refactor: use fed2 implementation due to changes

Author: greguintow

packages/graphql/lib/federation/graphql-federation.factory.ts

@@ -26,9 +26,13 @@ import { gql } from 'graphql-tag';
 import { forEach, isEmpty } from 'lodash';
 import { GraphQLSchemaBuilder } from '../graphql-schema.builder';
 import { GraphQLSchemaHost } from '../graphql-schema.host';
-import { GqlModuleOptions, BuildFederatedSchemaOptions } from '../interfaces';
+import {
+  GqlModuleOptions,
+  BuildFederatedSchemaOptions,
+  AutoSchemaFileValue,
+} from '../interfaces';
 import { ResolversExplorerService, ScalarsExplorerService } from '../services';
-import { extend, stringifyWithoutQuotes } from '../utils';
+import { extend, getFederation2Info, stringifyWithoutQuotes } from '../utils';
 import { transformSchema } from '../utils/transform-schema.util';
 
 @Injectable()
@@ -113,7 +117,10 @@ export class GraphQLFederationFactory {
     let typeDefs = isApolloSubgraph2
       ? printSchemaWithDirectives(autoGeneratedSchema)
       : printSubgraphSchema(autoGeneratedSchema);
-    if (options.useFed2 && isApolloSubgraph2) {
+
+    const useFed2 = getFederation2Info(options.autoSchemaFile);
+
+    if (useFed2 && isApolloSubgraph2) {
       const {
         directives = [
           '@key',
@@ -123,7 +130,7 @@ export class GraphQLFederationFactory {
           '@requires',
         ],
         importUrl = 'https://specs.apollo.dev/federation/v2.0',
-      } = typeof options.useFed2 === 'boolean' ? {} : options.useFed2;
+      } = typeof useFed2 === 'boolean' ? {} : useFed2;
       const mappedDirectives = directives
         .map((directive) => {
           if (!isString(directive)) {
@@ -141,7 +148,7 @@ export class GraphQLFederationFactory {
         extend schema @link(url: "${importUrl}", import: [${mappedDirectives}])
         ${typeDefs}
       `;
-    } else if (options.useFed2 && !isApolloSubgraph2) {
+    } else if (useFed2 && !isApolloSubgraph2) {
       Logger.error(
         'You are trying to use Apollo Federation 2 but you are not using @apollo/subgraph@^2.0.0, please upgrade',
         'GraphQLFederationFactory',
@@ -327,21 +334,22 @@ export class GraphQLFederationFactory {
   }
 
   async buildFederatedSchema<T extends GqlModuleOptions>(
-    autoSchemaFile: string | boolean,
+    autoSchemaFile: AutoSchemaFileValue,
     options: T,
     resolvers: Function[],
   ) {
     const scalarsMap = this.scalarsExplorerService.getScalarsMap();
     try {
       const buildSchemaOptions = options.buildSchemaOptions || {};
+      const useFed2 = getFederation2Info(options.autoSchemaFile);
       return await this.gqlSchemaBuilder.generateSchema(
         resolvers,
         autoSchemaFile,
         {
           ...buildSchemaOptions,
           directives: [
             ...specifiedDirectives,
-            ...(options.useFed2 ? [] : this.loadFederationDirectives()),
+            ...(useFed2 ? [] : this.loadFederationDirectives()),
             ...((buildSchemaOptions && buildSchemaOptions.directives) || []),
           ],
           scalarsMap,

packages/graphql/lib/graphql-schema.builder.ts

@@ -3,11 +3,12 @@ import { isString } from '@nestjs/common/utils/shared.utils';
 import { GraphQLSchema, lexicographicSortSchema, printSchema } from 'graphql';
 import { resolve } from 'path';
 import { GRAPHQL_SDL_FILE_HEADER } from './graphql.constants';
-import { GqlModuleOptions } from './interfaces';
+import { AutoSchemaFileValue, GqlModuleOptions } from './interfaces';
 import { BuildSchemaOptions } from './interfaces/build-schema-options.interface';
 import { GraphQLSchemaFactory } from './schema-builder/graphql-schema.factory';
 import { FileSystemHelper } from './schema-builder/helpers/file-system.helper';
 import { ScalarsExplorerService } from './services';
+import { getPathForAutoSchemaFile } from './utils';
 
 @Injectable()
 export class GraphQLSchemaBuilder {
@@ -18,7 +19,7 @@ export class GraphQLSchemaBuilder {
   ) {}
 
   public async build(
-    autoSchemaFile: string | boolean,
+    autoSchemaFile: AutoSchemaFileValue,
     options: GqlModuleOptions,
     resolvers: Function[],
   ): Promise<any> {
@@ -45,19 +46,17 @@ export class GraphQLSchemaBuilder {
 
   public async generateSchema(
     resolvers: Function[],
-    autoSchemaFile: boolean | string,
+    autoSchemaFile: AutoSchemaFileValue,
     options: BuildSchemaOptions = {},
     sortSchema?: boolean,
     transformSchema?: (
       schema: GraphQLSchema,
     ) => GraphQLSchema | Promise<GraphQLSchema>,
   ): Promise<GraphQLSchema> {
     const schema = await this.gqlSchemaFactory.create(resolvers, options);
-    if (typeof autoSchemaFile !== 'boolean') {
-      const filename = isString(autoSchemaFile)
-        ? autoSchemaFile
-        : resolve(process.cwd(), 'schema.gql');
+    const filename = getPathForAutoSchemaFile(autoSchemaFile);
 
+    if (filename) {
       const transformedSchema = transformSchema
         ? await transformSchema(schema)
         : schema;