@graphql-tools/delegate 7.0.3 → 7.0.5

package/index.esm.js

@@ -1,7 +1,7 @@
 import { cloneSchema, serializeInputValue, updateArgument, collectFields, relocatedError, mergeDeep, getResponseKeyFromInfo, implementsAbstractType, mapAsyncIterator } from '@graphql-tools/utils';
 import { Kind, typeFromAST, GraphQLError, responsePathAsArray, getNamedType, getNullableType, isLeafType, isCompositeType, isListType, isAbstractType, locatedError, defaultFieldResolver, TypeInfo, visit, visitWithTypeInfo, print, isInterfaceType, isObjectType, TypeNameMetaFieldDef, getOperationAST, subscribe, validate, execute } from 'graphql';
+import AggregateError from '@ardatan/aggregate-error';
 import isPromise from 'is-promise';
-import AggregateError$1 from '@ardatan/aggregate-error';
 import { getBatchingExecutor } from '@graphql-tools/batch-execute';
 
 function applySchemaTransforms(originalWrappingSchema, subschemaConfig, transformedSchema) {
@@ -560,7 +560,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;
@@ -1390,7 +1391,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: relocatedError(errors[0], newPath), unpathedErrors: [] };
         }
-        return { data: locatedError(new AggregateError$1(errors), undefined, path), unpathedErrors: [] };
+        return { data: locatedError(new AggregateError(errors), undefined, path), unpathedErrors: [] };
     }
     if (!errors.length) {
         return { data, unpathedErrors: [] };
@@ -1691,7 +1692,7 @@ function validateRequest(targetSchema, document) {
     const errors = 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];