@tanstack/react-router 1.22.5 → 1.22.6

package/dist/cjs/router.cjs

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 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 searchParams = require("./searchParams.cjs");
 const utils = require("./utils.cjs");
 const RouterProvider = require("./RouterProvider.cjs");
 const path = require("./path.cjs");
-const invariant = require("tiny-invariant");
 const redirects = require("./redirects.cjs");
 const notFound = require("./not-found.cjs");
-const warning = require("tiny-warning");
 const componentTypes = [
   "component",
   "errorComponent",
@@ -52,7 +52,10 @@ class Router {
           this.basepath = `/${path.trimPath(newOptions.basepath)}`;
         }
       }
-      if (!this.history || this.options.history && this.options.history !== this.history) {
+      if (
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        !this.history || this.options.history && this.options.history !== this.history
+      ) {
         this.history = this.options.history ?? (typeof document !== "undefined" ? history.createBrowserHistory() : history.createMemoryHistory({
           initialEntries: [this.options.basepath || "/"]
         }));
@@ -107,7 +110,8 @@ class Router {
       };
       recurseRoutes([this.routeTree]);
       const scoredRoutes = [];
-      Object.values(this.routesById).forEach((d, i) => {
+      const routes = Object.values(this.routesById);
+      routes.forEach((d, i) => {
         var _a;
         if (d.isRoot || !d.path) {
           return;
@@ -117,14 +121,14 @@ class Router {
         while (parsed.length > 1 && ((_a = parsed[0]) == null ? void 0 : _a.value) === "/") {
           parsed.shift();
         }
-        const scores = parsed.map((d2) => {
-          if (d2.value === "/") {
+        const scores = parsed.map((segment) => {
+          if (segment.value === "/") {
             return 0.75;
           }
-          if (d2.type === "param") {
+          if (segment.type === "param") {
             return 0.5;
           }
-          if (d2.type === "wildcard") {
+          if (segment.type === "wildcard") {
             return 0.25;
           }
           return 1;
@@ -191,7 +195,7 @@ class Router {
         };
       };
       const location = parse(this.history.location);
-      let { __tempLocation, __tempKey } = location.state;
+      const { __tempLocation, __tempKey } = location.state;
       if (__tempLocation && (!__tempKey || __tempKey === this.tempLocationKey)) {
         const parsedTempLocation = parse(__tempLocation);
         parsedTempLocation.state.key = location.state.key;
@@ -208,7 +212,7 @@ class Router {
     };
     this.matchRoutes = (pathname, locationSearch, opts) => {
       let routeParams = {};
-      let foundRoute = this.flatRoutes.find((route2) => {
+      const foundRoute = this.flatRoutes.find((route2) => {
         const matchedParams = path.matchPathname(
           this.basepath,
           path.trimPathRight(pathname),
@@ -225,7 +229,7 @@ class Router {
         return false;
       });
       let routeCursor = foundRoute || this.routesById[route.rootRouteId];
-      let matchedRoutes = [routeCursor];
+      const matchedRoutes = [routeCursor];
       let isGlobalNotFound = false;
       if (
         // If we found a route, and it's not an index route and we have left over path
@@ -240,10 +244,9 @@ class Router {
           isGlobalNotFound = true;
         }
       }
-      while (routeCursor == null ? void 0 : routeCursor.parentRoute) {
+      while (routeCursor.parentRoute) {
         routeCursor = routeCursor.parentRoute;
-        if (routeCursor)
-          matchedRoutes.unshift(routeCursor);
+        matchedRoutes.unshift(routeCursor);
       }
       const globalNotFoundRouteId = (() => {
         if (!isGlobalNotFound) {
@@ -285,7 +288,7 @@ class Router {
           const parentSearch = (parentMatch == null ? void 0 : parentMatch.search) ?? locationSearch;
           try {
             const validator = typeof route2.options.validateSearch === "object" ? route2.options.validateSearch.parse : route2.options.validateSearch;
-            let search = (validator == null ? void 0 : validator(parentSearch)) ?? {};
+            const search = (validator == null ? void 0 : validator(parentSearch)) ?? {};
             return [
               {
                 ...parentSearch,
@@ -294,13 +297,13 @@ class Router {
               void 0
             ];
           } catch (err) {
-            const searchError2 = new SearchParamError(err.message, {
+            const searchParamError = new SearchParamError(err.message, {
               cause: err
             });
             if (opts == null ? void 0 : opts.throwOnError) {
-              throw searchError2;
+              throw searchParamError;
             }
-            return [parentSearch, searchError2];
+            return [parentSearch, searchParamError];
           }
         })();
         const loaderDeps = ((_b = (_a = route2.options).loaderDeps) == null ? void 0 : _b.call(_a, {
@@ -316,7 +319,7 @@ class Router {
           params: routeParams,
           leaveWildcards: true
         }) + loaderDepsHash;
-        let existingMatch = RouterProvider.getRouteMatch(this.state, matchId);
+        const existingMatch = RouterProvider.getRouteMatch(this.state, matchId);
         const cause = this.state.matches.find((d) => d.id === matchId) ? "stay" : "enter";
         const match = existingMatch ? {
           ...existingMatch,
@@ -371,13 +374,16 @@ class Router {
       const build = (dest = {}, matches) => {
         var _a, _b, _c;
         const relevantMatches = this.state.pendingMatches || this.state.matches;
-        const fromSearch = ((_a = relevantMatches[relevantMatches.length - 1]) == null ? void 0 : _a.search) || this.latestLocation.search;
+        const fromSearch = (
+          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+          ((_a = relevantMatches[relevantMatches.length - 1]) == null ? void 0 : _a.search) || this.latestLocation.search
+        );
         const fromMatches = this.matchRoutes(
           this.latestLocation.pathname,
           fromSearch
         );
         const stayingMatches = matches == null ? void 0 : matches.filter(
-          (d) => fromMatches == null ? void 0 : fromMatches.find((e) => e.routeId === d.routeId)
+          (d) => fromMatches.find((e) => e.routeId === d.routeId)
         );
         const fromRoute = this.looseRoutesById[(_b = utils.last(fromMatches)) == null ? void 0 : _b.routeId];
         let pathname = dest.to ? this.resolvePathWithBase(
@@ -403,12 +409,9 @@ class Router {
         const postSearchFilters = (stayingMatches == null ? void 0 : stayingMatches.map(
           (match) => this.looseRoutesById[match.routeId].options.postSearchFilters ?? []
         ).flat().filter(Boolean)) ?? [];
-        const preFilteredSearch = (preSearchFilters == null ? void 0 : preSearchFilters.length) ? preSearchFilters == null ? void 0 : preSearchFilters.reduce(
-          (prev, next) => next(prev),
-          fromSearch
-        ) : fromSearch;
-        const destSearch = dest.search === true ? preFilteredSearch : dest.search ? utils.functionalUpdate(dest.search, preFilteredSearch) ?? {} : (preSearchFilters == null ? void 0 : preSearchFilters.length) ? preFilteredSearch : {};
-        const postFilteredSearch = (postSearchFilters == null ? void 0 : postSearchFilters.length) ? postSearchFilters.reduce((prev, next) => next(prev), destSearch) : destSearch;
+        const preFilteredSearch = preSearchFilters.length ? preSearchFilters.reduce((prev, next) => next(prev), fromSearch) : fromSearch;
+        const destSearch = dest.search === true ? preFilteredSearch : dest.search ? utils.functionalUpdate(dest.search, preFilteredSearch) : preSearchFilters.length ? preFilteredSearch : {};
+        const postFilteredSearch = postSearchFilters.length ? postSearchFilters.reduce((prev, next) => next(prev), destSearch) : destSearch;
         const search = utils.replaceEqualDeep(fromSearch, postFilteredSearch);
         const searchStr = this.options.stringifySearch(search);
         const hash = dest.hash === true ? this.latestLocation.hash : dest.hash ? utils.functionalUpdate(dest.hash, this.latestLocation.hash) : void 0;
@@ -427,11 +430,11 @@ class Router {
       };
       const buildWithMatches = (dest = {}, maskedDest) => {
         var _a;
-        let next = build(dest);
+        const next = build(dest);
         let maskedNext = maskedDest ? build(maskedDest) : void 0;
         if (!maskedNext) {
           let params = {};
-          let foundMask = (_a = this.options.routeMasks) == null ? void 0 : _a.find((d) => {
+          const foundMask = (_a = this.options.routeMasks) == null ? void 0 : _a.find((d) => {
             const match = path.matchPathname(this.basepath, next.pathname, {
               to: d.from,
               caseSensitive: false,
@@ -656,6 +659,7 @@ class Router {
       const matchPromises = [];
       validResolvedMatches.forEach((match, index) => {
         matchPromises.push(
+          // eslint-disable-next-line no-async-promise-executor
           new Promise(async (resolve, reject) => {
             var _a2;
             const parentMatchPromise = matchPromises[index - 1];
@@ -750,12 +754,13 @@ class Router {
                   meta,
                   headers
                 };
-              } catch (error) {
+              } catch (e) {
+                let error = e;
                 if (latestPromise = checkLatest())
                   return await latestPromise;
-                handleError(error);
+                handleError(e);
                 try {
-                  (_j = (_i = route2.options).onError) == null ? void 0 : _j.call(_i, error);
+                  (_j = (_i = route2.options).onError) == null ? void 0 : _j.call(_i, e);
                 } catch (onErrorError) {
                   error = onErrorError;
                   handleError(onErrorError);
@@ -770,10 +775,9 @@ class Router {
               updateMatch(match);
             };
             const age = Date.now() - match.updatedAt;
-            let staleAge = preload ? route2.options.preloadStaleTime ?? this.options.defaultPreloadStaleTime ?? 3e4 : route2.options.staleTime ?? this.options.defaultStaleTime ?? 0;
-            let shouldReload;
+            const staleAge = preload ? route2.options.preloadStaleTime ?? this.options.defaultPreloadStaleTime ?? 3e4 : route2.options.staleTime ?? this.options.defaultStaleTime ?? 0;
             const shouldReloadOption = route2.options.shouldReload;
-            shouldReload = typeof shouldReloadOption === "function" ? shouldReloadOption(loaderContext) : shouldReloadOption;
+            const shouldReload = typeof shouldReloadOption === "function" ? shouldReloadOption(loaderContext) : shouldReloadOption;
             matches[index] = match = {
               ...match,
               preload: !!preload && !this.state.matches.find((d) => d.id === match.id)
@@ -946,7 +950,7 @@ class Router {
       return this.latestLoadPromise;
     };
     this.resolveRedirect = (err) => {
-      let redirect = err;
+      const redirect = err;
       if (!redirect.href) {
         redirect.href = this.buildLocation(redirect).href;
       }
@@ -968,18 +972,17 @@ class Router {
       });
     };
     this.preloadRoute = async (opts) => {
-      var _a;
-      let next = this.buildLocation(opts);
+      const next = this.buildLocation(opts);
       let matches = this.matchRoutes(next.pathname, next.search, {
         throwOnError: true,
         preload: true
       });
       const loadedMatchIds = Object.fromEntries(
-        (_a = [
+        [
           ...this.state.matches,
           ...this.state.pendingMatches ?? [],
           ...this.state.cachedMatches
-        ]) == null ? void 0 : _a.map((d) => [d.id, true])
+        ].map((d) => [d.id, true])
       );
       this.__store.batch(() => {
         matches.forEach((match) => {
@@ -1019,9 +1022,6 @@ class Router {
         return false;
       }
       const baseLocation = (opts == null ? void 0 : opts.pending) ? this.latestLocation : this.state.resolvedLocation;
-      if (!baseLocation) {
-        return false;
-      }
       const match = path.matchPathname(this.basepath, baseLocation.pathname, {
         ...opts,
         to: next.pathname
@@ -1115,7 +1115,7 @@ class Router {
       this.dehydratedData = ctx.payload;
       (_c = (_b = this.options).hydrate) == null ? void 0 : _c.call(_b, ctx.payload);
       const dehydratedState = ctx.router.state;
-      let matches = this.matchRoutes(
+      const matches = this.matchRoutes(
         this.state.location.pathname,
         this.state.location.search
       ).map((match) => {
@@ -1127,23 +1127,20 @@ class Router {
           dehydratedMatch,
           `Could not find a client-side match for dehydrated match with id: ${match.id}!`
         );
-        if (dehydratedMatch) {
-          const route2 = this.looseRoutesById[match.routeId];
-          const assets = dehydratedMatch.status === "notFound" || dehydratedMatch.status === "redirected" ? {} : {
-            meta: (_b2 = (_a2 = route2.options).meta) == null ? void 0 : _b2.call(_a2, {
-              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)
-          };
-          return {
-            ...match,
-            ...dehydratedMatch,
-            ...assets
-          };
-        }
-        return match;
+        const route2 = this.looseRoutesById[match.routeId];
+        const assets = dehydratedMatch.status === "notFound" || dehydratedMatch.status === "redirected" ? {} : {
+          meta: (_b2 = (_a2 = route2.options).meta) == null ? void 0 : _b2.call(_a2, {
+            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)
+        };
+        return {
+          ...match,
+          ...dehydratedMatch,
+          ...assets
+        };
       });
       this.__store.setState((s) => {
         return {
@@ -1159,13 +1156,13 @@ class Router {
       );
       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) {
-        routeCursor = routeCursor == null ? void 0 : routeCursor.parentRoute;
+        routeCursor = routeCursor.parentRoute;
         invariant(
           routeCursor,
           "Found invalid route tree while trying to find not-found handler."
         );
       }
-      let match = matchesByRouteId[routeCursor.id];
+      const match = matchesByRouteId[routeCursor.id];
       invariant(match, "Could not find match for route: " + routeCursor.id);
       Object.assign(match, {
         status: "notFound",
@@ -1184,9 +1181,9 @@ class Router {
       defaultPendingMinMs: 500,
       context: void 0,
       ...options,
-      stringifySearch: (options == null ? void 0 : options.stringifySearch) ?? searchParams.defaultStringifySearch,
-      parseSearch: (options == null ? void 0 : options.parseSearch) ?? searchParams.defaultParseSearch,
-      transformer: (options == null ? void 0 : options.transformer) ?? JSON
+      stringifySearch: options.stringifySearch ?? searchParams.defaultStringifySearch,
+      parseSearch: options.parseSearch ?? searchParams.defaultParseSearch,
+      transformer: options.transformer ?? JSON
     });
     if (typeof document !== "undefined") {
       window.__TSR__ROUTER__ = this;