@tanstack/router-core 1.171.22 → 1.171.24

package/dist/cjs/router.cjs

@@ -345,34 +345,25 @@ var RouterCore = class {
 					unmaskOnReload: dest.unmaskOnReload
 				};
 			};
-			const buildWithMatches = (dest = {}, maskedDest) => {
-				const next = build(dest);
-				let maskedNext = maskedDest ? build(maskedDest) : void 0;
-				if (!maskedNext) {
-					const params = Object.create(null);
-					if (this.options.routeMasks) {
-						const match = require_new_process_route_tree.findFlatMatch(next.pathname, this.processedTree);
-						if (match) {
-							Object.assign(params, match.rawParams);
-							const { from: _from, params: maskParams, ...maskProps } = match.route;
-							const nextParams = resolveNextParams(maskParams, params);
-							maskedDest = {
-								from: opts.from,
-								...maskProps,
-								params: nextParams
-							};
-							maskedNext = build(maskedDest);
-						}
-					}
-				}
-				if (maskedNext) next.maskedLocation = maskedNext;
-				return next;
-			};
-			if (opts.mask) return buildWithMatches(opts, {
+			const next = build(opts);
+			if (opts.mask) next.maskedLocation = build({
 				from: opts.from,
 				...opts.mask
 			});
-			return buildWithMatches(opts);
+			else if (this.options.routeMasks) {
+				const match = require_new_process_route_tree.findFlatMatch(next.pathname, this.processedTree);
+				if (match) {
+					const params = Object.assign(Object.create(null), match.rawParams);
+					const { from: _from, params: maskParams, ...maskProps } = match.route;
+					const nextParams = resolveNextParams(maskParams, params);
+					next.maskedLocation = build({
+						from: opts.from,
+						...maskProps,
+						params: nextParams
+					});
+				}
+			}
+			return next;
 		};
 		this.commitLocation = async ({ viewTransition, ignoreBlocker, ...next }) => {
 			let historyAction;