@graphql-tools/delegate 7.0.3 → 7.0.5

package/es5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/delegate/es5",
-  "version": "7.0.3",
+  "version": "7.0.5",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {

package/es5/types.d.ts

@@ -77,6 +77,7 @@ export interface MergedTypeInfo {
     typeMaps: Map<GraphQLSchema | SubschemaConfig, TypeMap>;
     selectionSets: Map<Subschema, SelectionSetNode>;
     fieldSelectionSets: Map<Subschema, Record<string, SelectionSetNode>>;
+    resolvers: Map<Subschema, MergedTypeResolver>;
 }
 export interface ExecutionParams<TArgs = Record<string, any>, TContext = any> {
     document: DocumentNode;
@@ -111,7 +112,7 @@ export interface SubschemaConfig<K = any, V = any, C = K> {
     batch?: boolean;
     batchingOptions?: BatchingOptions<K, V, C>;
 }
-export interface MergedTypeConfig<K = any, V = any> {
+export interface MergedTypeConfig<K = any, V = any> extends MergedTypeResolverOptions<K, V> {
     selectionSet?: string;
     fields?: Record<string, {
         selectionSet?: string;
@@ -119,17 +120,19 @@ export interface MergedTypeConfig<K = any, V = any> {
     computedFields?: Record<string, {
         selectionSet?: string;
     }>;
+    key?: (originalResult: any) => K;
     resolve?: MergedTypeResolver;
+}
+export interface MergedTypeResolverOptions<K = any, V = any> {
     fieldName?: string;
     args?: (originalResult: any) => Record<string, any>;
-    key?: (originalResult: any) => K;
     argsFromKeys?: (keys: ReadonlyArray<K>) => Record<string, any>;
     valuesFromResults?: (results: any, keys: ReadonlyArray<K>) => Array<V>;
 }
 export interface MergedFieldConfig {
     selectionSet?: string;
 }
-export declare type MergedTypeResolver = (originalResult: any, context: Record<string, any>, info: GraphQLResolveInfo, subschema: GraphQLSchema | SubschemaConfig, selectionSet: SelectionSetNode) => any;
+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>;
     selectionSetsByField: Record<string, Record<string, SelectionSetNode>>;

package/index.cjs.js

@@ -6,8 +6,8 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 const utils = require('@graphql-tools/utils');
 const graphql = require('graphql');
+const AggregateError = _interopDefault(require('@ardatan/aggregate-error'));
 const isPromise = _interopDefault(require('is-promise'));
-const AggregateError$1 = _interopDefault(require('@ardatan/aggregate-error'));
 const batchExecute = require('@graphql-tools/batch-execute');
 
 function applySchemaTransforms(originalWrappingSchema, subschemaConfig, transformedSchema) {
@@ -566,7 +566,8 @@ function mergeFields(mergedTypeInfo, typeName, object, fieldNodes, sourceSubsche
     let containsPromises = false;
     const resultMap = new Map();
     delegationMap.forEach((selectionSet, s) => {
-        const maybePromise = s.merge[typeName].resolve(object, context, info, s, selectionSet);
+        const resolver = mergedTypeInfo.resolvers.get(s);
+        const maybePromise = resolver(object, context, info, s, selectionSet);
         resultMap.set(maybePromise, selectionSet);
         if (isPromise(maybePromise)) {
             containsPromises = true;
@@ -1396,7 +1397,7 @@ function mergeDataAndErrors(data, errors, path, index = 1) {
             const newPath = path === undefined ? error.path : error.path === undefined ? path : path.concat(error.path.slice(1));
             return { data: utils.relocatedError(errors[0], newPath), unpathedErrors: [] };
         }
-        return { data: graphql.locatedError(new AggregateError$1(errors), undefined, path), unpathedErrors: [] };
+        return { data: graphql.locatedError(new AggregateError(errors), undefined, path), unpathedErrors: [] };
     }
     if (!errors.length) {
         return { data, unpathedErrors: [] };
@@ -1697,7 +1698,7 @@ function validateRequest(targetSchema, document) {
     const errors = graphql.validate(targetSchema, document);
     if (errors.length > 0) {
         if (errors.length > 1) {
-            const combinedError = new AggregateError$1(errors);
+            const combinedError = new AggregateError(errors);
             throw combinedError;
         }
         const error = errors[0];