package.json

@@ -41,20 +41,19 @@
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "devDependencies": {
-    "patch-package": "6.4.6",
-    "@babel/core": "7.13.10",
-    "@babel/preset-env": "7.13.10",
-    "@babel/preset-typescript": "7.13.0",
-    "@babel/plugin-proposal-class-properties": "7.13.0",
-    "@changesets/cli": "2.14.0",
-    "@types/jest": "26.0.20",
-    "@types/node": "14.14.33",
-    "@typescript-eslint/eslint-plugin": "4.17.0",
-    "@typescript-eslint/parser": "4.17.0",
     "@ardatan/bob-the-bundler": "1.2.2",
+    "@babel/core": "7.13.14",
+    "@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.22",
+    "@types/node": "14.14.37",
+    "@typescript-eslint/eslint-plugin": "4.20.0",
+    "@typescript-eslint/parser": "4.20.0",
     "babel-jest": "26.6.3",
     "concurrently": "6.0.0",
-    "eslint": "7.21.0",
+    "eslint": "7.23.0",
     "eslint-config-prettier": "8.1.0",
     "eslint-config-standard": "16.0.2",
     "eslint-plugin-import": "2.22.1",
@@ -64,13 +63,14 @@
     "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.3",
-    "typedoc": "0.20.30",
+    "ts-jest": "26.5.4",
+    "typedoc": "0.20.34",
     "typedoc-plugin-markdown": "3.6.0",
     "typescript": "4.2.3"
   },
@@ -99,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/package.json

