@graphql-tools/delegate 8.5.0 → 8.5.3

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];
@@ -784,17 +785,7 @@ function resolveExternalObject(type, object, unpathedErrors, subschema, context,
     if (stitchingInfo == null) {
         return object;
     }
-    let typeName;
-    if (graphql.isAbstractType(type)) {
-        const resolvedType = info.schema.getType(object.__typename);
-        if (resolvedType == null) {
-            throw new Error(`Unable to resolve type '${object.__typename}'. Did you forget to include a transform that renames types? Did you delegate to the original subschema rather that the subschema config object containing the transform?`);
-        }
-        typeName = resolvedType.name;
-    }
-    else {
-        typeName = type.name;
-    }
+    const typeName = graphql.isAbstractType(type) ? object.__typename : type.name;
     const mergedTypeInfo = stitchingInfo.mergedTypes[typeName];
     let targetSubschemas;
     // Within the stitching context, delegation to a stitched GraphQLSchema or SubschemaConfig

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];
@@ -780,17 +781,7 @@ function resolveExternalObject(type, object, unpathedErrors, subschema, context,
     if (stitchingInfo == null) {
         return object;
     }
-    let typeName;
-    if (isAbstractType(type)) {
-        const resolvedType = info.schema.getType(object.__typename);
-        if (resolvedType == null) {
-            throw new Error(`Unable to resolve type '${object.__typename}'. Did you forget to include a transform that renames types? Did you delegate to the original subschema rather that the subschema config object containing the transform?`);
-        }
-        typeName = resolvedType.name;
-    }
-    else {
-        typeName = type.name;
-    }
+    const typeName = isAbstractType(type) ? object.__typename : type.name;
     const mergedTypeInfo = stitchingInfo.mergedTypes[typeName];
     let targetSubschemas;
     // Within the stitching context, delegation to a stitched GraphQLSchema or SubschemaConfig

package/mergeFields.d.ts

@@ -5,4 +5,4 @@ export declare function isExternalObject(data: any): data is ExternalObject;
 export declare function annotateExternalObject<TContext>(object: any, errors: Array<GraphQLError>, subschema: GraphQLSchema | SubschemaConfig<any, any, any, TContext> | undefined, subschemaMap: Record<string, GraphQLSchema | SubschemaConfig<any, any, any, Record<string, any>>>): ExternalObject;
 export declare function getSubschema(object: ExternalObject, responseKey: string): GraphQLSchema | SubschemaConfig;
 export declare function getUnpathedErrors(object: ExternalObject): Array<GraphQLError>;
-export declare function mergeFields(mergedTypeInfo: MergedTypeInfo, object: any, sourceSubschema: Subschema<any, any, any, any>, context: any, info: GraphQLResolveInfo): Promise<any>;
+export declare function mergeFields<TContext>(mergedTypeInfo: MergedTypeInfo, object: any, sourceSubschema: Subschema<any, any, any, TContext>, context: any, info: GraphQLResolveInfo): Promise<any>;

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@graphql-tools/delegate",
-  "version": "8.5.0",
+  "version": "8.5.3",
   "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.1",
-    "@graphql-tools/schema": "^8.3.1",
-    "@graphql-tools/utils": "^8.5.4",
+    "@graphql-tools/batch-execute": "^8.3.2",
+    "@graphql-tools/schema": "^8.3.2",
+    "@graphql-tools/utils": "^8.6.2",
     "dataloader": "2.0.0",
     "graphql-executor": "0.0.18",
     "tslib": "~2.3.0",

package/types.d.ts

@@ -118,7 +118,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 +132,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>>;