@mikro-orm/knex 6.1.7-dev.0 → 6.1.7-dev.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.1.7-dev.0",
+  "version": "6.1.7-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",
@@ -66,6 +66,6 @@
     "@mikro-orm/core": "^6.1.6"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.1.7-dev.0"
+    "@mikro-orm/core": "6.1.7-dev.2"
   }
 }

package/query/ArrayCriteriaNode.d.ts

@@ -6,5 +6,5 @@ import type { IQueryBuilder, ICriteriaNodeProcessOptions } from '../typings';
 export declare class ArrayCriteriaNode<T extends object> extends CriteriaNode<T> {
     process(qb: IQueryBuilder<T>, options?: ICriteriaNodeProcessOptions): any;
     unwrap(): any;
-    willAutoJoin(qb: IQueryBuilder<T>, alias?: string): any;
+    willAutoJoin(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): any;
 }

package/query/ArrayCriteriaNode.js

@@ -16,9 +16,9 @@ class ArrayCriteriaNode extends CriteriaNode_1.CriteriaNode {
             return node.unwrap();
         });
     }
-    willAutoJoin(qb, alias) {
+    willAutoJoin(qb, alias, options) {
         return this.payload.some((node) => {
-            return node.willAutoJoin(qb, alias);
+            return node.willAutoJoin(qb, alias, options);
         });
     }
 }

package/query/CriteriaNode.d.ts

@@ -19,7 +19,7 @@ export declare class CriteriaNode<T extends object> implements ICriteriaNode<T>
     process(qb: IQueryBuilder<T>, options?: ICriteriaNodeProcessOptions): any;
     unwrap(): any;
     shouldInline(payload: any): boolean;
-    willAutoJoin(qb: IQueryBuilder<T>, alias?: string): boolean;
+    willAutoJoin(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): boolean;
     shouldRename(payload: any): boolean;
     renameFieldToPK<T>(qb: IQueryBuilder<T>): string;
     getPath(addIndex?: boolean): string;

package/query/CriteriaNode.js

