@mikro-orm/core 7.0.0-dev.6 → 7.0.0-dev.8

package/EntityManager.js

@@ -149,7 +149,7 @@ export class EntityManager {
         options._populateWhere = options.populateWhere ?? this.config.get('populateWhere');
         options.populateWhere = this.createPopulateWhere({ ...where }, options);
         options.populateFilter = await this.getJoinedFilters(meta, { ...where }, options);
-        const results = await em.driver.find(entityName, where, { ctx: em.transactionContext, ...options });
+        const results = await em.driver.find(entityName, where, { ctx: em.transactionContext, em, ...options });
         if (results.length === 0) {
             await em.storeCache(options.cache, cached, []);
             return [];
@@ -547,6 +547,7 @@ export class EntityManager {
         options.populateFilter = await this.getJoinedFilters(meta, { ...where }, options);
         const data = await em.driver.findOne(entityName, where, {
             ctx: em.transactionContext,
+            em,
             ...options,
         });
         if (!data) {

package/decorators/Entity.d.ts

@@ -1,7 +1,7 @@
-import type { AnyString, Constructor, Dictionary, EntityClass, FilterQuery } from '../typings.js';
+import type { AnyString, Constructor, Dictionary, EntityClass, ObjectQuery } from '../typings.js';
 import type { FindOptions } from '../drivers/IDatabaseDriver.js';
 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/drivers/IDatabaseDriver.d.ts

@@ -146,6 +146,8 @@ export interface FindOptions<Entity, Hint extends string = never, Fields extends
     hintComments?: string | string[];
     loggerContext?: LogContext;
     logging?: LoggingOptions;
+    /** @internal used to apply filters to the auto-joined relations */
+    em?: EntityManager;
 }
 export interface FindByCursorOptions<T extends object, P extends string = never, F extends string = '*', E extends string = never> extends Omit<FindOptions<T, P, F, E>, 'limit' | 'offset'> {
 }

package/entity/ArrayCollection.d.ts

@@ -14,7 +14,7 @@ export declare class ArrayCollection<T extends object, O extends object> {
     getItems(): T[];
     toArray<TT extends T>(): EntityDTO<TT>[];
     toJSON(): EntityDTO<T>[];
-    getIdentifiers<U extends IPrimaryKey = Primary<T> & IPrimaryKey>(field?: string): U[];
+    getIdentifiers<U extends IPrimaryKey = Primary<T> & IPrimaryKey>(field?: string | string[]): U[];
     add(entity: T | Reference<T> | Iterable<T | Reference<T>>, ...entities: (T | Reference<T>)[]): void;
     /**
      * @internal

package/entity/ArrayCollection.js

@@ -40,15 +40,22 @@ export class ArrayCollection {
     }
     getIdentifiers(field) {
         const items = this.getItems();
+        const targetMeta = this.property.targetMeta;
         if (items.length === 0) {
             return [];
         }
-        field ??= this.property.targetMeta.serializedPrimaryKey;
+        field ??= targetMeta.compositePK ? targetMeta.primaryKeys : targetMeta.serializedPrimaryKey;
+        const cb = (i, f) => {
+            if (Utils.isEntity(i[f], true)) {
+                return wrap(i[f], true).getPrimaryKey();
+            }
+            return i[f];
+        };
         return items.map(i => {
-            if (Utils.isEntity(i[field], true)) {
-                return wrap(i[field], true).getPrimaryKey();
+            if (Array.isArray(field)) {
+                return field.map(f => cb(i, f));
             }
-            return i[field];
+            return cb(i, field);
         });
     }
     add(entity, ...entities) {

package/entity/Collection.d.ts

@@ -12,7 +12,6 @@ export interface MatchingOptions<T extends object, P extends string = never> ext
 export declare class Collection<T extends object, O extends object = object> extends ArrayCollection<T, O> {
     private readonly?;
     private _populated?;
-    private _em?;
     private _snapshot?;
     constructor(owner: O, items?: T[], initialized?: boolean);
     /**

package/entity/Collection.js

@@ -7,7 +7,6 @@ import { helper } from './wrap.js';
 export class Collection extends ArrayCollection {
     readonly;
     _populated;
-    _em;
     // this is for some reason needed for TS, otherwise it can fail with `Type instantiation is excessively deep and possibly infinite.`
     _snapshot;
     constructor(owner, items, initialized = true) {
@@ -220,9 +219,13 @@ export class Collection extends ArrayCollection {
         const em = this.getEntityManager();
         if (options.dataloader ?? [DataloaderType.ALL, DataloaderType.COLLECTION].includes(em.config.getDataloaderType())) {
             const order = [...this.items]; // copy order of references
-            const customOrder = !!options.orderBy;
+            const orderBy = this.createOrderBy(options.orderBy);
+            const customOrder = orderBy.length > 0;
             // eslint-disable-next-line dot-notation
-            const items = await em['colLoader'].load([this, options]);
+            const items = await em['colLoader'].load([
+                this,
+                { ...options, orderBy },
+            ]);
             if (!customOrder) {
                 this.reorderItems(items, order);
             }
@@ -254,7 +257,7 @@ export class Collection extends ArrayCollection {
     }
     getEntityManager(items = [], required = true) {
         const wrapped = helper(this.owner);
-        let em = (this._em ?? wrapped.__em);
+        let em = wrapped.__em;
         if (!em) {
             for (const i of items) {
                 if (i && helper(i).__em) {
@@ -263,9 +266,6 @@ export class Collection extends ArrayCollection {
                 }
             }
         }
-        if (em) {
-            Object.defineProperty(this, '_em', { value: em });
-        }
         if (!em && required) {
             throw ValidationError.entityNotManaged(this.owner);
         }

package/metadata/MetadataDiscovery.js

@@ -946,6 +946,7 @@ export class MetadataDiscovery {
         meta.collection = meta.root.collection;
         meta.root.indexes = Utils.unique([...meta.root.indexes, ...meta.indexes]);
         meta.root.uniques = Utils.unique([...meta.root.uniques, ...meta.uniques]);
+        meta.root.checks = Utils.unique([...meta.root.checks, ...meta.checks]);
     }
     createDiscriminatorProperty(meta) {
         meta.addProperty({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/core",
   "type": "module",
-  "version": "7.0.0-dev.6",
+  "version": "7.0.0-dev.8",
   "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.",
   "exports": {
     "./package.json": "./package.json",
@@ -55,7 +55,7 @@
     "dotenv": "16.4.7",
     "esprima": "4.0.1",
     "globby": "11.1.0",
-    "mikro-orm": "7.0.0-dev.6",
+    "mikro-orm": "7.0.0-dev.8",
     "reflect-metadata": "0.2.2"
   }
 }

package/types/BigIntType.d.ts

@@ -13,4 +13,5 @@ export declare class BigIntType extends Type<string | bigint | number | null | u
     toJSON(value: string | bigint | null | undefined): string | bigint | null | undefined;
     getColumnType(prop: EntityProperty, platform: Platform): string;
     compareAsType(): string;
+    compareValues(a: string, b: string): boolean;
 }

package/types/BigIntType.js

@@ -42,4 +42,7 @@ export class BigIntType extends Type {
     compareAsType() {
         return this.mode ?? 'bigint';
     }
+    compareValues(a, b) {
+        return String(a) === String(b);
+    }
 }

package/typings.d.ts

@@ -419,7 +419,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<RawQueryFragment | object | string>);
+    expression?: string | ((em: any, where: ObjectQuery<T>, options: FindOptions<T, any, any, any>) => MaybePromise<RawQueryFragment | object | string>);
     discriminatorColumn?: EntityKey<T> | AnyString;
     discriminatorValue?: number | string;
     discriminatorMap?: Dictionary<string>;

package/utils/QueryHelper.js

@@ -45,7 +45,7 @@ export class QueryHelper {
             return false;
         }
         if (meta.primaryKeys.every(pk => pk in where) && Utils.getObjectKeysSize(where) === meta.primaryKeys.length) {
-            return !!key && !GroupOperator[key] && Object.keys(where).every(k => !Utils.isPlainObject(where[k]) || Object.keys(where[k]).every(v => {
+            return !!key && !GroupOperator[key] && key !== '$not' && Object.keys(where).every(k => !Utils.isPlainObject(where[k]) || Object.keys(where[k]).every(v => {
                 if (Utils.isOperator(v, false)) {
                     return false;
                 }