@mikro-orm/knex 6.0.0-dev.202 → 6.0.0-dev.204

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.202",
+  "version": "6.0.0-dev.204",
   "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": "^5.9.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.0.0-dev.202"
+    "@mikro-orm/core": "6.0.0-dev.204"
   }
 }

package/query/CriteriaNode.d.ts

@@ -25,6 +25,7 @@ export declare class CriteriaNode<T extends object> implements ICriteriaNode<T>
     getPath(addIndex?: boolean): string;
     private isPivotJoin;
     getPivotPath(path: string): string;
+    aliased(field: string, alias?: string): string;
     /** @ignore */
     [inspect.custom](): string;
     static isCustomExpression(field: string): boolean;

package/query/CriteriaNode.js

@@ -106,6 +106,9 @@ class CriteriaNode {
     getPivotPath(path) {
         return `${path}[pivot]`;
     }
+    aliased(field, alias) {
+        return alias ? `${alias}.${field}` : field;
+    }
     /** @ignore */
     [util_1.inspect.custom]() {
         const o = {};

package/query/ObjectCriteriaNode.js

@@ -19,8 +19,13 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
         if (this.shouldAutoJoin(nestedAlias)) {
             if (keys.some(k => ['$some', '$none', '$every'].includes(k))) {
                 const $and = [];
-                const primaryKeys = this.metadata.find(this.entityName).primaryKeys.map(pk => `${alias}.${pk}`);
+                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;
+                });
                 for (const key of keys) {
+                    if (!['$some', '$none', '$every'].includes(key)) {
+                        throw new Error('Mixing collection operators with other filters is not allowed.');
+                    }
                     const payload = this.payload[key].unwrap();
                     const sub = qb.clone(true).innerJoin(this.key, qb.getNextAlias(this.prop.type));
                     sub.select(this.prop.targetMeta.primaryKeys);
@@ -101,7 +106,7 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
             if (core_1.Utils.isOperator(k, false)) {
                 const tmp = payload[k];
                 delete payload[k];
-                o[`${alias}.${field}`] = { [k]: tmp, ...(o[`${alias}.${field}`] || {}) };
+                o[this.aliased(field, alias)] = { [k]: tmp, ...(o[this.aliased(field, alias)] || {}) };
             }
             else if (this.isPrefixed(k) || core_1.Utils.isOperator(k) || !childAlias) {
                 const idx = prop.referencedPKs.indexOf(k);
@@ -114,7 +119,7 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
                 }
                 else if (core_1.Utils.isOperator(k) && Array.isArray(payload[k])) {
                     o[key] = payload[k].map((child) => Object.keys(child).reduce((o, childKey) => {
-                        const key = (this.isPrefixed(childKey) || core_1.Utils.isOperator(childKey)) ? childKey : `${childAlias}.${childKey}`;
+                        const key = (this.isPrefixed(childKey) || core_1.Utils.isOperator(childKey)) ? childKey : this.aliased(childKey, childAlias);
                         o[key] = child[childKey];
                         return o;
                     }, {}));
@@ -128,6 +133,7 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
             }
             else {
                 o[`${childAlias}.${k}`] = payload[k];
+                o[this.aliased(k, childAlias)] = payload[k];
             }
         }
     }

package/query/ScalarCriteriaNode.js

@@ -13,7 +13,7 @@ class ScalarCriteriaNode extends CriteriaNode_1.CriteriaNode {
             const path = this.getPath();
             const parentPath = this.parent.getPath(); // the parent is always there, otherwise `shouldJoin` would return `false`
             const nestedAlias = qb.getAliasForJoinPath(path) || qb.getNextAlias(this.prop?.pivotTable ?? this.entityName);
-            const field = `${options?.alias}.${this.prop.name}`;
+            const field = this.aliased(this.prop.name, options?.alias);
             const type = this.prop.kind === core_1.ReferenceKind.MANY_TO_MANY ? enums_1.JoinType.pivotJoin : enums_1.JoinType.leftJoin;
             qb.join(field, nestedAlias, undefined, type, path);
             // select the owner as virtual property when joining from 1:1 inverse side, but only if the parent is root entity