@graphql-tools/executor 1.2.4 → 1.2.5-alpha-20240328143324-239661c7f22ace5ca5539cc5b2e9f2e5fb67b38c

package/cjs/execution/execute.js

@@ -79,28 +79,14 @@ function executeImpl(exeContext) {
         }
         return initialResult;
     }, (error) => {
+        if (exeContext.signal?.aborted) {
+            throw exeContext.signal.reason;
+        }
         exeContext.errors.push(error);
         return buildResponse(null, exeContext.errors);
     })
         .resolve();
-    if (!exeContext.signal || 'initialResult' in result || 'then' in result === false) {
-        return result;
-    }
-    let resolve;
-    let reject;
-    const abortP = new Promise((_resolve, _reject) => {
-        resolve = _resolve;
-        reject = _reject;
-    });
-    function abortListener() {
-        reject(exeContext.signal?.reason);
-    }
-    exeContext.signal.addEventListener('abort', abortListener);
-    result.then(() => {
-        exeContext.signal?.removeEventListener('abort', abortListener);
-        resolve();
-    });
-    return Promise.race([abortP, result]);
+    return result;
 }
 /**
  * Also implements the "Executing requests" section of the GraphQL specification.
@@ -250,26 +236,16 @@ function executeOperation(exeContext) {
  * for fields that must be executed serially.
  */
 function executeFieldsSerially(exeContext, parentType, sourceValue, path, fields) {
-    let abortErrorThrown = false;
     return (0, utils_1.promiseReduce)(fields, (results, [responseName, fieldNodes]) => {
         const fieldPath = (0, utils_1.addPath)(path, responseName, parentType.name);
         if (exeContext.signal?.aborted) {
-            results[responseName] = null;
-            return results;
+            throw exeContext.signal.reason;
         }
         return new value_or_promise_1.ValueOrPromise(() => executeField(exeContext, parentType, sourceValue, fieldNodes, fieldPath)).then(result => {
             if (result === undefined) {
                 return results;
             }
             results[responseName] = result;
-            if (exeContext.signal?.aborted && !abortErrorThrown) {
-                exeContext.errors.push((0, utils_1.createGraphQLError)('Execution aborted', {
-                    nodes: fieldNodes,
-                    path: (0, utils_1.pathToArray)(fieldPath),
-                    originalError: exeContext.signal?.reason,
-                }));
-                abortErrorThrown = true;
-            }
             return results;
         });
     }, Object.create(null)).resolve();
@@ -281,12 +257,10 @@ function executeFieldsSerially(exeContext, parentType, sourceValue, path, fields
 function executeFields(exeContext, parentType, sourceValue, path, fields, asyncPayloadRecord) {
     const results = Object.create(null);
     let containsPromise = false;
-    let abortErrorThrown = false;
     try {
         for (const [responseName, fieldNodes] of fields) {
             if (exeContext.signal?.aborted) {
-                results[responseName] = null;
-                continue;
+                throw exeContext.signal.reason;
             }
             const fieldPath = (0, utils_1.addPath)(path, responseName, parentType.name);
             const result = executeField(exeContext, parentType, sourceValue, fieldNodes, fieldPath, asyncPayloadRecord);
@@ -296,14 +270,6 @@ function executeFields(exeContext, parentType, sourceValue, path, fields, asyncP
                     containsPromise = true;
                 }
             }
-            if (exeContext.signal?.aborted && !abortErrorThrown) {
-                exeContext.errors.push((0, utils_1.createGraphQLError)('Execution aborted', {
-                    nodes: fieldNodes,
-                    path: (0, utils_1.pathToArray)(fieldPath),
-                    originalError: exeContext.signal?.reason,
-                }));
-                abortErrorThrown = true;
-            }
         }
     }
     catch (error) {
@@ -502,11 +468,6 @@ function getStreamValues(exeContext, fieldNodes, path) {
 async function completeAsyncIteratorValue(exeContext, itemType, fieldNodes, info, path, iterator, asyncPayloadRecord) {
     exeContext.signal?.addEventListener('abort', () => {
         iterator.return?.();
-        exeContext.errors.push((0, utils_1.createGraphQLError)('Execution aborted', {
-            nodes: fieldNodes,
-            path: (0, utils_1.pathToArray)(path),
-            originalError: exeContext.signal?.reason,
-        }));
     });
     const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
     const stream = getStreamValues(exeContext, fieldNodes, path);
@@ -830,15 +791,10 @@ function subscribe(args) {
     return mapSourceToResponse(exeContext, resultOrStream);
 }
 exports.subscribe = subscribe;
-function flattenIncrementalResults(incrementalResults, signal) {
+function flattenIncrementalResults(incrementalResults) {
     const subsequentIterator = incrementalResults.subsequentResults;
     let initialResultSent = false;
     let done = false;
-    signal?.addEventListener('abort', () => {
-        done = true;
-        // we catch here to avoid unhandled promise rejection
-        subsequentIterator.throw?.(signal?.reason).catch(() => undefined);
-    });
     return {
         [Symbol.asyncIterator]() {
             return this;
@@ -870,9 +826,9 @@ function flattenIncrementalResults(incrementalResults, signal) {
     };
 }
 exports.flattenIncrementalResults = flattenIncrementalResults;
-async function* ensureAsyncIterable(someExecutionResult, signal) {
+async function* ensureAsyncIterable(someExecutionResult) {
     if ('initialResult' in someExecutionResult) {
-        yield* flattenIncrementalResults(someExecutionResult, signal);
+        yield* flattenIncrementalResults(someExecutionResult);
     }
     else {
         yield someExecutionResult;
@@ -888,7 +844,7 @@ function mapSourceToResponse(exeContext, resultOrStream) {
     // the GraphQL specification. The `execute` function provides the
     // "ExecuteSubscriptionEvent" algorithm, as it is nearly identical to the
     // "ExecuteQuery" algorithm, for which `execute` is also used.
-    return (0, flattenAsyncIterable_js_1.flattenAsyncIterable)((0, utils_1.mapAsyncIterator)(resultOrStream[Symbol.asyncIterator](), async (payload) => ensureAsyncIterable(await executeImpl(buildPerEventExecutionContext(exeContext, payload)), exeContext.signal), (error) => {
+    return (0, flattenAsyncIterable_js_1.flattenAsyncIterable)((0, utils_1.mapAsyncIterator)(resultOrStream[Symbol.asyncIterator](), async (payload) => ensureAsyncIterable(await executeImpl(buildPerEventExecutionContext(exeContext, payload))), (error) => {
         const wrappedError = (0, utils_1.createGraphQLError)(error.message, {
             originalError: error,
             nodes: [exeContext.operation],
@@ -1185,16 +1141,20 @@ function getCompletedIncrementalResults(exeContext) {
 }
 function yieldSubsequentPayloads(exeContext) {
     let isDone = false;
-    exeContext.signal?.addEventListener('abort', () => {
-        for (const payload of exeContext.subsequentPayloads) {
-            payload.cancel(exeContext.signal?.reason);
-        }
+    const abortPromise = new Promise((_, reject) => {
+        exeContext.signal?.addEventListener('abort', () => {
+            isDone = true;
+            reject(exeContext.signal?.reason);
+        });
     });
     async function next() {
         if (isDone) {
             return { value: undefined, done: true };
         }
-        await Promise.race(Array.from(exeContext.subsequentPayloads).map(p => p.promise));
+        await Promise.race([
+            abortPromise,
+            ...Array.from(exeContext.subsequentPayloads).map(p => p.promise),
+        ]);
         if (isDone) {
             // a different call to next has exhausted all payloads
             return { value: undefined, done: true };
@@ -1249,11 +1209,10 @@ class DeferredFragmentRecord {
         this._exeContext.subsequentPayloads.add(this);
         this.isCompleted = false;
         this.data = null;
-        this.promise = new Promise((resolve, reject) => {
+        this.promise = new Promise(resolve => {
             this._resolve = MaybePromise => {
                 resolve(MaybePromise);
             };
-            this._reject = reject;
         }).then(data => {
             this.data = data;
             this.isCompleted = true;
@@ -1267,9 +1226,6 @@ class DeferredFragmentRecord {
         }
         this._resolve?.(data);
     }
-    cancel(reason) {
-        this._reject?.(reason);
-    }
 }
 class StreamRecord {
     constructor(opts) {
@@ -1284,11 +1240,10 @@ class StreamRecord {
         this._exeContext.subsequentPayloads.add(this);
         this.isCompleted = false;
         this.items = null;
-        this.promise = new Promise((resolve, reject) => {
+        this.promise = new Promise(resolve => {
             this._resolve = MaybePromise => {
                 resolve(MaybePromise);
             };
-            this._reject = reject;
         }).then(items => {
             this.items = items;
             this.isCompleted = true;
@@ -1305,9 +1260,6 @@ class StreamRecord {
     setIsCompletedIterator() {
         this.isCompletedIterator = true;
     }
-    cancel(reason) {
-        this._reject?.(reason);
-    }
 }
 function isStreamPayload(asyncPayload) {
     return asyncPayload.type === 'stream';

package/cjs/execution/normalizedExecutor.js

@@ -15,7 +15,7 @@ function normalizedExecutor(args) {
     return new value_or_promise_1.ValueOrPromise(() => (0, execute_js_1.execute)(args))
         .then((result) => {
         if ('initialResult' in result) {
-            return (0, execute_js_1.flattenIncrementalResults)(result, args.signal);
+            return (0, execute_js_1.flattenIncrementalResults)(result);
         }
         return result;
     })

package/cjs/execution/promiseForObject.js

@@ -12,7 +12,7 @@ async function promiseForObject(object, signal) {
     const resolvedObject = Object.create(null);
     await new Promise((resolve, reject) => {
         signal?.addEventListener('abort', () => {
-            resolve();
+            reject(signal.reason);
         });
         Promise.all(Object.entries(object).map(async ([key, value]) => {
             resolvedObject[key] = await value;

package/esm/execution/execute.js

@@ -75,28 +75,14 @@ function executeImpl(exeContext) {
         }
         return initialResult;
     }, (error) => {
+        if (exeContext.signal?.aborted) {
+            throw exeContext.signal.reason;
+        }
         exeContext.errors.push(error);
         return buildResponse(null, exeContext.errors);
     })
         .resolve();
-    if (!exeContext.signal || 'initialResult' in result || 'then' in result === false) {
-        return result;
-    }
-    let resolve;
-    let reject;
-    const abortP = new Promise((_resolve, _reject) => {
-        resolve = _resolve;
-        reject = _reject;
-    });
-    function abortListener() {
-        reject(exeContext.signal?.reason);
-    }
-    exeContext.signal.addEventListener('abort', abortListener);
-    result.then(() => {
-        exeContext.signal?.removeEventListener('abort', abortListener);
-        resolve();
-    });
-    return Promise.race([abortP, result]);
+    return result;
 }
 /**
  * Also implements the "Executing requests" section of the GraphQL specification.
@@ -243,26 +229,16 @@ function executeOperation(exeContext) {
  * for fields that must be executed serially.
  */
 function executeFieldsSerially(exeContext, parentType, sourceValue, path, fields) {
-    let abortErrorThrown = false;
     return promiseReduce(fields, (results, [responseName, fieldNodes]) => {
         const fieldPath = addPath(path, responseName, parentType.name);
         if (exeContext.signal?.aborted) {
-            results[responseName] = null;
-            return results;
+            throw exeContext.signal.reason;
         }
         return new ValueOrPromise(() => executeField(exeContext, parentType, sourceValue, fieldNodes, fieldPath)).then(result => {
             if (result === undefined) {
                 return results;
             }
             results[responseName] = result;
-            if (exeContext.signal?.aborted && !abortErrorThrown) {
-                exeContext.errors.push(createGraphQLError('Execution aborted', {
-                    nodes: fieldNodes,
-                    path: pathToArray(fieldPath),
-                    originalError: exeContext.signal?.reason,
-                }));
-                abortErrorThrown = true;
-            }
             return results;
         });
     }, Object.create(null)).resolve();
@@ -274,12 +250,10 @@ function executeFieldsSerially(exeContext, parentType, sourceValue, path, fields
 function executeFields(exeContext, parentType, sourceValue, path, fields, asyncPayloadRecord) {
     const results = Object.create(null);
     let containsPromise = false;
-    let abortErrorThrown = false;
     try {
         for (const [responseName, fieldNodes] of fields) {
             if (exeContext.signal?.aborted) {
-                results[responseName] = null;
-                continue;
+                throw exeContext.signal.reason;
             }
             const fieldPath = addPath(path, responseName, parentType.name);
             const result = executeField(exeContext, parentType, sourceValue, fieldNodes, fieldPath, asyncPayloadRecord);
@@ -289,14 +263,6 @@ function executeFields(exeContext, parentType, sourceValue, path, fields, asyncP
                     containsPromise = true;
                 }
             }
-            if (exeContext.signal?.aborted && !abortErrorThrown) {
-                exeContext.errors.push(createGraphQLError('Execution aborted', {
-                    nodes: fieldNodes,
-                    path: pathToArray(fieldPath),
-                    originalError: exeContext.signal?.reason,
-                }));
-                abortErrorThrown = true;
-            }
         }
     }
     catch (error) {
@@ -494,11 +460,6 @@ function getStreamValues(exeContext, fieldNodes, path) {
 async function completeAsyncIteratorValue(exeContext, itemType, fieldNodes, info, path, iterator, asyncPayloadRecord) {
     exeContext.signal?.addEventListener('abort', () => {
         iterator.return?.();
-        exeContext.errors.push(createGraphQLError('Execution aborted', {
-            nodes: fieldNodes,
-            path: pathToArray(path),
-            originalError: exeContext.signal?.reason,
-        }));
     });
     const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
     const stream = getStreamValues(exeContext, fieldNodes, path);
@@ -819,15 +780,10 @@ export function subscribe(args) {
     }
     return mapSourceToResponse(exeContext, resultOrStream);
 }
-export function flattenIncrementalResults(incrementalResults, signal) {
+export function flattenIncrementalResults(incrementalResults) {
     const subsequentIterator = incrementalResults.subsequentResults;
     let initialResultSent = false;
     let done = false;
-    signal?.addEventListener('abort', () => {
-        done = true;
-        // we catch here to avoid unhandled promise rejection
-        subsequentIterator.throw?.(signal?.reason).catch(() => undefined);
-    });
     return {
         [Symbol.asyncIterator]() {
             return this;
@@ -858,9 +814,9 @@ export function flattenIncrementalResults(incrementalResults, signal) {
         },
     };
 }
-async function* ensureAsyncIterable(someExecutionResult, signal) {
+async function* ensureAsyncIterable(someExecutionResult) {
     if ('initialResult' in someExecutionResult) {
-        yield* flattenIncrementalResults(someExecutionResult, signal);
+        yield* flattenIncrementalResults(someExecutionResult);
     }
     else {
         yield someExecutionResult;
@@ -876,7 +832,7 @@ function mapSourceToResponse(exeContext, resultOrStream) {
     // the GraphQL specification. The `execute` function provides the
     // "ExecuteSubscriptionEvent" algorithm, as it is nearly identical to the
     // "ExecuteQuery" algorithm, for which `execute` is also used.
-    return flattenAsyncIterable(mapAsyncIterator(resultOrStream[Symbol.asyncIterator](), async (payload) => ensureAsyncIterable(await executeImpl(buildPerEventExecutionContext(exeContext, payload)), exeContext.signal), (error) => {
+    return flattenAsyncIterable(mapAsyncIterator(resultOrStream[Symbol.asyncIterator](), async (payload) => ensureAsyncIterable(await executeImpl(buildPerEventExecutionContext(exeContext, payload))), (error) => {
         const wrappedError = createGraphQLError(error.message, {
             originalError: error,
             nodes: [exeContext.operation],
@@ -1173,16 +1129,20 @@ function getCompletedIncrementalResults(exeContext) {
 }
 function yieldSubsequentPayloads(exeContext) {
     let isDone = false;
-    exeContext.signal?.addEventListener('abort', () => {
-        for (const payload of exeContext.subsequentPayloads) {
-            payload.cancel(exeContext.signal?.reason);
-        }
+    const abortPromise = new Promise((_, reject) => {
+        exeContext.signal?.addEventListener('abort', () => {
+            isDone = true;
+            reject(exeContext.signal?.reason);
+        });
     });
     async function next() {
         if (isDone) {
             return { value: undefined, done: true };
         }
-        await Promise.race(Array.from(exeContext.subsequentPayloads).map(p => p.promise));
+        await Promise.race([
+            abortPromise,
+            ...Array.from(exeContext.subsequentPayloads).map(p => p.promise),
+        ]);
         if (isDone) {
             // a different call to next has exhausted all payloads
             return { value: undefined, done: true };
@@ -1237,11 +1197,10 @@ class DeferredFragmentRecord {
         this._exeContext.subsequentPayloads.add(this);
         this.isCompleted = false;
         this.data = null;
-        this.promise = new Promise((resolve, reject) => {
+        this.promise = new Promise(resolve => {
             this._resolve = MaybePromise => {
                 resolve(MaybePromise);
             };
-            this._reject = reject;
         }).then(data => {
             this.data = data;
             this.isCompleted = true;
@@ -1255,9 +1214,6 @@ class DeferredFragmentRecord {
         }
         this._resolve?.(data);
     }
-    cancel(reason) {
-        this._reject?.(reason);
-    }
 }
 class StreamRecord {
     constructor(opts) {
@@ -1272,11 +1228,10 @@ class StreamRecord {
         this._exeContext.subsequentPayloads.add(this);
         this.isCompleted = false;
         this.items = null;
-        this.promise = new Promise((resolve, reject) => {
+        this.promise = new Promise(resolve => {
             this._resolve = MaybePromise => {
                 resolve(MaybePromise);
             };
-            this._reject = reject;
         }).then(items => {
             this.items = items;
             this.isCompleted = true;
@@ -1293,9 +1248,6 @@ class StreamRecord {
     setIsCompletedIterator() {
         this.isCompletedIterator = true;
     }
-    cancel(reason) {
-        this._reject?.(reason);
-    }
 }
 function isStreamPayload(asyncPayload) {
     return asyncPayload.type === 'stream';

package/esm/execution/normalizedExecutor.js

@@ -12,7 +12,7 @@ export function normalizedExecutor(args) {
     return new ValueOrPromise(() => execute(args))
         .then((result) => {
         if ('initialResult' in result) {
-            return flattenIncrementalResults(result, args.signal);
+            return flattenIncrementalResults(result);
         }
         return result;
     })

package/esm/execution/promiseForObject.js

@@ -9,7 +9,7 @@ export async function promiseForObject(object, signal) {
     const resolvedObject = Object.create(null);
     await new Promise((resolve, reject) => {
         signal?.addEventListener('abort', () => {
-            resolve();
+            reject(signal.reason);
         });
         Promise.all(Object.entries(object).map(async ([key, value]) => {
             resolvedObject[key] = await value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/executor",
-  "version": "1.2.4",
+  "version": "1.2.5-alpha-20240328143324-239661c7f22ace5ca5539cc5b2e9f2e5fb67b38c",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"

package/typings/execution/execute.d.cts

@@ -204,7 +204,7 @@ export declare const defaultFieldResolver: GraphQLFieldResolver<unknown, unknown
  * Accepts an object with named arguments.
  */
 export declare function subscribe<TData = any, TVariables = any, TContext = any>(args: ExecutionArgs<TData, TVariables, TContext>): MaybePromise<AsyncGenerator<SingularExecutionResult<TData> | InitialIncrementalExecutionResult<TData> | SubsequentIncrementalExecutionResult<TData>, void, void> | SingularExecutionResult<TData>>;
-export declare function flattenIncrementalResults<TData>(incrementalResults: IncrementalExecutionResults<TData>, signal?: AbortSignal): AsyncGenerator<SubsequentIncrementalExecutionResult<TData, Record<string, unknown>>, void, void>;
+export declare function flattenIncrementalResults<TData>(incrementalResults: IncrementalExecutionResults<TData>): AsyncGenerator<SubsequentIncrementalExecutionResult<TData, Record<string, unknown>>, void, void>;
 declare class DeferredFragmentRecord {
     type: 'defer';
     errors: Array<GraphQLError>;
@@ -216,7 +216,6 @@ 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;
@@ -224,7 +223,6 @@ declare class DeferredFragmentRecord {
         exeContext: ExecutionContext;
     });
     addData(data: MaybePromise<Record<string, unknown> | null>): void;
-    cancel(reason: unknown): void;
 }
 declare class StreamRecord {
     type: 'stream';
@@ -239,7 +237,6 @@ 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;
@@ -249,7 +246,6 @@ 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

@@ -204,7 +204,7 @@ export declare const defaultFieldResolver: GraphQLFieldResolver<unknown, unknown
  * Accepts an object with named arguments.
  */
 export declare function subscribe<TData = any, TVariables = any, TContext = any>(args: ExecutionArgs<TData, TVariables, TContext>): MaybePromise<AsyncGenerator<SingularExecutionResult<TData> | InitialIncrementalExecutionResult<TData> | SubsequentIncrementalExecutionResult<TData>, void, void> | SingularExecutionResult<TData>>;
-export declare function flattenIncrementalResults<TData>(incrementalResults: IncrementalExecutionResults<TData>, signal?: AbortSignal): AsyncGenerator<SubsequentIncrementalExecutionResult<TData, Record<string, unknown>>, void, void>;
+export declare function flattenIncrementalResults<TData>(incrementalResults: IncrementalExecutionResults<TData>): AsyncGenerator<SubsequentIncrementalExecutionResult<TData, Record<string, unknown>>, void, void>;
 declare class DeferredFragmentRecord {
     type: 'defer';
     errors: Array<GraphQLError>;
@@ -216,7 +216,6 @@ 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;
@@ -224,7 +223,6 @@ declare class DeferredFragmentRecord {
         exeContext: ExecutionContext;
     });
     addData(data: MaybePromise<Record<string, unknown> | null>): void;
-    cancel(reason: unknown): void;
 }
 declare class StreamRecord {
     type: 'stream';
@@ -239,7 +237,6 @@ 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;
@@ -249,7 +246,6 @@ declare class StreamRecord {
     });
     addItems(items: MaybePromise<Array<unknown> | null>): void;
     setIsCompletedIterator(): void;
-    cancel(reason: unknown): void;
 }
 type AsyncPayloadRecord = DeferredFragmentRecord | StreamRecord;
 /**