@@ -22,14 +22,14 @@
     "input": "./src/index.ts"
   },
   "dependencies": {
-    "@graphql-tools/delegate": "^7.0.10",
+    "@graphql-tools/delegate": "^7.1.1",
     "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.2"
+    "@graphql-tools/stitch": "7.5.0",
+    "@graphql-tools/utils": "7.7.1"
   },
   "publishConfig": {
     "access": "public",

packages/batch-execute/CHANGELOG.md

@@ -1,68 +1,81 @@
 # @graphql-tools/batch-execute
 
+## 7.1.0
+
+### Minor Changes
+
+- 58fd4b28: feat(types): add TContext to stitchSchemas and executor
+
+### Patch Changes
+
+- Updated dependencies [58fd4b28]
+- Updated dependencies [43da6b59]
+  - @graphql-tools/utils@7.7.0
+
 ## 7.0.0
+
 ### Major Changes
 
 - be1a1575: ## Breaking Changes:
-  
+
   #### Schema Generation and Decoration API (`@graphql-tools/schema`)
-  
+
   - Resolver validation options should now be set to `error`, `warn` or `ignore` rather than `true` or `false`. In previous versions, some of the validators caused errors to be thrown, while some issued warnings. This changes brings consistency to validator behavior.
-  
+
   - The `allowResolversNotInSchema` has been renamed to `requireResolversToMatchSchema`, to harmonize the naming convention of all the validators. The default setting of `requireResolversToMatchSchema` is `error`, matching the previous behavior.
-  
+
   #### Schema Delegation (`delegateToSchema` & `@graphql-tools/delegate`)
-  
+
   - The `delegateToSchema` return value has matured and been formalized as an `ExternalObject`, in which all errors are integrated into the GraphQL response, preserving their initial path. Those advanced users accessing the result directly will note the change in error handling. This also allows for the deprecation of unnecessary helper functions including `slicedError`, `getErrors`, `getErrorsByPathSegment` functions. Only external errors with missing or invalid paths must still be preserved by annotating the remote object with special properties. The new `getUnpathedErrors` function is therefore necessary for retrieving only these errors. Note also the new `annotateExternalObject` and `mergeExternalObjects` functions, as well as the renaming of `handleResult` to `resolveExternalValue`.
-  
+
   - Transform types and the `applySchemaTransforms` are now relocated to the `delegate` package; `applyRequestTransforms`/`applyResultTransforms` functions have been deprecated, however, as this functionality has been replaced since v6 by the `Transformer` abstraction.
-  
+
   - The `transformRequest`/`transformResult` methods are now provided additional `delegationContext` and `transformationContext` arguments -- these were introduced in v6, but previously optional.
-  
+
   - The `transformSchema` method may wish to create additional delegating resolvers and so it is now provided the `subschemaConfig` and final (non-executable) `transformedSchema` parameters. As in v6, the `transformSchema` is kicked off once to produce the non-executable version, and then, if a wrapping schema is being generated, proxying resolvers are created with access to the (non-executable) initial result. In v7, the individual `transformSchema` methods also get access to the result of the first run, if necessary, they can create additional wrapping schema proxying resolvers.
-  
+
   - `applySchemaTransforms` parameters have been updated to match and support the `transformSchema` parameters above.
-  
+
   #### Remote Schemas & Wrapping (`wrapSchema`, `makeRemoteExecutableSchema`, and `@graphql-tools/wrap`)
-  
+
   - `wrapSchema` and `generateProxyingResolvers` now only take a single options argument with named properties of type `SubschemaConfig`. The previously possible shorthand version with first argument consisting of a `GraphQLSchema` and second argument representing the transforms should be reworked as a `SubschemaConfig` object.
-  
-  - Similarly, the `ICreateProxyingResolverOptions` interface that provides the options for the `createProxyingResolver` property of `SubschemaConfig` options has  been adjusted. The `schema` property previously could be set to a `GraphQLSchema` or a `SubschemaConfig` object. This property has been removed in favor of a `subschemaConfig` property that will always be a `SubschemaConfig` object. The `transforms` property has been removed; transforms should be included within the `SubschemaConfig` object.`
-  
+
+  - Similarly, the `ICreateProxyingResolverOptions` interface that provides the options for the `createProxyingResolver` property of `SubschemaConfig` options has been adjusted. The `schema` property previously could be set to a `GraphQLSchema` or a `SubschemaConfig` object. This property has been removed in favor of a `subschemaConfig` property that will always be a `SubschemaConfig` object. The `transforms` property has been removed; transforms should be included within the `SubschemaConfig` object.`
+
   - The format of the wrapping schema has solidified. All non-root fields are expected to use identical resolvers, either `defaultMergedResolver` or a custom equivalent, with root fields doing the hard work of proxying. Support for custom merged resolvers throught `createMergedResolver` has been deprecated, as custom merging resolvers conflicts when using stitching's type merging, where resolvers are expected to be identical across subschemas.
-  
+
   - The `WrapFields` transform's `wrappingResolver` option has been removed, as this complicates multiple wrapping layers, as well as planned functionality to wrap subscription root fields in potentially multiple layers, as the wrapping resolvers may be different in different layers. Modifying resolvers can still be performed by use of an additional transform such as `TransformRootFields` or `TransformObjectFields`.
-  
+
   - The `ExtendSchema` transform has been removed, as it is conceptually simpler just to use `stitchSchemas` with one subschema.
-  
+
   - The `ReplaceFieldsWithFragment`, `AddFragmentsByField`, `AddSelectionSetsByField`, and `AddMergedTypeSelectionSets` transforms has been removed, as they are superseded by the `AddSelectionSets` and `VisitSelectionSets` transforms. The `AddSelectionSets` purposely takes parsed SDL rather than strings, to nudge end users to parse these strings at build time (when possible), rather than at runtime. Parsing of selection set strings can be performed using the `parseSelectionSet` function from `@graphql-tools/utils`.
-  
+
   #### Schema Stitching (`stitchSchemas` & `@graphql-tools/stitch`)
-  
+
   - `stitchSchemas`'s `mergeTypes` option is now true by default! This causes the `onTypeConflict` option to be ignored by default. To use `onTypeConflict` to select a specific type instead of simply merging, simply set `mergeTypes` to false.
-  
+
   - `schemas` argument has been deprecated, use `subschemas`, `typeDefs`, or `types`, depending on what you are stitching.
-  
+
   - When using batch delegation in type merging, the `argsFromKeys` function is now set only via the `argsFromKeys` property. Previously, if `argsFromKeys` was absent, it could be read from `args`.
-  
+
   - Support for fragment hints has been removed in favor of selection set hints.
-  
+
   - `stitchSchemas` now processes all `GraphQLSchema` and `SubschemaConfig` subschema input into new `Subschema` objects, handling schema config directives such aso`@computed` as well as generating the final transformed schema, stored as the `transformedSchema` property, if transforms are used. Signatures of the `onTypeConflict`, `fieldConfigMerger`, and `inputFieldConfigMerger` have been updated to include metadata related to the original and transformed subschemas. Note the property name change for `onTypeConflict` from `schema` to `subschema`.
-  
+
   #### Mocking (`addMocksToSchema` and `@graphql-tools/mock`)
-  
+
   - Mocks returning objects with fields set as functions are now operating according to upstream graphql-js convention, i.e. these functions take three arguments, `args`, `context`, and `info` with `parent` available as `this` rather than as the first argument.
-  
+
   #### Other Utilities (`@graphql-tools/utils`)
-  
-  - `filterSchema`'s `fieldFilter` will now filter *all* fields across Object, Interface, and Input types. For the previous Object-only behavior, switch to the `objectFieldFilter` option.
+
+  - `filterSchema`'s `fieldFilter` will now filter _all_ fields across Object, Interface, and Input types. For the previous Object-only behavior, switch to the `objectFieldFilter` option.
   - Unused `fieldNodes` utility functions have been removed.
   - Unused `typeContainsSelectionSet` function has been removed, and `typesContainSelectionSet` has been moved to the `stitch` package.
   - Unnecessary `Operation` type has been removed in favor of `OperationTypeNode` from upstream graphql-js.
   - As above, `applySchemaTransforms`/`applyRequestTransforms`/`applyResultTransforms` have been removed from the `utils` package, as they are implemented elsewhere or no longer necessary.
-  
+
   ## Related Issues
-  
+
   - proxy all the errors: #1047, #1641
   - better error handling for merges #2016, #2062
   - fix typings #1614

packages/batch-execute/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/batch-execute",
-  "version": "7.0.0",
+  "version": "7.1.0",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "input": "./src/index.ts"
   },
   "dependencies": {
-    "@graphql-tools/utils": "^7.0.0",
+    "@graphql-tools/utils": "^7.7.0",
     "dataloader": "2.0.0",
     "is-promise": "4.0.0",
     "tslib": "~2.1.0"

packages/batch-execute/src/createBatchingExecutor.ts

@@ -4,9 +4,7 @@ import isPromise from 'is-promise';
 
 import DataLoader from 'dataloader';
 
-import { ExecutionResult } from '@graphql-tools/utils';
-
-import { ExecutionParams, Executor } from './types';
+import { ExecutionParams, Executor, ExecutionResult } from '@graphql-tools/utils';
 
 import { mergeExecutionParams } from './mergeExecutionParams';
 import { splitResult } from './splitResult';

packages/batch-execute/src/getBatchingExecutor.ts

@@ -1,6 +1,6 @@
 import DataLoader from 'dataloader';
 
-import { ExecutionParams, Executor } from './types';
+import { ExecutionParams, Executor } from '@graphql-tools/utils';
 import { createBatchingExecutor } from './createBatchingExecutor';
 import { memoize2of4 } from './memoize';
 

packages/batch-execute/src/mergeExecutionParams.ts

@@ -18,7 +18,7 @@ import {
   OperationTypeNode,
 } from 'graphql';
 
-import { ExecutionParams } from './types';
+import { ExecutionParams } from '@graphql-tools/utils';
 
 import { createPrefix } from './prefix';
 
@@ -150,9 +150,9 @@ function aliasTopLevelFields(prefix: string, document: DocumentNode): DocumentNo
       };
     },
   };
