@mikro-orm/core 7.2.5-dev.1 → 7.2.5-dev.11

package/EntityManager.js

@@ -781,14 +781,36 @@ export class EntityManager {
             em.#unitOfWork.unsetIdentity(entity);
             return null;
         }
+        // `serialize()` applies `Type.toJSON()` and `serializedName`, take only relations and embeddables from it, scalars from the entity
+        const getData = (e, data = helper(e).serialize({
+            ignoreSerializers: true,
+            includeHidden: true,
+            convertCustomTypes: false,
+        })) => {
+            for (const prop of helper(e).__meta.props) {
+                if (prop.kind === ReferenceKind.SCALAR && !prop.ref) {
+                    data[prop.name] = e[prop.name];
+                    continue;
+                }
+                if (prop.serializedName && prop.serializedName in data) {
+                    data[prop.name] = data[prop.serializedName];
+                }
+                if (prop.kind === ReferenceKind.EMBEDDED && e[prop.name] != null) {
+                    Utils.asArray(e[prop.name]).forEach((item, i) => getData(item, prop.array ? data[prop.name][i] : data[prop.name]));
+                }
+            }
+            return data;
+        };
+        const hydrate = (target, source) => {
+            em.config
+                .getHydrator(this.metadata)
+                .hydrate(target, helper(target).__meta, getData(source), em.#entityFactory, 'full', false, false);
+            Utils.merge(helper(target).__originalEntityData, this.#comparator.prepareEntity(source));
+        };
         let found = false;
         for (const e of fork.#unitOfWork.getIdentityMap()) {
             const ref = em.getReference(e.constructor, helper(e).getPrimaryKey());
-            const data = helper(e).serialize({ ignoreSerializers: true, includeHidden: true, convertCustomTypes: false });
-            em.config
-                .getHydrator(this.metadata)
-                .hydrate(ref, helper(ref).__meta, data, em.#entityFactory, 'full', false, false);
-            Utils.merge(helper(ref).__originalEntityData, this.#comparator.prepareEntity(e));
+            hydrate(ref, e);
             // index a refreshed `targetKey` value, `getByKey` ignores the old one as stale
             if (helper(ref).__meta.root.targetKeys) {
                 em.#unitOfWork.getIdentityMap().store(ref);
@@ -796,15 +818,7 @@ export class EntityManager {
             found ||= ref === entity;
         }
         if (!found) {
-            const data = helper(reloaded).serialize({
-                ignoreSerializers: true,
-                includeHidden: true,
-                convertCustomTypes: false,
-            });
-            em.config
-                .getHydrator(this.metadata)
-                .hydrate(entity, wrapped.__meta, data, em.#entityFactory, 'full', false, false);
-            Utils.merge(wrapped.__originalEntityData, this.#comparator.prepareEntity(reloaded));
+            hydrate(entity, reloaded);
         }
         return entity;
     }

package/metadata/MetadataDiscovery.js

@@ -1506,6 +1506,9 @@ export class MetadataDiscovery {
             if (isInverseSideRelation && rootProp && rootProp.type !== prop.type) {
                 return;
             }
+            // a sibling matching the root property must not drop the column variants of already renamed siblings
+            newProp.stiFieldNames ??= rootProp?.stiFieldNames;
+            newProp.stiFieldNameMap ??= rootProp?.stiFieldNameMap;
             meta.root.addProperty(newProp);
         });
         meta.tableName = meta.root.tableName;
@@ -1626,7 +1629,7 @@ export class MetadataDiscovery {
         if (meta.inheritanceType !== 'tpt') {
             return;
         }
-        const belongsToTable = (prop) => prop.persist !== false || prop.primary;
+        const belongsToTable = (prop) => prop.persist !== false || prop.primary || !!prop.formula;
         // Use meta.properties (object) since meta.props (array) may not be populated yet
         const allProps = Object.values(meta.properties);
         if (!meta.tptParent) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.2.5-dev.1",
+  "version": "7.2.5-dev.11",
   "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/unit-of-work/CommitOrderCalculator.js

@@ -44,7 +44,8 @@ export class CommitOrderCalculator {
         if (!toOneOwner && !toManyOwner) {
             return;
         }
-        const propertyType = prop.targetMeta?.root._id;
+        // TPT tables are separate nodes and the FK references the target's own table, not the root
+        const propertyType = (prop.targetMeta?.inheritanceType === 'tpt' ? prop.targetMeta : prop.targetMeta?.root)?._id;
         if (propertyType == null || !this.hasNode(propertyType)) {
             return;
         }

package/unit-of-work/UnitOfWork.js

@@ -1283,6 +1283,13 @@ export class UnitOfWork {
                         calc.discoverProperty({ ...prop, targetMeta }, meta._id);
                     }
                 }
+                else if (prop.targetMeta?.inheritanceType === 'tpt') {
+                    calc.discoverProperty(prop, meta._id);
+                    // a TPT subclass delete has only a leaf change set that also removes the target row; weak edge so it can't break insert order
+                    for (const targetMeta of this.#metadata.find(prop.targetMeta.class).allTPTDescendants ?? []) {
+                        calc.discoverProperty({ ...prop, targetMeta, nullable: true }, meta._id);
+                    }
+                }
                 else {
                     calc.discoverProperty(prop, meta._id);
                 }

package/utils/EntityComparator.js

@@ -366,8 +366,16 @@ export class EntityComparator {
                 if (prop.renamedFrom) {
                     lines.push(`${padding}  ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
                     defined = `${this.propName(prop.fieldNames[0])} != null`;
-                    // a column shared with a differently typed subtype is left for each subtype's hydrator to convert
-                    if (meta.props.some(p => p !== prop && p.name === prop.name && p.fieldNames?.[0] === prop.fieldNames[0])) {
+                    const sharesColumn = meta.props.some(p => p !== prop && p.name === prop.name && p.fieldNames?.[0] === prop.fieldNames[0]);
+                    // hydrators expect mapped embeddable keys, so a shared object embeddable is mapped only for its own subtypes
+                    if (sharesColumn && prop.kind === ReferenceKind.EMBEDDED && prop.object && meta.discriminatorMap) {
+                        const owners = Object.entries(meta.discriminatorMap)
+                            .filter(([, cls]) => this.#metadata.find(cls)?.properties[prop.name]?.targetMeta === prop.targetMeta)
+                            .map(([value]) => `${this.propName(meta.discriminatorColumn)} == ${JSON.stringify(value)}`);
+                        defined += ` && (${owners.join(' || ')})`;
+                    }
+                    else if (sharesColumn) {
+                        // a column shared with a differently typed subtype is left for each subtype's hydrator to convert
                         lines.push(`${padding}  if (${defined}) {`);
                         lines.push(`${padding}    ret${this.wrap(prop.name)} = ${this.propName(prop.fieldNames[0])};`);
                         lines.push(`${padding}  }`);

package/utils/Utils.js

@@ -153,7 +153,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.2.5-dev.1';
+    static #ORM_VERSION = '7.2.5-dev.11';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;