@graphql-tools/delegate 12.0.5 → 12.0.6-alpha-1cce5edf33eefe10f69c3b55d80f1f6ceefe5aa3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @graphql-tools/delegate
 
+## 12.0.6-alpha-1cce5edf33eefe10f69c3b55d80f1f6ceefe5aa3
+### Patch Changes
+
+
+
+- [#1916](https://github.com/graphql-hive/gateway/pull/1916) [`5aa2a8c`](https://github.com/graphql-hive/gateway/commit/5aa2a8cb6ef1d254393e7926d9b26759d3df4901) Thanks [@ardatan](https://github.com/ardatan)! - Handle the type merging order correctly with custom labels and percentage labels for progressive override
+
 ## 12.0.5
 ### Patch Changes
 

package/dist/index.cjs

@@ -584,12 +584,6 @@ const getTypeInfoWithType = utils.memoize2(function getTypeInfoWithType2(schema,
   return graphql.versionInfo.major < 16 ? new graphql.TypeInfo(schema, void 0, type) : new graphql.TypeInfo(schema, type);
 });
 
-const handleOverrideByDelegation = utils.memoize3(
-  function handleOverrideByDelegation2(info, context, overrideHandler) {
-    return overrideHandler(context, info);
-  }
-);
-
 function finalizeGatewayDocument(targetSchema, fragments, operations, onOverlappingAliases, delegationContext) {
   let usedVariables = [];
   let usedFragments = [];
@@ -896,10 +890,9 @@ function filterSelectionSet(schema, typeInfo, validFragments, selectionSet, onOv
             const parentTypeName = parentType.name;
             const overrideHandler = delegationContext.subschemaConfig?.merge?.[parentTypeName]?.fields?.[field.name]?.override;
             if (overrideHandler != null) {
-              const overridden = handleOverrideByDelegation(
-                delegationContext.info,
+              const overridden = overrideHandler(
                 delegationContext.context,
-                overrideHandler
+                delegationContext.info
               );
               if (!overridden) {
                 return null;
@@ -2917,7 +2910,6 @@ exports.getSubschema = getSubschema;
 exports.getTypeInfo = getTypeInfo;
 exports.getTypeInfoWithType = getTypeInfoWithType;
 exports.getUnpathedErrors = getUnpathedErrors;
-exports.handleOverrideByDelegation = handleOverrideByDelegation;
 exports.handleResolverResult = handleResolverResult;
 exports.isExternalObject = isExternalObject;
 exports.isPrototypePollutingKey = isPrototypePollutingKey;

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { ExecutionRequest, ExecutionResult, Executor, Maybe, GraphQLResolveInfo as GraphQLResolveInfo$1 } from '@graphql-tools/utils';
+import { ExecutionRequest, ExecutionResult, Executor, Maybe } from '@graphql-tools/utils';
 export { createDeferred } from '@graphql-tools/utils';
 import * as graphql from 'graphql';
 import { GraphQLSchema, OperationTypeNode, GraphQLResolveInfo, GraphQLOutputType, GraphQLError, SelectionSetNode, GraphQLFieldResolver, FragmentDefinitionNode, FieldNode, GraphQLNamedType, GraphQLObjectType, GraphQLField, GraphQLInterfaceType, SelectionNode, GraphQLNamedOutputType, TypeInfo, GraphQLType } from 'graphql';
@@ -235,6 +235,4 @@ declare const prototypePollutingKeys: readonly ["__proto__", "constructor", "pro
 type PrototypePollutingKey = (typeof prototypePollutingKeys)[number];
 declare function isPrototypePollutingKey(key: string): key is PrototypePollutingKey;
 
-declare const handleOverrideByDelegation: (info: GraphQLResolveInfo$1, context: any, overrideHandler: OverrideHandler) => boolean;
-
-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, type OverrideHandler, PLAN_LEFT_OVER, type RequestTransform, type ResultTransform, type SchemaTransform, type StitchingInfo, Subschema, type SubschemaConfig, type Transform, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getTypeInfo, getTypeInfoWithType, getUnpathedErrors, handleOverrideByDelegation, handleResolverResult, isExternalObject, isPrototypePollutingKey, 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, type OverrideHandler, PLAN_LEFT_OVER, type RequestTransform, type ResultTransform, type SchemaTransform, type StitchingInfo, Subschema, type SubschemaConfig, type Transform, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getTypeInfo, getTypeInfoWithType, getUnpathedErrors, handleResolverResult, isExternalObject, isPrototypePollutingKey, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ExecutionRequest, ExecutionResult, Executor, Maybe, GraphQLResolveInfo as GraphQLResolveInfo$1 } from '@graphql-tools/utils';
+import { ExecutionRequest, ExecutionResult, Executor, Maybe } from '@graphql-tools/utils';
 export { createDeferred } from '@graphql-tools/utils';
 import * as graphql from 'graphql';
 import { GraphQLSchema, OperationTypeNode, GraphQLResolveInfo, GraphQLOutputType, GraphQLError, SelectionSetNode, GraphQLFieldResolver, FragmentDefinitionNode, FieldNode, GraphQLNamedType, GraphQLObjectType, GraphQLField, GraphQLInterfaceType, SelectionNode, GraphQLNamedOutputType, TypeInfo, GraphQLType } from 'graphql';
@@ -235,6 +235,4 @@ declare const prototypePollutingKeys: readonly ["__proto__", "constructor", "pro
 type PrototypePollutingKey = (typeof prototypePollutingKeys)[number];
 declare function isPrototypePollutingKey(key: string): key is PrototypePollutingKey;
 
-declare const handleOverrideByDelegation: (info: GraphQLResolveInfo$1, context: any, overrideHandler: OverrideHandler) => boolean;
-
-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, type OverrideHandler, PLAN_LEFT_OVER, type RequestTransform, type ResultTransform, type SchemaTransform, type StitchingInfo, Subschema, type SubschemaConfig, type Transform, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getTypeInfo, getTypeInfoWithType, getUnpathedErrors, handleOverrideByDelegation, handleResolverResult, isExternalObject, isPrototypePollutingKey, 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, type OverrideHandler, PLAN_LEFT_OVER, type RequestTransform, type ResultTransform, type SchemaTransform, type StitchingInfo, Subschema, type SubschemaConfig, type Transform, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getTypeInfo, getTypeInfoWithType, getUnpathedErrors, handleResolverResult, isExternalObject, isPrototypePollutingKey, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { memoize2, memoize1, collectFields, relocatedError, mergeDeep, promiseReduce, pathToArray, getResponseKeyFromInfo, memoize3, getDefinedRootType, createGraphQLError, implementsAbstractType, getRootTypeNames, astFromArg, astFromValueUntyped, asArray, isAsyncIterable, getOperationASTFromRequest } from '@graphql-tools/utils';
+import { memoize2, memoize1, collectFields, relocatedError, mergeDeep, promiseReduce, pathToArray, getResponseKeyFromInfo, getDefinedRootType, createGraphQLError, implementsAbstractType, getRootTypeNames, astFromArg, astFromValueUntyped, asArray, isAsyncIterable, getOperationASTFromRequest } from '@graphql-tools/utils';
 export { createDeferred } from '@graphql-tools/utils';
 import { GraphQLError, locatedError, isAbstractType, getNullableType, isLeafType, isCompositeType, isListType, responsePathAsArray, Kind, TypeInfo, versionInfo, visit, visitWithTypeInfo, isNullableType, isUnionType, getNamedType, isObjectType, isInterfaceType, isNonNullType, isInputObjectType, defaultFieldResolver, isSchema, validate } from 'graphql';
 import { handleMaybePromise, isPromise, createDeferredPromise, mapAsyncIterator } from '@whatwg-node/promise-helpers';
@@ -584,12 +584,6 @@ const getTypeInfoWithType = memoize2(function getTypeInfoWithType2(schema, type)
   return versionInfo.major < 16 ? new TypeInfo(schema, void 0, type) : new TypeInfo(schema, type);
 });
 
-const handleOverrideByDelegation = memoize3(
-  function handleOverrideByDelegation2(info, context, overrideHandler) {
-    return overrideHandler(context, info);
-  }
-);
-
 function finalizeGatewayDocument(targetSchema, fragments, operations, onOverlappingAliases, delegationContext) {
   let usedVariables = [];
   let usedFragments = [];
@@ -896,10 +890,9 @@ function filterSelectionSet(schema, typeInfo, validFragments, selectionSet, onOv
             const parentTypeName = parentType.name;
             const overrideHandler = delegationContext.subschemaConfig?.merge?.[parentTypeName]?.fields?.[field.name]?.override;
             if (overrideHandler != null) {
-              const overridden = handleOverrideByDelegation(
-                delegationContext.info,
+              const overridden = overrideHandler(
                 delegationContext.context,
-                overrideHandler
+                delegationContext.info
               );
               if (!overridden) {
                 return null;
@@ -2885,4 +2878,4 @@ function subtractSelectionSets(selectionSetA, selectionSetB) {
   };
 }
 
-export { EMPTY_ARRAY, EMPTY_OBJECT, FIELD_SUBSCHEMA_MAP_SYMBOL, OBJECT_SUBSCHEMA_SYMBOL, PLAN_LEFT_OVER, Subschema, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getTypeInfo, getTypeInfoWithType, getUnpathedErrors, handleOverrideByDelegation, handleResolverResult, isExternalObject, isPrototypePollutingKey, 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, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getTypeInfo, getTypeInfoWithType, getUnpathedErrors, handleResolverResult, isExternalObject, isPrototypePollutingKey, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/delegate",
-  "version": "12.0.5",
+  "version": "12.0.6-alpha-1cce5edf33eefe10f69c3b55d80f1f6ceefe5aa3",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {