fix(mapping): allow defining hooks on base entities

Closes #104
mikro-orm · Sep 1, 2019 · 6938398 · 6938398
1 parent c001000
commit 6938398
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 13 deletions.
diff --git a/lib/decorators/hooks.ts b/lib/decorators/hooks.ts
@@ -34,10 +34,6 @@ function hook(type: string) {
   return function (target: any, method: string) {
     const meta = MetadataStorage.getMetadata(target.constructor.name);
 
-    if (!meta.hooks) {
-      meta.hooks = {};
-    }
-
     if (!meta.hooks[type]) {
       meta.hooks[type] = [];
     }

diff --git a/lib/metadata/MetadataDiscovery.ts b/lib/metadata/MetadataDiscovery.ts
@@ -290,6 +290,11 @@ export class MetadataDiscovery {
     if (primary && !meta.primaryKey) {
       meta.primaryKey = primary.name;
     }
+
+    Object.keys(base.hooks).forEach(type => {
+      meta.hooks[type] = meta.hooks[type] || [];
+      meta.hooks[type].unshift(...base.hooks[type]);
+    });
   }
 
   private getDefaultVersionValue(prop: EntityProperty): string {

diff --git a/lib/metadata/MetadataStorage.ts b/lib/metadata/MetadataStorage.ts
@@ -8,7 +8,7 @@ export class MetadataStorage {
   static getMetadata<T extends IEntityType<T> = any>(entity: string): EntityMetadata<T>; // tslint:disable-next-line:lines-between-class-members
   static getMetadata<T extends IEntityType<T> = any>(entity?: string): Record<string, EntityMetadata> | EntityMetadata<T> {
     if (entity && !MetadataStorage.metadata[entity]) {
-      MetadataStorage.metadata[entity] = { properties: {} } as EntityMetadata;
+      MetadataStorage.metadata[entity] = { properties: {}, hooks: {} } as EntityMetadata;
     }
 
     if (entity) {

diff --git a/tests/EntityManager.mongo.test.ts b/tests/EntityManager.mongo.test.ts
@@ -10,9 +10,6 @@ import { Logger } from '../lib/utils';
 import { FooBar } from './entities/FooBar';
 import { FooBaz } from './entities/FooBaz';
 
-/**
- * @class EntityManagerMongoTest
- */
 describe('EntityManagerMongo', () => {
 
   let orm: MikroORM;
@@ -253,7 +250,7 @@ describe('EntityManagerMongo', () => {
     const fork = orm.em.fork();
 
     expect(fork).not.toBe(orm.em);
-    expect(fork['metadata']).toBe(orm.em['metadata']);
+    expect(fork.metadata).toBe(orm.em.metadata);
     expect(fork.getUnitOfWork().getIdentityMap()).toEqual({});
 
     // request context is not started so we can use UoW and EF getters
@@ -938,11 +935,13 @@ describe('EntityManagerMongo', () => {
     expect(author.id).toBeNull();
     expect(author.version).toBeUndefined();
     expect(author.versionAsString).toBeUndefined();
+    expect(author.hookTest).toBe(false);
 
     await repo.persist(author);
     expect(author.id).not.toBeNull();
     expect(author.version).toBe(1);
     expect(author.versionAsString).toBe('v1');
+    expect(author.hookTest).toBe(true);
 
     author.name = 'John Snow';
     await repo.flush();
@@ -1223,12 +1222,12 @@ describe('EntityManagerMongo', () => {
     const baz2 = FooBaz.create('fz2');
     bar.baz = baz1;
     await orm.em.persist(bar);
-    expect(orm.em.getUnitOfWork()['originalEntityData'][bar.__uuid].baz).toEqual(baz1._id);
+    expect(orm.em.getUnitOfWork().originalEntityData[bar.__uuid].baz).toEqual(baz1._id);
 
     // replacing reference with value will trigger orphan removal
     bar.baz = baz2;
     await orm.em.persist(bar);
-    expect(orm.em.getUnitOfWork()['originalEntityData'][bar.__uuid].baz).toEqual(baz2._id);
+    expect(orm.em.getUnitOfWork().originalEntityData[bar.__uuid].baz).toEqual(baz2._id);
     await expect(orm.em.findOne(FooBaz, baz1)).resolves.toBeNull();
     await expect(orm.em.findOne(FooBaz, baz2)).resolves.not.toBeNull();
 

diff --git a/tests/entities-sql/BaseEntity2.ts b/tests/entities-sql/BaseEntity2.ts
@@ -1,4 +1,4 @@
-import { Collection, IEntity, PrimaryKey } from '../../lib';
+import { BeforeCreate, Collection, IEntity, PrimaryKey, Property } from '../../lib';
 import { MetadataStorage } from '../../lib/metadata';
 import { ReferenceType } from '../../lib/entity';
 
@@ -7,6 +7,9 @@ export abstract class BaseEntity2 {
   @PrimaryKey()
   id: number;
 
+  @Property({ persist: false })
+  hookTest = false;
+
   protected constructor() {
     const meta = MetadataStorage.getMetadata(this.constructor.name);
     const props = meta.properties;
@@ -18,6 +21,11 @@ export abstract class BaseEntity2 {
     });
   }
 
+  @BeforeCreate()
+  baseBeforeCreate() {
+    this.hookTest = true;
+  }
+
 }
 
 export interface BaseEntity2 extends IEntity<number> { }
diff --git a/tests/entities/BaseEntity.ts b/tests/entities/BaseEntity.ts
@@ -1,4 +1,4 @@
-import { IEntity, PrimaryKey, Property } from '../../lib';
+import { BeforeCreate, IEntity, PrimaryKey, Property } from '../../lib';
 import { ObjectID } from 'bson';
 
 export abstract class BaseEntity {
@@ -15,6 +15,14 @@ export abstract class BaseEntity {
   @Property()
   foo: string;
 
+  @Property({ persist: false })
+  hookTest = false;
+
+  @BeforeCreate()
+  baseBeforeCreate() {
+    this.hookTest = true;
+  }
+
 }
 
 export interface BaseEntity extends IEntity<string> { }