@bool-ts/core 1.1.2 → 1.2.2

package/__test/controller.ts

@@ -11,7 +11,7 @@ export class TestController {
         @Inject(TestService) private readonly testService: IService
     ) { }
 
-    @Get()
+    @Get("abc")
     private _get(
         req: Request,
         res: Response
@@ -20,7 +20,7 @@ export class TestController {
         res.json({ test: "success" }).send();
     }
 
-    @Post()
+    @Post("abc")
     private _post(
         req: Request,
         res: Response
@@ -37,11 +37,12 @@ export class TestController {
         res.json({ test: "success" }).send();
     }
 
-    @Patch()
+    @Patch("abc/:id")
     private _patch(
         req: Request,
         res: Response
     ) {
+        console.log(req.params)
         res.json({ test: "success" }).send();
     }
 

package/dist/decorators/module.d.ts

@@ -1,4 +1,5 @@
 export type TModuleOptions = Partial<{
+    prefix: string;
     controllers: Array<new (...args: any[]) => unknown>;
     dependencies: Array<new (...args: any[]) => unknown>;
     allowOrigins: string | Array<string>;

package/dist/hooks/factory.d.ts

@@ -9,6 +9,7 @@ export type TBoolFactoryOptions = Partial<{
         depth: 10;
         arrayLimit: 50;
     }>;
+    prefix: string;
 }>;
 /**
  *

package/dist/hooks/factory.js

@@ -37,37 +37,38 @@ const http_1 = require("../http");
  * @param target
  * @param router
  */
-const controllerCreator = (target, router = (0, express_1.Router)()) => {
-    if (!Reflect.getOwnMetadataKeys(target).includes(decorators_1.controllerKey)) {
-        throw Error(`${target.name} is not a controller.`);
+const controllerCreator = (controllerConstructor, parentRouter = (0, express_1.Router)()) => {
+    if (!Reflect.getOwnMetadataKeys(controllerConstructor).includes(decorators_1.controllerKey)) {
+        throw Error(`${controllerConstructor.name} is not a controller.`);
     }
-    const controller = injector_1.Injector.get(target);
+    const controller = injector_1.Injector.get(controllerConstructor);
     if (!controller) {
         throw Error("Can not initialize controller.");
     }
-    const controllerMetadata = Reflect.getOwnMetadata(decorators_1.controllerKey, target) || "/";
-    const routesMetadata = (Reflect.getOwnMetadata(decorators_1.controllerRoutesKey, target) || []);
-    const innerRouter = router.route(controllerMetadata);
-    routesMetadata.forEach(route => {
-        if (typeof route.descriptor.value !== "function") {
+    const controllerMetadata = Reflect.getOwnMetadata(decorators_1.controllerKey, controllerConstructor) || "/";
+    const routesMetadata = (Reflect.getOwnMetadata(decorators_1.controllerRoutesKey, controllerConstructor) || []);
+    const router = (0, express_1.Router)();
+    routesMetadata.forEach(routeMetadata => {
+        if (typeof routeMetadata.descriptor.value !== "function") {
             return;
         }
-        switch (route.httpMethod) {
+        const route = router.route(routeMetadata.path);
+        switch (routeMetadata.httpMethod) {
             case "GET":
-                return innerRouter.get(route.descriptor.value.bind(controller));
+                return route.get(routeMetadata.descriptor.value.bind(controller));
             case "POST":
-                return innerRouter.post(route.descriptor.value.bind(controller));
+                return route.post(routeMetadata.descriptor.value.bind(controller));
             case "PUT":
-                return innerRouter.put(route.descriptor.value.bind(controller));
+                return route.put(routeMetadata.descriptor.value.bind(controller));
             case "PATCH":
-                return innerRouter.patch(route.descriptor.value.bind(controller));
+                return route.patch(routeMetadata.descriptor.value.bind(controller));
             case "DELETE":
-                return innerRouter.delete(route.descriptor.value.bind(controller));
+                return route.delete(routeMetadata.descriptor.value.bind(controller));
             case "OPTIONS":
-                return innerRouter.options(route.descriptor.value.bind(controller));
+                return route.options(routeMetadata.descriptor.value.bind(controller));
         }
     });
-    return router;
+    return parentRouter.use(controllerMetadata, router);
 };
 /**
  *
@@ -78,7 +79,6 @@ const BoolFactory = (target, options) => {
         throw Error(`${target.name} is not a module.`);
     }
     const metadata = Reflect.getOwnMetadata(decorators_1.moduleKey, target);
-    const routers = !metadata?.controllers ? [] : metadata.controllers.map(controllerConstructor => controllerCreator(controllerConstructor));
     const allowOrigins = !metadata?.allowOrigins ?
         ["*"] : typeof metadata.allowOrigins !== "string" ?
         metadata.allowOrigins : [metadata.allowOrigins];
@@ -88,6 +88,8 @@ const BoolFactory = (target, options) => {
     const factoryOptions = Object.freeze({
         allowLogsMethods: !options?.log?.methods ? ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"] : options.log.methods
     });
+    const routers = !metadata?.controllers ?
+        [] : metadata.controllers.map(controllerConstructor => controllerCreator(controllerConstructor));
     app.set("etag", "strong");
     app.set("query parser", (query) => Qs.parse(query, {
         depth: !options?.queryParser?.depth || options.queryParser.depth < 0 ? 10 : options.queryParser.depth,
@@ -163,7 +165,9 @@ const BoolFactory = (target, options) => {
         next();
     });
     if (routers.length > 0) {
-        app.use(routers);
+        !metadata?.prefix ?
+            app.use(routers) : app.use(!metadata.prefix.startsWith("/") ?
+            `/${metadata.prefix}` : metadata.prefix, routers);
     }
     return app;
 };

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@bool-ts/core",
-  "version": "1.1.2",
+  "version": "1.2.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
-    "test": "bun run __test/index.ts --watch",
+    "test": "bun --hot run __test/index.ts",
     "build": "tsc"
   },
   "repository": {

package/src/decorators/module.ts

@@ -1,4 +1,5 @@
 export type TModuleOptions = Partial<{
+    prefix: string;
     controllers: Array<new (...args: any[]) => unknown>;
     dependencies: Array<new (...args: any[]) => unknown>;
     allowOrigins: string | Array<string>;

package/src/hooks/factory.ts

@@ -19,6 +19,7 @@ export type TBoolFactoryOptions = Partial<{
         depth: 10,
         arrayLimit: 50
     }>;
+    prefix: string;
 }>;
 
 
@@ -28,45 +29,47 @@ export type TBoolFactoryOptions = Partial<{
  * @param router 
  */
 const controllerCreator = (
-    target: new (...args: any[]) => unknown,
-    router = Router()
+    controllerConstructor: new (...args: any[]) => unknown,
+    parentRouter: Router = Router()
 ) => {
-    if (!Reflect.getOwnMetadataKeys(target).includes(controllerKey)) {
-        throw Error(`${target.name} is not a controller.`);
+    if (!Reflect.getOwnMetadataKeys(controllerConstructor).includes(controllerKey)) {
+        throw Error(`${controllerConstructor.name} is not a controller.`);
     }
 
-    const controller = Injector.get(target);
+    const controller = Injector.get(controllerConstructor);
 
     if (!controller) {
         throw Error("Can not initialize controller.");
     }
 
-    const controllerMetadata = Reflect.getOwnMetadata(controllerKey, target) || "/";
-    const routesMetadata = (Reflect.getOwnMetadata(controllerRoutesKey, target) || []) as Array<IControllerRoute>;
-    const innerRouter = router.route(controllerMetadata);
+    const controllerMetadata = Reflect.getOwnMetadata(controllerKey, controllerConstructor) || "/";
+    const routesMetadata = (Reflect.getOwnMetadata(controllerRoutesKey, controllerConstructor) || []) as Array<IControllerRoute>;
+    const router = Router();
 
-    routesMetadata.forEach(route => {
-        if (typeof route.descriptor.value !== "function") {
+    routesMetadata.forEach(routeMetadata => {
+        if (typeof routeMetadata.descriptor.value !== "function") {
             return;
         }
 
-        switch (route.httpMethod) {
+        const route = router.route(routeMetadata.path);
+
+        switch (routeMetadata.httpMethod) {
             case "GET":
-                return innerRouter.get(route.descriptor.value.bind(controller));
+                return route.get(routeMetadata.descriptor.value.bind(controller));
             case "POST":
-                return innerRouter.post(route.descriptor.value.bind(controller));
+                return route.post(routeMetadata.descriptor.value.bind(controller));
             case "PUT":
-                return innerRouter.put(route.descriptor.value.bind(controller));
+                return route.put(routeMetadata.descriptor.value.bind(controller));
             case "PATCH":
-                return innerRouter.patch(route.descriptor.value.bind(controller));
+                return route.patch(routeMetadata.descriptor.value.bind(controller));
             case "DELETE":
-                return innerRouter.delete(route.descriptor.value.bind(controller));
+                return route.delete(routeMetadata.descriptor.value.bind(controller));
             case "OPTIONS":
-                return innerRouter.options(route.descriptor.value.bind(controller));
+                return route.options(routeMetadata.descriptor.value.bind(controller));
         }
     });
 
-    return router;
+    return parentRouter.use(controllerMetadata, router);
 }
 
 
@@ -83,7 +86,6 @@ export const BoolFactory = (
     }
 
     const metadata = Reflect.getOwnMetadata(moduleKey, target) as TModuleOptions;
-    const routers = !metadata?.controllers ? [] : metadata.controllers.map(controllerConstructor => controllerCreator(controllerConstructor));
     const allowOrigins = !metadata?.allowOrigins ?
         ["*"] : typeof metadata.allowOrigins !== "string" ?
             metadata.allowOrigins : [metadata.allowOrigins];
@@ -93,6 +95,8 @@ export const BoolFactory = (
     const factoryOptions = Object.freeze({
         allowLogsMethods: !options?.log?.methods ? ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"] : options.log.methods
     });
+    const routers = !metadata?.controllers ?
+        [] : metadata.controllers.map(controllerConstructor => controllerCreator(controllerConstructor));
 
     app.set("etag", "strong");
     app.set("query parser", (query: string) => Qs.parse(query, {
@@ -184,7 +188,9 @@ export const BoolFactory = (
     });
 
     if (routers.length > 0) {
-        app.use(routers);
+        !metadata?.prefix ?
+            app.use(routers) : app.use(!metadata.prefix.startsWith("/") ?
+                `/${metadata.prefix}` : metadata.prefix, routers);
     }
 
     return app;

package/test.http

@@ -2,10 +2,10 @@
 
 
 ### Send test GET method
-GET http://{{baseUrl}}/test
+GET http://{{baseUrl}}/test/abc
 
 ### Send test POST method
-POST http://{{baseUrl}}/test HTTP/1.1
+POST http://{{baseUrl}}/test/abc HTTP/1.1
 content-type: application/json
 
 {
@@ -18,7 +18,7 @@ PUT http://{{baseUrl}}/test
 Content-Type: "application/json"
 
 ### Send test PATCH method
-PATCH http://{{baseUrl}}/test
+PATCH http://{{baseUrl}}/test/abc/23
 Content-Type: "application/json"
 
 ### Send test DELETE method