c2-mongoose 2.1.291 → 2.1.293

package/dist/flow/SearcherFlow.js

@@ -360,35 +360,35 @@ var SearcherFlow = /** @class */ (function () {
         //     delete filters['$and']
         var orPayload = [];
         if (objectSearch === null || objectSearch === void 0 ? void 0 : objectSearch.or) {
-            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 = void 0;
-                    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);
-                            if (!conditionsAnd) {
-                                conditionsAnd = {};
-                            }
-                            conditionsAnd = __assign(__assign({}, conditionsAnd), condition);
-                        });
-                        if (conditionsAnd) {
-                            and = { $and: conditionsAnd };
-                        }
-                    };
-                    for (var _d = 0, _e = clauseOr.and; _d < _e.length; _d++) {
-                        var clauseAnd = _e[_d];
-                        _loop_1(clauseAnd);
-                    }
-                    if (and) {
-                        orPayload.push(and);
+            var _loop_1 = function (clauseOr) {
+                // if (clauseOr.and && Array.isArray(clauseOr.and)) {
+                var and 
+                // for (const clauseAnd of clauseOr.and) {
+                = void 0;
+                // for (const clauseAnd of clauseOr.and) {
+                var conditionsAnd;
+                Object.entries(clauseOr).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);
+                    if (!conditionsAnd) {
+                        conditionsAnd = {};
                     }
+                    conditionsAnd = __assign(__assign({}, conditionsAnd), condition);
+                });
+                if (conditionsAnd) {
+                    and = { $and: [conditionsAnd] };
+                }
+                // }
+                if (and) {
+                    orPayload.push(and);
                 }
+            };
+            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);
             }
         }
         console.log(orPayload);

package/package.json

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

@@ -347,30 +347,30 @@ class SearcherFlow<D> {
         const orPayload: any[] = []
         if (objectSearch?.or) {
             for (const clauseOr of objectSearch?.or) {
-                if (clauseOr.and && Array.isArray(clauseOr.and)) {
-                    let 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)
-
-                            if (!conditionsAnd) {
-                                conditionsAnd = {}
-                            }
-                            conditionsAnd = { ...conditionsAnd, ...condition }
-                        })
-
-                        if (conditionsAnd) {
-                            and = { $and: conditionsAnd }
-                        }
+                // if (clauseOr.and && Array.isArray(clauseOr.and)) {
+                let and: any
+                // for (const clauseAnd of clauseOr.and) {
+                let conditionsAnd: any
+                Object.entries(clauseOr).forEach(([key, value]) => {
+                    if (isEmpty(value)) return
+                    value = this.normalizeValue(key, value)
+                    const condition = this.buildCondition(key, value)
+
+                    if (!conditionsAnd) {
+                        conditionsAnd = {}
                     }
+                    conditionsAnd = { ...conditionsAnd, ...condition }
+                })
 
-                    if (and) {
-                        orPayload.push(and)
-                    }
+                if (conditionsAnd) {
+                    and = { $and: [conditionsAnd] }
+                }
+                // }
+
+                if (and) {
+                    orPayload.push(and)
                 }
+                // }
             }
         }