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

package/getMergedParent.d.ts

@@ -1,8 +1,8 @@
 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 const buildDelegationPlan: (mergedTypeInfo: MergedTypeInfo, schema: GraphQLSchema, sourceSubschema: Subschema, ...fieldNodeArrays: Array<ReadonlyArray<FieldNode>>) => {
+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>>>;
     stageMap: Record<string, number>;

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,7 +1043,22 @@ function getReturnType(info) {
     return info.returnType;
 }
 
-const getMergeDetails = utils.memoize1(function getMergeDetails(info) {
+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;
     const stitchingInfo = (_a = schema.extensions) === null || _a === void 0 ? void 0 : _a['stitchingInfo'];
@@ -1055,60 +1070,37 @@ const getMergeDetails = utils.memoize1(function getMergeDetails(info) {
     if (mergedTypeInfo === undefined) {
         return;
     }
-    return {
-        stitchingInfo,
-        mergedTypeInfo,
-    };
+    return mergedTypeInfo;
 });
-const loaders = new WeakMap();
-async function getMergedParent(parent, context, info) {
-    const mergeDetails = getMergeDetails(info);
-    if (!mergeDetails) {
-        return parent;
-    }
-    const { mergedTypeInfo } = mergeDetails;
-    // In the stitching context, all subschemas are compiled Subschema objects rather than SubschemaConfig objects
-    const sourceSubschema = getObjectSubchema(parent);
-    const targetSubschemas = mergedTypeInfo.targetSubschemas.get(sourceSubschema);
-    if (targetSubschemas === undefined || targetSubschemas.length === 0) {
-        return parent;
-    }
-    let loader = loaders.get(parent);
-    if (loader === undefined) {
-        loader = new DataLoader(infos => getMergedParentsFromInfos(parent, context, infos, mergedTypeInfo, sourceSubschema));
-        loaders.set(parent, loader);
-    }
-    return loader.load(info);
-}
-async function getMergedParentsFromInfos(parent, context, infos, mergedTypeInfo, sourceSubschema) {
-    const { requiredKeys, delegationMaps, stageMap } = buildDelegationPlan(mergedTypeInfo, infos[0].schema, sourceSubschema, ...infos.map(info => info.fieldNodes));
+async function getMergedParentsFromFieldNodes(parent, context, gatewaySchema, fieldNodeArrays, mergedTypeInfo, sourceSubschema) {
+    const { requiredKeys, delegationMaps, stageMap } = buildDelegationPlan(mergedTypeInfo, gatewaySchema, sourceSubschema, ...fieldNodeArrays);
     if (!delegationMaps.length) {
-        return Array(infos.length).fill(parent);
+        return Array(fieldNodeArrays.length).fill(parent);
     }
     const promises = [];
     const parentInfo = getInfo(parent);
-    const schema = parentInfo.schema;
-    const type = schema.getType(parent.__typename);
+    const type = gatewaySchema.getType(parent.__typename);
     const parentPath = graphql.responsePathAsArray(parentInfo.path);
-    let promise = executeDelegationStage(delegationMaps[0], schema, type, mergedTypeInfo, context, parent, parentInfo, parentPath).then(() => parent);
+    let promise = executeDelegationStage(delegationMaps[0], gatewaySchema, type, mergedTypeInfo, context, parent, parentInfo, parentPath);
     promises.push(promise);
     for (let i = 1, delegationStage = delegationMaps[i]; i < delegationMaps.length; i++) {
-        promise = promise.then(parent => executeDelegationStage(delegationStage, schema, type, mergedTypeInfo, context, parent, parentInfo, parentPath).then(() => parent));
+        promise = promise.then(parent => executeDelegationStage(delegationStage, gatewaySchema, type, mergedTypeInfo, context, parent, parentInfo, parentPath));
         promises.push(promise);
     }
-    return infos.map(info => {
-        const keys = requiredKeys[info.fieldName];
+    return fieldNodeArrays.map(fieldNodeArray => {
+        const fieldName = fieldNodeArray[0].name.value;
+        const keys = requiredKeys[fieldName];
         if (keys === undefined) {
-            const delegationStage = stageMap[info.fieldName];
+            const delegationStage = stageMap[fieldName];
             if (delegationStage !== undefined) {
-                return promises[delegationStage].then(() => parent);
+                return promises[delegationStage];
             }
             return Promise.resolve(parent);
         }
         return Promise.all(Array.from(keys.values()).map(fieldName => {
             const delegationStage = stageMap[fieldName];
             if (delegationStage !== undefined) {
-                return promises[delegationStage].then(() => parent);
+                return promises[delegationStage];
             }
             return Promise.resolve(parent);
         })).then(() => parent);
@@ -1155,12 +1147,12 @@ function calculateDelegationStage(mergedTypeInfo, sourceSubschemas, targetSubsch
         unproxiableFieldNodes,
     };
 }
-const buildDelegationPlan = utils.memoize4ofMany(function buildDelegationPlan(mergedTypeInfo, schema, sourceSubschema, ...fieldNodeArrays) {
+const buildDelegationPlan = utils.memoize4ofMany(function buildDelegationPlan(mergedTypeInfo, gatewaySchema, sourceSubschema, ...fieldNodeArrays) {
     var _a, _b, _c;
     const requiredKeys = Object.create(null);
     const delegationMaps = [];
     const stageMap = Object.create(null);
-    const stitchingInfo = (_a = schema.extensions) === null || _a === void 0 ? void 0 : _a['stitchingInfo'];
+    const stitchingInfo = (_a = gatewaySchema.extensions) === null || _a === void 0 ? void 0 : _a['stitchingInfo'];
     if (stitchingInfo == null) {
         return { requiredKeys, delegationMaps, stageMap };
     }
@@ -1337,20 +1329,21 @@ async function executeDelegationStage(delegationMap, schema, type, mergedTypeInf
                 }
                 source = nullResult;
             }
-            // TODO: fold this assign into loop below?
-            Object.assign(object, source);
             // TODO: is this check necessary or just to make TS happy?
             if (!isExternalObject(source)) {
-                return;
+                Object.assign(object, source);
+                return object;
             }
             const objectSubschema = getObjectSubchema(source);
             const subschemaMap = getSubschemaMap(source);
             for (const responseKey in source) {
+                object[responseKey] = source[responseKey];
                 newSubschemaMap[responseKey] = (_a = subschemaMap === null || subschemaMap === void 0 ? void 0 : subschemaMap[responseKey]) !== null && _a !== void 0 ? _a : objectSubschema;
             }
             unpathedErrors.push(...getUnpathedErrors(source));
         }
     }));
+    return object;
 }
 const subschemaTypesContainSelectionSet = utils.memoize3(function subschemaTypesContainSelectionSet(mergedTypeInfo, sourceSubschemas, selectionSet) {
     return typesContainSelectionSet(sourceSubschemas.map(sourceSubschema => sourceSubschema.transformedSchema.getType(mergedTypeInfo.typeName)), selectionSet);
@@ -1391,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);
@@ -1400,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,7 +1037,22 @@ function getReturnType(info) {
     return info.returnType;
 }
 
-const getMergeDetails = memoize1(function getMergeDetails(info) {
+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;
     const stitchingInfo = (_a = schema.extensions) === null || _a === void 0 ? void 0 : _a['stitchingInfo'];
@@ -1049,60 +1064,37 @@ const getMergeDetails = memoize1(function getMergeDetails(info) {
     if (mergedTypeInfo === undefined) {
         return;
     }
-    return {
-        stitchingInfo,
-        mergedTypeInfo,
-    };
+    return mergedTypeInfo;
 });
-const loaders = new WeakMap();
-async function getMergedParent(parent, context, info) {
-    const mergeDetails = getMergeDetails(info);
-    if (!mergeDetails) {
-        return parent;
-    }
-    const { mergedTypeInfo } = mergeDetails;
-    // In the stitching context, all subschemas are compiled Subschema objects rather than SubschemaConfig objects
-    const sourceSubschema = getObjectSubchema(parent);
-    const targetSubschemas = mergedTypeInfo.targetSubschemas.get(sourceSubschema);
-    if (targetSubschemas === undefined || targetSubschemas.length === 0) {
-        return parent;
-    }
-    let loader = loaders.get(parent);
-    if (loader === undefined) {
-        loader = new DataLoader(infos => getMergedParentsFromInfos(parent, context, infos, mergedTypeInfo, sourceSubschema));
-        loaders.set(parent, loader);
-    }
-    return loader.load(info);
-}
-async function getMergedParentsFromInfos(parent, context, infos, mergedTypeInfo, sourceSubschema) {
-    const { requiredKeys, delegationMaps, stageMap } = buildDelegationPlan(mergedTypeInfo, infos[0].schema, sourceSubschema, ...infos.map(info => info.fieldNodes));
+async function getMergedParentsFromFieldNodes(parent, context, gatewaySchema, fieldNodeArrays, mergedTypeInfo, sourceSubschema) {
+    const { requiredKeys, delegationMaps, stageMap } = buildDelegationPlan(mergedTypeInfo, gatewaySchema, sourceSubschema, ...fieldNodeArrays);
     if (!delegationMaps.length) {
-        return Array(infos.length).fill(parent);
+        return Array(fieldNodeArrays.length).fill(parent);
     }
     const promises = [];
     const parentInfo = getInfo(parent);
-    const schema = parentInfo.schema;
-    const type = schema.getType(parent.__typename);
+    const type = gatewaySchema.getType(parent.__typename);
     const parentPath = responsePathAsArray(parentInfo.path);
-    let promise = executeDelegationStage(delegationMaps[0], schema, type, mergedTypeInfo, context, parent, parentInfo, parentPath).then(() => parent);
+    let promise = executeDelegationStage(delegationMaps[0], gatewaySchema, type, mergedTypeInfo, context, parent, parentInfo, parentPath);
     promises.push(promise);
     for (let i = 1, delegationStage = delegationMaps[i]; i < delegationMaps.length; i++) {
-        promise = promise.then(parent => executeDelegationStage(delegationStage, schema, type, mergedTypeInfo, context, parent, parentInfo, parentPath).then(() => parent));
+        promise = promise.then(parent => executeDelegationStage(delegationStage, gatewaySchema, type, mergedTypeInfo, context, parent, parentInfo, parentPath));
         promises.push(promise);
     }
-    return infos.map(info => {
-        const keys = requiredKeys[info.fieldName];
+    return fieldNodeArrays.map(fieldNodeArray => {
+        const fieldName = fieldNodeArray[0].name.value;
+        const keys = requiredKeys[fieldName];
         if (keys === undefined) {
-            const delegationStage = stageMap[info.fieldName];
+            const delegationStage = stageMap[fieldName];
             if (delegationStage !== undefined) {
-                return promises[delegationStage].then(() => parent);
+                return promises[delegationStage];
             }
             return Promise.resolve(parent);
         }
         return Promise.all(Array.from(keys.values()).map(fieldName => {
             const delegationStage = stageMap[fieldName];
             if (delegationStage !== undefined) {
-                return promises[delegationStage].then(() => parent);
+                return promises[delegationStage];
             }
             return Promise.resolve(parent);
         })).then(() => parent);
@@ -1149,12 +1141,12 @@ function calculateDelegationStage(mergedTypeInfo, sourceSubschemas, targetSubsch
         unproxiableFieldNodes,
     };
 }
-const buildDelegationPlan = memoize4ofMany(function buildDelegationPlan(mergedTypeInfo, schema, sourceSubschema, ...fieldNodeArrays) {
+const buildDelegationPlan = memoize4ofMany(function buildDelegationPlan(mergedTypeInfo, gatewaySchema, sourceSubschema, ...fieldNodeArrays) {
     var _a, _b, _c;
     const requiredKeys = Object.create(null);
     const delegationMaps = [];
     const stageMap = Object.create(null);
-    const stitchingInfo = (_a = schema.extensions) === null || _a === void 0 ? void 0 : _a['stitchingInfo'];
+    const stitchingInfo = (_a = gatewaySchema.extensions) === null || _a === void 0 ? void 0 : _a['stitchingInfo'];
     if (stitchingInfo == null) {
         return { requiredKeys, delegationMaps, stageMap };
     }
@@ -1331,20 +1323,21 @@ async function executeDelegationStage(delegationMap, schema, type, mergedTypeInf
                 }
                 source = nullResult;
             }
-            // TODO: fold this assign into loop below?
-            Object.assign(object, source);
             // TODO: is this check necessary or just to make TS happy?
             if (!isExternalObject(source)) {
-                return;
+                Object.assign(object, source);
+                return object;
             }
             const objectSubschema = getObjectSubchema(source);
             const subschemaMap = getSubschemaMap(source);
             for (const responseKey in source) {
+                object[responseKey] = source[responseKey];
                 newSubschemaMap[responseKey] = (_a = subschemaMap === null || subschemaMap === void 0 ? void 0 : subschemaMap[responseKey]) !== null && _a !== void 0 ? _a : objectSubschema;
             }
             unpathedErrors.push(...getUnpathedErrors(source));
         }
     }));
+    return object;
 }
 const subschemaTypesContainSelectionSet = memoize3(function subschemaTypesContainSelectionSet(mergedTypeInfo, sourceSubschemas, selectionSet) {
     return typesContainSelectionSet(sourceSubschemas.map(sourceSubschema => sourceSubschema.transformedSchema.getType(mergedTypeInfo.typeName)), selectionSet);
@@ -1385,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);
@@ -1394,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-8ae2f1b1.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-8ae2f1b1.0",
-    "@graphql-tools/schema": "8.2.1-alpha-8ae2f1b1.0",
-    "@graphql-tools/utils": "9.0.0-alpha-8ae2f1b1.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"