@mikro-orm/core 6.3.11-dev.1 → 6.3.11-dev.2

package/entity/EntityLoader.js

@@ -26,11 +26,12 @@ class EntityLoader {
         if (entities.length === 0 || Utils_1.Utils.isEmpty(populate)) {
             return this.setSerializationContext(entities, populate, options);
         }
+        const meta = this.metadata.find(entityName);
         if (entities.some(e => !e.__helper)) {
             const entity = entities.find(e => !Utils_1.Utils.isEntity(e));
-            const meta = this.metadata.find(entityName);
             throw errors_1.ValidationError.notDiscoveredEntity(entity, meta, 'populate');
         }
+        const references = entities.filter(e => !(0, wrap_1.helper)(e).isInitialized());
         const visited = options.visited ??= new Set();
         options.where ??= {};
         options.orderBy ??= {};
@@ -39,6 +40,9 @@ class EntityLoader {
         options.validate ??= true;
         options.refresh ??= false;
         options.convertCustomTypes ??= true;
+        if (references.length > 0) {
+            await this.populateScalar(meta, references, options);
+        }
         populate = this.normalizePopulate(entityName, populate, options.strategy, options.lookup);
         const invalid = populate.find(({ field }) => !this.em.canPopulate(entityName, field));
         /* istanbul ignore next */
@@ -121,7 +125,7 @@ class EntityLoader {
         if (prop.kind === enums_1.ReferenceKind.MANY_TO_MANY && prop.owner && !this.driver.getPlatform().usesPivotTable()) {
             const filtered = entities.filter(e => !e[prop.name]?.isInitialized());
             if (filtered.length > 0) {
-                await this.populateScalar(meta, filtered, options, prop);
+                await this.populateScalar(meta, filtered, { ...options, fields: [prop.name] });
             }
         }
         if (prop.kind === enums_1.ReferenceKind.SCALAR && prop.lazy) {
@@ -129,7 +133,7 @@ class EntityLoader {
             if (options.ignoreLazyScalarProperties || filtered.length === 0) {
                 return entities;
             }
-            await this.populateScalar(meta, filtered, options, prop);
+            await this.populateScalar(meta, filtered, { ...options, fields: [prop.name] });
             return entities;
         }
         if (prop.kind === enums_1.ReferenceKind.EMBEDDED) {
@@ -147,14 +151,14 @@ class EntityLoader {
         this.initializeCollections(filtered, prop, field, data, innerOrderBy.length > 0);
         return data;
     }
-    async populateScalar(meta, filtered, options, prop) {
+    async populateScalar(meta, filtered, options) {
         const pk = Utils_1.Utils.getPrimaryKeyHash(meta.primaryKeys);
         const ids = Utils_1.Utils.unique(filtered.map(e => Utils_1.Utils.getPrimaryKeyValues(e, meta.primaryKeys, true)));
         const where = this.mergePrimaryCondition(ids, pk, options, meta, this.metadata, this.driver.getPlatform());
-        const { filters, convertCustomTypes, lockMode, strategy, populateWhere, connectionType, logging } = options;
+        const { filters, convertCustomTypes, lockMode, strategy, populateWhere, connectionType, logging, fields } = options;
         await this.em.find(meta.className, where, {
             filters, convertCustomTypes, lockMode, strategy, populateWhere, connectionType, logging,
-            fields: [prop.name],
+            fields: fields,
             populate: [],
         });
     }

package/package.json

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