@mikro-orm/core 6.5.9-dev.8 → 6.5.9-dev.9

package/EntityManager.js

@@ -493,8 +493,9 @@ class EntityManager {
     async refresh(entity, options = {}) {
         const fork = this.fork({ keepTransactionContext: true });
         const entityName = entity.constructor.name;
+        const wrapped = (0, entity_1.helper)(entity);
         const reloaded = await fork.findOne(entityName, entity, {
-            schema: (0, entity_1.helper)(entity).__schema,
+            schema: wrapped.__schema,
             ...options,
             flushMode: enums_1.FlushMode.COMMIT,
         });
@@ -508,13 +509,13 @@ class EntityManager {
             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);
+            utils_1.Utils.merge((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);
+            em.config.getHydrator(this.metadata).hydrate(entity, wrapped.__meta, data, em.entityFactory, 'full', false, true);
+            utils_1.Utils.merge(wrapped.__originalEntityData, this.comparator.prepareEntity(reloaded));
         }
         return entity;
     }

package/package.json

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

package/utils/TransactionManager.js

@@ -20,9 +20,7 @@ class TransactionManager {
      */
     async handle(cb, options = {}) {
         const em = this.em.getContext(false);
-        // Set NESTED as the default propagation type
         options.propagation ??= enums_1.TransactionPropagation.NESTED;
-        // Set the context to the current transaction context if not already set
         options.ctx ??= em.getTransactionContext();
         const hasExistingTransaction = !!em.getTransactionContext();
         return this.executeWithPropagation(options.propagation, em, cb, options, hasExistingTransaction);