-  return visit(document, transformer, ({ [Kind.DOCUMENT]: [`definitions`] } as unknown) as VisitorKeyMap<
-    ASTKindToNode
-  >);
+  return visit(document, transformer, ({
+    [Kind.DOCUMENT]: [`definitions`],
+  } as unknown) as VisitorKeyMap<ASTKindToNode>);
 }
 
 /**

packages/delegate/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @graphql-tools/delegate
 
+## 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
+
+- 58fd4b28: feat(types): add TContext to stitchSchemas and executor
+
+### Patch Changes
+
+- Updated dependencies [58fd4b28]
+- Updated dependencies [43da6b59]
+  - @graphql-tools/batch-execute@7.1.0
+  - @graphql-tools/utils@7.7.0
+
 ## 7.0.10
 
 ### Patch Changes

packages/delegate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/delegate",
-  "version": "7.0.10",
+  "version": "7.1.1",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",
@@ -22,9 +22,9 @@
     "input": "./src/index.ts"
   },
   "dependencies": {
-    "@graphql-tools/batch-execute": "^7.0.0",
+    "@graphql-tools/batch-execute": "^7.1.0",
     "@graphql-tools/schema": "^7.0.0",
-    "@graphql-tools/utils": "^7.1.6",
+    "@graphql-tools/utils": "^7.7.1",
     "@ardatan/aggregate-error": "0.0.6",
     "dataloader": "2.0.0",
     "is-promise": "4.0.0",

packages/delegate/src/Subschema.ts

@@ -1,41 +1,36 @@
 import { GraphQLSchema } from 'graphql';
 
-import {
-  SubschemaConfig,
-  Transform,
-  MergedTypeConfig,
-  CreateProxyingResolverFn,
-  Subscriber,
-  Executor,
-  BatchingOptions,
-} from './types';
+import { SubschemaConfig, Transform, MergedTypeConfig, CreateProxyingResolverFn, BatchingOptions } from './types';
 
 import { applySchemaTransforms } from './applySchemaTransforms';
+import { Executor, Subscriber } from '@graphql-tools/utils';
 
 export function isSubschema(value: any): value is Subschema {
   return Boolean(value.transformedSchema);
 }
 
-interface ISubschema extends SubschemaConfig {
+interface ISubschema<K = any, V = any, C = K, TContext = Record<string, any>>
+  extends SubschemaConfig<K, V, C, TContext> {
   transformedSchema: GraphQLSchema;
 }
 
-export class Subschema<K = any, V = any, C = K> implements ISubschema {
+export class Subschema<K = any, V = any, C = K, TContext = Record<string, any>>
+  implements ISubschema<K, V, C, TContext> {
   public schema: GraphQLSchema;
 
   public rootValue?: Record<string, any>;
-  public executor?: Executor;
-  public subscriber?: Subscriber;
+  public executor?: Executor<TContext>;
+  public subscriber?: Subscriber<TContext>;
   public batch?: boolean;
   public batchingOptions?: BatchingOptions<K, V, C>;
 
-  public createProxyingResolver?: CreateProxyingResolverFn;
+  public createProxyingResolver?: CreateProxyingResolverFn<TContext>;
   public transforms: Array<Transform>;
   public transformedSchema: GraphQLSchema;
 
-  public merge?: Record<string, MergedTypeConfig>;
+  public merge?: Record<string, MergedTypeConfig<any, any, TContext>>;
 
-  constructor(config: SubschemaConfig) {
+  constructor(config: SubschemaConfig<K, V, C, TContext>) {
     this.schema = config.schema;
 
     this.rootValue = config.rootValue;