use groupedFieldSet as variable name

to match type

Author: yaacovCR

src/execution/collectFields.ts

@@ -41,18 +41,18 @@ export function collectFields(
   variableValues: { [variable: string]: unknown },
   runtimeType: GraphQLObjectType,
   selectionSet: SelectionSetNode,
-): Map<string, FieldGroup> {
-  const fields = new AccumulatorMap<string, FieldNode>();
+): GroupedFieldSet {
+  const groupedFieldSet = new AccumulatorMap<string, FieldNode>();
   collectFieldsImpl(
     schema,
     fragments,
     variableValues,
     runtimeType,
     selectionSet,
-    fields,
+    groupedFieldSet,
     new Set(),
   );
-  return fields;
+  return groupedFieldSet;
 }
 
 /**
@@ -71,8 +71,8 @@ export function collectSubfields(
   variableValues: { [variable: string]: unknown },
   returnType: GraphQLObjectType,
   fieldGroup: FieldGroup,
-): Map<string, FieldGroup> {
-  const subFieldNodes = new AccumulatorMap<string, FieldNode>();
+): GroupedFieldSet {
+  const subGroupedFieldSet = new AccumulatorMap<string, FieldNode>();
   const visitedFragmentNames = new Set<string>();
   for (const node of fieldGroup) {
     if (node.selectionSet) {
@@ -82,12 +82,12 @@ export function collectSubfields(
         variableValues,
         returnType,
         node.selectionSet,
-        subFieldNodes,
+        subGroupedFieldSet,
         visitedFragmentNames,
       );
     }
   }
-  return subFieldNodes;
+  return subGroupedFieldSet;
 }
 
 // eslint-disable-next-line max-params
@@ -97,7 +97,7 @@ function collectFieldsImpl(
   variableValues: { [variable: string]: unknown },
   runtimeType: GraphQLObjectType,
   selectionSet: SelectionSetNode,
-  fields: AccumulatorMap<string, FieldNode>,
+  groupedFieldSet: AccumulatorMap<string, FieldNode>,
   visitedFragmentNames: Set<string>,
 ): void {
   for (const selection of selectionSet.selections) {
@@ -106,7 +106,7 @@ function collectFieldsImpl(
         if (!shouldIncludeNode(variableValues, selection)) {
           continue;
         }
-        fields.add(getFieldEntryKey(selection), selection);
+        groupedFieldSet.add(getFieldEntryKey(selection), selection);
         break;
       }
       case Kind.INLINE_FRAGMENT: {
@@ -122,7 +122,7 @@ function collectFieldsImpl(
           variableValues,
           runtimeType,
           selection.selectionSet,
-          fields,
+          groupedFieldSet,
           visitedFragmentNames,
         );
         break;
@@ -149,7 +149,7 @@ function collectFieldsImpl(
           variableValues,
           runtimeType,
           fragment.selectionSet,
-          fields,
+          groupedFieldSet,
           visitedFragmentNames,
         );
         break;

src/execution/execute.ts

@@ -397,7 +397,7 @@ function executeOperation(
     );
   }
 
-  const rootFields = collectFields(
+  const groupedFieldSet = collectFields(
     schema,
     fragments,
     variableValues,
@@ -408,19 +408,31 @@ function executeOperation(
 
   switch (operation.operation) {
     case OperationTypeNode.QUERY:
-      return executeFields(exeContext, rootType, rootValue, path, rootFields);
+      return executeFields(
+        exeContext,
+        rootType,
+        rootValue,
+        path,
+        groupedFieldSet,
+      );
     case OperationTypeNode.MUTATION:
       return executeFieldsSerially(
         exeContext,
         rootType,
         rootValue,
         path,
-        rootFields,
+        groupedFieldSet,
       );
     case OperationTypeNode.SUBSCRIPTION:
       // TODO: deprecate `subscribe` and move all logic here
       // Temporary solution until we finish merging execute and subscribe together
-      return executeFields(exeContext, rootType, rootValue, path, rootFields);
+      return executeFields(
+        exeContext,
+        rootType,
+        rootValue,
+        path,
+        groupedFieldSet,
+      );
   }
 }
 
@@ -1153,9 +1165,19 @@ function collectAndExecuteSubfields(
   result: unknown,
 ): PromiseOrValue<ObjMap<unknown>> {
   // Collect sub-fields to execute to complete this value.
-  const subFieldNodes = collectSubfields(exeContext, returnType, fieldGroup);
+  const subGroupedFieldSet = collectSubfields(
+    exeContext,
+    returnType,
+    fieldGroup,
+  );
 
-  return executeFields(exeContext, returnType, result, path, subFieldNodes);
+  return executeFields(
+    exeContext,
+    returnType,
+    result,
+    path,
+    subGroupedFieldSet,
+  );
 }
 
 /**
@@ -1367,15 +1389,15 @@ function executeSubscription(
     );
   }
 
-  const rootFields = collectFields(
+  const groupedFieldSet = collectFields(
     schema,
     fragments,
     variableValues,
     rootType,
     operation.selectionSet,
   );
 
-  const firstRootField = rootFields.entries().next().value;
+  const firstRootField = groupedFieldSet.entries().next().value;
   const [responseName, fieldGroup] = firstRootField;
   const fieldName = fieldGroup[0].name.value;
   const fieldDef = schema.getField(rootType, fieldName);

src/validation/rules/SingleFieldSubscriptionsRule.ts

@@ -41,15 +41,15 @@ export function SingleFieldSubscriptionsRule(
               fragments[definition.name.value] = definition;
             }
           }
-          const fields = collectFields(
+          const groupedFieldSet = collectFields(
             schema,
             fragments,
             variableValues,
             subscriptionType,
             node.selectionSet,
           );
-          if (fields.size > 1) {
-            const fieldSelectionLists = [...fields.values()];
+          if (groupedFieldSet.size > 1) {
+            const fieldSelectionLists = [...groupedFieldSet.values()];
             const extraFieldSelectionLists = fieldSelectionLists.slice(1);
             const extraFieldSelections = extraFieldSelectionLists.flat();
             context.reportError(
@@ -61,7 +61,7 @@ export function SingleFieldSubscriptionsRule(
               ),
             );
           }
-          for (const fieldGroup of fields.values()) {
+          for (const fieldGroup of groupedFieldSet.values()) {
             const fieldName = fieldGroup[0].name.value;
             if (fieldName.startsWith('__')) {
               context.reportError(