@mikro-orm/knex 6.3.9-dev.2 → 6.3.9-dev.3

package/AbstractSqlDriver.js

@@ -44,7 +44,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         qb.__populateWhere = options._populateWhere;
         qb.select(fields)
             // only add populateWhere if we are populate-joining, as this will be used to add `on` conditions
-            .populate(populate, joinedProps.length > 0 ? populateWhere : undefined)
+            .populate(populate, joinedProps.length > 0 ? populateWhere : undefined, joinedProps.length > 0 ? options.populateFilter : undefined)
             .where(where)
             .groupBy(options.groupBy)
             .having(options.having)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.3.9-dev.2",
+  "version": "6.3.9-dev.3",
   "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",
@@ -66,7 +66,7 @@
     "@mikro-orm/core": "^6.3.8"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.9-dev.2",
+    "@mikro-orm/core": "6.3.9-dev.3",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/QueryBuilder.d.ts

@@ -69,6 +69,8 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
     /** @internal */
     _populateWhere?: ObjectQuery<Entity> | PopulateHint | `${PopulateHint}`;
     /** @internal */
+    _populateFilter?: ObjectQuery<Entity> | PopulateHint | `${PopulateHint}`;
+    /** @internal */
     __populateWhere?: ObjectQuery<Entity> | PopulateHint | `${PopulateHint}`;
     /** @internal */
     _populateMap: Dictionary<string>;
@@ -161,7 +163,7 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
     /**
      * @internal
      */
-    populate(populate: PopulateOptions<Entity>[], populateWhere?: ObjectQuery<Entity> | PopulateHint | `${PopulateHint}`): this;
+    populate(populate: PopulateOptions<Entity>[], populateWhere?: ObjectQuery<Entity> | PopulateHint | `${PopulateHint}`, populateFilter?: ObjectQuery<Entity> | PopulateHint | `${PopulateHint}`): this;
     limit(limit?: number, offset?: number): SelectQueryBuilder<Entity, RootAlias, Hint, Context>;
     offset(offset?: number): SelectQueryBuilder<Entity, RootAlias, Hint, Context>;
     withSchema(schema?: string): this;
@@ -281,6 +283,7 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
     private applyDiscriminatorCondition;
     private finalize;
     private processPopulateWhere;
+    private mergeOnConditions;
     private hasToManyJoins;
     protected wrapPaginateSubQuery(meta: EntityMetadata): void;
     private wrapModifySubQuery;

package/query/QueryBuilder.js

