fixes default param bug

zilch · Oct 14, 2020 · cd4ffcc · cd4ffcc
1 parent 24513fb
commit cd4ffcc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/src/createLocation.ts b/src/createLocation.ts
@@ -35,15 +35,17 @@ export function createLocation({
     state: {} as ParamWithContextCollection,
   };
 
-  for (const paramName in paramCollection) {
-    const paramValue = paramCollection[paramName];
+  for (const paramName in paramDefCollection) {
+    const paramDef = paramDefCollection[paramName];
+    const paramValue =
+      paramCollection[paramName] === undefined
+        ? paramDef["~internal"].default
+        : paramCollection[paramName];
 
     if (paramValue === undefined) {
       continue;
     }
 
-    const paramDef = paramDefCollection[paramName];
-
     const urlEncodeDefault =
       paramDef["~internal"].kind !== "state" && !paramDef["~internal"].trailing;
     const urlEncode =

diff --git a/src/playground.tsx b/src/playground.tsx
@@ -2,7 +2,7 @@
 // @ts-ignore
 window.__DEV__ = true;
 
-import React, { useEffect } from "react";
+import React from "react";
 import ReactDOM from "react-dom";
 import {
   createRouter,
@@ -16,7 +16,7 @@ export const { RouteProvider, useRoute, routes } = createRouter({
   home: defineRoute("/"),
   userList: defineRoute(
     {
-      page: param.query.optional.number,
+      page: param.query.optional.number.default(1),
     },
     () => "/user"
   ),
@@ -31,12 +31,6 @@ export const { RouteProvider, useRoute, routes } = createRouter({
 function App() {
   const route = useRoute();
 
-  useEffect(() => {
-    if (route.name === "home") {
-      routes.user({ userId: "abc" }).replace();
-    }
-  }, [route]);
-
   return (
     <>
       <Navigation />
@@ -75,7 +69,7 @@ function Navigation() {
   return (
     <nav>
       <a {...replaceLink(routes.home())}>Home</a>
-      <a {...routes.userList({ page: 1 }).link}>User List</a>
+      <a {...routes.userList().link}>User List</a>
       <a {...routes.user({ userId: "abc" }).link}>User "abc"</a>
     </nav>
   );

diff --git a/test/createLocation.test.ts b/test/createLocation.test.ts
@@ -96,6 +96,21 @@ describe("createLocation", () => {
       state: undefined,
     });
   });
+
+  test.only("default param", () => {
+    expectLocation(
+      {
+        value: param.query.optional.string.default("bar"),
+      },
+      () => `/foo`,
+      {}
+    ).toEqual({
+      fullPath: "/foo",
+      path: "/foo",
+      query: "value=bar",
+      state: undefined,
+    });
+  });
 });
 
 function expectLocation(