@tanstack/react-router 1.35.2 → 1.35.5

package/dist/cjs/routeInfo.d.cts

@@ -1,4 +1,4 @@
-import { AnyRoute, RootSearchSchema } from './route.cjs';
+import { AnyRoute } from './route.cjs';
 import { AnyRouter, TrailingSlashOption } from './router.cjs';
 import { MergeUnion } from './utils.cjs';
 
@@ -34,8 +34,8 @@ export type RoutesByToPath<TRouter extends AnyRouter> = {
     [TRoute in ParseRouteWithoutBranches<TRouter['routeTree']> as RouteToByRouter<TRouter, TRoute>]: TRoute;
 };
 export type RouteByToPath<TRouter extends AnyRouter, TTo> = Extract<RoutesByToPath<TRouter>[TTo], AnyRoute>;
-export type FullSearchSchema<TRouteTree extends AnyRoute> = MergeUnion<Exclude<ParseRoute<TRouteTree>['types']['fullSearchSchema'], RootSearchSchema>>;
-export type FullSearchSchemaInput<TRouteTree extends AnyRoute> = MergeUnion<Exclude<ParseRoute<TRouteTree>['types']['fullSearchSchemaInput'], RootSearchSchema>>;
+export type FullSearchSchema<TRouteTree extends AnyRoute> = MergeUnion<ParseRoute<TRouteTree>['types']['fullSearchSchema']>;
+export type FullSearchSchemaInput<TRouteTree extends AnyRoute> = MergeUnion<ParseRoute<TRouteTree>['types']['fullSearchSchemaInput']>;
 export type AllParams<TRouteTree extends AnyRoute> = MergeUnion<ParseRoute<TRouteTree>['types']['allParams']>;
 export type AllContext<TRouteTree extends AnyRoute> = MergeUnion<ParseRoute<TRouteTree>['types']['allContext']>;
 export type AllLoaderData<TRouteTree extends AnyRoute> = MergeUnion<ParseRoute<TRouteTree>['types']['loaderData']>;

package/dist/cjs/router.cjs

@@ -398,31 +398,24 @@ class Router {
     };
     this.buildLocation = (opts) => {
       const build = (dest = {}, matches) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         let fromPath = this.latestLocation.pathname;
         let fromSearch = dest.fromSearch || this.latestLocation.search;
-        const looseRoutesByPath = this.routesByPath;
-        const fromRoute = dest.from !== void 0 ? looseRoutesByPath[path.trimPathRight(dest.from)] : void 0;
         const fromMatches = this.matchRoutes(
           this.latestLocation.pathname,
           fromSearch
         );
-        const fromMatch = fromMatches.find((d) => d.routeId === (fromRoute == null ? void 0 : fromRoute.id));
-        fromPath = (fromMatch == null ? void 0 : fromMatch.pathname) || fromPath;
-        invariant(
-          dest.from == null || fromMatch != null,
-          "Could not find match for from: " + dest.from
-        );
-        fromSearch = ((_a = utils.last(fromMatches)) == null ? void 0 : _a.search) || this.latestLocation.search;
+        fromPath = ((_a = fromMatches.find((d) => d.id === dest.from)) == null ? void 0 : _a.pathname) || fromPath;
+        fromSearch = ((_b = utils.last(fromMatches)) == null ? void 0 : _b.search) || this.latestLocation.search;
         const stayingMatches = matches == null ? void 0 : matches.filter(
           (d) => fromMatches.find((e) => e.routeId === d.routeId)
         );
-        const fromRouteByFromPathRouteId = this.routesById[(_b = stayingMatches == null ? void 0 : stayingMatches.find((d) => d.pathname === fromPath)) == null ? void 0 : _b.routeId];
+        const fromRouteByFromPathRouteId = this.routesById[(_c = stayingMatches == null ? void 0 : stayingMatches.find((d) => d.pathname === fromPath)) == null ? void 0 : _c.routeId];
         let pathname = dest.to ? this.resolvePathWithBase(fromPath, `${dest.to}`) : this.resolvePathWithBase(
           fromPath,
           (fromRouteByFromPathRouteId == null ? void 0 : fromRouteByFromPathRouteId.to) ?? fromPath
         );
-        const prevParams = { ...(_c = utils.last(fromMatches)) == null ? void 0 : _c.params };
+        const prevParams = { ...(_d = utils.last(fromMatches)) == null ? void 0 : _d.params };
         let nextParams = (dest.params ?? true) === true ? prevParams : { ...prevParams, ...utils.functionalUpdate(dest.params, prevParams) };
         if (Object.keys(nextParams).length > 0) {
           matches == null ? void 0 : matches.map((d) => this.looseRoutesById[d.routeId].options.stringifyParams).filter(Boolean).forEach((fn) => {
@@ -849,7 +842,7 @@ class Router {
                     preload: !!preload,
                     context: parentContext,
                     location,
-                    navigate: (opts) => this.navigate({ ...opts }),
+                    navigate: (opts) => this.navigate({ ...opts, from: match.pathname }),
                     buildLocation: this.buildLocation,
                     cause: preload ? "preload" : match.cause
                   })) ?? {};
@@ -891,7 +884,7 @@ class Router {
                     abortController: match.abortController,
                     context: match.context,
                     location,
-                    navigate: (opts) => this.navigate({ ...opts }),
+                    navigate: (opts) => this.navigate({ ...opts, from: match.pathname }),
                     cause: preload ? "preload" : match.cause,
                     route
                   };