@mikro-orm/core 7.0.7-dev.10 → 7.0.7-dev.11

package/entity/EntityFactory.js

@@ -47,11 +47,32 @@ export class EntityFactory {
         const exists = this.findEntity(data, meta2, options);
         let wrapped = exists && helper(exists);
         if (wrapped && !options.refresh) {
+            const wasInitialized = wrapped.isInitialized();
             wrapped.__processing = true;
             Utils.dropUndefinedProperties(data);
             this.mergeData(meta2, exists, data, options);
             wrapped.__processing = false;
+            wrapped.__initialized ||= !!options.initialized;
             if (wrapped.isInitialized()) {
+                if (!wasInitialized) {
+                    if (meta.root.inheritanceType && !(exists instanceof meta2.class)) {
+                        Object.setPrototypeOf(exists, meta2.prototype);
+                    }
+                    if (options.merge && wrapped.hasPrimaryKey()) {
+                        this.unitOfWork.register(exists, data, { loaded: options.initialized });
+                        // ensure all data keys are tracked as loaded for shouldRefresh checks,
+                        // but don't overwrite __originalEntityData — mergeData already set it
+                        // with DB values for non-user-modified keys, leaving user changes detectable
+                        for (const key of Utils.keys(data)) {
+                            if (meta2.properties[key]) {
+                                wrapped.__loadedProperties.add(key);
+                            }
+                        }
+                    }
+                    if (this.#eventManager.hasListeners(EventType.onInit, meta2)) {
+                        this.#eventManager.dispatchEvent(EventType.onInit, { entity: exists, meta: meta2, em: this.#em });
+                    }
+                }
                 return exists;
             }
         }
@@ -125,8 +146,18 @@ export class EntityFactory {
             diff[meta.versionProperty] = data[meta.versionProperty];
         }
         const diff2 = this.#comparator.diffEntities(meta.class, existsData, data, { includeInverseSides: true });
-        // do not override values changed by user
-        Utils.keys(diff).forEach(key => delete diff2[key]);
+        // do not override values changed by user; for uninitialized entities,
+        // the diff may include stale snapshot entries (value is undefined) — skip those
+        if (helper(entity).__initialized) {
+            Utils.keys(diff).forEach(key => delete diff2[key]);
+        }
+        else {
+            Utils.keys(diff).forEach(key => {
+                if (diff[key] !== undefined) {
+                    delete diff2[key];
+                }
+            });
+        }
         Utils.keys(diff2)
             .filter(key => {
             // ignore null values if there is already present non-null value

package/package.json

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

@@ -132,7 +132,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.0.7-dev.10';
+    static #ORM_VERSION = '7.0.7-dev.11';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */