@graphql-tools/batch-execute 9.0.1 → 9.0.2-rc-20230823115638-58a6e1fa

package/cjs/prefix.js

@@ -1,16 +1,42 @@
 "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;
+exports.parseKeyFromPath = exports.parseKey = exports.createPrefix = void 0;
 function createPrefix(index) {
     return `_${index}_`;
 }
 exports.createPrefix = createPrefix;
-function parseKey(prefixedKey) {
-    const match = /^_([\d]+)_(.*)$/.exec(prefixedKey);
+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] };
     }
-    throw new Error(`Key ${prefixedKey} is not correctly prefixed`);
+    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

@@ -30,9 +30,8 @@ function splitResult({ data, errors }, numResults) {
     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 { 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);

package/esm/prefix.js

@@ -2,10 +2,35 @@
 export function createPrefix(index) {
     return `_${index}_`;
 }
-export function parseKey(prefixedKey) {
-    const match = /^_([\d]+)_(.*)$/.exec(prefixedKey);
+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] };
     }
-    throw new Error(`Key ${prefixedKey} is not correctly prefixed`);
+    return null;
+}
+export function parseKey(prefixedKey) {
+    const match = matchKey(prefixedKey);
+    if (!match) {
+        throw new Error(`Key ${prefixedKey} is not correctly prefixed`);
+    }
+    return match;
+}
+export 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,
+    };
 }

package/esm/splitResult.js

@@ -1,6 +1,6 @@
 // adapted from https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js
 import { relocatedError } from '@graphql-tools/utils';
-import { parseKey } from './prefix.js';
+import { parseKey, parseKeyFromPath } from './prefix.js';
 /**
  * Split and transform result of the query produced by the `merge` function
  */
@@ -27,9 +27,8 @@ export function splitResult({ data, errors }, numResults) {
     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 { index, originalKey, keyOffset } = parseKeyFromPath(error.path);
+                const newError = relocatedError(error, [originalKey, ...error.path.slice(keyOffset)]);
                 const resultErrors = (splitResults[index].errors = (splitResults[index].errors ||
                     []));
                 resultErrors.push(newError);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/batch-execute",
-  "version": "9.0.1",
+  "version": "9.0.2-rc-20230823115638-58a6e1fa",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {

package/typings/prefix.d.cts

@@ -1,5 +1,9 @@
 export declare function createPrefix(index: string): string;
-export declare function parseKey(prefixedKey: string): {
+export type KeyMatch = {
     index: number;
     originalKey: string;
 };
+export declare function parseKey(prefixedKey: string): KeyMatch;
+export declare function parseKeyFromPath(path: readonly (string | number)[]): KeyMatch & {
+    keyOffset: number;
+};

package/typings/prefix.d.ts

@@ -1,5 +1,9 @@
 export declare function createPrefix(index: string): string;
-export declare function parseKey(prefixedKey: string): {
+export type KeyMatch = {
     index: number;
     originalKey: string;
 };
+export declare function parseKey(prefixedKey: string): KeyMatch;
+export declare function parseKeyFromPath(path: readonly (string | number)[]): KeyMatch & {
+    keyOffset: number;
+};