introduce target

graphql · May 4, 2023 · 8cb6f27 · 8cb6f27
1 parent 324a5ad
commit 8cb6f27
Showing 1 changed file with 34 additions and 40 deletions.
diff --git a/src/execution/collectFields.ts b/src/execution/collectFields.ts
@@ -30,24 +30,23 @@ import { getDirectiveValues } from './values.js';
 
 export interface DeferUsage {
   label: string | undefined;
-  ancestors: ReadonlyArray<DeferUsage | undefined>;
+  ancestors: ReadonlyArray<Target>;
 }
 
-export const NON_DEFERRED_SET = new OrderedSet<DeferUsage | undefined>([
-  undefined,
-]).freeze();
+export const NON_DEFERRED_SET = new OrderedSet<Target>([undefined]).freeze();
 
 export type Target = DeferUsage | undefined;
 export type TargetSet = ReadonlyOrderedSet<Target>;
 
 export interface FieldGroup {
   fieldName: string;
-  fields: Map<DeferUsage | undefined, ReadonlyArray<FieldNode>>;
+  fields: Map<Target, ReadonlyArray<FieldNode>>;
   targets: TargetSet;
 }
+
 interface MutableFieldGroup {
   fieldName: string;
-  fields: AccumulatorMap<DeferUsage | undefined, FieldNode>;
+  fields: AccumulatorMap<Target, FieldNode>;
 }
 
 export type GroupedFieldSet = Map<string, FieldGroup>;
