@graphql-tools/executor 3.0.0 → 4.0.0-alpha-20261019164611-538e7787be9cdbcfc800aa118defd976f702b538

package/cjs/execution/execute.js

@@ -20,7 +20,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");
 const EMPTY_ARGS = Object.freeze(Object.create(null));
 const isGraphQL17 = graphql_1.versionInfo.major >= 17;
 /**
@@ -241,7 +240,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,
         hideSuggestions: hideSuggestions ?? undefined,
     });
@@ -249,7 +248,14 @@ function buildExecutionContext(args) {
         return coercedVariableValues.errors;
     }
     signal?.throwIfAborted();
-    const variableValues = coercedVariableValues.variableValues;
+    // GraphQL 17 returns { variableValues }; GraphQL 16 returns { coerced }.
+    // Cast through unknown: installed graphql typings match only one major.
+    const variableValues = isGraphQL17
+        ? coercedVariableValues.variableValues
+        : {
+            coerced: coercedVariableValues.coerced,
+            sources: Object.create(null),
+        };
     const resolveInfoVariableValues = (isGraphQL17 ? variableValues : variableValues.coerced);
     let asyncHelpers;
     const getAbortSignal = () => signal;

package/cjs/execution/index.js

@@ -2,5 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./execute.js"), exports);
-tslib_1.__exportStar(require("./values.js"), exports);
 tslib_1.__exportStar(require("./normalizedExecutor.js"), exports);

package/esm/execution/execute.js

@@ -1,4 +1,4 @@
-import { assertValidSchema, getArgumentValues, GraphQLError, isAbstractType, isLeafType, isListType, isNonNullType, isObjectType, Kind, SchemaMetaFieldDef, TypeMetaFieldDef, TypeNameMetaFieldDef, versionInfo, } from 'graphql';
+import { assertValidSchema, getArgumentValues, getVariableValues, GraphQLError, isAbstractType, isLeafType, isListType, isNonNullType, isObjectType, Kind, SchemaMetaFieldDef, TypeMetaFieldDef, TypeNameMetaFieldDef, versionInfo, } from 'graphql';
 import { collectSubFields as _collectSubfields, addPath, collectFields, getDefinedRootType, getDirectiveValues, GraphQLStreamDirective, inspect, isAsyncIterable, isIterableObject, isObjectLike, locatedError, memoize2, memoize3, pathToArray, promiseReduce, } from '@graphql-tools/utils';
 import { DisposableSymbols } from '@whatwg-node/disposablestack';
 import { fakePromise, handleMaybePromise, isPromise, mapAsyncIterator, } from '@whatwg-node/promise-helpers';
@@ -6,7 +6,6 @@ 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';
 const EMPTY_ARGS = Object.freeze(Object.create(null));
 const isGraphQL17 = versionInfo.major >= 17;
 /**
@@ -235,7 +234,14 @@ export function buildExecutionContext(args) {
         return coercedVariableValues.errors;
     }
     signal?.throwIfAborted();
-    const variableValues = coercedVariableValues.variableValues;
+    // GraphQL 17 returns { variableValues }; GraphQL 16 returns { coerced }.
+    // Cast through unknown: installed graphql typings match only one major.
+    const variableValues = isGraphQL17
+        ? coercedVariableValues.variableValues
+        : {
+            coerced: coercedVariableValues.coerced,
+            sources: Object.create(null),
+        };
     const resolveInfoVariableValues = (isGraphQL17 ? variableValues : variableValues.coerced);
     let asyncHelpers;
     const getAbortSignal = () => signal;

package/esm/execution/index.js

@@ -1,3 +1,2 @@
 export * from './execute.js';
-export * from './values.js';
 export * from './normalizedExecutor.js';

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-tools/executor",
-  "version": "3.0.0",
+  "version": "4.0.0-alpha-20261019164611-538e7787be9cdbcfc800aa118defd976f702b538",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "^13.0.0",
+    "@graphql-tools/utils": "13.0.1-alpha-20261019164611-538e7787be9cdbcfc800aa118defd976f702b538",
     "@graphql-typed-document-node/core": "^3.2.0",
     "@repeaterjs/repeater": "^3.1.0",
     "@whatwg-node/disposablestack": "^0.1.0",

package/typings/execution/execute.d.cts

@@ -123,7 +123,8 @@ export interface ExecutionArgs<TData = any, TVariables = any, TContext = any> {
     schemaCoordinateInErrors?: boolean;
     /**
      * When true, omit "Did you mean ...?" suggestion text from variable coercion
-     * errors. Matches `graphql@17`'s `ExecutionArgs.hideSuggestions`.
+     * errors with GraphQL 17. GraphQL 16 ignores this option.
+     * Matches `graphql@17`'s `ExecutionArgs.hideSuggestions`.
      */
     hideSuggestions?: Maybe<boolean>;
 }

