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

package/es5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/delegate/es5",
-  "version": "7.1.3-alpha-1a132cb3.0",
+  "version": "7.1.3",
   "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.0",
+    "@graphql-tools/schema": "^7.0.0",
     "@graphql-tools/utils": "^7.7.1",
     "dataloader": "2.0.0",
-    "tslib": "~2.2.0",
-    "value-or-promise": "~1.0.5"
+    "is-promise": "4.0.0",
+    "tslib": "~2.2.0"
   },
   "repository": {
     "type": "git",

package/index.cjs.js

@@ -7,7 +7,7 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 const utils = require('@graphql-tools/utils');
 const graphql = require('graphql');
 const AggregateError = _interopDefault(require('@ardatan/aggregate-error'));
-const valueOrPromise = require('value-or-promise');
+const isPromise = _interopDefault(require('is-promise'));
 const batchExecute = require('@graphql-tools/batch-execute');
 
 function applySchemaTransforms(originalWrappingSchema, subschemaConfig, transformedSchema) {
@@ -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);
         }
@@ -559,13 +566,20 @@ function mergeFields(mergedTypeInfo, typeName, object, fieldNodes, sourceSubsche
     if (!delegationMap.size) {
         return object;
     }
+    let containsPromises = false;
     const resultMap = new Map();
     delegationMap.forEach((selectionSet, s) => {
         const resolver = mergedTypeInfo.resolvers.get(s);
-        const valueOrPromise$1 = new valueOrPromise.ValueOrPromise(() => resolver(object, context, info, s, selectionSet)).catch(error => error);
-        resultMap.set(valueOrPromise$1, selectionSet);
+        let maybePromise = resolver(object, context, info, s, selectionSet);
+        if (isPromise(maybePromise)) {
+            containsPromises = true;
+            maybePromise = maybePromise.then(undefined, error => error);
+        }
+        resultMap.set(maybePromise, selectionSet);
     });
-    return valueOrPromise.ValueOrPromise.all(Array.from(resultMap.keys())).then(results => mergeFields(mergedTypeInfo, typeName, mergeExternalObjects(info.schema, graphql.responsePathAsArray(info.path), object.__typename, object, results, Array.from(resultMap.values())), unproxiableFieldNodes, combineSubschemas(sourceSubschemaOrSourceSubschemas, proxiableSubschemas), nonProxiableSubschemas, context, info)).resolve();
+    return containsPromises
+        ? Promise.all(resultMap.keys()).then(results => mergeFields(mergedTypeInfo, typeName, mergeExternalObjects(info.schema, graphql.responsePathAsArray(info.path), object.__typename, object, results, Array.from(resultMap.values())), unproxiableFieldNodes, combineSubschemas(sourceSubschemaOrSourceSubschemas, proxiableSubschemas), nonProxiableSubschemas, context, info))
+        : mergeFields(mergedTypeInfo, typeName, mergeExternalObjects(info.schema, graphql.responsePathAsArray(info.path), object.__typename, object, Array.from(resultMap.keys()), Array.from(resultMap.values())), unproxiableFieldNodes, combineSubschemas(sourceSubschemaOrSourceSubschemas, proxiableSubschemas), nonProxiableSubschemas, context, info);
 }
 const subschemaTypesContainSelectionSet = memoize3(function (mergedTypeInfo, sourceSubschemaOrSourceSubschemas, selectionSet) {
     if (Array.isArray(sourceSubschemaOrSourceSubschemas)) {
@@ -1643,11 +1657,17 @@ function delegateRequest({ request, schema: subschemaOrSubschemaConfig, rootValu
             const batchingOptions = subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.batchingOptions;
             executor = batchExecute.getBatchingExecutor(context, executor, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.dataLoaderOptions, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.extensionsReducer);
         }
-        return new valueOrPromise.ValueOrPromise(() => executor({
+        const executionResult = executor({
             ...processedRequest,
             context,
             info,
-        })).then(originalResult => transformer.transformResult(originalResult)).resolve();
+        });
+        if (isPromise(executionResult)) {
+            return executionResult.then(originalResult => {
+                return transformer.transformResult(originalResult);
+            });
+        }
+        return transformer.transformResult(executionResult);
     }
     const subscriber = (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.subscriber) || createDefaultSubscriber(targetSchema, (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.rootValue) || targetRootValue);
     return subscriber({