@graphql-tools/stitch 10.2.0 → 10.2.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @graphql-tools/stitch
 
+## 10.2.1
+### Patch Changes
+
+
+
+- [#2484](https://github.com/graphql-hive/gateway/pull/2484) [`a589a2d`](https://github.com/graphql-hive/gateway/commit/a589a2d9797e67623b28439d0bd30a17e3a247d6) Thanks [@jdolle](https://github.com/jdolle)! - Reduce peak memory consumption for `stitchSchemas` function
+
 ## 10.2.0
 ### Minor Changes
 

package/dist/index.cjs

@@ -3220,80 +3220,46 @@ function onTypeConflictToCandidateSelector(onTypeConflict) {
   });
 }
 
-function stitchSchemas({
-  subschemas = [],
-  types = [],
-  typeDefs = [],
-  onTypeConflict,
-  mergeTypes = true,
-  typeMergingOptions,
-  subschemaConfigTransforms = [],
-  resolvers = {},
-  inheritResolversFromInterfaces = false,
-  resolverValidationOptions = {},
-  updateResolversInPlace = true,
-  schemaExtensions,
-  ...rest
-}) {
-  const mergeDirectives = rest.mergeDirectives ?? true;
-  const transformedSubschemas = [];
-  const subschemaMap = /* @__PURE__ */ new Map();
-  const originalSubschemaMap = /* @__PURE__ */ new Map();
-  for (const subschema of subschemas) {
-    for (const transformedSubschemaConfig of applySubschemaConfigTransforms(
-      subschemaConfigTransforms,
-      subschema,
-      subschemaMap,
-      originalSubschemaMap
-    )) {
-      transformedSubschemas.push(transformedSubschemaConfig);
-    }
-  }
-  const directiveMap = /* @__PURE__ */ Object.create(null);
-  for (const directive of graphql.specifiedDirectives) {
-    directiveMap[directive.name] = directive;
-  }
-  const schemaDefs = /* @__PURE__ */ Object.create(null);
-  const [typeCandidates, rootTypeNameMap, extensions] = buildTypeCandidates({
-    subschemas: transformedSubschemas,
-    originalSubschemaMap,
-    types,
-    typeDefs: typeDefs || [],
-    parseOptions: rest,
-    directiveMap,
-    schemaDefs,
-    mergeDirectives
-  });
-  let stitchingInfo = createStitchingInfo(
-    subschemaMap,
-    typeCandidates,
-    mergeTypes
-  );
-  const { typeMap: newTypeMap, directives: newDirectives } = buildTypes({
+function stitchSchemas(options) {
+  const {
+    resolvers = {},
+    inheritResolversFromInterfaces = false,
+    resolverValidationOptions = {},
+    updateResolversInPlace = true,
+    schemaExtensions,
+    ...rest
+  } = options;
+  let {
     typeCandidates,
-    directives: Object.values(directiveMap),
+    newTypeMap,
+    newDirectives,
+    rootTypeNameMap,
     stitchingInfo,
-    rootTypeNames: Object.values(rootTypeNameMap),
-    onTypeConflict,
-    mergeTypes,
-    typeMergingOptions
-  });
-  if (!mergeDirectives) {
-    stripCustomDirectiveUsages(Object.values(newTypeMap));
-  }
-  let schema$1 = new graphql.GraphQLSchema({
-    query: newTypeMap[rootTypeNameMap.query],
-    mutation: newTypeMap[rootTypeNameMap.mutation],
-    subscription: newTypeMap[rootTypeNameMap.subscription],
-    types: Object.values(newTypeMap),
-    directives: newDirectives,
-    astNode: schemaDefs.schemaDef,
-    extensionASTNodes: schemaDefs.schemaExtensions,
-    extensions: null,
-    assumeValid: rest.assumeValid
-  });
-  for (const extension of extensions) {
-    schema$1 = graphql.extendSchema(schema$1, extension, {
+    schemaDefs,
+    extensions,
+    mergeDirectives
+  } = prepareStitchingData(options);
+  let schema$1;
+  {
+    const finalTypes = Object.values(newTypeMap);
+    if (!mergeDirectives) {
+      stripCustomDirectiveUsages(finalTypes);
+    }
+    schema$1 = new graphql.GraphQLSchema({
+      query: newTypeMap[rootTypeNameMap.query],
+      mutation: newTypeMap[rootTypeNameMap.mutation],
+      subscription: newTypeMap[rootTypeNameMap.subscription],
+      types: finalTypes,
+      directives: newDirectives,
+      astNode: schemaDefs.schemaDef,
+      extensionASTNodes: schemaDefs.schemaExtensions,
+      extensions: null,
+      assumeValid: rest.assumeValid
+    });
+  }
+  if (extensions.length > 0) {
+    const mergedExtensions = graphql.concatAST(extensions);
+    schema$1 = graphql.extendSchema(schema$1, mergedExtensions, {
       commentDescriptions: true
     });
   }
@@ -3317,10 +3283,8 @@ function stitchSchemas({
   }
   addStitchingInfo(schema$1, stitchingInfo);
   if (schemaExtensions) {
-    if (Array.isArray(schemaExtensions)) {
-      schemaExtensions = merge.mergeExtensions(schemaExtensions);
-    }
-    merge.applyExtensions(schema$1, schemaExtensions);
+    const mergedSchemaExtensions = Array.isArray(schemaExtensions) ? merge.mergeExtensions(schemaExtensions) : schemaExtensions;
+    merge.applyExtensions(schema$1, mergedSchemaExtensions);
   }
   return schema$1;
 }
@@ -3479,6 +3443,71 @@ function applySubschemaConfigTransforms(subschemaConfigTransforms, subschemaOrSu
   }
   return transformedSubschemas;
 }
+function prepareStitchingData(options) {
+  const {
+    subschemas = [],
+    types = [],
+    typeDefs = [],
+    onTypeConflict,
+    mergeTypes = true,
+    typeMergingOptions,
+    subschemaConfigTransforms = [],
+    ...rest
+  } = options;
+  const mergeDirectives = rest.mergeDirectives ?? true;
+  const transformedSubschemas = [];
+  const subschemaMap = /* @__PURE__ */ new Map();
+  const originalSubschemaMap = /* @__PURE__ */ new Map();
+  for (const subschema of subschemas) {
+    for (const transformedSubschemaConfig of applySubschemaConfigTransforms(
+      subschemaConfigTransforms,
+      subschema,
+      subschemaMap,
+      originalSubschemaMap
+    )) {
+      transformedSubschemas.push(transformedSubschemaConfig);
+    }
+  }
+  const directiveMap = /* @__PURE__ */ Object.create(null);
+  for (const directive of graphql.specifiedDirectives) {
+    directiveMap[directive.name] = directive;
+  }
+  const schemaDefs = /* @__PURE__ */ Object.create(null);
+  const [typeCandidates, rootTypeNameMap, extensions] = buildTypeCandidates({
+    subschemas: transformedSubschemas,
+    originalSubschemaMap,
+    types,
+    typeDefs: typeDefs || [],
+    parseOptions: rest,
+    directiveMap,
+    schemaDefs,
+    mergeDirectives
+  });
+  const stitchingInfo = createStitchingInfo(
+    subschemaMap,
+    typeCandidates,
+    mergeTypes
+  );
+  const { typeMap: newTypeMap, directives: newDirectives } = buildTypes({
+    typeCandidates,
+    directives: Object.values(directiveMap),
+    stitchingInfo,
+    rootTypeNames: Object.values(rootTypeNameMap),
+    onTypeConflict,
+    mergeTypes,
+    typeMergingOptions
+  });
+  return {
+    typeCandidates,
+    newTypeMap,
+    newDirectives,
+    rootTypeNameMap,
+    stitchingInfo,
+    schemaDefs,
+    extensions,
+    mergeDirectives
+  };
+}
 
 const forwardArgsToSelectionSet = (selectionSet, mapping) => {
   const selectionSetDef = utils.parseSelectionSet(selectionSet, { noLocation: true });

package/dist/index.d.cts

@@ -85,7 +85,7 @@ declare module '@graphql-tools/utils' {
     }
 }
 
-declare function stitchSchemas<TContext extends Record<string, any> = Record<string, any>>({ subschemas, types, typeDefs, onTypeConflict, mergeTypes, typeMergingOptions, subschemaConfigTransforms, resolvers, inheritResolversFromInterfaces, resolverValidationOptions, updateResolversInPlace, schemaExtensions, ...rest }: IStitchSchemasOptions<TContext>): GraphQLSchema;
+declare function stitchSchemas<TContext extends Record<string, any> = Record<string, any>>(options: IStitchSchemasOptions<TContext>): GraphQLSchema;
 
 declare function createMergedTypeResolver<TContext extends Record<string, any> = any>(mergedTypeResolverOptions: MergedTypeResolverOptions, mergedType?: GraphQLOutputType | string): MergedTypeResolver<TContext> | undefined;
 

package/dist/index.d.ts

@@ -85,7 +85,7 @@ declare module '@graphql-tools/utils' {
     }
 }
 
-declare function stitchSchemas<TContext extends Record<string, any> = Record<string, any>>({ subschemas, types, typeDefs, onTypeConflict, mergeTypes, typeMergingOptions, subschemaConfigTransforms, resolvers, inheritResolversFromInterfaces, resolverValidationOptions, updateResolversInPlace, schemaExtensions, ...rest }: IStitchSchemasOptions<TContext>): GraphQLSchema;
+declare function stitchSchemas<TContext extends Record<string, any> = Record<string, any>>(options: IStitchSchemasOptions<TContext>): GraphQLSchema;
 
 declare function createMergedTypeResolver<TContext extends Record<string, any> = any>(mergedTypeResolverOptions: MergedTypeResolverOptions, mergedType?: GraphQLOutputType | string): MergedTypeResolver<TContext> | undefined;
 

package/dist/index.js

@@ -3,7 +3,7 @@ import { mergeType, mergeInputType, mergeInterface, mergeUnion, mergeEnum, merge
 import { extendResolversFromInterfaces, addResolversToSchema, assertResolversPresent, makeExecutableSchema } from '@graphql-tools/schema';
 import { mergeDeep, collectSubFields, memoize3, memoize2, memoize1, parseSelectionSet, collectFields, isSome, getImplementingTypes, getRootTypeNames, filterSchema, getDescription, createNamedStub, createStub, getRootTypeMap, getRootTypes, inspect, rewireTypes, getOperationASTFromRequest, getDefinedRootType, getArgumentValues } from '@graphql-tools/utils';
 import { handleMaybePromise } from '@whatwg-node/promise-helpers';
-import { getNamedType, Kind, isAbstractType, TypeNameMetaFieldDef, isObjectType, GraphQLList, isLeafType, isInputObjectType, isUnionType, print, isInterfaceType, visit, isScalarType, isCompositeType, isNonNullType, isEnumType, isListType, getNullableType, isNullableType, GraphQLObjectType, GraphQLInputObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLScalarType, GraphQLDirective, valueFromASTUntyped, getDirectiveValues, GraphQLDeprecatedDirective, DirectiveLocation, isNamedType, isIntrospectionType, isDirective, isSpecifiedScalarType, specifiedDirectives, GraphQLSchema, extendSchema, isSpecifiedDirective } from 'graphql';
+import { getNamedType, Kind, isAbstractType, TypeNameMetaFieldDef, isObjectType, GraphQLList, isLeafType, isInputObjectType, isUnionType, print, isInterfaceType, visit, isScalarType, isCompositeType, isNonNullType, isEnumType, isListType, getNullableType, isNullableType, GraphQLObjectType, GraphQLInputObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLScalarType, GraphQLDirective, valueFromASTUntyped, getDirectiveValues, GraphQLDeprecatedDirective, DirectiveLocation, isNamedType, isIntrospectionType, isDirective, isSpecifiedScalarType, GraphQLSchema, concatAST, extendSchema, specifiedDirectives, isSpecifiedDirective } from 'graphql';
 import { batchDelegateToSchema } from '@graphql-tools/batch-delegate';
 import { FilterTypes, TransformCompositeFields, wrapSchema } from '@graphql-tools/wrap';
 import { getFragmentsFromDocument } from '@graphql-tools/executor';
@@ -3218,80 +3218,46 @@ function onTypeConflictToCandidateSelector(onTypeConflict) {
   });
 }
 
-function stitchSchemas({
-  subschemas = [],
-  types = [],
-  typeDefs = [],
-  onTypeConflict,
-  mergeTypes = true,
-  typeMergingOptions,
-  subschemaConfigTransforms = [],
-  resolvers = {},
-  inheritResolversFromInterfaces = false,
-  resolverValidationOptions = {},
-  updateResolversInPlace = true,
-  schemaExtensions,
-  ...rest
-}) {
-  const mergeDirectives = rest.mergeDirectives ?? true;
-  const transformedSubschemas = [];
-  const subschemaMap = /* @__PURE__ */ new Map();
-  const originalSubschemaMap = /* @__PURE__ */ new Map();
-  for (const subschema of subschemas) {
-    for (const transformedSubschemaConfig of applySubschemaConfigTransforms(
-      subschemaConfigTransforms,
-      subschema,
-      subschemaMap,
-      originalSubschemaMap
-    )) {
-      transformedSubschemas.push(transformedSubschemaConfig);
-    }
-  }
-  const directiveMap = /* @__PURE__ */ Object.create(null);
-  for (const directive of specifiedDirectives) {
-    directiveMap[directive.name] = directive;
-  }
-  const schemaDefs = /* @__PURE__ */ Object.create(null);
-  const [typeCandidates, rootTypeNameMap, extensions] = buildTypeCandidates({
-    subschemas: transformedSubschemas,
-    originalSubschemaMap,
-    types,
-    typeDefs: typeDefs || [],
-    parseOptions: rest,
-    directiveMap,
-    schemaDefs,
-    mergeDirectives
-  });
-  let stitchingInfo = createStitchingInfo(
-    subschemaMap,
-    typeCandidates,
-    mergeTypes
-  );
-  const { typeMap: newTypeMap, directives: newDirectives } = buildTypes({
+function stitchSchemas(options) {
+  const {
+    resolvers = {},
+    inheritResolversFromInterfaces = false,
+    resolverValidationOptions = {},
+    updateResolversInPlace = true,
+    schemaExtensions,
+    ...rest
+  } = options;
+  let {
     typeCandidates,
-    directives: Object.values(directiveMap),
+    newTypeMap,
+    newDirectives,
+    rootTypeNameMap,
     stitchingInfo,
-    rootTypeNames: Object.values(rootTypeNameMap),
-    onTypeConflict,
-    mergeTypes,
-    typeMergingOptions
-  });
-  if (!mergeDirectives) {
-    stripCustomDirectiveUsages(Object.values(newTypeMap));
-  }
-  let schema = new GraphQLSchema({
-    query: newTypeMap[rootTypeNameMap.query],
-    mutation: newTypeMap[rootTypeNameMap.mutation],
-    subscription: newTypeMap[rootTypeNameMap.subscription],
-    types: Object.values(newTypeMap),
-    directives: newDirectives,
-    astNode: schemaDefs.schemaDef,
-    extensionASTNodes: schemaDefs.schemaExtensions,
-    extensions: null,
-    assumeValid: rest.assumeValid
-  });
-  for (const extension of extensions) {
-    schema = extendSchema(schema, extension, {
+    schemaDefs,
+    extensions,
+    mergeDirectives
+  } = prepareStitchingData(options);
+  let schema;
+  {
+    const finalTypes = Object.values(newTypeMap);
+    if (!mergeDirectives) {
+      stripCustomDirectiveUsages(finalTypes);
+    }
+    schema = new GraphQLSchema({
+      query: newTypeMap[rootTypeNameMap.query],
+      mutation: newTypeMap[rootTypeNameMap.mutation],
+      subscription: newTypeMap[rootTypeNameMap.subscription],
+      types: finalTypes,
+      directives: newDirectives,
+      astNode: schemaDefs.schemaDef,
+      extensionASTNodes: schemaDefs.schemaExtensions,
+      extensions: null,
+      assumeValid: rest.assumeValid
+    });
+  }
+  if (extensions.length > 0) {
+    const mergedExtensions = concatAST(extensions);
+    schema = extendSchema(schema, mergedExtensions, {
       commentDescriptions: true
     });
   }
@@ -3315,10 +3281,8 @@ function stitchSchemas({
   }
   addStitchingInfo(schema, stitchingInfo);
   if (schemaExtensions) {
-    if (Array.isArray(schemaExtensions)) {
-      schemaExtensions = mergeExtensions(schemaExtensions);
-    }
-    applyExtensions(schema, schemaExtensions);
+    const mergedSchemaExtensions = Array.isArray(schemaExtensions) ? mergeExtensions(schemaExtensions) : schemaExtensions;
+    applyExtensions(schema, mergedSchemaExtensions);
   }
   return schema;
 }
@@ -3477,6 +3441,71 @@ function applySubschemaConfigTransforms(subschemaConfigTransforms, subschemaOrSu
   }
   return transformedSubschemas;
 }
+function prepareStitchingData(options) {
+  const {
+    subschemas = [],
+    types = [],
+    typeDefs = [],
+    onTypeConflict,
+    mergeTypes = true,
+    typeMergingOptions,
+    subschemaConfigTransforms = [],
+    ...rest
+  } = options;
+  const mergeDirectives = rest.mergeDirectives ?? true;
+  const transformedSubschemas = [];
+  const subschemaMap = /* @__PURE__ */ new Map();
+  const originalSubschemaMap = /* @__PURE__ */ new Map();
+  for (const subschema of subschemas) {
+    for (const transformedSubschemaConfig of applySubschemaConfigTransforms(
+      subschemaConfigTransforms,
+      subschema,
+      subschemaMap,
+      originalSubschemaMap
+    )) {
+      transformedSubschemas.push(transformedSubschemaConfig);
+    }
+  }
+  const directiveMap = /* @__PURE__ */ Object.create(null);
+  for (const directive of specifiedDirectives) {
+    directiveMap[directive.name] = directive;
+  }
+  const schemaDefs = /* @__PURE__ */ Object.create(null);
+  const [typeCandidates, rootTypeNameMap, extensions] = buildTypeCandidates({
+    subschemas: transformedSubschemas,
+    originalSubschemaMap,
+    types,
+    typeDefs: typeDefs || [],
+    parseOptions: rest,
+    directiveMap,
+    schemaDefs,
+    mergeDirectives
+  });
+  const stitchingInfo = createStitchingInfo(
+    subschemaMap,
+    typeCandidates,
+    mergeTypes
+  );
+  const { typeMap: newTypeMap, directives: newDirectives } = buildTypes({
+    typeCandidates,
+    directives: Object.values(directiveMap),
+    stitchingInfo,
+    rootTypeNames: Object.values(rootTypeNameMap),
+    onTypeConflict,
+    mergeTypes,
+    typeMergingOptions
+  });
+  return {
+    typeCandidates,
+    newTypeMap,
+    newDirectives,
+    rootTypeNameMap,
+    stitchingInfo,
+    schemaDefs,
+    extensions,
+    mergeDirectives
+  };
+}
 
 const forwardArgsToSelectionSet = (selectionSet, mapping) => {
   const selectionSetDef = parseSelectionSet(selectionSet, { noLocation: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/stitch",
-  "version": "10.2.0",
+  "version": "10.2.1",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {