fix(reflection): only validate known types to allow using type aliases

Closes #5221
mikro-orm · Feb 8, 2024 · d6b93be · d6b93be
1 parent 7741b75
commit d6b93be
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/packages/core/src/entity/EntityValidator.ts b/packages/core/src/entity/EntityValidator.ts
@@ -6,6 +6,8 @@ import { helper } from './wrap';
 
 export class EntityValidator {
 
+  KNOWN_TYPES = new Set(['string', 'number', 'boolean', 'bigint', 'Uint8Array', 'Date', 'Buffer', 'RegExp']);
+
   constructor(private strict: boolean) { }
 
   validate<T extends object>(entity: T, payload: any, meta: EntityMetadata<T>): void {
@@ -81,7 +83,7 @@ export class EntityValidator {
         throw ValidationError.fromWrongPropertyType(entity, prop.name, expectedType, givenType, givenValue);
       }
     } else {
-      if (givenType !== expectedType) {
+      if (givenType !== expectedType && this.KNOWN_TYPES.has(expectedType)) {
         throw ValidationError.fromWrongPropertyType(entity, prop.name, expectedType, givenType, givenValue);
       }
     }

diff --git a/packages/knex/src/query/QueryBuilder.ts b/packages/knex/src/query/QueryBuilder.ts
@@ -888,10 +888,10 @@ export class QueryBuilder<T extends object = AnyEntity> {
    * Executes the query, returning both array of results and total count query (without offset and limit).
    */
   async getResultAndCount(): Promise<[T[], number]> {
-    return Promise.all([
-      this.getResultList(),
-      this.getCount(),
-    ]);
+    return [
+      await this.getResultList(),
+      await this.getCount(),
+    ];
   }
 
   /**

diff --git a/packages/reflection/src/TsMorphMetadataProvider.ts b/packages/reflection/src/TsMorphMetadataProvider.ts
@@ -136,7 +136,7 @@ export class TsMorphMetadataProvider extends MetadataProvider {
 
     let type = typeName;
     const union = type.split(' | ');
-    const optional = property.hasQuestionToken?.() || union.includes('null') || union.includes('undefined');
+    const optional = property.hasQuestionToken?.() || union.includes('null') || union.includes('undefined') || tsType.isNullable();
     type = union.filter(t => !['null', 'undefined'].includes(t)).join(' | ');
 
     prop.array ??= type.endsWith('[]') || !!type.match(/Array<(.*)>/);

diff --git a/tests/features/reflection/GH5185.test.ts b/tests/features/reflection/GH5185.test.ts
@@ -8,6 +8,8 @@ enum OrderState {
   CLOSED = 'closed',
 }
 
+type Nullable<T> = T | null;
+
 @Entity()
 class User {
 
@@ -17,6 +19,9 @@ class User {
   @Property()
   username!: string;
 
+  @Property({ columnType: 'varchar' })
+  test!: Nullable<string>;
+
   @Enum({ items: () => OrderState })
   state: Opt<OrderState> = OrderState.NEW;
 
@@ -38,12 +43,13 @@ afterAll(async () => {
   await orm.close(true);
 });
 
-test('#5185', async () => {
-  orm.em.create(User, { username: 'u' });
+test('#5185 and #5221', async () => {
+  orm.em.create(User, { username: 'u', test: '123' });
   await orm.em.flush();
   orm.em.clear();
   const u1 = await orm.em.fork().find(User, {});
   expect(u1).toHaveLength(1);
-  const u2 = await orm.em.fork().qb(User).getResult();
+  const [u2, total] = await orm.em.fork().qb(User).getResultAndCount();
   expect(u2).toHaveLength(1);
+  expect(total).toBe(1);
 });