@mikro-orm/knex 6.1.11-dev.7 → 6.1.11-dev.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.1.11-dev.7",
+  "version": "6.1.11-dev.8",
   "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.10"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.1.11-dev.7"
+    "@mikro-orm/core": "6.1.11-dev.8"
   }
 }

package/query/CriteriaNode.js

@@ -27,14 +27,14 @@ class CriteriaNode {
             if (pks.length > 1) {
                 return;
             }
-            pks.forEach(k => {
+            for (const k of pks) {
                 this.prop = meta.props.find(prop => prop.name === k || (prop.fieldNames?.length === 1 && prop.fieldNames[0] === k));
                 const isProp = this.prop || meta.props.find(prop => (prop.fieldNames || []).includes(k));
                 // do not validate if the key is prefixed or type casted (e.g. `k::text`)
                 if (validate && !isProp && !k.includes('.') && !k.includes('::') && !core_1.Utils.isOperator(k) && !core_1.RawQueryFragment.isKnownFragment(k)) {
                     throw new Error(`Trying to query by not existing property ${entityName}.${k}`);
                 }
-            });
+            }
         }
     }
     process(qb, options) {

package/query/ObjectCriteriaNode.d.ts

@@ -8,7 +8,10 @@ export declare class ObjectCriteriaNode<T extends object> extends CriteriaNode<T
     unwrap(): any;
     willAutoJoin(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): boolean;
     shouldInline(payload: any): boolean;
+    private getChildKey;
+    private inlineArrayChildPayload;
     private inlineChildPayload;
+    private inlineCondition;
     private shouldAutoJoin;
     private autoJoin;
     private isPrefixed;

package/query/ObjectCriteriaNode.js

@@ -112,6 +112,24 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
         const operator = core_1.Utils.isObject(payload) && Object.keys(payload).every(k => core_1.Utils.isOperator(k, false));
         return !!this.prop && this.prop.kind !== core_1.ReferenceKind.SCALAR && !scalar && !operator;
     }
+    getChildKey(k, prop, childAlias) {
+        const idx = prop.referencedPKs.indexOf(k);
+        return idx !== -1 && !childAlias && ![core_1.ReferenceKind.ONE_TO_MANY, core_1.ReferenceKind.MANY_TO_MANY].includes(prop.kind) ? prop.joinColumns[idx] : k;
+    }
+    inlineArrayChildPayload(obj, payload, k, prop, childAlias) {
+        const key = this.getChildKey(k, prop, childAlias);
+        const value = payload.map((child) => Object.keys(child).reduce((inner, childKey) => {
+            if (core_1.Utils.isGroupOperator(childKey) && Array.isArray(child[childKey])) {
+                this.inlineArrayChildPayload(child, child[childKey], childKey, prop, childAlias);
+            }
+            else {
+                const key = (this.isPrefixed(childKey) || core_1.Utils.isOperator(childKey)) ? childKey : this.aliased(childKey, childAlias);
+                inner[key] = child[childKey];
+            }
+            return inner;
+        }, {}));
+        this.inlineCondition(key, obj, value);
+    }
     inlineChildPayload(o, payload, field, alias, childAlias) {
         const prop = this.metadata.find(this.entityName).properties[field];
         for (const k of Object.keys(payload)) {
@@ -120,25 +138,12 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
                 delete payload[k];
                 o[this.aliased(field, alias)] = { [k]: tmp, ...o[this.aliased(field, alias)] };
             }
+            else if (core_1.Utils.isGroupOperator(k) && Array.isArray(payload[k])) {
+                this.inlineArrayChildPayload(o, payload[k], k, prop, childAlias);
+            }
             else if (this.isPrefixed(k) || core_1.Utils.isOperator(k) || !childAlias) {
-                const idx = prop.referencedPKs.indexOf(k);
-                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] });
-                    delete o[key];
-                    o.$and = $and;
-                }
-                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 : this.aliased(childKey, childAlias);
-                        o[key] = child[childKey];
-                        return o;
-                    }, {}));
-                }
-                else {
-                    o[key] = payload[k];
-                }
+                const key = this.getChildKey(k, prop, childAlias);
+                this.inlineCondition(key, o, payload[k]);
             }
             else if (core_1.RawQueryFragment.isKnownFragment(k)) {
                 o[k] = payload[k];
@@ -149,6 +154,17 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
             }
         }
     }
+    inlineCondition(key, o, value) {
+        if (key in o) {
+            const $and = o.$and ?? [];
+            $and.push({ [key]: o[key] }, { [key]: value });
+            delete o[key];
+            o.$and = $and;
+        }
+        else {
+            o[key] = value;
+        }
+    }
     shouldAutoJoin(qb, nestedAlias) {
         if (!this.prop || !this.parent) {
             return false;