@mikro-orm/core 6.4.4-dev.15 → 6.4.4-dev.16

package/entity/EntityValidator.js

@@ -59,6 +59,7 @@ class EntityValidator {
             return givenValue;
         }
         const expectedType = prop.runtimeType;
+        const propName = prop.embedded ? prop.name.replace(/~/g, '.') : prop.name;
         let givenType = Utils_1.Utils.getObjectType(givenValue);
         let ret = givenValue;
         if (!this.strict) {
@@ -67,12 +68,12 @@ class EntityValidator {
         }
         if (prop.enum && prop.items) {
             if (!prop.items.some(it => it === givenValue)) {
-                throw errors_1.ValidationError.fromWrongPropertyType(entity, prop.name, expectedType, givenType, givenValue);
+                throw errors_1.ValidationError.fromWrongPropertyType(entity, propName, expectedType, givenType, givenValue);
             }
         }
         else {
             if (givenType !== expectedType && this.KNOWN_TYPES.has(expectedType)) {
-                throw errors_1.ValidationError.fromWrongPropertyType(entity, prop.name, expectedType, givenType, givenValue);
+                throw errors_1.ValidationError.fromWrongPropertyType(entity, propName, expectedType, givenType, givenValue);
             }
         }
         return ret;

package/metadata/MetadataDiscovery.js

@@ -826,10 +826,11 @@ class MetadataDiscovery {
         const parentProperty = meta.properties[embeddedProp.embedded?.[0] ?? ''];
         const object = isParentObject(embeddedProp);
         this.initFieldName(embeddedProp, rootProperty !== embeddedProp && object);
-        // the prefix of the parent can not be a boolean; it already passed here
+        // the prefix of the parent cannot be a boolean; it already passed here
         const prefix = this.getPrefix(embeddedProp, parentProperty);
+        const glue = object ? '~' : '_';
         for (const prop of Object.values(embeddable.properties)) {
-            const name = (embeddedProp.embeddedPath?.join('_') ?? embeddedProp.fieldNames[0] + '_') + prop.name;
+            const name = (embeddedProp.embeddedPath?.join(glue) ?? embeddedProp.fieldNames[0] + glue) + prop.name;
             meta.properties[name] = Utils_1.Utils.copy(prop, false);
             meta.properties[name].name = name;
             meta.properties[name].embedded = [embeddedProp.name, prop.name];

package/package.json

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

package/utils/EntityComparator.js

@@ -389,8 +389,8 @@ class EntityComparator {
         dataKey = dataKey.replace(/^\./, '');
         const contains = (str, re) => (str.match(re) || []).length > 0;
         const a = contains(dataKey, /\./g);
-        const b = contains(dataKey, /\[/g);
-        return !!prop.object && !(a || b);
+        const b = contains(dataKey, /\[idx_/g);
+        return !!prop.object && !a && !b;
     }
     getEmbeddedPropertySnapshot(meta, prop, context, level, path, dataKey, object = prop.object) {
         const padding = ' '.repeat(level * 2);