c2-mongoose 2.1.62 → 2.1.64

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 {};
-        }
-        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 = ""; }
@@ -168,7 +181,8 @@ var SearchFlow = /** @class */ (function () {
                             { $match: this.filters },
                             { $sort: this.sort },
                             { $skip: (this.page - 1) * this.limit },
-                            { $limit: this.limit }
+                            { $limit: this.limit },
+                            this.projection ? { $project: this.projection } : { $addFields: {} }
                         ], options.pipelines, true);
                         return [4 /*yield*/, model.aggregate([
                                 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.62",
+  "version": "2.1.64",
   "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 {}
-    }
-
-    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 = "") {
@@ -95,7 +110,7 @@ abstract class SearchFlow {
       { $sort: this.sort },
       { $skip: (this.page - 1) * this.limit },
       { $limit: this.limit },
-      // { $project: this.projection },
+      this.projection ? { $project: this.projection } : { $addFields: {} },
       ...options.pipelines
     ]