@mikro-orm/core 7.2.2-dev.13 → 7.2.2-dev.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.2.2-dev.13",
+  "version": "7.2.2-dev.14",
   "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.",
   "keywords": [
     "data-mapper",

package/utils/QueryHelper.js

@@ -111,9 +111,17 @@ export class QueryHelper {
             const op = this.liftGroupOperators(value, prop.targetMeta, metadata, k);
             if (op) {
                 delete where[k];
-                where[op] = value[op].map((v) => {
+                const group = value[op].map((v) => {
                     return { [k]: v };
                 });
+                if (op in where) {
+                    // Sibling groups are conjunctive, even when both use `$or`.
+                    where.$and ??= [];
+                    where.$and.push({ [op]: group });
+                }
+                else {
+                    where[op] = group;
+                }
             }
         }
         return undefined;

package/utils/Utils.js

@@ -153,7 +153,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.2.2-dev.13';
+    static #ORM_VERSION = '7.2.2-dev.14';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;