@mikro-orm/core 7.2.7-dev.0 → 7.2.7-dev.10

package/EntityManager.js

@@ -743,10 +743,15 @@ export class EntityManager {
         if (Utils.isEmpty(options.orderBy) && !Raw.hasObjectFragments(options.orderBy)) {
             throw new Error('Explicit `orderBy` option required');
         }
+        const meta = this.metadata.get(entityName);
+        // same merge as em.find, so the cursor and the query see the same orderBy
+        if (meta.orderBy) {
+            options.orderBy = QueryHelper.mergeOrderBy(options.orderBy, meta.orderBy);
+        }
         const [entities, count] = options.includeCount !== false
             ? await em.findAndCount(entityName, options.where, options)
             : [await em.find(entityName, options.where, options)];
-        return new Cursor(entities, count, options, this.metadata.get(entityName));
+        return new Cursor(entities, count, options, meta);
     }
     /**
      * Refreshes the persistent state of an entity from the database, overriding any local changes that have not yet been

package/entity/EntityLoader.js

@@ -679,12 +679,20 @@ export class EntityLoader {
         const subCond = Utils.isPlainObject(where[prop.name]) ? { ...where[prop.name] } : {};
         const meta2 = prop.targetMeta;
         const pk = Utils.getPrimaryKeyHash(meta2.primaryKeys);
+        // `$not` wrapping entity conditions stays on the target entity, only operators on the relation itself map to its PK
+        const isRelationOperator = (key, value) => {
+            if (key === '$not' && Utils.isPlainObject(value)) {
+                return Utils.getObjectQueryKeys(value).every(k => Utils.isOperator(k, false));
+            }
+            return Utils.isOperator(key, false);
+        };
         ['$and', '$or'].forEach(op => {
             if (where[op]) {
                 const child = where[op]
                     .map((cond) => cond[prop.name])
                     .filter((sub) => sub != null &&
-                    !(Utils.isPlainObject(sub) && Utils.getObjectQueryKeys(sub).every(key => Utils.isOperator(key, false))))
+                    !(Utils.isPlainObject(sub) &&
+                        Utils.getObjectQueryKeys(sub).every(key => isRelationOperator(key, sub[key]))))
                     .map((cond) => {
                     if (Utils.isPrimaryKey(cond)) {
                         return { [pk]: cond };
@@ -697,7 +705,7 @@ export class EntityLoader {
                 }
             }
         });
-        const operators = Object.keys(subCond).filter(key => Utils.isOperator(key, false));
+        const operators = Object.keys(subCond).filter(key => isRelationOperator(key, subCond[key]));
         if (operators.length > 0) {
             subCond[pk] = Utils.isPlainObject(subCond[pk]) ? { ...subCond[pk] } : (subCond[pk] ?? {});
             operators.forEach(op => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.2.7-dev.0",
+  "version": "7.2.7-dev.10",
   "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.",
   "keywords": [
     "data-mapper",

package/platforms/Platform.d.ts

@@ -204,6 +204,8 @@ export declare abstract class Platform {
     supportsUnionWhere(): boolean;
     /** Returns the SQL type declaration used for array storage. */
     getArrayDeclarationSQL(): string;
+    /** Whether array columns support the `&&` (overlap) operator. */
+    supportsArrayOverlap(): boolean;
     /** Serializes a string array into its database storage format. */
     marshallArray(values: string[]): string;
     /** Deserializes a database-stored array string back into a string array. */

package/platforms/Platform.js

