@graphql-tools/batch-execute 9.0.6 → 9.0.7-alpha-63d80f9d08b5d8448f4bfb8b04aeff28b977dec8

package/package.json

@@ -1,62 +1,51 @@
 {
   "name": "@graphql-tools/batch-execute",
-  "version": "9.0.6",
+  "version": "9.0.7-alpha-63d80f9d08b5d8448f4bfb8b04aeff28b977dec8",
+  "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
-  "sideEffects": false,
-  "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
-  },
-  "dependencies": {
-    "@graphql-tools/utils": "^10.5.6",
-    "dataloader": "^2.2.2",
-    "tslib": "^2.4.0",
-    "value-or-promise": "^1.0.12"
-  },
   "repository": {
     "type": "git",
-    "url": "ardatan/graphql-tools",
+    "url": "graphql-hive/gateway",
     "directory": "packages/batch-execute"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=16.0.0"
-  },
-  "main": "cjs/index.js",
-  "module": "esm/index.js",
-  "typings": "typings/index.d.ts",
-  "typescript": {
-    "definition": "typings/index.d.ts"
+    "node": ">=18.0.0"
   },
-  "type": "module",
+  "main": "./dist/index.js",
   "exports": {
     ".": {
       "require": {
-        "types": "./typings/index.d.cts",
-        "default": "./cjs/index.js"
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
       },
       "import": {
-        "types": "./typings/index.d.ts",
-        "default": "./esm/index.js"
-      },
-      "default": {
-        "types": "./typings/index.d.ts",
-        "default": "./esm/index.js"
-      }
-    },
-    "./*": {
-      "require": {
-        "types": "./typings/*.d.cts",
-        "default": "./cjs/*.js"
-      },
-      "import": {
-        "types": "./typings/*.d.ts",
-        "default": "./esm/*.js"
-      },
-      "default": {
-        "types": "./typings/*.d.ts",
-        "default": "./esm/*.js"
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
       }
     },
     "./package.json": "./package.json"
-  }
+  },
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "pkgroll --clean-dist",
+    "prepack": "yarn build"
+  },
+  "peerDependencies": {
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
+  },
+  "dependencies": {
+    "@graphql-tools/utils": "^10.6.0",
+    "dataloader": "^2.2.2",
+    "tslib": "^2.4.0",
+    "value-or-promise": "^1.0.12"
+  },
+  "devDependencies": {
+    "graphql": "^16.9.0",
+    "pkgroll": "2.5.1"
+  },
+  "sideEffects": false
 }

package/cjs/createBatchingExecutor.js

@@ -1,51 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBatchingExecutor = void 0;
-const tslib_1 = require("tslib");
-const dataloader_1 = tslib_1.__importDefault(require("dataloader"));
-const value_or_promise_1 = require("value-or-promise");
-const utils_1 = require("@graphql-tools/utils");
-const mergeRequests_js_1 = require("./mergeRequests.js");
-const splitResult_js_1 = require("./splitResult.js");
-function createBatchingExecutor(executor, dataLoaderOptions, extensionsReducer = defaultExtensionsReducer) {
-    const loadFn = createLoadFn(executor, extensionsReducer);
-    const queryLoader = new dataloader_1.default(loadFn, dataLoaderOptions);
-    const mutationLoader = new dataloader_1.default(loadFn, dataLoaderOptions);
-    return function batchingExecutor(request) {
-        const operationType = request.operationType ?? (0, utils_1.getOperationASTFromRequest)(request)?.operation;
-        switch (operationType) {
-            case 'query':
-                return queryLoader.load(request);
-            case 'mutation':
-                return mutationLoader.load(request);
-            case 'subscription':
-                return executor(request);
-            default:
-                throw new Error(`Invalid operation type "${operationType}"`);
-        }
-    };
-}
-exports.createBatchingExecutor = createBatchingExecutor;
-function createLoadFn(executor, extensionsReducer) {
-    return function batchExecuteLoadFn(requests) {
-        if (requests.length === 1) {
-            return new value_or_promise_1.ValueOrPromise(() => executor(requests[0]))
-                .then((result) => [result])
-                .catch((err) => [err]);
-        }
-        const mergedRequests = (0, mergeRequests_js_1.mergeRequests)(requests, extensionsReducer);
-        return new value_or_promise_1.ValueOrPromise(() => executor(mergedRequests)).then(resultBatches => {
-            if ((0, utils_1.isAsyncIterable)(resultBatches)) {
-                throw new Error('Executor must not return incremental results for batching');
-            }
-            return (0, splitResult_js_1.splitResult)(resultBatches, requests.length);
-        });
-    };
-}
-function defaultExtensionsReducer(mergedExtensions, request) {
-    const newExtensions = request.extensions;
-    if (newExtensions != null) {
-        Object.assign(mergedExtensions, newExtensions);
-    }
-    return mergedExtensions;
-}

