c2-mongoose 2.1.287 → 2.1.289

package/dist/flow/SearcherFlow.js

@@ -360,37 +360,43 @@ var SearcherFlow = /** @class */ (function () {
         //     delete filters['$and']
         var orPayload = [];
         if (objectSearch === null || objectSearch === void 0 ? void 0 : objectSearch.or) {
-            var _loop_1 = function (clauseOr) {
+            for (var _b = 0, _c = objectSearch === null || objectSearch === void 0 ? void 0 : objectSearch.or; _b < _c.length; _b++) {
+                var clauseOr = _c[_b];
                 if (clauseOr.and && Array.isArray(clauseOr.and)) {
-                    var and_1 = [];
-                    for (var _d = 0, _e = clauseOr.and; _d < _e.length; _d++) {
-                        var clauseAnd = _e[_d];
+                    var and = [];
+                    var _loop_1 = function (clauseAnd) {
+                        var conditionsAnd;
                         Object.entries(clauseAnd).forEach(function (_a) {
                             var key = _a[0], value = _a[1];
                             if ((0, Utils_1.isEmpty)(value))
                                 return;
                             value = _this.normalizeValue(key, value);
                             var condition = _this.buildCondition(key, value);
-                            and_1.push(condition);
+                            if (!conditionsAnd) {
+                                conditionsAnd = {};
+                            }
+                            conditionsAnd = __assign(__assign({}, conditionsAnd), { condition: condition });
                         });
+                        if (conditionsAnd) {
+                            and.push({ $and: conditionsAnd });
+                        }
+                    };
+                    for (var _d = 0, _e = clauseOr.and; _d < _e.length; _d++) {
+                        var clauseAnd = _e[_d];
+                        _loop_1(clauseAnd);
+                    }
+                    if (and.length) {
+                        orPayload.push(and);
                     }
-                    orPayload.push(and_1);
                 }
-            };
-            for (var _b = 0, _c = objectSearch === null || objectSearch === void 0 ? void 0 : objectSearch.or; _b < _c.length; _b++) {
-                var clauseOr = _c[_b];
-                _loop_1(clauseOr);
             }
         }
-        var filtersFinal = {};
-        if (andQueriesParam.length > 0) {
-            // if (!filtersFinal.$or) filtersFinal.$or = []
-            filtersFinal = __assign(__assign({}, filtersFinal), andQueriesParam);
-        }
+        console.log(orPayload);
+        var filtersFinal = __assign({}, andQueriesParam);
         if (orPayload.length > 0) {
             if (!filtersFinal.$or)
                 filtersFinal.$or = [];
-            filtersFinal.$or = __spreadArray(__spreadArray([], filtersFinal.$or, true), [{ $and: __spreadArray([], orPayload, true) }], false);
+            filtersFinal.$or = __spreadArray(__spreadArray([], filtersFinal.$or, true), orPayload, true);
         }
         return filtersFinal;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.287",
+  "version": "2.1.289",
   "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

@@ -350,27 +350,37 @@ class SearcherFlow<D> {
                 if (clauseOr.and && Array.isArray(clauseOr.and)) {
                     const and: any[] = []
                     for (const clauseAnd of clauseOr.and) {
+                        let conditionsAnd: any
                         Object.entries(clauseAnd).forEach(([key, value]) => {
                             if (isEmpty(value)) return
                             value = this.normalizeValue(key, value)
                             const condition = this.buildCondition(key, value)
-                            and.push(condition)
+
+                            if (!conditionsAnd) {
+                                conditionsAnd = {}
+                            }
+                            conditionsAnd = { ...conditionsAnd, condition }
                         })
+
+                        if (conditionsAnd) {
+                            and.push({ $and: conditionsAnd })
+                        }
+                    }
+
+                    if (and.length) {
+                        orPayload.push(and)
                     }
-                    orPayload.push(and)
                 }
             }
         }
 
-        let filtersFinal = {} as any
-        if (andQueriesParam.length > 0) {
-            // if (!filtersFinal.$or) filtersFinal.$or = []
-            filtersFinal = { ...filtersFinal, ...andQueriesParam }
-        }
+        console.log(orPayload)
+
+        let filtersFinal = { ...andQueriesParam } as any
 
         if (orPayload.length > 0) {
             if (!filtersFinal.$or) filtersFinal.$or = []
-            filtersFinal.$or = [...filtersFinal.$or, { $and: [...orPayload] }]
+            filtersFinal.$or = [...filtersFinal.$or, ...orPayload]
         }