@tanstack/react-router 1.49.0 → 1.49.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-router",
-  "version": "1.49.0",
+  "version": "1.49.2",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/fileRoute.ts

@@ -17,6 +17,7 @@ import type {
   FileBaseRouteOptions,
   ResolveAllParamsFromParent,
   ResolveLoaderData,
+  ResolveParams,
   ResolveRouteContext,
   Route,
   RouteConstraints,
@@ -73,7 +74,7 @@ export class FileRoute<
 
   createRoute = <
     TSearchValidator extends AnySearchValidator = DefaultSearchValidator,
-    TParams = Record<ParsePathParams<TPath>, string>,
+    TParams = ResolveParams<TPath>,
     TAllParams = ResolveAllParamsFromParent<TParentRoute, TParams>,
     TRouteContextFn = AnyContext,
     TBeforeLoadFn = AnyContext,

package/src/link.tsx

@@ -67,12 +67,16 @@ export type Split<TValue, TIncludeTrailingSlash = true> = TValue extends unknown
 export type ParsePathParams<
   T extends string,
   TAcc = never,
-> = T extends `${string}$${infer TPossiblyParam}`
-  ? TPossiblyParam extends `${infer TParam}/${infer TRest}`
-    ? ParsePathParams<TRest, TParam extends '' ? '_splat' : TParam | TAcc>
-    : TPossiblyParam extends ''
-      ? '_splat'
-      : TPossiblyParam | TAcc
+> = T extends `${string}$${string}`
+  ? T extends `${string}$${infer TPossiblyParam}`
+    ? TPossiblyParam extends `${string}/${string}`
+      ? TPossiblyParam extends `${infer TParam}/${infer TRest}`
+        ? ParsePathParams<TRest, TParam extends '' ? TAcc : TParam | TAcc>
+        : never
+      : TPossiblyParam extends ''
+        ? TAcc
+        : TPossiblyParam | TAcc
+    : TAcc
   : TAcc
 
 export type Join<T, TDelimiter extends string = '/'> = T extends []

package/src/path.ts

@@ -337,16 +337,13 @@ export function matchByPath(
 
       if (routeSegment) {
         if (routeSegment.type === 'wildcard') {
-          if (baseSegment?.value) {
-            const _splat = decodeURI(
-              joinPaths(baseSegments.slice(i).map((d) => d.value)),
-            )
-            // TODO: Deprecate *
-            params['*'] = _splat
-            params['_splat'] = _splat
-            return true
-          }
-          return false
+          const _splat = decodeURI(
+            joinPaths(baseSegments.slice(i).map((d) => d.value)),
+          )
+          // TODO: Deprecate *
+          params['*'] = _splat
+          params['_splat'] = _splat
+          return true
         }
 
         if (routeSegment.type === 'pathname') {

package/src/route.ts

@@ -87,15 +87,30 @@ export type RouteOptions<
     NoInfer<TBeforeLoadFn>
   >
 
+export type ParseSplatParams<TPath extends string> = TPath extends `${string}$`
+  ? '_splat'
+  : TPath extends `${string}$/${string}`
+    ? '_splat'
+    : never
+
+export interface SplatParams {
+  _splat?: string
+}
+
+export type ResolveParams<TPath extends string> =
+  ParseSplatParams<TPath> extends never
+    ? Record<ParsePathParams<TPath>, string>
+    : Record<ParsePathParams<TPath>, string> & SplatParams
+
 export type ParseParamsFn<TPath extends string, TParams> = (
-  rawParams: Record<ParsePathParams<TPath>, string>,
+  rawParams: ResolveParams<TPath>,
 ) => TParams extends Record<ParsePathParams<TPath>, any>
   ? TParams
   : Record<ParsePathParams<TPath>, any>
 
 export type StringifyParamsFn<TPath extends string, TParams> = (
   params: TParams,
-) => Record<ParsePathParams<TPath>, string>
+) => ResolveParams<TPath>
 
 export type ParamsOptions<TPath extends string, TParams> = {
   params?: {
@@ -817,7 +832,7 @@ export class Route<
     TPath
   >,
   in out TSearchValidator extends AnySearchValidator = DefaultSearchValidator,
-  in out TParams = Record<ParsePathParams<TPath>, string>,
+  in out TParams = ResolveParams<TPath>,
   in out TAllParams = ResolveAllParamsFromParent<TParentRoute, TParams>,
   in out TRouterContext = AnyContext,
   in out TRouteContextFn = AnyContext,
@@ -1157,7 +1172,7 @@ export function createRoute<
     TPath
   >,
   TSearchValidator extends AnySearchValidator = DefaultSearchValidator,
-  TParams = Record<ParsePathParams<TPath>, string>,
+  TParams = ResolveParams<TPath>,
   TAllParams = ResolveAllParamsFromParent<TParentRoute, TParams>,
   TRouteContextFn = AnyContext,
   TBeforeLoadFn = AnyContext,

package/src/router.ts

@@ -42,6 +42,7 @@ import type {
   AnyContext,
   AnyRoute,
   AnyRouteWithContext,
+  AnySearchSchema,
   BeforeLoadContextOptions,
   ErrorRouteComponent,
   LoaderFnContext,
@@ -588,6 +589,8 @@ export function createRouter<
   >(options)
 }
 
+type MatchRoutesOpts = { preload?: boolean; throwOnError?: boolean }
+
 export class Router<
   in out TRouteTree extends AnyRoute,
   in out TTrailingSlashOption extends TrailingSlashOption,
@@ -950,10 +953,49 @@ export class Router<
     return this.routesById as Record<string, AnyRoute>
   }
 
-  matchRoutes = (
+  /** 
+  @deprecated use the following signature instead
+  ```ts
+  matchRoutes (
+    next: ParsedLocation,
+    opts?: { preload?: boolean; throwOnError?: boolean },
+  ): Array<AnyRouteMatch>;
+  ```
+*/
+  public matchRoutes(
+    pathname: string,
+    locationSearch: AnySearchSchema,
+    opts?: MatchRoutesOpts,
+  ): Array<AnyRouteMatch>
+  public matchRoutes(
+    next: ParsedLocation,
+    opts?: MatchRoutesOpts,
+  ): Array<AnyRouteMatch>
+
+  public matchRoutes(
+    pathnameOrNext: string | ParsedLocation,
+    locationSearchOrOpts?:
+      | AnySearchSchema
+      | { preload?: boolean; throwOnError?: boolean },
+    opts?: { preload?: boolean; throwOnError?: boolean },
+  ) {
+    if (typeof pathnameOrNext === 'string') {
+      return this.matchRoutesInternal(
+        {
+          pathname: pathnameOrNext,
+          search: locationSearchOrOpts,
+        } as ParsedLocation,
+        opts,
+      )
+    } else {
+      return this.matchRoutesInternal(pathnameOrNext, locationSearchOrOpts)
+    }
+  }
+
+  private matchRoutesInternal(
     next: ParsedLocation,
     opts?: { preload?: boolean; throwOnError?: boolean },
-  ): Array<AnyRouteMatch> => {
+  ): Array<AnyRouteMatch> {
     let routeParams: Record<string, string> = {}
 
     const foundRoute = this.flatRoutes.find((route) => {