.github/PULL_REQUEST_TEMPLATE.md

@@ -13,7 +13,10 @@
 
 Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
 
-Fixes # (issue)
+Related # (issue)
+<!--
+  Please do not use "Fixed" or "Resolves". Keep "Related" as-is.
+-->
 
 ## Type of change
 

.github/workflows/canary.yml

@@ -28,13 +28,10 @@ jobs:
         run: echo "//registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN" >> ~/.npmrc
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
-      - name: Get yarn cache
-        id: yarn-cache
-        run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Cache Yarn
         uses: actions/cache@v2
         with:
-          path: ${{ steps.yarn-cache.outputs.dir }}
+          path: '**/node_modules'
           key: ${{ runner.os }}-15-15-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-15-15-yarn-

.github/workflows/release.yml

@@ -29,13 +29,10 @@ jobs:
         run: echo "//registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN" >> ~/.npmrc
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
-      - name: Get yarn cache
-        id: yarn-cache
-        run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Cache Yarn
         uses: actions/cache@v2
         with:
-          path: ${{ steps.yarn-cache.outputs.dir }}
+          path: '**/node_modules'
           key: ${{ runner.os }}-15-15-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-15-15-yarn-

.github/workflows/tests.yml

@@ -19,16 +19,13 @@ jobs:
         uses: actions/setup-node@master
         with:
           node-version: 15
-      - name: Get yarn cache
-        id: yarn-cache
-        run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Cache Yarn
         uses: actions/cache@v2
         with:
-          path: ${{ steps.yarn-cache.outputs.dir }}
-          key: ${{ runner.os }}-${{matrix.node_version}}-${{matrix.graphql_version}}-yarn-${{ hashFiles('yarn.lock') }}
+          path: '**/node_modules'
+          key: ${{ runner.os }}-15-15-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{matrix.node_version}}-${{matrix.graphql_version}}-yarn
+            ${{ runner.os }}-15-15-yarn
       - name: Install Dependencies using Yarn
         run: yarn install --ignore-engines && git checkout yarn.lock
       - name: Lint
@@ -46,13 +43,10 @@ jobs:
         uses: actions/setup-node@master
         with:
           node-version: 15
-      - name: Get yarn cache
-        id: yarn-cache
-        run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Cache Yarn
         uses: actions/cache@v2
         with:
-          path: ${{ steps.yarn-cache.outputs.dir }}
+          path: '**/node_modules'
           key: ${{ runner.os }}-14-${{matrix.graphql_version}}-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-14-${{matrix.graphql_version}}-yarn
@@ -77,13 +71,10 @@ jobs:
         uses: actions/setup-node@master
         with:
           node-version: ${{ matrix.node_version }}
-      - name: Get yarn cache
-        id: yarn-cache
-        run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Cache Yarn
         uses: actions/cache@v2
         with:
-          path: ${{ steps.yarn-cache.outputs.dir }}
+          path: '**/node_modules'
           key: ${{ runner.os }}-${{matrix.node_version}}-${{matrix.graphql_version}}-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{matrix.node_version}}-${{matrix.graphql_version}}-yarn
@@ -99,4 +90,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-${{matrix.node_version}}-${{matrix.graphql_version}}-jest-
       - name: Test
-        run: yarn test --logHeapUsage
+        run: yarn test --ci
+        env:
+          CI: true

.github/workflows/website.yml

@@ -28,13 +28,10 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: '15.x'
-      - name: Get yarn cache
-        id: yarn-cache
-        run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Cache Yarn
         uses: actions/cache@v2
         with:
-          path: ${{ steps.yarn-cache.outputs.dir }}
+          path: '**/node_modules'
           key: ${{ runner.os }}-15-15-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-15-15-yarn-

algolia/config.json

@@ -1,6 +1,8 @@
 {
   "index_name": "theguild",
   "start_urls": [
+    "https://graphql-code-generator.com/",
+    "https://graphql-code-generator.com/docs/getting-started/index",
     "https://graphql-mesh.com/docs/",
     "https://graphql-mesh.com/docs/getting-started/introduction",
     "https://www.graphql-tools.com/docs/",
@@ -19,7 +21,8 @@
     "https://graphql-inspector.com/sitemap.xml",
     "https://graphql-modules.com/sitemap.xml",
     "https://graphql-cli.com/sitemap.xml",
-    "https://the-guild.dev/sitemap.xml"
+    "https://the-guild.dev/sitemap.xml",
+    "https://graphql-code-generator.com/sitemap.xml"
   ],
   "sitemap_alternate_links": true,
   "stop_urls": [],

babel.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+  presets: [['@babel/preset-env', { targets: { node: 'current' } }], '@babel/preset-typescript'],
+  plugins: ['@babel/plugin-proposal-class-properties'],
+};

