fix(federation): use type merger from 'merge-graphql-schemas'

nestjs · Jan 20, 2020 · 77ae270 · 77ae270
1 parent 32f395b
commit 77ae270
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/lib/graphql-definitions.factory.ts b/lib/graphql-definitions.factory.ts
@@ -71,7 +71,7 @@ export class GraphQLDefinitionsFactory {
     outputAs: 'class' | 'interface',
     isDebugEnabled: boolean,
   ) {
-    const typeDefs = await this.gqlTypesLoader.getTypesFromPaths(typePaths);
+    const typeDefs = await this.gqlTypesLoader.mergeTypesByPaths(typePaths);
 
     const { buildFederatedSchema } = loadPackage('@apollo/federation', 'ApolloFederation');
     const { printSchema } = loadPackage('@apollo/federation', 'ApolloFederation');

diff --git a/lib/graphql-federation.module.ts b/lib/graphql-federation.module.ts
@@ -15,7 +15,7 @@ import { GraphQLTypesLoader } from './graphql-types.loader';
 import { GraphQLSchemaBuilder } from './graphql-schema-builder';
 import { GRAPHQL_MODULE_ID, GRAPHQL_MODULE_OPTIONS } from './graphql.constants';
 import { GqlModuleAsyncOptions, GqlModuleOptions, GqlOptionsFactory } from './interfaces';
-import { generateString, extend, mergeDefaults, normalizeRoutePath } from './utils';
+import { generateString, mergeDefaults, normalizeRoutePath } from './utils';
 import { GraphQLFactory } from './graphql.factory';
 
 @Module({
@@ -112,12 +112,11 @@ export class GraphQLFederationModule implements OnModuleInit {
     const { printSchema } = loadPackage('@apollo/federation', 'ApolloFederation');
 
     const { typePaths } = this.options;
-    const typeDefs = await this.graphqlTypesLoader.getTypesFromPaths(typePaths);
-    const mergedTypeDefs = extend(typeDefs, this.options.typeDefs);
+    const typeDefs = await this.graphqlTypesLoader.mergeTypesByPaths(typePaths);
 
     const apolloOptions = await this.graphqlFederationFactory.mergeOptions({
       ...this.options,
-      typeDefs: mergedTypeDefs,
+      typeDefs,
     });
 
     if (this.options.definitions && this.options.definitions.path) {

diff --git a/lib/graphql-types.loader.ts b/lib/graphql-types.loader.ts
@@ -20,10 +20,8 @@ export class GraphQLTypesLoader {
     return mergeTypes(flatTypes, { all: true }) as any;
   }
 
-  async getTypesFromPaths(paths: string | string[]): Promise<string[]> {
-    paths = util.isArray(paths)
-      ? paths.map(path => normalize(path))
-      : normalize(paths);
+  private async getTypesFromPaths(paths: string | string[]): Promise<string[]> {
+    paths = util.isArray(paths) ? paths.map(path => normalize(path)) : normalize(paths);
 
     const filePaths = await glob(paths, {
       ignore: ['node_modules'],