@mikro-orm/core 6.4.9-dev.0 → 6.4.9-dev.1

package/decorators/Entity.d.ts

@@ -1,7 +1,7 @@
-import type { AnyString, Constructor, Dictionary, EntityClass, FilterQuery } from '../typings';
+import type { AnyString, Constructor, Dictionary, EntityClass, ObjectQuery } from '../typings';
 import type { FindOptions } from '../drivers/IDatabaseDriver';
 export declare function Entity<T extends EntityClass<unknown>>(options?: EntityOptions<T>): (target: T) => void;
-export type EntityOptions<T> = {
+export type EntityOptions<T, E = T extends EntityClass<infer P> ? P : T> = {
     tableName?: string;
     schema?: string;
     collection?: string;
@@ -13,6 +13,6 @@ export type EntityOptions<T> = {
     abstract?: boolean;
     readonly?: boolean;
     virtual?: boolean;
-    expression?: string | ((em: any, where: FilterQuery<T>, options: FindOptions<T, any, any, any>) => object);
+    expression?: string | ((em: any, where: ObjectQuery<E>, options: FindOptions<E, any, any, any>) => object);
     repository?: () => Constructor;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.4.9-dev.0",
+  "version": "6.4.9-dev.1",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "main": "index.js",
   "module": "index.mjs",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.3.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.4.9-dev.0",
+    "mikro-orm": "6.4.9-dev.1",
     "reflect-metadata": "0.2.2"
   }
 }

package/typings.d.ts

@@ -409,7 +409,7 @@ export interface EntityMetadata<T = any> {
     schema?: string;
     pivotTable?: boolean;
     virtual?: boolean;
-    expression?: string | ((em: any, where: FilterQuery<T>, options: FindOptions<T, any, any, any>) => MaybePromise<object | string>);
+    expression?: string | ((em: any, where: ObjectQuery<T>, options: FindOptions<T, any, any, any>) => MaybePromise<object | string>);
     discriminatorColumn?: EntityKey<T> | AnyString;
     discriminatorValue?: number | string;
     discriminatorMap?: Dictionary<string>;