Merge pull request #3069 from apollographql/benjamn/sparse-map-mergeT…

…ype-sources Use sparse `Map`s rather than dense `sources` arrays in `mergeType` code.
apollographql · Jul 8, 2024 · 3dff8a3 · 3dff8a3
2 parents 38debcf + f5f6a79
commit 3dff8a3
Show file tree

Hide file tree

Showing 4 changed files with 431 additions and 195 deletions.
diff --git a/.changeset/smooth-melons-study.md b/.changeset/smooth-melons-study.md
@@ -0,0 +1,5 @@
+---
+"@apollo/composition": patch
+---
+
+Type merging now uses maps instead of sparsely-populated arrays for per-subgraph data.
diff --git a/composition-js/src/composeDirectiveManager.ts b/composition-js/src/composeDirectiveManager.ts
@@ -15,6 +15,7 @@ import {
 import { GraphQLError } from 'graphql';
 import { CompositionHint, HINTS } from './hints';
 import { MismatchReporter } from './merging/reporter';
+import { sourcesFromArray } from './merging';
 
 /**
  * Return true if the directive from the same core feature has a different name in the subgraph
@@ -367,7 +368,7 @@ export class ComposeDirectiveManager {
         this.mismatchReporter.reportMismatchErrorWithoutSupergraph(
           ERRORS.DIRECTIVE_COMPOSITION_ERROR,
           'Composed directive is not named consistently in all subgraphs',
-          this.subgraphs.values()
+          sourcesFromArray(this.subgraphs.values()
             .map(sg => {
               const item = items.find(item => sg.name === item.sgName);
               return item ? {
@@ -384,7 +385,7 @@ export class ComposeDirectiveManager {
                 sourceAST,
                 item: val.item,
               } : undefined;
-            }),
+            })),
           (elt) => elt ? `"@${elt.item.directiveNameAs}"` : undefined
         );
       }