package/cjs/getBatchingExecutor.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBatchingExecutor = void 0;
-const utils_1 = require("@graphql-tools/utils");
-const createBatchingExecutor_js_1 = require("./createBatchingExecutor.js");
-exports.getBatchingExecutor = (0, utils_1.memoize2of4)(function getBatchingExecutor(_context, executor, dataLoaderOptions, extensionsReducer) {
-    return (0, createBatchingExecutor_js_1.createBatchingExecutor)(executor, dataLoaderOptions, extensionsReducer);
-});

package/cjs/index.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./createBatchingExecutor.js"), exports);
-tslib_1.__exportStar(require("./getBatchingExecutor.js"), exports);

package/cjs/mergeRequests.js

@@ -1,264 +0,0 @@
-"use strict";
-// adapted from https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeRequests = void 0;
-const graphql_1 = require("graphql");
-const utils_1 = require("@graphql-tools/utils");
-const prefix_js_1 = require("./prefix.js");
-/**
- * Merge multiple queries into a single query in such a way that query results
- * can be split and transformed as if they were obtained by running original queries.
- *
- * Merging algorithm involves several transformations:
- *  1. Replace top-level fragment spreads with inline fragments (... on Query {})
- *  2. Add unique aliases to all top-level query fields (including those on inline fragments)
- *  3. Prefix all variable definitions and variable usages
- *  4. Prefix names (and spreads) of fragments
- *
- * i.e transform:
- *   [
- *     `query Foo($id: ID!) { foo, bar(id: $id), ...FooQuery }
- *     fragment FooQuery on Query { baz }`,
- *
- *    `query Bar($id: ID!) { foo: baz, bar(id: $id), ... on Query { baz } }`
- *   ]
- * to:
- *   query (
- *     $graphqlTools1_id: ID!
- *     $graphqlTools2_id: ID!
- *   ) {
- *     graphqlTools1_foo: foo,
- *     graphqlTools1_bar: bar(id: $graphqlTools1_id)
- *     ... on Query {
- *       graphqlTools1__baz: baz
- *     }
- *     graphqlTools1__foo: baz
- *     graphqlTools1__bar: bar(id: $graphqlTools1__id)
- *     ... on Query {
- *       graphqlTools1__baz: baz
- *     }
- *   }
- */
-function mergeRequests(requests, extensionsReducer) {
-    const mergedVariables = Object.create(null);
-    const mergedVariableDefinitions = [];
-    const mergedSelections = [];
-    const mergedFragmentDefinitions = [];
-    let mergedExtensions = Object.create(null);
-    for (let index = 0; index < requests.length; index++) {
-        const request = requests[index];
-        const prefixedRequests = prefixRequest((0, prefix_js_1.createPrefix)(index), request);
-        for (const def of prefixedRequests.document.definitions) {
-            if (isOperationDefinition(def)) {
-                mergedSelections.push(...def.selectionSet.selections);
-                if (def.variableDefinitions) {
-                    mergedVariableDefinitions.push(...def.variableDefinitions);
-                }
-            }
-            if (isFragmentDefinition(def)) {
-                mergedFragmentDefinitions.push(def);
-            }
-        }
-        Object.assign(mergedVariables, prefixedRequests.variables);
-        mergedExtensions = extensionsReducer(mergedExtensions, request);
-    }
-    const firstRequest = requests[0];
-    const operationType = firstRequest.operationType ?? (0, utils_1.getOperationASTFromRequest)(firstRequest).operation;
-    const mergedOperationDefinition = {
-        kind: graphql_1.Kind.OPERATION_DEFINITION,
-        operation: operationType,
-        variableDefinitions: mergedVariableDefinitions,
-        selectionSet: {
-            kind: graphql_1.Kind.SELECTION_SET,
-            selections: mergedSelections,
-        },
-    };
-    const operationName = firstRequest.operationName ?? firstRequest.info?.operation?.name?.value;
-    if (operationName) {
-        mergedOperationDefinition.name = {
-            kind: graphql_1.Kind.NAME,
-            value: operationName,
-        };
-    }
-    return {
-        document: {
-            kind: graphql_1.Kind.DOCUMENT,
-            definitions: [mergedOperationDefinition, ...mergedFragmentDefinitions],
-        },
-        variables: mergedVariables,
-        extensions: mergedExtensions,
-        context: requests[0].context,
-        info: requests[0].info,
-        operationType,
-        rootValue: requests[0].rootValue,
-    };
-}
-exports.mergeRequests = mergeRequests;
-function prefixRequest(prefix, request) {
-    const executionVariables = request.variables ?? {};
-    function prefixNode(node) {
-        return prefixNodeName(node, prefix);
-    }
-    let prefixedDocument = aliasTopLevelFields(prefix, request.document);
-    const executionVariableNames = Object.keys(executionVariables);
-    const hasFragmentDefinitions = request.document.definitions.some(def => isFragmentDefinition(def));
-    const fragmentSpreadImpl = {};
-    if (executionVariableNames.length > 0 || hasFragmentDefinitions) {
-        prefixedDocument = (0, graphql_1.visit)(prefixedDocument, {
-            [graphql_1.Kind.VARIABLE]: prefixNode,
-            [graphql_1.Kind.FRAGMENT_DEFINITION]: prefixNode,
-            [graphql_1.Kind.FRAGMENT_SPREAD]: node => {
-                node = prefixNodeName(node, prefix);
-                fragmentSpreadImpl[node.name.value] = true;
-                return node;
-            },
-        });
-    }
-    const prefixedVariables = {};
-    for (const variableName of executionVariableNames) {
-        prefixedVariables[prefix + variableName] = executionVariables[variableName];
-    }
-    if (hasFragmentDefinitions) {
-        prefixedDocument = {
-            ...prefixedDocument,
-            definitions: prefixedDocument.definitions.filter(def => {
-                return !isFragmentDefinition(def) || fragmentSpreadImpl[def.name.value];
-            }),
-        };
-    }
-    return {
-        document: prefixedDocument,
-        variables: prefixedVariables,
-    };
-}
-/**
- * Adds prefixed aliases to top-level fields of the query.
- *
- * @see aliasFieldsInSelection for implementation details
- */
-function aliasTopLevelFields(prefix, document) {
-    const transformer = {
-        [graphql_1.Kind.OPERATION_DEFINITION]: (def) => {
-            const { selections } = def.selectionSet;
-            return {
-                ...def,
-                selectionSet: {
-                    ...def.selectionSet,
-                    selections: aliasFieldsInSelection(prefix, selections, document),
-                },
-            };
-        },
-    };
-    return (0, graphql_1.visit)(document, transformer, {
-        [graphql_1.Kind.DOCUMENT]: [`definitions`],
-    });
-}
-/**
- * Add aliases to fields of the selection, including top-level fields of inline fragments.
- * Fragment spreads are converted to inline fragments and their top-level fields are also aliased.
- *
- * Note that this method is shallow. It adds aliases only to the top-level fields and doesn't
- * descend to field sub-selections.
- *
- * For example, transforms:
- *   {
- *     foo
- *     ... on Query { foo }
- *     ...FragmentWithBarField
- *   }
- * To:
- *   {
- *     graphqlTools1_foo: foo
- *     ... on Query { graphqlTools1_foo: foo }
- *     ... on Query { graphqlTools1_bar: bar }
- *   }
- */
-function aliasFieldsInSelection(prefix, selections, document) {
-    return selections.map(selection => {
-        switch (selection.kind) {
-            case graphql_1.Kind.INLINE_FRAGMENT:
-                return aliasFieldsInInlineFragment(prefix, selection, document);
-            case graphql_1.Kind.FRAGMENT_SPREAD: {
-                const inlineFragment = inlineFragmentSpread(selection, document);
-                return aliasFieldsInInlineFragment(prefix, inlineFragment, document);
-            }
-            case graphql_1.Kind.FIELD:
-            default:
-                return aliasField(selection, prefix);
-        }
-    });
-}
-/**
- * Add aliases to top-level fields of the inline fragment.
- * Returns new inline fragment node.
- *
- * For Example, transforms:
- *   ... on Query { foo, ... on Query { bar: foo } }
- * To
- *   ... on Query { graphqlTools1_foo: foo, ... on Query { graphqlTools1_bar: foo } }
- */
-function aliasFieldsInInlineFragment(prefix, fragment, document) {
-    const { selections } = fragment.selectionSet;
-    return {
-        ...fragment,
-        selectionSet: {
-            ...fragment.selectionSet,
-            selections: aliasFieldsInSelection(prefix, selections, document),
-        },
-    };
-}
-/**
- * Replaces fragment spread with inline fragment
- *
- * Example:
- *   query { ...Spread }
- *   fragment Spread on Query { bar }
- *
- * Transforms to:
- *   query { ... on Query { bar } }
- */
-function inlineFragmentSpread(spread, document) {
-    const fragment = document.definitions.find(def => isFragmentDefinition(def) && def.name.value === spread.name.value);
-    if (!fragment) {
-        throw new Error(`Fragment ${spread.name.value} does not exist`);
-    }
-    const { typeCondition, selectionSet } = fragment;
-    return {
-        kind: graphql_1.Kind.INLINE_FRAGMENT,
-        typeCondition,
-        selectionSet,
-        directives: spread.directives,
-    };
-}
-function prefixNodeName(namedNode, prefix) {
-    return {
-        ...namedNode,
-        name: {
-            ...namedNode.name,
-            value: prefix + namedNode.name.value,
-        },
-    };
-}
-/**
- * Returns a new FieldNode with prefixed alias
- *
- * Example. Given prefix === "graphqlTools1_" transforms:
- *   { foo } -> { graphqlTools1_foo: foo }
- *   { foo: bar } -> { graphqlTools1_foo: bar }
- */
-function aliasField(field, aliasPrefix) {
-    const aliasNode = field.alias ? field.alias : field.name;
-    return {
-        ...field,
-        alias: {
-            ...aliasNode,
-            value: aliasPrefix + aliasNode.value,
-        },
-    };
-}
-function isOperationDefinition(def) {
-    return def.kind === graphql_1.Kind.OPERATION_DEFINITION;
-}
-function isFragmentDefinition(def) {
-    return def.kind === graphql_1.Kind.FRAGMENT_DEFINITION;
-}

