@tanstack/react-router 1.89.2 → 1.91.0

package/dist/cjs/routeInfo.d.cts

@@ -27,7 +27,7 @@ export type RouteByPath<TRouteTree extends AnyRoute, TPath> = Extract<RoutesByPa
 export type CodeRoutePaths<TRouteTree extends AnyRoute> = ParseRoute<TRouteTree> extends infer TRoutes extends AnyRoute ? TRoutes['fullPath'] : never;
 export type RoutePaths<TRouteTree extends AnyRoute> = unknown extends TRouteTree ? string : (InferFileRouteTypes<TRouteTree> extends never ? CodeRoutePaths<TRouteTree> : InferFileRouteTypes<TRouteTree>['fullPaths']) | '/';
 export type RouteToPathAlwaysTrailingSlash<TRoute extends AnyRoute> = TRoute['path'] extends '/' ? TRoute['fullPath'] : TRoute['fullPath'] extends '/' ? TRoute['fullPath'] : `${TRoute['fullPath']}/`;
-export type RouteToPathNeverTrailingSlash<TRoute extends AnyRoute> = TRoute['path'] extends '/' ? TRoute['fullPath'] extends '/' ? TRoute['fullPath'] : TRoute['fullPath'] extends `${infer TRest}/` ? TRest : TRoute['fullPath'] : TRoute['fullPath'];
+export type RouteToPathNeverTrailingSlash<TRoute extends AnyRoute> = TRoute['path'] extends '/' ? TRoute['fullPath'] extends '/' ? TRoute['fullPath'] : RemoveTrailingSlashes<TRoute['fullPath']> : TRoute['fullPath'];
 export type RouteToPathPreserveTrailingSlash<TRoute extends AnyRoute> = RouteToPathNeverTrailingSlash<TRoute> | RouteToPathAlwaysTrailingSlash<TRoute>;
 export type RouteToPathByTrailingSlashOption<TRoute extends AnyRoute> = {
     always: RouteToPathAlwaysTrailingSlash<TRoute>;
@@ -36,9 +36,9 @@ export type RouteToPathByTrailingSlashOption<TRoute extends AnyRoute> = {
 };
 export type TrailingSlashOptionByRouter<TRouter extends AnyRouter> = TrailingSlashOption extends TRouter['options']['trailingSlash'] ? 'never' : NonNullable<TRouter['options']['trailingSlash']>;
 export type RouteToByRouter<TRouter extends AnyRouter, TRoute extends AnyRoute> = RouteToPathByTrailingSlashOption<TRoute>[TrailingSlashOptionByRouter<TRouter>];
-export type CodeRouteToPath<TRouter extends AnyRouter, TRouteTree extends AnyRoute> = ParseRouteWithoutBranches<TRouteTree> extends infer TRoute extends AnyRoute ? TRoute extends any ? RouteToByRouter<TRouter, TRoute> : never : never;
+export type CodeRouteToPath<TRouter extends AnyRouter> = ParseRouteWithoutBranches<TRouter['routeTree']> extends infer TRoute extends AnyRoute ? TRoute extends any ? RouteToByRouter<TRouter, TRoute> : never : never;
 export type FileRouteToPath<TRouter extends AnyRouter, TTo = InferFileRouteTypes<TRouter['routeTree']>['to'], TTrailingSlashOption = TrailingSlashOptionByRouter<TRouter>> = 'never' extends TTrailingSlashOption ? TTo : 'always' extends TTrailingSlashOption ? AddTrailingSlash<TTo> : TTo | AddTrailingSlash<TTo>;
-export type RouteToPath<TRouter extends AnyRouter, TRouteTree extends AnyRoute> = unknown extends TRouter ? string : InferFileRouteTypes<TRouter['routeTree']> extends never ? CodeRouteToPath<TRouter, TRouteTree> : FileRouteToPath<TRouter>;
+export type RouteToPath<TRouter extends AnyRouter> = unknown extends TRouter ? string : InferFileRouteTypes<TRouter['routeTree']> extends never ? CodeRouteToPath<TRouter> : FileRouteToPath<TRouter>;
 export type CodeRoutesByToPath<TRouter extends AnyRouter> = ParseRouteWithoutBranches<TRouter['routeTree']> extends infer TRoutes extends AnyRoute ? {
     [TRoute in TRoutes as RouteToByRouter<TRouter, TRoute>]: TRoute;
 } : never;

package/dist/cjs/router.cjs

@@ -218,7 +218,7 @@ class Router {
         }
       });
     };
-    this.parseLocation = (previousLocation) => {
+    this.parseLocation = (previousLocation, locationToParse) => {
       const parse = ({
         pathname,
         search,
@@ -236,7 +236,7 @@ class Router {
           state: utils.replaceEqualDeep(previousLocation == null ? void 0 : previousLocation.state, state)
         };
       };
-      const location = parse(this.history.location);
+      const location = parse(locationToParse ?? this.history.location);
       const { __tempLocation, __tempKey } = location.state;
       if (__tempLocation && (!__tempKey || __tempKey === this.tempLocationKey)) {
         const parsedTempLocation = parse(__tempLocation);
@@ -1052,28 +1052,7 @@ class Router {
                             }
                           };
                           try {
-                            if (route._lazyPromise === void 0) {
-                              if (route.lazyFn) {
-                                route._lazyPromise = route.lazyFn().then((lazyRoute) => {
-                                  const { id: _id, ...options2 } = lazyRoute.options;
-                                  Object.assign(route.options, options2);
-                                });
-                              } else {
-                                route._lazyPromise = Promise.resolve();
-                              }
-                            }
-                            if (route._componentsPromise === void 0) {
-                              route._componentsPromise = route._lazyPromise.then(
-                                () => Promise.all(
-                                  componentTypes.map(async (type) => {
-                                    const component = route.options[type];
-                                    if (component == null ? void 0 : component.preload) {
-                                      await component.preload();
-                                    }
-                                  })
-                                )
-                              );
-                            }
+                            this.loadRouteChunk(route);
                             updateMatch(matchId, (prev) => ({
                               ...prev,
                               isFetching: "loader"
@@ -1258,6 +1237,31 @@ class Router {
       };
       this.clearCache({ filter });
     };
+    this.loadRouteChunk = (route) => {
+      if (route._lazyPromise === void 0) {
+        if (route.lazyFn) {
+          route._lazyPromise = route.lazyFn().then((lazyRoute) => {
+            const { id: _id, ...options2 } = lazyRoute.options;
+            Object.assign(route.options, options2);
+          });
+        } else {
+          route._lazyPromise = Promise.resolve();
+        }
+      }
+      if (route._componentsPromise === void 0) {
+        route._componentsPromise = route._lazyPromise.then(
+          () => Promise.all(
+            componentTypes.map(async (type) => {
+              const component = route.options[type];
+              if (component == null ? void 0 : component.preload) {
+                await component.preload();
+              }
+            })
+          )
+        );
+      }
+      return route._componentsPromise;
+    };
     this.preloadRoute = async (opts) => {
       const next = this.buildLocation(opts);
       let matches = this.matchRoutes(next, {