@mikro-orm/core 6.6.7 → 6.6.8-dev.1

package/entity/EntityFactory.js

@@ -134,7 +134,10 @@ class EntityFactory {
             .filter(key => meta.properties[key]?.formula || [enums_1.ReferenceKind.ONE_TO_MANY, enums_1.ReferenceKind.MANY_TO_MANY].includes(meta.properties[key]?.kind))
             .forEach(key => diff2[key] = data[key]);
         // rehydrated with the new values, skip those changed by user
-        this.hydrate(entity, meta, diff2, options);
+        // use full hydration if the entity is already initialized, even if the caller used `initialized: false`
+        // (e.g. from createReference), otherwise scalar properties in diff2 won't be applied
+        const initialized = options.initialized || (0, wrap_1.helper)(entity).__initialized;
+        this.hydrate(entity, meta, diff2, initialized ? { ...options, initialized } : options);
         // we need to update the entity data only with keys that were not present before
         const nullVal = this.config.get('forceUndefined') ? undefined : null;
         Utils_1.Utils.keys(diff2).forEach(key => {
@@ -142,7 +145,7 @@ class EntityFactory {
             if ([enums_1.ReferenceKind.MANY_TO_ONE, enums_1.ReferenceKind.ONE_TO_ONE].includes(prop.kind) && Utils_1.Utils.isPlainObject(data[prop.name])) {
                 diff2[key] = entity[prop.name] ? (0, wrap_1.helper)(entity[prop.name]).getPrimaryKey(options.convertCustomTypes) : null;
             }
-            if ([enums_1.ReferenceKind.MANY_TO_ONE, enums_1.ReferenceKind.ONE_TO_ONE, enums_1.ReferenceKind.SCALAR].includes(prop.kind) && prop.customType?.ensureComparable(meta, prop) && diff2[key] != null) {
+            if (!options.convertCustomTypes && [enums_1.ReferenceKind.MANY_TO_ONE, enums_1.ReferenceKind.ONE_TO_ONE, enums_1.ReferenceKind.SCALAR].includes(prop.kind) && prop.customType?.ensureComparable(meta, prop) && diff2[key] != null) {
                 const converted = prop.customType.convertToJSValue(diff2[key], this.platform, { force: true });
                 diff2[key] = prop.customType.convertToDatabaseValue(converted, this.platform, { fromQuery: true });
             }

package/package.json

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

package/serialization/EntityTransformer.js

@@ -50,10 +50,12 @@ class EntityTransformer {
                 continue;
             }
             const populated = root.isMarkedAsPopulated(meta.className, prop);
-            const partiallyLoaded = root.isPartiallyLoaded(meta.className, prop);
-            const isPrimary = includePrimaryKeys && meta.properties[prop].primary;
-            if (!partiallyLoaded && !populated && !isPrimary) {
-                continue;
+            if (!raw) {
+                const partiallyLoaded = root.isPartiallyLoaded(meta.className, prop);
+                const isPrimary = includePrimaryKeys && meta.properties[prop].primary;
+                if (!partiallyLoaded && !populated && !isPrimary) {
+                    continue;
+                }
             }
             const cycle = root.visit(meta.className, prop);
             if (cycle && visited) {