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

package/es5/index.esm.js

@@ -1,8 +1,8 @@
 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 { ValueOrPromise } from 'value-or-promise';
+import isPromise from 'is-promise';
 import { getBatchingExecutor } from '@graphql-tools/batch-execute/es5';
 
 function applySchemaTransforms(originalWrappingSchema, subschemaConfig, transformedSchema) {
@@ -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);
         }
@@ -557,15 +564,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 = new ValueOrPromise(function () { return resolver(object, context, info, s, selectionSet); }).catch(function (error) { return error; });
-        resultMap.set(valueOrPromise, 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.all(Array.from(resultMap.keys())).then(function (results) {
-        return mergeFields(mergedTypeInfo, typeName, mergeExternalObjects(info.schema, 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, responsePathAsArray(info.path), object.__typename, object, results, Array.from(resultMap.values())), unproxiableFieldNodes, combineSubschemas(sourceSubschemaOrSourceSubschemas, proxiableSubschemas), nonProxiableSubschemas, context, info);
+        })
+        : mergeFields(mergedTypeInfo, typeName, mergeExternalObjects(info.schema, 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)) {
@@ -1650,13 +1664,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 = getBatchingExecutor(context, executor_1, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.dataLoaderOptions, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.extensionsReducer);
+            executor = getBatchingExecutor(context, executor, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.dataLoaderOptions, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.extensionsReducer);
+        }
+        var executionResult = executor(__assign(__assign({}, processedRequest), { context: context,
+            info: info }));
+        if (isPromise(executionResult)) {
+            return executionResult.then(function (originalResult) {
+                return transformer.transformResult(originalResult);
+            });
         }
-        return new ValueOrPromise(function () { return executor_1(__assign(__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(__assign(__assign({}, processedRequest), { context: context,