@graphql-tools/batch-execute 8.1.1-alpha-be1b2ebd.0 → 8.1.1

package/createBatchingExecutor.d.ts

@@ -1,3 +1,3 @@
 import DataLoader from 'dataloader';
-import { ExecutionRequest, Executor } from '@graphql-tools/utils';
+import { Executor, ExecutionRequest } 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/index.js

@@ -10,10 +10,10 @@ const utils = require('@graphql-tools/utils');
 
 // adapted from https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js
 function createPrefix(index) {
-    return `graphqlTools${index}_`;
+    return `_${index}_`;
 }
 function parseKey(prefixedKey) {
-    const match = /^graphqlTools([\d]+)_(.*)$/.exec(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] };
     }
@@ -55,7 +55,7 @@ function parseKey(prefixedKey) {
  *     }
  *   }
  */
-function mergeRequests(requests, extensionsReducer) {
+function mergeRequests(operationType, requests, extensionsReducer) {
     const mergedVariables = Object.create(null);
     const mergedVariableDefinitions = [];
     const mergedSelections = [];
@@ -63,7 +63,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(createPrefix(index), request, operationType);
         for (const def of prefixedRequests.document.definitions) {
             if (isOperationDefinition(def)) {
                 mergedSelections.push(...def.selectionSet.selections);
@@ -80,7 +80,7 @@ function mergeRequests(requests, extensionsReducer) {
     }
     const mergedOperationDefinition = {
         kind: graphql.Kind.OPERATION_DEFINITION,
-        operation: requests[0].operationType,
+        operation: operationType,
         variableDefinitions: mergedVariableDefinitions,
         selectionSet: {
             kind: graphql.Kind.SELECTION_SET,
@@ -96,10 +96,10 @@ function mergeRequests(requests, extensionsReducer) {
         extensions: mergedExtensions,
         context: requests[0].context,
         info: requests[0].info,
-        operationType: requests[0].operationType,
+        operationType,
     };
 }
-function prefixRequest(prefix, request) {
+function prefixRequest(prefix, request, operationType) {
     var _a;
     const executionVariables = (_a = request.variables) !== null && _a !== void 0 ? _a : {};
     function prefixNode(node) {
@@ -107,21 +107,35 @@ function prefixRequest(prefix, request) {
     }
     let prefixedDocument = aliasTopLevelFields(prefix, request.document);
     const executionVariableNames = Object.keys(executionVariables);
-    if (executionVariableNames.length > 0) {
+    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]: prefixNode,
+            [graphql.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,
-        operationType: request.operationType,
+        operationType,
     };
 }
 /**
@@ -286,8 +300,14 @@ function splitResult({ data, errors }, numResults) {
                 const parsedKey = parseKey(error.path[0]);
                 const { index, originalKey } = parsedKey;
                 const newError = utils.relocatedError(error, [originalKey, ...error.path.slice(1)]);
-                const errors = (splitResults[index].errors = (splitResults[index].errors || []));
-                errors.push(newError);
+                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));
+                });
             }
         }
     }
@@ -309,21 +329,22 @@ function createLoadFn(executor, extensionsReducer) {
         let currentBatch = [request];
         execBatches.push(currentBatch);
         const operationType = request.operationType;
+        if (operationType == null) {
+            throw new Error('could not identify operation type of document');
+        }
         while (++index < requests.length) {
-            const currentOperationType = requests[index].operationType;
-            if (operationType == null) {
-                throw new Error('Could not identify operation type of document.');
-            }
+            const currentRequest = requests[index];
+            const currentOperationType = currentRequest.operationType;
             if (operationType === currentOperationType) {
-                currentBatch.push(requests[index]);
+                currentBatch.push(currentRequest);
             }
             else {
-                currentBatch = [requests[index]];
+                currentBatch = [currentRequest];
                 execBatches.push(currentBatch);
             }
         }
         const results = await Promise.all(execBatches.map(async (execBatch) => {
-            const mergedRequests = mergeRequests(execBatch, extensionsReducer);
+            const mergedRequests = mergeRequests(execBatch[0].operationType, execBatch, extensionsReducer);
             const resultBatches = (await executor(mergedRequests));
             return splitResult(resultBatches, execBatch.length);
         }));

package/index.mjs

@@ -1,13 +1,13 @@
 import DataLoader from 'dataloader';
-import { Kind, visit } from 'graphql';
+import { Kind, visit, GraphQLError } from 'graphql';
 import { relocatedError, memoize2of4 } from '@graphql-tools/utils';
 
 // adapted from https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js
 function createPrefix(index) {
-    return `graphqlTools${index}_`;
+    return `_${index}_`;
 }
 function parseKey(prefixedKey) {
-    const match = /^graphqlTools([\d]+)_(.*)$/.exec(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] };
     }
@@ -49,7 +49,7 @@ function parseKey(prefixedKey) {
  *     }
  *   }
  */
-function mergeRequests(requests, extensionsReducer) {
+function mergeRequests(operationType, requests, extensionsReducer) {
     const mergedVariables = Object.create(null);
     const mergedVariableDefinitions = [];
     const mergedSelections = [];
@@ -57,7 +57,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(createPrefix(index), request, operationType);
         for (const def of prefixedRequests.document.definitions) {
             if (isOperationDefinition(def)) {
                 mergedSelections.push(...def.selectionSet.selections);
@@ -74,7 +74,7 @@ function mergeRequests(requests, extensionsReducer) {
     }
     const mergedOperationDefinition = {
         kind: Kind.OPERATION_DEFINITION,
-        operation: requests[0].operationType,
+        operation: operationType,
         variableDefinitions: mergedVariableDefinitions,
         selectionSet: {
             kind: Kind.SELECTION_SET,
@@ -90,10 +90,10 @@ function mergeRequests(requests, extensionsReducer) {
         extensions: mergedExtensions,
         context: requests[0].context,
         info: requests[0].info,
-        operationType: requests[0].operationType,
+        operationType,
     };
 }
-function prefixRequest(prefix, request) {
+function prefixRequest(prefix, request, operationType) {
     var _a;
     const executionVariables = (_a = request.variables) !== null && _a !== void 0 ? _a : {};
     function prefixNode(node) {
@@ -101,21 +101,35 @@ function prefixRequest(prefix, request) {
     }
     let prefixedDocument = aliasTopLevelFields(prefix, request.document);
     const executionVariableNames = Object.keys(executionVariables);
-    if (executionVariableNames.length > 0) {
+    const hasFragmentDefinitions = request.document.definitions.some(def => isFragmentDefinition(def));
+    const fragmentSpreadImpl = {};
+    if (executionVariableNames.length > 0 || hasFragmentDefinitions) {
         prefixedDocument = visit(prefixedDocument, {
             [Kind.VARIABLE]: prefixNode,
             [Kind.FRAGMENT_DEFINITION]: prefixNode,
-            [Kind.FRAGMENT_SPREAD]: prefixNode,
+            [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,
-        operationType: request.operationType,
+        operationType,
     };
 }
 /**
@@ -280,8 +294,14 @@ 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 errors = (splitResults[index].errors = (splitResults[index].errors || []));
-                errors.push(newError);
+                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));
+                });
             }
         }
     }
@@ -303,21 +323,22 @@ function createLoadFn(executor, extensionsReducer) {
         let currentBatch = [request];
         execBatches.push(currentBatch);
         const operationType = request.operationType;
+        if (operationType == null) {
+            throw new Error('could not identify operation type of document');
+        }
         while (++index < requests.length) {
-            const currentOperationType = requests[index].operationType;
-            if (operationType == null) {
-                throw new Error('Could not identify operation type of document.');
-            }
+            const currentRequest = requests[index];
+            const currentOperationType = currentRequest.operationType;
             if (operationType === currentOperationType) {
-                currentBatch.push(requests[index]);
+                currentBatch.push(currentRequest);
             }
             else {
-                currentBatch = [requests[index]];
+                currentBatch = [currentRequest];
                 execBatches.push(currentBatch);
             }
         }
         const results = await Promise.all(execBatches.map(async (execBatch) => {
-            const mergedRequests = mergeRequests(execBatch, extensionsReducer);
+            const mergedRequests = mergeRequests(execBatch[0].operationType, execBatch, extensionsReducer);
             const resultBatches = (await executor(mergedRequests));
             return splitResult(resultBatches, execBatch.length);
         }));

package/mergeRequests.d.ts

@@ -1,3 +1,4 @@
+import { OperationTypeNode } from 'graphql';
 import { ExecutionRequest } from '@graphql-tools/utils';
 /**
  * Merge multiple queries into a single query in such a way that query results
@@ -33,4 +34,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(operationType: OperationTypeNode, requests: Array<ExecutionRequest>, extensionsReducer: (mergedExtensions: Record<string, any>, request: ExecutionRequest) => Record<string, any>): ExecutionRequest;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@graphql-tools/batch-execute",
-  "version": "8.1.1-alpha-be1b2ebd.0",
+  "version": "8.1.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"
   },
   "dependencies": {
-    "@graphql-tools/utils": "9.0.0-alpha-be1b2ebd.0",
+    "@graphql-tools/utils": "^8.2.4",
     "dataloader": "2.0.0",
     "tslib": "~2.3.0",
     "value-or-promise": "1.0.10"