@graphql-tools/delegate 10.2.5 → 10.2.6-alpha-8a518b5a83e07bd2eea5e9e3bd5dcd80c2f7b5eb

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @graphql-tools/delegate
 
+## 10.2.6-alpha-8a518b5a83e07bd2eea5e9e3bd5dcd80c2f7b5eb
+
+### Patch Changes
+
+- [#268](https://github.com/graphql-hive/gateway/pull/268) [`6111e73`](https://github.com/graphql-hive/gateway/commit/6111e733371982027c1b572d8451889ac6f266ed) Thanks [@ardatan](https://github.com/ardatan)! - dependencies updates:
+
+  - Updated dependency [`dataloader@^2.2.3` ↗︎](https://www.npmjs.com/package/dataloader/v/2.2.3) (from `^2.2.2`, in `dependencies`)
+
+- Updated dependencies [[`6111e73`](https://github.com/graphql-hive/gateway/commit/6111e733371982027c1b572d8451889ac6f266ed)]:
+  - @graphql-tools/batch-execute@9.0.9-alpha-8a518b5a83e07bd2eea5e9e3bd5dcd80c2f7b5eb
+
 ## 10.2.5
 
 ### Patch Changes

package/dist/index.cjs

@@ -558,6 +558,13 @@ function getDocumentMetadata(document) {
   };
 }
 
+const getTypeInfo = utils.memoize1(function getTypeInfo2(schema) {
+  return new graphql.TypeInfo(schema);
+});
+const getTypeInfoWithType = utils.memoize2(function getTypeInfoWithType2(schema, type) {
+  return graphql.versionInfo.major < 16 ? new graphql.TypeInfo(schema, void 0, type) : new graphql.TypeInfo(schema, type);
+});
+
 function finalizeGatewayDocument(targetSchema, fragments, operations, onOverlappingAliases, delegationContext) {
   let usedVariables = [];
   let usedFragments = [];
@@ -643,7 +650,7 @@ function finalizeGatewayDocument(targetSchema, fragments, operations, onOverlapp
   };
   const stitchingInfo = delegationContext.info?.schema?.extensions?.["stitchingInfo"];
   if (stitchingInfo != null) {
-    const typeInfo = new graphql.TypeInfo(targetSchema);
+    const typeInfo = getTypeInfo(targetSchema);
     newDocument = graphql.visit(
       newDocument,
       graphql.visitWithTypeInfo(typeInfo, {
@@ -886,7 +893,7 @@ const variablesVisitorKeys = {
 function finalizeSelectionSet(schema, type, validFragments, selectionSet, onOverlappingAliases) {
   const usedFragments = [];
   const usedVariables = [];
-  const typeInfo = graphql.versionInfo.major < 16 ? new graphql.TypeInfo(schema, void 0, type) : new graphql.TypeInfo(schema, type);
+  const typeInfo = getTypeInfoWithType(schema, type);
   const seenNonNullableMap = /* @__PURE__ */ new WeakMap();
   const seenNullableMap = /* @__PURE__ */ new WeakMap();
   const filteredSelectionSet = graphql.visit(
@@ -1157,7 +1164,7 @@ function prepareGatewayDocument(originalDocument, transformedSchema, returnType,
     fragmentNames,
     possibleTypesMap
   );
-  const typeInfo = new graphql.TypeInfo(transformedSchema);
+  const typeInfo = getTypeInfo(transformedSchema);
   const expandedDocument = {
     kind: graphql.Kind.DOCUMENT,
     definitions: [...operations, ...fragments, ...expandedFragments]
@@ -1547,7 +1554,7 @@ function wrapConcreteTypes(returnType, targetSchema, document) {
     possibleTypes = [namedType];
   }
   const rootTypeNames = utils.getRootTypeNames(targetSchema);
-  const typeInfo = new graphql.TypeInfo(targetSchema);
+  const typeInfo = getTypeInfo(targetSchema);
   const visitorKeys = {
     Document: ["definitions"],
     OperationDefinition: ["selectionSet"],
@@ -2010,7 +2017,7 @@ function handleFlattenedParent(flattenedParent, leftOverParent, possibleSubschem
                   sourceSubschema,
                   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),
+                  getActualFieldNodes(fieldNode),
                   context,
                   info
                 );
@@ -2205,7 +2212,6 @@ function flattenPromise(data) {
   }
   return data;
 }
-const memoizedAsArray = utils.memoize1(utils.asArray);
 
 function isSubschemaConfig(value) {
   return Boolean(value?.schema);
@@ -2685,6 +2691,8 @@ exports.getActualFieldNodes = getActualFieldNodes;
 exports.getDelegatingOperation = getDelegatingOperation;
 exports.getPlanLeftOverFromParent = getPlanLeftOverFromParent;
 exports.getSubschema = getSubschema;
+exports.getTypeInfo = getTypeInfo;
+exports.getTypeInfoWithType = getTypeInfoWithType;
 exports.getUnpathedErrors = getUnpathedErrors;
 exports.handleResolverResult = handleResolverResult;
 exports.isExternalObject = isExternalObject;

package/dist/index.d.cts

@@ -1,7 +1,7 @@
-import { ExecutionRequest, ExecutionResult, Executor, MaybePromise, PromiseWithResolvers } from '@graphql-tools/utils';
+import { ExecutionRequest, ExecutionResult, Executor, MaybePromise, PromiseWithResolvers, Maybe } from '@graphql-tools/utils';
 export { createDeferred } from '@graphql-tools/utils';
 import * as graphql from 'graphql';
-import { GraphQLSchema, OperationTypeNode, GraphQLResolveInfo, GraphQLOutputType, GraphQLError, SelectionSetNode, FieldNode, GraphQLObjectType, FragmentDefinitionNode, VariableDefinitionNode, GraphQLNamedType, GraphQLFieldResolver, GraphQLNamedOutputType, GraphQLInterfaceType, SelectionNode, GraphQLField } from 'graphql';
+import { GraphQLSchema, OperationTypeNode, GraphQLResolveInfo, GraphQLOutputType, GraphQLError, SelectionSetNode, FieldNode, GraphQLObjectType, FragmentDefinitionNode, VariableDefinitionNode, GraphQLNamedType, GraphQLFieldResolver, GraphQLNamedOutputType, GraphQLInterfaceType, SelectionNode, GraphQLField, TypeInfo, GraphQLType } from 'graphql';
 import DataLoader from 'dataloader';
 
 declare const UNPATHED_ERRORS_SYMBOL: unique symbol;
@@ -222,4 +222,7 @@ 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, 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 };
+declare const getTypeInfo: (schema: GraphQLSchema) => TypeInfo;
+declare const getTypeInfoWithType: (schema: GraphQLSchema, type: Maybe<GraphQLType>) => TypeInfo;
+
+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, getTypeInfo, getTypeInfoWithType, getUnpathedErrors, handleResolverResult, isExternalObject, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { ExecutionRequest, ExecutionResult, Executor, MaybePromise, PromiseWithResolvers } from '@graphql-tools/utils';
+import { ExecutionRequest, ExecutionResult, Executor, MaybePromise, PromiseWithResolvers, Maybe } from '@graphql-tools/utils';
 export { createDeferred } from '@graphql-tools/utils';
 import * as graphql from 'graphql';
-import { GraphQLSchema, OperationTypeNode, GraphQLResolveInfo, GraphQLOutputType, GraphQLError, SelectionSetNode, FieldNode, GraphQLObjectType, FragmentDefinitionNode, VariableDefinitionNode, GraphQLNamedType, GraphQLFieldResolver, GraphQLNamedOutputType, GraphQLInterfaceType, SelectionNode, GraphQLField } from 'graphql';
+import { GraphQLSchema, OperationTypeNode, GraphQLResolveInfo, GraphQLOutputType, GraphQLError, SelectionSetNode, FieldNode, GraphQLObjectType, FragmentDefinitionNode, VariableDefinitionNode, GraphQLNamedType, GraphQLFieldResolver, GraphQLNamedOutputType, GraphQLInterfaceType, SelectionNode, GraphQLField, TypeInfo, GraphQLType } from 'graphql';
 import DataLoader from 'dataloader';
 
 declare const UNPATHED_ERRORS_SYMBOL: unique symbol;
@@ -222,4 +222,7 @@ 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, 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 };
+declare const getTypeInfo: (schema: GraphQLSchema) => TypeInfo;
+declare const getTypeInfoWithType: (schema: GraphQLSchema, type: Maybe<GraphQLType>) => TypeInfo;
+
+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, getTypeInfo, getTypeInfoWithType, getUnpathedErrors, handleResolverResult, isExternalObject, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };

package/dist/index.js

@@ -1,6 +1,6 @@
-import { memoize2, memoize1, mapMaybePromise, collectFields, relocatedError, mergeDeep, pathToArray, isPromise, getResponseKeyFromInfo, getDefinedRootType, createVariableNameGenerator, updateArgument, serializeInputValue, createGraphQLError, implementsAbstractType, getRootTypeNames, createDeferred, asArray, isAsyncIterable, mapAsyncIterator, getOperationASTFromRequest } from '@graphql-tools/utils';
+import { memoize2, memoize1, mapMaybePromise, collectFields, relocatedError, mergeDeep, pathToArray, isPromise, getResponseKeyFromInfo, getDefinedRootType, createVariableNameGenerator, updateArgument, serializeInputValue, createGraphQLError, implementsAbstractType, getRootTypeNames, createDeferred, isAsyncIterable, mapAsyncIterator, getOperationASTFromRequest } from '@graphql-tools/utils';
 export { createDeferred } from '@graphql-tools/utils';
-import { GraphQLError, locatedError, isAbstractType, getNullableType, isLeafType, isCompositeType, isListType, responsePathAsArray, Kind, TypeInfo, visit, visitWithTypeInfo, versionInfo, isObjectType, isInterfaceType, isUnionType, getNamedType, isNullableType, typeFromAST, defaultFieldResolver, validate } from 'graphql';
+import { GraphQLError, locatedError, isAbstractType, getNullableType, isLeafType, isCompositeType, isListType, responsePathAsArray, Kind, TypeInfo, versionInfo, visit, visitWithTypeInfo, isObjectType, isInterfaceType, isUnionType, getNamedType, isNullableType, typeFromAST, defaultFieldResolver, validate } from 'graphql';
 import { CRITICAL_ERROR, normalizedExecutor } from '@graphql-tools/executor';
 import { getBatchingExecutor } from '@graphql-tools/batch-execute';
 import { Repeater } from '@repeaterjs/repeater';
@@ -557,6 +557,13 @@ function getDocumentMetadata(document) {
   };
 }
 
+const getTypeInfo = memoize1(function getTypeInfo2(schema) {
+  return new TypeInfo(schema);
+});
+const getTypeInfoWithType = memoize2(function getTypeInfoWithType2(schema, type) {
+  return versionInfo.major < 16 ? new TypeInfo(schema, void 0, type) : new TypeInfo(schema, type);
+});
+
 function finalizeGatewayDocument(targetSchema, fragments, operations, onOverlappingAliases, delegationContext) {
   let usedVariables = [];
   let usedFragments = [];
@@ -642,7 +649,7 @@ function finalizeGatewayDocument(targetSchema, fragments, operations, onOverlapp
   };
   const stitchingInfo = delegationContext.info?.schema?.extensions?.["stitchingInfo"];
   if (stitchingInfo != null) {
-    const typeInfo = new TypeInfo(targetSchema);
+    const typeInfo = getTypeInfo(targetSchema);
     newDocument = visit(
       newDocument,
       visitWithTypeInfo(typeInfo, {
@@ -885,7 +892,7 @@ const variablesVisitorKeys = {
 function finalizeSelectionSet(schema, type, validFragments, selectionSet, onOverlappingAliases) {
   const usedFragments = [];
   const usedVariables = [];
-  const typeInfo = versionInfo.major < 16 ? new TypeInfo(schema, void 0, type) : new TypeInfo(schema, type);
+  const typeInfo = getTypeInfoWithType(schema, type);
   const seenNonNullableMap = /* @__PURE__ */ new WeakMap();
   const seenNullableMap = /* @__PURE__ */ new WeakMap();
   const filteredSelectionSet = visit(
@@ -1156,7 +1163,7 @@ function prepareGatewayDocument(originalDocument, transformedSchema, returnType,
     fragmentNames,
     possibleTypesMap
   );
-  const typeInfo = new TypeInfo(transformedSchema);
+  const typeInfo = getTypeInfo(transformedSchema);
   const expandedDocument = {
     kind: Kind.DOCUMENT,
     definitions: [...operations, ...fragments, ...expandedFragments]
@@ -1546,7 +1553,7 @@ function wrapConcreteTypes(returnType, targetSchema, document) {
     possibleTypes = [namedType];
   }
   const rootTypeNames = getRootTypeNames(targetSchema);
-  const typeInfo = new TypeInfo(targetSchema);
+  const typeInfo = getTypeInfo(targetSchema);
   const visitorKeys = {
     Document: ["definitions"],
     OperationDefinition: ["selectionSet"],
@@ -2009,7 +2016,7 @@ function handleFlattenedParent(flattenedParent, leftOverParent, possibleSubschem
                   sourceSubschema,
                   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),
+                  getActualFieldNodes(fieldNode),
                   context,
                   info
                 );
@@ -2204,7 +2211,6 @@ function flattenPromise(data) {
   }
   return data;
 }
-const memoizedAsArray = memoize1(asArray);
 
 function isSubschemaConfig(value) {
   return Boolean(value?.schema);
@@ -2658,4 +2664,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, 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, getTypeInfo, getTypeInfoWithType, getUnpathedErrors, handleResolverResult, isExternalObject, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/delegate",
-  "version": "10.2.5",
+  "version": "10.2.6-alpha-8a518b5a83e07bd2eea5e9e3bd5dcd80c2f7b5eb",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
@@ -38,12 +38,12 @@
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/batch-execute": "^9.0.8",
+    "@graphql-tools/batch-execute": "9.0.9-alpha-8a518b5a83e07bd2eea5e9e3bd5dcd80c2f7b5eb",
     "@graphql-tools/executor": "^1.3.3",
     "@graphql-tools/schema": "^10.0.8",
     "@graphql-tools/utils": "^10.6.0",
     "@repeaterjs/repeater": "^3.0.6",
-    "dataloader": "^2.2.2",
+    "dataloader": "^2.2.3",
     "dset": "^3.1.2",
     "tslib": "^2.5.0"
   },