@tanstack/router-core 1.171.8 → 1.171.10

package/dist/esm/router.js

@@ -1104,62 +1104,59 @@ function applySearchMiddleware({ search, dest, destRoutes, _includeValidateSearc
 	return buildMiddlewareChain(destRoutes)(search, dest, _includeValidateSearch ?? false);
 }
 function buildMiddlewareChain(destRoutes) {
-	const context = {
-		dest: null,
-		_includeValidateSearch: false,
-		middlewares: []
-	};
+	let dest;
+	let includeValidateSearch;
+	const middlewares = [];
 	for (const route of destRoutes) {
-		if ("search" in route.options) {
-			if (route.options.search?.middlewares) context.middlewares.push(...route.options.search.middlewares);
-		} else if (route.options.preSearchFilters || route.options.postSearchFilters) {
+		const routeOptions = route.options;
+		if ("search" in routeOptions) {
+			if (routeOptions.search?.middlewares) middlewares.push(...routeOptions.search.middlewares);
+		} else if (routeOptions.preSearchFilters || routeOptions.postSearchFilters) {
 			const legacyMiddleware = ({ search, next }) => {
-				let nextSearch = search;
-				if ("preSearchFilters" in route.options && route.options.preSearchFilters) nextSearch = route.options.preSearchFilters.reduce((prev, next) => next(prev), search);
-				const result = next(nextSearch);
-				if ("postSearchFilters" in route.options && route.options.postSearchFilters) return route.options.postSearchFilters.reduce((prev, next) => next(prev), result);
-				return result;
+				const result = next(routeOptions.preSearchFilters ? routeOptions.preSearchFilters.reduce((prev, next) => next(prev), search) : search);
+				return routeOptions.postSearchFilters ? routeOptions.postSearchFilters.reduce((prev, next) => next(prev), result) : result;
 			};
-			context.middlewares.push(legacyMiddleware);
+			middlewares.push(legacyMiddleware);
 		}
-		if (route.options.validateSearch) {
-			const validate = ({ search, next }) => {
+		const routeValidateSearch = routeOptions.validateSearch;
+		if (routeValidateSearch) {
+			const validate = ({ search, next }, validations) => {
 				const result = next(search);
-				if (!context._includeValidateSearch) return result;
-				try {
+				if (includeValidateSearch) try {
+					const validated = validateSearch(routeValidateSearch, result);
+					if (validations && validated) validations.push(result, validated);
 					return {
 						...result,
-						...validateSearch(route.options.validateSearch, result) ?? void 0
+						...validated
 					};
-				} catch {
-					return result;
-				}
+				} catch {}
+				return result;
 			};
-			context.middlewares.push(validate);
+			middlewares.push(validate);
 		}
 	}
-	const final = ({ search }) => {
-		const dest = context.dest;
-		if (!dest.search) return {};
-		if (dest.search === true) return search;
-		return functionalUpdate(dest.search, search);
-	};
-	context.middlewares.push(final);
-	const applyNext = (index, currentSearch, middlewares) => {
-		if (index >= middlewares.length) return currentSearch;
-		const middleware = middlewares[index];
-		const next = (newSearch) => {
-			return applyNext(index + 1, newSearch, middlewares);
+	const applyNext = (index, currentSearch, validations) => {
+		if (index >= middlewares.length) {
+			if (!dest.search) return {};
+			if (dest.search === true) return currentSearch;
+			return functionalUpdate(dest.search, currentSearch);
+		}
+		const next = (newSearch, collectValidations) => {
+			if (collectValidations) {
+				const nextValidations = [];
+				return [applyNext(index + 1, newSearch, nextValidations), nextValidations];
+			}
+			return applyNext(index + 1, newSearch, validations);
 		};
-		return middleware({
+		return middlewares[index]({
 			search: currentSearch,
 			next
-		});
+		}, validations);
 	};
-	return function middleware(search, dest, _includeValidateSearch) {
-		context.dest = dest;
-		context._includeValidateSearch = _includeValidateSearch;
-		return applyNext(0, search, context.middlewares);
+	return function middleware(search, nextDest, _includeValidateSearch) {
+		dest = nextDest;
+		includeValidateSearch = _includeValidateSearch;
+		return applyNext(0, search);
 	};
 }
 function findGlobalNotFoundRouteId(notFoundMode, routes) {