@graphql-tools/executor 1.2.2 → 1.2.3-rc-20240321094334-45d083dabf3175feeb56af73b0ee06d98d83a1ae

package/cjs/execution/execute.js

@@ -815,7 +815,8 @@ function flattenIncrementalResults(incrementalResults, signal) {
     let done = false;
     signal?.addEventListener('abort', () => {
         done = true;
-        subsequentIterator.throw?.(signal?.reason);
+        // we catch here to avoid unhandled promise rejection
+        subsequentIterator.throw?.(signal?.reason).catch(() => undefined);
     });
     return {
         [Symbol.asyncIterator]() {
@@ -1163,6 +1164,11 @@ function getCompletedIncrementalResults(exeContext) {
 }
 function yieldSubsequentPayloads(exeContext) {
     let isDone = false;
+    exeContext.signal?.addEventListener('abort', () => {
+        for (const payload of exeContext.subsequentPayloads) {
+            payload.cancel(exeContext.signal?.reason);
+        }
+    });
     async function next() {
         if (isDone) {
             return { value: undefined, done: true };
@@ -1222,10 +1228,11 @@ class DeferredFragmentRecord {
         this._exeContext.subsequentPayloads.add(this);
         this.isCompleted = false;
         this.data = null;
-        this.promise = new Promise(resolve => {
+        this.promise = new Promise((resolve, reject) => {
             this._resolve = MaybePromise => {
                 resolve(MaybePromise);
             };
+            this._reject = reject;
         }).then(data => {
             this.data = data;
             this.isCompleted = true;
@@ -1239,6 +1246,9 @@ class DeferredFragmentRecord {
         }
         this._resolve?.(data);
     }
+    cancel(reason) {
+        this._reject?.(reason);
+    }
 }
 class StreamRecord {
     constructor(opts) {
@@ -1253,10 +1263,11 @@ class StreamRecord {
         this._exeContext.subsequentPayloads.add(this);
         this.isCompleted = false;
         this.items = null;
-        this.promise = new Promise(resolve => {
+        this.promise = new Promise((resolve, reject) => {
             this._resolve = MaybePromise => {
                 resolve(MaybePromise);
             };
+            this._reject = reject;
         }).then(items => {
             this.items = items;
             this.isCompleted = true;
@@ -1273,6 +1284,9 @@ class StreamRecord {
     setIsCompletedIterator() {
         this.isCompletedIterator = true;
     }
+    cancel(reason) {
+        this._reject?.(reason);
+    }
 }
 function isStreamPayload(asyncPayload) {
     return asyncPayload.type === 'stream';

package/esm/execution/execute.js

@@ -804,7 +804,8 @@ export function flattenIncrementalResults(incrementalResults, signal) {
     let done = false;
     signal?.addEventListener('abort', () => {
         done = true;
-        subsequentIterator.throw?.(signal?.reason);
+        // we catch here to avoid unhandled promise rejection
+        subsequentIterator.throw?.(signal?.reason).catch(() => undefined);
     });
     return {
         [Symbol.asyncIterator]() {
@@ -1151,6 +1152,11 @@ function getCompletedIncrementalResults(exeContext) {
 }
 function yieldSubsequentPayloads(exeContext) {
     let isDone = false;
+    exeContext.signal?.addEventListener('abort', () => {
+        for (const payload of exeContext.subsequentPayloads) {
+            payload.cancel(exeContext.signal?.reason);
+        }
+    });
     async function next() {
         if (isDone) {
             return { value: undefined, done: true };
@@ -1210,10 +1216,11 @@ class DeferredFragmentRecord {
         this._exeContext.subsequentPayloads.add(this);
         this.isCompleted = false;
         this.data = null;
-        this.promise = new Promise(resolve => {
+        this.promise = new Promise((resolve, reject) => {
             this._resolve = MaybePromise => {
                 resolve(MaybePromise);
             };
+            this._reject = reject;
         }).then(data => {
             this.data = data;
             this.isCompleted = true;
@@ -1227,6 +1234,9 @@ class DeferredFragmentRecord {
         }
         this._resolve?.(data);
     }
+    cancel(reason) {
+        this._reject?.(reason);
+    }
 }
 class StreamRecord {
     constructor(opts) {
@@ -1241,10 +1251,11 @@ class StreamRecord {
         this._exeContext.subsequentPayloads.add(this);
         this.isCompleted = false;
         this.items = null;
-        this.promise = new Promise(resolve => {
+        this.promise = new Promise((resolve, reject) => {
             this._resolve = MaybePromise => {
                 resolve(MaybePromise);
             };
+            this._reject = reject;
         }).then(items => {
             this.items = items;
             this.isCompleted = true;
@@ -1261,6 +1272,9 @@ class StreamRecord {
     setIsCompletedIterator() {
         this.isCompletedIterator = true;
     }
+    cancel(reason) {
+        this._reject?.(reason);
+    }
 }
 function isStreamPayload(asyncPayload) {
     return asyncPayload.type === 'stream';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/executor",
-  "version": "1.2.2",
+  "version": "1.2.3-rc-20240321094334-45d083dabf3175feeb56af73b0ee06d98d83a1ae",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"

package/typings/execution/execute.d.cts

@@ -216,6 +216,7 @@ declare class DeferredFragmentRecord {
     isCompleted: boolean;
     _exeContext: ExecutionContext;
     _resolve?: (arg: MaybePromise<Record<string, unknown> | null>) => void;
+    _reject?: (reason: unknown) => void;
     constructor(opts: {
         label: string | undefined;
         path: Path | undefined;
@@ -223,6 +224,7 @@ declare class DeferredFragmentRecord {
         exeContext: ExecutionContext;
     });
     addData(data: MaybePromise<Record<string, unknown> | null>): void;
+    cancel(reason: unknown): void;
 }
 declare class StreamRecord {
     type: 'stream';
@@ -237,6 +239,7 @@ declare class StreamRecord {
     isCompleted: boolean;
     _exeContext: ExecutionContext;
     _resolve?: (arg: MaybePromise<Array<unknown> | null>) => void;
+    _reject?: (reason: unknown) => void;
     constructor(opts: {
         label: string | undefined;
         path: Path | undefined;
@@ -246,6 +249,7 @@ declare class StreamRecord {
     });
     addItems(items: MaybePromise<Array<unknown> | null>): void;
     setIsCompletedIterator(): void;
+    cancel(reason: unknown): void;
 }
 type AsyncPayloadRecord = DeferredFragmentRecord | StreamRecord;
 /**

package/typings/execution/execute.d.ts

@@ -216,6 +216,7 @@ declare class DeferredFragmentRecord {
     isCompleted: boolean;
     _exeContext: ExecutionContext;
     _resolve?: (arg: MaybePromise<Record<string, unknown> | null>) => void;
+    _reject?: (reason: unknown) => void;
     constructor(opts: {
         label: string | undefined;
         path: Path | undefined;
@@ -223,6 +224,7 @@ declare class DeferredFragmentRecord {
         exeContext: ExecutionContext;
     });
     addData(data: MaybePromise<Record<string, unknown> | null>): void;
+    cancel(reason: unknown): void;
 }
 declare class StreamRecord {
     type: 'stream';
@@ -237,6 +239,7 @@ declare class StreamRecord {
     isCompleted: boolean;
     _exeContext: ExecutionContext;
     _resolve?: (arg: MaybePromise<Array<unknown> | null>) => void;
+    _reject?: (reason: unknown) => void;
     constructor(opts: {
         label: string | undefined;
         path: Path | undefined;
@@ -246,6 +249,7 @@ declare class StreamRecord {
     });
     addItems(items: MaybePromise<Array<unknown> | null>): void;
     setIsCompletedIterator(): void;
+    cancel(reason: unknown): void;
 }
 type AsyncPayloadRecord = DeferredFragmentRecord | StreamRecord;
 /**