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

package/index.esm.js

@@ -1,5 +1,5 @@
 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 { 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';
@@ -177,7 +177,7 @@ function mergeExternalObjects(schema, path, typeName, target, sources, selection
     const results = [];
     let errors = [];
     sources.forEach((source, index) => {
-        if (source instanceof GraphQLError || source === null) {
+        if (source instanceof Error || source === null) {
             const selectionSet = selectionSets[index];
             const fieldNodes = collectFields({
                 schema,
@@ -186,8 +186,15 @@ function mergeExternalObjects(schema, path, typeName, target, sources, selection
             }, schema.getType(typeName), selectionSet, Object.create(null), Object.create(null));
             const nullResult = {};
             Object.keys(fieldNodes).forEach(responseKey => {
-                nullResult[responseKey] =
-                    source instanceof GraphQLError ? relocatedError(source, path.concat([responseKey])) : null;
+                if (source instanceof GraphQLError) {
+                    nullResult[responseKey] = relocatedError(source, path.concat([responseKey]));
+                }
+                else if (source instanceof Error) {
+                    nullResult[responseKey] = locatedError(source, fieldNodes[responseKey], path.concat([responseKey]));
+                }
+                else {
+                    nullResult[responseKey] = null;
+                }
             });
             results.push(nullResult);
         }