ardatan · Mar 24, 2021 · Mar 24, 2021 · Mar 24, 2021 · Mar 24, 2021 · Mar 24, 2021
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -41,9 +41,3 @@ jobs:
         run: yarn deploy:website
         env:
           GIT_USER: theguild-bot
-      - name: Index Docs
-        uses: darrenjennings/algolia-docsearch-action@master
-        with:
-          algolia_api_key: ${{ secrets.ALGOLIA_API_KEY }}
-          algolia_application_id: ${{ secrets.ALGOLIA_APPLICATION_ID }}
-          file: algolia/config.json
diff --git a/.gitignore b/.gitignore
@@ -67,6 +67,7 @@ build
 temp
 .idea
 .bob
+.cache
 .DS_Store
 
 test-results/

diff --git a/.husky/.gitignore b/.husky/.gitignore
@@ -0,0 +1 @@
+_
diff --git a/algolia/config.json b/algolia/config.json
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "description": "Useful tools to create and manipulate GraphQL schemas.",
   "private": true,
   "scripts": {
-    "postinstall": "patch-package",
+    "postinstall": "patch-package && husky install",
     "predeploy:website": "yarn build:api-docs",
     "deploy:website": "cd website && yarn deploy",
     "ts:transpile": "concurrently \"tsc --project tsconfig.build.json\" \"tsc --project tsconfig.build.es5.json\"",
@@ -42,37 +42,37 @@
   },
   "devDependencies": {
     "@ardatan/bob-the-bundler": "1.2.2",
-    "@babel/core": "7.13.10",
+    "@babel/core": "7.13.15",
     "@babel/plugin-proposal-class-properties": "7.13.0",
-    "@babel/preset-env": "7.13.12",
+    "@babel/preset-env": "7.13.15",
     "@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",
+    "@changesets/cli": "2.16.0",
+    "@types/jest": "26.0.22",
+    "@types/node": "14.14.37",
+    "@typescript-eslint/eslint-plugin": "4.22.0",
+    "@typescript-eslint/parser": "4.22.0",
     "babel-jest": "26.6.3",
-    "concurrently": "6.0.0",
-    "eslint": "7.22.0",
-    "eslint-config-prettier": "8.1.0",
+    "concurrently": "6.0.2",
+    "eslint": "7.24.0",
+    "eslint-config-prettier": "8.2.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-promise": "5.1.0",
     "eslint-plugin-standard": "5.0.0",
     "graphql": "15.5.0",
     "graphql-helix": "1.2.3",
     "graphql-subscriptions": "1.2.1",
-    "husky": "4.3.8",
+    "husky": "6.0.0",
     "jest": "26.6.3",
     "lint-staged": "10.5.4",
     "nock": "13.0.11",
     "patch-package": "6.4.7",
     "prettier": "2.2.1",
     "ts-jest": "26.5.4",
-    "typedoc": "0.20.33",
-    "typedoc-plugin-markdown": "3.6.0",
-    "typescript": "4.2.3"
+    "typedoc": "0.20.35",
+    "typedoc-plugin-markdown": "3.6.1",
+    "typescript": "4.2.4"
   },
   "husky": {
     "hooks": {
@@ -99,6 +99,6 @@
   },
   "resolutions": {
     "graphql": "15.5.0",
-    "@changesets/apply-release-plan": "4.2.0"
+    "@changesets/apply-release-plan": "5.0.0"
   }
 }
