@mikro-orm/sql 7.0.0-dev.128 → 7.0.0-dev.130

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.0.0-dev.128",
+  "version": "7.0.0-dev.130",
   "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.",
   "type": "module",
   "exports": {
@@ -56,6 +56,6 @@
     "@mikro-orm/core": "^6.6.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.128"
+    "@mikro-orm/core": "7.0.0-dev.130"
   }
 }

package/query/ObjectCriteriaNode.js

@@ -1,6 +1,7 @@
 import { ALIAS_REPLACEMENT, GroupOperator, QueryFlag, raw, RawQueryFragment, ReferenceKind, Utils, } from '@mikro-orm/core';
 import { CriteriaNode } from './CriteriaNode.js';
 import { JoinType, QueryType } from './enums.js';
+const COLLECTION_OPERATORS = ['$some', '$none', '$every', '$size'];
 /**
  * @internal
  */
@@ -15,7 +16,7 @@ export class ObjectCriteriaNode extends CriteriaNode {
             alias = nestedAlias;
         }
         if (this.shouldAutoJoin(qb, nestedAlias)) {
-            if (keys.some(k => ['$some', '$none', '$every'].includes(k))) {
+            if (keys.some(k => COLLECTION_OPERATORS.includes(k))) {
                 if (![ReferenceKind.MANY_TO_MANY, ReferenceKind.ONE_TO_MANY].includes(this.prop.kind)) {
                     // ignore collection operators when used on a non-relational property - this can happen when they get into
                     // populateWhere via `infer` on m:n properties with select-in strategy
@@ -31,22 +32,31 @@ export class ObjectCriteriaNode extends CriteriaNode {
                     return [QueryType.SELECT, QueryType.COUNT].includes(qb.type) ? `${knownKey ? alias : ownerAlias}.${pk}` : pk;
                 });
                 for (const key of keys) {
-                    if (typeof key !== 'string' || !['$some', '$none', '$every'].includes(key)) {
+                    if (typeof key !== 'string' || !COLLECTION_OPERATORS.includes(key)) {
                         throw new Error('Mixing collection operators with other filters is not allowed.');
                     }
                     const payload = this.payload[key].unwrap();
                     const qb2 = qb.clone(true, ['_schema']);
+                    const joinAlias = qb2.getNextAlias(this.prop.targetMeta.class);
                     const sub = qb2
                         .from(parentMeta.class)
-                        .innerJoin(this.key, qb2.getNextAlias(this.prop.targetMeta.class))
+                    // eslint-disable-next-line no-unexpected-multiline
+                    [key === '$size' ? 'leftJoin' : 'innerJoin'](this.key, joinAlias)
                         .select(parentMeta.primaryKeys);
-                    if (key === '$every') {
+                    if (key === '$size') {
+                        const sizeCondition = typeof payload === 'number' ? { $eq: payload } : payload;
+                        const pks = this.prop.referencedColumnNames;
+                        const countExpr = raw(`count(${pks.map(() => '??').join(', ')})`, pks.map(pk => `${joinAlias}.${pk}`));
+                        sub.groupBy(parentMeta.primaryKeys);
+                        sub.having({ $and: Object.keys(sizeCondition).map(op => ({ [countExpr]: { [op]: sizeCondition[op] } })) });
+                    }
+                    else if (key === '$every') {
                         sub.where({ $not: { [this.key]: payload } });
                     }
                     else {
                         sub.where({ [this.key]: payload });
                     }
-                    const op = key === '$some' ? '$in' : '$nin';
+                    const op = ['$size', '$some'].includes(key) ? '$in' : '$nin';
                     $and.push({
                         [Utils.getPrimaryKeyHash(primaryKeys)]: { [op]: sub.getNativeQuery().toRaw() },
                     });
@@ -124,7 +134,7 @@ export class ObjectCriteriaNode extends CriteriaNode {
             alias = nestedAlias;
         }
         if (this.shouldAutoJoin(qb, nestedAlias)) {
-            return !keys.some(k => ['$some', '$none', '$every'].includes(k));
+            return !keys.some(k => COLLECTION_OPERATORS.includes(k));
         }
         return keys.some(field => {
             const childNode = this.payload[field];
@@ -198,7 +208,7 @@ export class ObjectCriteriaNode extends CriteriaNode {
         if (keys.every(k => typeof k === 'string' && k.includes('.') && k.startsWith(`${qb.alias}.`))) {
             return false;
         }
-        if (keys.some(k => ['$some', '$none', '$every'].includes(k))) {
+        if (keys.some(k => COLLECTION_OPERATORS.includes(k))) {
             return true;
         }
         const meta = this.metadata.find(this.entityName);

package/query/QueryBuilder.js

@@ -280,7 +280,7 @@ export class QueryBuilder {
             if (Utils.hasObjectKeys(cond) || RawQueryFragment.hasObjectFragments(cond)) {
                 // remove nested filters, we only care about scalars here, nesting would require another join branch
                 for (const key of Object.keys(cond)) {
-                    if (Utils.isPlainObject(cond[key]) && Object.keys(cond[key]).every(k => !(Utils.isOperator(k) && !['$some', '$none', '$every'].includes(k)))) {
+                    if (Utils.isPlainObject(cond[key]) && Object.keys(cond[key]).every(k => !(Utils.isOperator(k) && !['$some', '$none', '$every', '$size'].includes(k)))) {
                         delete cond[key];
                     }
                 }