fix: deep merge of MikroORM options

faberNovel · Jul 4, 2023 · 145274a · 145274a
1 parent cc23c84
commit 145274a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/modules/common/src/module/listener/ModuleListenerDatabaseConfig.ts b/modules/common/src/module/listener/ModuleListenerDatabaseConfig.ts
@@ -6,15 +6,13 @@ import { ServiceEntity } from "../../entities/ServiceEntity.js"
 const DB_NAME = "heart"
 
 export function createDatabaseConfig<D extends IDatabaseDriver>(options: Options<D>): Options<D> {
-  return {
-    ...options,
-    ...{
-      dbName: DB_NAME,
-      entities: [ReportEntity, ServiceEntity],
-      metadataProvider: TsMorphMetadataProvider,
-      migrations: {
-        snapshot: false,
-      },
-    },
+  options.dbName = DB_NAME
+  options.entities = [ReportEntity, ServiceEntity]
+  options.metadataProvider = TsMorphMetadataProvider
+
+  if (options.migrations) {
+    options.migrations.snapshot = false
   }
+
+  return options
 }
diff --git a/modules/mysql/src/client/Client.ts b/modules/mysql/src/client/Client.ts
@@ -8,7 +8,7 @@ export class MySQLClient {
   #orm: MikroORM<MySqlDriver> | undefined
 
   public async getMigrator(): Promise<IMigrator> {
-    const orm = await this.getOrCreateDatabaseClient()
+    const orm = await this.getOrCreateOrm()
 
     return orm.getMigrator()
   }
@@ -20,7 +20,7 @@ export class MySQLClient {
     const reportEntity = await this.createReportEntity(report)
 
     const em = await this.getOrCreateEntityManager()
-    const orm = await this.getOrCreateDatabaseClient()
+    const orm = await this.getOrCreateOrm()
 
     await em.persistAndFlush(reportEntity)
 
@@ -40,7 +40,7 @@ export class MySQLClient {
    * Get or create the ORM: avoid the opening of several DB connection at the same or in a very short interval of time.
    * As Heart is a CLI tool, having the DB connection opened during a single analysis that longs a couple of minutes is acceptable.
    */
-  private async getOrCreateDatabaseClient(): Promise<MikroORM<MySqlDriver>> {
+  private async getOrCreateOrm(): Promise<MikroORM<MySqlDriver>> {
     if (this.#orm === undefined) {
       this.#orm = await MikroORM.init<MySqlDriver>(databaseConfig)
     }
@@ -53,7 +53,7 @@ export class MySQLClient {
    * @link https://mikro-orm.io/docs/identity-map
    */
   private async getOrCreateEntityManager(): Promise<SqlEntityManager> {
-    const orm = await this.getOrCreateDatabaseClient()
+    const orm = await this.getOrCreateOrm()
 
     if (this.#em === undefined) {
       this.#em = orm.em.fork()

diff --git a/modules/mysql/src/config/mikro-orm.config.ts b/modules/mysql/src/config/mikro-orm.config.ts
@@ -1,10 +1,10 @@
 import { createDatabaseConfig } from "@fabernovel/heart-common"
-import { defineConfig } from "@mikro-orm/mysql"
+import { MySqlDriver, defineConfig } from "@mikro-orm/mysql"
 import { env } from "node:process"
 import { Migration20230702150637 } from "../migrations/Migration20230702150637.js"
 
 export default defineConfig(
-  createDatabaseConfig({
+  createDatabaseConfig<MySqlDriver>({
     clientUrl: env.HEART_MYSQL_DATABASE_URL as string,
     migrations: {
       migrationsList: [