@tanstack/router-core 1.171.17 → 1.171.18

package/dist/cjs/router.cjs

@@ -242,33 +242,33 @@ var RouterCore = class {
 			return this.matchRoutesInternal(pathnameOrNext, locationSearchOrOpts);
 		};
 		this.getMatchedRoutes = (pathname) => {
-			const routeParams = Object.create(null);
+			const rawParams = Object.create(null);
 			const match = require_new_process_route_tree.findRouteMatch(require_path.trimPathRight(pathname), this.processedTree, true);
-			if (match) Object.assign(routeParams, match.rawParams);
-			return {
-				matchedRoutes: match?.branch || [this.routesById["__root__"]],
-				routeParams,
-				foundRoute: match?.route
-			};
+			if (match) Object.assign(rawParams, match.rawParams);
+			return [
+				match?.branch || [this.routesById["__root__"]],
+				rawParams,
+				match?.route
+			];
 		};
 		this.buildLocation = (opts) => {
 			const build = (dest = {}) => {
 				const currentLocation = dest._fromLocation || this._pendingLocation || this.latestLocation;
 				const lightweightResult = this.matchRoutesLightweight(currentLocation);
 				if (dest.from && process.env.NODE_ENV !== "production" && dest._isNavigate) {
-					const allFromMatches = this.getMatchedRoutes(dest.from).matchedRoutes;
-					const matchedFrom = require_utils.findLast(lightweightResult.matchedRoutes, (d) => {
+					const [allFromMatches] = this.getMatchedRoutes(dest.from);
+					const matchedFrom = require_utils.findLast(lightweightResult[0], (d) => {
 						return comparePaths(d.fullPath, dest.from);
 					});
 					const matchedCurrent = require_utils.findLast(allFromMatches, (d) => {
-						return comparePaths(d.fullPath, lightweightResult.fullPath);
+						return comparePaths(d.fullPath, lightweightResult[1]);
 					});
 					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 defaultedFromPath = dest.unsafeRelative === "path" ? currentLocation.pathname : dest.from ?? lightweightResult[1];
 				const destTo = dest.to ? `${dest.to}` : void 0;
-				const fromSearch = lightweightResult.search;
-				const fromParams = Object.assign(Object.create(null), lightweightResult.params);
+				const fromSearch = lightweightResult[2];
+				const fromParams = Object.assign(Object.create(null), lightweightResult[3]);
 				const sourcePath = destTo?.charCodeAt(0) === 47 ? "/" : this.resolvePathWithBase(defaultedFromPath, ".");
 				const nextTo = destTo ? this.resolvePathWithBase(sourcePath, destTo) : sourcePath;
 				const nextParams = resolveNextParams(dest.params, fromParams);
@@ -277,9 +277,9 @@ var RouterCore = class {
 				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];
+					const [matchedRoutes, rawParams, foundRoute] = this.getMatchedRoutes(nextTo);
+					destRoutes = matchedRoutes;
+					if (this.options.notFoundRoute && (!foundRoute || foundRoute.path !== "/" && rawParams["**"])) destRoutes = [...destRoutes, this.options.notFoundRoute];
 				}
 				if (destRoutes.length && require_utils.hasKeys(nextParams)) for (const route of destRoutes) {
 					const fn = route.options.params?.stringify ?? route.options.stringifyParams;
@@ -294,8 +294,8 @@ var RouterCore = class {
 					server: this.isServer
 				}).interpolatedPath).path;
 				if (process.env.NODE_ENV !== "production" && destRoute && !opts.leaveParams) try {
-					const roundTrip = this.getMatchedRoutes(nextPathname);
-					if (roundTrip.foundRoute?.id !== destRoute.id) console.warn(`Generated path "${nextPathname}" for route "${destRoute.id}" matched route "${roundTrip.foundRoute?.id}" instead. This can happen when multiple route templates resolve to the same URL. Use the route template that matches the intended route, or adjust params.stringify if it changed the target path.`);
+					const foundRoute = this.getMatchedRoutes(nextPathname)[2];
+					if (foundRoute?.id !== destRoute.id) console.warn(`Generated path "${nextPathname}" for route "${destRoute.id}" matched route "${foundRoute?.id}" instead. This can happen when multiple route templates resolve to the same URL. Use the route template that matches the intended route, or adjust params.stringify if it changed the target path.`);
 				} catch {}
 				let nextSearch = fromSearch;
 				if (opts._includeValidateSearch && this.options.search?.strict) {
@@ -662,11 +662,10 @@ var RouterCore = class {
 		return branch;
 	}
 	matchRoutesInternal(next, opts) {
-		const matchedRoutesResult = this.getMatchedRoutes(next.pathname);
-		const { foundRoute, routeParams } = matchedRoutesResult;
-		let { matchedRoutes } = matchedRoutesResult;
+		const [initialMatchedRoutes, rawParams, foundRoute] = this.getMatchedRoutes(next.pathname);
+		let matchedRoutes = initialMatchedRoutes;
 		let isGlobalNotFound = false;
-		if (foundRoute ? foundRoute.path !== "/" && routeParams["**"] : require_path.trimPathRight(next.pathname)) if (this.options.notFoundRoute) matchedRoutes = [...matchedRoutes, this.options.notFoundRoute];
+		if (foundRoute ? foundRoute.path !== "/" && rawParams["**"] : require_path.trimPathRight(next.pathname)) if (this.options.notFoundRoute) matchedRoutes = [...matchedRoutes, this.options.notFoundRoute];
 		else isGlobalNotFound = true;
 		const _notFoundRouteId = isGlobalNotFound ? findGlobalNotFoundRouteId(this.options.notFoundMode, matchedRoutes) : void 0;
 		const matches = new Array(matchedRoutes.length);
@@ -675,6 +674,7 @@ var RouterCore = class {
 			const match = committed[index];
 			return match?.routeId === route.id ? match : route === this.options.notFoundRoute ? committed.find((candidate) => candidate.routeId === route.id) : void 0;
 		};
+		let strictParams;
 		for (let index = 0; index < matchedRoutes.length; index++) {
 			const route = matchedRoutes[index];
 			const parentMatch = matches[index - 1];
@@ -714,14 +714,14 @@ var RouterCore = class {
 			}
 			const { interpolatedPath, usedParams } = require_path.interpolatePath({
 				path: route.fullPath,
-				params: routeParams,
+				params: rawParams,
 				decoder: this.pathParamsDecoder,
 				server: this.isServer
 			});
 			const matchId = route.id + interpolatedPath + loaderDepsHash;
 			const previousMatch = previousAt(route, index);
 			const existingMatch = process.env.NODE_ENV !== "production" && opts?._rematerialize ? void 0 : this._cache.get(matchId) ?? (previousMatch?.id === matchId ? previousMatch : void 0);
-			const strictParams = existingMatch?._strictParams ?? usedParams;
+			strictParams = existingMatch?._strictParams ?? Object.assign(usedParams, strictParams);
 			let paramsError;
 			if (!existingMatch) try {
 				extractStrictParams(route, strictParams);
@@ -730,14 +730,11 @@ var RouterCore = class {
 				else paramsError = new PathParamError(err.message, { cause: err });
 				if (opts?.throwOnError) throw paramsError;
 			}
-			Object.assign(routeParams, strictParams);
 			const cause = previousMatch ? "stay" : "enter";
 			let match;
 			if (existingMatch) match = {
 				...existingMatch,
 				cause,
-				params: previousMatch?.params ?? routeParams,
-				_strictParams: strictParams,
 				search: previousMatch ? require_utils.nullReplaceEqualDeep(previousMatch.search, preMatchSearch) : require_utils.nullReplaceEqualDeep(existingMatch.search, preMatchSearch),
 				_strictSearch: strictMatchSearch,
 				searchError
@@ -749,7 +746,7 @@ var RouterCore = class {
 					ssr: _tanstack_router_core_isServer.isServer ?? this.isServer ? void 0 : route.options.ssr,
 					index,
 					routeId: route.id,
-					params: previousMatch?.params ?? routeParams,
+					params: previousMatch?.params ?? strictParams,
 					_strictParams: strictParams,
 					pathname: interpolatedPath,
 					updatedAt: Date.now(),
@@ -777,7 +774,7 @@ var RouterCore = class {
 		}
 		for (let index = 0; index < matches.length; index++) {
 			const match = matches[index];
-			match.params = match.cause === "stay" ? require_utils.nullReplaceEqualDeep(match.params, routeParams) : routeParams;
+			match.params = match.cause === "stay" ? require_utils.nullReplaceEqualDeep(match.params, strictParams) : strictParams;
 			if (opts?._controller) match.context = {};
 		}
 		return matches;
@@ -793,7 +790,7 @@ var RouterCore = class {
 		const lastStateMatchId = lastStateMatch?.id;
 		const cached = this.lightweightCache.get(location);
 		if (cached && cached[0] === lastStateMatchId) return cached[1];
-		const { matchedRoutes, routeParams } = this.getMatchedRoutes(location.pathname);
+		const [matchedRoutes, rawParams] = this.getMatchedRoutes(location.pathname);
 		const lastRoute = require_utils.last(matchedRoutes);
 		const accumulatedSearch = { ...location.search };
 		for (const route of matchedRoutes) try {
@@ -803,18 +800,18 @@ var RouterCore = class {
 		let params;
 		if (canReuseParams) params = lastStateMatch.params;
 		else {
-			const strictParams = Object.assign(Object.create(null), routeParams);
+			const strictParams = Object.assign(Object.create(null), rawParams);
 			for (const route of matchedRoutes) try {
 				extractStrictParams(route, strictParams);
 			} catch {}
 			params = strictParams;
 		}
-		const result = {
+		const result = [
 			matchedRoutes,
-			fullPath: lastRoute.fullPath,
-			search: accumulatedSearch,
+			lastRoute.fullPath,
+			accumulatedSearch,
 			params
-		};
+		];
 		this.lightweightCache.set(location, [lastStateMatchId, result]);
 		return result;
 	}