jest.config.js

@@ -1,23 +1,18 @@
 const { resolve } = require('path');
 const { pathsToModuleNameMapper } = require('ts-jest/utils');
+const CI = !!process.env.CI;
 
 const ROOT_DIR = __dirname;
 const TSCONFIG = resolve(ROOT_DIR, 'tsconfig.json');
 const tsconfig = require(TSCONFIG);
 
 module.exports = {
-  transform: { '^.+\\.tsx?$': 'ts-jest' },
   testEnvironment: 'node',
   rootDir: ROOT_DIR,
-  globals: {
-    'ts-jest': {
-      diagnostics: false,
-      tsconfig: TSCONFIG,
-    },
-  },
   restoreMocks: true,
   reporters: ['default'],
   modulePathIgnorePatterns: ['dist', 'test-assets', 'test-files', 'fixtures'],
   moduleNameMapper: pathsToModuleNameMapper(tsconfig.compilerOptions.paths, { prefix: `${ROOT_DIR}/` }),
   collectCoverage: false,
+  cacheDirectory: resolve(ROOT_DIR, `${CI ? '' : 'node_modules/'}.cache/jest`),
 };

package.json

@@ -41,33 +41,38 @@
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "devDependencies": {
-    "patch-package": "6.2.2",
-    "@changesets/cli": "2.14.0",
-    "@types/jest": "26.0.20",
-    "@types/node": "14.14.31",
-    "@typescript-eslint/eslint-plugin": "4.15.2",
-    "@typescript-eslint/parser": "4.15.2",
     "@ardatan/bob-the-bundler": "1.2.2",
+    "@babel/core": "7.13.10",
+    "@babel/plugin-proposal-class-properties": "7.13.0",
+    "@babel/preset-env": "7.13.12",
+    "@babel/preset-typescript": "7.13.0",
+    "@changesets/cli": "2.14.1",
+    "@types/jest": "26.0.21",
+    "@types/node": "14.14.35",
+    "@typescript-eslint/eslint-plugin": "4.19.0",
+    "@typescript-eslint/parser": "4.19.0",
+    "babel-jest": "26.6.3",
     "concurrently": "6.0.0",
-    "eslint": "7.20.0",
-    "eslint-config-prettier": "8.0.0",
+    "eslint": "7.22.0",
+    "eslint-config-prettier": "8.1.0",
     "eslint-config-standard": "16.0.2",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "4.3.1",
     "eslint-plugin-standard": "5.0.0",
     "graphql": "15.5.0",
     "graphql-helix": "1.2.3",
-    "graphql-subscriptions": "1.2.0",
+    "graphql-subscriptions": "1.2.1",
     "husky": "4.3.8",
     "jest": "26.6.3",
     "lint-staged": "10.5.4",
-    "nock": "13.0.7",
+    "nock": "13.0.11",
+    "patch-package": "6.4.7",
     "prettier": "2.2.1",
-    "ts-jest": "26.5.2",
-    "typedoc": "0.20.28",
-    "typedoc-plugin-markdown": "3.5.0",
-    "typescript": "4.2.2"
+    "ts-jest": "26.5.4",
+    "typedoc": "0.20.33",
+    "typedoc-plugin-markdown": "3.6.0",
+    "typescript": "4.2.3"
   },
   "husky": {
     "hooks": {
@@ -94,6 +99,6 @@
   },
   "resolutions": {
     "graphql": "15.5.0",
-    "@changesets/apply-release-plan": "4.0.0"
+    "@changesets/apply-release-plan": "4.2.0"
   }
 }

packages/batch-delegate/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @graphql-tools/batch-delegate
 
+## 7.0.2
+
+### Patch Changes
+
+- 161963ac: fix(batch-delegate): only batch together delegations to the same root field
+
+  see #2638.
+
 ## 7.0.1
 
 ### Patch Changes

