@tanstack/react-router 1.97.20 → 1.97.23

package/dist/cjs/router.cjs

@@ -3,10 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const history = require("@tanstack/history");
 const reactStore = require("@tanstack/react-store");
 const invariant = require("tiny-invariant");
-const root = require("./root.cjs");
-const searchParams = require("./searchParams.cjs");
-const utils = require("./utils.cjs");
-const path = require("./path.cjs");
+const routerCore = require("@tanstack/router-core");
 const redirects = require("./redirects.cjs");
 const notFound = require("./not-found.cjs");
 const componentTypes = [
@@ -64,7 +61,7 @@ class Router {
       var _a;
       if (newOptions.notFoundRoute) {
         console.warn(
-          "The notFoundRoute API is deprecated and will be removed in the next major version. See https://tanstack.com/router/v1/docs/guide/not-found-errors#migrating-from-notfoundroute for more info."
+          "The notFoundRoute API is deprecated and will be removed in the next major version. See https://tanstack.com/router/v1/docs/framework/react/guide/not-found-errors#migrating-from-notfoundroute for more info."
         );
       }
       const previousOptions = this.options;
@@ -83,7 +80,7 @@ class Router {
         if (newOptions.basepath === void 0 || newOptions.basepath === "" || newOptions.basepath === "/") {
           this.basepath = "/";
         } else {
-          this.basepath = `/${path.trimPath(newOptions.basepath)}`;
+          this.basepath = `/${routerCore.trimPath(newOptions.basepath)}`;
         }
       }
       if (
@@ -142,7 +139,7 @@ class Router {
           );
           this.routesById[childRoute.id] = childRoute;
           if (!childRoute.isRoot && childRoute.path) {
-            const trimmedFullPath = path.trimPathRight(childRoute.fullPath);
+            const trimmedFullPath = routerCore.trimPathRight(childRoute.fullPath);
             if (!this.routesByPath[trimmedFullPath] || childRoute.fullPath.endsWith("/")) {
               this.routesByPath[trimmedFullPath] = childRoute;
             }
@@ -161,8 +158,8 @@ class Router {
         if (d.isRoot || !d.path) {
           return;
         }
-        const trimmed = path.trimPathLeft(d.fullPath);
-        const parsed = path.parsePathname(trimmed);
+        const trimmed = routerCore.trimPathLeft(d.fullPath);
+        const parsed = routerCore.parsePathname(trimmed);
         while (parsed.length > 1 && ((_a = parsed[0]) == null ? void 0 : _a.value) === "/") {
           parsed.shift();
         }
@@ -230,10 +227,10 @@ class Router {
         return {
           pathname,
           searchStr,
-          search: utils.replaceEqualDeep(previousLocation == null ? void 0 : previousLocation.search, parsedSearch),
+          search: routerCore.replaceEqualDeep(previousLocation == null ? void 0 : previousLocation.search, parsedSearch),
           hash: hash.split("#").reverse()[0] ?? "",
           href: `${pathname}${searchStr}${hash}`,
-          state: utils.replaceEqualDeep(previousLocation == null ? void 0 : previousLocation.state, state)
+          state: routerCore.replaceEqualDeep(previousLocation == null ? void 0 : previousLocation.state, state)
         };
       };
       const location = parse(locationToParse ?? this.history.location);
@@ -249,11 +246,11 @@ class Router {
       }
       return location;
     };
-    this.resolvePathWithBase = (from, path$1) => {
-      const resolvedPath = path.resolvePath({
+    this.resolvePathWithBase = (from, path) => {
+      const resolvedPath = routerCore.resolvePath({
         basepath: this.basepath,
         base: from,
-        to: path.cleanPath(path$1),
+        to: routerCore.cleanPath(path),
         trailingSlash: this.options.trailingSlash,
         caseSensitive: this.options.caseSensitive
       });
@@ -261,9 +258,9 @@ class Router {
     };
     this.getMatchedRoutes = (next, dest) => {
       let routeParams = {};
-      const trimmedPath = path.trimPathRight(next.pathname);
+      const trimmedPath = routerCore.trimPathRight(next.pathname);
       const getMatchedParams = (route) => {
-        const result = path.matchPathname(this.basepath, trimmedPath, {
+        const result = routerCore.matchPathname(this.basepath, trimmedPath, {
           to: route.fullPath,
           caseSensitive: route.options.caseSensitive ?? this.options.caseSensitive,
           fuzzy: true
@@ -283,7 +280,7 @@ class Router {
           return false;
         });
       }
-      let routeCursor = foundRoute || this.routesById[root.rootRouteId];
+      let routeCursor = foundRoute || this.routesById[routerCore.rootRouteId];
       const matchedRoutes = [routeCursor];
       while (routeCursor.parentRoute) {
         routeCursor = routeCursor.parentRoute;
@@ -308,7 +305,7 @@ class Router {
         var _a, _b, _c, _d, _e, _f;
         const fromMatches = dest._fromLocation ? this.matchRoutes(dest._fromLocation, { _buildLocation: true }) : this.state.matches;
         const fromMatch = dest.from != null ? fromMatches.find(
-          (d) => path.matchPathname(this.basepath, path.trimPathRight(d.pathname), {
+          (d) => routerCore.matchPathname(this.basepath, routerCore.trimPathRight(d.pathname), {
             to: dest.from,
             caseSensitive: false,
             fuzzy: false
@@ -319,7 +316,7 @@ class Router {
           dest.from == null || fromMatch != null,
           "Could not find match for from: " + dest.from
         );
-        const fromSearch = ((_a = this.state.pendingMatches) == null ? void 0 : _a.length) ? (_b = utils.last(this.state.pendingMatches)) == null ? void 0 : _b.search : ((_c = utils.last(fromMatches)) == null ? void 0 : _c.search) || this.latestLocation.search;
+        const fromSearch = ((_a = this.state.pendingMatches) == null ? void 0 : _a.length) ? (_b = routerCore.last(this.state.pendingMatches)) == null ? void 0 : _b.search : ((_c = routerCore.last(fromMatches)) == null ? void 0 : _c.search) || this.latestLocation.search;
         const stayingMatches = matchedRoutesResult == null ? void 0 : matchedRoutesResult.matchedRoutes.filter(
           (d) => fromMatches.find((e) => e.routeId === d.id)
         );
@@ -328,12 +325,12 @@ class Router {
           pathname = this.resolvePathWithBase(fromPath, `${dest.to}`);
         } else {
           const fromRouteByFromPathRouteId = this.routesById[(_d = stayingMatches == null ? void 0 : stayingMatches.find((route) => {
-            const interpolatedPath = path.interpolatePath({
+            const interpolatedPath = routerCore.interpolatePath({
               path: route.fullPath,
               params: (matchedRoutesResult == null ? void 0 : matchedRoutesResult.routeParams) ?? {},
               decodeCharMap: this.pathParamsDecodeCharMap
             });
-            const pathname2 = path.joinPaths([this.basepath, interpolatedPath]);
+            const pathname2 = routerCore.joinPaths([this.basepath, interpolatedPath]);
             return pathname2 === fromPath;
           })) == null ? void 0 : _d.id];
           pathname = this.resolvePathWithBase(
@@ -341,10 +338,10 @@ class Router {
             (fromRouteByFromPathRouteId == null ? void 0 : fromRouteByFromPathRouteId.to) ?? fromPath
           );
         }
-        const prevParams = { ...(_e = utils.last(fromMatches)) == null ? void 0 : _e.params };
+        const prevParams = { ...(_e = routerCore.last(fromMatches)) == null ? void 0 : _e.params };
         let nextParams = (dest.params ?? true) === true ? prevParams : {
           ...prevParams,
-          ...utils.functionalUpdate(dest.params, prevParams)
+          ...routerCore.functionalUpdate(dest.params, prevParams)
         };
         if (Object.keys(nextParams).length > 0) {
           matchedRoutesResult == null ? void 0 : matchedRoutesResult.matchedRoutes.map((route) => {
@@ -354,7 +351,7 @@ class Router {
             nextParams = { ...nextParams, ...fn(nextParams) };
           });
         }
-        pathname = path.interpolatePath({
+        pathname = routerCore.interpolatePath({
           path: pathname,
           params: nextParams ?? {},
           leaveWildcards: false,
@@ -440,7 +437,7 @@ class Router {
             if (dest.search === true) {
               return search3;
             }
-            return utils.functionalUpdate(dest.search, search3);
+            return routerCore.functionalUpdate(dest.search, search3);
           };
           allMiddlewares.push(final);
           const applyNext = (index, currentSearch) => {
@@ -456,12 +453,12 @@ class Router {
           return applyNext(0, search2);
         };
         search = applyMiddlewares(search);
-        search = utils.replaceEqualDeep(fromSearch, search);
+        search = routerCore.replaceEqualDeep(fromSearch, search);
         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;
+        const hash = dest.hash === true ? this.latestLocation.hash : dest.hash ? routerCore.functionalUpdate(dest.hash, this.latestLocation.hash) : void 0;
         const hashStr = hash ? `#${hash}` : "";
-        let nextState = dest.state === true ? this.latestLocation.state : dest.state ? utils.functionalUpdate(dest.state, this.latestLocation.state) : {};
-        nextState = utils.replaceEqualDeep(this.latestLocation.state, nextState);
+        let nextState = dest.state === true ? this.latestLocation.state : dest.state ? routerCore.functionalUpdate(dest.state, this.latestLocation.state) : {};
+        nextState = routerCore.replaceEqualDeep(this.latestLocation.state, nextState);
         return {
           pathname,
           search,
@@ -479,7 +476,7 @@ class Router {
         if (!maskedNext) {
           let params = {};
           const foundMask = (_a = this.options.routeMasks) == null ? void 0 : _a.find((d) => {
-            const match = path.matchPathname(this.basepath, next.pathname, {
+            const match = routerCore.matchPathname(this.basepath, next.pathname, {
               to: d.from,
               caseSensitive: false,
               fuzzy: false
@@ -493,7 +490,7 @@ class Router {
           if (foundMask) {
             const { from: _from, ...maskProps } = foundMask;
             maskedDest = {
-              ...utils.pick(opts, ["from"]),
+              ...routerCore.pick(opts, ["from"]),
               ...maskProps,
               params
             };
@@ -511,7 +508,7 @@ class Router {
       };
       if (opts.mask) {
         return buildWithMatches(opts, {
-          ...utils.pick(opts, ["from"]),
+          ...routerCore.pick(opts, ["from"]),
           ...opts.mask
         });
       }
@@ -524,13 +521,13 @@ class Router {
     }) => {
       const isSameState = () => {
         next.state.key = this.latestLocation.state.key;
-        const isEqual = utils.deepEqual(next.state, this.latestLocation.state);
+        const isEqual = routerCore.deepEqual(next.state, this.latestLocation.state);
         delete next.state.key;
         return isEqual;
       };
       const isSameUrl = this.latestLocation.href === next.href;
       const previousCommitPromise = this.commitLocationPromise;
-      this.commitLocationPromise = utils.createControlledPromise(() => {
+      this.commitLocationPromise = routerCore.createControlledPromise(() => {
         previousCommitPromise == null ? void 0 : previousCommitPromise.resolve();
       });
       if (isSameUrl && isSameState()) {
@@ -916,11 +913,11 @@ class Router {
                   try {
                     updateMatch(matchId, (prev) => ({
                       ...prev,
-                      loadPromise: utils.createControlledPromise(() => {
+                      loadPromise: routerCore.createControlledPromise(() => {
                         var _a2;
                         (_a2 = prev.loadPromise) == null ? void 0 : _a2.resolve();
                       }),
-                      beforeLoadPromise: utils.createControlledPromise()
+                      beforeLoadPromise: routerCore.createControlledPromise()
                     }));
                     const abortController = new AbortController();
                     let pendingTimeout;
@@ -1041,7 +1038,7 @@ class Router {
                       const shouldReload = typeof shouldReloadOption === "function" ? shouldReloadOption(getLoaderContext()) : shouldReloadOption;
                       updateMatch(matchId, (prev) => ({
                         ...prev,
-                        loaderPromise: utils.createControlledPromise(),
+                        loaderPromise: routerCore.createControlledPromise(),
                         preload: !!preload && !this.state.matches.find((d) => d.id === matchId)
                       }));
                       const runLoader = async () => {
@@ -1337,7 +1334,7 @@ class Router {
       }
       const pending = (opts == null ? void 0 : opts.pending) === void 0 ? !this.state.isLoading : opts.pending;
       const baseLocation = pending ? this.latestLocation : this.state.resolvedLocation;
-      const match = path.matchPathname(this.basepath, baseLocation.pathname, {
+      const match = routerCore.matchPathname(this.basepath, baseLocation.pathname, {
         ...opts,
         to: next.pathname
       });
@@ -1345,12 +1342,12 @@ class Router {
         return false;
       }
       if (location.params) {
-        if (!utils.deepEqual(match, location.params, { partial: true })) {
+        if (!routerCore.deepEqual(match, location.params, { partial: true })) {
           return false;
         }
       }
       if (match && ((opts == null ? void 0 : opts.includeSearch) ?? true)) {
-        return utils.deepEqual(baseLocation.search, next.search, { partial: true }) ? match : false;
+        return routerCore.deepEqual(baseLocation.search, next.search, { partial: true }) ? match : false;
       }
       return match;
     };
@@ -1360,8 +1357,8 @@ class Router {
       const matchesByRouteId = Object.fromEntries(
         matches.map((match2) => [match2.routeId, match2])
       );
-      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) {
+      let routeCursor = (err.global ? this.looseRoutesById[routerCore.rootRouteId] : this.looseRoutesById[err.routeId]) || this.looseRoutesById[routerCore.rootRouteId];
+      while (!routeCursor.options.notFoundComponent && !this.options.defaultNotFoundComponent && routeCursor.id !== routerCore.rootRouteId) {
         routeCursor = routeCursor.parentRoute;
         invariant(
           routeCursor,
@@ -1396,8 +1393,8 @@ class Router {
       ...options,
       caseSensitive: options.caseSensitive ?? false,
       notFoundMode: options.notFoundMode ?? "fuzzy",
-      stringifySearch: options.stringifySearch ?? searchParams.defaultStringifySearch,
-      parseSearch: options.parseSearch ?? searchParams.defaultParseSearch
+      stringifySearch: options.stringifySearch ?? routerCore.defaultStringifySearch,
+      parseSearch: options.parseSearch ?? routerCore.defaultParseSearch
     });
     if (typeof document !== "undefined") {
       window.__TSR_ROUTER__ = this;
@@ -1432,7 +1429,7 @@ class Router {
       // If we found a route, and it's not an index route and we have left over path
       foundRoute ? foundRoute.path !== "/" && routeParams["**"] : (
         // Or if we didn't find a route and we have left over path
-        path.trimPathRight(next.pathname)
+        routerCore.trimPathRight(next.pathname)
       )
     ) {
       if (this.options.notFoundRoute) {
@@ -1453,7 +1450,7 @@ class Router {
           }
         }
       }
-      return root.rootRouteId;
+      return routerCore.rootRouteId;
     })();
     const parseErrors = matchedRoutes.map((route) => {
       var _a;
@@ -1512,12 +1509,12 @@ class Router {
         search: preMatchSearch
       })) ?? "";
       const loaderDepsHash = loaderDeps ? JSON.stringify(loaderDeps) : "";
-      const interpolatedPath = path.interpolatePath({
+      const interpolatedPath = routerCore.interpolatePath({
         path: route.fullPath,
         params: routeParams,
         decodeCharMap: this.pathParamsDecodeCharMap
       });
-      const matchId = path.interpolatePath({
+      const matchId = routerCore.interpolatePath({
         path: route.id,
         params: routeParams,
         leaveWildcards: true,
@@ -1533,8 +1530,8 @@ class Router {
         match = {
           ...existingMatch,
           cause,
-          params: previousMatch ? utils.replaceEqualDeep(previousMatch.params, routeParams) : routeParams,
-          search: previousMatch ? utils.replaceEqualDeep(previousMatch.search, preMatchSearch) : utils.replaceEqualDeep(existingMatch.search, preMatchSearch)
+          params: previousMatch ? routerCore.replaceEqualDeep(previousMatch.params, routeParams) : routeParams,
+          search: previousMatch ? routerCore.replaceEqualDeep(previousMatch.search, preMatchSearch) : routerCore.replaceEqualDeep(existingMatch.search, preMatchSearch)
         };
       } else {
         const status = route.options.loader || route.options.beforeLoad || route.lazyFn || routeNeedsPreload(route) ? "pending" : "success";
@@ -1542,10 +1539,10 @@ class Router {
           id: matchId,
           index,
           routeId: route.id,
-          params: previousMatch ? utils.replaceEqualDeep(previousMatch.params, routeParams) : routeParams,
-          pathname: path.joinPaths([this.basepath, interpolatedPath]),
+          params: previousMatch ? routerCore.replaceEqualDeep(previousMatch.params, routeParams) : routeParams,
+          pathname: routerCore.joinPaths([this.basepath, interpolatedPath]),
           updatedAt: Date.now(),
-          search: previousMatch ? utils.replaceEqualDeep(previousMatch.search, preMatchSearch) : preMatchSearch,
+          search: previousMatch ? routerCore.replaceEqualDeep(previousMatch.search, preMatchSearch) : preMatchSearch,
           searchError: void 0,
           status,
           isFetching: false,
@@ -1557,14 +1554,14 @@ class Router {
           abortController: new AbortController(),
           fetchCount: 0,
           cause,
-          loaderDeps: previousMatch ? utils.replaceEqualDeep(previousMatch.loaderDeps, loaderDeps) : loaderDeps,
+          loaderDeps: previousMatch ? routerCore.replaceEqualDeep(previousMatch.loaderDeps, loaderDeps) : loaderDeps,
           invalid: false,
           preload: false,
           links: void 0,
           scripts: void 0,
           meta: void 0,
           staticData: route.options.staticData || {},
-          loadPromise: utils.createControlledPromise(),
+          loadPromise: routerCore.createControlledPromise(),
           fullPath: route.fullPath
         };
       }
@@ -1648,27 +1645,11 @@ function getInitialRouterState(location) {
     statusCode: 200
   };
 }
-function defaultSerializeError(err) {
-  if (err instanceof Error) {
-    const obj = {
-      name: err.name,
-      message: err.message
-    };
-    if (process.env.NODE_ENV === "development") {
-      obj.stack = err.stack;
-    }
-    return obj;
-  }
-  return {
-    data: err
-  };
-}
 exports.PathParamError = PathParamError;
 exports.Router = Router;
 exports.SearchParamError = SearchParamError;
 exports.componentTypes = componentTypes;
 exports.createRouter = createRouter;
-exports.defaultSerializeError = defaultSerializeError;
 exports.getInitialRouterState = getInitialRouterState;
 exports.lazyFn = lazyFn;
 //# sourceMappingURL=router.cjs.map