chore(): resolve conflicts

nestjs · Jun 1, 2022 · 1f699cd · 1f699cd
2 parents 3d3a3f1 + 06372e8
commit 1f699cd
Show file tree

Hide file tree

Showing 5 changed files with 2,234 additions and 2,099 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   postgres:
-    image: postgres:14.2
+    image: postgres:14.3
     environment:
       POSTGRES_USER: root
       POSTGRES_PASSWORD: root

diff --git a/lib/interfaces/typeorm-options.interface.ts b/lib/interfaces/typeorm-options.interface.ts
@@ -1,4 +1,4 @@
-import { ModuleMetadata, Type } from '@nestjs/common';
+import { ModuleMetadata, Provider, Type } from '@nestjs/common';
 import { DataSource, DataSourceOptions } from 'typeorm';
 
 export type TypeOrmModuleOptions = {
@@ -50,4 +50,5 @@ export interface TypeOrmModuleAsyncOptions
   ) => Promise<TypeOrmModuleOptions> | TypeOrmModuleOptions;
   dataSourceFactory?: TypeOrmDataSourceFactory;
   inject?: any[];
+  extraProviders?: Provider[];
 }
diff --git a/lib/typeorm-core.module.ts b/lib/typeorm-core.module.ts
@@ -6,7 +6,7 @@ import {
   Module,
   OnApplicationShutdown,
   Provider,
-  Type,
+  Type
 } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
 import { defer, lastValueFrom } from 'rxjs';
@@ -16,14 +16,14 @@ import {
   getDataSourceName,
   getDataSourceToken,
   getEntityManagerToken,
-  handleRetry,
+  handleRetry
 } from './common/typeorm.utils';
 import { EntitiesMetadataStorage } from './entities-metadata.storage';
 import {
   TypeOrmDataSourceFactory,
   TypeOrmModuleAsyncOptions,
   TypeOrmModuleOptions,
-  TypeOrmOptionsFactory,
+  TypeOrmOptionsFactory
 } from './interfaces/typeorm-options.interface';
 import { TYPEORM_MODULE_ID, TYPEORM_MODULE_OPTIONS } from './typeorm.constants';
 
@@ -109,6 +109,7 @@ export class TypeOrmCoreModule implements OnApplicationShutdown {
         provide: TYPEORM_MODULE_ID,
         useValue: generateString(),
       },
+      ...(options.extraProviders || []),
     ];
     const exports: Array<Provider | Function> = [
       entityManagerProvider,