@graphql-tools/batch-execute 8.5.0-alpha-66bd3d52.0 → 8.5.0-alpha-b76ec274.0

package/cjs/createBatchingExecutor.js

@@ -0,0 +1,56 @@
+"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 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 loader = new dataloader_1.default(loadFn, dataLoaderOptions);
+    return function batchingExecutor(request) {
+        const operationAst = (0, utils_1.getOperationASTFromRequest)(request);
+        return operationAst.operation === 'subscription' ? executor(request) : loader.load(request);
+    };
+}
+exports.createBatchingExecutor = createBatchingExecutor;
+function createLoadFn(executor, extensionsReducer) {
+    return async function batchExecuteLoadFn(requests) {
+        const execBatches = [];
+        let index = 0;
+        const request = requests[index];
+        let currentBatch = [request];
+        execBatches.push(currentBatch);
+        const operationAst = (0, utils_1.getOperationASTFromRequest)(request);
+        const operationType = operationAst.operation;
+        if (operationType == null) {
+            throw new Error('could not identify operation type of document');
+        }
+        while (++index < requests.length) {
+            const currentRequest = requests[index];
+            const currentOperationAST = (0, utils_1.getOperationASTFromRequest)(currentRequest);
+            const currentOperationType = currentOperationAST.operation;
+            if (operationType === currentOperationType) {
+                currentBatch.push(currentRequest);
+            }
+            else {
+                currentBatch = [currentRequest];
+                execBatches.push(currentBatch);
+            }
+        }
+        const results = await Promise.all(execBatches.map(async (execBatch) => {
+            const mergedRequests = (0, mergeRequests_js_1.mergeRequests)(execBatch, extensionsReducer);
+            const resultBatches = (await executor(mergedRequests));
+            return (0, splitResult_js_1.splitResult)(resultBatches, execBatch.length);
+        }));
+        return results.flat();
+    };
+}
+function defaultExtensionsReducer(mergedExtensions, request) {
+    const newExtensions = request.extensions;
+    if (newExtensions != null) {
+        Object.assign(mergedExtensions, newExtensions);
+    }
+    return mergedExtensions;
+}

package/cjs/getBatchingExecutor.js

@@ -0,0 +1,8 @@
+"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

@@ -0,0 +1,5 @@
+"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/{index.js → cjs/mergeRequests.js}

