fix: SearchParams check

yesmeck · Oct 20, 2023 · f871bb2 · f871bb2
1 parent eba9684
commit f871bb2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/.changeset/witty-crabs-grin.md b/.changeset/witty-crabs-grin.md
@@ -0,0 +1,5 @@
+---
+"remix-routes": patch
+---
+
+fix SearchParams check
diff --git a/packages/remix-routes/src/__tests__/__snapshots__/cli.test.ts.snap b/packages/remix-routes/src/__tests__/__snapshots__/cli.test.ts.snap
@@ -2,14 +2,10 @@
 
 exports[`build v1 routes 1`] = `
 "declare module \\"remix-routes\\" {
- type IsAny<T> = (
- unknown extends T
- ? [keyof T] extends [never] ? false : true
- : false
- );
  type URLSearchParamsInit = string | string[][] | Record<string, string> | URLSearchParams;
- type ExportedQuery<T> = IsAny<T> extends true ? URLSearchParamsInit : T;
- type Query<T> = IsAny<T> extends true ? [URLSearchParamsInit?] : [T];
+ // symbol won't be a key of SearchParams
+ type IsSearchParams<T> = symbol extends keyof T ? false : true;
+ type ExportedQuery<T> = IsSearchParams<T> extends true ? T : URLSearchParamsInit;
 
  export interface Routes {
  
@@ -230,14 +226,10 @@ exports[`build v1 routes 1`] = `
 
 exports[`build v2 routes 1`] = `
 "declare module \\"remix-routes\\" {
- type IsAny<T> = (
- unknown extends T
- ? [keyof T] extends [never] ? false : true
- : false
- );
  type URLSearchParamsInit = string | string[][] | Record<string, string> | URLSearchParams;
- type ExportedQuery<T> = IsAny<T> extends true ? URLSearchParamsInit : T;
- type Query<T> = IsAny<T> extends true ? [URLSearchParamsInit?] : [T];
+ // symbol won't be a key of SearchParams
+ type IsSearchParams<T> = symbol extends keyof T ? false : true;
+ type ExportedQuery<T> = IsSearchParams<T> extends true ? T : URLSearchParamsInit;
 
  export interface Routes {
  

diff --git a/packages/remix-routes/src/template.ts b/packages/remix-routes/src/template.ts
@@ -1,12 +1,8 @@
 export const template = `declare module "remix-routes" {
- type IsAny<T> = (
- unknown extends T
- ? [keyof T] extends [never] ? false : true
- : false
- );
  type URLSearchParamsInit = string | string[][] | Record<string, string> | URLSearchParams;
- type ExportedQuery<T> = IsAny<T> extends true ? URLSearchParamsInit : T;
- type Query<T> = IsAny<T> extends true ? [URLSearchParamsInit?] : [T];
+ // symbol won't be a key of SearchParams
+ type IsSearchParams<T> = symbol extends keyof T ? false : true;
+ type ExportedQuery<T> = IsSearchParams<T> extends true ? T : URLSearchParamsInit;
 
  export interface Routes {
  <% routes.forEach(({ route, params, fileName }) => { %>