@graphql-tools/delegate 7.1.3-alpha-1a132cb3.0 → 7.1.5

package/es5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/delegate/es5",
-  "version": "7.1.3-alpha-1a132cb3.0",
+  "version": "7.1.5",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
@@ -8,12 +8,12 @@
   },
   "dependencies": {
     "@ardatan/aggregate-error": "0.0.6",
-    "@graphql-tools/batch-execute": "7.1.1-alpha-1a132cb3.0",
-    "@graphql-tools/schema": "7.1.4-alpha-1a132cb3.0",
+    "@graphql-tools/batch-execute": "^7.1.2",
+    "@graphql-tools/schema": "^7.1.5",
     "@graphql-tools/utils": "^7.7.1",
     "dataloader": "2.0.0",
     "tslib": "~2.2.0",
-    "value-or-promise": "~1.0.5"
+    "value-or-promise": "1.0.6"
   },
   "repository": {
     "type": "git",

package/index.cjs.js

@@ -183,7 +183,7 @@ function mergeExternalObjects(schema, path, typeName, target, sources, selection
     const results = [];
     let errors = [];
     sources.forEach((source, index) => {
-        if (source instanceof graphql.GraphQLError || source === null) {
+        if (source instanceof Error || source === null) {
             const selectionSet = selectionSets[index];
             const fieldNodes = utils.collectFields({
                 schema,
@@ -192,8 +192,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 graphql.GraphQLError ? utils.relocatedError(source, path.concat([responseKey])) : null;
+                if (source instanceof graphql.GraphQLError) {
+                    nullResult[responseKey] = utils.relocatedError(source, path.concat([responseKey]));
+                }
+                else if (source instanceof Error) {
+                    nullResult[responseKey] = graphql.locatedError(source, fieldNodes[responseKey], path.concat([responseKey]));
+                }
+                else {
+                    nullResult[responseKey] = null;
+                }
             });
             results.push(nullResult);
         }