@graphql-tools/delegate 7.1.3-alpha-3bf9d67c.0 → 7.1.3

package/es5/index.esm.js

@@ -1,6 +1,6 @@
 import { cloneSchema, serializeInputValue, updateArgument, collectFields, relocatedError, mergeDeep, getResponseKeyFromInfo, implementsAbstractType, mapAsyncIterator } from '@graphql-tools/utils/es5';
 import { __assign, __spreadArray, __read, __values } from 'tslib';
-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 { Kind, typeFromAST, GraphQLError, locatedError, responsePathAsArray, getNamedType, getNullableType, isLeafType, isCompositeType, isListType, isAbstractType, 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 { getBatchingExecutor } from '@graphql-tools/batch-execute/es5';
@@ -184,17 +184,24 @@ function mergeExternalObjects(schema, path, typeName, target, sources, selection
     var results = [];
     var errors = [];
     sources.forEach(function (source, index) {
-        if (source instanceof GraphQLError || source === null) {
+        if (source instanceof Error || source === null) {
             var selectionSet = selectionSets[index];
-            var fieldNodes = collectFields({
+            var fieldNodes_1 = collectFields({
                 schema: schema,
                 variableValues: {},
                 fragments: {},
             }, schema.getType(typeName), selectionSet, Object.create(null), Object.create(null));
             var nullResult_1 = {};
-            Object.keys(fieldNodes).forEach(function (responseKey) {
-                nullResult_1[responseKey] =
-                    source instanceof GraphQLError ? relocatedError(source, path.concat([responseKey])) : null;
+            Object.keys(fieldNodes_1).forEach(function (responseKey) {
+                if (source instanceof GraphQLError) {
+                    nullResult_1[responseKey] = relocatedError(source, path.concat([responseKey]));
+                }
+                else if (source instanceof Error) {
+                    nullResult_1[responseKey] = locatedError(source, fieldNodes_1[responseKey], path.concat([responseKey]));
+                }
+                else {
+                    nullResult_1[responseKey] = null;
+                }
             });
             results.push(nullResult_1);
         }