@graphql-tools/delegate 9.0.0-alpha-f6c67111.0 → 9.0.0-alpha-be1b2ebd.0

package/getMergedParent.d.ts

@@ -1,7 +1,7 @@
 import { FieldNode, GraphQLResolveInfo, GraphQLSchema } from 'graphql';
 import { ExternalObject, MergedTypeInfo } from './types';
 import { Subschema } from './Subschema';
-export declare function getMergedParent(parent: ExternalObject, context: Record<string, any>, info: GraphQLResolveInfo): Promise<ExternalObject>;
+export declare function getMergedParent(parent: ExternalObject, context: Record<string, any>, info: GraphQLResolveInfo): ExternalObject | Promise<ExternalObject>;
 export declare const buildDelegationPlan: (mergedTypeInfo: MergedTypeInfo, gatewaySchema: GraphQLSchema, sourceSubschema: Subschema, ...fieldNodeArrays: Array<ReadonlyArray<FieldNode>>) => {
     requiredKeys: Record<string, Set<string>>;
     delegationMaps: Array<Map<Subschema, Array<FieldNode>>>;

package/index.js

@@ -6,8 +6,8 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 const graphql = require('graphql');
 const utils = require('@graphql-tools/utils');
-const DataLoader = _interopDefault(require('dataloader'));
 const valueOrPromise = require('value-or-promise');
+const DataLoader = _interopDefault(require('dataloader'));
 const batchExecute = require('@graphql-tools/batch-execute');
 
 function applySchemaTransforms(originalWrappingSchema, subschemaConfig, transformedSchema) {
@@ -1043,6 +1043,21 @@ function getReturnType(info) {
     return info.returnType;
 }
 
+const loaders = new WeakMap();
+function getMergedParent(parent, context, info) {
+    // In the stitching context, all subschemas are compiled Subschema objects rather than SubschemaConfig objects
+    const sourceSubschema = getObjectSubchema(parent);
+    const mergedTypeInfo = getMergedTypeInfo(info);
+    if (mergedTypeInfo === undefined) {
+        return parent;
+    }
+    let loader = loaders.get(parent);
+    if (loader === undefined) {
+        loader = new DataLoader(fieldNodeArrays => getMergedParentsFromFieldNodes(parent, context, info.schema, fieldNodeArrays, mergedTypeInfo, sourceSubschema));
+        loaders.set(parent, loader);
+    }
+    return loader.load(info.fieldNodes).then(promise => promise);
+}
 const getMergedTypeInfo = utils.memoize1(function getMergedTypeInfo(info) {
     var _a;
     const schema = info.schema;
@@ -1057,21 +1072,6 @@ const getMergedTypeInfo = utils.memoize1(function getMergedTypeInfo(info) {
     }
     return mergedTypeInfo;
 });
-const loaders = new WeakMap();
-async function getMergedParent(parent, context, info) {
-    const mergedTypeInfo = getMergedTypeInfo(info);
-    if (!mergedTypeInfo) {
-        return parent;
-    }
-    // In the stitching context, all subschemas are compiled Subschema objects rather than SubschemaConfig objects
-    const sourceSubschema = getObjectSubchema(parent);
-    let loader = loaders.get(parent);
-    if (loader === undefined) {
-        loader = new DataLoader(fieldNodeArrays => getMergedParentsFromFieldNodes(parent, context, info.schema, fieldNodeArrays, mergedTypeInfo, sourceSubschema));
-        loaders.set(parent, loader);
-    }
-    return loader.load(info.fieldNodes);
-}
 async function getMergedParentsFromFieldNodes(parent, context, gatewaySchema, fieldNodeArrays, mergedTypeInfo, sourceSubschema) {
     const { requiredKeys, delegationMaps, stageMap } = buildDelegationPlan(mergedTypeInfo, gatewaySchema, sourceSubschema, ...fieldNodeArrays);
     if (!delegationMaps.length) {
@@ -1384,7 +1384,7 @@ function defaultMergedResolver(parent, args, context, info) {
     const initialPossibleFields = getInitialPossibleFields(parent);
     if (initialPossibleFields === undefined) {
         // TODO: can this be removed in the next major release?
-        // legacy use of  delegation without setting transformedSchema
+        // legacy use of delegation without setting transformedSchema
         const data = parent[responseKey];
         if (data !== undefined) {
             return resolveField(parent, responseKey, context, info);
@@ -1393,7 +1393,9 @@ function defaultMergedResolver(parent, args, context, info) {
     else if (info.fieldName in initialPossibleFields) {
         return resolveField(parent, responseKey, context, info);
     }
-    return getMergedParent(parent, context, info).then(mergedParent => resolveField(mergedParent, responseKey, context, info));
+    return new valueOrPromise.ValueOrPromise(() => getMergedParent(parent, context, info))
+        .then(mergedParent => resolveField(mergedParent, responseKey, context, info))
+        .resolve();
 }
 function resolveField(parent, responseKey, context, info) {
     const initialPath = getInitialPath(parent);

package/index.mjs

@@ -1,7 +1,7 @@
 import { Kind, isAbstractType, isInterfaceType, TypeInfo, visit, visitWithTypeInfo, getNamedType, isObjectType, versionInfo, TypeNameMetaFieldDef, typeFromAST, locatedError, responsePathAsArray, getNullableType, GraphQLError, isCompositeType, isListType, defaultFieldResolver, getOperationAST, GraphQLSchema, isSchema, validate, subscribe, execute } from 'graphql';
 import { memoize2, implementsAbstractType, getRootTypeNames, getDefinedRootType, createVariableNameGenerator, updateArgument, serializeInputValue, inspect, relocatedError, AggregateError, memoize1, memoize4ofMany, collectFields, memoize3, getResponseKeyFromInfo, isAsyncIterable, mapAsyncIterator } from '@graphql-tools/utils';
-import DataLoader from 'dataloader';
 import { ValueOrPromise } from 'value-or-promise';
+import DataLoader from 'dataloader';
 import { getBatchingExecutor } from '@graphql-tools/batch-execute';
 
 function applySchemaTransforms(originalWrappingSchema, subschemaConfig, transformedSchema) {
@@ -1037,6 +1037,21 @@ function getReturnType(info) {
     return info.returnType;
 }
 
+const loaders = new WeakMap();
+function getMergedParent(parent, context, info) {
+    // In the stitching context, all subschemas are compiled Subschema objects rather than SubschemaConfig objects
+    const sourceSubschema = getObjectSubchema(parent);
+    const mergedTypeInfo = getMergedTypeInfo(info);
+    if (mergedTypeInfo === undefined) {
+        return parent;
+    }
+    let loader = loaders.get(parent);
+    if (loader === undefined) {
+        loader = new DataLoader(fieldNodeArrays => getMergedParentsFromFieldNodes(parent, context, info.schema, fieldNodeArrays, mergedTypeInfo, sourceSubschema));
+        loaders.set(parent, loader);
+    }
+    return loader.load(info.fieldNodes).then(promise => promise);
+}
 const getMergedTypeInfo = memoize1(function getMergedTypeInfo(info) {
     var _a;
     const schema = info.schema;
@@ -1051,21 +1066,6 @@ const getMergedTypeInfo = memoize1(function getMergedTypeInfo(info) {
     }
     return mergedTypeInfo;
 });
-const loaders = new WeakMap();
-async function getMergedParent(parent, context, info) {
-    const mergedTypeInfo = getMergedTypeInfo(info);
-    if (!mergedTypeInfo) {
-        return parent;
-    }
-    // In the stitching context, all subschemas are compiled Subschema objects rather than SubschemaConfig objects
-    const sourceSubschema = getObjectSubchema(parent);
-    let loader = loaders.get(parent);
-    if (loader === undefined) {
-        loader = new DataLoader(fieldNodeArrays => getMergedParentsFromFieldNodes(parent, context, info.schema, fieldNodeArrays, mergedTypeInfo, sourceSubschema));
-        loaders.set(parent, loader);
-    }
-    return loader.load(info.fieldNodes);
-}
 async function getMergedParentsFromFieldNodes(parent, context, gatewaySchema, fieldNodeArrays, mergedTypeInfo, sourceSubschema) {
     const { requiredKeys, delegationMaps, stageMap } = buildDelegationPlan(mergedTypeInfo, gatewaySchema, sourceSubschema, ...fieldNodeArrays);
     if (!delegationMaps.length) {
@@ -1378,7 +1378,7 @@ function defaultMergedResolver(parent, args, context, info) {
     const initialPossibleFields = getInitialPossibleFields(parent);
     if (initialPossibleFields === undefined) {
         // TODO: can this be removed in the next major release?
-        // legacy use of  delegation without setting transformedSchema
+        // legacy use of delegation without setting transformedSchema
         const data = parent[responseKey];
         if (data !== undefined) {
             return resolveField(parent, responseKey, context, info);
@@ -1387,7 +1387,9 @@ function defaultMergedResolver(parent, args, context, info) {
     else if (info.fieldName in initialPossibleFields) {
         return resolveField(parent, responseKey, context, info);
     }
-    return getMergedParent(parent, context, info).then(mergedParent => resolveField(mergedParent, responseKey, context, info));
+    return new ValueOrPromise(() => getMergedParent(parent, context, info))
+        .then(mergedParent => resolveField(mergedParent, responseKey, context, info))
+        .resolve();
 }
 function resolveField(parent, responseKey, context, info) {
     const initialPath = getInitialPath(parent);

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@graphql-tools/delegate",
-  "version": "9.0.0-alpha-f6c67111.0",
+  "version": "9.0.0-alpha-be1b2ebd.0",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-tools/batch-execute": "8.1.1-alpha-f6c67111.0",
-    "@graphql-tools/schema": "8.2.1-alpha-f6c67111.0",
-    "@graphql-tools/utils": "9.0.0-alpha-f6c67111.0",
+    "@graphql-tools/batch-execute": "8.1.1-alpha-be1b2ebd.0",
+    "@graphql-tools/schema": "8.2.1-alpha-be1b2ebd.0",
+    "@graphql-tools/utils": "9.0.0-alpha-be1b2ebd.0",
     "dataloader": "2.0.0",
     "tslib": "~2.3.0",
     "value-or-promise": "1.0.10"