@graphql-tools/batch-execute 9.0.0 → 9.0.1

package/cjs/createBatchingExecutor.js

@@ -3,16 +3,26 @@ 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");
-const value_or_promise_1 = require("value-or-promise");
 function createBatchingExecutor(executor, dataLoaderOptions, extensionsReducer = defaultExtensionsReducer) {
     const loadFn = createLoadFn(executor, extensionsReducer);
-    const loader = new dataloader_1.default(loadFn, dataLoaderOptions);
+    const queryLoader = new dataloader_1.default(loadFn, dataLoaderOptions);
+    const mutationLoader = 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);
+        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;
@@ -23,32 +33,13 @@ function createLoadFn(executor, extensionsReducer) {
                 .then((result) => [result])
                 .catch((err) => [err]);
         }
-        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 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 value_or_promise_1.ValueOrPromise.all(execBatches.map(execBatch => new value_or_promise_1.ValueOrPromise(() => {
-            const mergedRequests = (0, mergeRequests_js_1.mergeRequests)(execBatch, extensionsReducer);
-            return executor(mergedRequests);
-        }).then(resultBatches => (0, splitResult_js_1.splitResult)(resultBatches, execBatch.length)))).then(results => results.flat());
+            return (0, splitResult_js_1.splitResult)(resultBatches, requests.length);
+        });
     };
 }
 function defaultExtensionsReducer(mergedExtensions, request) {

package/cjs/mergeRequests.js

@@ -90,6 +90,7 @@ function mergeRequests(requests, extensionsReducer) {
         context: requests[0].context,
         info: requests[0].info,
         operationType,
+        rootValue: requests[0].rootValue,
     };
 }
 exports.mergeRequests = mergeRequests;

package/cjs/splitResult.js

@@ -33,7 +33,8 @@ function splitResult({ data, errors }, numResults) {
                 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 || []));
+                const resultErrors = (splitResults[index].errors = (splitResults[index].errors ||
+                    []));
                 resultErrors.push(newError);
             }
             else {

package/esm/createBatchingExecutor.js

@@ -1,14 +1,24 @@
 import DataLoader from 'dataloader';
-import { getOperationASTFromRequest } from '@graphql-tools/utils';
+import { ValueOrPromise } from 'value-or-promise';
+import { getOperationASTFromRequest, isAsyncIterable, } from '@graphql-tools/utils';
 import { mergeRequests } from './mergeRequests.js';
 import { splitResult } from './splitResult.js';
-import { ValueOrPromise } from 'value-or-promise';
 export function createBatchingExecutor(executor, dataLoaderOptions, extensionsReducer = defaultExtensionsReducer) {
     const loadFn = createLoadFn(executor, extensionsReducer);
-    const loader = new DataLoader(loadFn, dataLoaderOptions);
+    const queryLoader = new DataLoader(loadFn, dataLoaderOptions);
+    const mutationLoader = new DataLoader(loadFn, dataLoaderOptions);
     return function batchingExecutor(request) {
-        const operationAst = getOperationASTFromRequest(request);
-        return operationAst.operation === 'subscription' ? executor(request) : loader.load(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) {
@@ -18,32 +28,13 @@ function createLoadFn(executor, extensionsReducer) {
                 .then((result) => [result])
                 .catch((err) => [err]);
         }
-        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 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 ValueOrPromise.all(execBatches.map(execBatch => new ValueOrPromise(() => {
-            const mergedRequests = mergeRequests(execBatch, extensionsReducer);
-            return executor(mergedRequests);
-        }).then(resultBatches => splitResult(resultBatches, execBatch.length)))).then(results => results.flat());
+            return splitResult(resultBatches, requests.length);
+        });
     };
 }
 function defaultExtensionsReducer(mergedExtensions, request) {

package/esm/mergeRequests.js

@@ -1,5 +1,5 @@
 // adapted from https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js
-import { visit, Kind, } from 'graphql';
+import { Kind, visit, } from 'graphql';
 import { getOperationASTFromRequest } from '@graphql-tools/utils';
 import { createPrefix } from './prefix.js';
 /**
@@ -87,6 +87,7 @@ export function mergeRequests(requests, extensionsReducer) {
         context: requests[0].context,
         info: requests[0].info,
         operationType,
+        rootValue: requests[0].rootValue,
     };
 }
 function prefixRequest(prefix, request) {

package/esm/splitResult.js

@@ -30,7 +30,8 @@ export function splitResult({ data, errors }, numResults) {
                 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 || []));
+                const resultErrors = (splitResults[index].errors = (splitResults[index].errors ||
+                    []));
                 resultErrors.push(newError);
             }
             else {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@graphql-tools/batch-execute",
-  "version": "9.0.0",
+  "version": "9.0.1",
   "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.0.0",
+    "@graphql-tools/utils": "^10.0.5",
     "dataloader": "^2.2.2",
     "tslib": "^2.4.0",
     "value-or-promise": "^1.0.12"

package/typings/createBatchingExecutor.d.cts

@@ -1,3 +1,3 @@
 import DataLoader from 'dataloader';
-import { Executor, ExecutionRequest } from '@graphql-tools/utils';
+import { ExecutionRequest, Executor } from '@graphql-tools/utils';
 export declare function createBatchingExecutor(executor: Executor, dataLoaderOptions?: DataLoader.Options<any, any, any>, extensionsReducer?: (mergedExtensions: Record<string, any>, request: ExecutionRequest) => Record<string, any>): Executor;

package/typings/createBatchingExecutor.d.ts

@@ -1,3 +1,3 @@
 import DataLoader from 'dataloader';
-import { Executor, ExecutionRequest } from '@graphql-tools/utils';
+import { ExecutionRequest, Executor } from '@graphql-tools/utils';
 export declare function createBatchingExecutor(executor: Executor, dataLoaderOptions?: DataLoader.Options<any, any, any>, extensionsReducer?: (mergedExtensions: Record<string, any>, request: ExecutionRequest) => Record<string, any>): Executor;

package/typings/mergeRequests.d.cts

@@ -33,4 +33,4 @@ import { ExecutionRequest } from '@graphql-tools/utils';
  *     }
  *   }
  */
-export declare function mergeRequests(requests: Array<ExecutionRequest>, extensionsReducer: (mergedExtensions: Record<string, any>, request: ExecutionRequest) => Record<string, any>): ExecutionRequest;
+export declare function mergeRequests(requests: ReadonlyArray<ExecutionRequest>, extensionsReducer: (mergedExtensions: Record<string, any>, request: ExecutionRequest) => Record<string, any>): ExecutionRequest;

package/typings/mergeRequests.d.ts

@@ -33,4 +33,4 @@ import { ExecutionRequest } from '@graphql-tools/utils';
  *     }
  *   }
  */
-export declare function mergeRequests(requests: Array<ExecutionRequest>, extensionsReducer: (mergedExtensions: Record<string, any>, request: ExecutionRequest) => Record<string, any>): ExecutionRequest;
+export declare function mergeRequests(requests: ReadonlyArray<ExecutionRequest>, extensionsReducer: (mergedExtensions: Record<string, any>, request: ExecutionRequest) => Record<string, any>): ExecutionRequest;