@tanstack/react-router 1.32.15 → 1.32.17

package/dist/cjs/router.cjs

@@ -4,7 +4,7 @@ const history = require("@tanstack/history");
 const reactStore = require("@tanstack/react-store");
 const invariant = require("tiny-invariant");
 const warning = require("tiny-warning");
-const route = require("./route.cjs");
+const root = require("./root.cjs");
 const searchParams = require("./searchParams.cjs");
 const utils = require("./utils.cjs");
 const RouterProvider = require("./RouterProvider.cjs");
@@ -220,13 +220,13 @@ class Router {
     };
     this.matchRoutes = (pathname, locationSearch, opts) => {
       let routeParams = {};
-      const foundRoute = this.flatRoutes.find((route2) => {
+      const foundRoute = this.flatRoutes.find((route) => {
         const matchedParams = path.matchPathname(
           this.basepath,
           path.trimPathRight(pathname),
           {
-            to: route2.fullPath,
-            caseSensitive: route2.options.caseSensitive ?? this.options.caseSensitive,
+            to: route.fullPath,
+            caseSensitive: route.options.caseSensitive ?? this.options.caseSensitive,
             fuzzy: true
           }
         );
@@ -236,7 +236,7 @@ class Router {
         }
         return false;
       });
-      let routeCursor = foundRoute || this.routesById[route.rootRouteId];
+      let routeCursor = foundRoute || this.routesById[root.rootRouteId];
       const matchedRoutes = [routeCursor];
       let isGlobalNotFound = false;
       if (
@@ -262,19 +262,19 @@ class Router {
         }
         if (this.options.notFoundMode !== "root") {
           for (let i = matchedRoutes.length - 1; i >= 0; i--) {
-            const route2 = matchedRoutes[i];
-            if (route2.children) {
-              return route2.id;
+            const route = matchedRoutes[i];
+            if (route.children) {
+              return route.id;
             }
           }
         }
-        return route.rootRouteId;
+        return root.rootRouteId;
       })();
-      const parseErrors = matchedRoutes.map((route2) => {
+      const parseErrors = matchedRoutes.map((route) => {
         let parsedParamsError;
-        if (route2.options.parseParams) {
+        if (route.options.parseParams) {
           try {
-            const parsedParams = route2.options.parseParams(routeParams);
+            const parsedParams = route.options.parseParams(routeParams);
             Object.assign(routeParams, parsedParams);
           } catch (err) {
             parsedParamsError = new PathParamError(err.message, {
@@ -289,13 +289,13 @@ class Router {
         return;
       });
       const matches = [];
-      matchedRoutes.forEach((route2, index) => {
+      matchedRoutes.forEach((route, index) => {
         var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
         const parentMatch = matches[index - 1];
         const [preMatchSearch, searchError] = (() => {
           const parentSearch = (parentMatch == null ? void 0 : parentMatch.search) ?? locationSearch;
           try {
-            const validator = typeof route2.options.validateSearch === "object" ? route2.options.validateSearch.parse : route2.options.validateSearch;
+            const validator = typeof route.options.validateSearch === "object" ? route.options.validateSearch.parse : route.options.validateSearch;
             const search = (validator == null ? void 0 : validator(parentSearch)) ?? {};
             return [
               {
@@ -314,16 +314,16 @@ class Router {
             return [parentSearch, searchParamError];
           }
         })();
-        const loaderDeps = ((_b = (_a = route2.options).loaderDeps) == null ? void 0 : _b.call(_a, {
+        const loaderDeps = ((_b = (_a = route.options).loaderDeps) == null ? void 0 : _b.call(_a, {
           search: preMatchSearch
         })) ?? "";
         const loaderDepsHash = loaderDeps ? JSON.stringify(loaderDeps) : "";
         const interpolatedPath = path.interpolatePath({
-          path: route2.fullPath,
+          path: route.fullPath,
           params: routeParams
         });
         const matchId = path.interpolatePath({
-          path: route2.id,
+          path: route.id,
           params: routeParams,
           leaveWildcards: true
         }) + loaderDepsHash;
@@ -337,14 +337,14 @@ class Router {
             params: routeParams
           };
         } else {
-          const status = route2.options.loader || route2.options.beforeLoad ? "pending" : "success";
+          const status = route.options.loader || route.options.beforeLoad ? "pending" : "success";
           const loadPromise = utils.createControlledPromise();
           if (status === "success") {
             loadPromise.resolve();
           }
           match = {
             id: matchId,
-            routeId: route2.id,
+            routeId: route.id,
             params: routeParams,
             pathname: path.joinPaths([this.basepath, interpolatedPath]),
             updatedAt: Date.now(),
@@ -364,23 +364,23 @@ class Router {
             loaderDeps,
             invalid: false,
             preload: false,
-            links: (_d = (_c = route2.options).links) == null ? void 0 : _d.call(_c),
-            scripts: (_f = (_e = route2.options).scripts) == null ? void 0 : _f.call(_e),
-            staticData: route2.options.staticData || {}
+            links: (_d = (_c = route.options).links) == null ? void 0 : _d.call(_c),
+            scripts: (_f = (_e = route.options).scripts) == null ? void 0 : _f.call(_e),
+            staticData: route.options.staticData || {}
           };
         }
         if (match.status === "success") {
-          match.meta = (_h = (_g = route2.options).meta) == null ? void 0 : _h.call(_g, {
+          match.meta = (_h = (_g = route.options).meta) == null ? void 0 : _h.call(_g, {
             matches,
             params: match.params,
             loaderData: match.loaderData
           });
-          match.headers = (_j = (_i = route2.options).headers) == null ? void 0 : _j.call(_i, {
+          match.headers = (_j = (_i = route.options).headers) == null ? void 0 : _j.call(_i, {
             loaderData: match.loaderData
           });
         }
         if (!(opts == null ? void 0 : opts.preload)) {
-          match.globalNotFound = globalNotFoundRouteId === route2.id;
+          match.globalNotFound = globalNotFoundRouteId === route.id;
         }
         match.search = utils.replaceEqualDeep(match.search, preMatchSearch);
         match.searchError = searchError;
@@ -743,11 +743,11 @@ class Router {
             isFetching: false,
             error: err
           }));
-          rendered = true;
           if (!err.routeId) {
             err.routeId = match.routeId;
           }
           if (redirects.isRedirect(err)) {
+            rendered = true;
             err = this.resolveRedirect(err);
             throw err;
           } else if (notFound.isNotFound(err)) {
@@ -764,11 +764,11 @@ class Router {
             try {
               for (let [index, match] of matches.entries()) {
                 const parentMatch = matches[index - 1];
-                const route2 = this.looseRoutesById[match.routeId];
+                const route = this.looseRoutesById[match.routeId];
                 const abortController = new AbortController();
                 let loadPromise = match.loadPromise;
-                const pendingMs = route2.options.pendingMs ?? this.options.defaultPendingMs;
-                const shouldPending = !!(onReady && !this.isServer && !preload && (route2.options.loader || route2.options.beforeLoad) && typeof pendingMs === "number" && pendingMs !== Infinity && (route2.options.pendingComponent ?? this.options.defaultPendingComponent));
+                const pendingMs = route.options.pendingMs ?? this.options.defaultPendingMs;
+                const shouldPending = !!(onReady && !this.isServer && !preload && (route.options.loader || route.options.beforeLoad) && typeof pendingMs === "number" && pendingMs !== Infinity && (route.options.pendingComponent ?? this.options.defaultPendingComponent));
                 if (shouldPending) {
                   setTimeout(() => {
                     try {
@@ -800,7 +800,7 @@ class Router {
                   firstBadMatchIndex = firstBadMatchIndex ?? index;
                   handleRedirectAndNotFound(match, err);
                   try {
-                    (_b2 = (_a2 = route2.options).onError) == null ? void 0 : _b2.call(_a2, err);
+                    (_b2 = (_a2 = route.options).onError) == null ? void 0 : _b2.call(_a2, err);
                   } catch (errorHandlerErr) {
                     err = errorHandlerErr;
                     handleRedirectAndNotFound(match, err);
@@ -821,7 +821,16 @@ class Router {
                 }
                 try {
                   const parentContext = (parentMatch == null ? void 0 : parentMatch.context) ?? this.options.context ?? {};
-                  const beforeLoadContext = await ((_b = (_a = route2.options).beforeLoad) == null ? void 0 : _b.call(_a, {
+                  matches[index] = match = updateMatch(match.id, (prev) => ({
+                    ...prev,
+                    routeContext: utils.replaceEqualDeep(
+                      match.routeContext,
+                      parentContext
+                    ),
+                    context: utils.replaceEqualDeep(match.context, parentContext),
+                    abortController
+                  }));
+                  const beforeLoadContext = await ((_b = (_a = route.options).beforeLoad) == null ? void 0 : _b.call(_a, {
                     search: match.search,
                     abortController,
                     params: match.params,
@@ -861,7 +870,7 @@ class Router {
               validResolvedMatches.forEach((match, index) => {
                 const createValidateResolvedMatchPromise = async () => {
                   const parentMatchPromise = matchPromises[index - 1];
-                  const route2 = this.looseRoutesById[match.routeId];
+                  const route = this.looseRoutesById[match.routeId];
                   const loaderContext = {
                     params: match.params,
                     deps: match.loaderDeps,
@@ -872,7 +881,7 @@ class Router {
                     location,
                     navigate: (opts) => this.navigate({ ...opts, from: match.pathname }),
                     cause: preload ? "preload" : match.cause,
-                    route: route2
+                    route
                   };
                   const fetch = async () => {
                     var _a2, _b2, _c, _d, _e, _f, _g, _h, _i;
@@ -901,13 +910,13 @@ class Router {
                             fetchCount: match.fetchCount + 1
                           })
                         );
-                        lazyPromise = ((_a2 = route2.lazyFn) == null ? void 0 : _a2.call(route2).then((lazyRoute) => {
-                          Object.assign(route2.options, lazyRoute.options);
+                        lazyPromise = ((_a2 = route.lazyFn) == null ? void 0 : _a2.call(route).then((lazyRoute) => {
+                          Object.assign(route.options, lazyRoute.options);
                         })) || Promise.resolve();
                         componentsPromise = lazyPromise.then(
                           () => Promise.all(
                             componentTypes.map(async (type) => {
-                              const component = route2.options[type];
+                              const component = route.options[type];
                               if (component == null ? void 0 : component.preload) {
                                 await component.preload();
                               }
@@ -916,7 +925,7 @@ class Router {
                         );
                         await lazyPromise;
                         checkLatest();
-                        loaderPromise = (_c = (_b2 = route2.options).loader) == null ? void 0 : _c.call(_b2, loaderContext);
+                        loaderPromise = (_c = (_b2 = route.options).loader) == null ? void 0 : _c.call(_b2, loaderContext);
                         matches[index] = match = updateMatch(
                           match.id,
                           (prev) => ({
@@ -930,12 +939,12 @@ class Router {
                       handleRedirectAndNotFound(match, loaderData);
                       await potentialPendingMinPromise();
                       checkLatest();
-                      const meta = (_e = (_d = route2.options).meta) == null ? void 0 : _e.call(_d, {
+                      const meta = (_e = (_d = route.options).meta) == null ? void 0 : _e.call(_d, {
                         matches,
                         params: match.params,
                         loaderData
                       });
-                      const headers = (_g = (_f = route2.options).headers) == null ? void 0 : _g.call(_f, {
+                      const headers = (_g = (_f = route.options).headers) == null ? void 0 : _g.call(_f, {
                         loaderData
                       });
                       matches[index] = match = updateMatch(match.id, (prev) => ({
@@ -955,7 +964,7 @@ class Router {
                       checkLatest();
                       handleRedirectAndNotFound(match, e);
                       try {
-                        (_i = (_h = route2.options).onError) == null ? void 0 : _i.call(_h, e);
+                        (_i = (_h = route.options).onError) == null ? void 0 : _i.call(_h, e);
                       } catch (onErrorError) {
                         error = onErrorError;
                         handleRedirectAndNotFound(match, onErrorError);
@@ -972,8 +981,8 @@ class Router {
                     match.loadPromise.resolve();
                   };
                   const age = Date.now() - match.updatedAt;
-                  const staleAge = preload ? route2.options.preloadStaleTime ?? this.options.defaultPreloadStaleTime ?? 3e4 : route2.options.staleTime ?? this.options.defaultStaleTime ?? 0;
-                  const shouldReloadOption = route2.options.shouldReload;
+                  const staleAge = preload ? route.options.preloadStaleTime ?? this.options.defaultPreloadStaleTime ?? 3e4 : route.options.staleTime ?? this.options.defaultStaleTime ?? 0;
+                  const shouldReloadOption = route.options.shouldReload;
                   const shouldReload = typeof shouldReloadOption === "function" ? shouldReloadOption(loaderContext) : shouldReloadOption;
                   matches[index] = match = {
                     ...match,
@@ -1015,6 +1024,10 @@ class Router {
         await triggerOnReady();
       } catch (err) {
         if (redirects.isRedirect(err) || notFound.isNotFound(err)) {
+          if (notFound.isNotFound(err) && !preload) {
+            console.log("trigger");
+            await triggerOnReady();
+          }
           throw err;
         }
       }
@@ -1049,11 +1062,11 @@ class Router {
         return {
           ...s,
           cachedMatches: s.cachedMatches.filter((d) => {
-            const route2 = this.looseRoutesById[d.routeId];
-            if (!route2.options.loader) {
+            const route = this.looseRoutesById[d.routeId];
+            if (!route.options.loader) {
               return false;
             }
-            const gcTime = (d.preload ? route2.options.preloadGcTime ?? this.options.defaultPreloadGcTime : route2.options.gcTime ?? this.options.defaultGcTime) ?? 5 * 60 * 1e3;
+            const gcTime = (d.preload ? route.options.preloadGcTime ?? this.options.defaultPreloadGcTime : route.options.gcTime ?? this.options.defaultGcTime) ?? 5 * 60 * 1e3;
             return d.status !== "error" && Date.now() - d.updatedAt < gcTime;
           })
         };
@@ -1207,7 +1220,7 @@ class Router {
       }
       invariant(
         _ctx,
-        "Expected to find a __TSR_DEHYDRATED__ property on window... but we did not. Did you forget to render <DehydrateRouter /> in your app?"
+        "Expected to find a __TSR_DEHYDRATED__ property on window... but we did not. Please file an issue!"
       );
       const ctx = this.options.transformer.parse(_ctx);
       this.dehydratedData = ctx.payload;
@@ -1225,15 +1238,15 @@ class Router {
           dehydratedMatch,
           `Could not find a client-side match for dehydrated match with id: ${match.id}!`
         );
-        const route2 = this.looseRoutesById[match.routeId];
+        const route = this.looseRoutesById[match.routeId];
         const assets = dehydratedMatch.status === "notFound" || dehydratedMatch.status === "redirected" ? {} : {
-          meta: (_b2 = (_a2 = route2.options).meta) == null ? void 0 : _b2.call(_a2, {
+          meta: (_b2 = (_a2 = route.options).meta) == null ? void 0 : _b2.call(_a2, {
             matches: allMatches,
             params: match.params,
             loaderData: dehydratedMatch.loaderData
           }),
-          links: (_d = (_c2 = route2.options).links) == null ? void 0 : _d.call(_c2),
-          scripts: (_f = (_e = route2.options).scripts) == null ? void 0 : _f.call(_e)
+          links: (_d = (_c2 = route.options).links) == null ? void 0 : _d.call(_c2),
+          scripts: (_f = (_e = route.options).scripts) == null ? void 0 : _f.call(_e)
         };
         return {
           ...match,
@@ -1252,8 +1265,8 @@ class Router {
       const matchesByRouteId = Object.fromEntries(
         matches.map((match2) => [match2.routeId, match2])
       );
-      let routeCursor = (err.global ? this.looseRoutesById[route.rootRouteId] : this.looseRoutesById[err.routeId]) || this.looseRoutesById[route.rootRouteId];
-      while (!routeCursor.options.notFoundComponent && !this.options.defaultNotFoundComponent && routeCursor.id !== route.rootRouteId) {
+      let routeCursor = (err.global ? this.looseRoutesById[root.rootRouteId] : this.looseRoutesById[err.routeId]) || this.looseRoutesById[root.rootRouteId];
+      while (!routeCursor.options.notFoundComponent && !this.options.defaultNotFoundComponent && routeCursor.id !== root.rootRouteId) {
         routeCursor = routeCursor.parentRoute;
         invariant(
           routeCursor,