c2-mongoose 2.0.2 → 2.0.4

package/dist/flow/CrudFlow.d.ts

@@ -1,13 +1,13 @@
 import mongoose from "mongoose";
 import SearchFlow from "./SearchFlow";
-declare class CrudFlow<D> {
+declare class CrudFlow<D> extends SearchFlow {
     private repository;
-    constructor(repository: mongoose.Model<any>);
-    create: (data: D, session?: any) => Promise<D>;
+    constructor(repository: mongoose.Model<any>, model?: any);
+    create: (data: any, session?: any) => Promise<any[]>;
     delete: (id: string, session?: any) => Promise<void>;
     update: (id: string, data: D, session?: any) => Promise<D>;
     find: (search: SearchFlow) => Promise<SearchResponse<D>>;
-    findOne: (model: D, sort?: undefined) => Promise<D>;
+    getOne: (model: D, select: undefined, populate: string | [] | any, sort?: undefined) => Promise<D>;
     get: (id: string, pop?: string, sel?: string) => Promise<D>;
 }
 export default CrudFlow;

package/dist/flow/CrudFlow.js

@@ -1,4 +1,19 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 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) {
@@ -35,11 +50,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var CrudFlow = /** @class */ (function () {
-    function CrudFlow(repository) {
-        var _this = this;
-        this.create = function (data, session) {
+var SearchFlow_1 = __importDefault(require("./SearchFlow"));
+var CrudFlow = /** @class */ (function (_super) {
+    __extends(CrudFlow, _super);
+    function CrudFlow(repository, model) {
+        if (model === void 0) { model = {}; }
+        var _this = _super.call(this, model) || this;
+        _this.create = function (data, session) {
             if (session === void 0) { session = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
@@ -50,7 +71,7 @@ var CrudFlow = /** @class */ (function () {
                 });
             });
         };
-        this.delete = function (id, session) {
+        _this.delete = function (id, session) {
             if (session === void 0) { session = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
@@ -63,7 +84,7 @@ var CrudFlow = /** @class */ (function () {
                 });
             });
         };
-        this.update = function (id, data, session) {
+        _this.update = function (id, data, session) {
             if (session === void 0) { session = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
                 var dataAfter;
@@ -77,7 +98,7 @@ var CrudFlow = /** @class */ (function () {
                 });
             });
         };
-        this.find = function (search) { return __awaiter(_this, void 0, void 0, function () {
+        _this.find = function (search) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, search.search(this.repository)];
@@ -85,14 +106,14 @@ var CrudFlow = /** @class */ (function () {
                 }
             });
         }); };
-        this.findOne = function (model, sort) {
+        _this.getOne = function (model, select, populate, sort) {
+            if (select === void 0) { select = undefined; }
             if (sort === void 0) { sort = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
                 var data;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.repository.findOne(model)
-                                .sort(sort)];
+                        case 0: return [4 /*yield*/, _super.prototype.findOne.call(this, this.repository, model, select, populate, sort)];
                         case 1:
                             data = _a.sent();
                             return [2 /*return*/, data];
@@ -100,7 +121,7 @@ var CrudFlow = /** @class */ (function () {
                 });
             });
         };
-        this.get = function (id, pop, sel) {
+        _this.get = function (id, pop, sel) {
             if (pop === void 0) { pop = ""; }
             if (sel === void 0) { sel = ""; }
             return __awaiter(_this, void 0, void 0, function () {
@@ -115,8 +136,9 @@ var CrudFlow = /** @class */ (function () {
                 });
             });
         };
-        this.repository = repository;
+        _this.repository = repository;
+        return _this;
     }
     return CrudFlow;
-}());
+}(SearchFlow_1.default));
 exports.default = CrudFlow;

package/dist/flow/SearchFlow.d.ts

@@ -19,6 +19,7 @@ declare abstract class SearchFlow {
     private searchNoPageable;
     private result;
     count: (model: mongoose.Model<any>) => Promise<number>;
+    findOne(repository: mongoose.Model<any>, model: any, select: undefined, populate: string | [] | any, sort?: undefined): Promise<any>;
     sumBy: (model: mongoose.Model<any>, _sum: any, _by: any) => Promise<any[]>;
     buildDefaultFilters: (objectSearch: any) => any;
     addFilterModel: (model: any, filters: any) => void;

package/dist/flow/SearchFlow.js

@@ -260,6 +260,21 @@ var SearchFlow = /** @class */ (function () {
         this.limit = params.limit || 25;
         this.buildPopulate();
     }
+    SearchFlow.prototype.findOne = function (repository, model, select, populate, sort) {
+        if (select === void 0) { select = undefined; }
+        if (sort === void 0) { sort = undefined; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, repository.findOne(model)
+                            .sort(sort)
+                            .select(select)
+                            .populate(populate)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
     return SearchFlow;
 }());
 exports.default = SearchFlow;

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "c2-mongoose",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "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",
-    "preversion": "tsc",
+    "watch": "tsc -w --skipLibCheck",
+    "build": "tsc --skipLibCheck",
+    "preversion": "tsc  --skipLibCheck",
     "postversion": "git push && git push --tags && npm publish",
     "publish-patch": "npm version patch",
     "publish-minor": "npm version minor",

package/src/flow/CrudFlow.ts

@@ -1,16 +1,17 @@
 import mongoose from "mongoose"
 import SearchFlow from "./SearchFlow"
 
-class CrudFlow<D> {
-    
+class CrudFlow<D> extends SearchFlow {
+
     private repository: mongoose.Model<any>
 
-    constructor(repository: mongoose.Model<any>) {
+    constructor(repository: mongoose.Model<any>, model: any = {}) {
+        super(model as D)
         this.repository = repository
     }
 
-    public create = async (data: D, session: any = undefined): Promise<D> => {
-        return await this.repository.create([data], { session }) as D
+    public create = async (data: any, session: any = undefined) => {
+        return await this.repository.create([data], { session })
     }
 
     public delete = async (id: string, session: any = undefined) => {
@@ -26,10 +27,8 @@ class CrudFlow<D> {
         return await search.search(this.repository)
     }
 
-    public findOne = async (model: D, sort = undefined): Promise<D> => {
-        const data = await this.repository.findOne(model as any)
-            .sort(sort)
-
+    public getOne = async (model: D, select = undefined, populate: string | [] | any, sort = undefined): Promise<D> => {
+        const data = await super.findOne(this.repository, model, select, populate, sort)
         return data as D
     }
 

package/src/flow/SearchFlow.ts

@@ -133,6 +133,13 @@ abstract class SearchFlow {
     return await model.countDocuments(this.filters).exec()
   }
 
+  public async findOne(repository: mongoose.Model<any>, model: any, select = undefined, populate: string | [] | any, sort = undefined) {
+    return await repository.findOne(model)
+      .sort(sort)
+      .select(select)
+      .populate(populate)
+  }
+
   public sumBy = async (model: mongoose.Model<any>, _sum: any, _by: any): Promise<any[]> => {
     const ret = await model.aggregate(
       [