c2-mongoose 2.1.284 → 2.1.286

package/dist/flow/SearcherFlow.js

@@ -359,30 +359,32 @@ var SearcherFlow = /** @class */ (function () {
         //     delete filters['$and']
         var orPayload = [];
         if (objectSearch === null || objectSearch === void 0 ? void 0 : objectSearch.or) {
-            var _loop_1 = function (clause) {
-                if (clause.and && Array.isArray(clause.and)) {
-                    var clauseAnd_1 = [];
-                    Object.entries(clause.and).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);
-                        clauseAnd_1.push(condition);
-                    });
-                    orPayload.push(clauseAnd_1);
+            var _loop_1 = function (clauseOr) {
+                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];
+                        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);
+                        });
+                    }
+                    orPayload.push(and_1);
                 }
             };
             for (var _b = 0, _c = objectSearch === null || objectSearch === void 0 ? void 0 : objectSearch.or; _b < _c.length; _b++) {
-                var clause = _c[_b];
-                _loop_1(clause);
+                var clauseOr = _c[_b];
+                _loop_1(clauseOr);
             }
         }
         var filtersFinal = {};
         if (andQueriesParam.length > 0) {
-            if (!filtersFinal.$or)
-                filtersFinal.$or = [];
-            filtersFinal.$or = __spreadArray(__spreadArray([], filtersFinal.$or, true), [{ $and: __spreadArray([], andQueriesParam, true) }], false);
+            // if (!filtersFinal.$or) filtersFinal.$or = []
+            filtersFinal = __assign(__assign({}, filtersFinal), andQueriesParam);
         }
         if (orPayload.length > 0) {
             if (!filtersFinal.$or)

package/package.json

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

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