Merge branch 'ledniy-bugfix/options-types-for-useFactory'

nestjs · May 20, 2022 · 1114488 · 1114488
2 parents 60f27f4 + b27adc3
commit 1114488
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/lib/interfaces/mongoose-options.interface.ts b/lib/interfaces/mongoose-options.interface.ts
@@ -17,13 +17,15 @@ export interface MongooseOptionsFactory {
     | MongooseModuleOptions;
 }
 
+export interface MongooseModuleFactoryOptions extends Omit<MongooseModuleOptions, 'connectionName'> {}
+
 export interface MongooseModuleAsyncOptions
   extends Pick<ModuleMetadata, 'imports'> {
   connectionName?: string;
   useExisting?: Type<MongooseOptionsFactory>;
   useClass?: Type<MongooseOptionsFactory>;
   useFactory?: (
     ...args: any[]
-  ) => Promise<MongooseModuleOptions> | MongooseModuleOptions;
+  ) => Promise<MongooseModuleFactoryOptions> | MongooseModuleFactoryOptions;
   inject?: any[];
 }
diff --git a/lib/mongoose-core.module.ts b/lib/mongoose-core.module.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
 import {
   DynamicModule,
   Global,
@@ -14,6 +13,7 @@ import { defer, lastValueFrom } from 'rxjs';
 import { getConnectionToken, handleRetry } from './common/mongoose.utils';
 import {
   MongooseModuleAsyncOptions,
+  MongooseModuleFactoryOptions,
   MongooseModuleOptions,
   MongooseOptionsFactory,
 } from './interfaces/mongoose-options.interface';
@@ -80,12 +80,11 @@ export class MongooseCoreModule implements OnApplicationShutdown {
     const connectionProvider = {
       provide: mongooseConnectionName,
       useFactory: async (
-        mongooseModuleOptions: MongooseModuleOptions,
+        mongooseModuleOptions: MongooseModuleFactoryOptions,
       ): Promise<any> => {
         const {
           retryAttempts,
           retryDelay,
-          connectionName,
           uri,
           connectionFactory,
           ...mongooseOptions
@@ -98,19 +97,11 @@ export class MongooseCoreModule implements OnApplicationShutdown {
           defer(async () =>
             mongooseConnectionFactory(
               await mongoose
-                .createConnection(
-                  mongooseModuleOptions.uri as string,
-                  mongooseOptions,
-                )
+                .createConnection(uri as string, mongooseOptions)
                 .asPromise(),
               mongooseConnectionName,
             ),
-          ).pipe(
-            handleRetry(
-              mongooseModuleOptions.retryAttempts,
-              mongooseModuleOptions.retryDelay,
-            ),
-          ),
+          ).pipe(handleRetry(retryAttempts, retryDelay)),
         );
       },
       inject: [MONGOOSE_MODULE_OPTIONS],