package/typings/execution/execute.d.ts

@@ -123,7 +123,8 @@ export interface ExecutionArgs<TData = any, TVariables = any, TContext = any> {
     schemaCoordinateInErrors?: boolean;
     /**
      * When true, omit "Did you mean ...?" suggestion text from variable coercion
-     * errors. Matches `graphql@17`'s `ExecutionArgs.hideSuggestions`.
+     * errors with GraphQL 17. GraphQL 16 ignores this option.
+     * Matches `graphql@17`'s `ExecutionArgs.hideSuggestions`.
      */
     hideSuggestions?: Maybe<boolean>;
 }

package/typings/execution/index.d.cts

@@ -1,3 +1,2 @@
 export * from './execute.cjs';
-export * from './values.cjs';
 export * from './normalizedExecutor.cjs';

package/typings/execution/index.d.ts

@@ -1,3 +1,2 @@
 export * from './execute.js';
-export * from './values.js';
 export * from './normalizedExecutor.js';

package/cjs/execution/didYouMean.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.didYouMean = didYouMean;
-const formatList_js_1 = require("./formatList.js");
-const MAX_SUGGESTIONS = 5;
-/** @internal */
-function didYouMean(firstArg, secondArg) {
-    const [subMessage, suggestions] = secondArg
-        ? [firstArg, secondArg]
-        : [undefined, firstArg];
-    if (suggestions.length === 0) {
-        return '';
-    }
-    let message = ' Did you mean ';
-    if (subMessage != null) {
-        message += subMessage + ' ';
-    }
-    const suggestionList = (0, formatList_js_1.orList)(suggestions.slice(0, MAX_SUGGESTIONS).map(x => `"${x}"`));
-    return message + suggestionList + '?';
-}

package/cjs/execution/formatList.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.orList = orList;
-exports.andList = andList;
-/**
- * Given [A, B, C] return 'A, B, or C'.
- *
- * @internal
- */
-function orList(items) {
-    return formatList('or', items);
-}
-/**
- * Given [A, B, C] return 'A, B, and C'.
- *
- * @internal
- */
-function andList(items) {
-    return formatList('and', items);
-}
-function formatList(conjunction, items) {
-    switch (items.length) {
-        case 1:
-            return items[0];
-        case 2:
-            return items[0] + ' ' + conjunction + ' ' + items[1];
-    }
-    const allButLast = items.slice(0, -1);
-    const lastItem = items.at(-1);
-    return allButLast.join(', ') + ', ' + conjunction + ' ' + lastItem;
-}

package/cjs/execution/naturalCompare.js

@@ -1,55 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.naturalCompare = naturalCompare;
-/**
- * Returns a number indicating whether a reference string comes before, or after,
- * or is the same as the given string in natural sort order.
- *
- * See: https://en.wikipedia.org/wiki/Natural_sort_order
- *
- * @internal
- */
-function naturalCompare(aStr, bStr) {
-    let aIndex = 0;
-    let bIndex = 0;
-    while (aIndex < aStr.length && bIndex < bStr.length) {
-        let aChar = aStr.charCodeAt(aIndex);
-        let bChar = bStr.charCodeAt(bIndex);
-        if (isDigit(aChar) && isDigit(bChar)) {
-            let aNum = 0;
-            do {
-                ++aIndex;
-                aNum = aNum * 10 + aChar - DIGIT_0;
-                aChar = aStr.charCodeAt(aIndex);
-            } while (isDigit(aChar) && aNum > 0);
-            let bNum = 0;
-            do {
-                ++bIndex;
-                bNum = bNum * 10 + bChar - DIGIT_0;
-                bChar = bStr.charCodeAt(bIndex);
-            } while (isDigit(bChar) && bNum > 0);
-            if (aNum < bNum) {
-                return -1;
-            }
-            if (aNum > bNum) {
-                return 1;
-            }
-        }
-        else {
-            if (aChar < bChar) {
-                return -1;
-            }
-            if (aChar > bChar) {
-                return 1;
-            }
-            ++aIndex;
-            ++bIndex;
-        }
-    }
-    return aStr.length - bStr.length;
-}
-const DIGIT_0 = 48;
-const DIGIT_9 = 57;
-function isDigit(code) {
-    return !isNaN(code) && DIGIT_0 <= code && code <= DIGIT_9;
-}

