@mikro-orm/core 6.3.14-dev.11 → 6.3.14-dev.13

package/entity/EntityFactory.js

@@ -69,6 +69,9 @@ class EntityFactory {
             if (options.convertCustomTypes) {
                 for (const prop of meta.props) {
                     if (prop.customType?.ensureComparable(meta, prop) && data[prop.name]) {
+                        if ([enums_1.ReferenceKind.MANY_TO_ONE, enums_1.ReferenceKind.ONE_TO_ONE].includes(prop.kind) && Utils_1.Utils.isPlainObject(data[prop.name])) {
+                            data[prop.name] = Utils_1.Utils.getPrimaryKeyValues(data[prop.name], prop.targetMeta.primaryKeys, true);
+                        }
                         data[prop.name] = prop.customType.convertToDatabaseValue(data[prop.name], this.platform, { key: prop.name, mode: 'hydration' });
                     }
                 }

package/entity/EntityHelper.js

@@ -176,10 +176,15 @@ class EntityHelper {
                 inverse.addWithoutPropagation(owner);
                 (0, wrap_1.helper)(owner).__em?.getUnitOfWork().cancelOrphanRemoval(owner);
             }
-            if (prop.kind === enums_1.ReferenceKind.ONE_TO_ONE && entity && (!prop.owner || (0, wrap_1.helper)(entity).__initialized)) {
+            if (prop.kind === enums_1.ReferenceKind.ONE_TO_ONE) {
                 if ((value != null && Reference_1.Reference.unwrapReference(inverse) !== owner) ||
-                    (value == null && entity[prop2.name] != null)) {
-                    EntityHelper.propagateOneToOne(entity, owner, prop, prop2, value, old);
+                    (value == null && entity?.[prop2.name] != null)) {
+                    if (entity && (!prop.owner || (0, wrap_1.helper)(entity).__initialized)) {
+                        EntityHelper.propagateOneToOne(entity, owner, prop, prop2, value, old);
+                    }
+                    if (old && prop.orphanRemoval) {
+                        (0, wrap_1.helper)(old).__em?.getUnitOfWork().scheduleOrphanRemoval(old);
+                    }
                 }
             }
         }
@@ -203,9 +208,6 @@ class EntityHelper {
         else {
             entity[prop2.name] = Reference_1.Reference.wrapReference(owner, prop);
         }
-        if (old && prop.orphanRemoval) {
-            (0, wrap_1.helper)(old).__em?.getUnitOfWork().scheduleOrphanRemoval(old);
-        }
         if (old?.[prop2.name] != null) {
             delete (0, wrap_1.helper)(old).__data[prop2.name];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.3.14-dev.11",
+  "version": "6.3.14-dev.13",
   "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.2.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.3.14-dev.11",
+    "mikro-orm": "6.3.14-dev.13",
     "reflect-metadata": "0.2.2"
   }
 }