@graphql-tools/executor 1.2.3 → 1.2.4-rc-20240322082015-3ea3fdfe4b4811657bcf474a0bf7b1187f3c4c09

package/cjs/execution/execute.js

@@ -51,6 +51,9 @@ function execute(args) {
 }
 exports.execute = execute;
 function executeImpl(exeContext) {
+    if (exeContext.signal?.aborted) {
+        throw exeContext.signal.reason;
+    }
     // Return a Promise that will eventually resolve to the data described by
     // The "Response" section of the GraphQL specification.
     //
@@ -62,7 +65,7 @@ function executeImpl(exeContext) {
     // Errors from sub-fields of a NonNull type may propagate to the top level,
     // at which point we still log the error and null the parent field, which
     // in this case is the entire response.
-    return new value_or_promise_1.ValueOrPromise(() => executeOperation(exeContext))
+    const result = new value_or_promise_1.ValueOrPromise(() => executeOperation(exeContext))
         .then(data => {
         const initialResult = buildResponse(data, exeContext.errors);
         if (exeContext.subsequentPayloads.size > 0) {
@@ -80,6 +83,24 @@ function executeImpl(exeContext) {
         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]);
 }
 /**
  * Also implements the "Executing requests" section of the GraphQL specification.

package/esm/execution/execute.js

@@ -47,6 +47,9 @@ export function execute(args) {
     return executeImpl(exeContext);
 }
 function executeImpl(exeContext) {
+    if (exeContext.signal?.aborted) {
+        throw exeContext.signal.reason;
+    }
     // Return a Promise that will eventually resolve to the data described by
     // The "Response" section of the GraphQL specification.
     //
@@ -58,7 +61,7 @@ function executeImpl(exeContext) {
     // Errors from sub-fields of a NonNull type may propagate to the top level,
     // at which point we still log the error and null the parent field, which
     // in this case is the entire response.
-    return new ValueOrPromise(() => executeOperation(exeContext))
+    const result = new ValueOrPromise(() => executeOperation(exeContext))
         .then(data => {
         const initialResult = buildResponse(data, exeContext.errors);
         if (exeContext.subsequentPayloads.size > 0) {
@@ -76,6 +79,24 @@ function executeImpl(exeContext) {
         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]);
 }
 /**
  * Also implements the "Executing requests" section of the GraphQL specification.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/executor",
-  "version": "1.2.3",
+  "version": "1.2.4-rc-20240322082015-3ea3fdfe4b4811657bcf474a0bf7b1187f3c4c09",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"