@tanstack/router-core 1.168.17 → 1.169.0

package/dist/esm/router.js

@@ -1,6 +1,6 @@
-import { DEFAULT_PROTOCOL_ALLOWLIST, createControlledPromise, decodePath, deepEqual, encodePathLikeUrl, findLast, functionalUpdate, isDangerousProtocol, last, nullReplaceEqualDeep, replaceEqualDeep } from "./utils.js";
+import { DEFAULT_PROTOCOL_ALLOWLIST, createControlledPromise, decodePath, deepEqual, encodePathLikeUrl, findLast, functionalUpdate, hasKeys, isDangerousProtocol, last, nullReplaceEqualDeep, replaceEqualDeep } from "./utils.js";
 import { createLRUCache } from "./lru-cache.js";
-import { findFlatMatch, findRouteMatch, findSingleMatch, processRouteMasks, processRouteTree } from "./new-process-route-tree.js";
+import { buildRouteBranch, findFlatMatch, findRouteMatch, findSingleMatch, processRouteMasks, processRouteTree } from "./new-process-route-tree.js";
 import { cleanPath, compileDecodeCharMap, interpolatePath, resolvePath, trimPath, trimPathRight } from "./path.js";
 import { isNotFound } from "./not-found.js";
 import { setupScrollRestoration } from "./scroll-restoration.js";
@@ -29,7 +29,7 @@ function defaultSerializeError(err) {
 	return { data: err };
 }
 /** Options for configuring trailing-slash behavior. */
