@graphql-tools/executor 1.3.6 → 1.3.7-alpha-20241209101052-b0932c49214ceb915e4bebbab82ae2fee9dfba47

package/cjs/execution/coerceError.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.coerceError = void 0;
+exports.coerceError = coerceError;
 function coerceError(error) {
     if (error instanceof Error) {
         return error;
@@ -23,4 +23,3 @@ function coerceError(error) {
     }
     return new Error(String(error));
 }
-exports.coerceError = coerceError;

package/cjs/execution/execute.js

@@ -1,9 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isIncrementalResult = exports.getFieldDef = exports.flattenIncrementalResults = exports.subscribe = exports.defaultFieldResolver = exports.defaultTypeResolver = exports.CRITICAL_ERROR = exports.buildResolveInfo = exports.buildExecutionContext = exports.getFragmentsFromDocument = exports.assertValidExecutionArguments = exports.executeSync = exports.execute = void 0;
+exports.defaultFieldResolver = exports.defaultTypeResolver = exports.CRITICAL_ERROR = exports.getFragmentsFromDocument = void 0;
+exports.execute = execute;
+exports.executeSync = executeSync;
+exports.assertValidExecutionArguments = assertValidExecutionArguments;
+exports.buildExecutionContext = buildExecutionContext;
+exports.buildResolveInfo = buildResolveInfo;
+exports.subscribe = subscribe;
+exports.flattenIncrementalResults = flattenIncrementalResults;
+exports.getFieldDef = getFieldDef;
+exports.isIncrementalResult = isIncrementalResult;
 const graphql_1 = require("graphql");
 const value_or_promise_1 = require("value-or-promise");
 const utils_1 = require("@graphql-tools/utils");
+const disposablestack_1 = require("@whatwg-node/disposablestack");
 const coerceError_js_1 = require("./coerceError.js");
 const flattenAsyncIterable_js_1 = require("./flattenAsyncIterable.js");
 const invariant_js_1 = require("./invariant.js");
@@ -50,7 +60,6 @@ function execute(args) {
     }
     return executeImpl(exeContext);
 }
