c2-mongoose 2.1.50 → 2.1.52

package/dist/flow/SearchFlow.d.ts

@@ -15,7 +15,7 @@ declare abstract class SearchFlow {
     buildPopulate(): any;
     buildPath(target: string, nested?: string): any;
     buildOrdenation(): any;
-    diacriticSensitiveRegex(string?: string): string;
+    buildRegex(searchText: string): RegExp;
     searchPageable(model: mongoose.Model<any>, pipeline: any): Promise<{
         items: any;
         paging: any;

package/dist/flow/SearchFlow.js

@@ -135,21 +135,21 @@ var SearchFlow = /** @class */ (function () {
         this.sort = order;
         return order;
     };
-    SearchFlow.prototype.diacriticSensitiveRegex = function (string) {
-        if (string === void 0) { string = ""; }
-        return string
-            .replace(/[a|á|à|ä|â|A|Á|Â|Ã|Ä]/g, '[a,á,à,ä,â,A,Á,Â,Ã,Ä]')
-            .replace(/[e|é|ë|è|E|É|Ë|È]/g, '[e,é,ë,è,E,É,Ë,È]')
-            .replace(/[i|í|ï|ì|I|Í|Ï|Ì]/g, '[i,í,ï,ì,I,Í,Ï,Ì]')
-            .replace(/[o|ó|ö|ò|õ|O|Ó|Ö|Ô|Õ]/g, '[o,ó,ö,ò,õ,O,Ó,Ö,Ô,Õ]')
-            .replace(/[u|ü|ú|ù|U|Ú|Ü|Ù]/g, '[u,ü,ú,ù,U,Ú,Ü,Ù]')
-            .replace(/[ç|Ç|c|C]/g, '[c,C,ç,Ç]');
+    SearchFlow.prototype.buildRegex = function (searchText) {
+        var regexExpression = searchText
+            .replace(/^"/, '^').replace(/"$/, '$') //Replace aspas duplas para busca exata
+            .replace(/^%22/, '^').replace(/%22$/, '$') //Replace aspas duplas para busca exata
+            .replace(/%20/, ' ') //Replace espaço em branco para nao quebrar o proximo replace
+            .replace(/%/g, '.*?') //Replace % para o padrão regex (% é muito utilizado como o .*? e é mais simples para o usuario digitar)
+            .replace(/[ç|c|C|Ç]/g, '[c,ç]');
+        return new RegExp("".concat(regexExpression), 'i');
     };
     SearchFlow.prototype.searchPageable = function (model, pipeline) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var stagesItems, result;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         stagesItems = __spreadArray([
                             { $match: this.filters },
@@ -175,10 +175,10 @@ var SearchFlow = /** @class */ (function () {
                                 }
                             ])];
                     case 1:
-                        result = _a.sent();
+                        result = _b.sent();
                         return [2 /*return*/, {
                                 items: result[0].items,
-                                paging: result[0].paging[0]
+                                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.50",
+  "version": "2.1.52",
   "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

@@ -64,14 +64,14 @@ abstract class SearchFlow {
     return order
   }
 
-  public diacriticSensitiveRegex(string: string = ""): string {
-    return string
-      .replace(/[a|á|à|ä|â|A|Á|Â|Ã|Ä]/g, '[a,á,à,ä,â,A,Á,Â,Ã,Ä]')
-      .replace(/[e|é|ë|è|E|É|Ë|È]/g, '[e,é,ë,è,E,É,Ë,È]')
-      .replace(/[i|í|ï|ì|I|Í|Ï|Ì]/g, '[i,í,ï,ì,I,Í,Ï,Ì]')
-      .replace(/[o|ó|ö|ò|õ|O|Ó|Ö|Ô|Õ]/g, '[o,ó,ö,ò,õ,O,Ó,Ö,Ô,Õ]')
-      .replace(/[u|ü|ú|ù|U|Ú|Ü|Ù]/g, '[u,ü,ú,ù,U,Ú,Ü,Ù]')
-      .replace(/[ç|Ç|c|C]/g, '[c,C,ç,Ç]')
+  buildRegex(searchText: string): RegExp {
+    let regexExpression = searchText
+      .replace(/^"/, '^').replace(/"$/, '$') //Replace aspas duplas para busca exata
+      .replace(/^%22/, '^').replace(/%22$/, '$') //Replace aspas duplas para busca exata
+      .replace(/%20/, ' ')  //Replace espaço em branco para nao quebrar o proximo replace
+      .replace(/%/g, '.*?') //Replace % para o padrão regex (% é muito utilizado como o .*? e é mais simples para o usuario digitar)
+      .replace(/[ç|c|C|Ç]/g, '[c,ç]')
+    return new RegExp(`${regexExpression}`, 'i');
   }
 
   async searchPageable(model: mongoose.Model<any>, pipeline: any) {
@@ -105,7 +105,7 @@ abstract class SearchFlow {
     )
     return {
       items: result[0].items,
-      paging: result[0].paging[0]
+      paging: result[0]?.paging[0] || { total: 0, page: 1, limit: this.limit }
     }
   }