collectFields does not need to return a map of labels

yaacovCR · yaacovCR · commit 7df0bfc18667 · 2023-04-22T21:41:33.000+03:00
the labels were only checked to be unique (and only have to be unique) in combination with the path at which they are used

execute was never using the keys, just the values
diff --git a/src/execution/collectFields.ts b/src/execution/collectFields.ts
@@ -47,12 +47,7 @@ type MutableGroupedFieldSet = Map<string, MutableFieldGroup>;
 
 export interface CollectFieldsResult {
   groupedFieldSet: GroupedFieldSet;
-  deferUsages: Map<string | undefined, DeferUsage>;
-}
-
-interface MutableCollectFieldsResult {
-  groupedFieldSet: MutableGroupedFieldSet;
-  deferUsages: Map<string | undefined, DeferUsage>;
+  deferUsages: ReadonlyArray<DeferUsage>;
 }
 
 /**
@@ -74,23 +69,22 @@ export function collectFields(
   const groupedFieldSet = new Map<string, MutableFieldGroup>();
   const deferUsages = new Map<string | undefined, DeferUsage>();
 
-  const collectFieldsResult = {
-    groupedFieldSet,
-    deferUsages,
-  };
-
   collectFieldsImpl(
     schema,
     fragments,
     variableValues,
     operation,
     runtimeType,
     operation.selectionSet,
-    collectFieldsResult,
+    groupedFieldSet,
+    deferUsages,
     new Set(),
   );
 
-  return collectFieldsResult;
+  return {
+    groupedFieldSet,
+    deferUsages: Array.from(deferUsages.values()),
+  };
 }
 
 /**
@@ -114,10 +108,6 @@ export function collectSubfields(
 ): CollectFieldsResult {
   const subGroupedFieldSet = new Map<string, MutableFieldGroup>();
   const deferUsages = new Map<string | undefined, DeferUsage>();
-  const collectSubfieldsResult = {
-    groupedFieldSet: subGroupedFieldSet,
-    deferUsages,
-  };
   const visitedFragmentNames = new Set<string>();
 
   for (const [deferUsage, fieldNodes] of fieldGroup.fields) {
@@ -130,15 +120,19 @@ export function collectSubfields(
           operation,
           returnType,
           node.selectionSet,
-          collectSubfieldsResult,
+          subGroupedFieldSet,
+          deferUsages,
           visitedFragmentNames,
           deferUsage,
         );
       }
     }
   }
 
-  return collectSubfieldsResult;
+  return {
+    groupedFieldSet: subGroupedFieldSet,
+    deferUsages: Array.from(deferUsages.values()),
+  };
 }
 
 // eslint-disable-next-line max-params
@@ -149,12 +143,12 @@ function collectFieldsImpl(
   operation: OperationDefinitionNode,
   runtimeType: GraphQLObjectType,
   selectionSet: SelectionSetNode,
-  collectFieldsResult: MutableCollectFieldsResult,
+  groupedFieldSet: MutableGroupedFieldSet,
+  deferUsages: Map<string | undefined, DeferUsage>,
   visitedFragmentNames: Set<string>,
   parentDeferUsage?: DeferUsage | undefined,
   newDeferUsage?: DeferUsage | undefined,
 ): void {
-  const { groupedFieldSet } = collectFieldsResult;
   for (const selection of selectionSet.selections) {
     switch (selection.kind) {
       case Kind.FIELD: {
@@ -215,7 +209,8 @@ function collectFieldsImpl(
             operation,
             runtimeType,
             selection.selectionSet,
-            collectFieldsResult,
+            groupedFieldSet,
+            deferUsages,
             visitedFragmentNames,
             parentDeferUsage,
             newDeferUsage,
@@ -230,7 +225,8 @@ function collectFieldsImpl(
           operation,
           runtimeType,
           selection.selectionSet,
-          collectFieldsResult,
+          groupedFieldSet,
+          deferUsages,
           visitedFragmentNames,
           defer,
           parentDeferUsage,
@@ -266,7 +262,8 @@ function collectFieldsImpl(
             operation,
             runtimeType,
             fragment.selectionSet,
-            collectFieldsResult,
+            groupedFieldSet,
+            deferUsages,
             visitedFragmentNames,
             parentDeferUsage,
             newDeferUsage,
@@ -281,7 +278,8 @@ function collectFieldsImpl(
           operation,
           runtimeType,
           fragment.selectionSet,
-          collectFieldsResult,
+          groupedFieldSet,
+          deferUsages,
           visitedFragmentNames,
           defer,
           parentDeferUsage,
@@ -300,12 +298,12 @@ function collectDeferredFragmentFields(
   operation: OperationDefinitionNode,
   runtimeType: GraphQLObjectType,
   selectionSet: SelectionSetNode,
-  collectFieldsResult: MutableCollectFieldsResult,
+  groupedFieldSet: MutableGroupedFieldSet,
+  deferUsages: Map<string | undefined, DeferUsage>,
   visitedFragmentNames: Set<string>,
   defer: { label: string | undefined },
   parentDeferUsage?: DeferUsage | undefined,
 ): void {
-  const deferUsages = collectFieldsResult.deferUsages;
   const existingNewDefer = deferUsages.get(defer.label);
   if (existingNewDefer !== undefined) {
     collectFieldsImpl(
@@ -315,7 +313,8 @@ function collectDeferredFragmentFields(
       operation,
       runtimeType,
       selectionSet,
-      collectFieldsResult,
+      groupedFieldSet,
+      deferUsages,
       visitedFragmentNames,
       parentDeferUsage,
       existingNewDefer,
@@ -332,7 +331,8 @@ function collectDeferredFragmentFields(
     operation,
     runtimeType,
     selectionSet,
-    collectFieldsResult,
+    groupedFieldSet,
+    deferUsages,
     visitedFragmentNames,
     parentDeferUsage,
     newDefer,
diff --git a/src/execution/execute.ts b/src/execution/execute.ts
@@ -575,7 +575,7 @@ function executeOperation(
 
   const deferredFragmentRecords: Array<DeferredFragmentRecord> = [];
   const newDefers = new Map<DeferUsage, DeferredFragmentRecord>();
-  for (const deferUsage of deferUsages.values()) {
+  for (const deferUsage of deferUsages) {
     const deferredFragmentRecord = new DeferredFragmentRecord({
       deferUsage,
       path,
@@ -1873,7 +1873,7 @@ function collectAndExecuteSubfields(
 
   const deferredFragmentRecords: Array<DeferredFragmentRecord> = [];
   const newDefers = new Map<DeferUsage, DeferredFragmentRecord>(deferMap);
-  for (const deferUsage of subDeferUsages.values()) {
+  for (const deferUsage of subDeferUsages) {
     const deferredFragmentRecord = new DeferredFragmentRecord({
       deferUsage,
       path,
