@mikro-orm/core 7.0.4-dev.13 → 7.0.4-dev.14

package/hydration/ObjectHydrator.js

@@ -122,7 +122,7 @@ export class ObjectHydrator extends Hydrator {
                 ret.push(`    entity${entityKey} = data${dataKey};`);
             }
             if (prop.ref) {
-                ret.push(`    const value = entity${entityKey};`);
+                ret.push(`    const value = entity${entityKey}?.__scalarReference ? entity${entityKey}.unwrap() : entity${entityKey};`);
                 ret.push(`    entity${entityKey} = oldValue_${idx} ?? new ScalarReference(value);`);
                 ret.push(`    entity${entityKey}.bind(entity, '${prop.name}');`);
                 ret.push(`    entity${entityKey}.set(value);`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.4-dev.13",
+  "version": "7.0.4-dev.14",
   "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/EntityComparator.js

@@ -525,7 +525,11 @@ export class EntityComparator {
     }
     getPropertySnapshot(meta, prop, context, dataKey, entityKey, path, level = 1, object) {
         const unwrap = prop.ref ? '?.unwrap()' : '';
-        let ret = `  if (${this.getPropertyCondition(path)}) {\n`;
+        let ret = `  if (${this.getPropertyCondition(path)}`;
+        if (prop.lazy && prop.ref) {
+            ret += ` && entity${path.map(k => this.wrap(k)).join('')}?.isInitialized()`;
+        }
+        ret += `) {\n`;
         if (['number', 'string', 'boolean'].includes(prop.type.toLowerCase())) {
             return ret + `    ret${dataKey} = entity${entityKey}${unwrap};\n  }\n`;
         }

package/utils/Utils.js

@@ -129,7 +129,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.4-dev.13';
+    static #ORM_VERSION = '7.0.4-dev.14';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */