@mikro-orm/knex 6.0.0-dev.157 → 6.0.0-dev.159

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.157",
+  "version": "6.0.0-dev.159",
   "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.157"
+    "@mikro-orm/core": "6.0.0-dev.159"
   }
 }

package/query/ArrayCriteriaNode.d.ts

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

package/query/ArrayCriteriaNode.js

@@ -11,6 +11,11 @@ class ArrayCriteriaNode extends CriteriaNode_1.CriteriaNode {
             return node.process(qb, alias);
         });
     }
+    unwrap() {
+        return this.payload.map((node) => {
+            return node.unwrap();
+        });
+    }
     willAutoJoin(qb, alias) {
         return this.payload.some((node) => {
             return node.willAutoJoin(qb, alias);

package/query/CriteriaNode.d.ts

@@ -17,6 +17,7 @@ export declare class CriteriaNode<T extends object> implements ICriteriaNode<T>
     index?: number;
     constructor(metadata: MetadataStorage, entityName: string, parent?: ICriteriaNode<T> | undefined, key?: EntityKey<T> | undefined, validate?: boolean);
     process(qb: IQueryBuilder<T>, alias?: string): any;
+    unwrap(): any;
     shouldInline(payload: any): boolean;
     willAutoJoin(qb: IQueryBuilder<T>, alias?: string): boolean;
     shouldRename(payload: any): boolean;

package/query/CriteriaNode.js

@@ -40,6 +40,9 @@ class CriteriaNode {
     process(qb, alias) {
         return this.payload;
     }
+    unwrap() {
+        return this.payload;
+    }
     shouldInline(payload) {
         return false;
     }
@@ -51,7 +54,9 @@ class CriteriaNode {
         const composite = this.prop?.joinColumns ? this.prop.joinColumns.length > 1 : false;
         const customExpression = CriteriaNode.isCustomExpression(this.key);
         const scalar = payload === null || core_1.Utils.isPrimaryKey(payload) || payload instanceof RegExp || payload instanceof Date || customExpression;
-        const operator = core_1.Utils.isPlainObject(payload) && Object.keys(payload).every(k => core_1.Utils.isOperator(k, false));
+        const plainObject = core_1.Utils.isPlainObject(payload);
+        const keys = plainObject ? Object.keys(payload) : [];
+        const operator = plainObject && keys.every(k => core_1.Utils.isOperator(k, false));
         if (composite) {
             return true;
         }

package/query/ObjectCriteriaNode.d.ts

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

package/query/ObjectCriteriaNode.js

@@ -11,13 +11,34 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
     process(qb, alias) {
         const nestedAlias = qb.getAliasForJoinPath(this.getPath());
         const ownerAlias = alias || qb.alias;
+        const keys = Object.keys(this.payload);
         if (nestedAlias) {
             alias = nestedAlias;
         }
         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}`);
+                for (const key of keys) {
+                    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);
+                    if (key === '$every') {
+                        sub.where({ $not: { [this.key]: payload } });
+                    }
+                    else {
+                        sub.where({ [this.key]: payload });
+                    }
+                    const op = key === '$some' ? '$in' : '$nin';
+                    $and.push({
+                        [core_1.Utils.getPrimaryKeyHash(primaryKeys)]: { [op]: sub.getKnexQuery() },
+                    });
+                }
+                return { $and };
+            }
             alias = this.autoJoin(qb, ownerAlias);
         }
-        return Object.keys(this.payload).reduce((o, field) => {
+        return keys.reduce((o, field) => {
             const childNode = this.payload[field];
             const payload = childNode.process(qb, this.prop ? alias : ownerAlias);
             const operator = core_1.Utils.isOperator(field);
@@ -46,16 +67,23 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
             return o;
         }, {});
     }
+    unwrap() {
+        return Object.keys(this.payload).reduce((o, field) => {
+            o[field] = this.payload[field].unwrap();
+            return o;
+        }, {});
+    }
     willAutoJoin(qb, alias) {
         const nestedAlias = qb.getAliasForJoinPath(this.getPath());
         const ownerAlias = alias || qb.alias;
+        const keys = Object.keys(this.payload);
         if (nestedAlias) {
             alias = nestedAlias;
         }
         if (this.shouldAutoJoin(nestedAlias)) {
-            return true;
+            return !keys.some(k => ['$some', '$none', '$every'].includes(k));
         }
-        return Object.keys(this.payload).some(field => {
+        return keys.some(field => {
             const childNode = this.payload[field];
             return childNode.willAutoJoin(qb, this.prop ? alias : ownerAlias);
         });
@@ -76,7 +104,8 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
             }
             else if (this.isPrefixed(k) || core_1.Utils.isOperator(k) || !childAlias) {
                 const idx = prop.referencedPKs.indexOf(k);
-                const key = idx !== -1 && !childAlias ? prop.joinColumns[idx] : k;
+                // FIXME maybe other kinds should be supported too?
+                const key = idx !== -1 && !childAlias && ![core_1.ReferenceKind.ONE_TO_MANY, core_1.ReferenceKind.MANY_TO_MANY].includes(prop.kind) ? prop.joinColumns[idx] : k;
                 if (key in o) {
                     const $and = o.$and ?? [];
                     $and.push({ [key]: o[key] }, { [key]: payload[k] });
@@ -85,9 +114,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 : `${childAlias}.${childKey}`;
                         o[key] = child[childKey];
                         return o;
                     }, {}));

package/query/QueryBuilder.d.ts

@@ -217,7 +217,7 @@ export declare class QueryBuilder<T extends object = AnyEntity> {
      * You can provide `EntityName.propName` as alias, then the field name will be used based on the metadata
      */
     as(alias: string): Knex.QueryBuilder;
-    clone(): QueryBuilder<T>;
+    clone(reset?: boolean): QueryBuilder<T>;
     getKnex(): Knex.QueryBuilder;
     private joinReference;
     private prepareFields;

package/query/QueryBuilder.js

@@ -663,8 +663,11 @@ class QueryBuilder {
         Object.defineProperty(ret, '__as', { enumerable: false, value: alias });
         return ret;
     }
-    clone() {
+    clone(reset) {
         const qb = new QueryBuilder(this.mainAlias.entityName, this.metadata, this.driver, this.context, this.mainAlias.aliasName, this.connectionType, this.em);
+        if (reset) {
+            return qb;
+        }
         Object.assign(qb, this);
         // clone array/object properties
         const properties = [

package/typings.d.ts

@@ -126,6 +126,7 @@ export interface IQueryBuilder<T> {
     truncate(): this;
     count(field?: string | string[], distinct?: boolean): this;
     join(field: string, alias: string, cond?: QBFilterQuery, type?: JoinType, path?: string): this;
+    innerJoin(field: string, alias: string, cond?: QBFilterQuery): this;
     leftJoin(field: string, alias: string, cond?: QBFilterQuery): this;
     joinAndSelect(field: string, alias: string, cond?: QBFilterQuery): this;
     leftJoinAndSelect(field: string, alias: string, cond?: QBFilterQuery, fields?: string[]): this;
@@ -142,6 +143,7 @@ export interface IQueryBuilder<T> {
     having(cond?: QBFilterQuery | string, params?: any[]): this;
     getAliasForJoinPath(path: string): string | undefined;
     getNextAlias(entityName?: string): string;
+    clone(reset?: boolean): IQueryBuilder<T>;
 }
 export interface ICriteriaNode<T extends object> {
     readonly entityName: string;