chore(): minor improvements

Author: kamilmysliwiec

packages/apollo/lib/drivers/apollo-gateway.driver.ts

@@ -19,4 +19,13 @@ export class ApolloGatewayDriver extends ApolloBaseDriver<ApolloGatewayDriverCon
       gateway,
     });
   }
+
+  public async mergeDefaultOptions(
+    options: Record<string, any>,
+  ): Promise<Record<string, any>> {
+    return {
+      ...options,
+      server: await super.mergeDefaultOptions(options?.server ?? {}),
+    };
+  }
 }

packages/apollo/lib/interfaces/apollo-federation-driver-config.interface.ts

@@ -0,0 +1,9 @@
+import {
+  ApolloDriverAsyncConfig,
+  ApolloDriverConfig,
+  ApolloDriverConfigFactory,
+} from './apollo-driver-config.interface';
+
+export type ApolloFederationDriverConfig = ApolloDriverConfig;
+export type ApolloFederationDriverConfigFactory = ApolloDriverConfigFactory;
+export type ApolloFederationDriverAsyncConfig = ApolloDriverAsyncConfig;

packages/apollo/lib/interfaces/apollo-gateway-driver-config.interface.ts

@@ -1,14 +1,28 @@
 import { GatewayConfig } from '@apollo/gateway';
+import { Type } from '@nestjs/common';
 import {
   GqlModuleAsyncOptions,
-  GqlModuleOptions,
   GqlOptionsFactory,
+  GraphQLDriver,
 } from '@nestjs/graphql';
+import { ApolloDriverConfig } from './apollo-driver-config.interface';
 
-export interface ApolloGatewayDriverConfig {
+export interface ApolloGatewayDriverConfig<
+  TDriver extends GraphQLDriver = any,
+> {
+  /**
+   * GraphQL gateway adapter
+   */
+  driver?: Type<TDriver>;
+  /**
+   * Gateway configuration
+   */
   gateway?: GatewayConfig;
+  /**
+   * Server configuration
+   */
   server?: Omit<
-    GqlModuleOptions,
+    ApolloDriverConfig,
     | 'typeDefs'
     | 'typePaths'
     | 'include'

packages/apollo/lib/interfaces/index.ts

@@ -1,2 +1,3 @@
 export * from './apollo-driver-config.interface';
+export * from './apollo-federation-driver-config.interface';
 export * from './apollo-gateway-driver-config.interface';

packages/apollo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/apollo",
-  "version": "9.2.0",
+  "version": "9.2.6",
   "description": "Nest - modern, fast, powerful node.js web framework (@apollo)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",

packages/mercurius/lib/interfaces/index.ts

@@ -1 +1,3 @@
 export * from './mercurius-driver-config.interface';
+export * from './mercurius-federation-driver-config.interface';
+export * from './mercurius-gateway-driver-config.interface';

packages/mercurius/lib/interfaces/mercurius-federation-driver-config.interface.ts

@@ -0,0 +1,10 @@
+import {
+  MercuriusDriverAsyncConfig,
+  MercuriusDriverConfig,
+  MercuriusDriverConfigFactory,
+} from './mercurius-driver-config.interface';
+
+export type MercuriusFederationDriverConfig = MercuriusDriverConfig;
+export type MercuriusFederationDriverConfigFactory =
+  MercuriusDriverConfigFactory;
+export type MercuriusFederationDriverAsyncConfig = MercuriusDriverAsyncConfig;

packages/mercurius/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/mercurius",
-  "version": "9.2.0",
+  "version": "9.2.1",
   "description": "Nest - modern, fast, powerful node.js web framework (@graphql)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",