use get_navigation_intent and reroute hook

Author: hmnd

packages/kit/src/runtime/app/paths/client.js

@@ -2,8 +2,7 @@
 /** @import { ResolveArgs } from './types.js' */
 import { base, assets, hash_routing } from './internal/client.js';
 import { resolve_route } from '../../../utils/routing.js';
-import { decode_params } from '../../../utils/url.js';
-import { get_routes } from '../../client/client.js';
+import { get_navigation_intent } from '../../client/client.js';
 
 /**
  * Resolve the URL of an asset in your `static` directory, by prefixing it with [`config.kit.paths.assets`](https://svelte.dev/docs/kit/configuration#paths) if configured, or otherwise by prefixing it with the base path.
@@ -75,22 +74,14 @@ export function resolve(...args) {
  * @returns {Promise<{ id: RouteId, params: Record<string, string> } | null>}
  */
 export async function match(pathname) {
-	let path = pathname;
+	const url = new URL(pathname, location.href);
+	const intent = await get_navigation_intent(url, false);
 
-	if (base && path.startsWith(base)) {
-		path = path.slice(base.length) || '/';
-	}
-
-	if (hash_routing && path.startsWith('#')) {
-		path = path.slice(1) || '/';
-	}
-
-	const routes = get_routes();
-	for (const route of routes) {
-		const params = route.exec(path);
-		if (params) {
-			return { id: /** @type {RouteId} */ (route.id), params: decode_params(params) };
-		}
+	if (intent) {
+		return {
+			id: /** @type {RouteId} */ (intent.route.id),
+			params: intent.params
+		};
 	}
 
 	return null;

packages/kit/src/runtime/app/paths/server.js

@@ -1,8 +1,9 @@
 import { base, assets, relative, initial_base } from './internal/server.js';
 import { resolve_route, exec } from '../../../utils/routing.js';
-import { decode_params } from '../../../utils/url.js';
+import { decode_params, decode_pathname } from '../../../utils/url.js';
 import { try_get_request_store } from '@sveltejs/kit/internal/server';
 import { manifest } from '__sveltekit/server';
+import { get_hooks } from '__SERVER__/internal.js';
 
 /** @type {import('./client.js').asset} */
 export function asset(file) {
@@ -31,16 +32,29 @@ export function resolve(id, params) {
 
 /** @type {import('./client.js').match} */
 export async function match(pathname) {
-	let path = pathname;
+	const store = try_get_request_store();
+	const origin = store?.event.url.origin ?? 'http://sveltekit';
+	const url = new URL(pathname, origin);
 
-	if (base && path.startsWith(base)) {
-		path = path.slice(base.length) || '/';
+	const { reroute } = await get_hooks();
+
+	let resolved_path =
+		(await reroute?.({ url, fetch: store?.event.fetch ?? fetch })) ?? url.pathname;
+
+	try {
+		resolved_path = decode_pathname(resolved_path);
+	} catch {
+		return null;
+	}
+
+	if (base && resolved_path.startsWith(base)) {
+		resolved_path = resolved_path.slice(base.length) || '/';
 	}
 
 	const matchers = await manifest._.matchers();
 
 	for (const route of manifest._.routes) {
-		const match = route.pattern.exec(path);
+		const match = route.pattern.exec(resolved_path);
 		if (!match) continue;
 
 		const matched = exec(match, route.params, matchers);

packages/kit/src/runtime/client/client.js

@@ -203,6 +203,8 @@ export function get_routes() {
  */
 export let remote_responses = {};
 
+export { get_navigation_intent };
+
 /** @type {Array<((url: URL) => boolean)>} */
 const invalidated = [];
 

packages/kit/test/apps/basics/src/routes/match/const.ts

@@ -1,5 +1,6 @@
 export const testPaths = [
 	'/match/load/foo',
 	'/match/slug/test-slug',
-	'/match/not-a-real-route-that-exists'
+	'/match/not-a-real-route-that-exists',
+	'/reroute/basic/a'
 ];

packages/kit/test/apps/basics/test/test.js

@@ -779,7 +779,8 @@ test.describe('$app/paths', () => {
 				path: '/match/slug/test-slug',
 				expected: { id: '/match/slug/[slug]', params: { slug: 'test-slug' } }
 			},
-			{ path: '/match/not-a-real-route-that-exists', expected: null }
+			{ path: '/match/not-a-real-route-that-exists', expected: null },
+			{ path: '/reroute/basic/a', expected: { id: '/reroute/basic/b', params: {} } }
 		];
 
 		for (const { path, expected } of samples) {