@mikro-orm/core 7.1.7-dev.0 → 7.1.7-dev.2

package/metadata/MetadataDiscovery.js

@@ -1073,10 +1073,20 @@ export class MetadataDiscovery {
                     // defaults on db level would mess up with change tracking
                     delete prop.default;
                     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];
+                        const merged = properties[prop.name];
+                        const prevEntity = merged.entity;
+                        const nextEntity = prop.entity;
+                        // merge the `entity`/`target` references too, so the union type survives re-normalization (GH #7983)
+                        if (prevEntity && nextEntity) {
+                            merged.entity = (() => Utils.unique([...Utils.asArray(prevEntity()), ...Utils.asArray(nextEntity())]));
+                        }
+                        if (merged.target && prop.target) {
+                            merged.target = Utils.unique([...Utils.asArray(merged.target), ...Utils.asArray(prop.target)]);
+                        }
+                        merged.type = `${merged.type} | ${prop.type}`;
+                        merged.runtimeType = 'any';
+                        merged.stiMerged = true;
+                        return merged;
                     }
                     // Deep copy to prevent mutating the original entity's property —
                     // both from the merge path above (GH #6522/#6523) and from
@@ -1325,6 +1335,12 @@ export class MetadataDiscovery {
         Object.values(meta.properties).forEach(prop => {
             const newProp = { ...prop };
             const rootProp = meta.root.properties[prop.name];
+            // Same-named embedded props merged from polymorphic embeddable variants keep the merged
+            // union-typed declaration, so nested paths of every variant stay resolvable (GH #7983).
+            if (rootProp?.stiMerged && prop.kind === ReferenceKind.EMBEDDED) {
+                rootProp.nullable = true; // each variant fills only its own columns
+                return;
+            }
             // A child that narrows a relation to a subclass of the root's declared
             // target (same STI hierarchy) shares the FK column with the root; treat
             // that as matching so the rename branch below doesn't run (which would

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.1.7-dev.0",
+  "version": "7.1.7-dev.2",
   "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/utils/Utils.js

@@ -141,7 +141,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.1.7-dev.0';
+    static #ORM_VERSION = '7.1.7-dev.2';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */