fix(ts-morph): fix validation of embedded polymorphic arrays

mikro-orm · Jan 7, 2022 · b6a068a · b6a068a
1 parent 08d8c3c
commit b6a068a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/packages/core/src/metadata/MetadataValidator.ts b/packages/core/src/metadata/MetadataValidator.ts
@@ -55,9 +55,14 @@ export class MetadataValidator {
       throw MetadataError.onlyAbstractEntitiesDiscovered();
     }
 
+    const unwrap = (type: string) => type
+      .replace(/Array<(.*)>/, '$1') // unwrap array
+      .replace(/\[]$/, '')          // remove array suffix
+      .replace(/\((.*)\)/, '$1');   // unwrap union types
+
     // check for not discovered entities
     discovered.forEach(meta => Object.values(meta.properties).forEach(prop => {
-      if (prop.reference !== ReferenceType.SCALAR && !prop.type.split(/ ?\| ?/).every(type => discovered.find(m => m.className === type))) {
+      if (prop.reference !== ReferenceType.SCALAR && !unwrap(prop.type).split(/ ?\| ?/).every(type => discovered.find(m => m.className === type))) {
         throw MetadataError.fromUnknownEntity(prop.type, `${meta.className}.${prop.name}`);
       }
     }));

diff --git a/packages/reflection/src/TsMorphMetadataProvider.ts b/packages/reflection/src/TsMorphMetadataProvider.ts
@@ -119,6 +119,11 @@ export class TsMorphMetadataProvider extends MetadataProvider {
     const optional = property.hasQuestionToken?.() || union.includes('null') || union.includes('undefined');
     type = union.filter(t => !['null', 'undefined'].includes(t)).join(' | ');
 
+    type = type
+      .replace(/Array<(.*)>/, '$1') // unwrap array
+      .replace(/\[]$/, '')          // remove array suffix
+      .replace(/\((.*)\)/, '$1');   // unwrap union types
+
     return { type, optional };
   }
 

diff --git a/tests/features/embeddables/polymorphic-embedded-entities.sqlite.test.ts b/tests/features/embeddables/polymorphic-embedded-entities.sqlite.test.ts
@@ -1,5 +1,6 @@
 import type { ObjectHydrator } from '@mikro-orm/core';
 import { Embeddable, Embedded, Entity, Enum, MikroORM, PrimaryKey, Property, wrap } from '@mikro-orm/core';
+import { TsMorphMetadataProvider } from '@mikro-orm/reflection';
 import { mockLogger } from '../../helpers';
 
 enum AnimalType {
@@ -10,7 +11,7 @@ enum AnimalType {
 @Embeddable({ abstract: true, discriminatorColumn: 'type' })
 abstract class Animal {
 
-  @Enum(() => AnimalType)
+  @Enum()
   type!: AnimalType;
 
   @Property()
@@ -21,8 +22,8 @@ abstract class Animal {
 @Embeddable({ discriminatorValue: AnimalType.CAT })
 class Cat extends Animal {
 
-  @Property({ nullable: true })
-  canMeow?: boolean = true;
+  @Property()
+  canMeow? = true;
 
   constructor(name: string) {
     super();
@@ -35,8 +36,8 @@ class Cat extends Animal {
 @Embeddable({ discriminatorValue: AnimalType.DOG })
 class Dog extends Animal {
 
-  @Property({ nullable: true })
-  canBark?: boolean = true;
+  @Property()
+  canBark? = true;
 
   constructor(name: string) {
     super();
@@ -55,13 +56,13 @@ class Owner {
   @Property()
   name: string;
 
-  @Embedded(() => [Cat, Dog])
+  @Embedded()
   pet!: Cat | Dog;
 
-  @Embedded(() => [Cat, Dog], { object: true })
+  @Embedded({ object: true })
   pet2!: Cat | Dog;
 
-  @Embedded(() => [Cat, Dog], { array: true })
+  @Embedded()
   pets: (Cat | Dog)[] = [];
 
   constructor(name: string) {
@@ -79,6 +80,7 @@ describe('polymorphic embeddables in sqlite', () => {
       entities: [Dog, Cat, Owner],
       dbName: ':memory:',
       type: 'sqlite',
+      metadataProvider: TsMorphMetadataProvider,
     });
     await orm.getSchemaGenerator().createSchema();
   });