c2-mongoose 2.1.276 → 2.1.278

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;

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;
@@ -219,7 +219,7 @@ var SearcherFlow = /** @class */ (function () {
         Object.entries(objectSearch).forEach(function (_a) {
             var _b, _c, _d;
             var key = _a[0], value = _a[1];
-            if ((0, Utils_1.isNotEmpty)(value)) {
+            if ((0, Utils_1.isNotEmpty)(value) || value === null) {
                 var condition = {};
                 if ([
                     'filters',

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.276",
+  "version": "2.1.278",
   "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])
@@ -181,7 +188,7 @@ class SearcherFlow<D> {
 
         let filters = { $and: [] } as any
         Object.entries(objectSearch).forEach(([key, value]) => {
-            if (isNotEmpty(value)) {
+            if (isNotEmpty(value) || value === null) {
                 let condition = {} as any
                 if ([
                     '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)) {