@graphql-tools/executor 1.5.7 → 1.5.8-alpha-20260805104220-afd9ce934fb96bca17c99dca2e98db84c0b782c1

package/cjs/execution/execute.js

@@ -19,7 +19,6 @@ const coerceError_js_1 = require("./coerceError.js");
 const flattenAsyncIterable_js_1 = require("./flattenAsyncIterable.js");
 const invariant_js_1 = require("./invariant.js");
 const promiseForObject_js_1 = require("./promiseForObject.js");
-const values_js_1 = require("./values.js");
 /**
  * A memoized collection of relevant subfields with regard to the return
  * type. Memoizing ensures the subfields are not repeatedly calculated, which
@@ -199,7 +198,7 @@ function buildExecutionContext(args) {
     // FIXME: https://github.com/graphql/graphql-js/issues/2203
     /* c8 ignore next */
     const variableDefinitions = operation.variableDefinitions ?? [];
-    const coercedVariableValues = (0, values_js_1.getVariableValues)(schema, variableDefinitions, rawVariableValues ?? {}, {
+    const coercedVariableValues = (0, graphql_1.getVariableValues)(schema, variableDefinitions, rawVariableValues ?? {}, {
         maxErrors: 50,
     });
     if (coercedVariableValues.errors) {
@@ -227,13 +226,26 @@ function buildExecutionContext(args) {
             listeners.add(handler);
         };
     }
+    // If GraphQL v17, use `variableValues`
+    let variableValues;
+    if (graphql_1.versionInfo.major >= 17) {
+        variableValues = coercedVariableValues.variableValues;
+        // Older versions use `coerced`
+    }
+    else {
+        variableValues = {
+            coerced: coercedVariableValues.coerced,
+            sources: {},
+            errors: coercedVariableValues.errors,
+        };
+    }
     return {
         schema,
         fragments,
         rootValue,
         contextValue,
         operation,
-        variableValues: coercedVariableValues.coerced,
+        variableValues,
         fieldResolver: fieldResolver ?? exports.defaultFieldResolver,
         typeResolver: typeResolver ?? exports.defaultTypeResolver,
         subscribeFieldResolver: subscribeFieldResolver ?? exports.defaultFieldResolver,
@@ -357,7 +369,7 @@ function executeField(exeContext, parentType, source, fieldNodes, path, asyncPay
         // 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.
-        const args = (0, utils_1.getArgumentValues)(fieldDef, fieldNodes[0], exeContext.variableValues);
+        const args = (0, utils_1.getArgumentValues)(fieldDef, fieldNodes[0], exeContext.variableValues.coerced);
         // The resolve function's optional third argument is a context value that
         // is provided to every resolve function within an execution. It is commonly
         // used to represent an authenticated user, or request-specific caches.
@@ -418,6 +430,10 @@ function executeField(exeContext, parentType, source, fieldNodes, path, asyncPay
 function buildResolveInfo(exeContext, fieldDef, fieldNodes, parentType, path) {
     // The resolve function's optional fourth argument is a collection of
     // information about the current execution state.
+    // GraphQL.js v17 requires getAbortSignal / getAsyncHelpers on GraphQLResolveInfo.
+    // track() mirrors Yoga/Cloudflare waitUntil via context.waitUntil when available.
+    let asyncHelpers;
+    const variableValues = graphql_1.versionInfo.major >= 17 ? exeContext.variableValues : exeContext.variableValues.coerced;
     return {
         fieldName: fieldDef.name,
         fieldNodes,
@@ -428,8 +444,23 @@ function buildResolveInfo(exeContext, fieldDef, fieldNodes, parentType, path) {
         fragments: exeContext.fragments,
         rootValue: exeContext.rootValue,
         operation: exeContext.operation,
-        variableValues: exeContext.variableValues,
+        variableValues: variableValues,
         signal: exeContext.signal,
+        getAbortSignal: () => exeContext.signal,
+        getAsyncHelpers: () => (asyncHelpers ??= {
+            promiseAll: Promise.all.bind(Promise),
+            track: maybePromises => {
+                const waitUntil = exeContext.contextValue?.waitUntil;
+                if (typeof waitUntil !== 'function') {
+                    return;
+                }
+                for (const value of maybePromises) {
+                    if ((0, utils_1.isPromise)(value)) {
+                        waitUntil(value);
+                    }
+                }
+            },
+        }),
     };
 }
 exports.CRITICAL_ERROR = 'CRITICAL_ERROR';
@@ -520,7 +551,7 @@ function getStreamValues(exeContext, fieldNodes, path) {
     }
     // validation only allows equivalent streams on multiple fields, so it is
     // safe to only check the first fieldNode for the stream directive
-    const stream = (0, graphql_1.getDirectiveValues)(utils_1.GraphQLStreamDirective, fieldNodes[0], exeContext.variableValues);
+    const stream = (0, utils_1.getDirectiveValues)(utils_1.GraphQLStreamDirective, fieldNodes[0], exeContext.variableValues);
     if (!stream) {
         return;
     }
@@ -973,7 +1004,7 @@ function executeSubscription(exeContext) {
         // It differs from "ResolveFieldValue" due to providing a different `resolveFn`.
         // Build a JS object of arguments from the field.arguments AST, using the
         // variables scope to fulfill any variable references.
-        const args = (0, utils_1.getArgumentValues)(fieldDef, fieldNodes[0], variableValues);
+        const args = (0, utils_1.getArgumentValues)(fieldDef, fieldNodes[0], variableValues.coerced);
         // The resolve function's optional third argument is a context value that
         // is provided to every resolve function within an execution. It is commonly
         // used to represent an authenticated user, or request-specific caches.

package/cjs/execution/values.js

@@ -2,77 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVariableValues = getVariableValues;
 const graphql_1 = require("graphql");
-const utils_1 = require("@graphql-tools/utils");
-/**
- * Prepares an object map of variableValues of the correct type based on the
- * provided variable definitions and arbitrary input. If the input cannot be
- * parsed to match the variable definitions, a GraphQLError will be thrown.
- *
- * Note: The returned value is a plain Object with a prototype, since it is
- * exposed to user code. Care should be taken to not pull values from the
- * Object prototype.
- */
 function getVariableValues(schema, varDefNodes, inputs, options) {
-    const errors = [];
-    const maxErrors = options?.maxErrors;
-    try {
-        const coerced = coerceVariableValues(schema, varDefNodes, inputs, error => {
-            if (maxErrors != null && errors.length >= maxErrors) {
-                throw (0, utils_1.createGraphQLError)('Too many errors processing variables, error limit reached. Execution aborted.');
-            }
-            errors.push(error);
-        });
-        if (errors.length === 0) {
-            return { coerced };
-        }
+    const result = (0, graphql_1.getVariableValues)(schema, varDefNodes, inputs, options);
+    if (result.errors?.length) {
+        return { errors: result.errors };
     }
-    catch (error) {
-        errors.push(error);
+    if (graphql_1.versionInfo.major >= 17) {
+        return result.variableValues;
     }
-    return { errors };
-}
-function coerceVariableValues(schema, varDefNodes, inputs, onError) {
-    const coercedValues = {};
-    for (const varDefNode of varDefNodes) {
-        const varName = varDefNode.variable.name.value;
-        const varType = (0, graphql_1.typeFromAST)(schema, varDefNode.type);
-        if (!(0, graphql_1.isInputType)(varType)) {
-            // Must use input types for variables. This should be caught during
-            // validation, however is checked again here for safety.
-            const varTypeStr = (0, graphql_1.print)(varDefNode.type);
-            onError((0, utils_1.createGraphQLError)(`Variable "$${varName}" expected value of type "${varTypeStr}" which cannot be used as an input type.`, { nodes: varDefNode.type }));
-            continue;
-        }
-        if (!(0, utils_1.hasOwnProperty)(inputs, varName)) {
-            if (varDefNode.defaultValue) {
-                coercedValues[varName] = (0, graphql_1.valueFromAST)(varDefNode.defaultValue, varType);
-            }
-            else if ((0, graphql_1.isNonNullType)(varType)) {
-                const varTypeStr = (0, utils_1.inspect)(varType);
-                onError((0, utils_1.createGraphQLError)(`Variable "$${varName}" of required type "${varTypeStr}" was not provided.`, {
-                    nodes: varDefNode,
-                }));
-            }
-            continue;
-        }
-        const value = inputs[varName];
-        if (value === null && (0, graphql_1.isNonNullType)(varType)) {
-            const varTypeStr = (0, utils_1.inspect)(varType);
-            onError((0, utils_1.createGraphQLError)(`Variable "$${varName}" of non-null type "${varTypeStr}" must not be null.`, {
-                nodes: varDefNode,
-            }));
-            continue;
-        }
-        coercedValues[varName] = (0, graphql_1.coerceInputValue)(value, varType, (path, invalidValue, error) => {
-            let prefix = `Variable "$${varName}" got invalid value ` + (0, utils_1.inspect)(invalidValue);
-            if (path.length > 0) {
-                prefix += ` at "${varName}${(0, utils_1.printPathArray)(path)}"`;
-            }
-            onError((0, utils_1.createGraphQLError)(prefix + '; ' + error.message, {
-                nodes: varDefNode,
-                originalError: error,
-            }));
-        });
-    }
-    return coercedValues;
+    return result;
 }

package/esm/execution/execute.js

@@ -1,12 +1,11 @@
-import { assertValidSchema, getDirectiveValues, GraphQLError, isAbstractType, isLeafType, isListType, isNonNullType, isObjectType, Kind, SchemaMetaFieldDef, TypeMetaFieldDef, TypeNameMetaFieldDef, versionInfo, } from 'graphql';
-import { collectSubFields as _collectSubfields, addPath, collectFields, createGraphQLError, fakePromise, getArgumentValues, getDefinedRootType, GraphQLStreamDirective, inspect, isAsyncIterable, isIterableObject, isObjectLike, isPromise, locatedError, mapAsyncIterator, memoize1, memoize3, pathToArray, promiseReduce, } from '@graphql-tools/utils';
+import { assertValidSchema, getVariableValues, GraphQLError, isAbstractType, isLeafType, isListType, isNonNullType, isObjectType, Kind, SchemaMetaFieldDef, TypeMetaFieldDef, TypeNameMetaFieldDef, versionInfo, } from 'graphql';
+import { collectSubFields as _collectSubfields, addPath, collectFields, createGraphQLError, fakePromise, getArgumentValues, getDefinedRootType, getDirectiveValues, GraphQLStreamDirective, inspect, isAsyncIterable, isIterableObject, isObjectLike, isPromise, locatedError, mapAsyncIterator, memoize1, memoize3, pathToArray, promiseReduce, } from '@graphql-tools/utils';
 import { DisposableSymbols } from '@whatwg-node/disposablestack';
 import { createDeferredPromise, handleMaybePromise } from '@whatwg-node/promise-helpers';
 import { coerceError } from './coerceError.js';
 import { flattenAsyncIterable } from './flattenAsyncIterable.js';
 import { invariant } from './invariant.js';
 import { promiseForObject } from './promiseForObject.js';
-import { getVariableValues } from './values.js';
 /**
  * A memoized collection of relevant subfields with regard to the return
  * type. Memoizing ensures the subfields are not repeatedly calculated, which
@@ -214,13 +213,26 @@ export function buildExecutionContext(args) {
             listeners.add(handler);
         };
     }
+    // If GraphQL v17, use `variableValues`
+    let variableValues;
+    if (versionInfo.major >= 17) {
+        variableValues = coercedVariableValues.variableValues;
+        // Older versions use `coerced`
+    }
+    else {
+        variableValues = {
+            coerced: coercedVariableValues.coerced,
+            sources: {},
+            errors: coercedVariableValues.errors,
+        };
+    }
     return {
         schema,
         fragments,
         rootValue,
         contextValue,
         operation,
-        variableValues: coercedVariableValues.coerced,
+        variableValues,
         fieldResolver: fieldResolver ?? defaultFieldResolver,
         typeResolver: typeResolver ?? defaultTypeResolver,
         subscribeFieldResolver: subscribeFieldResolver ?? defaultFieldResolver,
@@ -344,7 +356,7 @@ function executeField(exeContext, parentType, source, fieldNodes, path, asyncPay
         // 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.
-        const args = getArgumentValues(fieldDef, fieldNodes[0], exeContext.variableValues);
+        const args = getArgumentValues(fieldDef, fieldNodes[0], exeContext.variableValues.coerced);
         // The resolve function's optional third argument is a context value that
         // is provided to every resolve function within an execution. It is commonly
         // used to represent an authenticated user, or request-specific caches.
@@ -405,6 +417,10 @@ function executeField(exeContext, parentType, source, fieldNodes, path, asyncPay
 export function buildResolveInfo(exeContext, fieldDef, fieldNodes, parentType, path) {
     // The resolve function's optional fourth argument is a collection of
     // information about the current execution state.
+    // GraphQL.js v17 requires getAbortSignal / getAsyncHelpers on GraphQLResolveInfo.
+    // track() mirrors Yoga/Cloudflare waitUntil via context.waitUntil when available.
+    let asyncHelpers;
+    const variableValues = versionInfo.major >= 17 ? exeContext.variableValues : exeContext.variableValues.coerced;
     return {
         fieldName: fieldDef.name,
         fieldNodes,
@@ -415,8 +431,23 @@ export function buildResolveInfo(exeContext, fieldDef, fieldNodes, parentType, p
         fragments: exeContext.fragments,
         rootValue: exeContext.rootValue,
         operation: exeContext.operation,
-        variableValues: exeContext.variableValues,
+        variableValues: variableValues,
         signal: exeContext.signal,
+        getAbortSignal: () => exeContext.signal,
+        getAsyncHelpers: () => (asyncHelpers ??= {
+            promiseAll: Promise.all.bind(Promise),
+            track: maybePromises => {
+                const waitUntil = exeContext.contextValue?.waitUntil;
+                if (typeof waitUntil !== 'function') {
+                    return;
+                }
+                for (const value of maybePromises) {
+                    if (isPromise(value)) {
+                        waitUntil(value);
+                    }
+                }
+            },
+        }),
     };
 }
 export const CRITICAL_ERROR = 'CRITICAL_ERROR';
@@ -958,7 +989,7 @@ function executeSubscription(exeContext) {
         // It differs from "ResolveFieldValue" due to providing a different `resolveFn`.
         // Build a JS object of arguments from the field.arguments AST, using the
         // variables scope to fulfill any variable references.
-        const args = getArgumentValues(fieldDef, fieldNodes[0], variableValues);
+        const args = getArgumentValues(fieldDef, fieldNodes[0], variableValues.coerced);
         // The resolve function's optional third argument is a context value that
         // is provided to every resolve function within an execution. It is commonly
         // used to represent an authenticated user, or request-specific caches.

package/esm/execution/values.js

@@ -1,75 +1,11 @@
-import { coerceInputValue, isInputType, isNonNullType, print, typeFromAST, valueFromAST, } from 'graphql';
-import { createGraphQLError, hasOwnProperty, inspect, printPathArray } from '@graphql-tools/utils';
-/**
- * Prepares an object map of variableValues of the correct type based on the
- * provided variable definitions and arbitrary input. If the input cannot be
- * parsed to match the variable definitions, a GraphQLError will be thrown.
- *
- * Note: The returned value is a plain Object with a prototype, since it is
- * exposed to user code. Care should be taken to not pull values from the
- * Object prototype.
- */
+import { getVariableValues as graphqlGetVariableValues, versionInfo, } from 'graphql';
 export function getVariableValues(schema, varDefNodes, inputs, options) {
-    const errors = [];
-    const maxErrors = options?.maxErrors;
-    try {
-        const coerced = coerceVariableValues(schema, varDefNodes, inputs, error => {
-            if (maxErrors != null && errors.length >= maxErrors) {
-                throw createGraphQLError('Too many errors processing variables, error limit reached. Execution aborted.');
-            }
-            errors.push(error);
-        });
-        if (errors.length === 0) {
-            return { coerced };
-        }
+    const result = graphqlGetVariableValues(schema, varDefNodes, inputs, options);
+    if (result.errors?.length) {
+        return { errors: result.errors };
     }
-    catch (error) {
-        errors.push(error);
+    if (versionInfo.major >= 17) {
+        return result.variableValues;
     }
-    return { errors };
-}
-function coerceVariableValues(schema, varDefNodes, inputs, onError) {
-    const coercedValues = {};
-    for (const varDefNode of varDefNodes) {
-        const varName = varDefNode.variable.name.value;
-        const varType = typeFromAST(schema, varDefNode.type);
-        if (!isInputType(varType)) {
-            // Must use input types for variables. This should be caught during
-            // validation, however is checked again here for safety.
-            const varTypeStr = print(varDefNode.type);
-            onError(createGraphQLError(`Variable "$${varName}" expected value of type "${varTypeStr}" which cannot be used as an input type.`, { nodes: varDefNode.type }));
-            continue;
-        }
-        if (!hasOwnProperty(inputs, varName)) {
-            if (varDefNode.defaultValue) {
-                coercedValues[varName] = valueFromAST(varDefNode.defaultValue, varType);
-            }
-            else if (isNonNullType(varType)) {
-                const varTypeStr = inspect(varType);
-                onError(createGraphQLError(`Variable "$${varName}" of required type "${varTypeStr}" was not provided.`, {
-                    nodes: varDefNode,
-                }));
-            }
-            continue;
-        }
-        const value = inputs[varName];
-        if (value === null && isNonNullType(varType)) {
-            const varTypeStr = inspect(varType);
-            onError(createGraphQLError(`Variable "$${varName}" of non-null type "${varTypeStr}" must not be null.`, {
-                nodes: varDefNode,
-            }));
-            continue;
-        }
-        coercedValues[varName] = coerceInputValue(value, varType, (path, invalidValue, error) => {
-            let prefix = `Variable "$${varName}" got invalid value ` + inspect(invalidValue);
-            if (path.length > 0) {
-                prefix += ` at "${varName}${printPathArray(path)}"`;
-            }
-            onError(createGraphQLError(prefix + '; ' + error.message, {
-                nodes: varDefNode,
-                originalError: error,
-            }));
-        });
-    }
-    return coercedValues;
+    return result;
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-tools/executor",
-  "version": "1.5.7",
+  "version": "1.5.8-alpha-20260805104220-afd9ce934fb96bca17c99dca2e98db84c0b782c1",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "^11.2.2",
+    "@graphql-tools/utils": "11.2.3-alpha-20260805104220-afd9ce934fb96bca17c99dca2e98db84c0b782c1",
     "@graphql-typed-document-node/core": "^3.2.0",
     "@repeaterjs/repeater": "^3.1.0",
     "@whatwg-node/disposablestack": "^0.0.6",

package/typings/execution/execute.d.cts

@@ -1,5 +1,5 @@
 import { DocumentNode, FieldNode, FragmentDefinitionNode, GraphQLError, GraphQLField, GraphQLFieldResolver, GraphQLFormattedError, GraphQLObjectType, GraphQLSchema, GraphQLTypeResolver, OperationDefinitionNode } from 'graphql';
-import { GraphQLResolveInfo, Maybe, MaybePromise, Path } from '@graphql-tools/utils';
+import { GraphQLResolveInfo, Maybe, MaybePromise, Path, VariableValues } from '@graphql-tools/utils';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 export interface SingularExecutionResult<TData = any, TExtensions = any> {
     errors?: ReadonlyArray<GraphQLError>;
@@ -37,7 +37,7 @@ export interface ExecutionContext<TVariables = any, TContext = any> {
     rootValue: unknown;
     contextValue: TContext;
     operation: OperationDefinitionNode;
-    variableValues: TVariables;
+    variableValues: VariableValues<TVariables>;
     fieldResolver: GraphQLFieldResolver<any, TContext>;
     typeResolver: GraphQLTypeResolver<any, TContext>;
     subscribeFieldResolver: GraphQLFieldResolver<any, TContext>;

package/typings/execution/execute.d.ts

@@ -1,5 +1,5 @@
 import { DocumentNode, FieldNode, FragmentDefinitionNode, GraphQLError, GraphQLField, GraphQLFieldResolver, GraphQLFormattedError, GraphQLObjectType, GraphQLSchema, GraphQLTypeResolver, OperationDefinitionNode } from 'graphql';
-import { GraphQLResolveInfo, Maybe, MaybePromise, Path } from '@graphql-tools/utils';
+import { GraphQLResolveInfo, Maybe, MaybePromise, Path, VariableValues } from '@graphql-tools/utils';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 export interface SingularExecutionResult<TData = any, TExtensions = any> {
     errors?: ReadonlyArray<GraphQLError>;
@@ -37,7 +37,7 @@ export interface ExecutionContext<TVariables = any, TContext = any> {
     rootValue: unknown;
     contextValue: TContext;
     operation: OperationDefinitionNode;
-    variableValues: TVariables;
+    variableValues: VariableValues<TVariables>;
     fieldResolver: GraphQLFieldResolver<any, TContext>;
     typeResolver: GraphQLTypeResolver<any, TContext>;
     subscribeFieldResolver: GraphQLFieldResolver<any, TContext>;

package/typings/execution/values.d.cts

@@ -1,25 +1,11 @@
 import { GraphQLError, GraphQLSchema, VariableDefinitionNode } from 'graphql';
-type CoercedVariableValues = {
+import { VariableValues } from '@graphql-tools/utils';
+export type VariableValuesOrErrors = VariableValues | {
     errors: ReadonlyArray<GraphQLError>;
-    coerced?: never;
-} | {
-    coerced: {
-        [variable: string]: unknown;
-    };
-    errors?: never;
 };
-/**
- * Prepares an object map of variableValues of the correct type based on the
- * provided variable definitions and arbitrary input. If the input cannot be
- * parsed to match the variable definitions, a GraphQLError will be thrown.
- *
- * Note: The returned value is a plain Object with a prototype, since it is
- * exposed to user code. Care should be taken to not pull values from the
- * Object prototype.
- */
 export declare function getVariableValues(schema: GraphQLSchema, varDefNodes: ReadonlyArray<VariableDefinitionNode>, inputs: {
     readonly [variable: string]: unknown;
 }, options?: {
     maxErrors?: number;
-}): CoercedVariableValues;
-export {};
+    hideSuggestions?: boolean;
+}): VariableValuesOrErrors;

package/typings/execution/values.d.ts

@@ -1,25 +1,11 @@
 import { GraphQLError, GraphQLSchema, VariableDefinitionNode } from 'graphql';
-type CoercedVariableValues = {
+import { VariableValues } from '@graphql-tools/utils';
+export type VariableValuesOrErrors = VariableValues | {
     errors: ReadonlyArray<GraphQLError>;
-    coerced?: never;
-} | {
-    coerced: {
-        [variable: string]: unknown;
-    };
-    errors?: never;
 };
-/**
- * Prepares an object map of variableValues of the correct type based on the
- * provided variable definitions and arbitrary input. If the input cannot be
- * parsed to match the variable definitions, a GraphQLError will be thrown.
- *
- * Note: The returned value is a plain Object with a prototype, since it is
- * exposed to user code. Care should be taken to not pull values from the
- * Object prototype.
- */
 export declare function getVariableValues(schema: GraphQLSchema, varDefNodes: ReadonlyArray<VariableDefinitionNode>, inputs: {
     readonly [variable: string]: unknown;
 }, options?: {
     maxErrors?: number;
-}): CoercedVariableValues;
-export {};
+    hideSuggestions?: boolean;
+}): VariableValuesOrErrors;