add filtering again

graphql · Apr 8, 2024 · 25a0425 · 25a0425
1 parent 8ff203d
commit 25a0425
Show file tree

Hide file tree

Showing 4 changed files with 264 additions and 189 deletions.
diff --git a/src/execution/IncrementalPublisher.ts b/src/execution/IncrementalPublisher.ts
@@ -520,7 +520,7 @@ class IncrementalPublisher {
       );
     }
 
-    if (deferredGroupedFieldSetResult.incrementalDataRecords !== undefined) {
+    if (deferredGroupedFieldSetResult.incrementalDataRecords) {
       this._addIncrementalDataRecords(
         deferredGroupedFieldSetResult.incrementalDataRecords,
       );
@@ -616,7 +616,7 @@ class IncrementalPublisher {
 
       this._incremental.push(incrementalEntry);
 
-      if (streamItemsResult.incrementalDataRecords !== undefined) {
+      if (streamItemsResult.incrementalDataRecords) {
         this._addIncrementalDataRecords(
           streamItemsResult.incrementalDataRecords,
         );
@@ -658,13 +658,13 @@ class IncrementalPublisher {
   }
 }
 
-function isDeferredFragmentRecord(
+export function isDeferredFragmentRecord(
   subsequentResultRecord: SubsequentResultRecord,
 ): subsequentResultRecord is DeferredFragmentRecord {
   return subsequentResultRecord instanceof DeferredFragmentRecord;
 }
 
-function isDeferredGroupedFieldSetRecord(
+export function isDeferredGroupedFieldSetRecord(
   incrementalDataRecord: IncrementalDataRecord,
 ): incrementalDataRecord is DeferredGroupedFieldSetRecord {
   return incrementalDataRecord instanceof DeferredGroupedFieldSetRecord;
@@ -673,7 +673,8 @@ function isDeferredGroupedFieldSetRecord(
 export interface IncrementalContext {
   deferUsageSet: DeferUsageSet | undefined;
   path: Path | undefined;
-  errors?: Array<GraphQLError> | undefined;
+  errors?: Map<Path | undefined, GraphQLError> | undefined;
+  incrementalDataRecords?: Array<IncrementalDataRecord> | undefined;
 }
 
 export type DeferredGroupedFieldSetResult =
@@ -690,7 +691,7 @@ interface ReconcilableDeferredGroupedFieldSetResult {
   deferredFragmentRecords: ReadonlyArray<DeferredFragmentRecord>;
   path: Array<string | number>;
   result: BareDeferredGroupedFieldSetResult;
-  incrementalDataRecords: ReadonlyArray<IncrementalDataRecord> | undefined;
+  incrementalDataRecords?: ReadonlyArray<IncrementalDataRecord> | undefined;
   sent?: true | undefined;
 }
 
@@ -795,7 +796,7 @@ interface NonReconcilableStreamItemsResult {
 interface NonTerminatingStreamItemsResult {
   streamRecord: StreamRecord;
   result: BareStreamItemsResult;
-  incrementalDataRecords: ReadonlyArray<IncrementalDataRecord> | undefined;
+  incrementalDataRecords?: ReadonlyArray<IncrementalDataRecord> | undefined;
 }
 
 interface TerminatingStreamItemsResult {
@@ -857,10 +858,10 @@ export class StreamItemsRecord {
       this.nextStreamItems !== undefined
       ? {
           ...result,
-          incrementalDataRecords:
-            result.incrementalDataRecords === undefined
-              ? [this.nextStreamItems]
-              : [this.nextStreamItems, ...result.incrementalDataRecords],
+          incrementalDataRecords: [
+            this.nextStreamItems,
+            ...(result.incrementalDataRecords ?? []),
+          ],
         }
       : result;
   }

diff --git a/src/execution/__tests__/stream-test.ts b/src/execution/__tests__/stream-test.ts
@@ -2096,14 +2096,23 @@ describe('Execute: stream directive', () => {
             id: '2',
           },
         ],
-        completed: [{ id: '2' }, { id: '1' }],
-        hasNext: false,
+        completed: [{ id: '2' }],
+        hasNext: true,
       },
       done: false,
     });
 
     const result5 = await iterator.next();
     expectJSON(result5).toDeepEqual({
+      value: {
+        completed: [{ id: '1' }],
+        hasNext: false,
+      },
+      done: false,
+    });
+
+    const result6 = await iterator.next();
+    expectJSON(result6).toDeepEqual({
       value: undefined,
       done: true,
     });