c2-mongoose 2.1.277 → 2.1.279

package/dist/flow/SearcherFlow.d.ts

@@ -1,5 +1,10 @@
 import mongoose, { Schema } from "mongoose";
 import { SearchOptions, SearchResponse } from "../types/SearchResponse";
+export interface IPopulate2 {
+    path: string;
+    select: string;
+    populate: IPopulate2[];
+}
 export interface IPopulate {
     [key: string]: any;
     path: string;
@@ -24,6 +29,7 @@ declare class SearcherFlow<D> {
     search(options: SearchOptions): Promise<SearchResponse<D>>;
     transformObject(originalObject: any): any;
     extractFieldsOfType(schema: Schema, typing?: string, parent?: string): string[];
+    buildCondition(key: string, value: any): any;
     buildDefaultFilters(objectSearch: any): any;
     isValidObjectId(value: string): boolean;
     buildOrdenation(): any;

package/dist/flow/SearcherFlow.js

@@ -167,7 +167,7 @@ var SearcherFlow = /** @class */ (function () {
                         result = _d.sent();
                         if (!(0, Utils_1.isNotEmpty)(this.populate)) return [3 /*break*/, 3];
                         _c = result[0];
-                        return [4 /*yield*/, this.model.populate(result[0].items, BuildPopulateSingleFlowItem_1.default.buildPopulate(this.model, this.populate, this.select))];
+                        return [4 /*yield*/, this.model.populate(result[0].items, BuildPopulateSingleFlowItem_1.default.buildPopulate2(this.populate))];
                     case 2:
                         _c.items = _d.sent();
                         _d.label = 3;
@@ -211,17 +211,105 @@ var SearcherFlow = /** @class */ (function () {
         });
         return fieldsTyped;
     };
+    SearcherFlow.prototype.buildCondition = function (key, value) {
+        var _this = this;
+        var _a, _b, _c;
+        var condition = {};
+        if (key.endsWith('DateRange')) {
+            var fieldName = key.replace('Range', '');
+            var values = value;
+            if ((0, Utils_1.isNotEmpty)(values[0])) {
+                var momentValue = (0, moment_1.default)(values[0]);
+                momentValue.hour(0);
+                momentValue.minute(0);
+                momentValue.second(0);
+                condition[fieldName] = __assign(__assign({}, condition[fieldName]), { $gte: momentValue.tz('America/Sao_Paulo', true).toDate() });
+            }
+            if ((0, Utils_1.isNotEmpty)(values[1])) {
+                var momentValue = (0, moment_1.default)(values[1]);
+                momentValue.hour(23);
+                momentValue.minute(59);
+                momentValue.second(59);
+                condition[fieldName] = __assign(__assign({}, condition[fieldName]), { $lte: momentValue.tz('America/Sao_Paulo', true).toDate() });
+            }
+        }
+        else if (key.endsWith('DateTimeRange')) {
+            var fieldName = key.replace('Range', '');
+            var values = value;
+            if ((0, Utils_1.isNotEmpty)(values[0])) {
+                var momentValue = (0, moment_1.default)(values[0]);
+                momentValue.hour(0);
+                momentValue.minute(0);
+                momentValue.second(0);
+                condition[fieldName] = __assign(__assign({}, condition[fieldName]), { $gte: momentValue.tz('America/Sao_Paulo', true).toDate() });
+            }
+            if ((0, Utils_1.isNotEmpty)(values[1])) {
+                var momentValue = (0, moment_1.default)(values[1]);
+                momentValue.hour(23);
+                momentValue.minute(59);
+                momentValue.second(59);
+                condition[fieldName] = __assign(__assign({}, condition[fieldName]), { $lte: momentValue.tz('America/Sao_Paulo', true).toDate() });
+            }
+        }
+        else if (key.endsWith('Like')) {
+            var fieldName = key.replace('Like', '');
+            condition[fieldName] = this.buildRegex(value); //{ $regex: value as any, $options: 'i' }
+        }
+        else if (key.endsWith('Exists')) {
+            var fieldName = key.replace('Exists', '');
+            condition[fieldName] = { $exists: value };
+        }
+        else {
+            if (((_c = (_b = (_a = this.model) === null || _a === void 0 ? void 0 : _a.schema) === null || _b === void 0 ? void 0 : _b.paths[key]) === null || _c === void 0 ? void 0 : _c.instance) === 'Array') {
+                if (!Array.isArray(value)) {
+                    value = [value];
+                }
+                value === null || value === void 0 ? void 0 : value.forEach(function (v) {
+                    if (typeof v === 'string' && _this.isValidObjectId(v)) {
+                        v = new mongoose_1.Types.ObjectId(v);
+                    }
+                });
+                if (key.startsWith("notIn")) {
+                    key = key.replace("notIn", "");
+                    condition[key] = { $nin: value };
+                }
+                else {
+                    condition[key] = { $in: value };
+                }
+            }
+            else if (Array.isArray(value)) {
+                var arr = [];
+                for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
+                    var val = value_1[_i];
+                    if (typeof val === 'string' && this.isValidObjectId(val)) {
+                        val = new mongoose_1.Types.ObjectId(val);
+                    }
+                    arr.push(val);
+                }
+                if (key.startsWith("notIn")) {
+                    key = key.replace("notIn", "");
+                    condition[key] = { $nin: arr };
+                }
+                else {
+                    condition[key] = { $in: arr };
+                }
+            }
+            else {
+                condition[key] = value;
+            }
+        }
+        return condition;
+    };
     SearcherFlow.prototype.buildDefaultFilters = function (objectSearch) {
         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: [] };
         Object.entries(objectSearch).forEach(function (_a) {
-            var _b, _c, _d;
             var key = _a[0], value = _a[1];
             if ((0, Utils_1.isNotEmpty)(value) || value === null) {
-                var condition = {};
                 if ([
+                    'or',
                     'filters',
                     'withTotalizers',
                     'onlyMetadata',
@@ -252,94 +340,8 @@ var SearcherFlow = /** @class */ (function () {
                 if (value === 'false') {
                     value = false;
                 }
-                if (key.endsWith('DateRange')) {
-                    var fieldName = key.replace('Range', '');
-                    var values = value;
-                    if ((0, Utils_1.isNotEmpty)(values[0])) {
-                        var momentValue = (0, moment_1.default)(values[0]);
-                        momentValue.hour(0);
-                        momentValue.minute(0);
-                        momentValue.second(0);
-                        condition[fieldName] = __assign(__assign({}, condition[fieldName]), { $gte: momentValue.tz('America/Sao_Paulo', true).toDate() });
-                    }
-                    if ((0, Utils_1.isNotEmpty)(values[1])) {
-                        var momentValue = (0, moment_1.default)(values[1]);
-                        momentValue.hour(23);
-                        momentValue.minute(59);
-                        momentValue.second(59);
-                        condition[fieldName] = __assign(__assign({}, condition[fieldName]), { $lte: momentValue.tz('America/Sao_Paulo', true).toDate() });
-                    }
-                    filters.$and.push(condition);
-                }
-                else if (key.endsWith('DateTimeRange')) {
-                    var fieldName = key.replace('Range', '');
-                    var values = value;
-                    if ((0, Utils_1.isNotEmpty)(values[0])) {
-                        var momentValue = (0, moment_1.default)(values[0]);
-                        momentValue.hour(0);
-                        momentValue.minute(0);
-                        momentValue.second(0);
-                        condition[fieldName] = __assign(__assign({}, condition[fieldName]), { $gte: momentValue.tz('America/Sao_Paulo', true).toDate() });
-                    }
-                    if ((0, Utils_1.isNotEmpty)(values[1])) {
-                        var momentValue = (0, moment_1.default)(values[1]);
-                        momentValue.hour(23);
-                        momentValue.minute(59);
-                        momentValue.second(59);
-                        condition[fieldName] = __assign(__assign({}, condition[fieldName]), { $lte: momentValue.tz('America/Sao_Paulo', true).toDate() });
-                    }
-                    filters.$and.push(condition);
-                }
-                else if (key.endsWith('Like')) {
-                    var fieldName = key.replace('Like', '');
-                    condition[fieldName] = _this.buildRegex(value); //{ $regex: value as any, $options: 'i' }
-                    filters.$and.push(condition);
-                }
-                else if (key.endsWith('Exists')) {
-                    var fieldName = key.replace('Exists', '');
-                    condition[fieldName] = { $exists: value };
-                    filters.$and.push(condition);
-                }
-                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)) {
-                            value = [value];
-                        }
-                        value === null || value === void 0 ? void 0 : value.forEach(function (v) {
-                            if (typeof v === 'string' && _this.isValidObjectId(v)) {
-                                v = new mongoose_1.Types.ObjectId(v);
-                            }
-                        });
-                        if (key.startsWith("notIn")) {
-                            key = key.replace("notIn", "");
-                            condition[key] = { $nin: value };
-                        }
-                        else {
-                            condition[key] = { $in: value };
-                        }
-                    }
-                    else if (Array.isArray(value)) {
-                        var arr = [];
-                        for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
-                            var val = value_1[_i];
-                            if (typeof val === 'string' && _this.isValidObjectId(val)) {
-                                val = new mongoose_1.Types.ObjectId(val);
-                            }
-                            arr.push(val);
-                        }
-                        if (key.startsWith("notIn")) {
-                            key = key.replace("notIn", "");
-                            condition[key] = { $nin: arr };
-                        }
-                        else {
-                            condition[key] = { $in: arr };
-                        }
-                    }
-                    else {
-                        condition[key] = value;
-                    }
-                    filters.$and.push(condition);
-                }
+                var condition = _this.buildCondition(key, value);
+                filters.$and.push(condition);
             }
         });
         if ((0, Utils_1.isNotEmpty)(this.searchText) && (0, Utils_1.isNotEmpty)(camposString)) {
@@ -355,6 +357,23 @@ var SearcherFlow = /** @class */ (function () {
         }
         if (filters.$and.length === 0)
             delete filters['$and'];
+        Object.entries(objectSearch === null || objectSearch === void 0 ? void 0 : objectSearch.or).forEach(function (_a) {
+            var key = _a[0], value = _a[1];
+            console.log(key, value);
+            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 condition = _this.buildCondition(key, value);
+            filters.$or.push(condition);
+        });
         return filters;
     };
     SearcherFlow.prototype.isValidObjectId = function (value) {

package/dist/flow/item/BuildPopulateSingleFlowItem.d.ts

@@ -1,6 +1,8 @@
 import mongoose from "mongoose";
-import { IPopulate } from "../SearcherFlow";
+import { IPopulate, IPopulate2 } from "../SearcherFlow";
 declare class BuildPopulateSingleFlowItem {
+    buildPopulate2(paths: string[]): IPopulate2[];
+    addPath2(root: IPopulate2[], parts: string[]): void;
     buildPopulate(model: mongoose.Model<any>, populatesStr: string[], selectsStr: string[]): IPopulate[];
     buildPath(target: string, nested: string | undefined, populateAcc: IPopulate): IPopulate;
 }

package/dist/flow/item/BuildPopulateSingleFlowItem.js

@@ -15,6 +15,26 @@ var Utils_1 = require("../../utils/Utils");
 var BuildPopulateSingleFlowItem = /** @class */ (function () {
     function BuildPopulateSingleFlowItem() {
     }
+    BuildPopulateSingleFlowItem.prototype.buildPopulate2 = function (paths) {
+        var _this = this;
+        var root = [];
+        paths.forEach(function (path) {
+            var parts = path.split('.');
+            _this.addPath2(root, parts);
+        });
+        return root;
+    };
+    BuildPopulateSingleFlowItem.prototype.addPath2 = function (root, parts) {
+        if (parts.length === 0)
+            return;
+        var currentPath = parts[0];
+        var existing = root.find(function (item) { return item.path === currentPath; });
+        if (!existing) {
+            existing = { path: currentPath, populate: [], select: "" };
+            root.push(existing);
+        }
+        this.addPath2(existing.populate, parts.slice(1));
+    };
     BuildPopulateSingleFlowItem.prototype.buildPopulate = function (model, populatesStr, selectsStr) {
         var populateArray = [];
         if ((0, Utils_1.isEmpty)(populatesStr)) {

package/package.json

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

@@ -4,6 +4,13 @@ import { SearchOptions, SearchResponse } from "../types/SearchResponse"
 import { isEmpty, isNotEmpty } from "../utils/Utils"
 import BuildPopulateSingleFlowItem from "./item/BuildPopulateSingleFlowItem"
 import BuildSelectSingleFlowItem from "./item/BuildSelectSingleFlowItem"
+
+export interface IPopulate2 {
+    path: string
+    select: string
+    populate: IPopulate2[]
+}
+
 export interface IPopulate {
     [key: string]: any
     path: string
@@ -128,7 +135,7 @@ class SearcherFlow<D> {
 
 
         if (isNotEmpty(this.populate)) {
-            result[0].items = await this.model.populate(result[0].items, BuildPopulateSingleFlowItem.buildPopulate(this.model, this.populate, this.select))
+            result[0].items = await this.model.populate(result[0].items, BuildPopulateSingleFlowItem.buildPopulate2(this.populate))
         }
 
         let resultAux = this.transformObject(result[0])
@@ -173,6 +180,105 @@ class SearcherFlow<D> {
         return fieldsTyped
     }
 
+    public buildCondition(key: string, value: any) {
+        let condition = {} as any
+        if (key.endsWith('DateRange')) {
+            var fieldName = key.replace('Range', '')
+            var values = value as any
+            if (isNotEmpty(values[0])) {
+                var momentValue = moment(values[0])
+                momentValue.hour(0)
+                momentValue.minute(0)
+                momentValue.second(0)
+                condition[fieldName] = {
+                    ...condition[fieldName],
+                    $gte: momentValue.tz('America/Sao_Paulo', true).toDate()
+                }
+            }
+
+            if (isNotEmpty(values[1])) {
+                var momentValue = moment(values[1])
+                momentValue.hour(23)
+                momentValue.minute(59)
+                momentValue.second(59)
+                condition[fieldName] = {
+                    ...condition[fieldName],
+                    $lte: momentValue.tz('America/Sao_Paulo', true).toDate()
+                }
+            }
+        } else if (key.endsWith('DateTimeRange')) {
+            var fieldName = key.replace('Range', '')
+            var values = value as any
+            if (isNotEmpty(values[0])) {
+                var momentValue = moment(values[0])
+                momentValue.hour(0)
+                momentValue.minute(0)
+                momentValue.second(0)
+                condition[fieldName] = {
+                    ...condition[fieldName],
+                    $gte: momentValue.tz('America/Sao_Paulo', true).toDate()
+                }
+            }
+
+            if (isNotEmpty(values[1])) {
+                var momentValue = moment(values[1])
+                momentValue.hour(23)
+                momentValue.minute(59)
+                momentValue.second(59)
+                condition[fieldName] = {
+                    ...condition[fieldName],
+                    $lte: momentValue.tz('America/Sao_Paulo', true).toDate()
+                }
+            }
+        } 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 (this.model?.schema?.paths[key]?.instance === 'Array') {
+                if (!Array.isArray(value)) {
+                    value = [value]
+                }
+
+                (value as [])?.forEach((v: any) => {
+                    if (typeof v === 'string' && this.isValidObjectId(v)) {
+                        v = new Types.ObjectId(v);
+                    }
+                })
+
+                if (key.startsWith("notIn")) {
+                    key = key.replace("notIn", "");
+                    condition[key] = { $nin: value };
+                }
+                else {
+                    condition[key] = { $in: value };
+                }
+            } else if (Array.isArray(value)) {
+                var arr = [];
+                for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
+                    var val = value_1[_i];
+                    if (typeof val === 'string' && this.isValidObjectId(val)) {
+                        val = new Types.ObjectId(val);
+                    }
+                    arr.push(val);
+                }
+                if (key.startsWith("notIn")) {
+                    key = key.replace("notIn", "");
+                    condition[key] = { $nin: arr };
+                }
+                else {
+                    condition[key] = { $in: arr };
+                }
+            } else {
+                condition[key] = value;
+            }
+        }
+
+        return condition
+    }
+
     public buildDefaultFilters(objectSearch: any) {
 
         // Recuperar todos os campos do tipo String
@@ -182,8 +288,8 @@ class SearcherFlow<D> {
         let filters = { $and: [] } as any
         Object.entries(objectSearch).forEach(([key, value]) => {
             if (isNotEmpty(value) || value === null) {
-                let condition = {} as any
                 if ([
+                    'or',
                     'filters',
                     'withTotalizers',
                     'onlyMetadata',
@@ -217,106 +323,8 @@ class SearcherFlow<D> {
                     value = false
                 }
 
-                if (key.endsWith('DateRange')) {
-                    var fieldName = key.replace('Range', '')
-                    var values = value as any
-                    if (isNotEmpty(values[0])) {
-                        var momentValue = moment(values[0])
-                        momentValue.hour(0)
-                        momentValue.minute(0)
-                        momentValue.second(0)
-                        condition[fieldName] = {
-                            ...condition[fieldName],
-                            $gte: momentValue.tz('America/Sao_Paulo', true).toDate()
-                        }
-                    }
-
-                    if (isNotEmpty(values[1])) {
-                        var momentValue = moment(values[1])
-                        momentValue.hour(23)
-                        momentValue.minute(59)
-                        momentValue.second(59)
-                        condition[fieldName] = {
-                            ...condition[fieldName],
-                            $lte: momentValue.tz('America/Sao_Paulo', true).toDate()
-                        }
-                    }
-                    filters.$and.push(condition)
-                }else if (key.endsWith('DateTimeRange')) {
-                    var fieldName = key.replace('Range', '')
-                    var values = value as any
-                    if (isNotEmpty(values[0])) {
-                        var momentValue = moment(values[0])
-                        momentValue.hour(0)
-                        momentValue.minute(0)
-                        momentValue.second(0)
-                        condition[fieldName] = {
-                            ...condition[fieldName],
-                            $gte: momentValue.tz('America/Sao_Paulo', true).toDate()
-                        }
-                    }
-
-                    if (isNotEmpty(values[1])) {
-                        var momentValue = moment(values[1])
-                        momentValue.hour(23)
-                        momentValue.minute(59)
-                        momentValue.second(59)
-                        condition[fieldName] = {
-                            ...condition[fieldName],
-                            $lte: momentValue.tz('America/Sao_Paulo', true).toDate()
-                        }
-                    }
-                    filters.$and.push(condition)
-                } else if (key.endsWith('Like')) {
-                    var fieldName = key.replace('Like', '')
-                    condition[fieldName] = this.buildRegex(value as string) //{ $regex: value as any, $options: 'i' }
-                    filters.$and.push(condition)
-                } else if (key.endsWith('Exists')) {
-                    var fieldName = key.replace('Exists', '')
-                    condition[fieldName] = { $exists: value as boolean }
-                    filters.$and.push(condition)
-                }
-
-                else {
-                    if (this.model?.schema?.paths[key]?.instance === 'Array') {
-                        if (!Array.isArray(value)) {
-                            value = [value]
-                        }
-
-                        (value as [])?.forEach((v: any) => {
-                            if (typeof v === 'string' && this.isValidObjectId(v)) {
-                                v = new Types.ObjectId(v);
-                            }
-                        })
-
-                        if (key.startsWith("notIn")) {
-                            key = key.replace("notIn", "");
-                            condition[key] = { $nin: value };
-                        }
-                        else {
-                            condition[key] = { $in: value };
-                        }
-                    } else if (Array.isArray(value)) {
-                        var arr = [];
-                        for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
-                            var val = value_1[_i];
-                            if (typeof val === 'string' && this.isValidObjectId(val)) {
-                                val = new Types.ObjectId(val);
-                            }
-                            arr.push(val);
-                        }
-                        if (key.startsWith("notIn")) {
-                            key = key.replace("notIn", "");
-                            condition[key] = { $nin: arr };
-                        }
-                        else {
-                            condition[key] = { $in: arr };
-                        }
-                    } else {
-                        condition[key] = value;
-                    }
-                    filters.$and.push(condition)
-                }
+                const condition = this.buildCondition(key, value)
+                filters.$and.push(condition)
             }
         })
 
@@ -335,6 +343,27 @@ class SearcherFlow<D> {
         if (filters.$and.length === 0)
             delete filters['$and']
 
+
+        Object.entries(objectSearch?.or).forEach(([key, value]) => {
+            console.log(key, value)
+            if (isEmpty(value)) return
+
+            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
+            }
+
+            const condition = this.buildCondition(key, value)
+            filters.$or.push(condition)
+        })
+
         return filters
     }
 

package/src/flow/item/BuildPopulateSingleFlowItem.ts

@@ -1,9 +1,36 @@
 import mongoose from "mongoose";
 import { isEmpty, isNotEmpty } from "../../utils/Utils";
-import { IPopulate } from "../SearcherFlow";
+import { IPopulate, IPopulate2 } from "../SearcherFlow";
 
 class BuildPopulateSingleFlowItem {
 
+
+  buildPopulate2(paths: string[]): IPopulate2[] {
+    const root: IPopulate2[] = [];
+  
+    paths.forEach((path) => {
+      const parts = path.split('.');
+      this.addPath2(root, parts);
+    });
+  
+    return root;
+  }
+  
+  addPath2(root: IPopulate2[], parts: string[]) {
+    if (parts.length === 0) return;
+  
+    const currentPath = parts[0];
+    let existing = root.find((item) => item.path === currentPath) as IPopulate2;
+  
+    if (!existing) {
+      existing = { path: currentPath, populate: [], select: "" };
+      root.push(existing as any);
+    }
+  
+    this.addPath2(existing.populate, parts.slice(1));
+  }
+
+
   public buildPopulate(model: mongoose.Model<any>, populatesStr: string[], selectsStr: string[]): IPopulate[] {
     var populateArray = [] as IPopulate[]
     if (isEmpty(populatesStr)) {