c2-mongoose 2.1.142 → 2.1.144

package/dist/flow/SearchFlow.d.ts

@@ -18,7 +18,6 @@ declare abstract class SearchFlow {
     buildProjections(): any;
     buildProjectionNested(projectCurrent: any, field: string, include: boolean): any;
     buildPopulate(): any;
-    buildPopulateArray(): void;
     buildPath(target: string, nested?: string): any;
     buildOrdenation(): any;
     buildRegex(searchText: string): RegExp;

package/dist/flow/SearchFlow.js

@@ -64,7 +64,7 @@ var SearchFlow = /** @class */ (function () {
         this.limit = Number(params.limit || 25);
         this.pageable = params.pageable == false || params.pageable == 'false' ? false : true;
         this.projection = this.buildProjections();
-        this.buildPopulate();
+        this.populate = this.buildPopulate();
         this.buildOrdenation();
     }
     SearchFlow.prototype.buildProjections = function () {
@@ -81,7 +81,6 @@ var SearchFlow = /** @class */ (function () {
         return projection;
     };
     SearchFlow.prototype.buildProjectionNested = function (projectCurrent, field, include) {
-        // var projectionAux: { [key: string]: any } = {}
         var _a = field.split('.'), first = _a[0], rest = _a.slice(1);
         if (rest.length === 0) {
             projectCurrent[first] = include ? 1 : 0;
@@ -94,22 +93,14 @@ var SearchFlow = /** @class */ (function () {
         if ((0, Utils_1.isEmpty)(this.populate)) {
             return;
         }
-        if (Array.isArray(this.populate)) {
-            return this.buildPopulateArray();
-        }
-        var propertiesArray = this.populate.toString().split(',');
-        var populates = [];
-        for (var _i = 0, propertiesArray_1 = propertiesArray; _i < propertiesArray_1.length; _i++) {
-            var property = propertiesArray_1[_i];
-            var _a = property.split('.'), first = _a[0], rest = _a.slice(1);
-            var nested = rest.join('.');
-            populates.push(this.buildPath(first, nested));
+        if (!Array.isArray(this.populate)) {
+            return;
         }
-        this.populate = populates;
-    };
-    SearchFlow.prototype.buildPopulateArray = function () {
         var populates = [];
         var _loop_1 = function () {
+            if (property.include(".")) {
+                return "continue";
+            }
             var _b = property.split('.'), first = _b[0], rest = _b.slice(1);
             var nested = rest.join('.');
             var populate = this_1.buildPath(first, nested);
@@ -124,7 +115,7 @@ var SearchFlow = /** @class */ (function () {
             var property = _a[_i];
             _loop_1();
         }
-        this.populate = populates;
+        return populates;
     };
     SearchFlow.prototype.buildPath = function (target, nested) {
         if (nested === void 0) { nested = ""; }
@@ -221,9 +212,9 @@ var SearchFlow = /** @class */ (function () {
     };
     SearchFlow.prototype.searchPageable = function (model, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var stagesItems, stagesPaging, stagesMetadata, facet, _i, stagesMetadata_2, metadata, result, items, _a, _b, populate, resultAux;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var stagesItems, stagesPaging, stagesMetadata, facet, _i, stagesMetadata_2, metadata, result, _a, _b, populate, _c, resultAux;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         stagesItems = [];
                         if ((0, Utils_1.isNotEmpty)(options.pipelines)) {
@@ -267,18 +258,18 @@ var SearchFlow = /** @class */ (function () {
                                 },
                             ]).session(options === null || options === void 0 ? void 0 : options.session)];
                     case 1:
-                        result = _c.sent();
-                        items = result[0].items;
+                        result = _d.sent();
                         if (!((0, Utils_1.isNotEmpty)(this.populate) && Array.isArray(this.populate))) return [3 /*break*/, 5];
                         _a = 0, _b = this.populate;
-                        _c.label = 2;
+                        _d.label = 2;
                     case 2:
                         if (!(_a < _b.length)) return [3 /*break*/, 5];
                         populate = _b[_a];
+                        _c = result[0];
                         return [4 /*yield*/, model.populate(result[0].items, populate)];
                     case 3:
-                        items = _c.sent();
-                        _c.label = 4;
+                        _c.items = _d.sent();
+                        _d.label = 4;
                     case 4:
                         _a++;
                         return [3 /*break*/, 2];

package/package.json

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

@@ -26,7 +26,7 @@ abstract class SearchFlow {
     this.limit = Number(params.limit || 25)
     this.pageable = params.pageable == false || params.pageable == 'false' ? false : true
     this.projection = this.buildProjections()
-    this.buildPopulate()
+    this.populate = this.buildPopulate()
     this.buildOrdenation()
   }
 
@@ -49,7 +49,6 @@ abstract class SearchFlow {
   }
 
   buildProjectionNested(projectCurrent: any, field: string, include: boolean) {
-    // var projectionAux: { [key: string]: any } = {}
     let [first, ...rest] = field.split('.')
 
     if (rest.length === 0) {
@@ -64,34 +63,20 @@ abstract class SearchFlow {
     return projectCurrent
   }
 
-
-
-
-
-
   public buildPopulate(): any {
     if (isEmpty(this.populate)) {
       return
     }
 
-    if (Array.isArray(this.populate)) {
-      return this.buildPopulateArray()
-    }
-
-    var propertiesArray = (this.populate as string).toString().split(',')
-    var populates = [] as any
-    for (var property of propertiesArray) {
-      let [first, ...rest] = property.split('.')
-      let nested = rest.join('.')
-      populates.push(this.buildPath(first, nested))
+    if (!Array.isArray(this.populate)) {
+      return
     }
 
-    this.populate = populates
-  }
-
-  buildPopulateArray() {
     var populates = [] as any
     for (var property of this.populate) {
+      if (property.include(".")) {
+        continue
+      }
       let [first, ...rest] = property.split('.')
       let nested = rest.join('.')
       let populate = this.buildPath(first, nested)
@@ -102,7 +87,7 @@ abstract class SearchFlow {
       populates.push(populate)
     }
 
-    this.populate = populates
+    return populates
   }
 
   public buildPath(target: string, nested: string = "") {
@@ -245,8 +230,6 @@ abstract class SearchFlow {
       facet[metadata.id] = metadata.conditions
     }
 
-
-
     const result = await model.aggregate(
       [
         {
@@ -255,11 +238,9 @@ abstract class SearchFlow {
       ]
     ).session(options?.session as ClientSession)
 
-    var items = result[0].items
-
     if (isNotEmpty(this.populate) && Array.isArray(this.populate)) {
       for (var populate of this.populate) {
-        items = await model.populate(result[0].items, populate)
+        result[0].items = await model.populate(result[0].items, populate)
       }
     }