@tanstack/router-core 1.171.24 → 1.171.26

package/dist/cjs/router.cjs

@@ -59,13 +59,13 @@ function _getUserHistoryState({ key: _key, __TSR_key: _tsrKey, __TSR_index: _tsr
 	return state;
 }
 /** Run route lifecycle callbacks in leave/enter/stay phases. */
-function runRouteLifecycle(router, previous, matches, isCurrent) {
+function runRouteLifecycle(router, previous, matches, owner) {
 	for (const match of previous) {
-		if (isCurrent?.() === false) return;
+		if (owner && router._tx !== owner) return;
 		if (!matches.some((candidate) => candidate.routeId === match.routeId)) router.routesById[match.routeId].options.onLeave?.(match);
 	}
 	for (const match of matches) {
-		if (isCurrent?.() === false) return;
+		if (owner && router._tx !== owner) return;
 		router.routesById[match.routeId].options[previous.some((candidate) => candidate.routeId === match.routeId) ? "onStay" : "onEnter"]?.(match);
 	}
 }
@@ -229,7 +229,7 @@ var RouterCore = class {
 		this.resolvePathWithBase = (from, path) => {
 			return require_path.resolvePath({
 				base: from,
-				to: path.includes("//") ? require_path.cleanPath(path) : path,
+				to: path,
 				trailingSlash: this.options.trailingSlash,
 				cache: this.resolvePathCache
 			});
@@ -253,6 +253,15 @@ var RouterCore = class {
 		};
 		this.buildLocation = (opts) => {
 			const build = (dest = {}) => {
+				if (dest.href) {
+					const parsed = (0, _tanstack_history.parseHref)(dest.href, {});
+					dest = {
+						...dest,
+						to: require_rewrite.executeRewriteInput(this.rewrite, new URL(parsed.pathname, this.origin)).pathname,
+						search: this.options.parseSearch(parsed.search),
+						hash: parsed.hash.slice(1)
+					};
+				}
 				const currentLocation = dest._fromLocation || this._pendingLocation || this.latestLocation;
 				const lightweightResult = this.matchRoutesLightweight(currentLocation);
 				if (dest.from && process.env.NODE_ENV !== "production" && dest._isNavigate) {
@@ -266,12 +275,10 @@ 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[1];
-				const destTo = dest.to ? `${dest.to}` : void 0;
 				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);
+				const fromParams = lightweightResult[3];
+				const nextTo = this.resolvePathWithBase(defaultedFromPath, dest.to ? `${dest.to}` : ".");
+				let nextParams = resolveNextParams(dest.params, fromParams);
 				const destRoute = this.routesByPath[require_path.trimPathRight(nextTo)];
 				let destRoutes;
 				if (destRoute) destRoutes = this.getRouteBranch(destRoute);
@@ -283,9 +290,12 @@ var RouterCore = class {
 				}
 				if (destRoutes.length && require_utils.hasKeys(nextParams)) for (const route of destRoutes) {
 					const fn = route.options.params?.stringify ?? route.options.stringifyParams;
-					if (fn) try {
-						Object.assign(nextParams, fn(nextParams));
-					} catch {}
+					if (fn) {
+						if (nextParams === fromParams) nextParams = Object.assign(Object.create(null), nextParams);
+						try {
+							Object.assign(nextParams, fn(nextParams));
+						} catch {}
+					}
 				}
 				const nextPathname = opts.leaveParams ? nextTo : require_utils.decodePath(require_path.interpolatePath({
 					path: nextTo,
@@ -316,7 +326,7 @@ var RouterCore = class {
 				const hash = dest.hash === true ? currentLocation.hash : dest.hash ? require_utils.functionalUpdate(dest.hash, currentLocation.hash) : void 0;
 				const hashStr = hash ? `#${hash}` : "";
 				let nextState = dest.state === true ? currentLocation.state : dest.state ? require_utils.functionalUpdate(dest.state, currentLocation.state) : {};
-				nextState = require_utils.replaceEqualDeep(currentLocation.state, nextState);
+				if (dest.state) nextState = require_utils.replaceEqualDeep(currentLocation.state, nextState);
 				const fullPath = `${nextPathname}${searchStr}${hashStr}`;
 				let href;
 				let publicHref;
@@ -411,20 +421,11 @@ var RouterCore = class {
 			this._scroll.next = next.resetScroll ?? true;
 			return this._commitPromise;
 		};
-		this.buildAndCommitLocation = ({ replace, resetScroll, hashScrollIntoView, viewTransition, ignoreBlocker, _redirects, href, ...rest } = {}) => {
-			if (href) {
-				const currentIndex = this.history.location.state.__TSR_index;
-				const parsed = (0, _tanstack_history.parseHref)(href, { __TSR_index: replace ? currentIndex : currentIndex + 1 });
-				const hrefUrl = new URL(parsed.pathname, this.origin);
-				rest.to = require_rewrite.executeRewriteInput(this.rewrite, hrefUrl).pathname;
-				rest.search = this.options.parseSearch(parsed.search);
-				rest.hash = parsed.hash.slice(1);
-			}
+		this.buildAndCommitLocation = ({ replace, resetScroll, hashScrollIntoView, viewTransition, ignoreBlocker, ...rest } = {}) => {
 			const location = this.buildLocation({
 				...rest,
 				_includeValidateSearch: true
 			});
-			if (_redirects) location._redirects = _redirects;
 			this._pendingLocation = location;
 			const commitPromise = this.commitLocation({
 				...location,
@@ -549,8 +550,8 @@ var RouterCore = class {
 		};
 		this.resolveRedirect = (redirect) => {
 			const locationHeader = redirect.headers.get("Location");
-			if (!redirect.options.href || redirect.options._builtLocation) {
-				const href = (redirect.options._builtLocation ?? this.buildLocation(redirect.options)).publicHref || "/";
+			if (!redirect.options.href) {
+				const href = this.buildLocation(redirect.options).publicHref || "/";
 				redirect.options.href = href;
 				redirect.headers.set("Location", href);
 			} else if (locationHeader) try {
@@ -561,7 +562,7 @@ var RouterCore = class {
 					redirect.headers.set("Location", href);
 				}
 			} catch {}
-			if (redirect.options.href && !redirect.options._builtLocation && require_utils.isDangerousProtocol(redirect.options.href, this.protocolAllowlist)) throw new Error(process.env.NODE_ENV !== "production" ? `Redirect blocked: unsafe protocol in href "${redirect.options.href}". Allowed protocols: ${Array.from(this.protocolAllowlist).join(", ")}.` : "Redirect blocked: unsafe protocol");
+			if (redirect.options.href && require_utils.isDangerousProtocol(redirect.options.href, this.protocolAllowlist)) throw new Error(process.env.NODE_ENV !== "production" ? `Redirect blocked: unsafe protocol in href "${redirect.options.href}". Allowed protocols: ${Array.from(this.protocolAllowlist).join(", ")}.` : "Redirect blocked: unsafe protocol");
 			if (!redirect.headers.get("Location")) redirect.headers.set("Location", redirect.options.href);
 			return redirect;
 		};
@@ -593,7 +594,7 @@ var RouterCore = class {
 			for (const controller of abort) controller.abort();
 		};
 		this.loadRouteChunk = require_load_client.loadRouteChunk;
-		this.preloadRoute = (opts) => require_load_client.preloadClientRoute(this, opts);
+		this.preloadRoute = (opts, builtLocation) => require_load_client.preloadClientRoute(this, opts, 0, builtLocation);
 		this.matchRoute = (location, opts) => {
 			const matchLocation = {
 				...location,
@@ -873,10 +874,10 @@ function applySearchMiddleware(search, dest, destRoutes, includeValidateSearch)
 			middlewares.push(legacyMiddleware);
 		}
 		const routeValidateSearch = routeOptions.validateSearch;
-		if (routeValidateSearch) {
+		if (includeValidateSearch && routeValidateSearch) {
 			const validate = ({ search, next, meta }) => {
 				const result = next(search);
-				if (includeValidateSearch) try {
+				try {
 					const validated = validateSearch(routeValidateSearch, result);
 					if (meta && validated) {
 						for (const key in validated) if (!(key in result)) (meta.defaulted ||= /* @__PURE__ */ new Map()).set(key, validated[key]);
@@ -930,7 +931,10 @@ function findGlobalNotFoundRouteId(notFoundMode, routes) {
 	return require_root.rootRouteId;
 }
 function resolveNextParams(spec, base) {
-	return spec === false || spec === null ? Object.create(null) : (spec ?? true) === true ? base : Object.assign(base, require_utils.functionalUpdate(spec, base));
+	if (spec === false || spec === null) return Object.create(null);
+	if ((spec ?? true) === true) return base;
+	const next = Object.assign(Object.create(null), base);
+	return Object.assign(next, require_utils.functionalUpdate(spec, next));
 }
 function extractStrictParams(route, accumulatedParams) {
 	const parseParams = route.options.params?.parse ?? route.options.parseParams;