diff --git a/packages/batch-delegate/package.json b/packages/batch-delegate/package.json
@@ -22,14 +22,14 @@
     "input": "./src/index.ts"
   },
   "dependencies": {
-    "@graphql-tools/delegate": "^7.1.0",
+    "@graphql-tools/delegate": "^7.1.2",
     "dataloader": "2.0.0",
-    "tslib": "~2.1.0"
+    "tslib": "~2.2.0"
   },
   "devDependencies": {
     "@graphql-tools/schema": "7.1.3",
-    "@graphql-tools/stitch": "7.5.0",
-    "@graphql-tools/utils": "7.7.0"
+    "@graphql-tools/stitch": "7.5.1",
+    "@graphql-tools/utils": "7.7.2"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/batch-execute/package.json b/packages/batch-execute/package.json
@@ -25,7 +25,7 @@
     "@graphql-tools/utils": "^7.7.0",
     "dataloader": "2.0.0",
     "is-promise": "4.0.0",
-    "tslib": "~2.1.0"
+    "tslib": "~2.2.0"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/delegate/CHANGELOG.md b/packages/delegate/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @graphql-tools/delegate
 
+## 7.1.2
+
+### Patch Changes
+
+- 6aed1714: Allows `MergedTypeConfig` to be written with an `entryPoints` array for multiple merged type entry points, each with their own `fieldName` and `selectionSet`:
+
+  ```js
+  {
+    schema: testSchema,
+    merge: {
+      Product: {
+        entryPoints: [{
+          selectionSet: '{ id }',
+          fieldName: 'productById',
+          key: ({ id, price, weight }) => ({ id, price, weight }),
+          argsFromKeys: (key) => ({ key }),
+        }, {
+          selectionSet: '{ upc }',
+          fieldName: 'productByUpc',
+          key: ({ upc, price, weight }) => ({ upc, price, weight }),
+          argsFromKeys: (key) => ({ key }),
+        }],
+      }
+    }
+  }
+  ```
+
+  These multiple entry points accommodate types with multiple keys across services that rely on a central service to join them, for example:
+
+  - Catalog service: `type Product { upc }`
+  - Vendors service: `type Product { upc id }`
+  - Reviews service: `type Product { id }`
+
+  Given this graph, the possible traversals require the Vendors service to provide entry points for each unique key format:
+
+  - `Catalog > Vendors > Reviews`
+  - `Catalog < Vendors > Reviews`
+  - `Catalog < Vendors < Reviews`
+
+  Is it highly recommended that you enable query batching for subschemas with multiple entry points.
+
+## 7.1.1
+
+### Patch Changes
+
+- f84e7b15: fix(delegate): export executor typings not to have breaking change
+- Updated dependencies [194ac370]
+  - @graphql-tools/utils@7.7.1
+
 ## 7.1.0
 
 ### Minor Changes

diff --git a/packages/delegate/package.json b/packages/delegate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/delegate",
-  "version": "7.1.0",
+  "version": "7.1.2",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",
@@ -24,11 +24,11 @@
   "dependencies": {
     "@graphql-tools/batch-execute": "^7.1.0",
     "@graphql-tools/schema": "^7.0.0",
-    "@graphql-tools/utils": "^7.7.0",
+    "@graphql-tools/utils": "^7.7.1",
     "@ardatan/aggregate-error": "0.0.6",
     "dataloader": "2.0.0",
     "is-promise": "4.0.0",
-    "tslib": "~2.1.0"
+    "tslib": "~2.2.0"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/delegate/src/index.ts b/packages/delegate/src/index.ts
@@ -9,3 +9,4 @@ export * from './resolveExternalValue';
 export * from './subschemaConfig';
 export * from './transforms';
 export * from './types';
+export { Executor, Subscriber, AsyncExecutor, SyncExecutor, ExecutionParams } from '@graphql-tools/utils';
diff --git a/packages/delegate/src/subschemaConfig.ts b/packages/delegate/src/subschemaConfig.ts
@@ -13,10 +13,14 @@ export function cloneSubschemaConfig(subschemaConfig: SubschemaConfig): Subschem
   if (newSubschemaConfig.merge != null) {
     newSubschemaConfig.merge = { ...subschemaConfig.merge };
     Object.keys(newSubschemaConfig.merge).forEach(typeName => {
-      newSubschemaConfig.merge[typeName] = { ...subschemaConfig.merge[typeName] };
+      const mergedTypeConfig = (newSubschemaConfig.merge[typeName] = { ...subschemaConfig.merge[typeName] });
 
-      const fields = newSubschemaConfig.merge[typeName].fields;
-      if (fields != null) {
+      if (mergedTypeConfig.entryPoints != null) {
+        mergedTypeConfig.entryPoints = mergedTypeConfig.entryPoints.map(entryPoint => ({ ...entryPoint }));
+      }
+
+      if (mergedTypeConfig.fields != null) {
+        const fields = (mergedTypeConfig.fields = { ...mergedTypeConfig.fields });
         Object.keys(fields).forEach(fieldName => {
           fields[fieldName] = { ...fields[fieldName] };
         });

diff --git a/packages/delegate/src/types.ts b/packages/delegate/src/types.ts
@@ -147,13 +147,16 @@ export interface SubschemaConfig<K = any, V = any, C = K, TContext = Record<stri
   batchingOptions?: BatchingOptions<K, V, C>;
 }
 
-export interface MergedTypeConfig<K = any, V = any, TContext = Record<string, any>>
-  extends MergedTypeResolverOptions<K, V> {
-  selectionSet?: string;
+export interface MergedTypeConfig<K = any, V = any, TContext = Record<string, any>> extends MergedTypeEntryPoint<K, V, TContext> {
+  entryPoints?: Array<MergedTypeEntryPoint>;
   fields?: Record<string, MergedFieldConfig>;
   computedFields?: Record<string, { selectionSet?: string }>;
-  key?: (originalResult: any) => K;
   canonical?: boolean;
+}
+
+export interface MergedTypeEntryPoint<K = any, V = any, TContext = Record<string, any>> extends MergedTypeResolverOptions<K, V> {
+  selectionSet?: string;
+  key?: (originalResult: any) => K;
   resolve?: MergedTypeResolver<TContext>;
 }
 

diff --git a/packages/graphql-tag-pluck/package.json b/packages/graphql-tag-pluck/package.json
@@ -19,15 +19,15 @@
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "@babel/parser": "7.13.12",
-    "@babel/traverse": "7.13.0",
-    "@babel/types": "7.13.12",
+    "@babel/parser": "7.13.15",
+    "@babel/traverse": "7.13.15",
+    "@babel/types": "7.13.14",
     "@graphql-tools/utils": "^7.0.0",
-    "tslib": "~2.1.0"
+    "tslib": "~2.2.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "7.11.1",
-    "@vue/compiler-sfc": "3.0.7"
+    "@vue/compiler-sfc": "3.0.11"
   },
   "buildOptions": {
     "external": [

diff --git a/packages/graphql-tools/package.json b/packages/graphql-tools/package.json
@@ -47,6 +47,6 @@
     "@graphql-tools/stitch": "^7.3.0",
     "@graphql-tools/utils": "^7.0.1",
     "@graphql-tools/wrap": "^7.0.0",
-    "tslib": "~2.1.0"
+    "tslib": "~2.2.0"
   }
 }
diff --git a/packages/import/package.json b/packages/import/package.json
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "resolve-from": "5.0.0",
-    "tslib": "~2.1.0"
+    "tslib": "~2.2.0"
   }
 }
diff --git a/packages/links/package.json b/packages/links/package.json
@@ -28,7 +28,7 @@
     ]
   },
   "devDependencies": {
-    "@apollo/client": "3.3.12",
+    "@apollo/client": "3.3.15",
     "@types/apollo-upload-client": "14.1.0",
     "@types/graphql-upload": "8.0.4",
     "express-graphql": "0.12.0",
@@ -38,10 +38,10 @@
     "@graphql-tools/delegate": "^7.1.0",
     "@graphql-tools/utils": "^7.7.0",
     "apollo-upload-client": "14.1.3",
-    "cross-fetch": "3.1.2",
+    "cross-fetch": "3.1.4",
     "form-data": "4.0.0",
     "is-promise": "4.0.0",
-    "tslib": "~2.1.0"
+    "tslib": "~2.2.0"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/load-files/CHANGELOG.md b/packages/load-files/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @graphql-tools/load-files
 
+## 6.3.2
+
+### Patch Changes
+
+- 7c6e0083: Remove duplicate code
+
 ## 6.3.1
 
 ### Patch Changes

diff --git a/packages/load-files/package.json b/packages/load-files/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/load-files",
-  "version": "6.3.1",
+  "version": "6.3.2",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
   "dependencies": {
     "globby": "11.0.3",
     "unixify": "1.0.0",
-    "tslib": "~2.1.0"
+    "tslib": "~2.2.0"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/load-files/src/index.ts b/packages/load-files/src/index.ts
@@ -233,15 +233,6 @@ export async function loadFiles(
         if (extension === formatExtension('js') || extension === formatExtension('ts') || execOptions.useRequire) {
           const fileExports = await requireMethod(path);
           const extractedExport = extractExports(fileExports);
-
-          if (extractedExport.resolver) {
-            return extractedExport.resolver;
-          }
-
-          if (extractedExport.resolvers) {
-            return extractedExport.resolvers;
-          }
-
           return extractedExport;
         } else {
           return readFile(path, { encoding: 'utf-8' });
-Original file line number
+Diff line change
@@ @@ -67,6 +67,7 @@ build @@
     temp
     .idea
     .bob
+    .cache
     .DS_Store
     test-results/