@@ -360,6 +360,10 @@ export class Platform {
     getArrayDeclarationSQL() {
         return 'text';
     }
+    /** Whether array columns support the `&&` (overlap) operator. */
+    supportsArrayOverlap() {
+        return false;
+    }
     /** Serializes a string array into its database storage format. */
     marshallArray(values) {
         return values.map(v => (/[,",\\]/.test(v) ? JSON.stringify(v) : v)).join(',');

package/serialization/EntitySerializer.js

@@ -4,20 +4,50 @@ import { ReferenceKind } from '../enums.js';
 import { Reference } from '../entity/Reference.js';
 import { SerializationContext } from './SerializationContext.js';
 import { isRaw } from '../utils/RawQueryFragment.js';
-/** Returns true when any entry in `items` is `propName`, the wildcard `*`, or a dot-path under `propName`. */
-function matchesPath(items, propName) {
-    return items.some(item => item === propName || item === '*' || item.startsWith(propName + '.'));
+// Keyed by option objects created for a single `serialize()` call, so caller-owned options are never cached.
+const preparedOptions = new WeakMap();
+function createPathLookup(items) {
+    const heads = new Set();
+    let all = false;
+    for (const item of items) {
+        const dot = item.indexOf('.');
+        heads.add(dot === -1 ? item : item.substring(0, dot));
+        all ||= item === '*';
+    }
+    return { all, heads };
+}
+/**
+ * Copies caller options once per `serialize()` call, so the derived child options and path lookups can be cached
+ * for every entity of the call without ever caching an options object the caller might mutate later.
+ */
+function prepareOptions(options) {
+    if (preparedOptions.has(options)) {
+        return options;
+    }
+    const prepared = {
+        ...options,
+        populate: options.populate ? Utils.asArray(options.populate) : options.populate,
+    };
+    preparedOptions.set(prepared, { children: new Map() });
+    return prepared;
+}
+function pathLookup(options, key) {
+    return (preparedOptions.get(options)[key] ??= createPathLookup(options[key]));
+}
+/** Returns true when any entry in `options[key]` is `propName`, the wildcard `*`, or a dot-path under `propName`. */
+function matchesPath(options, key, propName) {
+    const lookup = pathLookup(options, key);
+    return lookup.all || lookup.heads.has(propName);
 }
 function isVisible(meta, propName, options) {
     const prop = meta.properties[propName];
     if (options.groups && prop?.groups) {
         return prop.groups.some(g => options.groups.includes(g));
     }
-    if (Array.isArray(options.fields) && options.fields.length > 0 && !matchesPath(options.fields, propName)) {
+    if (Array.isArray(options.fields) && options.fields.length > 0 && !matchesPath(options, 'fields', propName)) {
         return false;
     }
-    if (Array.isArray(options.populate) &&
-        options.populate.find(item => item === propName || item.startsWith(propName + '.'))) {
+    if (Array.isArray(options.populate) && pathLookup(options, 'populate').heads.has(propName)) {
         return true;
     }
     if (options.exclude?.find(item => item === propName)) {
@@ -30,7 +60,7 @@ function isVisible(meta, propName, options) {
 function isPopulated(propName, options) {
     if (typeof options.populate !== 'boolean' &&
         Array.isArray(options.populate) &&
-        matchesPath(options.populate, propName)) {
+        matchesPath(options, 'populate', propName)) {
         return true;
     }
     if (typeof options.populate === 'boolean') {
@@ -45,10 +75,10 @@ export class EntitySerializer {
         const wrapped = helper(entity);
         const meta = wrapped.__meta;
         let contextCreated = false;
+        options = prepareOptions(options);
         if (!wrapped.__serializationContext.root) {
             const root = new SerializationContext();
             SerializationContext.propagate(root, entity, (meta, prop) => meta.properties[prop]?.kind !== ReferenceKind.SCALAR);
-            options.populate = (options.populate ? Utils.asArray(options.populate) : options.populate);
             contextCreated = true;
         }
         const root = wrapped.__serializationContext.root;
@@ -145,7 +175,8 @@ export class EntitySerializer {
         if (entity[prop] instanceof Function) {
             const returnValue = entity[prop]();
             if (!options.ignoreSerializers && serializer) {
-                return serializer(returnValue, this.extractChildOptions(options, prop));
+                // copy, so a serializer mutating its options cannot leak into the cached child options
+                return serializer(returnValue, { ...this.extractChildOptions(options, prop) });
             }
             return returnValue;
         }
@@ -186,7 +217,12 @@ export class EntitySerializer {
         return prop.customType.toJSON(value, platform);
     }
     static extractChildOptions(options, prop) {
-        return {
+        const prepared = preparedOptions.get(options);
+        const cached = prepared.children.get(prop);
+        if (cached) {
+            return cached;
+        }
+        const child = {
             ...options,
             populate: Array.isArray(options.populate)
                 ? Utils.extractChildElements(options.populate, prop, '*')
@@ -194,6 +230,9 @@ export class EntitySerializer {
             exclude: Array.isArray(options.exclude) ? Utils.extractChildElements(options.exclude, prop) : options.exclude,
             fields: Array.isArray(options.fields) ? this.extractChildFields(options.fields, prop) : options.fields,
         };
+        prepared.children.set(prop, child);
+        preparedOptions.set(child, { children: new Map() });
+        return child;
     }
     /**
      * Extracts the nested `fields` whitelist for a child property. A bare parent name (`fields: ['books']`) or a
@@ -269,8 +308,9 @@ export class EntitySerializer {
  * ```
  */
 export function serialize(entities, options) {
+    const prepared = prepareOptions(options ?? {});
     if (Array.isArray(entities)) {
-        return entities.map(e => EntitySerializer.serialize(e, options));
+        return entities.map(e => EntitySerializer.serialize(e, prepared));
     }
-    return EntitySerializer.serialize(entities, options);
+    return EntitySerializer.serialize(entities, prepared);
 }

package/typings.d.ts

@@ -356,12 +356,15 @@ type ElemMatchCondition<T extends Record<string, any>> = {
     $and?: ElemMatchCondition<T>[];
     $not?: ElemMatchCondition<T>;
 };
-type ElemMatchFilter<T> = T extends readonly (infer E)[] ? E extends Record<string, any> ? {
+type ArrayFilter<T> = T extends readonly (infer E)[] ? [E] extends [Scalar] ? {
+    $in?: readonly (readonly ExpandScalar<E>[])[];
+    $nin?: readonly (readonly ExpandScalar<E>[])[];
+} : E extends Record<string, any> ? {
     $elemMatch: ElemMatchCondition<E>;
 } : never : never;
 /** Object form of a filter query, mapping entity keys to their filter conditions. */
 export type FilterObject<T> = {
-    -readonly [K in EntityKey<T>]?: ExpandQuery<ExpandProperty<FilterObjectProp<T, K>>> | ExpandQueryMerged<ExpandProperty<FilterObjectProp<T, K>>> | FilterValue<ExpandProperty<FilterObjectProp<T, K>>> | ElemMatchFilter<FilterObjectProp<T, K>> | null;
+    -readonly [K in EntityKey<T>]?: ExpandQuery<ExpandProperty<FilterObjectProp<T, K>>> | ExpandQueryMerged<ExpandProperty<FilterObjectProp<T, K>>> | FilterValue<ExpandProperty<FilterObjectProp<T, K>>> | ArrayFilter<FilterObjectProp<T, K>> | null;
 };
 /** Recursively expands a type into its `FilterQuery` form for nested object filtering. */
 export type ExpandQuery<T> = T extends object ? (T extends Scalar ? never : FilterQuery<T>) : FilterValue<T>;
@@ -381,7 +384,7 @@ export type FilterQuery<T> = ObjectQuery<T> | NonNullable<ExpandScalar<Primary<T
  * Used when `using` option is set in `FindOptions` to enforce type-safe index usage.
  */
 export type IndexFilterQuery<T, Using extends string> = [Using] extends [never] ? FilterQuery<T> : (OperatorMap<T> & {
-    -readonly [K in Extract<EntityKey<T>, IndexColumns<T, Using>>]?: ExpandQuery<ExpandProperty<FilterObjectProp<T, K>>> | ExpandQueryMerged<ExpandProperty<FilterObjectProp<T, K>>> | FilterValue<ExpandProperty<FilterObjectProp<T, K>>> | ElemMatchFilter<FilterObjectProp<T, K>> | null;
+    -readonly [K in Extract<EntityKey<T>, IndexColumns<T, Using>>]?: ExpandQuery<ExpandProperty<FilterObjectProp<T, K>>> | ExpandQueryMerged<ExpandProperty<FilterObjectProp<T, K>>> | FilterValue<ExpandProperty<FilterObjectProp<T, K>>> | ArrayFilter<FilterObjectProp<T, K>> | null;
 }) | NonNullable<ExpandScalar<Primary<T>>> | IndexFilterQuery<T, Using>[];
 /** Replaces `where` and `using` on an options type with index-aware variants when `Using` is specified. */
 export type WithUsingOptions<Opts, Entity, Using extends string> = Omit<Opts, 'where' | 'using'> & {
@@ -562,6 +565,13 @@ export declare namespace LazyRef {
         [__lazyRef]?: (arg: T) => T;
     }
 }
+/**
+ * The brand's only key is optional, so an object type without named properties (like `Record<string, number>`)
+ * extends `LazyRef.Brand<infer U>` too, with `U` inferred as `unknown`. `LazyRef<T>` needs `T extends object`,
+ * so an `unknown` target means the type is not a `LazyRef` and resolves to `Fallback`. `any` stays `any`.
+ * Only checked once `unknown extends U` holds, so a real `LazyRef` skips it.
+ */
+type NotLazyRef<U, Fallback> = IsAny<U> extends true ? U : Fallback;
 /** Alias for `Reference<T> & { id: number }` (see {@apilink Ref}). */
 export type EntityRef<T extends object> = true extends IsUnknown<PrimaryProperty<T>> ? Reference<T> : IsAny<T> extends true ? Reference<T> : {
     [K in PrimaryProperty<T> & keyof T]: T[K];
@@ -1615,7 +1625,8 @@ export type UnboxArray<T> = T extends any[] ? ArrayElement<T> : T;
 /** Extracts the element type from an array type. */
 export type ArrayElement<ArrayType extends unknown[]> = ArrayType extends (infer ElementType)[] ? ElementType : never;
 /** Unwraps a property type from its wrapper (Reference, Collection, or array) to the inner entity type. */
-export type ExpandProperty<T> = T extends LazyRef.Brand<infer U> ? NonNullable<U> : T extends ReferenceShape<infer U> ? NonNullable<U> : T extends CollectionShape<infer U> ? NonNullable<U> : T extends (infer U)[] ? NonNullable<U> : NonNullable<T>;
+export type ExpandProperty<T> = ExpandPropertyOf<T, T>;
+type ExpandPropertyOf<T, R> = T extends LazyRef.Brand<infer U> ? unknown extends U ? NotLazyRef<U, NonNullable<R>> : NonNullable<U> : T extends ReferenceShape<infer U> ? NonNullable<U> : T extends CollectionShape<infer U> ? NonNullable<U> : T extends (infer U)[] ? NonNullable<U> : NonNullable<T>;
 type LoadedLoadable<T, E extends object> = T extends CollectionShape ? LoadedCollection<E> : T extends ScalarReference<infer U> ? LoadedScalarReference<U> : T extends LazyRef.Brand<any> ? E : T extends ReferenceShape ? T & LoadedReference<E> : T extends Scalar ? T : T extends (infer U)[] ? U extends Scalar ? T : E[] : E;
 type IsTrue<T> = IsNever<T> extends true ? false : T extends boolean ? (T extends true ? true : false) : false;
 type StringLiteral<T> = T extends string ? (string extends T ? never : T) : never;
@@ -1650,7 +1661,12 @@ export type MergeSelected<T, U, F extends string> = IsLoadedType<T> extends true
 export type MergeLoaded<T, U, P extends string, F extends string, E extends string, R extends boolean = false> = IsLoadedType<T> extends true ? T & Loaded<U, P, F, E> : Loaded<T, P, F, E>;
 /** Extracts the nullability modifiers (`null`, `undefined`, or both) from a type `T`. */
 export type AddOptional<T> = undefined | null extends T ? null | undefined : null extends T ? null : undefined extends T ? undefined : never;
-type LoadedProp<T, L extends string = never, F extends string = '*', E extends string = never> = LoadedLoadable<T, Loaded<ExtractTypeWithLazyRef<T>, L, F, E>>;
+/**
+ * Like {@link ExtractTypeWithLazyRef}, but a record type that matched `LazyRef.Brand` resolves to itself (see
+ * {@link NotLazyRef}). `AutoPath` keeps the unguarded version, as it is on its hot path.
+ */
+type ExtractLoadedType<T> = T extends LazyRef.Brand<infer U> ? (unknown extends U ? NotLazyRef<U, ExtractType<T>> : U) : ExtractType<T>;
+type LoadedProp<T, L extends string = never, F extends string = '*', E extends string = never> = LoadedLoadable<T, Loaded<ExtractLoadedType<T>, L, F, E>>;
 /** Extracts the eager-loaded property names declared via `[EagerProps]` as a string union. */
 export type AddEager<T> = ExtractEagerProps<T> & string;
 /** Combines an explicit populate hint `L` with the entity's eagerly loaded properties. */

package/unit-of-work/UnitOfWork.js

@@ -600,19 +600,27 @@ export class UnitOfWork {
                 this.findEarlyUpdates(cs, inserts[cs.meta.uniqueName]);
             }
         }
+        // hashes of the inserts' PKs and unique values per type, built lazily, so matching a removed entity is a set lookup
+        const insertHashes = {};
         for (const entity of this.#removeStack) {
             const wrapped = helper(entity);
             /* v8 ignore next */
             if (wrapped.__processing) {
                 continue;
             }
-            const deletePkHash = [wrapped.getSerializedPrimaryKey(), ...this.expandUniqueProps(entity)];
-            let type = ChangeSetType.DELETE;
-            for (const cs of inserts[wrapped.__meta.uniqueName] ?? []) {
-                if (deletePkHash.some(hash => hash === cs.getSerializedPrimaryKey() || this.expandUniqueProps(cs.entity).find(child => hash === child))) {
-                    type = ChangeSetType.DELETE_EARLY;
+            const uniqueName = wrapped.__meta.uniqueName;
+            let hashes = insertHashes[uniqueName];
+            if (!hashes) {
+                hashes = insertHashes[uniqueName] = new Set();
+                for (const cs of inserts[uniqueName] ?? []) {
+                    hashes.add(cs.getSerializedPrimaryKey());
+                    for (const hash of this.expandUniqueProps(cs.entity)) {
+                        hashes.add(hash);
+                    }
                 }
             }
+            const deletePkHash = [wrapped.getSerializedPrimaryKey(), ...this.expandUniqueProps(entity)];
+            const type = deletePkHash.some(hash => hashes.has(hash)) ? ChangeSetType.DELETE_EARLY : ChangeSetType.DELETE;
             this.computeChangeSet(entity, type);
         }
     }

package/utils/Utils.js

@@ -153,7 +153,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.2.7-dev.0';
+    static #ORM_VERSION = '7.2.7-dev.10';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;
@@ -244,7 +244,7 @@ export class Utils {
     /**
      * Merges all sources into the target recursively.
      */
-    static _merge(target, sources, ignoreUndefined) {
+    static _merge(target, sources, ignoreUndefined, copies) {
         if (!sources.length) {
             return target;
         }
@@ -259,7 +259,13 @@ export class Utils {
                 }
                 if (Utils.isPlainObject(value)) {
                     if (!Utils.isObject(target[key])) {
-                        target[key] = Utils.copy(value);
+                        // copy plain objects but keep class instances by reference, tracking copies so cycles terminate
+                        const seen = copies ?? new WeakMap();
+                        if (!seen.has(value)) {
+                            seen.set(value, {});
+                            Utils._merge(seen.get(value), [value], ignoreUndefined, seen);
+                        }
+                        target[key] = seen.get(value);
                         continue;
                     }
                     /* v8 ignore next */