@mikro-orm/core 7.0.0-dev.335 → 7.0.0-dev.337

package/drivers/DatabaseDriver.js

@@ -346,8 +346,8 @@ export class DatabaseDriver {
                 const props = prop.embeddedProps;
                 let unknownProp = false;
                 Object.keys(data[prop.name]).forEach(kk => {
-                    // explicitly allow `$exists`, `$eq` and `$ne` operators here as they can't be misused this way
-                    const operator = Object.keys(data[prop.name]).some(f => Utils.isOperator(f) && !['$exists', '$ne', '$eq'].includes(f));
+                    // explicitly allow `$exists`, `$eq`, `$ne` and `$elemMatch` operators here as they can't be misused this way
+                    const operator = Object.keys(data[prop.name]).some(f => Utils.isOperator(f) && !['$exists', '$ne', '$eq', '$elemMatch'].includes(f));
                     if (operator) {
                         throw ValidationError.cannotUseOperatorsInsideEmbeddables(meta.class, prop.name, data);
                     }

package/enums.d.ts

@@ -45,7 +45,8 @@ export declare enum QueryOperator {
     $size = "size",// collection operators, sql only
     $hasKey = "?",// postgres only, json
     $hasKeys = "?&",// postgres only, json
-    $hasSomeKeys = "?|"
+    $hasSomeKeys = "?|",// postgres only, json
+    $elemMatch = "elemMatch"
 }
 export declare const ARRAY_OPERATORS: string[];
 export declare const JSON_KEY_OPERATORS: string[];

package/enums.js

@@ -48,6 +48,7 @@ export var QueryOperator;
     QueryOperator["$hasKey"] = "?";
     QueryOperator["$hasKeys"] = "?&";
     QueryOperator["$hasSomeKeys"] = "?|";
+    QueryOperator["$elemMatch"] = "elemMatch";
 })(QueryOperator || (QueryOperator = {}));
 export const ARRAY_OPERATORS = ['$eq', '$gt', '$gte', '$lt', '$lte', '$ne', '$overlap', '$contains', '$contained'];
 export const JSON_KEY_OPERATORS = ['$hasKey', '$hasKeys', '$hasSomeKeys'];

package/metadata/MetadataDiscovery.js

@@ -990,9 +990,13 @@ export class MetadataDiscovery {
                     if (properties[prop.name] && properties[prop.name].type !== prop.type) {
                         properties[prop.name].type = `${properties[prop.name].type} | ${prop.type}`;
                         properties[prop.name].runtimeType = 'any';
+                        properties[prop.name].stiMerged = true;
                         return properties[prop.name];
                     }
-                    return (properties[prop.name] = prop);
+                    // Deep copy to prevent mutating the original entity's property —
+                    // both from the merge path above (GH #6522/#6523) and from
+                    // downstream code that mutates nested arrays like fieldNames.
+                    return (properties[prop.name] = Utils.copy(prop));
                 });
             };
             const processExtensions = (meta) => {
@@ -1219,8 +1223,13 @@ export class MetadataDiscovery {
         Object.values(meta.properties).forEach(prop => {
             const newProp = { ...prop };
             const rootProp = meta.root.properties[prop.name];
+            // stiMerged is set during inlineProperties when a property was merged
+            // from multiple polymorphic variants with different types. The flag is
+            // cleared implicitly when the first child claims the root property via
+            // addProperty below, so subsequent children correctly trigger renaming.
+            const typesMatch = rootProp?.type === prop.type || rootProp?.stiMerged === true;
             if (rootProp &&
-                (rootProp.type !== prop.type ||
+                (!typesMatch ||
                     (rootProp.fieldNames && prop.fieldNames && !compareArrays(rootProp.fieldNames, prop.fieldNames)))) {
                 const name = newProp.name;
                 this.initFieldName(newProp, newProp.object);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.0-dev.335",
+  "version": "7.0.0-dev.337",
   "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/typings.d.ts

@@ -234,8 +234,18 @@ export type FilterItemValue<T> = T | ExpandScalar<T> | Primary<T> | Raw;
 export type FilterValue<T> = OperatorMap<FilterItemValue<T>> | FilterItemValue<T> | FilterItemValue<T>[] | null;
 type FilterObjectProp<T, K extends PropertyKey> = K extends keyof MergeUnion<T> ? MergeUnion<T>[K] : K extends keyof T ? T[K] : never;
 type ExpandQueryMerged<T> = [T] extends [object] ? [T] extends [Scalar] ? never : FilterQuery<MergeUnion<T>> : FilterValue<T>;
+type ElemMatchCondition<T extends Record<string, any>> = {
+    [K in keyof T]?: T[K] | OperatorMap<T[K]>;
+} & {
+    $or?: ElemMatchCondition<T>[];
+    $and?: ElemMatchCondition<T>[];
+    $not?: ElemMatchCondition<T>;
+};
+type ElemMatchFilter<T> = T extends readonly (infer E)[] ? E extends Record<string, any> ? {
+    $elemMatch: ElemMatchCondition<E>;
+} : never : never;
 export type FilterObject<T> = {
-    -readonly [K in EntityKey<T>]?: ExpandQuery<ExpandProperty<FilterObjectProp<T, K>>> | ExpandQueryMerged<ExpandProperty<FilterObjectProp<T, K>>> | FilterValue<ExpandProperty<FilterObjectProp<T, K>>> | null;
+    -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;
 };
 export type ExpandQuery<T> = T extends object ? (T extends Scalar ? never : FilterQuery<T>) : FilterValue<T>;
 export type EntityProps<T> = {
@@ -523,6 +533,7 @@ export interface EntityProperty<Owner = any, Target = any> {
     nullable?: boolean;
     inherited?: boolean;
     renamedFrom?: string;
+    stiMerged?: boolean;
     stiFieldNames?: string[];
     stiFieldNameMap?: Dictionary<string>;
     unsigned?: boolean;

package/utils/QueryHelper.js

@@ -186,7 +186,7 @@ export class QueryHelper {
                 value = QueryHelper.processCustomType(prop, value, platform, undefined, true);
             }
             // oxfmt-ignore
-            const isJsonProperty = prop?.customType instanceof JsonType && !isRaw(value) && (Utils.isPlainObject(value) ? Object.keys(value)[0] !== '$eq' : !Array.isArray(value));
+            const isJsonProperty = prop?.customType instanceof JsonType && !isRaw(value) && (Utils.isPlainObject(value) ? !['$eq', '$elemMatch'].includes(Object.keys(value)[0]) : !Array.isArray(value));
             if (isJsonProperty && prop?.kind !== ReferenceKind.EMBEDDED) {
                 return this.processJsonCondition(o, value, [prop.fieldNames[0]], platform, aliased);
             }

package/utils/Utils.js

@@ -123,7 +123,7 @@ export function parseJsonSafe(value) {
 }
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.0.0-dev.335';
+    static #ORM_VERSION = '7.0.0-dev.337';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */