@graphql-tools/executor 1.3.7 → 1.3.8

package/cjs/execution/execute.js

@@ -390,6 +390,7 @@ function buildResolveInfo(exeContext, fieldDef, fieldNodes, parentType, path) {
         rootValue: exeContext.rootValue,
         operation: exeContext.operation,
         variableValues: exeContext.variableValues,
+        signal: exeContext.signal,
     };
 }
 exports.CRITICAL_ERROR = 'CRITICAL_ERROR';
@@ -501,7 +502,7 @@ function getStreamValues(exeContext, fieldNodes, path) {
 async function completeAsyncIteratorValue(exeContext, itemType, fieldNodes, info, path, iterator, asyncPayloadRecord) {
     exeContext.signal?.addEventListener('abort', () => {
         iterator.return?.();
-    });
+    }, { once: true });
     const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
     const stream = getStreamValues(exeContext, fieldNodes, path);
     let containsPromise = false;
@@ -1191,7 +1192,7 @@ function yieldSubsequentPayloads(exeContext) {
         exeContext.signal?.addEventListener('abort', () => {
             isDone = true;
             reject(exeContext.signal?.reason);
-        });
+        }, { once: true });
     });
     async function next() {
         if (isDone) {
@@ -1240,7 +1241,7 @@ function yieldSubsequentPayloads(exeContext) {
         async throw(error) {
             await returnStreamIterators();
             isDone = true;
-            return Promise.reject(error);
+            throw error;
         },
         async [disposablestack_1.DisposableSymbols.asyncDispose]() {
             await returnStreamIterators();

package/cjs/execution/normalizedExecutor.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.executorFromSchema = void 0;
 exports.normalizedExecutor = normalizedExecutor;
 const graphql_1 = require("graphql");
 const value_or_promise_1 = require("value-or-promise");
+const utils_1 = require("@graphql-tools/utils");
 const execute_js_1 = require("./execute.js");
 function normalizedExecutor(args) {
     const operationAST = (0, graphql_1.getOperationAST)(args.document, args.operationName);
@@ -21,3 +23,16 @@ function normalizedExecutor(args) {
     })
         .resolve();
 }
+exports.executorFromSchema = (0, utils_1.memoize1)(function executorFromSchema(schema) {
+    return function schemaExecutor(request) {
+        return normalizedExecutor({
+            schema,
+            document: request.document,
+            variableValues: request.variables,
+            operationName: request.operationName,
+            rootValue: request.rootValue,
+            contextValue: request.context,
+            signal: request.signal || request.info?.signal,
+        });
+    };
+});

package/esm/execution/execute.js

@@ -378,6 +378,7 @@ export function buildResolveInfo(exeContext, fieldDef, fieldNodes, parentType, p
         rootValue: exeContext.rootValue,
         operation: exeContext.operation,
         variableValues: exeContext.variableValues,
+        signal: exeContext.signal,
     };
 }
 export const CRITICAL_ERROR = 'CRITICAL_ERROR';
@@ -489,7 +490,7 @@ function getStreamValues(exeContext, fieldNodes, path) {
 async function completeAsyncIteratorValue(exeContext, itemType, fieldNodes, info, path, iterator, asyncPayloadRecord) {
     exeContext.signal?.addEventListener('abort', () => {
         iterator.return?.();
-    });
+    }, { once: true });
     const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
     const stream = getStreamValues(exeContext, fieldNodes, path);
     let containsPromise = false;
@@ -1177,7 +1178,7 @@ function yieldSubsequentPayloads(exeContext) {
         exeContext.signal?.addEventListener('abort', () => {
             isDone = true;
             reject(exeContext.signal?.reason);
-        });
+        }, { once: true });
     });
     async function next() {
         if (isDone) {
@@ -1226,7 +1227,7 @@ function yieldSubsequentPayloads(exeContext) {
         async throw(error) {
             await returnStreamIterators();
             isDone = true;
-            return Promise.reject(error);
+            throw error;
         },
         async [DisposableSymbols.asyncDispose]() {
             await returnStreamIterators();

package/esm/execution/normalizedExecutor.js

@@ -1,5 +1,6 @@
 import { getOperationAST } from 'graphql';
 import { ValueOrPromise } from 'value-or-promise';
+import { memoize1, } from '@graphql-tools/utils';
 import { execute, flattenIncrementalResults, subscribe } from './execute.js';
 export function normalizedExecutor(args) {
     const operationAST = getOperationAST(args.document, args.operationName);
@@ -18,3 +19,16 @@ export function normalizedExecutor(args) {
     })
         .resolve();
 }
+export const executorFromSchema = memoize1(function executorFromSchema(schema) {
+    return function schemaExecutor(request) {
+        return normalizedExecutor({
+            schema,
+            document: request.document,
+            variableValues: request.variables,
+            operationName: request.operationName,
+            rootValue: request.rootValue,
+            contextValue: request.context,
+            signal: request.signal || request.info?.signal,
+        });
+    };
+});

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-tools/executor",
-  "version": "1.3.7",
+  "version": "1.3.8",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "^10.6.2",
+    "@graphql-tools/utils": "^10.6.3",
     "@graphql-typed-document-node/core": "^3.2.0",
     "@repeaterjs/repeater": "^3.0.4",
     "@whatwg-node/disposablestack": "^0.0.5",

package/typings/execution/execute.d.cts

@@ -1,5 +1,5 @@
-import { DocumentNode, FieldNode, FragmentDefinitionNode, GraphQLError, GraphQLField, GraphQLFieldResolver, GraphQLFormattedError, GraphQLObjectType, GraphQLResolveInfo, GraphQLSchema, GraphQLTypeResolver, OperationDefinitionNode } from 'graphql';
-import { Maybe, MaybePromise, Path } from '@graphql-tools/utils';
+import { DocumentNode, FieldNode, FragmentDefinitionNode, GraphQLError, GraphQLField, GraphQLFieldResolver, GraphQLFormattedError, GraphQLObjectType, GraphQLSchema, GraphQLTypeResolver, OperationDefinitionNode } from 'graphql';
+import { GraphQLResolveInfo, Maybe, MaybePromise, Path } from '@graphql-tools/utils';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 export interface SingularExecutionResult<TData = any, TExtensions = any> {
     errors?: ReadonlyArray<GraphQLError>;

package/typings/execution/execute.d.ts

@@ -1,5 +1,5 @@
-import { DocumentNode, FieldNode, FragmentDefinitionNode, GraphQLError, GraphQLField, GraphQLFieldResolver, GraphQLFormattedError, GraphQLObjectType, GraphQLResolveInfo, GraphQLSchema, GraphQLTypeResolver, OperationDefinitionNode } from 'graphql';
-import { Maybe, MaybePromise, Path } from '@graphql-tools/utils';
+import { DocumentNode, FieldNode, FragmentDefinitionNode, GraphQLError, GraphQLField, GraphQLFieldResolver, GraphQLFormattedError, GraphQLObjectType, GraphQLSchema, GraphQLTypeResolver, OperationDefinitionNode } from 'graphql';
+import { GraphQLResolveInfo, Maybe, MaybePromise, Path } from '@graphql-tools/utils';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 export interface SingularExecutionResult<TData = any, TExtensions = any> {
     errors?: ReadonlyArray<GraphQLError>;

package/typings/execution/normalizedExecutor.d.cts

@@ -1,3 +1,5 @@
-import { ExecutionResult, MaybeAsyncIterable, MaybePromise } from '@graphql-tools/utils';
+import { GraphQLSchema } from 'graphql';
+import { ExecutionResult, Executor, MaybeAsyncIterable, MaybePromise } from '@graphql-tools/utils';
 import { ExecutionArgs } from './execute.cjs';
 export declare function normalizedExecutor<TData = any, TVariables = any, TContext = any>(args: ExecutionArgs<TData, TVariables, TContext>): MaybePromise<MaybeAsyncIterable<ExecutionResult<TData>>>;
+export declare const executorFromSchema: (schema: GraphQLSchema) => Executor;

package/typings/execution/normalizedExecutor.d.ts

@@ -1,3 +1,5 @@
-import { ExecutionResult, MaybeAsyncIterable, MaybePromise } from '@graphql-tools/utils';
+import { GraphQLSchema } from 'graphql';
+import { ExecutionResult, Executor, MaybeAsyncIterable, MaybePromise } from '@graphql-tools/utils';
 import { ExecutionArgs } from './execute.js';
 export declare function normalizedExecutor<TData = any, TVariables = any, TContext = any>(args: ExecutionArgs<TData, TVariables, TContext>): MaybePromise<MaybeAsyncIterable<ExecutionResult<TData>>>;
+export declare const executorFromSchema: (schema: GraphQLSchema) => Executor;