@mikro-orm/knex 6.4.8-dev.5 → 6.4.8-dev.7

package/AbstractSqlDriver.js

@@ -65,6 +65,9 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         if (options.lockMode) {
             qb.setLockMode(options.lockMode, options.lockTableAliases);
         }
+        if (options.em) {
+            await qb.applyJoinedFilters(options.em, options.filters);
+        }
         const result = await this.rethrow(qb.execute('all'));
         if (isCursorPagination && !first && !!last) {
             result.reverse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.4.8-dev.5",
+  "version": "6.4.8-dev.7",
   "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.4.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.8-dev.5",
+    "@mikro-orm/core": "6.4.8-dev.7",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/ObjectCriteriaNode.js

@@ -203,16 +203,18 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
         const operator = core_1.Utils.isPlainObject(this.payload) && Object.keys(this.payload).every(k => core_1.Utils.isOperator(k, false));
         const field = `${alias}.${this.prop.name}`;
         const method = qb.hasFlag(core_1.QueryFlag.INFER_POPULATE) ? 'joinAndSelect' : 'join';
+        const path = this.getPath();
         if (this.prop.kind === core_1.ReferenceKind.MANY_TO_MANY && (scalar || operator)) {
-            qb.join(field, nestedAlias, undefined, enums_1.JoinType.pivotJoin, this.getPath());
+            qb.join(field, nestedAlias, undefined, enums_1.JoinType.pivotJoin, path);
         }
         else {
             const prev = qb._fields?.slice();
-            qb[method](field, nestedAlias, undefined, enums_1.JoinType.leftJoin, this.getPath());
+            qb[method](field, nestedAlias, undefined, enums_1.JoinType.leftJoin, path);
             if (!qb.hasFlag(core_1.QueryFlag.INFER_POPULATE)) {
                 qb._fields = prev;
             }
         }
+        qb.scheduleFilterCheck(path);
         return nestedAlias;
     }
     isPrefixed(field) {

package/query/QueryBuilder.d.ts

@@ -1,6 +1,6 @@
 import { inspect } from 'node:util';
 import type { Knex } from 'knex';
-import { type AnyEntity, type ConnectionType, type Dictionary, type EntityData, type EntityKey, type EntityMetadata, type EntityName, type EntityProperty, type ExpandProperty, type FlushMode, type GroupOperator, type Loaded, LockMode, type LoggingOptions, type MetadataStorage, type ObjectQuery, PopulateHint, type PopulateOptions, type QBFilterQuery, type QBQueryOrderMap, QueryFlag, type QueryOrderMap, type QueryResult, RawQueryFragment, type RequiredEntityData } from '@mikro-orm/core';
+import { type AnyEntity, type ConnectionType, type Dictionary, type EntityData, type EntityKey, type EntityManager, type EntityMetadata, type EntityName, type EntityProperty, type ExpandProperty, type FlushMode, type GroupOperator, type Loaded, LockMode, type LoggingOptions, type MetadataStorage, type ObjectQuery, PopulateHint, type PopulateOptions, type QBFilterQuery, type QBQueryOrderMap, QueryFlag, type QueryOrderMap, type QueryResult, RawQueryFragment, type RequiredEntityData } from '@mikro-orm/core';
 import { JoinType, QueryType } from './enums';
 import type { AbstractSqlDriver } from '../AbstractSqlDriver';
 import { type Alias, QueryBuilderHelper } from './QueryBuilderHelper';
@@ -148,6 +148,15 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
      * Apply filters to the QB where condition.
      */
     applyFilters(filterOptions?: Dictionary<boolean | Dictionary> | string[] | boolean): Promise<void>;
+    private readonly autoJoinedPaths;
+    /**
+     * @internal
+     */
+    scheduleFilterCheck(path: string): void;
+    /**
+     * @internal
+     */
+    applyJoinedFilters(em: EntityManager, filterOptions?: Dictionary<boolean | Dictionary> | string[] | boolean): Promise<void>;
     withSubQuery(subQuery: Knex.QueryBuilder, alias: string): this;
     where(cond: QBFilterQuery<Entity>, operator?: keyof typeof GroupOperator): this;
     where(cond: string, params?: any[], operator?: keyof typeof GroupOperator): this;

package/query/QueryBuilder.js

@@ -267,6 +267,34 @@ class QueryBuilder {
         const cond = await this.em.applyFilters(this.mainAlias.entityName, {}, filterOptions, 'read');
         this.andWhere(cond);
     }
+    autoJoinedPaths = [];
+    /**
+     * @internal
+     */
+    scheduleFilterCheck(path) {
+        this.autoJoinedPaths.push(path);
+    }
+    /**
+     * @internal
+     */
+    async applyJoinedFilters(em, filterOptions = {}) {
+        for (const path of this.autoJoinedPaths) {
+            const join = this.getJoinForPath(path);
+            if (join.type === enums_1.JoinType.pivotJoin) {
+                continue;
+            }
+            const cond = await em.applyFilters(join.prop.type, join.cond, filterOptions, 'read');
+            if (core_1.Utils.hasObjectKeys(cond)) {
+                if (core_1.Utils.hasObjectKeys(join.cond)) {
+                    /* istanbul ignore next */
+                    join.cond = { $and: [join.cond, cond] };
+                }
+                else {
+                    join.cond = { ...cond };
+                }
+            }
+        }
+    }
     withSubQuery(subQuery, alias) {
         this.ensureNotFinalized();
         this.subQueries[alias] = subQuery.toString();
@@ -1197,7 +1225,7 @@ class QueryBuilder {
         let joins = Object.values(this._joins);
         for (const join of joins) {
             join.cond_ ??= join.cond;
-            join.cond = filter ? { ...join.cond } : {};
+            join.cond = { ...join.cond };
         }
         if (typeof this[key] === 'object') {
             const cond = CriteriaNodeFactory_1.CriteriaNodeFactory

package/typings.d.ts

@@ -163,6 +163,7 @@ export interface IQueryBuilder<T> {
     setFlag(flag: QueryFlag): this;
     unsetFlag(flag: QueryFlag): this;
     hasFlag(flag: QueryFlag): boolean;
+    scheduleFilterCheck(path: string): void;
 }
 export interface ICriteriaNodeProcessOptions {
     alias?: string;