@graphql-tools/executor 1.4.2 → 1.4.3-alpha-20250226150456-c866968c9e16e4eb2d1460dcbf97397c4a27ca60

package/cjs/execution/execute.js

@@ -150,6 +150,7 @@ exports.getFragmentsFromDocument = (0, utils_1.memoize1)(function getFragmentsFr
  */
 function buildExecutionContext(args) {
     const { schema, document, rootValue, contextValue, variableValues: rawVariableValues, operationName, fieldResolver, typeResolver, subscribeFieldResolver, signal, } = args;
+    signal?.throwIfAborted();
     // If the schema used for execution is invalid, throw an error.
     (0, graphql_1.assertValidSchema)(schema);
     const fragments = (0, exports.getFragmentsFromDocument)(document);
@@ -204,6 +205,28 @@ function buildExecutionContext(args) {
     if (coercedVariableValues.errors) {
         return coercedVariableValues.errors;
     }
+    signal?.throwIfAborted();
+    let onSignalAbort;
+    let signalPromise;
+    if (signal) {
+        const listeners = new Set();
+        const signalDeferred = (0, promise_helpers_1.createDeferredPromise)();
+        signalPromise = signalDeferred.promise;
+        const sharedListener = () => {
+            signalDeferred.reject(signal.reason);
+            signal.removeEventListener('abort', sharedListener);
+        };
+        signal.addEventListener('abort', sharedListener, { once: true });
+        signalPromise.catch(() => {
+            for (const listener of listeners) {
+                listener();
+            }
+            listeners.clear();
+        });
+        onSignalAbort = handler => {
+            listeners.add(handler);
+        };
+    }
     return {
         schema,
         fragments,
@@ -217,6 +240,8 @@ function buildExecutionContext(args) {
         subsequentPayloads: new Set(),
         errors: [],
         signal,
+        onSignalAbort,
+        signalPromise,
     };
 }
 function buildPerEventExecutionContext(exeContext, payload) {
@@ -291,9 +316,9 @@ function executeFields(exeContext, parentType, sourceValue, path, fields, asyncP
         }
     }
     catch (error) {
-        if (containsPromise) {
+        if (error !== exeContext.signal?.reason && containsPromise) {
             // Ensure that any promises returned by other fields are handled, as they may also reject.
-            return (0, promiseForObject_js_1.promiseForObject)(results, exeContext.signal).finally(() => {
+            return (0, promiseForObject_js_1.promiseForObject)(results, exeContext.signal, exeContext.signalPromise).finally(() => {
                 throw error;
             });
         }
@@ -306,7 +331,7 @@ function executeFields(exeContext, parentType, sourceValue, path, fields, asyncP
     // Otherwise, results is a map from field name to the result of resolving that
     // field, which is possibly a promise. Return a promise that will return this
     // same map, but with any promises replaced with the values they resolved to.
-    return (0, promiseForObject_js_1.promiseForObject)(results, exeContext.signal);
+    return (0, promiseForObject_js_1.promiseForObject)(results, exeContext.signal, exeContext.signalPromise);
 }
 /**
  * Implements the "Executing fields" section of the spec
@@ -325,6 +350,7 @@ function executeField(exeContext, parentType, source, fieldNodes, path, asyncPay
     const info = buildResolveInfo(exeContext, fieldDef, fieldNodes, parentType, path);
     // Get the resolve function, regardless of if its result is normal or abrupt (error).
     try {
+        exeContext.signal?.throwIfAborted();
         // Build a JS object of arguments from the field.arguments AST, using the
         // variables scope to fulfill any variable references.
         // TODO: find a way to memoize, in case this field is within a List type.
@@ -506,8 +532,9 @@ function getStreamValues(exeContext, fieldNodes, path) {
  * recursively until all the results are completed.
  */
 async function completeAsyncIteratorValue(exeContext, itemType, fieldNodes, info, path, iterator, asyncPayloadRecord) {
-    if (exeContext.signal && iterator.return) {
-        (0, utils_1.registerAbortSignalListener)(exeContext.signal, () => {
+    exeContext.signal?.throwIfAborted();
+    if (iterator.return) {
+        exeContext.onSignalAbort?.(() => {
             iterator.return?.();
         });
     }
@@ -949,17 +976,20 @@ function executeSubscription(exeContext) {
         const resolveFn = fieldDef.subscribe ?? exeContext.subscribeFieldResolver;
         const result = resolveFn(rootValue, args, contextValue, info);
         if ((0, utils_1.isPromise)(result)) {
-            return result.then(assertEventStream).then(undefined, error => {
+            return result
+                .then(result => assertEventStream(result, exeContext.signal, exeContext.onSignalAbort))
+                .then(undefined, error => {
                 throw (0, graphql_1.locatedError)(error, fieldNodes, (0, utils_1.pathToArray)(path));
             });
         }
-        return assertEventStream(result, exeContext.signal);
+        return assertEventStream(result, exeContext.signal, exeContext.onSignalAbort);
     }
     catch (error) {
         throw (0, graphql_1.locatedError)(error, fieldNodes, (0, utils_1.pathToArray)(path));
     }
 }
-function assertEventStream(result, signal) {
+function assertEventStream(result, signal, onSignalAbort) {
+    signal?.throwIfAborted();
     if (result instanceof Error) {
         throw result;
     }
@@ -967,12 +997,12 @@ function assertEventStream(result, signal) {
     if (!(0, utils_1.isAsyncIterable)(result)) {
         throw (0, utils_1.createGraphQLError)('Subscription field must return Async Iterable. ' + `Received: ${(0, utils_1.inspect)(result)}.`);
     }
-    if (signal) {
+    if (onSignalAbort) {
         return {
             [Symbol.asyncIterator]() {
                 const asyncIterator = result[Symbol.asyncIterator]();
                 if (asyncIterator.return) {
-                    (0, utils_1.registerAbortSignalListener)(signal, () => {
+                    onSignalAbort?.(() => {
                         asyncIterator.return?.();
                     });
                 }
@@ -1200,14 +1230,13 @@ function getCompletedIncrementalResults(exeContext) {
 }
 function yieldSubsequentPayloads(exeContext) {
     let isDone = false;
-    const abortPromise = exeContext.signal ? (0, utils_1.getAbortPromise)(exeContext.signal) : undefined;
     async function next() {
         if (isDone) {
             return { value: undefined, done: true };
         }
         const subSequentPayloadPromises = Array.from(exeContext.subsequentPayloads).map(record => record.promise);
-        if (abortPromise) {
-            await Promise.race([abortPromise, ...subSequentPayloadPromises]);
+        if (exeContext.signalPromise) {
+            await Promise.race([exeContext.signalPromise, ...subSequentPayloadPromises]);
         }
         else {
             await Promise.race(subSequentPayloadPromises);

package/cjs/execution/promiseForObject.js

@@ -9,14 +9,25 @@ const utils_1 = require("@graphql-tools/utils");
  * This is akin to bluebird's `Promise.props`, but implemented only using
  * `Promise.all` so it will work with any implementation of ES6 promises.
  */
-async function promiseForObject(object, signal) {
+function promiseForObject(object, signal, signalPromise) {
+    signal?.throwIfAborted();
     const resolvedObject = Object.create(null);
-    const promises = Promise.all(Object.entries(object).map(async ([key, value]) => {
-        resolvedObject[key] = await value;
-    }));
-    if (signal) {
-        const abortPromise = (0, utils_1.getAbortPromise)(signal);
-        return Promise.race([abortPromise, promises]).then(() => resolvedObject);
+    const promises = [];
+    for (const key in object) {
+        const value = object[key];
+        if ((0, utils_1.isPromise)(value)) {
+            promises.push(value.then(value => {
+                signal?.throwIfAborted();
+                resolvedObject[key] = value;
+            }));
+        }
+        else {
+            resolvedObject[key] = value;
+        }
     }
-    return promises.then(() => resolvedObject);
+    const promiseAll = Promise.all(promises);
+    if (signalPromise) {
+        return Promise.race([signalPromise, promiseAll]).then(() => resolvedObject);
+    }
+    return promiseAll.then(() => resolvedObject);
 }

package/esm/execution/execute.js

@@ -1,7 +1,7 @@
 import { assertValidSchema, getDirectiveValues, GraphQLError, isAbstractType, isLeafType, isListType, isNonNullType, isObjectType, Kind, locatedError, SchemaMetaFieldDef, TypeMetaFieldDef, TypeNameMetaFieldDef, versionInfo, } from 'graphql';
-import { collectSubFields as _collectSubfields, addPath, collectFields, createGraphQLError, fakePromise, getAbortPromise, getArgumentValues, getDefinedRootType, GraphQLStreamDirective, inspect, isAsyncIterable, isIterableObject, isObjectLike, isPromise, mapAsyncIterator, memoize1, memoize3, pathToArray, promiseReduce, registerAbortSignalListener, } from '@graphql-tools/utils';
+import { collectSubFields as _collectSubfields, addPath, collectFields, createGraphQLError, fakePromise, getArgumentValues, getDefinedRootType, GraphQLStreamDirective, inspect, isAsyncIterable, isIterableObject, isObjectLike, isPromise, mapAsyncIterator, memoize1, memoize3, pathToArray, promiseReduce, } from '@graphql-tools/utils';
 import { DisposableSymbols } from '@whatwg-node/disposablestack';
-import { handleMaybePromise } from '@whatwg-node/promise-helpers';
+import { createDeferredPromise, handleMaybePromise } from '@whatwg-node/promise-helpers';
 import { coerceError } from './coerceError.js';
 import { flattenAsyncIterable } from './flattenAsyncIterable.js';
 import { invariant } from './invariant.js';
@@ -137,6 +137,7 @@ export const getFragmentsFromDocument = memoize1(function getFragmentsFromDocume
  */
 export function buildExecutionContext(args) {
     const { schema, document, rootValue, contextValue, variableValues: rawVariableValues, operationName, fieldResolver, typeResolver, subscribeFieldResolver, signal, } = args;
+    signal?.throwIfAborted();
     // If the schema used for execution is invalid, throw an error.
     assertValidSchema(schema);
     const fragments = getFragmentsFromDocument(document);
@@ -191,6 +192,28 @@ export function buildExecutionContext(args) {
     if (coercedVariableValues.errors) {
         return coercedVariableValues.errors;
     }
+    signal?.throwIfAborted();
+    let onSignalAbort;
+    let signalPromise;
+    if (signal) {
+        const listeners = new Set();
+        const signalDeferred = createDeferredPromise();
+        signalPromise = signalDeferred.promise;
+        const sharedListener = () => {
+            signalDeferred.reject(signal.reason);
+            signal.removeEventListener('abort', sharedListener);
+        };
+        signal.addEventListener('abort', sharedListener, { once: true });
+        signalPromise.catch(() => {
+            for (const listener of listeners) {
+                listener();
+            }
+            listeners.clear();
+        });
+        onSignalAbort = handler => {
+            listeners.add(handler);
+        };
+    }
     return {
         schema,
         fragments,
@@ -204,6 +227,8 @@ export function buildExecutionContext(args) {
         subsequentPayloads: new Set(),
         errors: [],
         signal,
+        onSignalAbort,
+        signalPromise,
     };
 }
 function buildPerEventExecutionContext(exeContext, payload) {
@@ -278,9 +303,9 @@ function executeFields(exeContext, parentType, sourceValue, path, fields, asyncP
         }
     }
     catch (error) {
-        if (containsPromise) {
+        if (error !== exeContext.signal?.reason && containsPromise) {
             // Ensure that any promises returned by other fields are handled, as they may also reject.
-            return promiseForObject(results, exeContext.signal).finally(() => {
+            return promiseForObject(results, exeContext.signal, exeContext.signalPromise).finally(() => {
                 throw error;
             });
         }
@@ -293,7 +318,7 @@ function executeFields(exeContext, parentType, sourceValue, path, fields, asyncP
     // Otherwise, results is a map from field name to the result of resolving that
     // field, which is possibly a promise. Return a promise that will return this
     // same map, but with any promises replaced with the values they resolved to.
-    return promiseForObject(results, exeContext.signal);
+    return promiseForObject(results, exeContext.signal, exeContext.signalPromise);
 }
 /**
  * Implements the "Executing fields" section of the spec
@@ -312,6 +337,7 @@ function executeField(exeContext, parentType, source, fieldNodes, path, asyncPay
     const info = buildResolveInfo(exeContext, fieldDef, fieldNodes, parentType, path);
     // Get the resolve function, regardless of if its result is normal or abrupt (error).
     try {
+        exeContext.signal?.throwIfAborted();
         // Build a JS object of arguments from the field.arguments AST, using the
         // variables scope to fulfill any variable references.
         // TODO: find a way to memoize, in case this field is within a List type.
@@ -493,8 +519,9 @@ function getStreamValues(exeContext, fieldNodes, path) {
  * recursively until all the results are completed.
  */
 async function completeAsyncIteratorValue(exeContext, itemType, fieldNodes, info, path, iterator, asyncPayloadRecord) {
-    if (exeContext.signal && iterator.return) {
-        registerAbortSignalListener(exeContext.signal, () => {
+    exeContext.signal?.throwIfAborted();
+    if (iterator.return) {
+        exeContext.onSignalAbort?.(() => {
             iterator.return?.();
         });
     }
@@ -934,17 +961,20 @@ function executeSubscription(exeContext) {
         const resolveFn = fieldDef.subscribe ?? exeContext.subscribeFieldResolver;
         const result = resolveFn(rootValue, args, contextValue, info);
         if (isPromise(result)) {
-            return result.then(assertEventStream).then(undefined, error => {
+            return result
+                .then(result => assertEventStream(result, exeContext.signal, exeContext.onSignalAbort))
+                .then(undefined, error => {
                 throw locatedError(error, fieldNodes, pathToArray(path));
             });
         }
-        return assertEventStream(result, exeContext.signal);
+        return assertEventStream(result, exeContext.signal, exeContext.onSignalAbort);
     }
     catch (error) {
         throw locatedError(error, fieldNodes, pathToArray(path));
     }
 }
-function assertEventStream(result, signal) {
+function assertEventStream(result, signal, onSignalAbort) {
+    signal?.throwIfAborted();
     if (result instanceof Error) {
         throw result;
     }
@@ -952,12 +982,12 @@ function assertEventStream(result, signal) {
     if (!isAsyncIterable(result)) {
         throw createGraphQLError('Subscription field must return Async Iterable. ' + `Received: ${inspect(result)}.`);
     }
-    if (signal) {
+    if (onSignalAbort) {
         return {
             [Symbol.asyncIterator]() {
                 const asyncIterator = result[Symbol.asyncIterator]();
                 if (asyncIterator.return) {
-                    registerAbortSignalListener(signal, () => {
+                    onSignalAbort?.(() => {
                         asyncIterator.return?.();
                     });
                 }
@@ -1185,14 +1215,13 @@ function getCompletedIncrementalResults(exeContext) {
 }
 function yieldSubsequentPayloads(exeContext) {
     let isDone = false;
-    const abortPromise = exeContext.signal ? getAbortPromise(exeContext.signal) : undefined;
     async function next() {
         if (isDone) {
             return { value: undefined, done: true };
         }
         const subSequentPayloadPromises = Array.from(exeContext.subsequentPayloads).map(record => record.promise);
-        if (abortPromise) {
-            await Promise.race([abortPromise, ...subSequentPayloadPromises]);
+        if (exeContext.signalPromise) {
+            await Promise.race([exeContext.signalPromise, ...subSequentPayloadPromises]);
         }
         else {
             await Promise.race(subSequentPayloadPromises);

package/esm/execution/promiseForObject.js

@@ -1,4 +1,4 @@
-import { getAbortPromise } from '@graphql-tools/utils';
+import { isPromise } from '@graphql-tools/utils';
 /**
  * This function transforms a JS object `Record<string, Promise<T>>` into
  * a `Promise<Record<string, T>>`
@@ -6,14 +6,25 @@ import { getAbortPromise } from '@graphql-tools/utils';
  * This is akin to bluebird's `Promise.props`, but implemented only using
  * `Promise.all` so it will work with any implementation of ES6 promises.
  */
-export async function promiseForObject(object, signal) {
+export function promiseForObject(object, signal, signalPromise) {
+    signal?.throwIfAborted();
     const resolvedObject = Object.create(null);
-    const promises = Promise.all(Object.entries(object).map(async ([key, value]) => {
-        resolvedObject[key] = await value;
-    }));
-    if (signal) {
-        const abortPromise = getAbortPromise(signal);
-        return Promise.race([abortPromise, promises]).then(() => resolvedObject);
+    const promises = [];
+    for (const key in object) {
+        const value = object[key];
+        if (isPromise(value)) {
+            promises.push(value.then(value => {
+                signal?.throwIfAborted();
+                resolvedObject[key] = value;
+            }));
+        }
+        else {
+            resolvedObject[key] = value;
+        }
     }
-    return promises.then(() => resolvedObject);
+    const promiseAll = Promise.all(promises);
+    if (signalPromise) {
+        return Promise.race([signalPromise, promiseAll]).then(() => resolvedObject);
+    }
+    return promiseAll.then(() => resolvedObject);
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-tools/executor",
-  "version": "1.4.2",
+  "version": "1.4.3-alpha-20250226150456-c866968c9e16e4eb2d1460dcbf97397c4a27ca60",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "^10.8.3",
+    "@graphql-tools/utils": "10.8.4-alpha-20250226150456-c866968c9e16e4eb2d1460dcbf97397c4a27ca60",
     "@graphql-typed-document-node/core": "^3.2.0",
     "@repeaterjs/repeater": "^3.0.4",
     "@whatwg-node/disposablestack": "^0.0.6",

package/typings/execution/execute.d.cts

@@ -44,6 +44,8 @@ export interface ExecutionContext<TVariables = any, TContext = any> {
     errors: Array<GraphQLError>;
     subsequentPayloads: Set<AsyncPayloadRecord>;
     signal?: AbortSignal;
+    onSignalAbort?(handler: () => void): void;
+    signalPromise?: Promise<never>;
 }
 export interface FormattedExecutionResult<TData = Record<string, unknown>, TExtensions = Record<string, unknown>> {
     errors?: ReadonlyArray<GraphQLFormattedError>;

package/typings/execution/execute.d.ts

@@ -44,6 +44,8 @@ export interface ExecutionContext<TVariables = any, TContext = any> {
     errors: Array<GraphQLError>;
     subsequentPayloads: Set<AsyncPayloadRecord>;
     signal?: AbortSignal;
+    onSignalAbort?(handler: () => void): void;
+    signalPromise?: Promise<never>;
 }
 export interface FormattedExecutionResult<TData = Record<string, unknown>, TExtensions = Record<string, unknown>> {
     errors?: ReadonlyArray<GraphQLFormattedError>;

package/typings/execution/promiseForObject.d.cts

@@ -8,5 +8,5 @@ type ResolvedObject<TData> = {
  * This is akin to bluebird's `Promise.props`, but implemented only using
  * `Promise.all` so it will work with any implementation of ES6 promises.
  */
-export declare function promiseForObject<TData>(object: TData, signal?: AbortSignal): Promise<ResolvedObject<TData>>;
+export declare function promiseForObject<TData>(object: TData, signal?: AbortSignal, signalPromise?: Promise<never>): Promise<ResolvedObject<TData>>;
 export {};

package/typings/execution/promiseForObject.d.ts

@@ -8,5 +8,5 @@ type ResolvedObject<TData> = {
  * This is akin to bluebird's `Promise.props`, but implemented only using
  * `Promise.all` so it will work with any implementation of ES6 promises.
  */
-export declare function promiseForObject<TData>(object: TData, signal?: AbortSignal): Promise<ResolvedObject<TData>>;
+export declare function promiseForObject<TData>(object: TData, signal?: AbortSignal, signalPromise?: Promise<never>): Promise<ResolvedObject<TData>>;
 export {};