fix: handle root wildcard routes (#173)

Author: kricsleo

src/operations/_utils.ts

@@ -13,7 +13,7 @@ export function getMatchParams(
   const params = new NullProtoObj();
   for (const [index, name] of paramsMap) {
     const segment =
-      index < 0 ? segments.slice(-1 * index).join("/") : segments[index];
+      index < 0 ? segments.slice(-(index + 1)).join("/") : segments[index];
     if (typeof name === "string") {
       params[name] = segment;
     } else {

src/operations/add.ts

@@ -35,7 +35,7 @@ export function addRoute<T>(
       }
       node = node.wildcard;
       paramsMap.push([
-        -i,
+        -(i + 1),
         segment.split(":")[1] || "_",
         segment.length === 2 /* no id */,
       ]);

test/.snapshot/compiled-aot.mjs

@@ -10,7 +10,8 @@ const findRoute = /* @__PURE__ */ (() => {
     $8 = { path: "/test/:id" },
     $9 = { path: "/test/:idY/y" },
     $10 = { path: "/test/:idYZ/y/z" },
-    $11 = { path: "/wildcard/**" };
+    $11 = { path: "/wildcard/**" },
+    $12 = { path: "/**" };
   return (m, p) => {
     if (p.charCodeAt(p.length - 1) === 47) p = p.slice(0, -1) || "/";
     if (p === "/test") {
@@ -59,5 +60,6 @@ const findRoute = /* @__PURE__ */ (() => {
       if (m === "GET")
         return { data: $11, params: { _: s.slice(2).join("/") } };
     }
+    if (m === "GET") return { data: $12, params: { _: s.slice(1).join("/") } };
   };
 })();

test/.snapshot/compiled-jit.mjs

@@ -44,4 +44,5 @@
   if (s[1] === "wildcard") {
     if (m === "GET") return { data: $11, params: { _: s.slice(2).join("/") } };
   }
+  if (m === "GET") return { data: $12, params: { _: s.slice(1).join("/") } };
 };

test/find.test.ts

@@ -18,6 +18,7 @@ describe("route matching", () => {
     "/test/fooo",
     "/another/path",
     "/wildcard/**",
+    "/**",
   ]);
 
   const compiledLookup = compileRouter(router);
@@ -39,7 +40,8 @@ describe("route matching", () => {
           ├── /another
           │       ├── /path ┈> [GET] /another/path
           ├── /wildcard
-          │       ├── /** ┈> [GET] /wildcard/**"
+          │       ├── /** ┈> [GET] /wildcard/**
+          ├── /** ┈> [GET] /**"
     `);
   });
 
@@ -123,6 +125,15 @@ describe("route matching", () => {
         data: { path: "/wildcard/**" },
         params: { _: "" },
       });
+      // Root wildcard
+      expect(match("GET", "/anything")).toMatchObject({
+        data: { path: "/**" },
+        params: { _: "anything" },
+      });
+      expect(match("GET", "/any/deep/path")).toMatchObject({
+        data: { path: "/**" },
+        params: { _: "any/deep/path" },
+      });
     });
   }
 
@@ -131,6 +142,7 @@ describe("route matching", () => {
     removeRoute(router, "GET", "/test/*");
     removeRoute(router, "GET", "/test/foo/*");
     removeRoute(router, "GET", "/test/foo/**");
+    removeRoute(router, "GET", "/**");
     expect(formatTree(router.root)).toMatchInlineSnapshot(`
       "<root>
           ├── /test

test/regexp.test.ts

@@ -44,6 +44,14 @@ describe("routeToRegExp", () => {
       regex: /^\/base\/?(?<path>.+)\/?$/,
       match: [["/base/anything/more", { path: "anything/more" }]],
     },
+    "/**": {
+      regex: /^\/?(?<_>.*)\/?$/,
+      match: [
+        ["/", { _: "" }],
+        ["/anything", { _: "anything" }],
+        ["/any/deep/path", { _: "any/deep/path" }],
+      ],
+    },
   } as const;
 
   for (const [route, expected] of Object.entries(routes)) {

test/router.test.ts

@@ -260,6 +260,25 @@ describe("Router lookup", function () {
         },
       },
     );
+
+    testRouter(
+      ["/**"],
+      (router) =>
+        expect(formatTree(router.root)).toMatchInlineSnapshot(`
+          "<root>
+              ├── /** ┈> [GET] /**"
+        `),
+      {
+        "/anything": {
+          data: { path: "/**" },
+          params: { _: "anything" },
+        },
+        "/any/deep/path": {
+          data: { path: "/**" },
+          params: { _: "any/deep/path" },
+        },
+      },
+    );
   });
 
   describe("fallback to dynamic", () => {