package/cjs/package.json

@@ -1 +0,0 @@
-{"type":"commonjs"}

package/cjs/prefix.js

@@ -1,42 +0,0 @@
-"use strict";
-// adapted from https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseKeyFromPath = exports.parseKey = exports.createPrefix = void 0;
-function createPrefix(index) {
-    return `_${index}_`;
-}
-exports.createPrefix = createPrefix;
-function matchKey(prefixedKey) {
-    const match = /^_(\d+)_(.*)$/.exec(prefixedKey);
-    if (match && match.length === 3 && !isNaN(Number(match[1])) && match[2]) {
-        return { index: Number(match[1]), originalKey: match[2] };
-    }
-    return null;
-}
-function parseKey(prefixedKey) {
-    const match = matchKey(prefixedKey);
-    if (!match) {
-        throw new Error(`Key ${prefixedKey} is not correctly prefixed`);
-    }
-    return match;
-}
-exports.parseKey = parseKey;
-function parseKeyFromPath(path) {
-    let keyOffset = 0;
-    let match = null;
-    // Keep looping over path until we've found a match or path has no more items left
-    for (; !match && keyOffset < path.length; keyOffset++) {
-        const pathKey = path[keyOffset];
-        if (typeof pathKey === 'string') {
-            match = matchKey(pathKey);
-        }
-    }
-    if (!match) {
-        throw new Error(`Path ${path.join('.')} does not contain correctly prefixed key`);
-    }
-    return {
-        ...match,
-        keyOffset,
-    };
-}
-exports.parseKeyFromPath = parseKeyFromPath;

