Improve regex

index.cjs

@@ -1,4 +1,3 @@
 const Router = require("./src/router.cjs");
 const methods = require("./src/methods.cjs");
-
 module.exports = { Router, ...methods };

src/route.cjs

@@ -247,13 +247,13 @@ module.exports = class Route {
         return regexp
           ? new RegExp(`^/?${regexp}/?(?=\/|$)`)
           : regexp === ""
-          ? new RegExp("^/?(?=\/|$)")
+          ? new RegExp("^/?(?=/|$)")
           : null;
       }
       return regexp
         ? new RegExp(`^/?${regexp}/?(?=\/|$)`, "i")
         : regexp === ""
-        ? new RegExp("^/?(?=\/|$)", "i")
+        ? new RegExp("^/?(?=/|$)", "i")
         : null;
     } catch (err) {
       throw new TypeError(`Error: ${path} invalid regular expression`);

src/route.mjs

@@ -247,13 +247,13 @@ export default class Route {
         return regexp
           ? new RegExp(`^/?${regexp}/?(?=\/|$)`)
           : regexp === ""
-          ? new RegExp("^/?(?=\/|$)")
+          ? new RegExp("^/?(?=/|$)")
           : null;
       }
       return regexp
         ? new RegExp(`^/?${regexp}/?(?=\/|$)`, "i")
         : regexp === ""
-        ? new RegExp("^/?(?=\/|$)", "i")
+        ? new RegExp("^/?(?=/|$)", "i")
         : null;
     } catch (err) {
       throw new TypeError(`Error: ${path} invalid regular expression`);

tests/routing.test.js

@@ -41,6 +41,9 @@ describe("Routing test", () => {
     .get("{name}/dashboard", function (req, res) {
       res.end(req.params.name);
     })
+    .get("/user/{name}/dashboard", function (req, res) {
+      res.end(req.params.name);
+    })
     .get("/params/{name:([A-Za-z]+)}/{id}", function (req, res) {
       res.end(`${req.params.name},${req.params.id}`);
     })
@@ -120,6 +123,15 @@ describe("Routing test", () => {
       });
   });
 
+  test("GET /user/abc/dashboard", async () => {
+    await request(app.handler())
+      .get("/user/abc/dashboard")
+      .expect(200)
+      .then((res) => {
+        expect(res.text).toBe("abc");
+      });
+  });
+
   test("GET /params/user/1", async () => {
     await request(app.handler())
       .get("/params/user/1")

tests/url.test.js

@@ -16,6 +16,9 @@ describe("Routing test", () => {
       res.end(req.method.toUpperCase())
     ).setName("any"),
     path("get", "{name}/dashboard", (req, res) => res.end(req.params.name)),
+    path("get", "/user/{name}/dashboard", (req, res) =>
+      res.end(req.params.name)
+    ),
     path("get", "/params/{name:([A-Za-z]+)}/{id}", (req, res) =>
       res.end(`${req.params.name},${req.params.id}`)
     ).setName("params"),
@@ -93,6 +96,15 @@ describe("Routing test", () => {
       });
   });
 
+  test("GET /user/abc/dashboard", async () => {
+    await request(app.handler())
+      .get("/user/abc/dashboard")
+      .expect(200)
+      .then((res) => {
+        expect(res.text).toBe("abc");
+      });
+  });
+
   test("GET /params/user/1", async () => {
     await request(app.handler())
       .get("/params/user/1")