c2-mongoose 2.1.283 → 2.1.285

package/dist/flow/SearcherFlow.d.ts

@@ -31,6 +31,7 @@ declare class SearcherFlow<D> {
     extractFieldsOfType(schema: Schema, typing?: string, parent?: string): string[];
     buildCondition(key: string, value: any): any;
     buildDefaultFilters(objectSearch: any): any;
+    normalizeValue(key: string, value: any): any;
     isValidObjectId(value: string): boolean;
     buildOrdenation(): any;
     buildRegex(searchText: string): RegExp;

package/dist/flow/SearcherFlow.js

@@ -304,7 +304,7 @@ var SearcherFlow = /** @class */ (function () {
         var _this = this;
         // Recuperar todos os campos do tipo String
         var camposString = (0, Utils_1.isEmpty)(this.searchTextFields) ? this.extractFieldsOfType(this.model.schema, 'String') : this.searchTextFields;
-        var filters = { $and: [] };
+        var andQueriesParam = [];
         Object.entries(objectSearch).forEach(function (_a) {
             var key = _a[0], value = _a[1];
             if ((0, Utils_1.isNotEmpty)(value) || value === null) {
@@ -341,7 +341,7 @@ var SearcherFlow = /** @class */ (function () {
                     value = false;
                 }
                 var condition = _this.buildCondition(key, value);
-                filters.$and.push(condition);
+                andQueriesParam.push(condition);
             }
         });
         if ((0, Utils_1.isNotEmpty)(this.searchText) && (0, Utils_1.isNotEmpty)(camposString)) {
@@ -353,34 +353,58 @@ var SearcherFlow = /** @class */ (function () {
                 conditionAux[fieldString] = { $regex: regex };
                 conditions.$or.push(conditionAux);
             }
-            filters.$and.push(conditions);
+            andQueriesParam.push(conditions);
         }
-        if (filters.$and.length === 0)
-            delete filters['$and'];
+        // if (filters.$and.length === 0)
+        //     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 clause = _c[_b];
-                if (!filters.$or)
-                    filters.$or = [];
-                Object.entries(clause).forEach(function (_a) {
-                    var key = _a[0], value = _a[1];
-                    if ((0, Utils_1.isEmpty)(value))
-                        return;
-                    if (typeof value === 'string' && _this.isValidObjectId(value) && key !== 'owner') {
-                        value = new mongoose_1.Types.ObjectId(value);
-                    }
-                    if (value === 'true') {
-                        value = true;
-                    }
-                    if (value === 'false') {
-                        value = false;
+            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);
+                        });
                     }
-                    var condition = _this.buildCondition(key, value);
-                    filters.$or.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 clauseOr = _c[_b];
+                _loop_1(clauseOr);
             }
         }
-        return filters;
+        var filtersFinal = {};
+        if (andQueriesParam.length > 0) {
+            if (!filtersFinal.$or)
+                filtersFinal.$or = [];
+            filtersFinal.$or = __spreadArray(__spreadArray([], filtersFinal.$or, true), [{ $and: __spreadArray([], andQueriesParam, true) }], false);
+        }
+        if (orPayload.length > 0) {
+            if (!filtersFinal.$or)
+                filtersFinal.$or = [];
+            filtersFinal.$or = __spreadArray(__spreadArray([], filtersFinal.$or, true), [{ $and: __spreadArray([], orPayload, true) }], false);
+        }
+        return filtersFinal;
+    };
+    SearcherFlow.prototype.normalizeValue = function (key, value) {
+        if (typeof value === 'string' && this.isValidObjectId(value) && key !== 'owner') {
+            value = new mongoose_1.Types.ObjectId(value);
+        }
+        if (value === 'true') {
+            value = true;
+        }
+        if (value === 'false') {
+            value = false;
+        }
+        return value;
     };
     SearcherFlow.prototype.isValidObjectId = function (value) {
         var objectIdPattern = /^[0-9a-fA-F]{24}$/;

package/package.json

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

@@ -285,7 +285,7 @@ class SearcherFlow<D> {
         const camposString = isEmpty(this.searchTextFields) ? this.extractFieldsOfType(this.model.schema, 'String') : this.searchTextFields
 
 
-        let filters = { $and: [] } as any
+        const andQueriesParam = []
         Object.entries(objectSearch).forEach(([key, value]) => {
             if (isNotEmpty(value) || value === null) {
                 if ([
@@ -324,7 +324,7 @@ class SearcherFlow<D> {
                 }
 
                 const condition = this.buildCondition(key, value)
-                filters.$and.push(condition)
+                andQueriesParam.push(condition)
             }
         })
 
@@ -337,40 +337,60 @@ class SearcherFlow<D> {
 
                 conditions.$or.push(conditionAux)
             }
-            filters.$and.push(conditions)
+            andQueriesParam.push(conditions)
         }
 
-        if (filters.$and.length === 0)
-            delete filters['$and']
+        // if (filters.$and.length === 0)
+        //     delete filters['$and']
 
+        const orPayload: any[] = []
         if (objectSearch?.or) {
-            for (const clause of objectSearch?.or) {
-                if (!filters.$or) filters.$or = []
-
-                Object.entries(clause).forEach(([key, value]) => {
-                    
-                    if (isEmpty(value)) return
-    
-                    if (typeof value === 'string' && this.isValidObjectId(value as string) && key !== 'owner') {
-                        value = new Types.ObjectId(value as string)
+            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)
+                        })
                     }
-        
-                    if (value === 'true') {
-                        value = true
-                    }
-        
-                    if (value === 'false') {
-                        value = false
-                    }
-        
-                    const condition = this.buildCondition(key, value)
-                    filters.$or.push(condition)
-                })
+                    orPayload.push(and)
+                }
             }
-        } 
+        }
+
+        const filtersFinal = {} as any
+
+        if (andQueriesParam.length > 0) {
+            if (!filtersFinal.$or) filtersFinal.$or = []
+            filtersFinal.$or = [...filtersFinal.$or, { $and: [...andQueriesParam] }]
+        }
+
+        if (orPayload.length > 0) {
+            if (!filtersFinal.$or) filtersFinal.$or = []
+            filtersFinal.$or = [...filtersFinal.$or, { $and: [...orPayload] }]
+        }
+
 
+        return filtersFinal
+    }
+
+    public normalizeValue(key: string, value: any): any {
+        if (typeof value === 'string' && this.isValidObjectId(value as string) && key !== 'owner') {
+            value = new Types.ObjectId(value as string)
+        }
+
+        if (value === 'true') {
+            value = true
+        }
+
+        if (value === 'false') {
+            value = false
+        }
 
-        return filters
+        return value
     }
 
     public isValidObjectId(value: string) {