@mikro-orm/core 6.6.13 → 6.6.14-dev.0

package/metadata/MetadataDiscovery.d.ts

@@ -50,6 +50,7 @@ export declare class MetadataDiscovery {
     private defineBaseEntityProperties;
     private initPolyEmbeddables;
     private initEmbeddables;
+    private sameRelationTargetRoot;
     private initSingleTableInheritance;
     private createDiscriminatorProperty;
     private initAutoincrement;

package/metadata/MetadataDiscovery.js

@@ -953,6 +953,16 @@ class MetadataDiscovery {
             });
         }
     }
+    sameRelationTargetRoot(rootProp, prop) {
+        if (rootProp?.kind !== prop.kind) {
+            return false;
+        }
+        if (prop.kind !== enums_1.ReferenceKind.MANY_TO_ONE && prop.kind !== enums_1.ReferenceKind.ONE_TO_ONE) {
+            return false;
+        }
+        const aRoot = this.metadata.find(prop.type)?.root;
+        return aRoot != null && aRoot === this.metadata.find(rootProp.type)?.root;
+    }
     initSingleTableInheritance(meta, metadata) {
         if (meta.root !== meta && !meta.__processed) {
             meta.root = metadata.find(m => m.className === meta.root.className);
@@ -984,7 +994,12 @@ class MetadataDiscovery {
         Object.values(meta.properties).forEach(prop => {
             const newProp = { ...prop };
             const rootProp = meta.root.properties[prop.name];
-            if (rootProp && (rootProp.type !== prop.type || (rootProp.fieldNames && prop.fieldNames && !(0, Utils_1.compareArrays)(rootProp.fieldNames, prop.fieldNames)))) {
+            // 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
+            // crash — `targetMeta` is only populated later, in `initRelation`).
+            const narrowedRelationOverride = rootProp != null && rootProp.type !== prop.type && this.sameRelationTargetRoot(rootProp, prop);
+            if (rootProp && !narrowedRelationOverride && (rootProp.type !== prop.type || (rootProp.fieldNames && prop.fieldNames && !(0, Utils_1.compareArrays)(rootProp.fieldNames, prop.fieldNames)))) {
                 const name = newProp.name;
                 this.initFieldName(newProp, newProp.object);
                 newProp.renamedFrom = name;
@@ -1019,6 +1034,12 @@ class MetadataDiscovery {
             }
             newProp.nullable = true;
             newProp.inherited = !rootProp;
+            // For narrowed relation overrides, keep the root's declaration intact so
+            // the full target union (e.g. `Food`) is preserved for populates from the
+            // abstract root — otherwise the last child processed would win.
+            if (narrowedRelationOverride) {
+                return;
+            }
             meta.root.addProperty(newProp);
         });
         meta.collection = meta.root.collection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.6.13",
+  "version": "6.6.14-dev.0",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.3.3",
     "globby": "11.1.0",
-    "mikro-orm": "6.6.13",
+    "mikro-orm": "6.6.14-dev.0",
     "reflect-metadata": "0.2.2"
   }
 }