@mikro-orm/core 6.4.17-dev.74 → 6.4.17-dev.76

package/EntityManager.js

@@ -282,7 +282,7 @@ class EntityManager {
             for (const hint of options.populate) {
                 const field = hint.field.split(':')[0];
                 const prop = meta.properties[field];
-                const strategy = (0, utils_2.getLoadingStrategy)(prop.strategy || options.strategy || hint.strategy || this.config.get('loadStrategy'), prop.kind);
+                const strategy = (0, utils_2.getLoadingStrategy)(prop.strategy || hint.strategy || options.strategy || this.config.get('loadStrategy'), prop.kind);
                 const joined = strategy === enums_1.LoadStrategy.JOINED && prop.kind !== enums_1.ReferenceKind.SCALAR;
                 if (!joined && !hint.filter) {
                     continue;
@@ -320,10 +320,19 @@ class EntityManager {
             const cond = await this.applyFilters(prop.type, {}, options.filters ?? {}, 'read', options);
             if (!utils_1.Utils.isEmpty(cond)) {
                 const populated = options.populate.filter(({ field }) => field.split(':')[0] === prop.name);
+                let found = false;
                 if (populated.length > 0) {
-                    populated.forEach(hint => hint.filter = true);
+                    for (const hint of populated) {
+                        if (!hint.all) {
+                            hint.filter = true;
+                            found = true;
+                        }
+                        else if (hint.field === `${prop.name}:ref`) {
+                            found = true;
+                        }
+                    }
                 }
-                else {
+                if (!found) {
                     ret.push({ field: `${prop.name}:ref`, strategy: enums_1.LoadStrategy.JOINED, filter: true });
                 }
             }

package/entity/EntityLoader.js

@@ -41,7 +41,7 @@ class EntityLoader {
         options.refresh ??= false;
         options.convertCustomTypes ??= true;
         if (references.length > 0) {
-            await this.populateScalar(meta, references, options);
+            await this.populateScalar(meta, references, { ...options, populateWhere: undefined });
         }
         populate = this.normalizePopulate(entityName, populate, options.strategy, options.lookup);
         const invalid = populate.find(({ field }) => !this.em.canPopulate(entityName, field));

package/entity/utils.js

@@ -38,7 +38,6 @@ function expandDotPaths(meta, populate, normalized = false) {
         p.field = f;
         p.children ??= [];
         const prop = meta.properties[p.field];
-        p.strategy ??= prop.strategy;
         if (parts[0] === enums_1.PopulatePath.ALL) {
             prop.targetMeta.props
                 .filter(prop => prop.lazy || prop.kind !== enums_1.ReferenceKind.SCALAR)

package/enums.d.ts

@@ -85,6 +85,7 @@ export declare enum QueryFlag {
     INCLUDE_LAZY_FORMULAS = "INCLUDE_LAZY_FORMULAS",
     AUTO_JOIN_ONE_TO_ONE_OWNER = "AUTO_JOIN_ONE_TO_ONE_OWNER",
     INFER_POPULATE = "INFER_POPULATE",
+    DISABLE_NESTED_INNER_JOIN = "DISABLE_NESTED_INNER_JOIN",
     IDENTITY_INSERT = "IDENTITY_INSERT"
 }
 export declare const SCALAR_TYPES: string[];
@@ -109,7 +110,6 @@ export declare enum Cascade {
 export declare enum LoadStrategy {
     SELECT_IN = "select-in",
     JOINED = "joined",
-    INNER_JOINED = "inner-joined",
     BALANCED = "balanced"
 }
 export declare enum DataloaderType {

package/enums.js

@@ -98,6 +98,7 @@ var QueryFlag;
     QueryFlag["INCLUDE_LAZY_FORMULAS"] = "INCLUDE_LAZY_FORMULAS";
     QueryFlag["AUTO_JOIN_ONE_TO_ONE_OWNER"] = "AUTO_JOIN_ONE_TO_ONE_OWNER";
     QueryFlag["INFER_POPULATE"] = "INFER_POPULATE";
+    QueryFlag["DISABLE_NESTED_INNER_JOIN"] = "DISABLE_NESTED_INNER_JOIN";
     QueryFlag["IDENTITY_INSERT"] = "IDENTITY_INSERT";
 })(QueryFlag || (exports.QueryFlag = QueryFlag = {}));
 exports.SCALAR_TYPES = ['string', 'number', 'boolean', 'bigint', 'Date', 'Buffer', 'RegExp'];
@@ -125,7 +126,6 @@ var LoadStrategy;
 (function (LoadStrategy) {
     LoadStrategy["SELECT_IN"] = "select-in";
     LoadStrategy["JOINED"] = "joined";
-    LoadStrategy["INNER_JOINED"] = "inner-joined";
     LoadStrategy["BALANCED"] = "balanced";
 })(LoadStrategy || (exports.LoadStrategy = LoadStrategy = {}));
 var DataloaderType;

package/metadata/MetadataDiscovery.js

@@ -825,9 +825,16 @@ class MetadataDiscovery {
             }
             return prop.embedded ? isParentObject(meta.properties[prop.embedded[0]]) : false;
         };
+        const isParentArray = (prop) => {
+            if (prop.array) {
+                return true;
+            }
+            return prop.embedded ? isParentArray(meta.properties[prop.embedded[0]]) : false;
+        };
         const rootProperty = getRootProperty(embeddedProp);
         const parentProperty = meta.properties[embeddedProp.embedded?.[0] ?? ''];
         const object = isParentObject(embeddedProp);
+        const array = isParentArray(embeddedProp);
         this.initFieldName(embeddedProp, rootProperty !== embeddedProp && object);
         // the prefix of the parent cannot be a boolean; it already passed here
         const prefix = this.getPrefix(embeddedProp, parentProperty);
@@ -840,7 +847,8 @@ class MetadataDiscovery {
             meta.propertyOrder.set(name, (order += 0.01));
             embeddedProp.embeddedProps[prop.name] = meta.properties[name];
             meta.properties[name].persist ??= embeddedProp.persist;
-            if (embeddedProp.nullable) {
+            const refInArray = array && [enums_1.ReferenceKind.MANY_TO_ONE, enums_1.ReferenceKind.ONE_TO_ONE].includes(prop.kind) && prop.owner;
+            if (embeddedProp.nullable || refInArray) {
                 meta.properties[name].nullable = true;
             }
             if (meta.properties[name].fieldNames) {

package/package.json

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