@mikro-orm/core 6.3.4-dev.2 → 6.3.4-dev.4

package/entity/EntityLoader.js

@@ -91,9 +91,9 @@ class EntityLoader {
         }
     }
     expandDotPaths(normalized, meta) {
-        normalized.forEach(p => {
+        for (const p of normalized) {
             if (!p.field.includes('.')) {
-                return;
+                continue;
             }
             const [f, ...parts] = p.field.split('.');
             p.field = f;
@@ -105,10 +105,18 @@ class EntityLoader {
                     .filter(prop => prop.lazy || prop.kind !== enums_1.ReferenceKind.SCALAR)
                     .forEach(prop => p.children.push({ field: prop.name, strategy: p.strategy }));
             }
+            else if (prop.kind === enums_1.ReferenceKind.EMBEDDED) {
+                normalized.push({
+                    ...p,
+                    field: Object.values(prop.embeddedProps).find(c => c.embedded[1] === parts[0])?.name,
+                    children: [],
+                });
+                p.children.push(this.expandNestedPopulate(prop.type, parts, p.strategy, p.all));
+            }
             else {
                 p.children.push(this.expandNestedPopulate(prop.type, parts, p.strategy, p.all));
             }
-        });
+        }
     }
     /**
      * Merge multiple populates for the same entity with different children. Also skips `*` fields, those can come from
@@ -404,6 +412,9 @@ class EntityLoader {
         const where = options.where;
         const subCond = Utils_1.Utils.isPlainObject(where[prop.name]) ? where[prop.name] : {};
         const meta2 = this.metadata.find(prop.type);
+        if (!meta2) {
+            return {};
+        }
         const pk = Utils_1.Utils.getPrimaryKeyHash(meta2.primaryKeys);
         ['$and', '$or'].forEach(op => {
             if (where[op]) {

package/metadata/MetadataDiscovery.js

@@ -896,10 +896,13 @@ class MetadataDiscovery {
                 prop.hydrate = false;
                 return;
             }
-            prop = Utils_1.Utils.copy(prop, false);
-            prop.nullable = true;
-            prop.inherited = true;
-            meta.root.addProperty(prop);
+            const newProp = Utils_1.Utils.copy(prop, false);
+            if (prop.enum && prop.items && meta.root.properties[prop.name]?.items) {
+                newProp.items = Utils_1.Utils.unique([...meta.root.properties[prop.name].items, ...prop.items]);
+            }
+            newProp.nullable = true;
+            newProp.inherited = true;
+            meta.root.addProperty(newProp);
         });
         meta.collection = meta.root.collection;
         meta.root.indexes = Utils_1.Utils.unique([...meta.root.indexes, ...meta.indexes]);

package/package.json

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