Proper route extending with path params #42 (#43)

* Proper route extending with path params #42 * Fixed linting errors Co-authored-by: Łukasz Kużyński <[email protected]>
zilch · Jul 15, 2020 · 28907a7 · 28907a7
1 parent 15f2e8e
commit 28907a7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/defineRoute.ts b/src/defineRoute.ts
@@ -51,7 +51,7 @@ export function defineRoute(...args: any[]): UmbrellaRouteDef {
         },
         (x) => {
           const parentPathArray = asArray(
-            parent.path(filter(extensionParamNames))
+            parent.path(filter(parentParamNames))
           );
           const childPathArray = asArray(path(filter(extensionParamNames)));
 

diff --git a/test/defineRoute.test.ts b/test/defineRoute.test.ts
@@ -33,4 +33,24 @@ describe("defineRoute", () => {
       "b",
     ]);
   });
+
+  it("extending routes with params should merge path", () => {
+    const fooRoute = defineRoute(
+      { a: param.path.string },
+      (p) => `/foo/${p.a}`
+    );
+    const barRoute = fooRoute.extend(
+      { b: param.path.string },
+      (p) => `/bar/${p.b}`
+    );
+
+    expect(Object.keys(barRoute["~internal"].params).sort()).toEqual([
+      "a",
+      "b",
+    ]);
+
+    expect(barRoute["~internal"].path({ a: "aa", b: "bb" })).toEqual([
+      "/foo/aa/bar/bb",
+    ]);
+  });
 });