@mikro-orm/knex 6.6.8-dev.4 → 6.6.8-dev.6

package/package.json

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

package/query/ObjectCriteriaNode.js

@@ -137,7 +137,13 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
     shouldInline(payload) {
         const customExpression = core_1.RawQueryFragment.isKnownFragment(this.key);
         const scalar = core_1.Utils.isPrimaryKey(payload) || payload instanceof RegExp || payload instanceof Date || customExpression;
-        const operator = core_1.Utils.isObject(payload) && Object.keys(payload).every(k => core_1.Utils.isOperator(k, false));
+        const operator = core_1.Utils.isObject(payload) && Object.keys(payload).every(k => {
+            if (k === '$not' && core_1.Utils.isPlainObject(payload[k])) {
+                // $not wrapping non-operator conditions (entity props) should be inlined
+                return Object.keys(payload[k]).every(ik => core_1.Utils.isOperator(ik, false));
+            }
+            return core_1.Utils.isOperator(k, false);
+        });
         return !!this.prop && this.prop.kind !== core_1.ReferenceKind.SCALAR && !scalar && !operator;
     }
     getChildKey(k, prop, childAlias, alias) {
@@ -158,7 +164,11 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
     inlineChildPayload(o, payload, field, alias, childAlias) {
         const prop = this.metadata.find(this.entityName).properties[field];
         for (const k of Object.keys(payload)) {
-            if (core_1.Utils.isOperator(k, false)) {
+            if (k === '$not' && core_1.Utils.isPlainObject(payload[k]) && Object.keys(payload[k]).some(ik => !core_1.Utils.isOperator(ik, false))) {
+                // $not wraps entity conditions (from auto-join), inline at current level
+                this.inlineCondition(k, o, payload[k]);
+            }
+            else if (core_1.Utils.isOperator(k, false)) {
                 const tmp = payload[k];
                 delete payload[k];
                 o[this.aliased(field, alias)] = { [k]: tmp, ...o[this.aliased(field, alias)] };
@@ -207,7 +217,17 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
         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);
-        const operatorKeys = knownKey && keys.every(key => core_1.Utils.isOperator(key, false));
+        const operatorKeys = knownKey && keys.every(key => {
+            if (key === '$not') {
+                // $not wraps conditions like $and/$or, check if it wraps entity property conditions (needs auto-join)
+                // vs simple operator conditions on the FK (doesn't need auto-join)
+                const childPayload = this.payload[key].payload;
+                if (core_1.Utils.isPlainObject(childPayload)) {
+                    return Object.keys(childPayload).every(k => core_1.Utils.isOperator(k, false));
+                }
+            }
+            return core_1.Utils.isOperator(key, false);
+        });
         const primaryKeys = knownKey && keys.every(key => {
             if (!meta.primaryKeys.includes(key)) {
                 return false;