Fix matchRoutes can't match index page

Author: ije

lib/route.ts

@@ -52,6 +52,18 @@ export function matchRoutes(
         }
       }
     }
+    if (matches.length === 0) {
+      // find index route
+      for (const [p, m] of routes) {
+        if (m.pattern.pathname.endsWith("/index")) {
+          const ret = p.exec({ host: url.host, pathname: pathname + "/index" });
+          if (ret) {
+            matches.push([ret, m]);
+            break;
+          }
+        }
+      }
+    }
     if (matches.length > 0) {
       const directMatch = matches[matches.length - 1][1];
       const parts = util.splitPath(pathname);
@@ -71,7 +83,7 @@ export function matchRoutes(
       }
 
       if (directMatch.nesting) {
-        // find the nesting index of the route
+        // find index route
         for (const [p, m] of routes) {
           if (m.pattern.pathname === directMatch.pattern.pathname + "/index") {
             const ret = p.exec({ host: url.host, pathname: pathname + "/index" });

tests/lib_route_test.ts

@@ -15,20 +15,24 @@ Deno.test("lib/helpers.ts: matchRoutes", async () => {
     "./routes/docs/index.mdx",
     "./routes/index.tsx",
     "./routes/utils.ts",
-    "./routes/post/[date]/[...slug].tsx",
     "./routes/works.tsx",
     "./routes/works/$id.tsx",
     "./routes/works/$id/$page+.tsx",
     "./routes/works/$id/index.tsx",
     "./routes/works/$id/order.tsx",
     "./routes/works/index.tsx",
     "./routes/works/new.tsx",
+    "./routes/users/index.tsx",
+    "./routes/users/$uid.tsx",
+    "./routes/users/$uid/index.tsx",
+    "./routes/users/$uid/settings/$page.tsx",
+    "./routes/post/[date]/[...slug].tsx",
   ];
   await Promise.all(files.map((file) => Deno.mkdir(join(tmpDir, dirname(file)), { recursive: true })));
   await Promise.all(files.map((file) => Deno.writeTextFile(join(tmpDir, file), "")));
   const routes = await initRoutes("./routes/**/*.{tsx,mdx}", tmpDir);
   assertEquals(routes.routes.length, files.length - 1);
-  assertEquals(routes.routes.filter(([_, meta]) => meta.nesting).length, 4);
+  assertEquals(routes.routes.filter(([_, meta]) => meta.nesting).length, 5);
 
   let matches = matchRoutes(new URL("/", "http://localhost:3000"), routes);
   assertEquals(matches.map(([ret]) => ret.pathname.input), ["/_app", "/"]);
@@ -119,4 +123,30 @@ Deno.test("lib/helpers.ts: matchRoutes", async () => {
     "./routes/works/$id.tsx",
     "./routes/works/$id/$page+.tsx",
   ]);
+
+  matches = matchRoutes(new URL("/users", "http://localhost:3000"), routes);
+  assertEquals(matches.map(([ret]) => ret.pathname.input), ["/_app", "/users/index"]);
+  assertEquals(matches.map(([ret]) => ret.pathname.groups), [{}, {}]);
+  assertEquals(matches.map(([_, meta]) => meta.filename), [
+    "./routes/_app.tsx",
+    "./routes/users/index.tsx",
+  ]);
+
+  matches = matchRoutes(new URL("/users/ije", "http://localhost:3000"), routes);
+  assertEquals(matches.map(([ret]) => ret.pathname.input), ["/_app", "/users/ije", "/users/ije/index"]);
+  assertEquals(matches.map(([ret]) => ret.pathname.groups), [{}, { uid: "ije" }, { uid: "ije" }]);
+  assertEquals(matches.map(([_, meta]) => meta.filename), [
+    "./routes/_app.tsx",
+    "./routes/users/$uid.tsx",
+    "./routes/users/$uid/index.tsx",
+  ]);
+
+  matches = matchRoutes(new URL("/users/ije/settings/profile", "http://localhost:3000"), routes);
+  assertEquals(matches.map(([ret]) => ret.pathname.input), ["/_app", "/users/ije", "/users/ije/settings/profile"]);
+  assertEquals(matches.map(([ret]) => ret.pathname.groups), [{}, { uid: "ije" }, { uid: "ije", page: "profile" }]);
+  assertEquals(matches.map(([_, meta]) => meta.filename), [
+    "./routes/_app.tsx",
+    "./routes/users/$uid.tsx",
+    "./routes/users/$uid/settings/$page.tsx",
+  ]);
 });