fix: repair extraction of route name for useSafeParams when `search…

…Params` exists
lukemorales · Mar 30, 2024 · 4f0e3a5 · 4f0e3a5
1 parent 0634241
commit 4f0e3a5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.changeset/metal-cooks-cross.md b/.changeset/metal-cooks-cross.md
@@ -0,0 +1,5 @@
+---
+"next-safe-navigation": patch
+---
+
+Fix type definition for `useSafeParams` when route has both `params` and `searchParams` defined
diff --git a/src/create-navigation-config.ts b/src/create-navigation-config.ts
@@ -79,8 +79,7 @@ type SafeRoute<
 
 type RouteWithParams<Config extends NavigationConfig> = {
   [Route in keyof Config & string]: Config[Route] extends (
-    | RouteBuilder<string, infer Params extends z.ZodSchema, never>
-    | RouteBuilder<string, infer Params extends z.ZodSchema, any>
+    RouteBuilder<string, infer Params extends z.ZodSchema, infer _>
   ) ?
     Params extends z.ZodSchema ?
       Route
@@ -90,8 +89,11 @@ type RouteWithParams<Config extends NavigationConfig> = {
 
 type RouteWithSearchParams<Config extends NavigationConfig> = {
   [Route in keyof Config & string]: Config[Route] extends (
-    | RouteBuilder<string, never, infer Search extends z.ZodSchema>
-    | RouteBuilder<string, any, infer Search extends z.ZodSchema>
+    RouteBuilder<
+      string,
+      infer _ extends z.ZodSchema,
+      infer Search extends z.ZodSchema
+    >
   ) ?
     Search extends z.ZodSchema ?
       Route