packages/batch-delegate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/batch-delegate",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",
@@ -22,14 +22,14 @@
     "input": "./src/index.ts"
   },
   "dependencies": {
-    "@graphql-tools/delegate": "^7.0.10",
+    "@graphql-tools/delegate": "^7.1.0",
     "dataloader": "2.0.0",
     "tslib": "~2.1.0"
   },
   "devDependencies": {
     "@graphql-tools/schema": "7.1.3",
-    "@graphql-tools/stitch": "7.4.0",
-    "@graphql-tools/utils": "7.5.0"
+    "@graphql-tools/stitch": "7.5.0",
+    "@graphql-tools/utils": "7.7.0"
   },
   "publishConfig": {
     "access": "public",

packages/batch-delegate/src/getLoader.ts

@@ -1,13 +1,16 @@
-import { getNamedType, GraphQLOutputType, GraphQLList, GraphQLSchema } from 'graphql';
+import { getNamedType, GraphQLOutputType, GraphQLList, GraphQLSchema, FieldNode } from 'graphql';
 
 import DataLoader from 'dataloader';
 
 import { delegateToSchema, SubschemaConfig } from '@graphql-tools/delegate';
 import { relocatedError } from '@graphql-tools/utils';
 
-import { BatchDelegateOptions, DataLoaderCache } from './types';
+import { BatchDelegateOptions } from './types';
 
-const cache1: DataLoaderCache = new WeakMap();
+const cache1: WeakMap<
+  ReadonlyArray<FieldNode>,
+  WeakMap<GraphQLSchema | SubschemaConfig, Record<string, DataLoader<any, any>>>
+> = new WeakMap();
 
 function createBatchFn<K = any>(options: BatchDelegateOptions) {
   const argsFromKeys = options.argsFromKeys ?? ((keys: ReadonlyArray<K>) => ({ ids: keys }));
@@ -33,25 +36,40 @@ function createBatchFn<K = any>(options: BatchDelegateOptions) {
 }
 
 export function getLoader<K = any, V = any, C = K>(options: BatchDelegateOptions): DataLoader<K, V, C> {
-  let cache2: WeakMap<GraphQLSchema | SubschemaConfig, DataLoader<K, V, C>> = cache1.get(options.info.fieldNodes);
-  let loader: DataLoader<K, V, C>;
+  const fieldName = options.fieldName ?? options.info.fieldName;
+
+  let cache2: WeakMap<GraphQLSchema | SubschemaConfig, Record<string, DataLoader<K, V, C>>> = cache1.get(
+    options.info.fieldNodes
+  );
 
   if (cache2 === undefined) {
-    const batchFn = createBatchFn(options);
     cache2 = new WeakMap();
     cache1.set(options.info.fieldNodes, cache2);
-    loader = new DataLoader<K, V, C>(keys => batchFn(keys), options.dataLoaderOptions);
-    cache2.set(options.schema, loader);
+    const loaders = Object.create(null);
+    cache2.set(options.schema, loaders);
+    const batchFn = createBatchFn(options);
+    const loader = new DataLoader<K, V, C>(keys => batchFn(keys), options.dataLoaderOptions);
+    loaders[fieldName] = loader;
+    return loader;
+  }
+
+  let loaders = cache2.get(options.schema);
+
+  if (loaders === undefined) {
+    loaders = Object.create(null);
+    cache2.set(options.schema, loaders);
+    const batchFn = createBatchFn(options);
+    const loader = new DataLoader<K, V, C>(keys => batchFn(keys), options.dataLoaderOptions);
+    loaders[fieldName] = loader;
     return loader;
   }
 
-  loader = cache2.get(options.schema);
+  let loader = loaders[fieldName];
 
   if (loader === undefined) {
     const batchFn = createBatchFn(options);
     loader = new DataLoader<K, V, C>(keys => batchFn(keys), options.dataLoaderOptions);
-    cache2.set(options.schema, loader);
-    return loader;
+    loaders[fieldName] = loader;
   }
 
   return loader;

packages/batch-delegate/src/types.ts

@@ -4,6 +4,7 @@ import DataLoader from 'dataloader';
 
 import { IDelegateToSchemaOptions, SubschemaConfig } from '@graphql-tools/delegate';
 
+// TODO: remove in next major release
 export type DataLoaderCache<K = any, V = any, C = K> = WeakMap<
   ReadonlyArray<FieldNode>,
   WeakMap<GraphQLSchema | SubschemaConfig, DataLoader<K, V, C>>