@@ -52,6 +52,8 @@ class QueryBuilder {
     /** @internal */
     _populateWhere;
     /** @internal */
+    _populateFilter;
+    /** @internal */
     __populateWhere;
     /** @internal */
     _populateMap = {};
@@ -393,10 +395,11 @@ class QueryBuilder {
     /**
      * @internal
      */
-    populate(populate, populateWhere) {
+    populate(populate, populateWhere, populateFilter) {
         this.ensureNotFinalized();
         this._populate = populate;
         this._populateWhere = populateWhere;
+        this._populateFilter = populateFilter;
         return this;
     }
     limit(limit, offset = 0) {
@@ -782,7 +785,7 @@ class QueryBuilder {
         reset = reset || [];
         // clone array/object properties
         const properties = [
-            'flags', '_populate', '_populateWhere', '__populateWhere', '_populateMap', '_joins', '_joinedProps', '_cond', '_data', '_orderBy',
+            'flags', '_populate', '_populateWhere', '_populateFilter', '__populateWhere', '_populateMap', '_joins', '_joinedProps', '_cond', '_data', '_orderBy',
             '_schema', '_indexHint', '_cache', 'subQueries', 'lockMode', 'lockTables', '_groupBy', '_having', '_returning',
             '_comments', '_hintComments', 'rawFragments', 'aliasCounter',
         ];
@@ -1141,7 +1144,8 @@ class QueryBuilder {
             }))
                 .forEach(field => this._fields.push((0, core_1.raw)(field)));
         }
-        this.processPopulateWhere();
+        this.processPopulateWhere(false);
+        this.processPopulateWhere(true);
         core_1.QueryHelper.processObjectParams(this._data);
         core_1.QueryHelper.processObjectParams(this._cond);
         core_1.QueryHelper.processObjectParams(this._having);
@@ -1157,55 +1161,59 @@ class QueryBuilder {
         }
         this.finalized = true;
     }
-    processPopulateWhere() {
-        if (this._populateWhere == null || this._populateWhere === core_1.PopulateHint.ALL) {
+    processPopulateWhere(filter) {
+        const key = filter ? '_populateFilter' : '_populateWhere';
+        if (this[key] == null || this[key] === core_1.PopulateHint.ALL) {
             return;
         }
         let joins = Object.values(this._joins);
-        joins.forEach(join => {
-            join.cond_ = join.cond;
-            join.cond = {};
-        });
-        const replaceOnConditions = (cond, op) => {
-            Object.keys(cond).forEach(k => {
-                if (core_1.Utils.isOperator(k)) {
-                    if (Array.isArray(cond[k])) {
-                        return cond[k].forEach((c) => replaceOnConditions(c, k));
-                    }
+        for (const join of joins) {
+            join.cond_ ??= join.cond;
+            // join.cond = {};
+            join.cond = filter ? { ...join.cond } : {};
+        }
+        if (typeof this[key] === 'object') {
+            const cond = CriteriaNodeFactory_1.CriteriaNodeFactory
+                .createNode(this.metadata, this.mainAlias.entityName, this[key])
+                .process(this, { matchPopulateJoins: true, ignoreBranching: true, preferNoBranch: true });
+            // there might be new joins created by processing the `populateWhere` object
+            joins = Object.values(this._joins);
+            this.mergeOnConditions(joins, cond, filter);
+        }
+    }
+    mergeOnConditions(joins, cond, filter, op) {
+        for (const k of Object.keys(cond)) {
+            if (core_1.Utils.isOperator(k)) {
+                if (Array.isArray(cond[k])) {
+                    cond[k].forEach((c) => this.mergeOnConditions(joins, c, filter, k));
+                }
+                /* istanbul ignore next */
+                this.mergeOnConditions(joins, cond[k], filter, k);
+            }
+            const [alias] = this.helper.splitField(k);
+            const join = joins.find(j => j.alias === alias);
+            if (join) {
+                const parentJoin = joins.find(j => j.alias === join.ownerAlias);
+                // https://stackoverflow.com/a/56815807/3665878
+                if (parentJoin && !filter) {
+                    const nested = (parentJoin.nested ??= new Set());
+                    join.type = join.type === enums_1.JoinType.innerJoin || ([core_1.ReferenceKind.ONE_TO_MANY, core_1.ReferenceKind.MANY_TO_MANY].includes(parentJoin.prop.kind))
+                        ? enums_1.JoinType.nestedInnerJoin
+                        : enums_1.JoinType.nestedLeftJoin;
+                    nested.add(join);
+                }
+                if (join.cond[k]) {
                     /* istanbul ignore next */
-                    return replaceOnConditions(cond[k], k);
+                    join.cond = { [op ?? '$and']: [join.cond, { [k]: cond[k] }] };
                 }
-                const [alias] = this.helper.splitField(k);
-                const join = joins.find(j => j.alias === alias);
-                if (join) {
-                    const parentJoin = joins.find(j => j.alias === join.ownerAlias);
-                    // https://stackoverflow.com/a/56815807/3665878
-                    if (parentJoin) {
-                        const nested = (parentJoin.nested ??= new Set());
-                        join.type = join.type === enums_1.JoinType.innerJoin || [core_1.ReferenceKind.ONE_TO_MANY, core_1.ReferenceKind.MANY_TO_MANY].includes(parentJoin.prop.kind)
-                            ? enums_1.JoinType.nestedInnerJoin
-                            : enums_1.JoinType.nestedLeftJoin;
-                        nested.add(join);
-                    }
-                    if (join.cond[k]) {
-                        join.cond = { [op ?? '$and']: [join.cond, { [k]: cond[k] }] };
-                    }
-                    else if (op === '$or') {
-                        join.cond.$or ??= [];
-                        join.cond.$or.push({ [k]: cond[k] });
-                    }
-                    else {
-                        join.cond = { ...join.cond, [k]: cond[k] };
-                    }
+                else if (op === '$or') {
+                    join.cond.$or ??= [];
+                    join.cond.$or.push({ [k]: cond[k] });
                 }
-            });
-        };
-        if (typeof this._populateWhere === 'object') {
-            const cond = CriteriaNodeFactory_1.CriteriaNodeFactory
-                .createNode(this.metadata, this.mainAlias.entityName, this._populateWhere)
-                .process(this, { matchPopulateJoins: true, ignoreBranching: true, preferNoBranch: true });
-            joins = Object.values(this._joins); // there might be new joins created by processing the `populateWhere` object
-            replaceOnConditions(cond);
+                else {
+                    join.cond = { ...join.cond, [k]: cond[k] };
+                }
+            }
         }
     }
     hasToManyJoins() {