c2-mongoose 2.1.84 → 2.1.86

package/dist/flow/SearchFlow.js

@@ -195,13 +195,14 @@ var SearchFlow = /** @class */ (function () {
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        stagesItems = __spreadArray([
+                        stagesItems = __spreadArray(__spreadArray([
                             { $match: this.filters },
+                            this.projection ? { $project: this.projection } : { $addFields: {} }
+                        ], options.pipelines, true), [
                             { $sort: this.sort },
                             { $skip: ((this.page - 1) * this.limit) || 0 },
                             { $limit: this.limit },
-                            this.projection ? { $project: this.projection } : { $addFields: {} }
-                        ], options.pipelines, true);
+                        ], false);
                         return [4 /*yield*/, model.aggregate([
                                 {
                                     $facet: {
@@ -410,6 +411,7 @@ var SearchFlow = /** @class */ (function () {
         });
     };
     SearchFlow.prototype.buildDefaultFilters = function (objectSearch) {
+        var _this = this;
         var filters = { $and: [] };
         Object.entries(objectSearch.model).forEach(function (_a) {
             var key = _a[0], value = _a[1];
@@ -448,7 +450,7 @@ var SearchFlow = /** @class */ (function () {
                 }
                 else if (key.endsWith('Like')) {
                     var fieldName = key.replace('Like', '');
-                    condition[fieldName] = { $regex: value, $options: 'i' };
+                    condition[fieldName] = _this.buildRegex(value); //{ $regex: value as any, $options: 'i' }
                     filters.$and.push(condition);
                 }
                 else {

package/package.json

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

@@ -120,11 +120,11 @@ abstract class SearchFlow {
   async searchPageable(model: mongoose.Model<any>, options: SearchOptions) {
     let stagesItems = [
       { $match: this.filters },
+      this.projection ? { $project: this.projection } : { $addFields: {} },
+      ...options.pipelines,
       { $sort: this.sort },
       { $skip: ((this.page - 1) * this.limit) || 0 },
       { $limit: this.limit },
-      this.projection ? { $project: this.projection } : { $addFields: {} },
-      ...options.pipelines
     ]
 
     const result = await model.aggregate(
@@ -350,7 +350,7 @@ abstract class SearchFlow {
           filters.$and.push(condition)
         } else if (key.endsWith('Like')) {
           var fieldName = key.replace('Like', '')
-          condition[fieldName] = { $regex: value as any, $options: 'i' }
+          condition[fieldName] = this.buildRegex(value as string) //{ $regex: value as any, $options: 'i' }
           filters.$and.push(condition)
         } else {
           if (!Array.isArray(value)) {