@mikro-orm/core 7.0.0-dev.334 → 7.0.0-dev.336

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.334",
+  "version": "7.0.0-dev.336",
   "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

@@ -523,6 +523,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/Utils.js

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