@graphql-tools/delegate 10.2.1 → 10.2.2-alpha-9a7e474e0889bfa3b027934ebd5fb1c2454da1ff

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @graphql-tools/delegate
 
+## 10.2.2-alpha-9a7e474e0889bfa3b027934ebd5fb1c2454da1ff
+
+### Patch Changes
+
+- [#205](https://github.com/graphql-hive/gateway/pull/205) [`d60c21b`](https://github.com/graphql-hive/gateway/commit/d60c21bf0d211be52d4d740fedd18fca8a492edd) Thanks [@ardatan](https://github.com/ardatan)! - Fix missing key fields in the nested queries
+
 ## 10.2.1
 
 ### Patch Changes

package/dist/index.cjs

@@ -1962,11 +1962,13 @@ function handleFlattenedParent(flattenedParent, leftOverParent, possibleSubschem
                 const delegationPlan = stitchingInfo.mergedTypes[nestedTypeName]?.delegationPlanBuilder(
                   info.schema,
                   sourceSubschema,
-                  info.variableValues,
-                  info.fragments,
-                  [fieldNode]
+                  info.variableValues != null && Object.keys(info.variableValues).length > 0 ? info.variableValues : EMPTY_OBJECT,
+                  info.fragments != null && Object.keys(info.fragments).length > 0 ? info.fragments : EMPTY_OBJECT,
+                  memoizedAsArray(fieldNode),
+                  context,
+                  info
                 );
-                if (delegationPlan) {
+                if (delegationPlan?.length) {
                   for (const delegationMap of delegationPlan) {
                     for (const [subschema, selectionSet2] of delegationMap) {
                       const resolver = stitchingInfo.mergedTypes[nestedTypeName]?.resolvers.get(subschema);
@@ -2157,6 +2159,7 @@ function flattenPromise(data) {
   }
   return data;
 }
+const memoizedAsArray = utils.memoize1(utils.asArray);
 
 function isSubschemaConfig(value) {
   return Boolean(value?.schema);
@@ -2585,6 +2588,8 @@ Object.defineProperty(exports, "createDeferred", {
   enumerable: true,
   get: function () { return utils.createDeferred; }
 });
+exports.EMPTY_ARRAY = EMPTY_ARRAY;
+exports.EMPTY_OBJECT = EMPTY_OBJECT;
 exports.FIELD_SUBSCHEMA_MAP_SYMBOL = FIELD_SUBSCHEMA_MAP_SYMBOL;
 exports.OBJECT_SUBSCHEMA_SYMBOL = OBJECT_SUBSCHEMA_SYMBOL;
 exports.PLAN_LEFT_OVER = PLAN_LEFT_OVER;

package/dist/index.d.cts

@@ -193,6 +193,8 @@ declare function isExternalObject(data: any): data is ExternalObject;
 declare function annotateExternalObject<TContext>(object: any, errors: Array<GraphQLError>, subschema: GraphQLSchema | SubschemaConfig<any, any, any, TContext> | undefined, subschemaMap: Record<string, GraphQLSchema | SubschemaConfig<any, any, any, Record<string, any>>>): ExternalObject;
 declare function getSubschema(object: ExternalObject, responseKey: string): GraphQLSchema | SubschemaConfig;
 declare function getUnpathedErrors(object: ExternalObject): Array<GraphQLError>;
+declare const EMPTY_ARRAY: any[];
+declare const EMPTY_OBJECT: any;
 declare const getActualFieldNodes: (fieldNode: FieldNode) => FieldNode[];
 declare function mergeFields<TContext>(mergedTypeInfo: MergedTypeInfo, object: any, sourceSubschema: Subschema<any, any, any, TContext>, context: any, info: GraphQLResolveInfo): MaybePromise<any>;
 declare function handleResolverResult(resolverResult: any, subschema: Subschema, selectionSet: SelectionSetNode, object: ExternalObject, combinedFieldSubschemaMap: Record<string, GraphQLSchema | SubschemaConfig<any, any, any, Record<string, any>>>, info: GraphQLResolveInfo, path: Array<string | number>, combinedErrors: Array<GraphQLError>): void;
@@ -218,4 +220,4 @@ declare const leftOverByDelegationPlan: WeakMap<Map<Subschema<any, any, any, Rec
 declare const PLAN_LEFT_OVER: unique symbol;
 declare function getPlanLeftOverFromParent(parent: any): DelegationPlanLeftOver | undefined;
 
-export { type BatchingOptions, type CreateProxyingResolverFn, type Deferred, type DelegationContext, type DelegationPlanBuilder, type DelegationPlanLeftOver, type ExternalObject, FIELD_SUBSCHEMA_MAP_SYMBOL, type ICreateProxyingResolverOptions, type ICreateRequest, type IDelegateRequestOptions, type IDelegateToSchemaOptions, type MergedFieldConfig, type MergedTypeConfig, type MergedTypeEntryPoint, type MergedTypeInfo, type MergedTypeResolver, type MergedTypeResolverOptions, OBJECT_SUBSCHEMA_SYMBOL, PLAN_LEFT_OVER, type RequestTransform, type ResultTransform, type SchemaTransform, type StitchingInfo, Subschema, type SubschemaConfig, type Transform, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createDefaultExecutor, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getUnpathedErrors, handleResolverResult, isExternalObject, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };
+export { type BatchingOptions, type CreateProxyingResolverFn, type Deferred, type DelegationContext, type DelegationPlanBuilder, type DelegationPlanLeftOver, EMPTY_ARRAY, EMPTY_OBJECT, type ExternalObject, FIELD_SUBSCHEMA_MAP_SYMBOL, type ICreateProxyingResolverOptions, type ICreateRequest, type IDelegateRequestOptions, type IDelegateToSchemaOptions, type MergedFieldConfig, type MergedTypeConfig, type MergedTypeEntryPoint, type MergedTypeInfo, type MergedTypeResolver, type MergedTypeResolverOptions, OBJECT_SUBSCHEMA_SYMBOL, PLAN_LEFT_OVER, type RequestTransform, type ResultTransform, type SchemaTransform, type StitchingInfo, Subschema, type SubschemaConfig, type Transform, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createDefaultExecutor, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getUnpathedErrors, handleResolverResult, isExternalObject, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };

package/dist/index.d.ts

@@ -193,6 +193,8 @@ declare function isExternalObject(data: any): data is ExternalObject;
 declare function annotateExternalObject<TContext>(object: any, errors: Array<GraphQLError>, subschema: GraphQLSchema | SubschemaConfig<any, any, any, TContext> | undefined, subschemaMap: Record<string, GraphQLSchema | SubschemaConfig<any, any, any, Record<string, any>>>): ExternalObject;
 declare function getSubschema(object: ExternalObject, responseKey: string): GraphQLSchema | SubschemaConfig;
 declare function getUnpathedErrors(object: ExternalObject): Array<GraphQLError>;
+declare const EMPTY_ARRAY: any[];
+declare const EMPTY_OBJECT: any;
 declare const getActualFieldNodes: (fieldNode: FieldNode) => FieldNode[];
 declare function mergeFields<TContext>(mergedTypeInfo: MergedTypeInfo, object: any, sourceSubschema: Subschema<any, any, any, TContext>, context: any, info: GraphQLResolveInfo): MaybePromise<any>;
 declare function handleResolverResult(resolverResult: any, subschema: Subschema, selectionSet: SelectionSetNode, object: ExternalObject, combinedFieldSubschemaMap: Record<string, GraphQLSchema | SubschemaConfig<any, any, any, Record<string, any>>>, info: GraphQLResolveInfo, path: Array<string | number>, combinedErrors: Array<GraphQLError>): void;
@@ -218,4 +220,4 @@ declare const leftOverByDelegationPlan: WeakMap<Map<Subschema<any, any, any, Rec
 declare const PLAN_LEFT_OVER: unique symbol;
 declare function getPlanLeftOverFromParent(parent: any): DelegationPlanLeftOver | undefined;
 
-export { type BatchingOptions, type CreateProxyingResolverFn, type Deferred, type DelegationContext, type DelegationPlanBuilder, type DelegationPlanLeftOver, type ExternalObject, FIELD_SUBSCHEMA_MAP_SYMBOL, type ICreateProxyingResolverOptions, type ICreateRequest, type IDelegateRequestOptions, type IDelegateToSchemaOptions, type MergedFieldConfig, type MergedTypeConfig, type MergedTypeEntryPoint, type MergedTypeInfo, type MergedTypeResolver, type MergedTypeResolverOptions, OBJECT_SUBSCHEMA_SYMBOL, PLAN_LEFT_OVER, type RequestTransform, type ResultTransform, type SchemaTransform, type StitchingInfo, Subschema, type SubschemaConfig, type Transform, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createDefaultExecutor, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getUnpathedErrors, handleResolverResult, isExternalObject, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };
+export { type BatchingOptions, type CreateProxyingResolverFn, type Deferred, type DelegationContext, type DelegationPlanBuilder, type DelegationPlanLeftOver, EMPTY_ARRAY, EMPTY_OBJECT, type ExternalObject, FIELD_SUBSCHEMA_MAP_SYMBOL, type ICreateProxyingResolverOptions, type ICreateRequest, type IDelegateRequestOptions, type IDelegateToSchemaOptions, type MergedFieldConfig, type MergedTypeConfig, type MergedTypeEntryPoint, type MergedTypeInfo, type MergedTypeResolver, type MergedTypeResolverOptions, OBJECT_SUBSCHEMA_SYMBOL, PLAN_LEFT_OVER, type RequestTransform, type ResultTransform, type SchemaTransform, type StitchingInfo, Subschema, type SubschemaConfig, type Transform, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createDefaultExecutor, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getUnpathedErrors, handleResolverResult, isExternalObject, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { memoize2, memoize1, mapMaybePromise, collectFields, relocatedError, mergeDeep, pathToArray, isPromise, getResponseKeyFromInfo, getDefinedRootType, createVariableNameGenerator, updateArgument, serializeInputValue, createGraphQLError, implementsAbstractType, getRootTypeNames, createDeferred, isAsyncIterable, mapAsyncIterator, getOperationASTFromRequest, memoize4 } from '@graphql-tools/utils';
+import { memoize2, memoize1, mapMaybePromise, collectFields, relocatedError, mergeDeep, pathToArray, isPromise, getResponseKeyFromInfo, getDefinedRootType, createVariableNameGenerator, updateArgument, serializeInputValue, createGraphQLError, implementsAbstractType, getRootTypeNames, createDeferred, asArray, isAsyncIterable, mapAsyncIterator, getOperationASTFromRequest, memoize4 } from '@graphql-tools/utils';
 export { createDeferred } from '@graphql-tools/utils';
 import { GraphQLError, locatedError, isAbstractType, getNullableType, isLeafType, isCompositeType, isListType, responsePathAsArray, Kind, versionInfo, TypeInfo, visit, visitWithTypeInfo, isObjectType, isInterfaceType, TypeNameMetaFieldDef, isUnionType, getNamedType, isNullableType, typeFromAST, defaultFieldResolver, validate } from 'graphql';
 import { CRITICAL_ERROR, normalizedExecutor } from '@graphql-tools/executor';
@@ -1961,11 +1961,13 @@ function handleFlattenedParent(flattenedParent, leftOverParent, possibleSubschem
                 const delegationPlan = stitchingInfo.mergedTypes[nestedTypeName]?.delegationPlanBuilder(
                   info.schema,
                   sourceSubschema,
-                  info.variableValues,
-                  info.fragments,
-                  [fieldNode]
+                  info.variableValues != null && Object.keys(info.variableValues).length > 0 ? info.variableValues : EMPTY_OBJECT,
+                  info.fragments != null && Object.keys(info.fragments).length > 0 ? info.fragments : EMPTY_OBJECT,
+                  memoizedAsArray(fieldNode),
+                  context,
+                  info
                 );
-                if (delegationPlan) {
+                if (delegationPlan?.length) {
                   for (const delegationMap of delegationPlan) {
                     for (const [subschema, selectionSet2] of delegationMap) {
                       const resolver = stitchingInfo.mergedTypes[nestedTypeName]?.resolvers.get(subschema);
@@ -2156,6 +2158,7 @@ function flattenPromise(data) {
   }
   return data;
 }
+const memoizedAsArray = memoize1(asArray);
 
 function isSubschemaConfig(value) {
   return Boolean(value?.schema);
@@ -2580,4 +2583,4 @@ function subtractSelectionSets(selectionSetA, selectionSetB) {
   });
 }
 
-export { FIELD_SUBSCHEMA_MAP_SYMBOL, OBJECT_SUBSCHEMA_SYMBOL, PLAN_LEFT_OVER, Subschema, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createDefaultExecutor, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getUnpathedErrors, handleResolverResult, isExternalObject, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };
+export { EMPTY_ARRAY, EMPTY_OBJECT, FIELD_SUBSCHEMA_MAP_SYMBOL, OBJECT_SUBSCHEMA_SYMBOL, PLAN_LEFT_OVER, Subschema, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createDefaultExecutor, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getUnpathedErrors, handleResolverResult, isExternalObject, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@graphql-tools/delegate",
-  "version": "10.2.1",
+  "version": "10.2.2-alpha-9a7e474e0889bfa3b027934ebd5fb1c2454da1ff",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",
-    "url": "graphql-hive/gateway",
+    "url": "git+https://github.com/graphql-hive/gateway.git",
     "directory": "packages/delegate"
   },
   "license": "MIT",