-var trailingSlashOptions = {
+const trailingSlashOptions = {
 	always: "always",
 	never: "never",
 	preserve: "preserve"
@@ -70,6 +70,7 @@ var RouterCore = class {
 		this.subscribers = /* @__PURE__ */ new Set();
 		this.isScrollRestoring = false;
 		this.isScrollRestorationSetup = false;
+		this.routeBranchCache = /* @__PURE__ */ new WeakMap();
 		this.startTransition = (fn) => fn();
 		this.update = (newOptions) => {
 			if (process.env.NODE_ENV !== "production") {
@@ -207,7 +208,7 @@ var RouterCore = class {
 		this.resolvePathWithBase = (from, path) => {
 			return resolvePath({
 				base: from,
-				to: cleanPath(path),
+				to: path.includes("//") ? cleanPath(path) : path,
 				trailingSlash: this.options.trailingSlash,
 				cache: this.resolvePathCache
 			});
@@ -259,15 +260,22 @@ var RouterCore = class {
 					if (!matchedFrom && !matchedCurrent) console.warn(`Could not find match for from: ${dest.from}`);
 				}
 				const defaultedFromPath = dest.unsafeRelative === "path" ? currentLocation.pathname : dest.from ?? lightweightResult.fullPath;
-				const fromPath = this.resolvePathWithBase(defaultedFromPath, ".");
+				const destTo = dest.to ? `${dest.to}` : void 0;
 				const fromSearch = lightweightResult.search;
 				const fromParams = Object.assign(Object.create(null), lightweightResult.params);
-				const nextTo = dest.to ? this.resolvePathWithBase(fromPath, `${dest.to}`) : this.resolvePathWithBase(fromPath, ".");
+				const sourcePath = destTo?.charCodeAt(0) === 47 ? "/" : this.resolvePathWithBase(defaultedFromPath, ".");
+				const nextTo = destTo ? this.resolvePathWithBase(sourcePath, destTo) : sourcePath;
 				const nextParams = dest.params === false || dest.params === null ? Object.create(null) : (dest.params ?? true) === true ? fromParams : Object.assign(fromParams, functionalUpdate(dest.params, fromParams));
-				const destMatchResult = this.getMatchedRoutes(nextTo);
-				let destRoutes = destMatchResult.matchedRoutes;
-				if ((!destMatchResult.foundRoute || destMatchResult.foundRoute.path !== "/" && destMatchResult.routeParams["**"]) && this.options.notFoundRoute) destRoutes = [...destRoutes, this.options.notFoundRoute];
-				if (Object.keys(nextParams).length > 0) for (const route of destRoutes) {
+				const destRoute = this.routesByPath[trimPathRight(nextTo)];
+				let destRoutes;
+				if (destRoute) destRoutes = this.getRouteBranch(destRoute);
+				else if (nextTo.includes("$")) destRoutes = [];
+				else {
+					const destMatchResult = this.getMatchedRoutes(nextTo);
+					destRoutes = destMatchResult.matchedRoutes;
+					if (this.options.notFoundRoute && (!destMatchResult.foundRoute || destMatchResult.foundRoute.path !== "/" && destMatchResult.routeParams["**"])) destRoutes = [...destRoutes, this.options.notFoundRoute];
+				}
+				if (destRoutes.length && hasKeys(nextParams)) for (const route of destRoutes) {
 					const fn = route.options.params?.stringify ?? route.options.stringifyParams;
 					if (fn) try {
 						Object.assign(nextParams, fn(nextParams));
@@ -279,6 +287,9 @@ var RouterCore = class {
 					decoder: this.pathParamsDecoder,
 					server: this.isServer
 				}).interpolatedPath).path;
+				if (process.env.NODE_ENV !== "production" && destRoute && !opts.leaveParams) try {
+					if (this.getMatchedRoutes(nextPathname).foundRoute?.id !== destRoute.id) console.warn(`Generated path "${nextPathname}" for route "${destRoute.id}" did not match the same route after params.stringify.`);
+				} catch {}
 				let nextSearch = fromSearch;
 				if (opts._includeValidateSearch && this.options.search?.strict) {
 					const validatedSearch = {};
@@ -817,6 +828,14 @@ var RouterCore = class {
 			this.routesById[notFoundRoute.id] = notFoundRoute;
 		}
 	}
+	getRouteBranch(route) {
+		let branch = this.routeBranchCache.get(route);
+		if (!branch) {
+			branch = buildRouteBranch(route);
+			this.routeBranchCache.set(route, branch);
+		}
+		return branch;
+	}
 	get looseRoutesById() {
 		return this.routesById;
 	}
@@ -825,7 +844,7 @@ var RouterCore = class {
 	}
 	matchRoutesInternal(next, opts) {
 		const matchedRoutesResult = this.getMatchedRoutes(next.pathname);
-		const { foundRoute, routeParams, parsedParams } = matchedRoutesResult;
+		const { foundRoute, routeParams } = matchedRoutesResult;
 		let { matchedRoutes } = matchedRoutesResult;
 		let isGlobalNotFound = false;
 		if (foundRoute ? foundRoute.path !== "/" && routeParams["**"] : trimPathRight(next.pathname)) if (this.options.notFoundRoute) matchedRoutes = [...matchedRoutes, this.options.notFoundRoute];
@@ -877,7 +896,7 @@ var RouterCore = class {
 			const strictParams = existingMatch?._strictParams ?? usedParams;
 			let paramsError = void 0;
 			if (!existingMatch) try {
-				extractStrictParams(route, usedParams, parsedParams, strictParams);
+				extractStrictParams(route, strictParams);
 			} catch (err) {
 				if (isNotFound(err) || isRedirect(err)) paramsError = err;
 				else paramsError = new PathParamError(err.message, { cause: err });
@@ -983,7 +1002,7 @@ var RouterCore = class {
 	* operations like AbortController, ControlledPromise, loaderDeps, and full match objects.
 	*/
 	matchRoutesLightweight(location) {
-		const { matchedRoutes, routeParams, parsedParams } = this.getMatchedRoutes(location.pathname);
+		const { matchedRoutes, routeParams } = this.getMatchedRoutes(location.pathname);
 		const lastRoute = last(matchedRoutes);
 		const accumulatedSearch = { ...location.search };
 		for (const route of matchedRoutes) try {
@@ -997,7 +1016,7 @@ var RouterCore = class {
 		else {
 			const strictParams = Object.assign(Object.create(null), routeParams);
 			for (const route of matchedRoutes) try {
-				extractStrictParams(route, routeParams, parsedParams ?? {}, strictParams);
+				extractStrictParams(route, strictParams);
 			} catch {}
 			params = strictParams;
 		}
@@ -1013,7 +1032,7 @@ var RouterCore = class {
 var SearchParamError = class extends Error {};
 /** Error thrown when path parameter parsing/validation fails. */
 var PathParamError = class extends Error {};
-var normalize = (str) => str.endsWith("/") && str.length > 1 ? str.slice(0, -1) : str;
+const normalize = (str) => str.endsWith("/") && str.length > 1 ? str.slice(0, -1) : str;
 function comparePaths(a, b) {
 	return normalize(a) === normalize(b);
 }
@@ -1059,18 +1078,15 @@ function getMatchedRoutes({ pathname, routesById, processedTree }) {
 	const routeParams = Object.create(null);
 	const trimmedPath = trimPathRight(pathname);
 	let foundRoute = void 0;
-	let parsedParams = void 0;
 	const match = findRouteMatch(trimmedPath, processedTree, true);
 	if (match) {
 		foundRoute = match.route;
 		Object.assign(routeParams, match.rawParams);
-		parsedParams = Object.assign(Object.create(null), match.parsedParams);
 	}
 	return {
 		matchedRoutes: match?.branch || [routesById["__root__"]],
 		routeParams,
-		foundRoute,
-		parsedParams
+		foundRoute
 	};
 }
 /**
@@ -1146,12 +1162,11 @@ function findGlobalNotFoundRouteId(notFoundMode, routes) {
 	}
 	return rootRouteId;
 }
-function extractStrictParams(route, referenceParams, parsedParams, accumulatedParams) {
+function extractStrictParams(route, accumulatedParams) {
 	const parseParams = route.options.params?.parse ?? route.options.parseParams;
-	if (parseParams) if (route.options.skipRouteOnParseError) {
-		for (const key in referenceParams) if (key in parsedParams) accumulatedParams[key] = parsedParams[key];
-	} else {
+	if (parseParams) {
 		const result = parseParams(accumulatedParams);
+		if (result === false) throw new Error("Route params.parse returned false for a matched route");
 		Object.assign(accumulatedParams, result);
 	}
 }