c2-mongoose 1.0.3 → 1.2.0

package/dist/model/Search.d.ts

@@ -13,7 +13,7 @@ declare abstract class Search {
     buildPath: (target: string, nested?: string) => any;
     buildOrdenation: () => any;
     private isPageable;
-    private diacriticSensitiveRegex;
+    diacriticSensitiveRegex: (string?: string) => string;
     search: (model: mongoose.Model<any>) => Promise<SearchResponse<any>>;
     private searchPageable;
     private searchNoPageable;

package/dist/model/Search.js

@@ -84,6 +84,9 @@ var Search = /** @class */ (function () {
             return order;
         };
         this.isPageable = function () {
+            if ((0, Utils_1.isEmpty)(_this.page)) {
+                _this.page = 1;
+            }
             if (_this.page >= 0) {
                 return true;
             }
@@ -251,7 +254,7 @@ var Search = /** @class */ (function () {
         this.orderBy = params.orderBy || "_id";
         this.select = params.select;
         this.populate = params.populate;
-        this.page = params.page || -1;
+        this.page = params.page || undefined;
         this.limit = params.limit || 25;
         this.buildPopulate();
     }

package/package.json

@@ -1,11 +1,16 @@
 {
   "name": "c2-mongoose",
-  "version": "1.0.3",
+  "version": "1.2.0",
   "description": "Lib to make any search in database mongoose and use as basic crud",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "build": "tsc"
+    "build": "tsc",
+    "preversion": "tsc",
+    "postversion": "git push && git push --tags && npm publish",
+    "publish-patch": "npm version patch -m 'Publishing a patch'",
+    "publish-minor": "npm version minor --force -m 'Publishing a minor'",
+    "publish-major": "npm version major --force -m 'Publishing a major'"
   },
   "repository": {
     "type": "git",

package/src/model/Search.ts

@@ -18,7 +18,7 @@ abstract class Search {
     this.orderBy = params.orderBy || "_id"
     this.select = params.select
     this.populate = params.populate
-    this.page = params.page || -1
+    this.page = params.page || undefined
     this.limit = params.limit || 25
     this.buildPopulate()
   }
@@ -57,6 +57,10 @@ abstract class Search {
   }
 
   private isPageable = () => {
+    if (isEmpty(this.page)){
+      this.page = 1
+    }
+
     if (this.page >= 0) {
       return true
     }

package/dist/src/configuration/Environment.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.dbCollation = void 0;
-exports.dbCollation = process.env.DB_COLLACTION;
-exports.default = process.env;

package/dist/src/index.js

@@ -1,7 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const Search_1 = __importDefault(require("./model/Search"));
-exports.default = Search_1.default;

package/dist/src/model/Search.js

@@ -1,174 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const Environment_1 = require("../configuration/Environment");
-const Utils_1 = require("../utils/Utils");
-class Search {
-    constructor(params) {
-        this.buildPopulate = () => {
-            if ((0, Utils_1.isEmpty)(this.populate)) {
-                return;
-            }
-            var propertiesArray = this.populate.split(',');
-            var populates = [];
-            for (var property of propertiesArray) {
-                let [first, ...rest] = property.split('.');
-                let nested = rest.join('.');
-                populates.push(this.buildPath(first, nested));
-            }
-            this.populate = populates;
-        };
-        this.buildPath = (target, nested = "") => {
-            var populate = {};
-            populate.path = target;
-            if ((0, Utils_1.isNotEmpty)(nested)) {
-                let [first, ...rest] = nested.split('.');
-                let nested2 = rest.join('.');
-                populate.populate = this.buildPath(first, nested2);
-            }
-            return populate;
-        };
-        this.buildOrdenation = () => {
-            let order = {};
-            this.orderBy = this.orderBy || "_id";
-            order[this.orderBy] = this.order === "desc" ? -1 : 1;
-            return order;
-        };
-        this.isPageable = () => {
-            if (this.page >= 0) {
-                return true;
-            }
-            return false;
-        };
-        this.diacriticSensitiveRegex = (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,ç,Ç]');
-        };
-        this.search = (model) => __awaiter(this, void 0, void 0, function* () {
-            if (this.isPageable()) {
-                return yield this.searchPageable(model);
-            }
-            return yield this.searchNoPageable(model);
-        });
-        this.searchPageable = (model) => __awaiter(this, void 0, void 0, function* () {
-            const sort = this.buildOrdenation();
-            var items = yield model
-                .find(this.filters, this.select)
-                .populate(this.populate)
-                .skip(this.page * this.limit)
-                .limit(this.limit)
-                .sort(sort)
-                .collation({
-                locale: Environment_1.dbCollation || "pt"
-            });
-            return this.result(model, items);
-        });
-        this.searchNoPageable = (model) => __awaiter(this, void 0, void 0, function* () {
-            const sort = this.buildOrdenation();
-            var items = yield model
-                .find(this.filters, this.select)
-                .populate(this.populate)
-                .sort(sort)
-                .collation({
-                locale: Environment_1.dbCollation || "pt"
-            });
-            return this.result(model, items);
-        });
-        this.result = (model, items) => __awaiter(this, void 0, void 0, function* () {
-            var total = yield this.count(model);
-            var paging = {};
-            paging.total = total;
-            paging.page = this.page;
-            paging.limit = this.limit;
-            var searchResponse = {};
-            searchResponse.items = items;
-            searchResponse.paging = paging;
-            return searchResponse;
-        });
-        this.count = (model) => __awaiter(this, void 0, void 0, function* () {
-            return yield model.countDocuments(this.filters).exec();
-        });
-        this.sumBy = (model, _sum, _by) => __awaiter(this, void 0, void 0, function* () {
-            const ret = yield model.aggregate([
-                {
-                    '$match': this.filters
-                },
-                {
-                    $group: {
-                        _id: _by,
-                        totalValue: { "$sum": _sum },
-                        count: { "$sum": 1 }
-                    }
-                }
-            ]);
-            return ret;
-        });
-        this.buildDefaultFilters = (objectSearch) => {
-            let filters = { $and: [] };
-            Object.entries(objectSearch).forEach(([key, value]) => {
-                if ((0, Utils_1.isNotEmpty)(value)) {
-                    let condition = {};
-                    if (['order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'searchText'].includes(key)) {
-                        return;
-                    }
-                    if (key.endsWith('DateRange')) {
-                        var keyAux = key.replace('Range', '');
-                        var values = value;
-                        if ((0, Utils_1.isNotEmpty)(values[0])) {
-                            condition[keyAux] = Object.assign(Object.assign({}, condition[keyAux]), { $gte: new Date(values[0]) });
-                        }
-                        if ((0, Utils_1.isNotEmpty)(values[1])) {
-                            condition[keyAux] = Object.assign(Object.assign({}, condition[keyAux]), { $lte: new Date(values[1]) });
-                        }
-                    }
-                    else {
-                        if (!Array.isArray(value)) {
-                            condition[key] = value;
-                        }
-                        else {
-                            condition[key] = { $in: value };
-                        }
-                    }
-                    filters.$and.push(condition);
-                }
-            });
-            if ((0, Utils_1.isNotEmpty)(objectSearch.model)) {
-                this.addFilterModel(objectSearch.model, filters);
-            }
-            if (filters.$and.length === 0)
-                delete filters['$and'];
-            return filters;
-        };
-        this.addFilterModel = (model, filters) => {
-            Object.entries(model).forEach(([key, value]) => {
-                if ((0, Utils_1.isNotEmpty)(value)) {
-                    let condition = {};
-                    condition[key] = value;
-                    filters.$and.push(condition);
-                }
-            });
-        };
-        this.searchText = params.searchText || "";
-        this.order = params.order || "asc";
-        this.orderBy = params.orderBy || "_id";
-        this.select = params.select;
-        this.populate = params.populate;
-        this.page = params.page || -1;
-        this.limit = params.limit || 25;
-        this.buildPopulate();
-    }
-}
-exports.default = Search;

package/dist/src/utils/Utils.js

@@ -1,56 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareDesc = exports.compareAsc = exports.isNotIterable = exports.isIterable = exports.isEmpty = exports.isNotEmpty = void 0;
-const isNotEmpty = (obj) => {
-    return !(0, exports.isEmpty)(obj);
-};
-exports.isNotEmpty = isNotEmpty;
-const isEmpty = (obj) => {
-    if (!obj) {
-        return true;
-    }
-    if (Array.isArray(obj)) {
-        if (obj.length == 0) {
-            return true;
-        }
-    }
-    if (obj === "") {
-        return true;
-    }
-    return false;
-};
-exports.isEmpty = isEmpty;
-const isIterable = (input) => {
-    if (input === null || input === undefined) {
-        return false;
-    }
-    if ('string' === typeof input) {
-        return false;
-    }
-    return typeof input[Symbol.iterator] === 'function';
-};
-exports.isIterable = isIterable;
-const isNotIterable = (input) => {
-    return !(0, exports.isIterable)(input);
-};
-exports.isNotIterable = isNotIterable;
-const compareAsc = (a, b) => {
-    if (a._id < b._id) {
-        return -1;
-    }
-    if (a._id > b._id) {
-        return 1;
-    }
-    return 0;
-};
-exports.compareAsc = compareAsc;
-const compareDesc = (a, b) => {
-    if (a._id > b._id) {
-        return -1;
-    }
-    if (a._id < b._id) {
-        return 1;
-    }
-    return 0;
-};
-exports.compareDesc = compareDesc;