@mikro-orm/core 6.6.5-dev.2 → 6.6.5-dev.4

package/metadata/MetadataDiscovery.js

@@ -978,8 +978,27 @@ class MetadataDiscovery {
             if (rootProp && (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;
                 newProp.name = name + '_' + (i++);
                 meta.root.addProperty(newProp);
+                // Track all field variants and map discriminator values to field names
+                if (!rootProp.stiFieldNames) {
+                    this.initFieldName(prop, prop.object);
+                    this.initFieldName(rootProp, rootProp.object);
+                    rootProp.stiFieldNames = [...rootProp.fieldNames];
+                    rootProp.stiFieldNameMap = {};
+                    // Find which discriminator owns the original fieldNames
+                    for (const [discValue, childClass] of Object.entries(meta.root.discriminatorMap)) {
+                        const childMeta = this.metadata.find(childClass);
+                        if (childMeta?.properties[prop.name]?.fieldNames &&
+                            (0, Utils_1.compareArrays)(childMeta.properties[prop.name].fieldNames, rootProp.fieldNames)) {
+                            rootProp.stiFieldNameMap[discValue] = rootProp.fieldNames[0];
+                            break;
+                        }
+                    }
+                }
+                rootProp.stiFieldNameMap[meta.discriminatorValue] = prop.fieldNames[0];
+                rootProp.stiFieldNames.push(...prop.fieldNames);
                 newProp.nullable = true;
                 newProp.name = name;
                 newProp.hydrate = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.6.5-dev.2",
+  "version": "6.6.5-dev.4",
   "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.5-dev.2",
+    "mikro-orm": "6.6.5-dev.4",
     "reflect-metadata": "0.2.2"
   }
 }

package/typings.d.ts

@@ -364,6 +364,9 @@ export interface EntityProperty<Owner = any, Target = any> {
     unique?: boolean | string;
     nullable?: boolean;
     inherited?: boolean;
+    renamedFrom?: string;
+    stiFieldNames?: string[];
+    stiFieldNameMap?: Dictionary<string>;
     unsigned?: boolean;
     mapToPk?: boolean;
     persist?: boolean;

package/unit-of-work/ChangeSetPersister.js

@@ -48,7 +48,10 @@ class ChangeSetPersister {
         }
         const meta = this.metadata.find(changeSets[0].name);
         changeSets.forEach(changeSet => this.processProperties(changeSet));
-        if (batched && changeSets.length > 1 && this.config.get('useBatchUpdates', this.platform.usesBatchUpdates())) {
+        // For STI with conflicting fieldNames (renamedFrom properties), we can't batch mixed child types
+        const hasSTIConflicts = meta.root.props.some(p => p.renamedFrom);
+        const hasMixedTypes = hasSTIConflicts && changeSets.some(cs => cs.meta.class !== meta.class);
+        if (batched && changeSets.length > 1 && !hasMixedTypes && this.config.get('useBatchUpdates', this.platform.usesBatchUpdates())) {
             return this.persistManagedEntities(meta, changeSets, options);
         }
         for (const changeSet of changeSets) {
@@ -96,7 +99,8 @@ class ChangeSetPersister {
         options = this.prepareOptions(meta, options, {
             convertCustomTypes: false,
         });
-        const res = await this.driver.nativeInsertMany(meta.className, [changeSet.payload], options);
+        // Use changeSet's own meta for STI entities to get correct field mappings
+        const res = await this.driver.nativeInsertMany(changeSet.meta.className, [changeSet.payload], options);
         if (!wrapped.hasPrimaryKey()) {
             this.mapPrimaryKey(meta, res.insertId, changeSet);
         }

package/utils/Utils.js

@@ -658,7 +658,7 @@ class Utils {
      */
     static detectTsNode() {
         /* istanbul ignore next */
-        return process.argv[0].endsWith('ts-node') // running via ts-node directly
+        return process.argv[0]?.endsWith('ts-node') // running via ts-node directly
             // @ts-ignore
             || !!process[Symbol.for('ts-node.register.instance')] // check if internal ts-node symbol exists
             || !!process.env.TS_JEST // check if ts-jest is used (works only with v27.0.4+)