@benjavicente/router-core 1.168.9 → 1.169.2

package/dist/cjs/router.cjs

@@ -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") {
@@ -133,8 +134,8 @@ var RouterCore = class {
 				if (this.history) this.updateLatestLocation();
 				needsLocationUpdate = true;
 			}
-			if (needsLocationUpdate && this.stores) this.stores.location.setState(() => this.latestLocation);
-			if (typeof window !== "undefined" && "CSS" in window && typeof window.CSS?.supports === "function") this.isViewTransitionTypesSupported = window.CSS.supports("selector(:active-view-transition-type(a)");
+			if (needsLocationUpdate && this.stores) this.stores.location.set(this.latestLocation);
+			if (typeof window !== "undefined" && "CSS" in window && typeof window.CSS?.supports === "function") this.isViewTransitionTypesSupported = window.CSS.supports("selector(:active-view-transition-type(a))");
 		};
 		this.updateLatestLocation = () => {
 			this.latestLocation = this.parseLocation(this.history.location, this.latestLocation);
@@ -210,7 +211,7 @@ var RouterCore = class {
 		this.resolvePathWithBase = (from, path) => {
 			return require_path.resolvePath({
 				base: from,
-				to: require_path.cleanPath(path),
+				to: path.includes("//") ? require_path.cleanPath(path) : path,
 				trailingSlash: this.options.trailingSlash,
 				cache: this.resolvePathCache
 			});
@@ -237,12 +238,12 @@ var RouterCore = class {
 			match._nonReactive.pendingTimeout = void 0;
 		};
 		this.cancelMatches = () => {
-			this.stores.pendingMatchesId.state.forEach((matchId) => {
+			this.stores.pendingIds.get().forEach((matchId) => {
 				this.cancelMatch(matchId);
 			});
-			this.stores.matchesId.state.forEach((matchId) => {
-				if (this.stores.pendingMatchStoresById.has(matchId)) return;
-				const match = this.stores.activeMatchStoresById.get(matchId)?.state;
+			this.stores.matchesId.get().forEach((matchId) => {
+				if (this.stores.pendingMatchStores.has(matchId)) return;
+				const match = this.stores.matchStores.get(matchId)?.get();
 				if (!match) return;
 				if (match.status === "pending" || match.isFetching === "loader") this.cancelMatch(matchId);
 			});
@@ -262,15 +263,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, require_utils.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[require_path.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 && 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));
@@ -282,6 +290,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 = {};
@@ -510,29 +521,28 @@ var RouterCore = class {
 				}
 			}
 			const pendingMatches = this.matchRoutes(this.latestLocation);
-			const nextCachedMatches = this.stores.cachedMatchesSnapshot.state.filter((d) => !pendingMatches.some((e) => e.id === d.id));
+			const nextCachedMatches = this.stores.cachedMatches.get().filter((d) => !pendingMatches.some((e) => e.id === d.id));
 			this.batch(() => {
-				this.stores.status.setState(() => "pending");
-				this.stores.statusCode.setState(() => 200);
-				this.stores.isLoading.setState(() => true);
-				this.stores.location.setState(() => this.latestLocation);
-				this.stores.setPendingMatches(pendingMatches);
-				this.stores.setCachedMatches(nextCachedMatches);
+				this.stores.status.set("pending");
+				this.stores.statusCode.set(200);
+				this.stores.isLoading.set(true);
+				this.stores.location.set(this.latestLocation);
+				this.stores.setPending(pendingMatches);
+				this.stores.setCached(nextCachedMatches);
 			});
 		};
 		this.load = async (opts) => {
 			let redirect;
 			let notFound;
 			let loadPromise;
-			const previousLocation = this.stores.resolvedLocation.state ?? this.stores.location.state;
+			const previousLocation = this.stores.resolvedLocation.get() ?? this.stores.location.get();
 			loadPromise = new Promise((resolve) => {
 				this.startTransition(async () => {
 					try {
 						this.beforeLoad();
 						const next = this.latestLocation;
-						const prevLocation = this.stores.resolvedLocation.state;
-						const locationChangeInfo = getLocationChangeInfo(next, prevLocation);
-						if (!this.stores.redirect.state) this.emit({
+						const locationChangeInfo = getLocationChangeInfo(next, this.stores.resolvedLocation.get());
+						if (!this.stores.redirect.get()) this.emit({
 							type: "onBeforeNavigate",
 							...locationChangeInfo
 						});
@@ -544,7 +554,7 @@ var RouterCore = class {
 							router: this,
 							sync: opts?.sync,
 							forceStaleReload: previousLocation.href === next.href,
-							matches: this.stores.pendingMatchesSnapshot.state,
+							matches: this.stores.pendingMatches.get(),
 							location: next,
 							updateMatch: this.updateMatch,
 							onReady: async () => {
@@ -555,19 +565,19 @@ var RouterCore = class {
 										let hookEnteringMatches = null;
 										let hookStayingMatches = null;
 										this.batch(() => {
-											const pendingMatches = this.stores.pendingMatchesSnapshot.state;
+											const pendingMatches = this.stores.pendingMatches.get();
 											const mountPending = pendingMatches.length;
-											const currentMatches = this.stores.activeMatchesSnapshot.state;
-											exitingMatches = mountPending ? currentMatches.filter((match) => !this.stores.pendingMatchStoresById.has(match.id)) : null;
+											const currentMatches = this.stores.matches.get();
+											exitingMatches = mountPending ? currentMatches.filter((match) => !this.stores.pendingMatchStores.has(match.id)) : null;
 											const pendingRouteIds = /* @__PURE__ */ new Set();
-											for (const s of this.stores.pendingMatchStoresById.values()) if (s.routeId) pendingRouteIds.add(s.routeId);
+											for (const s of this.stores.pendingMatchStores.values()) if (s.routeId) pendingRouteIds.add(s.routeId);
 											const activeRouteIds = /* @__PURE__ */ new Set();
-											for (const s of this.stores.activeMatchStoresById.values()) if (s.routeId) activeRouteIds.add(s.routeId);
+											for (const s of this.stores.matchStores.values()) if (s.routeId) activeRouteIds.add(s.routeId);
 											hookExitingMatches = mountPending ? currentMatches.filter((match) => !pendingRouteIds.has(match.routeId)) : null;
 											hookEnteringMatches = mountPending ? pendingMatches.filter((match) => !activeRouteIds.has(match.routeId)) : null;
 											hookStayingMatches = mountPending ? pendingMatches.filter((match) => activeRouteIds.has(match.routeId)) : currentMatches;
-											this.stores.isLoading.setState(() => false);
-											this.stores.loadedAt.setState(() => Date.now());
+											this.stores.isLoading.set(false);
+											this.stores.loadedAt.set(Date.now());
 											/**
 											* When committing new matches, cache any exiting matches that are still usable.
 											* Routes that resolved with `status: 'error'` or `status: 'notFound'` are
@@ -575,9 +585,9 @@ var RouterCore = class {
 											* or reloads re-run their loaders instead of reusing the failed/not-found data.
 											*/
 											if (mountPending) {
-												this.stores.setActiveMatches(pendingMatches);
-												this.stores.setPendingMatches([]);
-												this.stores.setCachedMatches([...this.stores.cachedMatchesSnapshot.state, ...exitingMatches.filter((d) => d.status !== "error" && d.status !== "notFound" && d.status !== "redirected")]);
+												this.stores.setMatches(pendingMatches);
+												this.stores.setPending([]);
+												this.stores.setCached([...this.stores.cachedMatches.get(), ...exitingMatches.filter((d) => d.status !== "error" && d.status !== "notFound" && d.status !== "redirected")]);
 												this.clearExpiredCache();
 											}
 										});
@@ -602,10 +612,10 @@ var RouterCore = class {
 								ignoreBlocker: true
 							});
 						} else if (require_not_found.isNotFound(err)) notFound = err;
-						const nextStatusCode = redirect ? redirect.status : notFound ? 404 : this.stores.activeMatchesSnapshot.state.some((d) => d.status === "error") ? 500 : 200;
+						const nextStatusCode = redirect ? redirect.status : notFound ? 404 : this.stores.matches.get().some((d) => d.status === "error") ? 500 : 200;
 						this.batch(() => {
-							this.stores.statusCode.setState(() => nextStatusCode);
-							this.stores.redirect.setState(() => redirect);
+							this.stores.statusCode.set(nextStatusCode);
+							this.stores.redirect.set(redirect);
 						});
 					}
 					if (this.latestLoadPromise === loadPromise) {
@@ -621,8 +631,8 @@ var RouterCore = class {
 			while (this.latestLoadPromise && loadPromise !== this.latestLoadPromise) await this.latestLoadPromise;
 			let newStatusCode = void 0;
 			if (this.hasNotFoundMatch()) newStatusCode = 404;
-			else if (this.stores.activeMatchesSnapshot.state.some((d) => d.status === "error")) newStatusCode = 500;
-			if (newStatusCode !== void 0) this.stores.statusCode.setState(() => newStatusCode);
+			else if (this.stores.matches.get().some((d) => d.status === "error")) newStatusCode = 500;
+			if (newStatusCode !== void 0) this.stores.statusCode.set(newStatusCode);
 		};
 		this.startViewTransition = (fn) => {
 			const shouldViewTransition = this.shouldViewTransition ?? this.options.defaultViewTransition;
@@ -631,7 +641,7 @@ var RouterCore = class {
 				let startViewTransitionParams;
 				if (typeof shouldViewTransition === "object" && this.isViewTransitionTypesSupported) {
 					const next = this.latestLocation;
-					const prevLocation = this.stores.resolvedLocation.state;
+					const prevLocation = this.stores.resolvedLocation.get();
 					const resolvedViewTransitionTypes = typeof shouldViewTransition.types === "function" ? shouldViewTransition.types(getLocationChangeInfo(next, prevLocation)) : shouldViewTransition.types;
 					if (resolvedViewTransitionTypes === false) {
 						fn();
@@ -647,27 +657,27 @@ var RouterCore = class {
 		};
 		this.updateMatch = (id, updater) => {
 			this.startTransition(() => {
-				const pendingMatch = this.stores.pendingMatchStoresById.get(id);
+				const pendingMatch = this.stores.pendingMatchStores.get(id);
 				if (pendingMatch) {
-					pendingMatch.setState(updater);
+					pendingMatch.set(updater);
 					return;
 				}
-				const activeMatch = this.stores.activeMatchStoresById.get(id);
+				const activeMatch = this.stores.matchStores.get(id);
 				if (activeMatch) {
-					activeMatch.setState(updater);
+					activeMatch.set(updater);
 					return;
 				}
-				const cachedMatch = this.stores.cachedMatchStoresById.get(id);
+				const cachedMatch = this.stores.cachedMatchStores.get(id);
 				if (cachedMatch) {
-					const next = updater(cachedMatch.state);
+					const next = updater(cachedMatch.get());
 					if (next.status === "redirected") {
-						if (this.stores.cachedMatchStoresById.delete(id)) this.stores.cachedMatchesId.setState((prev) => prev.filter((matchId) => matchId !== id));
-					} else cachedMatch.setState(() => next);
+						if (this.stores.cachedMatchStores.delete(id)) this.stores.cachedIds.set((prev) => prev.filter((matchId) => matchId !== id));
+					} else cachedMatch.set(next);
 				}
 			});
 		};
 		this.getMatch = (matchId) => {
-			return this.stores.cachedMatchStoresById.get(matchId)?.state ?? this.stores.pendingMatchStoresById.get(matchId)?.state ?? this.stores.activeMatchStoresById.get(matchId)?.state;
+			return this.stores.cachedMatchStores.get(matchId)?.get() ?? this.stores.pendingMatchStores.get(matchId)?.get() ?? this.stores.matchStores.get(matchId)?.get();
 		};
 		this.invalidate = (opts) => {
 			const invalidate = (d) => {
@@ -682,9 +692,9 @@ var RouterCore = class {
 				return d;
 			};
 			this.batch(() => {
-				this.stores.setActiveMatches(this.stores.activeMatchesSnapshot.state.map(invalidate));
-				this.stores.setCachedMatches(this.stores.cachedMatchesSnapshot.state.map(invalidate));
-				this.stores.setPendingMatches(this.stores.pendingMatchesSnapshot.state.map(invalidate));
+				this.stores.setMatches(this.stores.matches.get().map(invalidate));
+				this.stores.setCached(this.stores.cachedMatches.get().map(invalidate));
+				this.stores.setPending(this.stores.pendingMatches.get().map(invalidate));
 			});
 			this.shouldViewTransition = false;
 			return this.load({ sync: opts?.sync });
@@ -713,8 +723,8 @@ var RouterCore = class {
 		};
 		this.clearCache = (opts) => {
 			const filter = opts?.filter;
-			if (filter !== void 0) this.stores.setCachedMatches(this.stores.cachedMatchesSnapshot.state.filter((m) => !filter(m)));
-			else this.stores.setCachedMatches([]);
+			if (filter !== void 0) this.stores.setCached(this.stores.cachedMatches.get().filter((m) => !filter(m)));
+			else this.stores.setCached([]);
 		};
 		this.clearExpiredCache = () => {
 			const now = Date.now();
@@ -735,12 +745,12 @@ var RouterCore = class {
 				preload: true,
 				dest: opts
 			});
-			const activeMatchIds = new Set([...this.stores.matchesId.state, ...this.stores.pendingMatchesId.state]);
-			const loadedMatchIds = new Set([...activeMatchIds, ...this.stores.cachedMatchesId.state]);
+			const activeMatchIds = new Set([...this.stores.matchesId.get(), ...this.stores.pendingIds.get()]);
+			const loadedMatchIds = new Set([...activeMatchIds, ...this.stores.cachedIds.get()]);
 			const matchesToCache = matches.filter((match) => !loadedMatchIds.has(match.id));
 			if (matchesToCache.length) {
-				const cachedMatches = this.stores.cachedMatchesSnapshot.state;
-				this.stores.setCachedMatches([...cachedMatches, ...matchesToCache]);
+				const cachedMatches = this.stores.cachedMatches.get();
+				this.stores.setCached([...cachedMatches, ...matchesToCache]);
 			}
 			try {
 				matches = await require_load_matches.loadMatches({
@@ -774,8 +784,8 @@ var RouterCore = class {
 				leaveParams: true
 			};
 			const next = this.buildLocation(matchLocation);
-			if (opts?.pending && this.stores.status.state !== "pending") return false;
-			const baseLocation = (opts?.pending === void 0 ? !this.stores.isLoading.state : opts.pending) ? this.latestLocation : this.stores.resolvedLocation.state || this.stores.location.state;
+			if (opts?.pending && this.stores.status.get() !== "pending") return false;
+			const baseLocation = (opts?.pending === void 0 ? !this.stores.isLoading.get() : opts.pending) ? this.latestLocation : this.stores.resolvedLocation.get() || this.stores.location.get();
 			const match = require_new_process_route_tree.findSingleMatch(next.pathname, opts?.caseSensitive ?? false, opts?.fuzzy ?? false, baseLocation.pathname, this.processedTree);
 			if (!match) return false;
 			if (location.params) {
@@ -785,7 +795,7 @@ var RouterCore = class {
 			return match.rawParams;
 		};
 		this.hasNotFoundMatch = () => {
-			return this.stores.activeMatchesSnapshot.state.some((d) => d.status === "notFound" || d.globalNotFound);
+			return this.stores.matches.get().some((d) => d.status === "notFound" || d.globalNotFound);
 		};
 		this.getStoreConfig = getStoreConfig;
 		this.update({
@@ -809,7 +819,7 @@ var RouterCore = class {
 		return !!this.options.isPrerendering;
 	}
 	get state() {
-		return this.stores.__store.state;
+		return this.stores.__store.get();
 	}
 	setRoutes({ routesById, routesByPath, processedTree }) {
 		this.routesById = routesById;
@@ -821,6 +831,14 @@ var RouterCore = class {
 			this.routesById[notFoundRoute.id] = notFoundRoute;
 		}
 	}
+	getRouteBranch(route) {
+		let branch = this.routeBranchCache.get(route);
+		if (!branch) {
+			branch = require_new_process_route_tree.buildRouteBranch(route);
+			this.routeBranchCache.set(route, branch);
+		}
+		return branch;
+	}
 	get looseRoutesById() {
 		return this.routesById;
 	}
@@ -829,7 +847,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["**"] : require_path.trimPathRight(next.pathname)) if (this.options.notFoundRoute) matchedRoutes = [...matchedRoutes, this.options.notFoundRoute];
@@ -837,7 +855,7 @@ var RouterCore = class {
 		const globalNotFoundRouteId = isGlobalNotFound ? findGlobalNotFoundRouteId(this.options.notFoundMode, matchedRoutes) : void 0;
 		const matches = new Array(matchedRoutes.length);
 		const previousActiveMatchesByRouteId = /* @__PURE__ */ new Map();
-		for (const store of this.stores.activeMatchStoresById.values()) if (store.routeId) previousActiveMatchesByRouteId.set(store.routeId, store.state);
+		for (const store of this.stores.matchStores.values()) if (store.routeId) previousActiveMatchesByRouteId.set(store.routeId, store.get());
 		for (let index = 0; index < matchedRoutes.length; index++) {
 			const route = matchedRoutes[index];
 			const parentMatch = matches[index - 1];
@@ -881,7 +899,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 (require_not_found.isNotFound(err) || require_redirect.isRedirect(err)) paramsError = err;
 				else paramsError = new PathParamError(err.message, { cause: err });
@@ -987,21 +1005,21 @@ 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 = require_utils.last(matchedRoutes);
 		const accumulatedSearch = { ...location.search };
 		for (const route of matchedRoutes) try {
 			Object.assign(accumulatedSearch, validateSearch(route.options.validateSearch, accumulatedSearch));
 		} catch {}
-		const lastStateMatchId = require_utils.last(this.stores.matchesId.state);
-		const lastStateMatch = lastStateMatchId && this.stores.activeMatchStoresById.get(lastStateMatchId)?.state;
+		const lastStateMatchId = require_utils.last(this.stores.matchesId.get());
+		const lastStateMatch = lastStateMatchId && this.stores.matchStores.get(lastStateMatchId)?.get();
 		const canReuseParams = lastStateMatch && lastStateMatch.routeId === lastRoute.id && lastStateMatch.pathname === location.pathname;
 		let params;
 		if (canReuseParams) params = lastStateMatch.params;
 		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;
 		}
@@ -1017,7 +1035,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);
 }
@@ -1063,18 +1081,15 @@ function getMatchedRoutes({ pathname, routesById, processedTree }) {
 	const routeParams = Object.create(null);
 	const trimmedPath = require_path.trimPathRight(pathname);
 	let foundRoute = void 0;
-	let parsedParams = void 0;
 	const match = require_new_process_route_tree.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
 	};
 }
 /**
@@ -1150,12 +1165,11 @@ function findGlobalNotFoundRouteId(notFoundMode, routes) {
 	}
 	return require_root.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);
 	}
 }