preserve original path on optional segments

Author: ryansolid

.changeset/cuddly-falcons-obey.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/router": patch
+---
+
+preserve original path on optional segments

.gitignore

@@ -2,4 +2,5 @@ node_modules/
 dist/
 .vscode/
 coverage/
-solid-router-*.tgz
+solid-router-*.tgz
+.DS_Store

src/routing.ts

@@ -132,9 +132,9 @@ export function createRoutes(routeDef: RouteDefinition, base: string = ""): Rout
     info
   };
 
-  return asArray(routeDef.path).reduce<Route[]>((acc, path) => {
-    for (const originalPath of expandOptionals(path)) {
-      const path = joinPaths(base, originalPath);
+  return asArray(routeDef.path).reduce<Route[]>((acc, originalPath) => {
+    for (const expandedPath of expandOptionals(originalPath)) {
+      const path = joinPaths(base, expandedPath);
       let pattern = isLeaf ? path : path.split("/*", 1)[0];
       pattern = pattern
         .split("/")

test/route.spec.ts

@@ -158,6 +158,7 @@ describe("createRoutes should", () => {
         id: "someTHING",
         all: "BaR/sOlId"
       });
+      expect(route.originalPath).toBe("foo/:id/*all");
     });
 
     test(`validate path using match filters`, () => {
@@ -182,19 +183,25 @@ describe("createRoutes should", () => {
         path: "foo/:id?"
       };
       const routes = createRoutes(routeDef);
-      expect(routes[0].originalPath).toBe("foo");
-      expect(routes[1].originalPath).toBe("foo/:id");
+      expect(routes[0].pattern).toBe("/foo");
+      expect(routes[0].originalPath).toBe("foo/:id?");
+      expect(routes[1].pattern).toBe("/foo/:id");
+      expect(routes[1].originalPath).toBe("foo/:id?");
     });
 
     test(`with a multiple paths`, () => {
       const routeDef = {
         path: ["foo/:id?", "bar/:name?"]
       };
       const routes = createRoutes(routeDef);
-      expect(routes[0].originalPath).toBe("foo");
-      expect(routes[1].originalPath).toBe("foo/:id");
-      expect(routes[2].originalPath).toBe("bar");
-      expect(routes[3].originalPath).toBe("bar/:name");
+      expect(routes[0].pattern).toBe("/foo");
+      expect(routes[0].originalPath).toBe("foo/:id?");
+      expect(routes[1].pattern).toBe("/foo/:id");
+      expect(routes[1].originalPath).toBe("foo/:id?");
+      expect(routes[2].pattern).toBe("/bar");
+      expect(routes[2].originalPath).toBe("bar/:name?");
+      expect(routes[3].pattern).toBe("/bar/:name");
+      expect(routes[3].originalPath).toBe("bar/:name?");
     });
   });
 });