@@ -445,14 +445,14 @@ function matchRouteBranch<
445
445
* @private
446
446
* Parameters in the path
447
447
*/
448
- type PathParams <
448
+ type PathParam <
449
449
Path extends string
450
450
> = Path extends `:${infer Param } /${infer Rest } `
451
- ? Param | PathParams < Rest >
451
+ ? Param | PathParam < Rest >
452
452
: Path extends `:${infer Param } `
453
453
? Param
454
454
: Path extends `${any } :${infer Param } `
455
- ? PathParams < `:${Param } `>
455
+ ? PathParam < `:${Param } `>
456
456
: Path extends `${any } /*`
457
457
? "*"
458
458
: Path extends "*"
@@ -465,16 +465,16 @@ function matchRouteBranch<
465
465
* @see https://reactrouter.com/docs/en/v6/utils/generate-path
466
466
*/
467
467
export function generatePath < Path extends string > ( path : Path , params : {
468
- [ key in PathParams < Path > ] : string
468
+ [ key in PathParam < Path > ] : string
469
469
} = { } as any ) : string {
470
470
return path
471
- . replace ( / : ( \w + ) / g, ( _ , key : PathParams < Path > ) => {
471
+ . replace ( / : ( \w + ) / g, ( _ , key : PathParam < Path > ) => {
472
472
invariant ( params [ key ] != null , `Missing ":${ key } " param` ) ;
473
473
return params [ key ] ! ;
474
474
} )
475
475
. replace ( / \/ * \* $ / , ( _ ) =>
476
476
{
477
- const star = "*" as PathParams < Path >
477
+ const star = "*" as PathParam < Path >
478
478
479
479
return params [ star ] == null ? "" : params [ star ] . replace ( / ^ \/ * / , "/" )
480
480
}
0 commit comments