c2-mongoose 2.1.314 → 2.1.316

package/dist/flow/SearcherFlow.js

@@ -240,6 +240,15 @@ var SearcherFlow = /** @class */ (function () {
             var fieldName = key.replace('Like', '');
             condition[fieldName] = this.buildRegex(value); //{ $regex: value as any, $options: 'i' }
         }
+        else if (key.endsWith("AtLeastOneExists")) {
+            key = key.replace("AtLeastOneExists", "");
+            var fields = key.split('.');
+            if (!fields)
+                return condition;
+            // const elemMatch = {} as any
+            // elemMatch[lastField] = value as boolean
+            condition[fields[0]] = { $elemMatch: (_a = {}, _a[fields[1]] = value, _a) };
+        }
         else if (key.endsWith('Exists')) {
             var fieldName = key.replace('Exists', '');
             condition[fieldName] = { $exists: value };
@@ -248,15 +257,6 @@ var SearcherFlow = /** @class */ (function () {
             key = key.replace("IsEmpty", "");
             condition[key] = value ? { $size: 0 } : { $not: { $size: 0 } };
         }
-        else if (key.endsWith("AtLeastOneExists")) {
-            key = key.replace("AtLeastOneExists", "");
-            var lastField = key.split('.').pop();
-            if (!lastField)
-                return condition;
-            // const elemMatch = {} as any
-            // elemMatch[lastField] = value as boolean
-            condition[key] = { $elemMatch: (_a = {}, _a[lastField] = value, _a) };
-        }
         else {
             if (((_d = (_c = (_b = this.model) === null || _b === void 0 ? void 0 : _b.schema) === null || _c === void 0 ? void 0 : _c.paths[key]) === null || _d === void 0 ? void 0 : _d.instance) === 'Array') {
                 if (!Array.isArray(value)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.314",
+  "version": "2.1.316",
   "description": "Lib to make any search in database mongoose and use as basic crud",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/flow/SearcherFlow.ts

@@ -216,21 +216,21 @@ class SearcherFlow<D> {
         } else if (key.endsWith('Like')) {
             var fieldName = key.replace('Like', '')
             condition[fieldName] = this.buildRegex(value as string) //{ $regex: value as any, $options: 'i' }
-        } else if (key.endsWith('Exists')) {
-            var fieldName = key.replace('Exists', '')
-            condition[fieldName] = { $exists: value as boolean }
-        } else if (key.endsWith("IsEmpty")) {
-            key = key.replace("IsEmpty", "");
-            condition[key] = value ? { $size: 0 } : { $not: { $size: 0 } };
         } else if (key.endsWith("AtLeastOneExists")) {
             key = key.replace("AtLeastOneExists", "");
 
-            const lastField = key.split('.').pop()
-            if (!lastField) return condition;
+            const fields = key.split('.')
+            if (!fields) return condition;
 
             // const elemMatch = {} as any
             // elemMatch[lastField] = value as boolean
-            condition[key] = { $elemMatch: { [lastField]: value as boolean} }
+            condition[fields[0]] = { $elemMatch: { [fields[1]]: value as boolean } }
+        } else if (key.endsWith('Exists')) {
+            var fieldName = key.replace('Exists', '')
+            condition[fieldName] = { $exists: value as boolean }
+        } else if (key.endsWith("IsEmpty")) {
+            key = key.replace("IsEmpty", "");
+            condition[key] = value ? { $size: 0 } : { $not: { $size: 0 } };
         } else {
             if (this.model?.schema?.paths[key]?.instance === 'Array') {
                 if (!Array.isArray(value)) {