c2-mongoose 2.1.63 → 2.1.65

package/dist/flow/SearchFlow.d.ts

@@ -15,10 +15,11 @@ declare abstract class SearchFlow {
         [key: string]: number;
     } | undefined;
     constructor(params: any);
-    buildPopulate(): any;
     buildProjections(): {
         [key: string]: number;
     } | undefined;
+    buildPopulate(): any;
+    buildPopulateArray(): void;
     buildPath(target: string, nested?: string): any;
     buildOrdenation(): any;
     buildRegex(searchText: string): RegExp;

package/dist/flow/SearchFlow.js

@@ -105,10 +105,24 @@ var SearchFlow = /** @class */ (function () {
         this.buildPopulate();
         this.buildOrdenation();
     }
+    SearchFlow.prototype.buildProjections = function () {
+        if (!Array.isArray(this.select)) {
+            return undefined;
+        }
+        var projection = {};
+        for (var _i = 0, _a = this.select; _i < _a.length; _i++) {
+            var field = _a[_i];
+            projection[field] = 1;
+        }
+        return projection;
+    };
     SearchFlow.prototype.buildPopulate = function () {
         if ((0, Utils_1.isEmpty)(this.populate)) {
             return;
         }
+        if (Array.isArray(this.populate)) {
+            return undefined;
+        }
         var propertiesArray = this.populate.toString().split(',');
         var populates = [];
         for (var _i = 0, propertiesArray_1 = propertiesArray; _i < propertiesArray_1.length; _i++) {
@@ -119,16 +133,15 @@ var SearchFlow = /** @class */ (function () {
         }
         this.populate = populates;
     };
-    SearchFlow.prototype.buildProjections = function () {
-        if (!Array.isArray(this.select)) {
-            return undefined;
-        }
-        var projection = {};
-        for (var _i = 0, _a = this.select; _i < _a.length; _i++) {
-            var field = _a[_i];
-            projection[field] = 1;
+    SearchFlow.prototype.buildPopulateArray = function () {
+        var populates = [];
+        for (var _i = 0, _a = this.populate; _i < _a.length; _i++) {
+            var property = _a[_i];
+            var _b = property.split('.'), first = _b[0], rest = _b.slice(1);
+            var nested = rest.join('.');
+            populates.push(this.buildPath(first, nested));
         }
-        return projection;
+        this.populate = populates;
     };
     SearchFlow.prototype.buildPath = function (target, nested) {
         if (nested === void 0) { nested = ""; }
@@ -160,9 +173,9 @@ var SearchFlow = /** @class */ (function () {
     SearchFlow.prototype.searchPageable = function (model, options) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var stagesItems, result;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var stagesItems, result, items, _i, _b, populate;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         stagesItems = __spreadArray([
                             { $match: this.filters },
@@ -189,11 +202,24 @@ var SearchFlow = /** @class */ (function () {
                                 }
                             ]).session(options === null || options === void 0 ? void 0 : options.session)];
                     case 1:
-                        result = _b.sent();
-                        return [2 /*return*/, {
-                                items: result[0].items,
-                                paging: ((_a = result[0]) === null || _a === void 0 ? void 0 : _a.paging[0]) || { total: 0, page: 1, limit: this.limit }
-                            }];
+                        result = _c.sent();
+                        items = result[0].items;
+                        _i = 0, _b = this.populate;
+                        _c.label = 2;
+                    case 2:
+                        if (!(_i < _b.length)) return [3 /*break*/, 5];
+                        populate = _b[_i];
+                        return [4 /*yield*/, model.populate(result[0].items, populate)];
+                    case 3:
+                        items = _c.sent();
+                        _c.label = 4;
+                    case 4:
+                        _i++;
+                        return [3 /*break*/, 2];
+                    case 5: return [2 /*return*/, {
+                            items: items,
+                            paging: ((_a = result[0]) === null || _a === void 0 ? void 0 : _a.paging[0]) || { total: 0, page: 1, limit: this.limit }
+                        }];
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.63",
+  "version": "2.1.65",
   "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/SearchFlow.ts

@@ -31,12 +31,29 @@ abstract class SearchFlow {
     this.buildOrdenation()
   }
 
+  buildProjections() {
+    if (!Array.isArray(this.select)) {
+      return undefined
+    }
+
+    let projection: { [key: string]: number } = {}
+    for (var field of this.select) {
+      projection[field] = 1
+    }
+
+    return projection
+  }
+
   public buildPopulate(): any {
     if (isEmpty(this.populate)) {
       return
     }
 
-    var propertiesArray = this.populate.toString().split(',')
+    if (Array.isArray(this.populate)) {
+      return undefined
+    }
+
+    var propertiesArray = (this.populate as string).toString().split(',')
     var populates = [] as any
     for (var property of propertiesArray) {
       let [first, ...rest] = property.split('.')
@@ -47,17 +64,15 @@ abstract class SearchFlow {
     this.populate = populates
   }
 
-  buildProjections() {
-    if (!Array.isArray(this.select)) {
-      return undefined
-    }
-
-    let projection: { [key: string]: number } = {}
-    for (var field of this.select) {
-      projection[field] = 1
+  buildPopulateArray() {
+    var populates = [] as any
+    for (var property of this.populate) {
+      let [first, ...rest] = property.split('.')
+      let nested = rest.join('.')
+      populates.push(this.buildPath(first, nested))
     }
 
-    return projection
+    this.populate = populates
   }
 
   public buildPath(target: string, nested: string = "") {
@@ -119,8 +134,14 @@ abstract class SearchFlow {
         }
       ]
     ).session(options?.session as ClientSession)
+
+    var items = result[0].items
+    for (var populate of this.populate) {
+      items = await model.populate(result[0].items, populate)
+    }
+
     return {
-      items: result[0].items,
+      items,
       paging: result[0]?.paging[0] || { total: 0, page: 1, limit: this.limit }
     }
   }