@graphql-tools/batch-delegate 9.0.26 → 9.0.27-alpha-b8b708a9eeee5075b250f1ba263eb7121fd7ae50

package/CHANGELOG.md

@@ -1,5 +1,71 @@
 # @graphql-tools/batch-delegate
 
+## 9.0.27-alpha-b8b708a9eeee5075b250f1ba263eb7121fd7ae50
+
+### Patch Changes
+
+- [#396](https://github.com/graphql-hive/gateway/pull/396) [`b8b708a`](https://github.com/graphql-hive/gateway/commit/b8b708a9eeee5075b250f1ba263eb7121fd7ae50) Thanks [@ardatan](https://github.com/ardatan)! - Memoize the key arguments correctly;
+
+  With the following schema and resolvers, `userById` should batch all the requests to `usersByIds`;
+
+  ```ts
+  {
+        typeDefs: /* GraphQL */ `
+          type User {
+            id: ID!
+            email: String!
+          }
+          type Query {
+            userById(id: ID!): User
+            usersByIds(ids: [ID!]): [User]
+          }
+        `,
+        resolvers: {
+          Query: {
+            usersByIds: (_root, args) => {
+              return args.ids.map((id: string) => users.find((user) => user.id === id));
+            },
+            userById: (root, args, context, info) => {
+              return batchDelegateToSchema({
+                schema: userSubschema,
+                fieldName: 'usersByIds',
+                key: args.id,
+                rootValue: root,
+                context,
+                info,
+              })
+            },
+          },
+        },
+      }
+  ```
+
+  This query should batch all the requests to `usersByIds`:
+
+  ```graphql
+  {
+    userById(id: "1") {
+      id
+      email
+    }
+    userById(id: "2") {
+      id
+      email
+    }
+  }
+  ```
+
+  The delegation request should be;
+
+  ```graphql
+  {
+    usersByIds(ids: ["1", "2"]) {
+      id
+      email
+    }
+  }
+  ```
+
 ## 9.0.26
 
 ### Patch Changes

package/dist/index.cjs

@@ -9,8 +9,9 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var DataLoader__default = /*#__PURE__*/_interopDefault(DataLoader);
 
+const DEFAULT_ARGS_FROM_KEYS = (keys) => ({ ids: keys });
 function createBatchFn(options) {
-  const argsFromKeys = options.argsFromKeys ?? ((keys) => ({ ids: keys }));
+  const argsFromKeys = options.argsFromKeys ?? DEFAULT_ARGS_FROM_KEYS;
   const fieldName = options.fieldName ?? options.info.fieldName;
   const { valuesFromResults, lazyOptionsFn } = options;
   return function batchFn(keys) {
@@ -74,7 +75,9 @@ function getLoader(options) {
     dataLoaderOptions,
     fieldNodes = info.fieldNodes[0] && delegate.getActualFieldNodes(info.fieldNodes[0]),
     selectionSet = fieldNodes?.[0]?.selectionSet,
-    returnType = info.returnType
+    returnType = info.returnType,
+    argsFromKeys = DEFAULT_ARGS_FROM_KEYS,
+    key
   } = options;
   const loaders = getLoadersMap(context ?? GLOBAL_CONTEXT, schema);
   let cacheKey = fieldName;
@@ -87,7 +90,8 @@ function getLoader(options) {
   }
   const fieldNode = fieldNodes?.[0];
   if (fieldNode?.arguments) {
-    cacheKey += fieldNode.arguments.map((arg) => memoizedPrint(arg)).join(",");
+    const args = argsFromKeys([key]);
+    cacheKey += fieldNode.arguments.filter((arg) => arg.name.value in args).map((arg) => memoizedPrint(arg)).join(",");
   }
   let loader = loaders.get(cacheKey);
   if (loader === void 0) {

package/dist/index.js

@@ -3,8 +3,9 @@ import { memoize2, memoize1, fakePromise, mapMaybePromise, relocatedError } from
 import DataLoader from 'dataloader';
 import { print, getNamedType, GraphQLList } from 'graphql';
 
+const DEFAULT_ARGS_FROM_KEYS = (keys) => ({ ids: keys });
 function createBatchFn(options) {
-  const argsFromKeys = options.argsFromKeys ?? ((keys) => ({ ids: keys }));
+  const argsFromKeys = options.argsFromKeys ?? DEFAULT_ARGS_FROM_KEYS;
   const fieldName = options.fieldName ?? options.info.fieldName;
   const { valuesFromResults, lazyOptionsFn } = options;
   return function batchFn(keys) {
@@ -68,7 +69,9 @@ function getLoader(options) {
     dataLoaderOptions,
     fieldNodes = info.fieldNodes[0] && getActualFieldNodes(info.fieldNodes[0]),
     selectionSet = fieldNodes?.[0]?.selectionSet,
-    returnType = info.returnType
+    returnType = info.returnType,
+    argsFromKeys = DEFAULT_ARGS_FROM_KEYS,
+    key
   } = options;
   const loaders = getLoadersMap(context ?? GLOBAL_CONTEXT, schema);
   let cacheKey = fieldName;
@@ -81,7 +84,8 @@ function getLoader(options) {
   }
   const fieldNode = fieldNodes?.[0];
   if (fieldNode?.arguments) {
-    cacheKey += fieldNode.arguments.map((arg) => memoizedPrint(arg)).join(",");
+    const args = argsFromKeys([key]);
+    cacheKey += fieldNode.arguments.filter((arg) => arg.name.value in args).map((arg) => memoizedPrint(arg)).join(",");
   }
   let loader = loaders.get(cacheKey);
   if (loader === void 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/batch-delegate",
-  "version": "9.0.26",
+  "version": "9.0.27-alpha-b8b708a9eeee5075b250f1ba263eb7121fd7ae50",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {