Simplify input route types

nanostores · Feb 10, 2024 · 27de355 · 27de355
1 parent 4e0aa93
commit 27de355
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -74,10 +74,15 @@ export type InputPage<
   Config extends RouterConfig = RouterConfig,
   PageName extends keyof Config = any
 > = PageName extends any
-  ? {
-      params: Input<ParamsFromConfig<Config>[PageName]>
-      route: PageName
-    }
+  ? Input<ParamsFromConfig<Config>[PageName]> extends EmptyObject
+    ? {
+        params?: Input<ParamsFromConfig<Config>[PageName]>
+        route: PageName
+      }
+    : {
+        params: Input<ParamsFromConfig<Config>[PageName]>
+        route: PageName
+      }
   : never
 
 export type Page<

diff --git a/test/router.test.ts b/test/router.test.ts
@@ -398,6 +398,8 @@ test('allows RegExp routes', () => {
 
 test('generates URLs', () => {
   equal(getPagePath(router, 'home'), '/')
+  equal(getPagePath(router, 'home', {}), '/')
+  equal(getPagePath(router, { route: 'home' }), '/')
   equal(getPagePath(router, 'posts'), '/posts')
   equal(getPagePath(router, 'posts', {}, { a: '1' }), '/posts?a=1')
   equal(

diff --git a/test/types.ts b/test/types.ts
@@ -21,8 +21,11 @@ router.subscribe(page => {
     openPage(router, 'profile', {})
     openPage(router, 'profile', { userId: '123' })
     openPage(router, 'profile', { userId: 123 })
+    openPage(router, { route: 'profile', params: {} })
     openPage(router, { route: 'post', params: { id: '1' } })
     openPage(router, { route: 'post', params: { id: 1 } })
+    openPage(router, { route: 'home', params: {} })
+    openPage(router, { route: 'home' })
     redirectPage(router, 'post', { id: '1' })
     redirectPage(router, 'home')
   } else if (page.route === 'create') {