@mikro-orm/core 7.0.7-dev.17 → 7.0.7-dev.19

package/entity/EntityHelper.js

@@ -223,10 +223,20 @@ export class EntityHelper {
                     if (entity && (!prop.owner || helper(entity).__initialized)) {
                         EntityHelper.propagateOneToOne(entity, owner, prop, prop2, value, old);
                     }
-                    if (old && prop.orphanRemoval) {
-                        helper(old).__em?.getUnitOfWork().scheduleOrphanRemoval(old);
+                }
+                else if (old && old !== value) {
+                    // Inverse already points to owner — propagation is not needed,
+                    // but we still need to clean up old's inverse side.
+                    helper(old).__pk ??= helper(old).getPrimaryKey();
+                    if (old[prop2.name] != null) {
+                        delete helper(old).__data[prop2.name];
+                        old[prop2.name] = null;
                     }
                 }
+                if (old && old !== value && prop.orphanRemoval) {
+                    helper(old).__pk ??= helper(old).getPrimaryKey();
+                    helper(old).__em?.getUnitOfWork().scheduleOrphanRemoval(old);
+                }
             }
         }
     }

package/entity/EntityLoader.js

@@ -399,10 +399,17 @@ export class EntityLoader {
             for (const child of children) {
                 childrenMap.add(getKey(child));
             }
+            const isInverseOneToOne = prop.kind === ReferenceKind.ONE_TO_ONE && !prop.owner;
             for (const entity of entities) {
-                const ref = entity[prop.name] ?? {};
-                const key = helper(ref) ? getKey(ref) : undefined;
-                if (key && childrenMap.has(key) && !itemsMap.has(key)) {
+                const ref = entity[prop.name];
+                if (ref == null) {
+                    continue;
+                }
+                const refKey = getKey(ref);
+                // For 1:1 inverse, `children` contains parent entities, so `childrenMap`
+                // has parent PKs — match against the entity's own PK, not the referenced entity's PK.
+                const childKey = isInverseOneToOne ? getKey(entity) : refKey;
+                if (childrenMap.has(childKey) && !itemsMap.has(refKey)) {
                     entity[prop.name] = nullVal;
                     helper(entity).__originalEntityData[prop.name] = null;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.7-dev.17",
+  "version": "7.0.7-dev.19",
   "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

@@ -132,7 +132,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.0.7-dev.17';
+    static #ORM_VERSION = '7.0.7-dev.19';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */