fix: nested route with escaping resolved incorrectly (#1829) (#1834)

Co-authored-by: Atila Fassina <[email protected]>
Co-authored-by: Birk Skyum <[email protected]>

Author: 3 people

.changeset/young-shrimps-fetch.md

@@ -0,0 +1,7 @@
+---
+"@solidjs/start": patch
+---
+
+fix nested route with escaping resolved incorrectly (#1829).
+before `/routes/nested/(ignored)route.tsx` resolved to `/nestedroute`
+now it resolves to `/nested/route`.

packages/start/src/router/routes.ts

@@ -36,7 +36,7 @@ function defineRoutes(fileRoutes: Route[]) {
       routes.push({
         ...route,
         id,
-        path: id.replace(/\/\([^)/]+\)/g, "").replace(/\([^)/]+\)/g, "")
+        path: id.replace(/\([^)/]+\)/g, "").replace(/\/+/g, "/")
       });
       return routes;
     }
@@ -85,8 +85,8 @@ const router = createRouter({
   routes: (fileRoutes as unknown as Route[]).reduce((memo, route) => {
     if (!containsHTTP(route)) return memo;
     let path = route.path
-      .replace(/\/\([^)/]+\)/g, "")
       .replace(/\([^)/]+\)/g, "")
+      .replace(/\/+/g, "/")
       .replace(/\*([^/]*)/g, (_, m) => `**:${m}`)
       .split("/")
       .map(s => (s.startsWith(":") || s.startsWith("*") ? s : encodeURIComponent(s)))

packages/tests/cypress/e2e/route-groups.cy.ts

@@ -0,0 +1,18 @@
+describe("route-groups", () => {
+  it("should resolve `/routes/nested/(ignored)route0.tsx` to `nested/route0`", () => {
+    cy.visit("/nested/route0");
+    cy.contains("nested route 0")
+  });
+  it("should resolve `/routes/nested/(level1)/(ignored)route1.tsx` to `nested/route1`", () => {
+    cy.visit("/nested/route1");
+    cy.contains("nested route 1")
+  });
+  it("should resolve `/routes/nested/(level1)/(level2)/(ignored)route2.tsx` to `nested/route2`", () => {
+    cy.visit("/nested/route2");
+    cy.contains("nested route 2")
+  });
+  it("should resolve `/routes/nested/(level1)/(level2)/route3.tsx` to `nested/route3`", () => {
+    cy.visit("/nested/route3");
+    cy.contains("nested route 3")
+  });
+});

packages/tests/src/routes/nested/(ignored)route0.tsx

@@ -0,0 +1,4 @@
+
+export default function nested() {
+  return <h1>nested route 0</h1>;
+}

packages/tests/src/routes/nested/(level1)/(ignored)route1.tsx

@@ -0,0 +1,4 @@
+
+export default function nested() {
+  return <h1>nested route 1</h1>;
+}

packages/tests/src/routes/nested/(level1)/(level2)/(ignored)route2.tsx

@@ -0,0 +1,4 @@
+
+export default function nested() {
+  return <h1>nested route 2</h1>;
+}

packages/tests/src/routes/nested/(level1)/(level2)/route3.tsx

@@ -0,0 +1,4 @@
+
+export default function nested() {
+  return <h1>nested route 3</h1>;
+}