@mikro-orm/knex 6.0.0-dev.178 → 6.0.0-dev.179

package/package.json

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

package/query/CriteriaNodeFactory.js

@@ -57,15 +57,25 @@ class CriteriaNodeFactory {
             }, {});
             return this.createNode(metadata, entityName, map, node, key);
         }
-        const operator = Object.keys(payload[key]).some(f => core_1.Utils.isOperator(f));
+        // array operators can be used on embedded properties
+        const allowedOperators = ['$contains', '$contained', '$overlap'];
+        const operator = Object.keys(payload[key]).some(f => core_1.Utils.isOperator(f) && !allowedOperators.includes(f));
         if (operator) {
             throw core_1.ValidationError.cannotUseOperatorsInsideEmbeddables(entityName, prop.name, payload);
         }
         const map = Object.keys(payload[key]).reduce((oo, k) => {
-            if (!prop.embeddedProps[k]) {
+            if (!prop.embeddedProps[k] && !allowedOperators.includes(k)) {
                 throw core_1.ValidationError.invalidEmbeddableQuery(entityName, k, prop.type);
             }
-            oo[prop.embeddedProps[k].name] = payload[key][k];
+            if (prop.embeddedProps[k]) {
+                oo[prop.embeddedProps[k].name] = payload[key][k];
+            }
+            else if (typeof payload[key][k] === 'object') {
+                oo[k] = JSON.stringify(payload[key][k]);
+            }
+            else {
+                oo[k] = payload[key][k];
+            }
             return oo;
         }, {});
         return this.createNode(metadata, entityName, map, node, key);

package/query/ObjectCriteriaNode.js

@@ -104,7 +104,6 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
             }
             else if (this.isPrefixed(k) || core_1.Utils.isOperator(k) || !childAlias) {
                 const idx = prop.referencedPKs.indexOf(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 ?? [];