@@ -1,26 +1,10 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-const DataLoader = _interopDefault(require('dataloader'));
-const utils = require('@graphql-tools/utils');
-const graphql = require('graphql');
-
-// adapted from https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js
-function createPrefix(index) {
-    return `_${index}_`;
-}
-function parseKey(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] };
-    }
-    throw new Error(`Key ${prefixedKey} is not correctly prefixed`);
-}
-
+"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.
@@ -64,7 +48,7 @@ function mergeRequests(requests, extensionsReducer) {
     let mergedExtensions = Object.create(null);
     for (const index in requests) {
         const request = requests[index];
-        const prefixedRequests = prefixRequest(createPrefix(index), request);
+        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);
@@ -80,26 +64,26 @@ function mergeRequests(requests, extensionsReducer) {
         mergedExtensions = extensionsReducer(mergedExtensions, request);
     }
     const firstRequest = requests[0];
-    const operationType = (_a = firstRequest.operationType) !== null && _a !== void 0 ? _a : utils.getOperationASTFromRequest(firstRequest).operation;
+    const operationType = (_a = firstRequest.operationType) !== null && _a !== void 0 ? _a : (0, utils_1.getOperationASTFromRequest)(firstRequest).operation;
     const mergedOperationDefinition = {
-        kind: graphql.Kind.OPERATION_DEFINITION,
+        kind: graphql_1.Kind.OPERATION_DEFINITION,
         operation: operationType,
         variableDefinitions: mergedVariableDefinitions,
         selectionSet: {
-            kind: graphql.Kind.SELECTION_SET,
+            kind: graphql_1.Kind.SELECTION_SET,
             selections: mergedSelections,
         },
     };
     const operationName = (_b = firstRequest.operationName) !== null && _b !== void 0 ? _b : (_e = (_d = (_c = firstRequest.info) === null || _c === void 0 ? void 0 : _c.operation) === null || _d === void 0 ? void 0 : _d.name) === null || _e === void 0 ? void 0 : _e.value;
     if (operationName) {
         mergedOperationDefinition.name = {
-            kind: graphql.Kind.NAME,
+            kind: graphql_1.Kind.NAME,
             value: operationName,
         };
     }
     return {
         document: {
-            kind: graphql.Kind.DOCUMENT,
+            kind: graphql_1.Kind.DOCUMENT,
             definitions: [mergedOperationDefinition, ...mergedFragmentDefinitions],
         },
         variables: mergedVariables,
@@ -109,6 +93,7 @@ function mergeRequests(requests, extensionsReducer) {
         operationType,
     };
 }
+exports.mergeRequests = mergeRequests;
 function prefixRequest(prefix, request) {
     var _a;
     const executionVariables = (_a = request.variables) !== null && _a !== void 0 ? _a : {};
@@ -120,10 +105,10 @@ function prefixRequest(prefix, request) {
     const hasFragmentDefinitions = request.document.definitions.some(def => isFragmentDefinition(def));
     const fragmentSpreadImpl = {};
     if (executionVariableNames.length > 0 || hasFragmentDefinitions) {
-        prefixedDocument = graphql.visit(prefixedDocument, {
-            [graphql.Kind.VARIABLE]: prefixNode,
-            [graphql.Kind.FRAGMENT_DEFINITION]: prefixNode,
-            [graphql.Kind.FRAGMENT_SPREAD]: node => {
+        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;
@@ -154,7 +139,7 @@ function prefixRequest(prefix, request) {
  */
 function aliasTopLevelFields(prefix, document) {
     const transformer = {
-        [graphql.Kind.OPERATION_DEFINITION]: (def) => {
+        [graphql_1.Kind.OPERATION_DEFINITION]: (def) => {
             const { selections } = def.selectionSet;
             return {
                 ...def,
@@ -165,8 +150,8 @@ function aliasTopLevelFields(prefix, document) {
             };
         },
     };
-    return graphql.visit(document, transformer, {
-        [graphql.Kind.DOCUMENT]: [`definitions`],
+    return (0, graphql_1.visit)(document, transformer, {
+        [graphql_1.Kind.DOCUMENT]: [`definitions`],
     });
 }
 /**
@@ -192,13 +177,13 @@ function aliasTopLevelFields(prefix, document) {
 function aliasFieldsInSelection(prefix, selections, document) {
     return selections.map(selection => {
         switch (selection.kind) {
-            case graphql.Kind.INLINE_FRAGMENT:
+            case graphql_1.Kind.INLINE_FRAGMENT:
                 return aliasFieldsInInlineFragment(prefix, selection, document);
-            case graphql.Kind.FRAGMENT_SPREAD: {
+            case graphql_1.Kind.FRAGMENT_SPREAD: {
                 const inlineFragment = inlineFragmentSpread(selection, document);
                 return aliasFieldsInInlineFragment(prefix, inlineFragment, document);
             }
-            case graphql.Kind.FIELD:
+            case graphql_1.Kind.FIELD:
             default:
                 return aliasField(selection, prefix);
         }
@@ -240,7 +225,7 @@ function inlineFragmentSpread(spread, document) {
     }
     const { typeCondition, selectionSet } = fragment;
     return {
-        kind: graphql.Kind.INLINE_FRAGMENT,
+        kind: graphql_1.Kind.INLINE_FRAGMENT,
         typeCondition,
         selectionSet,
         directives: spread.directives,
@@ -273,107 +258,8 @@ function aliasField(field, aliasPrefix) {
     };
 }
 function isOperationDefinition(def) {
-    return def.kind === graphql.Kind.OPERATION_DEFINITION;
+    return def.kind === graphql_1.Kind.OPERATION_DEFINITION;
 }
 function isFragmentDefinition(def) {
-    return def.kind === graphql.Kind.FRAGMENT_DEFINITION;
-}
-
-// adapted from https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.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 } = 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 parsedKey = parseKey(error.path[0]);
-                const { index, originalKey } = parsedKey;
-                const newError = utils.relocatedError(error, [originalKey, ...error.path.slice(1)]);
-                const resultErrors = (splitResults[index].errors = (splitResults[index].errors || []));
-                resultErrors.push(newError);
-            }
-            else {
-                splitResults.forEach(result => {
-                    const resultErrors = (result.errors = (result.errors || []));
-                    resultErrors.push(new graphql.GraphQLError(error.message));
-                });
-            }
-        }
-    }
-    return splitResults;
-}
-
-function createBatchingExecutor(executor, dataLoaderOptions, extensionsReducer = defaultExtensionsReducer) {
-    const loadFn = createLoadFn(executor, extensionsReducer);
-    const loader = new DataLoader(loadFn, dataLoaderOptions);
-    return function batchingExecutor(request) {
-        const operationAst = utils.getOperationASTFromRequest(request);
-        return operationAst.operation === 'subscription' ? executor(request) : loader.load(request);
-    };
-}
-function createLoadFn(executor, extensionsReducer) {
-    return async function batchExecuteLoadFn(requests) {
-        const execBatches = [];
-        let index = 0;
-        const request = requests[index];
-        let currentBatch = [request];
-        execBatches.push(currentBatch);
-        const operationAst = utils.getOperationASTFromRequest(request);
-        const operationType = operationAst.operation;
-        if (operationType == null) {
-            throw new Error('could not identify operation type of document');
-        }
-        while (++index < requests.length) {
-            const currentRequest = requests[index];
-            const currentOperationAST = utils.getOperationASTFromRequest(currentRequest);
-            const currentOperationType = currentOperationAST.operation;
-            if (operationType === currentOperationType) {
-                currentBatch.push(currentRequest);
-            }
-            else {
-                currentBatch = [currentRequest];
-                execBatches.push(currentBatch);
-            }
-        }
-        const results = await Promise.all(execBatches.map(async (execBatch) => {
-            const mergedRequests = mergeRequests(execBatch, extensionsReducer);
-            const resultBatches = (await executor(mergedRequests));
-            return splitResult(resultBatches, execBatch.length);
-        }));
-        return results.flat();
-    };
-}
-function defaultExtensionsReducer(mergedExtensions, request) {
-    const newExtensions = request.extensions;
-    if (newExtensions != null) {
-        Object.assign(mergedExtensions, newExtensions);
-    }
-    return mergedExtensions;
+    return def.kind === graphql_1.Kind.FRAGMENT_DEFINITION;
 }
-
-const getBatchingExecutor = utils.memoize2of4(function getBatchingExecutor(_context, executor, dataLoaderOptions, extensionsReducer) {
-    return createBatchingExecutor(executor, dataLoaderOptions, extensionsReducer);
-});
-
-exports.createBatchingExecutor = createBatchingExecutor;
-exports.getBatchingExecutor = getBatchingExecutor;

package/cjs/package.json

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

package/cjs/prefix.js

@@ -0,0 +1,16 @@
+"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.parseKey = exports.createPrefix = void 0;
+function createPrefix(index) {
+    return `_${index}_`;
+}
+exports.createPrefix = createPrefix;
+function parseKey(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] };
+    }
+    throw new Error(`Key ${prefixedKey} is not correctly prefixed`);
+}
+exports.parseKey = parseKey;

package/cjs/splitResult.js

@@ -0,0 +1,50 @@
+"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 graphql_1 = require("graphql");
+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 parsedKey = (0, prefix_js_1.parseKey)(error.path[0]);
+                const { index, originalKey } = parsedKey;
+                const newError = (0, utils_1.relocatedError)(error, [originalKey, ...error.path.slice(1)]);
+                const resultErrors = (splitResults[index].errors = (splitResults[index].errors || []));
+                resultErrors.push(newError);
+            }
+            else {
+                splitResults.forEach(result => {
+                    const resultErrors = (result.errors = (result.errors || []));
+                    resultErrors.push(new graphql_1.GraphQLError(error.message));
+                });
+            }
+        }
+    }
+    return splitResults;
+}
+exports.splitResult = splitResult;

package/esm/createBatchingExecutor.js

@@ -0,0 +1,51 @@
+import DataLoader from 'dataloader';
+import { getOperationASTFromRequest } 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 loader = new DataLoader(loadFn, dataLoaderOptions);
+    return function batchingExecutor(request) {
+        const operationAst = getOperationASTFromRequest(request);
+        return operationAst.operation === 'subscription' ? executor(request) : loader.load(request);
+    };
+}
+function createLoadFn(executor, extensionsReducer) {
+    return async function batchExecuteLoadFn(requests) {
+        const execBatches = [];
+        let index = 0;
+        const request = requests[index];
+        let currentBatch = [request];
+        execBatches.push(currentBatch);
+        const operationAst = getOperationASTFromRequest(request);
+        const operationType = operationAst.operation;
+        if (operationType == null) {
+            throw new Error('could not identify operation type of document');
+        }
+        while (++index < requests.length) {
+            const currentRequest = requests[index];
+            const currentOperationAST = getOperationASTFromRequest(currentRequest);
+            const currentOperationType = currentOperationAST.operation;
+            if (operationType === currentOperationType) {
+                currentBatch.push(currentRequest);
+            }
+            else {
+                currentBatch = [currentRequest];
+                execBatches.push(currentBatch);
+            }
+        }
+        const results = await Promise.all(execBatches.map(async (execBatch) => {
+            const mergedRequests = mergeRequests(execBatch, extensionsReducer);
+            const resultBatches = (await executor(mergedRequests));
+            return splitResult(resultBatches, execBatch.length);
+        }));
+        return results.flat();
+    };
+}
+function defaultExtensionsReducer(mergedExtensions, request) {
+    const newExtensions = request.extensions;
+    if (newExtensions != null) {
+        Object.assign(mergedExtensions, newExtensions);
+    }
+    return mergedExtensions;
+}

package/esm/getBatchingExecutor.js

@@ -0,0 +1,5 @@
+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

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

package/{index.mjs → esm/mergeRequests.js}

@@ -1,20 +1,7 @@
-import DataLoader from 'dataloader';
-import { getOperationASTFromRequest, relocatedError, memoize2of4 } from '@graphql-tools/utils';
-import { Kind, visit, GraphQLError } from 'graphql';
-
-// adapted from https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js
-function createPrefix(index) {
-    return `_${index}_`;
-}
-function parseKey(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] };
-    }
-    throw new Error(`Key ${prefixedKey} is not correctly prefixed`);
-}
-
 // adapted from https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js
+import { visit, Kind, } from 'graphql';
+import { getOperationASTFromRequest } from '@graphql-tools/utils';
+import { createPrefix } from './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.
@@ -49,7 +36,7 @@ function parseKey(prefixedKey) {
  *     }
  *   }
  */
-function mergeRequests(requests, extensionsReducer) {
+export function mergeRequests(requests, extensionsReducer) {
     var _a, _b, _c, _d, _e;
     const mergedVariables = Object.create(null);
     const mergedVariableDefinitions = [];
@@ -272,101 +259,3 @@ function isOperationDefinition(def) {
 function isFragmentDefinition(def) {
     return def.kind === Kind.FRAGMENT_DEFINITION;
 }
-
-// adapted from https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.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 } = 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 parsedKey = parseKey(error.path[0]);
-                const { index, originalKey } = parsedKey;
-                const newError = relocatedError(error, [originalKey, ...error.path.slice(1)]);
-                const resultErrors = (splitResults[index].errors = (splitResults[index].errors || []));
-                resultErrors.push(newError);
-            }
-            else {
-                splitResults.forEach(result => {
-                    const resultErrors = (result.errors = (result.errors || []));
-                    resultErrors.push(new GraphQLError(error.message));
-                });
-            }
-        }
-    }
-    return splitResults;
-}
-
-function createBatchingExecutor(executor, dataLoaderOptions, extensionsReducer = defaultExtensionsReducer) {
-    const loadFn = createLoadFn(executor, extensionsReducer);
-    const loader = new DataLoader(loadFn, dataLoaderOptions);
-    return function batchingExecutor(request) {
-        const operationAst = getOperationASTFromRequest(request);
-        return operationAst.operation === 'subscription' ? executor(request) : loader.load(request);
-    };
-}
-function createLoadFn(executor, extensionsReducer) {
-    return async function batchExecuteLoadFn(requests) {
-        const execBatches = [];
-        let index = 0;
-        const request = requests[index];
-        let currentBatch = [request];
-        execBatches.push(currentBatch);
-        const operationAst = getOperationASTFromRequest(request);
-        const operationType = operationAst.operation;
-        if (operationType == null) {
-            throw new Error('could not identify operation type of document');
-        }
-        while (++index < requests.length) {
-            const currentRequest = requests[index];
-            const currentOperationAST = getOperationASTFromRequest(currentRequest);
-            const currentOperationType = currentOperationAST.operation;
-            if (operationType === currentOperationType) {
-                currentBatch.push(currentRequest);
-            }
-            else {
-                currentBatch = [currentRequest];
-                execBatches.push(currentBatch);
-            }
-        }
-        const results = await Promise.all(execBatches.map(async (execBatch) => {
-            const mergedRequests = mergeRequests(execBatch, extensionsReducer);
-            const resultBatches = (await executor(mergedRequests));
-            return splitResult(resultBatches, execBatch.length);
-        }));
-        return results.flat();
-    };
-}
-function defaultExtensionsReducer(mergedExtensions, request) {
-    const newExtensions = request.extensions;
-    if (newExtensions != null) {
-        Object.assign(mergedExtensions, newExtensions);
-    }
-    return mergedExtensions;
-}
-
-const getBatchingExecutor = memoize2of4(function getBatchingExecutor(_context, executor, dataLoaderOptions, extensionsReducer) {
-    return createBatchingExecutor(executor, dataLoaderOptions, extensionsReducer);
-});
-
-export { createBatchingExecutor, getBatchingExecutor };

package/esm/prefix.js

@@ -0,0 +1,11 @@
+// adapted from https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js
+export function createPrefix(index) {
+    return `_${index}_`;
+}
+export function parseKey(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] };
+    }
+    throw new Error(`Key ${prefixedKey} is not correctly prefixed`);
+}

package/esm/splitResult.js

@@ -0,0 +1,46 @@
+// adapted from https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js
+import { GraphQLError } from 'graphql';
+import { relocatedError } from '@graphql-tools/utils';
+import { parseKey } from './prefix.js';
+/**
+ * Split and transform result of the query produced by the `merge` function
+ */
+export 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 } = 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 parsedKey = parseKey(error.path[0]);
+                const { index, originalKey } = parsedKey;
+                const newError = relocatedError(error, [originalKey, ...error.path.slice(1)]);
+                const resultErrors = (splitResults[index].errors = (splitResults[index].errors || []));
+                resultErrors.push(newError);
+            }
+            else {
+                splitResults.forEach(result => {
+                    const resultErrors = (result.errors = (result.errors || []));
+                    resultErrors.push(new GraphQLError(error.message));
+                });
+            }
+        }
+    }
+    return splitResults;
+}

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@graphql-tools/batch-execute",
-  "version": "8.5.0-alpha-66bd3d52.0",
+  "version": "8.5.0-alpha-b76ec274.0",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "8.6.6",
+    "@graphql-tools/utils": "8.8.0-alpha-b76ec274.0",
     "dataloader": "2.1.0",
-    "tslib": "~2.3.0",
+    "tslib": "^2.4.0",
     "value-or-promise": "1.0.11"
   },
   "repository": {
@@ -18,21 +18,42 @@
     "directory": "packages/batch-execute"
   },
   "license": "MIT",
-  "main": "index.js",
-  "module": "index.mjs",
-  "typings": "index.d.ts",
+  "main": "cjs/index.js",
+  "module": "esm/index.js",
+  "typings": "typings/index.d.ts",
   "typescript": {
-    "definition": "index.d.ts"
+    "definition": "typings/index.d.ts"
   },
+  "type": "module",
   "exports": {
     ".": {
-      "require": "./index.js",
-      "import": "./index.mjs"
+      "require": {
+        "types": "./typings/index.d.ts",
+        "default": "./cjs/index.js"
+      },
+      "import": {
+        "types": "./typings/index.d.ts",
+        "default": "./esm/index.js"
+      },
+      "default": {
+        "types": "./typings/index.d.ts",
+        "default": "./esm/index.js"
+      }
     },
     "./*": {
-      "require": "./*.js",
-      "import": "./*.mjs"
+      "require": {
+        "types": "./typings/*.d.ts",
+        "default": "./cjs/*.js"
+      },
+      "import": {
+        "types": "./typings/*.d.ts",
+        "default": "./esm/*.js"
+      },
+      "default": {
+        "types": "./typings/*.d.ts",
+        "default": "./esm/*.js"
+      }
     },
     "./package.json": "./package.json"
   }
-}
+}

package/typings/index.d.ts

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

package/README.md

@@ -1,5 +0,0 @@
-Check API Reference for more information about this package;
-https://www.graphql-tools.com/docs/api/modules/batch_execute_src
-
-You can also learn more about Batch Delegation in this chapter;
-https://www.graphql-tools.com/docs/stitch-schema-extensions#batch-delegation

package/index.d.ts

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