c2-http 1.0.41 → 1.0.43

package/dist/index.js

@@ -22,6 +22,57 @@ Object.defineProperty(exports, "CrudController", { enumerable: true, get: functi
 const HttpError_1 = require("./model/HttpError");
 const Server_1 = require("./model/Server");
 Object.defineProperty(exports, "Server", { enumerable: true, get: function () { return Server_1.Server; } });
+global.OPEN_API_DOC = {
+    "openapi": "3.1.0",
+    "info": {
+        "version": "1.0.0",
+        "title": "REST API",
+        "description": ""
+    },
+    "servers": [
+        {
+            "url": "http://localhost:3000/"
+        }
+    ],
+    "components": {
+        "schemas": {
+            "info": {
+                "type": "object",
+                "properties": {
+                    "title": {
+                        "type": "string",
+                        "example": "Sua API"
+                    },
+                    "version": {
+                        "type": "string",
+                        "example": "1.0.0"
+                    },
+                    "description": {
+                        "type": "string",
+                        "example": "Descrição da sua API"
+                    }
+                }
+            },
+            "servers": {
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "properties": {
+                        "url": {
+                            "type": "string",
+                            "example": "http://localhost:3000"
+                        },
+                        "description": {
+                            "type": "string",
+                            "example": "Servidor local"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    paths: {}
+};
 const convertErrorToHttpError = (error) => {
     if (error instanceof mongodb_1.MongoServerError) {
         if (error.code === 11000) {

package/dist/model/Controller.d.ts

@@ -1,9 +1,10 @@
 import { Router } from "express";
 import { IControllerOptions } from "./IControllerOptions";
+import { ControllerRoute } from "./ControllerRoute";
 export declare abstract class Controller {
     routers: Router;
-    documentation: any;
     protected options: IControllerOptions;
+    routesControlled: ControllerRoute[];
     constructor(_options: Partial<IControllerOptions>);
 }
 export declare function HttpDispatchHandling(target: any, methodName: string, descriptor: PropertyDescriptor): PropertyDescriptor;

package/dist/model/Controller.js

@@ -1,16 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenApi = exports.HttpDispatchDownload = exports.HttpDispatchHandling = exports.Controller = void 0;
-/* eslint-disable @typescript-eslint/ban-types */
 const c2_util_1 = require("c2-util");
 const express_1 = require("express");
 const http_status_1 = require("http-status");
 class Controller {
     routers = (0, express_1.Router)();
-    documentation;
     options;
-    // Propriedade estática compartilhada por todas as instâncias
-    // static openApi: any = {};
+    routesControlled = [];
     constructor(_options) {
         this.options = _options;
         if (!this?.options?.relativePath?.startsWith("/")) {
@@ -30,57 +27,6 @@ class Controller {
             this.options.prefixRole = defaultPrefixRole.replaceAll("/", "-");
         }
         this.options.uri = `${this.options.basePath}${this.options.relativePath}`;
-        global.OPEN_API_DOC = {
-            "openapi": "3.1.0",
-            "info": {
-                "version": "1.0.0",
-                "title": "REST API",
-                "description": ""
-            },
-            "servers": [
-                {
-                    "url": "http://localhost:3000/"
-                }
-            ],
-            "components": {
-                "schemas": {
-                    "info": {
-                        "type": "object",
-                        "properties": {
-                            "title": {
-                                "type": "string",
-                                "example": "Sua API"
-                            },
-                            "version": {
-                                "type": "string",
-                                "example": "1.0.0"
-                            },
-                            "description": {
-                                "type": "string",
-                                "example": "Descrição da sua API"
-                            }
-                        }
-                    },
-                    "servers": {
-                        "type": "array",
-                        "items": {
-                            "type": "object",
-                            "properties": {
-                                "url": {
-                                    "type": "string",
-                                    "example": "http://localhost:3000"
-                                },
-                                "description": {
-                                    "type": "string",
-                                    "example": "Servidor local"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            paths: {}
-        };
     }
 }
 exports.Controller = Controller;
@@ -136,7 +82,9 @@ function OpenApi(target) {
                     const methodsUsed = this.getMethodsUsed2(route.route.methods);
                     const methods = {};
                     methodsUsed.forEach((method) => {
-                        methods[method] = {};
+                        methods[method] = {
+                            tags: [target.name]
+                        };
                     });
                     paths[route.route.path] = {
                         ...paths[route.route.path],

package/dist/model/ControllerRoleMiddleware.d.ts

@@ -0,0 +1,6 @@
+export declare class ControllerRoleMiddleware {
+    roles: string[];
+    checkRoleFn: (roles: string[]) => any;
+    constructor(roles: string[], checkRoleFn: (roles: string[]) => any);
+    exec(): void;
+}

package/dist/model/ControllerRoleMiddleware.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ControllerRoleMiddleware = void 0;
+class ControllerRoleMiddleware {
+    roles;
+    checkRoleFn;
+    // run: (request: Request, response: Response, next: NextFunction) => any
+    constructor(roles, checkRoleFn) {
+        this.roles = roles;
+        this.checkRoleFn = checkRoleFn;
+    }
+    exec() {
+        this.checkRoleFn(this.roles);
+    }
+}
+exports.ControllerRoleMiddleware = ControllerRoleMiddleware;

package/dist/model/ControllerRoute.d.ts

@@ -0,0 +1,18 @@
+import { Request, Response, Router } from "express";
+import { ControllerRoleMiddleware } from "./ControllerRoleMiddleware";
+export declare class ControllerRoute {
+    router: Router;
+    method: string;
+    uri: string;
+    middlewaresRoles: ControllerRoleMiddleware[];
+    controllerFn: (request: Request, response: Response) => Promise<any>;
+    openApiPath: IOpenApiPath;
+    constructor(options: any);
+    initialize(): void;
+}
+export interface IOpenApiPath {
+    path: string;
+    description: string;
+    response: any;
+    parameters: any;
+}

package/dist/model/ControllerRoute.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ControllerRoute = void 0;
+class ControllerRoute {
+    router;
+    method;
+    uri;
+    middlewaresRoles; //(() => void)[];
+    controllerFn;
+    openApiPath;
+    constructor(options) {
+        this.router = options.router;
+        this.method = options.method;
+        this.uri = options.uri;
+        this.middlewaresRoles = options.middlewaresRoles;
+        this.controllerFn = options.controllerFn;
+        this.openApiPath = options.openApiPath;
+        this.initialize();
+    }
+    initialize() {
+        // router.use(this.method, ...this.middlewares, this.controllerFn)
+        this.router[this.method](this.uri, this.middlewaresRoles.map((middl) => middl.exec()), this.controllerFn);
+    }
+}
+exports.ControllerRoute = ControllerRoute;

package/dist/model/CrudController.js

@@ -8,6 +8,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrudController = void 0;
 const Controller_1 = require("./Controller");
+const ControllerRoleMiddleware_1 = require("./ControllerRoleMiddleware");
+const ControllerRoute_1 = require("./ControllerRoute");
 class CrudController extends Controller_1.Controller {
     constructor(options) {
         super(options);
@@ -17,18 +19,93 @@ class CrudController extends Controller_1.Controller {
         this.updateRunner = this.updateRunner.bind(this);
         this.deleteRunner = this.deleteRunner.bind(this);
         if (options.byPass === true || options.middlewareRoles === undefined) {
-            this.routers.get(`${this.options.uri}/:id`, this.getByIdRunner);
-            this.routers.get(`${this.options.uri}`, this.searchRunner);
-            this.routers.post(`${this.options.uri}`, this.createRunner);
-            this.routers.patch(`${this.options.uri}/:id`, this.updateRunner);
-            this.routers.delete(`${this.options.uri}/:id`, this.deleteRunner);
+            // this.routers.get(`${this.options.uri}/:id`, this.getByIdRunner)
+            // this.routers.get(`${this.options.uri}`, this.searchRunner)
+            // this.routers.post(`${this.options.uri}`, this.createRunner)
+            // this.routers.patch(`${this.options.uri}/:id`, this.updateRunner)
+            // this.routers.delete(`${this.options.uri}/:id`, this.deleteRunner)
+            this.routesControlled.push(new ControllerRoute_1.ControllerRoute({
+                router: this.routers,
+                method: "get",
+                uri: `${this.options.uri}/:id`,
+                controllerFn: this.getByIdRunner
+            }));
+            this.routesControlled.push(new ControllerRoute_1.ControllerRoute({
+                router: this.routers,
+                method: "get",
+                uri: `${this.options.uri}`,
+                controllerFn: this.searchRunner
+            }));
+            this.routesControlled.push(new ControllerRoute_1.ControllerRoute({
+                router: this.routers,
+                method: "post",
+                uri: `${this.options.uri}`,
+                controllerFn: this.createRunner
+            }));
+            this.routesControlled.push(new ControllerRoute_1.ControllerRoute({
+                router: this.routers,
+                method: "patch",
+                uri: `${this.options.uri}/:id`,
+                controllerFn: this.updateRunner
+            }));
+            this.routesControlled.push(new ControllerRoute_1.ControllerRoute({
+                router: this.routers,
+                method: "delete",
+                uri: `${this.options.uri}/:id`,
+                controllerFn: this.deleteRunner
+            }));
         }
         else {
-            this.routers.get(`${this.options.uri}/:id`, options.middlewareRoles([`${this.options.prefixRole}:read`]), this.getByIdRunner);
-            this.routers.get(`${this.options.uri}`, options.middlewareRoles([`${this.options.prefixRole}:read`]), this.searchRunner);
-            this.routers.post(`${this.options.uri}`, options.middlewareRoles([`${this.options.prefixRole}:create`]), this.createRunner);
-            this.routers.patch(`${this.options.uri}/:id`, options.middlewareRoles([`${this.options.prefixRole}:edit`]), this.updateRunner);
-            this.routers.delete(`${this.options.uri}/:id`, options.middlewareRoles([`${this.options.prefixRole}:delete`]), this.deleteRunner);
+            // this.routers.get(`${this.options.uri}/:id`,
+            //   options.middlewareRoles([`${this.options.prefixRole}:read`]),
+            //   this.getByIdRunner)
+            // this.routers.get(`${this.options.uri}`,
+            //   options.middlewareRoles([`${this.options.prefixRole}:read`]),
+            //   this.searchRunner)
+            // this.routers.post(`${this.options.uri}`,
+            //   options.middlewareRoles([`${this.options.prefixRole}:create`]),
+            //   this.createRunner)
+            // this.routers.patch(`${this.options.uri}/:id`,
+            //   options.middlewareRoles([`${this.options.prefixRole}:edit`]),
+            //   this.updateRunner)
+            // this.routers.delete(`${this.options.uri}/:id`,
+            //   options.middlewareRoles([`${this.options.prefixRole}:delete`]),
+            //   this.deleteRunner)
+            this.routesControlled.push(new ControllerRoute_1.ControllerRoute({
+                router: this.routers,
+                method: "get",
+                uri: `${this.options.uri}/:id`,
+                middlewaresRoles: new ControllerRoleMiddleware_1.ControllerRoleMiddleware([`${this.options.prefixRole}:read`], options.middlewareRoles),
+                controllerFn: this.getByIdRunner
+            }));
+            this.routesControlled.push(new ControllerRoute_1.ControllerRoute({
+                router: this.routers,
+                method: "get",
+                uri: `${this.options.uri}`,
+                middlewaresRoles: new ControllerRoleMiddleware_1.ControllerRoleMiddleware([`${this.options.prefixRole}:read`], options.middlewareRoles),
+                controllerFn: this.searchRunner
+            }));
+            this.routesControlled.push(new ControllerRoute_1.ControllerRoute({
+                router: this.routers,
+                method: "post",
+                uri: `${this.options.uri}`,
+                middlewaresRoles: new ControllerRoleMiddleware_1.ControllerRoleMiddleware([`${this.options.prefixRole}:create`], options.middlewareRoles),
+                controllerFn: this.createRunner
+            }));
+            this.routesControlled.push(new ControllerRoute_1.ControllerRoute({
+                router: this.routers,
+                method: "patch",
+                uri: `${this.options.uri}/:id`,
+                middlewaresRoles: new ControllerRoleMiddleware_1.ControllerRoleMiddleware([`${this.options.prefixRole}:edit`], options.middlewareRoles),
+                controllerFn: this.updateRunner
+            }));
+            this.routesControlled.push(new ControllerRoute_1.ControllerRoute({
+                router: this.routers,
+                method: "delete",
+                uri: `${this.options.uri}/:id`,
+                middlewaresRoles: new ControllerRoleMiddleware_1.ControllerRoleMiddleware([`${this.options.prefixRole}:delete`], options.middlewareRoles),
+                controllerFn: this.deleteRunner
+            }));
         }
     }
     async searchRunner(request, response) {

package/dist/model/ICrudControllerOptions.d.ts

@@ -1,5 +1,4 @@
-import { RequestHandler } from "express";
 import { IControllerOptions } from "./IControllerOptions";
 export interface ICrudControllerOptions extends IControllerOptions {
-    middlewareRoles: (roles: string[]) => RequestHandler<any>;
+    middlewareRoles: (roles: string[]) => any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-http",
-  "version": "1.0.41",
+  "version": "1.0.43",
   "description": "Biblioteca Typescript para API NodeJS",
   "repository": "https://cabralsilva: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@github.com/cabralsilva/c2-http.git",
   "author": "Daniel Cabral <cabralconsultoriaemsoftware@gmail.com>",