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

package/entity/EntityHelper.js

@@ -222,7 +222,8 @@ class EntityHelper {
                     // Inverse already points to owner — propagation is not needed,
                     // but we still need to clean up old's inverse side.
                     (0, wrap_1.helper)(old).__pk ??= (0, wrap_1.helper)(old).getPrimaryKey();
-                    if (old[prop2.name] != null) {
+                    // Don't nullify the FK if it's part of the PK — the entity will be deleted via orphan removal
+                    if (old[prop2.name] != null && !(prop.orphanRemoval && prop2.primary)) {
                         delete (0, wrap_1.helper)(old).__data[prop2.name];
                         old[prop2.name] = null;
                     }
@@ -258,7 +259,8 @@ class EntityHelper {
         else {
             entity[prop2.name] = Reference_1.Reference.wrapReference(owner, prop);
         }
-        if (old?.[prop2.name] != null) {
+        // Don't nullify the FK if it's part of the PK — the entity will be deleted via orphan removal
+        if (old?.[prop2.name] != null && !(prop.orphanRemoval && prop2.primary)) {
             delete (0, wrap_1.helper)(old).__data[prop2.name];
             old[prop2.name] = null;
         }

package/package.json

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

package/utils/EntityComparator.d.ts

@@ -73,6 +73,7 @@ export declare class EntityComparator {
      */
     private shouldSerialize;
     private getEmbeddedPropertySnapshot;
+    private getInlineEmbeddedNullLines;
     private registerCustomType;
     private getPropertySnapshot;
     /**

package/utils/EntityComparator.js

@@ -436,12 +436,7 @@ class EntityComparator {
         }
         else {
             ret += `${padding}if (${nullCond}) {\n`;
-            ret += meta.props.filter(p => p.embedded?.[0] === prop.name
-                // object for JSON embeddable
-                && (p.object || (p.persist !== false))).map(childProp => {
-                const childDataKey = meta.embeddable || prop.object ? dataKey + this.wrap(childProp.embedded[1]) : this.wrap(childProp.name);
-                return `${padding}  ret${childDataKey} = null;`;
-            }).join('\n') + `\n`;
+            ret += this.getInlineEmbeddedNullLines(meta, prop.name, padding, dataKey, !!(meta.embeddable || prop.object)).join('\n') + `\n`;
             ret += `${padding}}\n`;
         }
         const cond = `entity${path.map(k => this.wrap(k)).join('')} != null`;
@@ -485,6 +480,16 @@ class EntityComparator {
         }
         return `${ret}${padding}}`;
     }
+    getInlineEmbeddedNullLines(meta, parentName, padding, dataKey, useEmbeddedKey) {
+        return meta.props.filter(p => p.embedded?.[0] === parentName
+            && (p.object || (p.persist !== false))).flatMap(childProp => {
+            const childDataKey = useEmbeddedKey ? dataKey + this.wrap(childProp.embedded[1]) : this.wrap(childProp.name);
+            if (childProp.kind === enums_1.ReferenceKind.EMBEDDED && !childProp.object) {
+                return this.getInlineEmbeddedNullLines(meta, childProp.name, padding, childDataKey, useEmbeddedKey);
+            }
+            return [`${padding}  ret${childDataKey} = null;`];
+        });
+    }
     registerCustomType(prop, context) {
         const convertorKey = this.safeKey(prop.name);
         context.set(`convertToDatabaseValue_${convertorKey}`, (val) => {