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

package/es5/index.cjs.js

@@ -8,7 +8,7 @@ const utils = require('@graphql-tools/utils/es5');
 const tslib = require('tslib');
 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/es5');
 
 function applySchemaTransforms(originalWrappingSchema, subschemaConfig, transformedSchema) {
@@ -190,17 +190,24 @@ function mergeExternalObjects(schema, path, typeName, target, sources, selection
     var results = [];
     var errors = [];
     sources.forEach(function (source, index) {
-        if (source instanceof graphql.GraphQLError || source === null) {
+        if (source instanceof Error || source === null) {
             var selectionSet = selectionSets[index];
-            var fieldNodes = utils.collectFields({
+            var fieldNodes_1 = utils.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 graphql.GraphQLError ? utils.relocatedError(source, path.concat([responseKey])) : null;
+            Object.keys(fieldNodes_1).forEach(function (responseKey) {
+                if (source instanceof graphql.GraphQLError) {
+                    nullResult_1[responseKey] = utils.relocatedError(source, path.concat([responseKey]));
+                }
+                else if (source instanceof Error) {
+                    nullResult_1[responseKey] = graphql.locatedError(source, fieldNodes_1[responseKey], path.concat([responseKey]));
+                }
+                else {
+                    nullResult_1[responseKey] = null;
+                }
             });
             results.push(nullResult_1);
         }
@@ -563,15 +570,22 @@ function mergeFields(mergedTypeInfo, typeName, object, fieldNodes, sourceSubsche
     if (!delegationMap.size) {
         return object;
     }
+    var containsPromises = false;
     var resultMap = new Map();
     delegationMap.forEach(function (selectionSet, s) {
         var resolver = mergedTypeInfo.resolvers.get(s);
-        var valueOrPromise$1 = new valueOrPromise.ValueOrPromise(function () { return resolver(object, context, info, s, selectionSet); }).catch(function (error) { return error; });
-        resultMap.set(valueOrPromise$1, selectionSet);
+        var maybePromise = resolver(object, context, info, s, selectionSet);
+        if (isPromise(maybePromise)) {
+            containsPromises = true;
+            maybePromise = maybePromise.then(undefined, function (error) { return error; });
+        }
+        resultMap.set(maybePromise, selectionSet);
     });
-    return valueOrPromise.ValueOrPromise.all(Array.from(resultMap.keys())).then(function (results) {
-        return 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(function (results) {
+            return 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);
 }
 var subschemaTypesContainSelectionSet = memoize3(function (mergedTypeInfo, sourceSubschemaOrSourceSubschemas, selectionSet) {
     if (Array.isArray(sourceSubschemaOrSourceSubschemas)) {
@@ -1656,13 +1670,19 @@ function delegateRequest(_a) {
         validateRequest(targetSchema, processedRequest.document);
     }
     if (targetOperation === 'query' || targetOperation === 'mutation') {
-        var executor_1 = (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.executor) || createDefaultExecutor(targetSchema, (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.rootValue) || targetRootValue);
+        var executor = (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.executor) || createDefaultExecutor(targetSchema, (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.rootValue) || targetRootValue);
         if (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.batch) {
             var batchingOptions = subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.batchingOptions;
-            executor_1 = batchExecute.getBatchingExecutor(context, executor_1, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.dataLoaderOptions, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.extensionsReducer);
+            executor = batchExecute.getBatchingExecutor(context, executor, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.dataLoaderOptions, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.extensionsReducer);
+        }
+        var executionResult = executor(tslib.__assign(tslib.__assign({}, processedRequest), { context: context,
+            info: info }));
+        if (isPromise(executionResult)) {
+            return executionResult.then(function (originalResult) {
+                return transformer.transformResult(originalResult);
+            });
         }
-        return new valueOrPromise.ValueOrPromise(function () { return executor_1(tslib.__assign(tslib.__assign({}, processedRequest), { context: context,
-            info: info })); }).then(function (originalResult) { return transformer.transformResult(originalResult); }).resolve();
+        return transformer.transformResult(executionResult);
     }
     var subscriber = (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.subscriber) || createDefaultSubscriber(targetSchema, (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.rootValue) || targetRootValue);
     return subscriber(tslib.__assign(tslib.__assign({}, processedRequest), { context: context,