Skip to content

Commit

Permalink
Merge f2b8d45 into 502709f
Browse files Browse the repository at this point in the history
  • Loading branch information
yusukebe authored Jan 18, 2025
2 parents 502709f + f2b8d45 commit a60565a
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1939,14 +1939,12 @@ export type ValidationTargets<T extends FormValue = ParsedFormValue, P extends s
////// //////
////////////////////////////////////////

type ParamKeyName<NameWithPattern> = NameWithPattern extends `${infer Name}{${infer Rest}`
? Rest extends `${infer _Pattern}?`
? `${Name}?`
: Name
: NameWithPattern

type ParamKey<Component> = Component extends `:${infer NameWithPattern}`
? ParamKeyName<NameWithPattern>
? NameWithPattern extends `${infer Name}{${infer Rest}`
? Rest extends `${infer _Pattern}?`
? `${Name}?`
: Name
: NameWithPattern
: never

export type ParamKeys<Path> = Path extends `${infer Component}/${infer Rest}`
Expand Down

0 comments on commit a60565a

Please sign in to comment.