package/cjs/execution/suggestionList.js

@@ -1,117 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.suggestionList = suggestionList;
-const naturalCompare_js_1 = require("./naturalCompare.js");
-/**
- * Given an invalid input string and a list of valid options, returns a filtered
- * list of valid options sorted based on their similarity with the input.
- *
- * @internal
- */
-function suggestionList(input, options) {
-    const optionsByDistance = Object.create(null);
-    const lexicalDistance = new LexicalDistance(input);
-    const threshold = Math.floor(input.length * 0.4) + 1;
-    for (const option of options) {
-        const distance = lexicalDistance.measure(option, threshold);
-        if (distance !== undefined) {
-            optionsByDistance[option] = distance;
-        }
-    }
-    return Object.keys(optionsByDistance).sort((a, b) => {
-        const distanceDiff = optionsByDistance[a] - optionsByDistance[b];
-        return distanceDiff !== 0 ? distanceDiff : (0, naturalCompare_js_1.naturalCompare)(a, b);
-    });
-}
-/**
- * Computes the lexical distance between strings A and B.
- *
- * The "distance" between two strings is given by counting the minimum number
- * of edits needed to transform string A into string B. An edit can be an
- * insertion, deletion, or substitution of a single character, or a swap of two
- * adjacent characters.
- *
- * Includes a custom alteration from Damerau-Levenshtein to treat case changes
- * as a single edit which helps identify mis-cased values with an edit distance
- * of 1.
- *
- * This distance can be useful for detecting typos in input or sorting
- *
- * @internal
- */
-class LexicalDistance {
-    _input;
-    _inputLowerCase;
-    _inputArray;
-    _rows;
-    constructor(input) {
-        this._input = input;
-        this._inputLowerCase = input.toLowerCase();
-        this._inputArray = stringToArray(this._inputLowerCase);
-        this._rows = [
-            new Array(input.length + 1).fill(0),
-            new Array(input.length + 1).fill(0),
-            new Array(input.length + 1).fill(0),
-        ];
-    }
-    measure(option, threshold) {
-        if (this._input === option) {
-            return 0;
-        }
-        const optionLowerCase = option.toLowerCase();
-        // Any case change counts as a single edit
-        if (this._inputLowerCase === optionLowerCase) {
-            return 1;
-        }
-        let a = stringToArray(optionLowerCase);
-        let b = this._inputArray;
-        if (a.length < b.length) {
-            const tmp = a;
-            a = b;
-            b = tmp;
-        }
-        const aLength = a.length;
-        const bLength = b.length;
-        if (aLength - bLength > threshold) {
-            return undefined;
-        }
-        const rows = this._rows;
-        for (let j = 0; j <= bLength; j++) {
-            rows[0][j] = j;
-        }
-        for (let i = 1; i <= aLength; i++) {
-            const upRow = rows[(i - 1) % 3];
-            const currentRow = rows[i % 3];
-            let smallestCell = (currentRow[0] = i);
-            for (let j = 1; j <= bLength; j++) {
-                const cost = a[i - 1] === b[j - 1] ? 0 : 1;
-                let currentCell = Math.min(upRow[j] + 1, // delete
-                currentRow[j - 1] + 1, // insert
-                upRow[j - 1] + cost);
-                if (i > 1 && j > 1 && a[i - 1] === b[j - 2] && a[i - 2] === b[j - 1]) {
-                    // transposition
-                    const doubleDiagonalCell = rows[(i - 2) % 3][j - 2];
-                    currentCell = Math.min(currentCell, doubleDiagonalCell + 1);
-                }
-                if (currentCell < smallestCell) {
-                    smallestCell = currentCell;
-                }
-                currentRow[j] = currentCell;
-            }
-            // Early exit, since distance can't go smaller than smallest element of the previous row.
-            if (smallestCell > threshold) {
-                return undefined;
-            }
-        }
-        const distance = rows[aLength % 3][bLength];
-        return distance <= threshold ? distance : undefined;
-    }
-}
-function stringToArray(str) {
-    const strLength = str.length;
-    const array = new Array(strLength);
-    for (let i = 0; i < strLength; ++i) {
-        array[i] = str.charCodeAt(i);
-    }
-    return array;
-}