package/cjs/splitResult.js

@@ -1,49 +0,0 @@
-"use strict";
-// adapted from https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.splitResult = void 0;
-const utils_1 = require("@graphql-tools/utils");
-const prefix_js_1 = require("./prefix.js");
-/**
- * Split and transform result of the query produced by the `merge` function
- */
-function splitResult({ data, errors }, numResults) {
-    const splitResults = [];
-    for (let i = 0; i < numResults; i++) {
-        splitResults.push({});
-    }
-    if (data) {
-        for (const prefixedKey in data) {
-            const { index, originalKey } = (0, prefix_js_1.parseKey)(prefixedKey);
-            const result = splitResults[index];
-            if (result == null) {
-                continue;
-            }
-            if (result.data == null) {
-                result.data = { [originalKey]: data[prefixedKey] };
-            }
-            else {
-                result.data[originalKey] = data[prefixedKey];
-            }
-        }
-    }
-    if (errors) {
-        for (const error of errors) {
-            if (error.path) {
-                const { index, originalKey, keyOffset } = (0, prefix_js_1.parseKeyFromPath)(error.path);
-                const newError = (0, utils_1.relocatedError)(error, [originalKey, ...error.path.slice(keyOffset)]);
-                const resultErrors = (splitResults[index].errors = (splitResults[index].errors ||
-                    []));
-                resultErrors.push(newError);
-            }
-            else {
-                splitResults.forEach(result => {
-                    const resultErrors = (result.errors = (result.errors || []));
-                    resultErrors.push(error);
-                });
-            }
-        }
-    }
-    return splitResults;
-}
-exports.splitResult = splitResult;

