@graphql-tools/delegate 7.0.11-alpha-3e5e5d87.0 → 7.1.2

package/es5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/delegate/es5",
-  "version": "7.0.11-alpha-3e5e5d87.0",
+  "version": "7.1.2",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
@@ -8,12 +8,12 @@
   },
   "dependencies": {
     "@ardatan/aggregate-error": "0.0.6",
-    "@graphql-tools/batch-execute": "7.0.1-alpha-3e5e5d87.0",
-    "@graphql-tools/schema": "7.1.4-alpha-3e5e5d87.0",
-    "@graphql-tools/utils": "7.5.0-alpha-3e5e5d87.0",
+    "@graphql-tools/batch-execute": "^7.1.0",
+    "@graphql-tools/schema": "^7.0.0",
+    "@graphql-tools/utils": "^7.7.1",
     "dataloader": "2.0.0",
     "is-promise": "4.0.0",
-    "tslib": "~2.1.0"
+    "tslib": "~2.2.0"
   },
   "repository": {
     "type": "git",

package/es5/types.d.ts

@@ -1,6 +1,6 @@
-import { GraphQLSchema, GraphQLOutputType, SelectionSetNode, FieldNode, DocumentNode, GraphQLResolveInfo, GraphQLFieldResolver, FragmentDefinitionNode, GraphQLObjectType, VariableDefinitionNode, OperationTypeNode, GraphQLError } from 'graphql';
+import { GraphQLSchema, GraphQLOutputType, SelectionSetNode, FieldNode, GraphQLResolveInfo, GraphQLFieldResolver, FragmentDefinitionNode, GraphQLObjectType, VariableDefinitionNode, OperationTypeNode, GraphQLError } from 'graphql';
 import DataLoader from 'dataloader';
-import { Request, TypeMap, ExecutionResult } from '@graphql-tools/utils';
+import { ExecutionParams, ExecutionResult, Executor, Request, Subscriber, TypeMap } from '@graphql-tools/utils';
 import { Subschema } from './Subschema';
 import { OBJECT_SUBSCHEMA_SYMBOL, FIELD_SUBSCHEMA_MAP_SYMBOL, UNPATHED_ERRORS_SYMBOL } from './symbols';
 export declare type SchemaTransform = (originalWrappingSchema: GraphQLSchema, subschemaConfig: SubschemaConfig, transformedSchema?: GraphQLSchema) => GraphQLSchema;
@@ -27,7 +27,7 @@ export interface DelegationContext {
 }
 export declare type DelegationBinding = (delegationContext: DelegationContext) => Array<Transform>;
 export interface IDelegateToSchemaOptions<TContext = Record<string, any>, TArgs = Record<string, any>> {
-    schema: GraphQLSchema | SubschemaConfig;
+    schema: GraphQLSchema | SubschemaConfig<any, any, any, TContext>;
     operationName?: string;
     operation?: OperationTypeNode;
     fieldName?: string;
@@ -45,7 +45,7 @@ export interface IDelegateToSchemaOptions<TContext = Record<string, any>, TArgs
     skipTypeMerging?: boolean;
     binding?: DelegationBinding;
 }
-export interface IDelegateRequestOptions extends Omit<IDelegateToSchemaOptions, 'info'> {
+export interface IDelegateRequestOptions<TContext = Record<string, any>, TArgs = Record<string, any>> extends Omit<IDelegateToSchemaOptions<TContext, TArgs>, 'info'> {
     request: Request;
     info?: GraphQLResolveInfo;
 }
@@ -70,7 +70,7 @@ export interface ICreateRequest {
     selectionSet?: SelectionSetNode;
     fieldNodes?: ReadonlyArray<FieldNode>;
 }
-export interface MergedTypeInfo {
+export interface MergedTypeInfo<TContext = Record<string, any>> {
     typeName: string;
     selectionSet?: SelectionSetNode;
     targetSubschemas: Map<Subschema, Array<Subschema>>;
@@ -79,50 +79,42 @@ export interface MergedTypeInfo {
     typeMaps: Map<GraphQLSchema | SubschemaConfig, TypeMap>;
     selectionSets: Map<Subschema, SelectionSetNode>;
     fieldSelectionSets: Map<Subschema, Record<string, SelectionSetNode>>;
-    resolvers: Map<Subschema, MergedTypeResolver>;
+    resolvers: Map<Subschema, MergedTypeResolver<TContext>>;
 }
-export interface ExecutionParams<TArgs = Record<string, any>, TContext = any> {
-    document: DocumentNode;
-    variables?: TArgs;
-    extensions?: Record<string, any>;
-    context?: TContext;
-    info?: GraphQLResolveInfo;
-}
-export declare type AsyncExecutor = <TReturn = Record<string, any>, TArgs = Record<string, any>, TContext = Record<string, any>>(params: ExecutionParams<TArgs, TContext>) => Promise<ExecutionResult<TReturn>>;
-export declare type SyncExecutor = <TReturn = Record<string, any>, TArgs = Record<string, any>, TContext = Record<string, any>>(params: ExecutionParams<TArgs, TContext>) => ExecutionResult<TReturn>;
-export declare type Executor = <TReturn = Record<string, any>, TArgs = Record<string, any>, TContext = Record<string, any>>(params: ExecutionParams<TArgs, TContext>) => ExecutionResult<TReturn> | Promise<ExecutionResult<TReturn>>;
-export declare type Subscriber = <TReturn = Record<string, any>, TArgs = Record<string, any>, TContext = Record<string, any>>(params: ExecutionParams<TArgs, TContext>) => Promise<AsyncIterator<ExecutionResult<TReturn>> | ExecutionResult<TReturn>>;
-export interface ICreateProxyingResolverOptions {
-    subschemaConfig: SubschemaConfig;
+export interface ICreateProxyingResolverOptions<TContext = Record<string, any>> {
+    subschemaConfig: SubschemaConfig<any, any, any, TContext>;
     transformedSchema?: GraphQLSchema;
     operation?: OperationTypeNode;
     fieldName?: string;
 }
-export declare type CreateProxyingResolverFn = (options: ICreateProxyingResolverOptions) => GraphQLFieldResolver<any, any>;
+export declare type CreateProxyingResolverFn<TContext = Record<string, any>> = (options: ICreateProxyingResolverOptions<TContext>) => GraphQLFieldResolver<any, TContext>;
 export interface BatchingOptions<K = any, V = any, C = K> {
     extensionsReducer?: (mergedExtensions: Record<string, any>, executionParams: ExecutionParams) => Record<string, any>;
     dataLoaderOptions?: DataLoader.Options<K, V, C>;
 }
-export interface SubschemaConfig<K = any, V = any, C = K> {
+export interface SubschemaConfig<K = any, V = any, C = K, TContext = Record<string, any>> {
     schema: GraphQLSchema;
-    createProxyingResolver?: CreateProxyingResolverFn;
+    createProxyingResolver?: CreateProxyingResolverFn<TContext>;
     transforms?: Array<Transform>;
-    merge?: Record<string, MergedTypeConfig>;
+    merge?: Record<string, MergedTypeConfig<any, any, TContext>>;
     rootValue?: Record<string, any>;
-    executor?: Executor;
-    subscriber?: Subscriber;
+    executor?: Executor<TContext>;
+    subscriber?: Subscriber<TContext>;
     batch?: boolean;
     batchingOptions?: BatchingOptions<K, V, C>;
 }
-export interface MergedTypeConfig<K = any, V = 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;
-    resolve?: MergedTypeResolver;
+}
+export interface MergedTypeEntryPoint<K = any, V = any, TContext = Record<string, any>> extends MergedTypeResolverOptions<K, V> {
+    selectionSet?: string;
+    key?: (originalResult: any) => K;
+    resolve?: MergedTypeResolver<TContext>;
 }
 export interface MergedTypeResolverOptions<K = any, V = any> {
     fieldName?: string;
@@ -135,17 +127,17 @@ export interface MergedFieldConfig {
     computed?: boolean;
     canonical?: boolean;
 }
-export declare type MergedTypeResolver = (originalResult: any, context: Record<string, any>, info: GraphQLResolveInfo, subschema: GraphQLSchema | SubschemaConfig, selectionSet: SelectionSetNode, key?: any) => any;
-export interface StitchingInfo {
-    subschemaMap: Map<GraphQLSchema | SubschemaConfig, Subschema>;
+export declare type MergedTypeResolver<TContext = Record<string, any>> = (originalResult: any, context: TContext, info: GraphQLResolveInfo, subschema: GraphQLSchema | SubschemaConfig<any, any, any, TContext>, selectionSet: SelectionSetNode, key?: any) => any;
+export interface StitchingInfo<TContext = Record<string, any>> {
+    subschemaMap: Map<GraphQLSchema | SubschemaConfig<any, any, any, TContext>, Subschema<any, any, any, TContext>>;
     selectionSetsByType: Record<string, SelectionSetNode>;
     selectionSetsByField: Record<string, Record<string, SelectionSetNode>>;
     dynamicSelectionSetsByField: Record<string, Record<string, Array<(node: FieldNode) => SelectionSetNode>>>;
-    mergedTypes: Record<string, MergedTypeInfo>;
+    mergedTypes: Record<string, MergedTypeInfo<TContext>>;
 }
-export interface ExternalObject {
+export interface ExternalObject<TContext = Record<string, any>> {
     key: any;
-    [OBJECT_SUBSCHEMA_SYMBOL]: GraphQLSchema | SubschemaConfig;
-    [FIELD_SUBSCHEMA_MAP_SYMBOL]: Record<string, GraphQLSchema | SubschemaConfig>;
+    [OBJECT_SUBSCHEMA_SYMBOL]: GraphQLSchema | SubschemaConfig<any, any, any, TContext>;
+    [FIELD_SUBSCHEMA_MAP_SYMBOL]: Record<string, GraphQLSchema | SubschemaConfig<any, any, any, TContext>>;
     [UNPATHED_ERRORS_SYMBOL]: Array<GraphQLError>;
 }

package/getFieldsNotInSubschema.d.ts

@@ -1,3 +1,3 @@
 import { GraphQLSchema, FieldNode, GraphQLResolveInfo } from 'graphql';
 import { MergedTypeInfo, SubschemaConfig } from './types';
-export declare const getFieldsNotInSubschema: (A1: GraphQLResolveInfo, A2: GraphQLSchema | SubschemaConfig<any, any, any>, A3: MergedTypeInfo) => FieldNode[];
+export declare const getFieldsNotInSubschema: (A1: GraphQLResolveInfo, A2: GraphQLSchema | SubschemaConfig<any, any, any, Record<string, any>>, A3: MergedTypeInfo<Record<string, any>>) => FieldNode[];

package/index.cjs.js

@@ -236,9 +236,12 @@ function cloneSubschemaConfig(subschemaConfig) {
     if (newSubschemaConfig.merge != null) {
         newSubschemaConfig.merge = { ...subschemaConfig.merge };
         Object.keys(newSubschemaConfig.merge).forEach(typeName => {
-            newSubschemaConfig.merge[typeName] = { ...subschemaConfig.merge[typeName] };
-            const fields = newSubschemaConfig.merge[typeName].fields;
-            if (fields != null) {
+            const mergedTypeConfig = (newSubschemaConfig.merge[typeName] = { ...subschemaConfig.merge[typeName] });
+            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] };
                 });