@@ -123,7 +122,7 @@ export function collectSubfields(
   const deferUsages = new Map<string | undefined, DeferUsage>();
   const visitedFragmentNames = new Set<string>();
 
-  for (const [deferUsage, fieldNodes] of fieldGroup.fields) {
+  for (const [target, fieldNodes] of fieldGroup.fields) {
     for (const node of fieldNodes) {
       if (node.selectionSet) {
         collectFieldsImpl(
@@ -136,7 +135,7 @@ export function collectSubfields(
           subGroupedFieldSet,
           deferUsages,
           visitedFragmentNames,
-          deferUsage,
+          target,
         );
       }
     }
@@ -150,7 +149,7 @@ export function collectSubfields(
 
 function buildGroupedFieldSets(
   originalGroupedFieldSet: MutableGroupedFieldSet,
-  parentDeferUsages = NON_DEFERRED_SET,
+  parentTargets = NON_DEFERRED_SET,
 ): {
   groupedFieldSet: GroupedFieldSet;
   newGroupedFieldSets: Map<
@@ -165,21 +164,19 @@ function buildGroupedFieldSets(
   >();
 
   for (const [key, fieldGroup] of originalGroupedFieldSet) {
-    const nonMaskedDeferUsageList: Array<DeferUsage | undefined> = [];
+    const nonMaskedTargetList: Array<Target> = [];
     const originalTargetSet = new Set(fieldGroup.fields.keys());
-    for (const [deferUsage] of fieldGroup.fields) {
+    for (const [target] of fieldGroup.fields) {
       if (
-        deferUsage === undefined ||
-        deferUsage.ancestors.every(
-          (ancestor) => !originalTargetSet.has(ancestor),
-        )
+        target === undefined ||
+        target.ancestors.every((ancestor) => !originalTargetSet.has(ancestor))
       ) {
-        nonMaskedDeferUsageList.push(deferUsage);
+        nonMaskedTargetList.push(target);
       }
     }
 
-    const newTargetSet = new OrderedSet(nonMaskedDeferUsageList).freeze();
-    if (newTargetSet === parentDeferUsages) {
+    const newTargetSet = new OrderedSet(nonMaskedTargetList).freeze();
+    if (newTargetSet === parentTargets) {
       groupedFieldSet.set(key, {
         ...fieldGroup,
         targets: newTargetSet,
@@ -190,8 +187,8 @@ function buildGroupedFieldSets(
     let newGroupedFieldSet =
       newGroupedFieldSets.get(newTargetSet)?.groupedFieldSet;
     if (newGroupedFieldSet === undefined) {
-      const shouldInitiateDefer = nonMaskedDeferUsageList.some(
-        (deferUsage) => !parentDeferUsages.has(deferUsage),
+      const shouldInitiateDefer = nonMaskedTargetList.some(
+        (target) => !parentTargets.has(target),
       );
       newGroupedFieldSet = new Map();
       newGroupedFieldSets.set(newTargetSet, {
@@ -222,8 +219,8 @@ function collectFieldsImpl(
   groupedFieldSet: MutableGroupedFieldSet,
   deferUsages: Map<string | undefined, DeferUsage>,
   visitedFragmentNames: Set<string>,
-  parentDeferUsage?: DeferUsage | undefined,
-  newDeferUsage?: DeferUsage | undefined,
+  parentTarget?: Target,
+  newTarget?: Target,
 ): void {
   for (const selection of selectionSet.selections) {
     switch (selection.kind) {
@@ -234,14 +231,11 @@ function collectFieldsImpl(
         const key = getFieldEntryKey(selection);
         const fieldGroup = groupedFieldSet.get(key);
         if (fieldGroup) {
-          fieldGroup.fields.add(newDeferUsage ?? parentDeferUsage, selection);
+          fieldGroup.fields.add(newTarget ?? parentTarget, selection);
         } else {
-          const fields = new AccumulatorMap<
-            DeferUsage | undefined,
-            FieldNode
-          >();
+          const fields = new AccumulatorMap<Target, FieldNode>();
 
-          fields.add(newDeferUsage ?? parentDeferUsage, selection);
+          fields.add(newTarget ?? parentTarget, selection);
 
           groupedFieldSet.set(key, {
             fieldName: selection.name.value,
@@ -271,8 +265,8 @@ function collectFieldsImpl(
             groupedFieldSet,
             deferUsages,
             visitedFragmentNames,
-            parentDeferUsage,
-            newDeferUsage,
+            parentTarget,
+            newTarget,
           );
           break;
         }
@@ -288,7 +282,7 @@ function collectFieldsImpl(
           deferUsages,
           visitedFragmentNames,
           defer,
-          parentDeferUsage,
+          parentTarget,
         );
         break;
       }
@@ -324,8 +318,8 @@ function collectFieldsImpl(
             groupedFieldSet,
             deferUsages,
             visitedFragmentNames,
-            parentDeferUsage,
-            newDeferUsage,
+            parentTarget,
+            newTarget,
           );
           break;
         }
@@ -341,7 +335,7 @@ function collectFieldsImpl(
           deferUsages,
           visitedFragmentNames,
           defer,
-          parentDeferUsage,
+          parentTarget,
         );
         break;
       }
@@ -361,7 +355,7 @@ function collectDeferredFragmentFields(
   deferUsages: Map<string | undefined, DeferUsage>,
   visitedFragmentNames: Set<string>,
   defer: { label: string | undefined },
-  parentDeferUsage?: DeferUsage | undefined,
+  parentTarget?: Target,
 ): void {
   const existingNewDefer = deferUsages.get(defer.label);
   if (existingNewDefer !== undefined) {
@@ -375,16 +369,16 @@ function collectDeferredFragmentFields(
       groupedFieldSet,
       deferUsages,
       visitedFragmentNames,
-      parentDeferUsage,
+      parentTarget,
       existingNewDefer,
     );
     return;
   }
 
   const ancestors =
-    parentDeferUsage === undefined
-      ? [parentDeferUsage]
-      : [...parentDeferUsage.ancestors, parentDeferUsage];
+    parentTarget === undefined
+      ? [parentTarget]
+      : [...parentTarget.ancestors, parentTarget];
   const newDefer: DeferUsage = { ...defer, ancestors };
   deferUsages.set(defer.label, newDefer);
   collectFieldsImpl(
@@ -397,7 +391,7 @@ function collectDeferredFragmentFields(
     groupedFieldSet,
     deferUsages,
     visitedFragmentNames,
-    parentDeferUsage,
+    parentTarget,
     newDefer,
   );
 }