@mikro-orm/core 7.2.5-dev.2 → 7.2.5-dev.4

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/package.json

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

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