@mikro-orm/core 6.5.6-dev.0 → 6.5.6-dev.1

package/EntityManager.js

@@ -499,18 +499,24 @@ class EntityManager {
             flushMode: enums_1.FlushMode.COMMIT,
         });
         const em = this.getContext();
-        if (reloaded) {
-            for (const e of fork.unitOfWork.getIdentityMap()) {
-                const ref = em.getReference(e.constructor.name, (0, entity_1.helper)(e).getPrimaryKey());
-                const data = this.comparator.prepareEntity(e);
-                em.config.getHydrator(this.metadata).hydrate(ref, (0, entity_1.helper)(ref).__meta, (0, entity_1.helper)(e).serialize({ ignoreSerializers: true, includeHidden: true }), em.entityFactory, 'full', false, true);
-                (0, entity_1.helper)(ref).__originalEntityData = data;
-            }
-        }
-        else {
+        if (!reloaded) {
             em.unitOfWork.unsetIdentity(entity);
+            return null;
         }
-        return reloaded ? entity : reloaded;
+        let found = false;
+        for (const e of fork.unitOfWork.getIdentityMap()) {
+            const ref = em.getReference(e.constructor.name, (0, entity_1.helper)(e).getPrimaryKey());
+            const data = (0, entity_1.helper)(e).serialize({ ignoreSerializers: true, includeHidden: true });
+            em.config.getHydrator(this.metadata).hydrate(ref, (0, entity_1.helper)(ref).__meta, data, em.entityFactory, 'full', false, true);
+            (0, entity_1.helper)(ref).__originalEntityData = this.comparator.prepareEntity(e);
+            found ||= ref === entity;
+        }
+        if (!found) {
+            const data = (0, entity_1.helper)(reloaded).serialize({ ignoreSerializers: true, includeHidden: true });
+            em.config.getHydrator(this.metadata).hydrate(entity, (0, entity_1.helper)(entity).__meta, data, em.entityFactory, 'full', false, true);
+            (0, entity_1.helper)(entity).__originalEntityData = this.comparator.prepareEntity(reloaded);
+        }
+        return entity;
     }
     /**
      * Finds first entity matching your `where` query.

package/package.json

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