diff options
Diffstat (limited to 'packages/web-util/src/utils/route.ts')
-rw-r--r-- | packages/web-util/src/utils/route.ts | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/packages/web-util/src/utils/route.ts b/packages/web-util/src/utils/route.ts index 4f8a020f6..494a61efa 100644 --- a/packages/web-util/src/utils/route.ts +++ b/packages/web-util/src/utils/route.ts @@ -74,7 +74,7 @@ export function findMatch<T extends ObjectOf<RouteDefinition>>( pagesMap: T, pageList: Array<keyof T>, path: string, - params: Record<string, string>, + params: Record<string, string[]>, ): Location<T> | undefined { for (let idx = 0; idx < pageList.length; idx++) { const name = pageList[idx]; @@ -82,10 +82,6 @@ export function findMatch<T extends ObjectOf<RouteDefinition>>( if (found !== null) { const values = {} as Record<string, unknown>; - Object.entries(params).forEach(([key, value]) => { - values[key] = value; - }); - if (found.groups !== undefined) { Object.entries(found.groups).forEach(([key, value]) => { values[key] = value; @@ -93,7 +89,7 @@ export function findMatch<T extends ObjectOf<RouteDefinition>>( } // @ts-expect-error values is a map string which is equivalent to the RouteParamsType - return { name, parent: pagesMap, values }; + return { name, parent: pagesMap, values, params }; } } return undefined; @@ -117,6 +113,7 @@ type MapKeyValue<Type> = { parent: Type; name: Key; values: RouteParamsType<Type, Key>; + params: Record<string, string[]>; } : never; }; |