@graphql-tools/batch-delegate 10.0.1 → 10.0.2-alpha-d83adffc9111fdd4d1112c93a9b70254b1a42e09

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @graphql-tools/batch-delegate
 
+## 10.0.2-alpha-d83adffc9111fdd4d1112c93a9b70254b1a42e09
+### Patch Changes
+
+
+
+- [#1556](https://github.com/graphql-hive/gateway/pull/1556) [`d83adff`](https://github.com/graphql-hive/gateway/commit/d83adffc9111fdd4d1112c93a9b70254b1a42e09) Thanks [@ardatan](https://github.com/ardatan)! - Correct error paths in case of batch delegation with the same error
+
+- Updated dependencies [[`d83adff`](https://github.com/graphql-hive/gateway/commit/d83adffc9111fdd4d1112c93a9b70254b1a42e09)]:
+  - @graphql-tools/delegate@11.0.2-alpha-d83adffc9111fdd4d1112c93a9b70254b1a42e09
+
 ## 10.0.1
 ### Patch Changes
 

package/dist/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
+var promiseHelpers = require('@whatwg-node/promise-helpers');
+var graphql = require('graphql');
 var delegate = require('@graphql-tools/delegate');
 var utils = require('@graphql-tools/utils');
-var promiseHelpers = require('@whatwg-node/promise-helpers');
 var DataLoader = require('dataloader');
-var graphql = require('graphql');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -107,7 +107,16 @@ function batchDelegateToSchema(options) {
     return [];
   }
   const loader = getLoader(options);
-  return Array.isArray(key) ? loader.loadMany(key) : loader.load(key);
+  return promiseHelpers.handleMaybePromise(
+    () => Array.isArray(key) ? loader.loadMany(key) : loader.load(key),
+    (res) => res,
+    (error) => {
+      if (options.info?.path && error instanceof graphql.GraphQLError) {
+        return utils.relocatedError(error, utils.pathToArray(options.info.path));
+      }
+      return error;
+    }
+  );
 }
 
 function createBatchDelegateFn(optionsOrArgsFromKeys, lazyOptionsFn, dataLoaderOptions, valuesFromResults) {

package/dist/index.js

@@ -1,8 +1,8 @@
+import { fakePromise, handleMaybePromise } from '@whatwg-node/promise-helpers';
+import { getNamedType, print, GraphQLList, GraphQLError } from 'graphql';
 import { getActualFieldNodes, delegateToSchema } from '@graphql-tools/delegate';
-import { memoize2, memoize1, relocatedError } from '@graphql-tools/utils';
-import { fakePromise } from '@whatwg-node/promise-helpers';
+import { memoize2, memoize1, relocatedError, pathToArray } from '@graphql-tools/utils';
 import DataLoader from 'dataloader';
-import { getNamedType, print, GraphQLList } from 'graphql';
 
 const DEFAULT_ARGS_FROM_KEYS = (keys) => ({ ids: keys });
 function createBatchFn(options) {
@@ -101,7 +101,16 @@ function batchDelegateToSchema(options) {
     return [];
   }
   const loader = getLoader(options);
-  return Array.isArray(key) ? loader.loadMany(key) : loader.load(key);
+  return handleMaybePromise(
+    () => Array.isArray(key) ? loader.loadMany(key) : loader.load(key),
+    (res) => res,
+    (error) => {
+      if (options.info?.path && error instanceof GraphQLError) {
+        return relocatedError(error, pathToArray(options.info.path));
+      }
+      return error;
+    }
+  );
 }
 
 function createBatchDelegateFn(optionsOrArgsFromKeys, lazyOptionsFn, dataLoaderOptions, valuesFromResults) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/batch-delegate",
-  "version": "10.0.1",
+  "version": "10.0.2-alpha-d83adffc9111fdd4d1112c93a9b70254b1a42e09",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
@@ -38,7 +38,7 @@
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/delegate": "^11.0.1",
+    "@graphql-tools/delegate": "11.0.2-alpha-d83adffc9111fdd4d1112c93a9b70254b1a42e09",
     "@graphql-tools/utils": "^10.9.1",
     "@whatwg-node/promise-helpers": "^1.3.2",
     "dataloader": "^2.2.3",