remove permanent tracking of all ancestors

in favor of resolution at runtime this is a tradeoff of theoretical performance gain vs code simplification
yaacovCR · Dec 15, 2023 · 40f07e2 · 40f07e2
1 parent cff3477
commit 40f07e2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/execution/buildFieldPlan.ts b/src/execution/buildFieldPlan.ts
@@ -77,7 +77,7 @@ export function buildFieldPlan(
     for (const target of targetSet) {
       if (
         target === undefined ||
-        target.ancestors.every((ancestor) => !targetSet.has(ancestor))
+        getAncestors(target).every((ancestor) => !targetSet.has(ancestor))
       ) {
         maskingTargetList.push(target);
       }
@@ -145,3 +145,15 @@ export function buildFieldPlan(
     newDeferUsages: Array.from(newDeferUsages),
   };
 }
+
+function getAncestors(
+  deferUsage: DeferUsage,
+): ReadonlyArray<DeferUsage | undefined> {
+  let parentDeferUsage: DeferUsage | undefined = deferUsage.parentDeferUsage;
+  const ancestors: Array<DeferUsage | undefined> = [parentDeferUsage];
+  while (parentDeferUsage !== undefined) {
+    parentDeferUsage = parentDeferUsage.parentDeferUsage;
+    ancestors.unshift(parentDeferUsage);
+  }
+  return ancestors;
+}
diff --git a/src/execution/collectFields.ts b/src/execution/collectFields.ts
@@ -28,7 +28,7 @@ import { getDirectiveValues } from './values.js';
 
 export interface DeferUsage {
   label: string | undefined;
-  ancestors: ReadonlyArray<DeferUsage | undefined>;
+  parentDeferUsage: DeferUsage | undefined;
 }
 
 export interface FieldDetails {
@@ -242,10 +242,7 @@ function getDeferUsage(
 
   return {
     label: typeof defer.label === 'string' ? defer.label : undefined,
-    ancestors:
-      parentDeferUsage === undefined
-        ? [undefined]
-        : [parentDeferUsage, ...parentDeferUsage.ancestors],
+    parentDeferUsage,
   };
 }
 

diff --git a/src/execution/execute.ts b/src/execution/execute.ts
@@ -1464,8 +1464,7 @@ function addNewDeferredFragments(
 
   // For each new deferUsage object:
   for (const newDeferUsage of newDeferUsages) {
-    // DeferUsage objects track their parent targets; the immediate parent is always the first member of this list.
-    const parentTarget = newDeferUsage.ancestors[0];
+    const parentTarget = newDeferUsage.parentDeferUsage;
 
     // If the parent target is defined, the parent target is a DeferUsage object and
     // the parent result record is the DeferredFragmentRecord corresponding to that DeferUsage.