-exports.execute = execute;
 function executeImpl(exeContext) {
     if (exeContext.signal?.aborted) {
         throw exeContext.signal.reason;
@@ -107,7 +116,6 @@ function executeSync(args) {
     }
     return result;
 }
-exports.executeSync = executeSync;
 /**
  * Given a completed execution context and data, build the `{ errors, data }`
  * response defined by the "Response" section of the GraphQL specification.
@@ -128,7 +136,6 @@ function assertValidExecutionArguments(schema, document, rawVariableValues) {
     // Variables, if provided, must be an object.
     console.assert(rawVariableValues == null || (0, utils_1.isObjectLike)(rawVariableValues), 'Variables must be provided as an Object where each property is a variable value. Perhaps look to see if an unparsed JSON string was provided.');
 }
-exports.assertValidExecutionArguments = assertValidExecutionArguments;
 exports.getFragmentsFromDocument = (0, utils_1.memoize1)(function getFragmentsFromDocument(document) {
     const fragments = Object.create(null);
     for (const definition of document.definitions) {
@@ -202,7 +209,6 @@ function buildExecutionContext(args) {
         signal,
     };
 }
-exports.buildExecutionContext = buildExecutionContext;
 function buildPerEventExecutionContext(exeContext, payload) {
     return {
         ...exeContext,
@@ -386,7 +392,6 @@ function buildResolveInfo(exeContext, fieldDef, fieldNodes, parentType, path) {
         variableValues: exeContext.variableValues,
     };
 }
-exports.buildResolveInfo = buildResolveInfo;
 exports.CRITICAL_ERROR = 'CRITICAL_ERROR';
 function handleFieldError(error, returnType, errors) {
     // If the field type is non-nullable, then it is resolved without any
@@ -824,7 +829,6 @@ function subscribe(args) {
     }
     return mapSourceToResponse(exeContext, resultOrStream);
 }
-exports.subscribe = subscribe;
 function flattenIncrementalResults(incrementalResults) {
     const subsequentIterator = incrementalResults.subsequentResults;
     let initialResultSent = false;
@@ -854,9 +858,12 @@ function flattenIncrementalResults(incrementalResults) {
             done = true;
             return subsequentIterator.throw(error);
         },
+        [disposablestack_1.DisposableSymbols.asyncDispose]() {
+            done = true;
+            return subsequentIterator?.[disposablestack_1.DisposableSymbols.asyncDispose]?.();
+        },
     };
 }
-exports.flattenIncrementalResults = flattenIncrementalResults;
 async function* ensureAsyncIterable(someExecutionResult) {
     if ('initialResult' in someExecutionResult) {
         yield* flattenIncrementalResults(someExecutionResult);
@@ -1235,6 +1242,10 @@ function yieldSubsequentPayloads(exeContext) {
             isDone = true;
             return Promise.reject(error);
         },
+        async [disposablestack_1.DisposableSymbols.asyncDispose]() {
+            await returnStreamIterators();
+            isDone = true;
+        },
     };
 }
 class DeferredFragmentRecord {
@@ -1349,8 +1360,6 @@ function getFieldDef(schema, parentType, fieldNode) {
     }
     return parentType.getFields()[fieldName];
 }
-exports.getFieldDef = getFieldDef;
 function isIncrementalResult(result) {
     return 'incremental' in result;
 }
-exports.isIncrementalResult = isIncrementalResult;

package/cjs/execution/flattenAsyncIterable.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.flattenAsyncIterable = void 0;
+exports.flattenAsyncIterable = flattenAsyncIterable;
+const disposablestack_1 = require("@whatwg-node/disposablestack");
 /**
  * Given an AsyncIterable of AsyncIterables, flatten all yielded results into a
  * single AsyncIterable.
@@ -84,6 +85,12 @@ function flattenAsyncIterable(iterable) {
         [Symbol.asyncIterator]() {
             return this;
         },
+        async [disposablestack_1.DisposableSymbols.asyncDispose]() {
+            done = true;
+            await Promise.all([
+                currentNestedIterator?.[disposablestack_1.DisposableSymbols.asyncDispose]?.(),
+                topIterator?.[disposablestack_1.DisposableSymbols.asyncDispose]?.(),
+            ]);
+        },
     };
 }
-exports.flattenAsyncIterable = flattenAsyncIterable;

package/cjs/execution/invariant.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.invariant = void 0;
+exports.invariant = invariant;
 function invariant(condition, message) {
     if (!condition) {
         throw new Error(message != null ? message : 'Unexpected invariant triggered.');
     }
 }
-exports.invariant = invariant;

package/cjs/execution/normalizedExecutor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizedExecutor = void 0;
+exports.normalizedExecutor = normalizedExecutor;
 const graphql_1 = require("graphql");
 const value_or_promise_1 = require("value-or-promise");
 const execute_js_1 = require("./execute.js");
@@ -21,4 +21,3 @@ function normalizedExecutor(args) {
     })
         .resolve();
 }
-exports.normalizedExecutor = normalizedExecutor;

package/cjs/execution/promiseForObject.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promiseForObject = void 0;
+exports.promiseForObject = promiseForObject;
 /**
  * This function transforms a JS object `Record<string, Promise<T>>` into
  * a `Promise<Record<string, T>>`
@@ -20,4 +20,3 @@ async function promiseForObject(object, signal) {
     });
     return resolvedObject;
 }
-exports.promiseForObject = promiseForObject;

package/cjs/execution/values.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVariableValues = void 0;
+exports.getVariableValues = getVariableValues;
 const graphql_1 = require("graphql");
 const utils_1 = require("@graphql-tools/utils");
 /**
@@ -29,10 +29,8 @@ function getVariableValues(schema, varDefNodes, inputs, options) {
     catch (error) {
         errors.push(error);
     }
-    // @ts-expect-error - We know that errors is an array of GraphQLError.
     return { errors };
 }
-exports.getVariableValues = getVariableValues;
 function coerceVariableValues(schema, varDefNodes, inputs, onError) {
     const coercedValues = {};
     for (const varDefNode of varDefNodes) {

package/esm/execution/execute.js

@@ -1,6 +1,7 @@
 import { assertValidSchema, getDirectiveValues, GraphQLError, isAbstractType, isLeafType, isListType, isNonNullType, isObjectType, Kind, locatedError, SchemaMetaFieldDef, TypeMetaFieldDef, TypeNameMetaFieldDef, versionInfo, } from 'graphql';
 import { ValueOrPromise } from 'value-or-promise';
 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 { coerceError } from './coerceError.js';
 import { flattenAsyncIterable } from './flattenAsyncIterable.js';
 import { invariant } from './invariant.js';
@@ -843,6 +844,10 @@ export function flattenIncrementalResults(incrementalResults) {
             done = true;
             return subsequentIterator.throw(error);
         },
+        [DisposableSymbols.asyncDispose]() {
+            done = true;
+            return subsequentIterator?.[DisposableSymbols.asyncDispose]?.();
+        },
     };
 }
 async function* ensureAsyncIterable(someExecutionResult) {
@@ -1223,6 +1228,10 @@ function yieldSubsequentPayloads(exeContext) {
             isDone = true;
             return Promise.reject(error);
         },
+        async [DisposableSymbols.asyncDispose]() {
+            await returnStreamIterators();
+            isDone = true;
+        },
     };
 }
 class DeferredFragmentRecord {

package/esm/execution/flattenAsyncIterable.js

@@ -1,3 +1,4 @@
+import { DisposableSymbols } from '@whatwg-node/disposablestack';
 /**
  * Given an AsyncIterable of AsyncIterables, flatten all yielded results into a
  * single AsyncIterable.
@@ -81,5 +82,12 @@ export function flattenAsyncIterable(iterable) {
         [Symbol.asyncIterator]() {
             return this;
         },
+        async [DisposableSymbols.asyncDispose]() {
+            done = true;
+            await Promise.all([
+                currentNestedIterator?.[DisposableSymbols.asyncDispose]?.(),
+                topIterator?.[DisposableSymbols.asyncDispose]?.(),
+            ]);
+        },
     };
 }

package/esm/execution/values.js

@@ -26,7 +26,6 @@ export function getVariableValues(schema, varDefNodes, inputs, options) {
     catch (error) {
         errors.push(error);
     }
-    // @ts-expect-error - We know that errors is an array of GraphQLError.
     return { errors };
 }
 function coerceVariableValues(schema, varDefNodes, inputs, onError) {

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@graphql-tools/executor",
-  "version": "1.3.6",
+  "version": "1.3.7-alpha-20241209101052-b0932c49214ceb915e4bebbab82ae2fee9dfba47",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
     "@graphql-tools/utils": "^10.6.2",
-    "@graphql-typed-document-node/core": "3.2.0",
+    "@graphql-typed-document-node/core": "^3.2.0",
     "@repeaterjs/repeater": "^3.0.4",
+    "@whatwg-node/disposablestack": "^0.0.5",
     "tslib": "^2.4.0",
     "value-or-promise": "^1.0.12"
   },