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

package/index.esm.js

@@ -1,7 +1,7 @@
 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 { ValueOrPromise } from 'value-or-promise';
+import isPromise from 'is-promise';
 import { getBatchingExecutor } from '@graphql-tools/batch-execute';
 
 function applySchemaTransforms(originalWrappingSchema, subschemaConfig, transformedSchema) {
@@ -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);
         }
@@ -553,13 +560,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 = new ValueOrPromise(() => resolver(object, context, info, s, selectionSet)).catch(error => error);
-        resultMap.set(valueOrPromise, 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.all(Array.from(resultMap.keys())).then(results => 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(results => 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);
 }
 const subschemaTypesContainSelectionSet = memoize3(function (mergedTypeInfo, sourceSubschemaOrSourceSubschemas, selectionSet) {
     if (Array.isArray(sourceSubschemaOrSourceSubschemas)) {
@@ -1637,11 +1651,17 @@ function delegateRequest({ request, schema: subschemaOrSubschemaConfig, rootValu
             const batchingOptions = subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.batchingOptions;
             executor = getBatchingExecutor(context, executor, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.dataLoaderOptions, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.extensionsReducer);
         }
-        return new 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({