@graphql-tools/delegate 8.5.2 → 8.6.0-alpha-bd5ea4d7.0

package/createRequest.d.ts

@@ -1,6 +1,5 @@
 import { GraphQLSchema, GraphQLObjectType, OperationTypeNode } from 'graphql';
 import { ExecutionRequest } from '@graphql-tools/utils';
-import { ICreateRequestFromInfo, ICreateRequest } from './types';
+import { ICreateRequest } from './types';
 export declare function getDelegatingOperation(parentType: GraphQLObjectType, schema: GraphQLSchema): OperationTypeNode;
-export declare function createRequestFromInfo({ info, rootValue, operationName, operation, fieldName, selectionSet, fieldNodes, context, }: ICreateRequestFromInfo): ExecutionRequest;
 export declare function createRequest({ sourceSchema, sourceParentType, sourceFieldName, fragments, variableDefinitions, variableValues, targetRootValue, targetOperationName, targetOperation, targetFieldName, selectionSet, fieldNodes, context, info, }: ICreateRequest): ExecutionRequest;

package/index.js

@@ -708,20 +708,21 @@ async function executeDelegationStage(mergedTypeInfo, delegationMap, object, con
     const combinedErrors = object[UNPATHED_ERRORS_SYMBOL];
     const path = graphql.responsePathAsArray(info.path);
     const combinedFieldSubschemaMap = object[FIELD_SUBSCHEMA_MAP_SYMBOL];
-    const type = info.schema.getType(object.__typename);
-    await Promise.all([...delegationMap.entries()].map(async ([s, selectionSet]) => {
+    await Promise.all([...delegationMap.entries()].map(async ([subschema, selectionSet]) => {
         var _a;
-        const resolver = mergedTypeInfo.resolvers.get(s);
+        const schema = subschema.transformedSchema || info.schema;
+        const type = schema.getType(object.__typename);
+        const resolver = mergedTypeInfo.resolvers.get(subschema);
         if (resolver) {
             let source;
             try {
-                source = await resolver(object, context, info, s, selectionSet);
+                source = await resolver(object, context, info, subschema, selectionSet, undefined, type);
             }
             catch (error) {
                 source = error;
             }
             if (source instanceof Error || source == null) {
-                const fieldNodeResponseKeyMap = utils.collectFields(info.schema, {}, {}, type, selectionSet, new Map(), new Set());
+                const fieldNodeResponseKeyMap = utils.collectFields(schema, EMPTY_OBJECT, EMPTY_OBJECT, type, selectionSet, new Map(), new Set());
                 const nullResult = {};
                 for (const [responseKey, fieldNodes] of fieldNodeResponseKeyMap) {
                     const combinedPath = [...path, responseKey];
@@ -967,24 +968,6 @@ function getDelegatingOperation(parentType, schema) {
     }
     return 'query';
 }
-function createRequestFromInfo({ info, rootValue, operationName, operation = getDelegatingOperation(info.parentType, info.schema), fieldName = info.fieldName, selectionSet, fieldNodes = info.fieldNodes, context, }) {
-    return createRequest({
-        sourceSchema: info.schema,
-        sourceParentType: info.parentType,
-        sourceFieldName: info.fieldName,
-        fragments: info.fragments,
-        variableDefinitions: info.operation.variableDefinitions,
-        variableValues: info.variableValues,
-        targetRootValue: rootValue,
-        targetOperationName: operationName,
-        targetOperation: operation,
-        targetFieldName: fieldName,
-        selectionSet,
-        fieldNodes,
-        context,
-        info,
-    });
-}
 function createRequest({ sourceSchema, sourceParentType, sourceFieldName, fragments, variableDefinitions, variableValues, targetRootValue, targetOperationName, targetOperation, targetFieldName, selectionSet, fieldNodes, context, info, }) {
     var _a, _b;
     let newSelectionSet;
@@ -1145,16 +1128,23 @@ function cloneSubschemaConfig(subschemaConfig) {
 }
 
 function delegateToSchema(options) {
-    const { info, schema, rootValue, operationName, operation = getDelegatingOperation(info.parentType, info.schema), fieldName = info.fieldName, selectionSet, fieldNodes, context, } = options;
-    const request = createRequestFromInfo({
-        info,
-        operation,
-        fieldName,
+    var _a, _b;
+    const { info, schema, rootValue = (_a = schema.rootValue) !== null && _a !== void 0 ? _a : info.rootValue, operationName = (_b = info.operation.name) === null || _b === void 0 ? void 0 : _b.value, operation = getDelegatingOperation(info.parentType, info.schema), fieldName = info.fieldName, selectionSet, fieldNodes = info.fieldNodes, context, } = options;
+    const request = createRequest({
+        sourceSchema: info.schema,
+        sourceParentType: info.parentType,
+        sourceFieldName: info.fieldName,
+        fragments: info.fragments,
+        variableDefinitions: info.operation.variableDefinitions,
+        variableValues: info.variableValues,
+        targetRootValue: rootValue,
+        targetOperationName: operationName,
+        targetOperation: operation,
+        targetFieldName: fieldName,
         selectionSet,
         fieldNodes,
-        rootValue: rootValue !== null && rootValue !== void 0 ? rootValue : schema.rootValue,
-        operationName,
         context,
+        info,
     });
     return delegateRequest({
         ...options,
@@ -1278,7 +1268,6 @@ exports.applySchemaTransforms = applySchemaTransforms;
 exports.cloneSubschemaConfig = cloneSubschemaConfig;
 exports.createDefaultExecutor = createDefaultExecutor;
 exports.createRequest = createRequest;
-exports.createRequestFromInfo = createRequestFromInfo;
 exports.defaultMergedResolver = defaultMergedResolver;
 exports.delegateRequest = delegateRequest;
 exports.delegateToSchema = delegateToSchema;

package/index.mjs

@@ -704,20 +704,21 @@ async function executeDelegationStage(mergedTypeInfo, delegationMap, object, con
     const combinedErrors = object[UNPATHED_ERRORS_SYMBOL];
     const path = responsePathAsArray(info.path);
     const combinedFieldSubschemaMap = object[FIELD_SUBSCHEMA_MAP_SYMBOL];
-    const type = info.schema.getType(object.__typename);
-    await Promise.all([...delegationMap.entries()].map(async ([s, selectionSet]) => {
+    await Promise.all([...delegationMap.entries()].map(async ([subschema, selectionSet]) => {
         var _a;
-        const resolver = mergedTypeInfo.resolvers.get(s);
+        const schema = subschema.transformedSchema || info.schema;
+        const type = schema.getType(object.__typename);
+        const resolver = mergedTypeInfo.resolvers.get(subschema);
         if (resolver) {
             let source;
             try {
-                source = await resolver(object, context, info, s, selectionSet);
+                source = await resolver(object, context, info, subschema, selectionSet, undefined, type);
             }
             catch (error) {
                 source = error;
             }
             if (source instanceof Error || source == null) {
-                const fieldNodeResponseKeyMap = collectFields(info.schema, {}, {}, type, selectionSet, new Map(), new Set());
+                const fieldNodeResponseKeyMap = collectFields(schema, EMPTY_OBJECT, EMPTY_OBJECT, type, selectionSet, new Map(), new Set());
                 const nullResult = {};
                 for (const [responseKey, fieldNodes] of fieldNodeResponseKeyMap) {
                     const combinedPath = [...path, responseKey];
@@ -963,24 +964,6 @@ function getDelegatingOperation(parentType, schema) {
     }
     return 'query';
 }
-function createRequestFromInfo({ info, rootValue, operationName, operation = getDelegatingOperation(info.parentType, info.schema), fieldName = info.fieldName, selectionSet, fieldNodes = info.fieldNodes, context, }) {
-    return createRequest({
-        sourceSchema: info.schema,
-        sourceParentType: info.parentType,
-        sourceFieldName: info.fieldName,
-        fragments: info.fragments,
-        variableDefinitions: info.operation.variableDefinitions,
-        variableValues: info.variableValues,
-        targetRootValue: rootValue,
-        targetOperationName: operationName,
-        targetOperation: operation,
-        targetFieldName: fieldName,
-        selectionSet,
-        fieldNodes,
-        context,
-        info,
-    });
-}
 function createRequest({ sourceSchema, sourceParentType, sourceFieldName, fragments, variableDefinitions, variableValues, targetRootValue, targetOperationName, targetOperation, targetFieldName, selectionSet, fieldNodes, context, info, }) {
     var _a, _b;
     let newSelectionSet;
@@ -1141,16 +1124,23 @@ function cloneSubschemaConfig(subschemaConfig) {
 }
 
 function delegateToSchema(options) {
-    const { info, schema, rootValue, operationName, operation = getDelegatingOperation(info.parentType, info.schema), fieldName = info.fieldName, selectionSet, fieldNodes, context, } = options;
-    const request = createRequestFromInfo({
-        info,
-        operation,
-        fieldName,
+    var _a, _b;
+    const { info, schema, rootValue = (_a = schema.rootValue) !== null && _a !== void 0 ? _a : info.rootValue, operationName = (_b = info.operation.name) === null || _b === void 0 ? void 0 : _b.value, operation = getDelegatingOperation(info.parentType, info.schema), fieldName = info.fieldName, selectionSet, fieldNodes = info.fieldNodes, context, } = options;
+    const request = createRequest({
+        sourceSchema: info.schema,
+        sourceParentType: info.parentType,
+        sourceFieldName: info.fieldName,
+        fragments: info.fragments,
+        variableDefinitions: info.operation.variableDefinitions,
+        variableValues: info.variableValues,
+        targetRootValue: rootValue,
+        targetOperationName: operationName,
+        targetOperation: operation,
+        targetFieldName: fieldName,
         selectionSet,
         fieldNodes,
-        rootValue: rootValue !== null && rootValue !== void 0 ? rootValue : schema.rootValue,
-        operationName,
         context,
+        info,
     });
     return delegateRequest({
         ...options,
@@ -1267,4 +1257,4 @@ const createDefaultExecutor = memoize1(function createDefaultExecutor(schema) {
     };
 });
 
-export { Subschema, Transformer, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createDefaultExecutor, createRequest, createRequestFromInfo, defaultMergedResolver, delegateRequest, delegateToSchema, getDelegatingOperation, getSubschema, getUnpathedErrors, isExternalObject, isSubschema, isSubschemaConfig, mergeFields, resolveExternalValue };
+export { Subschema, Transformer, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createDefaultExecutor, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, getDelegatingOperation, getSubschema, getUnpathedErrors, isExternalObject, isSubschema, isSubschemaConfig, mergeFields, resolveExternalValue };

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@graphql-tools/delegate",
-  "version": "8.5.2",
+  "version": "8.6.0-alpha-bd5ea4d7.0",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-tools/batch-execute": "^8.3.2",
-    "@graphql-tools/schema": "^8.3.2",
-    "@graphql-tools/utils": "^8.6.2",
+    "@graphql-tools/batch-execute": "8.4.0-alpha-bd5ea4d7.0",
+    "@graphql-tools/schema": "8.3.3",
+    "@graphql-tools/utils": "8.6.3",
     "dataloader": "2.0.0",
-    "graphql-executor": "0.0.18",
+    "graphql-executor": "0.0.21",
     "tslib": "~2.3.0",
     "value-or-promise": "1.0.11"
   },

package/types.d.ts

@@ -48,16 +48,6 @@ export interface IDelegateToSchemaOptions<TContext = Record<string, any>, TArgs
 export interface IDelegateRequestOptions<TContext = Record<string, any>, TArgs = Record<string, any>> extends IDelegateToSchemaOptions<TContext, TArgs> {
     request: ExecutionRequest;
 }
-export interface ICreateRequestFromInfo {
-    info: GraphQLResolveInfo;
-    rootValue?: any;
-    operationName?: string;
-    operation?: OperationTypeNode;
-    fieldName?: string;
-    selectionSet?: SelectionSetNode;
-    fieldNodes?: ReadonlyArray<FieldNode>;
-    context?: any;
-}
 export interface ICreateRequest {
     sourceSchema?: GraphQLSchema;
     sourceParentType?: GraphQLObjectType;
@@ -118,7 +108,7 @@ export interface MergedTypeConfig<K = any, V = any, TContext = Record<string, an
 }
 export interface MergedTypeEntryPoint<K = any, V = any, TContext = Record<string, any>> extends MergedTypeResolverOptions<K, V> {
     selectionSet?: string;
-    key?: (originalResult: any) => K;
+    key?: (originalResult: any) => K | PromiseLike<K>;
     resolve?: MergedTypeResolver<TContext>;
 }
 export interface MergedTypeResolverOptions<K = any, V = any> {
@@ -132,7 +122,7 @@ export interface MergedFieldConfig {
     computed?: boolean;
     canonical?: boolean;
 }
-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 declare type MergedTypeResolver<TContext = Record<string, any>> = (originalResult: any, context: TContext, info: GraphQLResolveInfo, subschema: Subschema<any, any, any, TContext>, selectionSet: SelectionSetNode, key: any | undefined, type: GraphQLOutputType) => any;
 export interface StitchingInfo<TContext = Record<string, any>> {
     subschemaMap: Map<GraphQLSchema | SubschemaConfig<any, any, any, TContext>, Subschema<any, any, any, TContext>>;
     fieldNodesByType: Record<string, Array<FieldNode>>;