@tanstack/react-router 1.5.6 → 1.5.8

package/build/types/link.d.ts

@@ -9,7 +9,7 @@ import { HistoryState } from '@tanstack/history';
 export type CleanPath<T extends string> = T extends `${infer L}//${infer R}` ? CleanPath<`${CleanPath<L>}/${CleanPath<R>}`> : T extends `${infer L}//` ? `${CleanPath<L>}/` : T extends `//${infer L}` ? `/${CleanPath<L>}` : T;
 export type Split<S, TIncludeTrailingSlash = true> = S extends unknown ? string extends S ? string[] : S extends string ? CleanPath<S> extends '' ? [] : TIncludeTrailingSlash extends true ? CleanPath<S> extends `${infer T}/` ? [...Split<T>, '/'] : CleanPath<S> extends `/${infer U}` ? Split<U> : CleanPath<S> extends `${infer T}/${infer U}` ? [...Split<T>, ...Split<U>] : [S] : CleanPath<S> extends `${infer T}/${infer U}` ? [...Split<T>, ...Split<U>] : S extends string ? [S] : never : never : never;
 export type ParsePathParams<T extends string> = keyof {
-    [K in Trim<Split<T>[number], '_'> as K extends `$${infer L}` ? L : never]: K;
+    [K in Trim<Split<T>[number], '_'> as K extends `$${infer L}` ? L extends '' ? '_splat' : L : never]: K;
 };
 export type Join<T, Delimiter extends string = '/'> = T extends [] ? '' : T extends [infer L extends string] ? L : T extends [infer L extends string, ...infer Tail extends [...string[]]] ? CleanPath<`${L}${Delimiter}${Join<Tail>}`> : never;
 export type Last<T extends any[]> = T extends [...infer _, infer L] ? L : never;

package/build/umd/index.development.js

@@ -2482,7 +2482,8 @@
     };
     buildLocation = opts => {
       const build = (dest = {}, matches) => {
-        const fromSearch = (this.state.pendingMatches || this.state.matches).reverse()[0]?.search || this.latestLocation.search;
+        const relevantMatches = this.state.pendingMatches || this.state.matches;
+        const fromSearch = relevantMatches[relevantMatches.length - 1]?.search || this.latestLocation.search;
         let pathname = this.resolvePathWithBase(dest.from ?? this.latestLocation.pathname, `${dest.to ?? ''}`);
         const fromMatches = this.matchRoutes(this.latestLocation.pathname, fromSearch);
         const stayingMatches = matches?.filter(d => fromMatches?.find(e => e.routeId === d.routeId));