@mikro-orm/core 6.2.10-dev.62 → 6.2.10-dev.63

package/EntityManager.js

@@ -603,7 +603,7 @@ class EntityManager {
         em.prepareOptions(options);
         let entityName;
         let where;
-        let entity;
+        let entity = null;
         if (data === undefined) {
             entityName = entityNameOrEntity.constructor.name;
             data = entityNameOrEntity;
@@ -661,13 +661,13 @@ class EntityManager {
             convertCustomTypes,
             ...options,
         });
+        em.unitOfWork.getChangeSetPersister().mapReturnedValues(entity, data, ret.row, meta, true);
         entity ??= em.entityFactory.create(entityName, data, {
             refresh: true,
             initialized: true,
             schema: options.schema,
             convertCustomTypes: true,
         });
-        em.unitOfWork.getChangeSetPersister().mapReturnedValues(entity, data, ret.row, meta, true);
         const uniqueFields = options.onConflictFields ?? (utils_1.Utils.isPlainObject(where) ? Object.keys(where) : meta.primaryKeys);
         const returning = (0, utils_1.getOnConflictReturningFields)(meta, data, uniqueFields, options);
         if (options.onConflictAction === 'ignore' || !(0, entity_1.helper)(entity).hasPrimaryKey() || (returning.length > 0 && !(this.getPlatform().usesReturningStatement() && ret.row))) {
@@ -825,13 +825,13 @@ class EntityManager {
         entitiesByData.clear();
         const loadPK = new Map();
         allData.forEach((row, i) => {
+            em.unitOfWork.getChangeSetPersister().mapReturnedValues(utils_1.Utils.isEntity(data[i]) ? data[i] : null, utils_1.Utils.isEntity(data[i]) ? {} : data[i], res.rows?.[i], meta, true);
             const entity = utils_1.Utils.isEntity(data[i]) ? data[i] : em.entityFactory.create(entityName, row, {
                 refresh: true,
                 initialized: true,
                 schema: options.schema,
                 convertCustomTypes: true,
             });
-            em.unitOfWork.getChangeSetPersister().mapReturnedValues(entity, utils_1.Utils.isEntity(data[i]) ? {} : data[i], res.rows?.[i], meta, true);
             if (!(0, entity_1.helper)(entity).hasPrimaryKey()) {
                 loadPK.set(entity, allWhere[i]);
             }

package/package.json

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

package/unit-of-work/ChangeSetPersister.d.ts

@@ -47,5 +47,5 @@ export declare class ChangeSetPersister {
      * No need to handle composite keys here as they need to be set upfront.
      * We do need to map to the change set payload too, as it will be used in the originalEntityData for new entities.
      */
-    mapReturnedValues<T extends object>(entity: T, payload: EntityDictionary<T>, row: Dictionary | undefined, meta: EntityMetadata<T>, upsert?: boolean): void;
+    mapReturnedValues<T extends object>(entity: T | null | undefined, payload: EntityDictionary<T>, row: Dictionary | undefined, meta: EntityMetadata<T>, upsert?: boolean): void;
 }

package/unit-of-work/ChangeSetPersister.js

@@ -354,7 +354,9 @@ class ChangeSetPersister {
     mapReturnedValues(entity, payload, row, meta, upsert = false) {
         if ((this.usesReturningStatement || upsert) && row && utils_1.Utils.hasObjectKeys(row)) {
             const mapped = this.comparator.mapResult(meta.className, row);
-            this.hydrator.hydrate(entity, meta, mapped, this.factory, 'full', false, true);
+            if (entity) {
+                this.hydrator.hydrate(entity, meta, mapped, this.factory, 'full', false, true);
+            }
             Object.assign(payload, mapped); // merge to the changeset payload, so it gets saved to the entity snapshot
         }
     }