@@ -46,7 +46,7 @@ class CriteriaNode {
     shouldInline(payload) {
         return false;
     }
-    willAutoJoin(qb, alias) {
+    willAutoJoin(qb, alias, options) {
         return false;
     }
     shouldRename(payload) {

package/query/ObjectCriteriaNode.d.ts

@@ -6,7 +6,7 @@ import type { ICriteriaNodeProcessOptions, IQueryBuilder } from '../typings';
 export declare class ObjectCriteriaNode<T extends object> extends CriteriaNode<T> {
     process(qb: IQueryBuilder<T>, options?: ICriteriaNodeProcessOptions): any;
     unwrap(): any;
-    willAutoJoin(qb: IQueryBuilder<T>, alias?: string): boolean;
+    willAutoJoin(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): boolean;
     shouldInline(payload: any): boolean;
     private inlineChildPayload;
     private shouldAutoJoin;

package/query/ObjectCriteriaNode.js

@@ -18,9 +18,18 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
         }
         if (this.shouldAutoJoin(qb, nestedAlias)) {
             if (keys.some(k => ['$some', '$none', '$every'].includes(k))) {
+                if (![core_1.ReferenceKind.MANY_TO_MANY, core_1.ReferenceKind.ONE_TO_MANY].includes(this.prop.kind)) {
+                    // ignore collection operators when used on a non-relational property - this can happen when they get into
+                    // populateWhere via `infer` on m:n properties with select-in strategy
+                    if (this.parent?.parent) { // we validate only usage on top level
+                        return {};
+                    }
+                    throw new Error(`Collection operators can be used only inside a collection property context, but it was used for ${this.getPath()}.`);
+                }
                 const $and = [];
+                const knownKey = [core_1.ReferenceKind.SCALAR, core_1.ReferenceKind.MANY_TO_ONE, core_1.ReferenceKind.EMBEDDED].includes(this.prop.kind) || (this.prop.kind === core_1.ReferenceKind.ONE_TO_ONE && this.prop.owner);
                 const primaryKeys = this.metadata.find(this.entityName).primaryKeys.map(pk => {
-                    return [enums_1.QueryType.SELECT, enums_1.QueryType.COUNT].includes(qb.type) ? `${alias}.${pk}` : pk;
+                    return [enums_1.QueryType.SELECT, enums_1.QueryType.COUNT].includes(qb.type) ? `${knownKey ? alias : ownerAlias}.${pk}` : pk;
                 });
                 for (const key of keys) {
                     if (!['$some', '$none', '$every'].includes(key)) {
@@ -82,8 +91,8 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
             return o;
         }, {});
     }
-    willAutoJoin(qb, alias) {
-        const nestedAlias = qb.getAliasForJoinPath(this.getPath());
+    willAutoJoin(qb, alias, options) {
+        const nestedAlias = qb.getAliasForJoinPath(this.getPath(), options);
         const ownerAlias = alias || qb.alias;
         const keys = Object.keys(this.payload);
         if (nestedAlias) {
@@ -94,7 +103,7 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
         }
         return keys.some(field => {
             const childNode = this.payload[field];
-            return childNode.willAutoJoin(qb, this.prop ? alias : ownerAlias);
+            return childNode.willAutoJoin(qb, this.prop ? alias : ownerAlias, options);
         });
     }
     shouldInline(payload) {
@@ -148,6 +157,9 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
         if (keys.every(k => k.includes('.') && k.startsWith(`${qb.alias}.`))) {
             return false;
         }
+        if (keys.some(k => ['$some', '$none', '$every'].includes(k))) {
+            return true;
+        }
         const meta = this.metadata.find(this.entityName);
         const embeddable = this.prop.kind === core_1.ReferenceKind.EMBEDDED;
         const knownKey = [core_1.ReferenceKind.SCALAR, core_1.ReferenceKind.MANY_TO_ONE, core_1.ReferenceKind.EMBEDDED].includes(this.prop.kind) || (this.prop.kind === core_1.ReferenceKind.ONE_TO_ONE && this.prop.owner);

package/query/QueryBuilder.js

@@ -267,7 +267,7 @@ class QueryBuilder {
         const topLevel = !op || !core_1.Utils.hasObjectKeys(this._cond);
         const criteriaNode = CriteriaNodeFactory_1.CriteriaNodeFactory.createNode(this.metadata, this.mainAlias.entityName, cond);
         const ignoreBranching = this.__populateWhere === 'infer';
-        if ([enums_1.QueryType.UPDATE, enums_1.QueryType.DELETE].includes(this.type) && criteriaNode.willAutoJoin(this)) {
+        if ([enums_1.QueryType.UPDATE, enums_1.QueryType.DELETE].includes(this.type) && criteriaNode.willAutoJoin(this, undefined, { ignoreBranching })) {
             // use sub-query to support joining
             this.setFlag(this.type === enums_1.QueryType.UPDATE ? core_1.QueryFlag.UPDATE_SUB_QUERY : core_1.QueryFlag.DELETE_SUB_QUERY);
             this.select(this.mainAlias.metadata.primaryKeys, true);

package/query/QueryBuilderHelper.js

@@ -427,7 +427,7 @@ class QueryBuilderHelper {
         const op = Object.keys(core_1.QueryOperator).find(op => op in value);
         /* istanbul ignore next */
         if (!op) {
-            throw new Error(`Invalid query condition: ${(0, util_1.inspect)(cond)}`);
+            throw new Error(`Invalid query condition: ${(0, util_1.inspect)(cond, { depth: 5 })}`);
         }
         const replacement = this.getOperatorReplacement(op, value);
         const fields = core_1.Utils.splitPrimaryKeys(key);

package/query/ScalarCriteriaNode.d.ts

@@ -5,6 +5,6 @@ import type { IQueryBuilder, ICriteriaNodeProcessOptions } from '../typings';
  */
 export declare class ScalarCriteriaNode<T extends object> extends CriteriaNode<T> {
     process(qb: IQueryBuilder<T>, options?: ICriteriaNodeProcessOptions): any;
-    willAutoJoin<T>(qb: IQueryBuilder<T>, alias?: string): boolean;
+    willAutoJoin<T>(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): boolean;
     shouldJoin(): boolean;
 }

package/query/ScalarCriteriaNode.js

@@ -29,7 +29,7 @@ class ScalarCriteriaNode extends CriteriaNode_1.CriteriaNode {
         }
         return this.payload;
     }
-    willAutoJoin(qb, alias) {
+    willAutoJoin(qb, alias, options) {
         return this.shouldJoin();
     }
     shouldJoin() {

package/typings.d.ts

@@ -165,7 +165,7 @@ export interface ICriteriaNode<T extends object> {
     index?: number;
     process(qb: IQueryBuilder<T>, options?: ICriteriaNodeProcessOptions): any;
     shouldInline(payload: any): boolean;
-    willAutoJoin(qb: IQueryBuilder<T>, alias?: string): boolean;
+    willAutoJoin(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): boolean;
     shouldRename(payload: any): boolean;
     renameFieldToPK<T>(qb: IQueryBuilder<T>): string;
     getPath(addIndex?: boolean): string;