@mikro-orm/core 7.2.1-dev.13 → 7.2.1-dev.15

package/EntityManager.js

@@ -489,7 +489,8 @@ export class EntityManager {
             return userFilter;
         }
         const ret = {};
-        for (const hint of options.populate) {
+        const populate = options.populate;
+        for (const hint of populate) {
             const field = hint.field.split(':')[0];
             const prop = meta.properties[field];
             const strategy = getLoadingStrategy(prop.strategy || hint.strategy || options.strategy || this.config.get('loadStrategy'), prop.kind);
@@ -533,6 +534,16 @@ export class EntityManager {
         if (userFilter) {
             Utils.merge(ret, userFilter);
         }
+        for (const hint of populate) {
+            const [field, ref] = hint.field.split(':');
+            // Filtered M:N refs need the target join and its PKs (unless a plain hint for the field already provides them).
+            if (ref &&
+                meta.properties[field].kind === ReferenceKind.MANY_TO_MANY &&
+                ret[field] &&
+                !populate.some(other => other.field === field)) {
+                hint.filter = true;
+            }
+        }
         return Utils.hasObjectKeys(ret) ? ret : undefined;
     }
     /**

package/package.json

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

@@ -153,7 +153,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.2.1-dev.13';
+    static #ORM_VERSION = '7.2.1-dev.15';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;