pass subsequentPayloads rather than entire exeContext

Author: yaacovCR

src/execution/execute.ts

@@ -363,7 +363,9 @@ function executeImpl(
                 ...initialResult,
                 hasNext: true,
               },
-              subsequentResults: yieldSubsequentPayloads(exeContext),
+              subsequentResults: yieldSubsequentPayloads(
+                exeContext.subsequentPayloads,
+              ),
             };
           }
           return initialResult;
@@ -381,7 +383,9 @@ function executeImpl(
           ...initialResult,
           hasNext: true,
         },
-        subsequentResults: yieldSubsequentPayloads(exeContext),
+        subsequentResults: yieldSubsequentPayloads(
+          exeContext.subsequentPayloads,
+        ),
       };
     }
     return initialResult;
@@ -810,7 +814,11 @@ function handleRawError(
 ): void {
   const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
   addError(rawError, fieldNodes, returnType, path, errors);
-  filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
+  filterSubsequentPayloads(
+    exeContext.subsequentPayloads,
+    path,
+    asyncPayloadRecord,
+  );
 }
 
 function addError(
@@ -1867,7 +1875,11 @@ function executeStreamField(
       (value) => [value],
       (error) => {
         asyncPayloadRecord.errors.push(error);
-        filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
+        filterSubsequentPayloads(
+          exeContext.subsequentPayloads,
+          path,
+          asyncPayloadRecord,
+        );
         return null;
       },
     );
@@ -1901,7 +1913,11 @@ function executeStreamField(
     }
   } catch (error) {
     asyncPayloadRecord.errors.push(error);
-    filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
+    filterSubsequentPayloads(
+      exeContext.subsequentPayloads,
+      path,
+      asyncPayloadRecord,
+    );
     asyncPayloadRecord.addItems(null);
     return asyncPayloadRecord;
   }
@@ -1923,7 +1939,11 @@ function executeStreamField(
         (value) => [value],
         (error) => {
           asyncPayloadRecord.errors.push(error);
-          filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
+          filterSubsequentPayloads(
+            exeContext.subsequentPayloads,
+            path,
+            asyncPayloadRecord,
+          );
           return null;
         },
       );
@@ -2044,7 +2064,11 @@ async function executeStreamIterator(
       );
     } catch (error) {
       asyncPayloadRecord.errors.push(error);
-      filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
+      filterSubsequentPayloads(
+        exeContext.subsequentPayloads,
+        path,
+        asyncPayloadRecord,
+      );
       asyncPayloadRecord.addItems(null);
       // entire stream has errored and bubbled upwards
       if (iterator?.return) {
@@ -2063,7 +2087,11 @@ async function executeStreamIterator(
         (value) => [value],
         (error) => {
           asyncPayloadRecord.errors.push(error);
-          filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
+          filterSubsequentPayloads(
+            exeContext.subsequentPayloads,
+            path,
+            asyncPayloadRecord,
+          );
           return null;
         },
       );
@@ -2082,12 +2110,12 @@ async function executeStreamIterator(
 }
 
 function filterSubsequentPayloads(
-  exeContext: ExecutionContext,
+  subsequentPayloads: Set<AsyncPayloadRecord>,
   nullPath: Path,
   currentAsyncRecord: AsyncPayloadRecord | undefined,
 ): void {
   const nullPathArray = pathToArray(nullPath);
-  exeContext.subsequentPayloads.forEach((asyncRecord) => {
+  subsequentPayloads.forEach((asyncRecord) => {
     if (asyncRecord === currentAsyncRecord) {
       // don't remove payload from where error originates
       return;
@@ -2104,20 +2132,20 @@ function filterSubsequentPayloads(
         // ignore error
       });
     }
-    exeContext.subsequentPayloads.delete(asyncRecord);
+    subsequentPayloads.delete(asyncRecord);
   });
 }
 
 function getCompletedIncrementalResults(
-  exeContext: ExecutionContext,
+  subsequentPayloads: Set<AsyncPayloadRecord>,
 ): Array<IncrementalResult> {
   const incrementalResults: Array<IncrementalResult> = [];
-  for (const asyncPayloadRecord of exeContext.subsequentPayloads) {
+  for (const asyncPayloadRecord of subsequentPayloads) {
     const incrementalResult: IncrementalResult = {};
     if (!asyncPayloadRecord.isCompleted) {
       continue;
     }
-    exeContext.subsequentPayloads.delete(asyncPayloadRecord);
+    subsequentPayloads.delete(asyncPayloadRecord);
     if (isStreamPayload(asyncPayloadRecord)) {
       const items = asyncPayloadRecord.items;
       if (asyncPayloadRecord.isCompletedIterator) {
@@ -2143,7 +2171,7 @@ function getCompletedIncrementalResults(
 }
 
 function yieldSubsequentPayloads(
-  exeContext: ExecutionContext,
+  subsequentPayloads: Set<AsyncPayloadRecord>,
 ): AsyncGenerator<SubsequentIncrementalExecutionResult, void, void> {
   let isDone = false;
 
@@ -2154,17 +2182,15 @@ function yieldSubsequentPayloads(
       return { value: undefined, done: true };
     }
 
-    await Promise.race(
-      Array.from(exeContext.subsequentPayloads).map((p) => p.promise),
-    );
+    await Promise.race(Array.from(subsequentPayloads).map((p) => p.promise));
 
     if (isDone) {
       // a different call to next has exhausted all payloads
       return { value: undefined, done: true };
     }
 
-    const incremental = getCompletedIncrementalResults(exeContext);
-    const hasNext = exeContext.subsequentPayloads.size > 0;
+    const incremental = getCompletedIncrementalResults(subsequentPayloads);
+    const hasNext = subsequentPayloads.size > 0;
 
     if (!incremental.length && hasNext) {
       return next();
@@ -2182,7 +2208,7 @@ function yieldSubsequentPayloads(
 
   function returnStreamIterators() {
     const promises: Array<Promise<IteratorResult<unknown>>> = [];
-    exeContext.subsequentPayloads.forEach((asyncPayloadRecord) => {
+    subsequentPayloads.forEach((asyncPayloadRecord) => {
       if (
         isStreamPayload(asyncPayloadRecord) &&
         asyncPayloadRecord.iterator?.return