Merge pull request #21 from thiagomini/fix/merge-objects

Fix/merge objects
thiagomini · Sep 23, 2023 · e5e4e97 · e5e4e97
2 parents 3da299a + 4b1dc9d
commit e5e4e97
Show file tree

Hide file tree

Showing 10 changed files with 149 additions and 126 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "@faker-js/faker": "7.6.0",
     "@mikro-orm/core": "^5.7.14",
     "@mikro-orm/postgresql": "^5.7.14",
-    "@types/lodash": "4.14.194",
+    "@types/lodash": "4.14.198",
     "@types/node": "18.16.3",
     "@typescript-eslint/eslint-plugin": "5.59.0",
     "@typescript-eslint/parser": "5.59.0",
@@ -67,10 +67,11 @@
     "type-fest": "3.8.0",
     "typeorm": "0.3.15",
     "typescript": "5.0.4",
-    "vitest": "0.34.1"
+    "vitest": "0.34.5"
   },
   "dependencies": {
     "class-transformer": "0.5.1",
+    "deepmerge": "^4.3.1",
     "lodash": "4.17.21"
   }
 }
diff --git a/src/adapters/mikro-orm.adapter.ts b/src/adapters/mikro-orm.adapter.ts
@@ -1,13 +1,15 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { EntityManager, MikroORM } from '@mikro-orm/core';
+import { BaseEntity, EntityManager, MikroORM } from '@mikro-orm/core';
 import { ModelAdapter } from './adapter.interface';
 
 export type MikroOrmAdapterOptions = {
   shouldFork: boolean;
 };
 
-export class MikroOrmAdapter<TModelSchema, ReturnType>
-  implements ModelAdapter<TModelSchema, ReturnType>
+export class MikroOrmAdapter<
+  TModelSchema extends BaseEntity<any, any>,
+  ReturnType,
+> implements ModelAdapter<TModelSchema, ReturnType>
 {
   constructor(
     private readonly orm: MikroORM,