package/esm/createBatchingExecutor.js

@@ -1,46 +0,0 @@
-import DataLoader from 'dataloader';
-import { ValueOrPromise } from 'value-or-promise';
-import { getOperationASTFromRequest, isAsyncIterable, } from '@graphql-tools/utils';
-import { mergeRequests } from './mergeRequests.js';
-import { splitResult } from './splitResult.js';
-export function createBatchingExecutor(executor, dataLoaderOptions, extensionsReducer = defaultExtensionsReducer) {
-    const loadFn = createLoadFn(executor, extensionsReducer);
-    const queryLoader = new DataLoader(loadFn, dataLoaderOptions);
-    const mutationLoader = new DataLoader(loadFn, dataLoaderOptions);
-    return function batchingExecutor(request) {
-        const operationType = request.operationType ?? getOperationASTFromRequest(request)?.operation;
-        switch (operationType) {
-            case 'query':
-                return queryLoader.load(request);
-            case 'mutation':
-                return mutationLoader.load(request);
-            case 'subscription':
-                return executor(request);
-            default:
-                throw new Error(`Invalid operation type "${operationType}"`);
-        }
-    };
-}
-function createLoadFn(executor, extensionsReducer) {
-    return function batchExecuteLoadFn(requests) {
-        if (requests.length === 1) {
-            return new ValueOrPromise(() => executor(requests[0]))
-                .then((result) => [result])
-                .catch((err) => [err]);
-        }
-        const mergedRequests = mergeRequests(requests, extensionsReducer);
-        return new ValueOrPromise(() => executor(mergedRequests)).then(resultBatches => {
-            if (isAsyncIterable(resultBatches)) {
-                throw new Error('Executor must not return incremental results for batching');
-            }
-            return splitResult(resultBatches, requests.length);
-        });
-    };
-}
-function defaultExtensionsReducer(mergedExtensions, request) {
-    const newExtensions = request.extensions;
-    if (newExtensions != null) {
-        Object.assign(mergedExtensions, newExtensions);
-    }
-    return mergedExtensions;
-}

package/esm/getBatchingExecutor.js

@@ -1,5 +0,0 @@
-import { memoize2of4 } from '@graphql-tools/utils';
-import { createBatchingExecutor } from './createBatchingExecutor.js';
-export const getBatchingExecutor = memoize2of4(function getBatchingExecutor(_context, executor, dataLoaderOptions, extensionsReducer) {
-    return createBatchingExecutor(executor, dataLoaderOptions, extensionsReducer);
-});

package/esm/index.js

@@ -1,2 +0,0 @@
-export * from './createBatchingExecutor.js';
-export * from './getBatchingExecutor.js';