@graphql-tools/delegate 7.0.3 → 7.0.5

package/es5/index.cjs.js

@@ -7,8 +7,8 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 const utils = require('@graphql-tools/utils/es5');
 const tslib = require('tslib');
 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/es5');
 
 function applySchemaTransforms(originalWrappingSchema, subschemaConfig, transformedSchema) {
@@ -570,7 +570,8 @@ function mergeFields(mergedTypeInfo, typeName, object, fieldNodes, sourceSubsche
     var containsPromises = false;
     var resultMap = new Map();
     delegationMap.forEach(function (selectionSet, s) {
-        var maybePromise = s.merge[typeName].resolve(object, context, info, s, selectionSet);
+        var resolver = mergedTypeInfo.resolvers.get(s);
+        var maybePromise = resolver(object, context, info, s, selectionSet);
         resultMap.set(maybePromise, selectionSet);
         if (isPromise(maybePromise)) {
             containsPromises = true;
@@ -1417,7 +1418,7 @@ function mergeDataAndErrors(data, errors, path, index) {
             var 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: data, unpathedErrors: [] };
@@ -1713,7 +1714,7 @@ function validateRequest(targetSchema, document) {
     var errors = graphql.validate(targetSchema, document);
     if (errors.length > 0) {
         if (errors.length > 1) {
-            var combinedError = new AggregateError$1(errors);
+            var combinedError = new AggregateError(errors);
             throw combinedError;
         }
         var error = errors[0];