@bool-ts/core 1.7.5 → 1.7.6

package/__test/controller.ts

@@ -58,13 +58,13 @@ export class TestController {
         console.log("testInject", testInject);
     }
 
-    @Get("abc/:id")
+    @Get("abc/:id.xml")
     public get(@Param("id") id: string) {
         console.log("HEHE", id, typeof id);
         console.log("this.testService", this.testService.exec());
     }
 
-    @Post("abc/:id/provider/:providerId")
+    @Post("abc/:id/provider/:providerId.xml")
     public async post(
         @RequestHeaders(headersSchema)
         headers: Zod.infer<typeof headersSchema>,
@@ -75,7 +75,7 @@ export class TestController {
         @RequestBody(bodySchema)
         body: Zod.infer<typeof bodySchema>
     ) {
-        console.log("req.headers", headers);
+        console.log("req.headers", params);
         console.log("===========================");
     }
 

package/dist/entities/route.d.ts

@@ -6,6 +6,7 @@ export type TRouteModel<T = unknown> = Readonly<{
 }>;
 export declare class Route {
     static rootPattern: string;
+    static innerRootPattern: string;
     readonly alias: string;
     private _map;
     constructor(alias: string);

package/dist/entities/route.js

@@ -1,6 +1,7 @@
 "use strict";
 export class Route {
     static rootPattern = ":([a-z0-9A-Z_-]{1,})";
+    static innerRootPattern = "([a-z0-9A-Z_-]{1,})";
     alias;
     _map = new Map();
     constructor(alias) {
@@ -19,6 +20,10 @@ export class Route {
                 return undefined;
             }
             const parameters = Object();
+            const matchingRegex = this.alias.replace(new RegExp(Route.rootPattern, "g"), Route.innerRootPattern);
+            if (!new RegExp(matchingRegex).test(this._thinAlias(pathname))) {
+                return undefined;
+            }
             for (let index = 0; index < aliasSplitted.length; index++) {
                 const aliasPart = aliasSplitted[index];
                 const pathnamePart = currentPathNameSplitted[index];
@@ -31,8 +36,13 @@ export class Route {
                     let isFailed = false;
                     aliasPart.replace(new RegExp(Route.rootPattern, "g"), (match, key, offset) => {
                         if (offset === 0) {
-                            Object.assign(parameters, {
-                                [key]: pathnamePart
+                            pathnamePart.replace(new RegExp(Route.innerRootPattern, "g"), (innerMatch, innerKey, innerOffset) => {
+                                if (innerOffset === 0) {
+                                    Object.assign(parameters, {
+                                        [key]: innerMatch
+                                    });
+                                }
+                                return innerMatch;
                             });
                         }
                         return match;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bool-ts/core",
-    "version": "1.7.5",
+    "version": "1.7.6",
     "description": "",
     "main": "dist/index.js",
     "scripts": {

package/src/entities/route.ts

@@ -10,6 +10,7 @@ export type TRouteModel<T = unknown> = Readonly<{
 
 export class Route {
     public static rootPattern = ":([a-z0-9A-Z_-]{1,})";
+    public static innerRootPattern = "([a-z0-9A-Z_-]{1,})";
 
     public readonly alias: string;
 
@@ -38,6 +39,11 @@ export class Route {
             }
 
             const parameters: Record<string, string> = Object();
+            const matchingRegex = this.alias.replace(new RegExp(Route.rootPattern, "g"), Route.innerRootPattern);
+
+            if (!new RegExp(matchingRegex).test(this._thinAlias(pathname))) {
+                return undefined;
+            }
 
             for (let index = 0; index < aliasSplitted.length; index++) {
                 const aliasPart = aliasSplitted[index];
@@ -51,9 +57,18 @@ export class Route {
 
                     aliasPart.replace(new RegExp(Route.rootPattern, "g"), (match, key, offset) => {
                         if (offset === 0) {
-                            Object.assign(parameters, {
-                                [key]: pathnamePart
-                            });
+                            pathnamePart.replace(
+                                new RegExp(Route.innerRootPattern, "g"),
+                                (innerMatch, innerKey, innerOffset) => {
+                                    if (innerOffset === 0) {
+                                        Object.assign(parameters, {
+                                            [key]: innerMatch
+                                        });
+                                    }
+
+                                    return innerMatch;
+                                }
+                            );
                         }
 
                         return match;

package/test.http

@@ -2,10 +2,10 @@
 
 
 ### Send test GET method
-GET http://{{baseUrl}}/test/abc/23234
+GET http://{{baseUrl}}/test/abc/test-case.html
 
 ### Send test POST method
-POST http://{{baseUrl}}/test/abc/123/provider/23234?options[page]=1&options[limit]=6&options[sort][metadata.latestReviewAt]=desc&options[sort][info.searchCount]=desc&options[sort][createdAt]=desc&populate[0]=__headquarters&populate[1]=__logoMedia HTTP/1.1
+POST http://{{baseUrl}}/test/abc/123/provider/1111.xml?options[page]=1&options[limit]=6&options[sort][metadata.latestReviewAt]=desc&options[sort][info.searchCount]=desc&options[sort][createdAt]=desc&populate[0]=__headquarters&populate[1]=__logoMedia HTTP/1.1
 content-type: application/json
 
 {