extract route matching into find_route

hmnd · hmnd · commit 2534e43bdbb1 · 2025-12-09T00:23:04.000-08:00
diff --git a/packages/kit/src/runtime/app/paths/server.js b/packages/kit/src/runtime/app/paths/server.js
@@ -1,6 +1,6 @@
 import { base, assets, relative, initial_base } from './internal/server.js';
-import { resolve_route, exec } from '../../../utils/routing.js';
-import { decode_params, decode_pathname } from '../../../utils/url.js';
+import { resolve_route, find_route } from '../../../utils/routing.js';
+import { 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';
@@ -55,18 +55,13 @@ export async function match(url) {
 	}
 
 	const matchers = await manifest._.matchers();
+	const result = find_route(resolved_path, manifest._.routes, matchers);
 
-	for (const route of manifest._.routes) {
-		const match = route.pattern.exec(resolved_path);
-		if (!match) continue;
-
-		const matched = exec(match, route.params, matchers);
-		if (matched) {
-			return {
-				id: /** @type {import('$app/types').RouteId} */ (route.id),
-				params: decode_params(matched)
-			};
-		}
+	if (result) {
+		return {
+			id: /** @type {import('$app/types').RouteId} */ (result.route.id),
+			params: result.params
+		};
 	}
 
 	return null;
diff --git a/packages/kit/src/runtime/server/page/server_routing.js b/packages/kit/src/runtime/server/page/server_routing.js
@@ -1,8 +1,7 @@
 import { base, assets, relative } from '$app/paths/internal/server';
 import { text } from '@sveltejs/kit';
 import { s } from '../../../utils/misc.js';
-import { exec } from '../../../utils/routing.js';
-import { decode_params } from '../../../utils/url.js';
+import { find_route } from '../../../utils/routing.js';
 import { get_relative_path } from '../../utils.js';
 
 /**
@@ -69,26 +68,11 @@ export async function resolve_route(resolved_path, url, manifest) {
 		return text('Server-side route resolution disabled', { status: 400 });
 	}
 
-	/** @type {import('types').SSRClientRoute | null} */
-	let route = null;
-	/** @type {Record<string, string>} */
-	let params = {};
-
 	const matchers = await manifest._.matchers();
+	const result = find_route(resolved_path, manifest._.client.routes, matchers);
 
-	for (const candidate of manifest._.client.routes) {
-		const match = candidate.pattern.exec(resolved_path);
-		if (!match) continue;
-
-		const matched = exec(match, candidate.params, matchers);
-		if (matched) {
-			route = candidate;
-			params = decode_params(matched);
-			break;
-		}
-	}
-
-	return create_server_routing_response(route, params, url, manifest).response;
+	return create_server_routing_response(result?.route ?? null, result?.params ?? {}, url, manifest)
+		.response;
 }
 
 /**
diff --git a/packages/kit/src/runtime/server/respond.js b/packages/kit/src/runtime/server/respond.js
@@ -15,8 +15,8 @@ import {
 	method_not_allowed,
 	redirect_response
 } from './utils.js';
-import { decode_pathname, decode_params, disable_search, normalize_path } from '../../utils/url.js';
-import { exec } from '../../utils/routing.js';
+import { decode_pathname, disable_search, normalize_path } from '../../utils/url.js';
+import { find_route } from '../../utils/routing.js';
 import { redirect_json_response, render_data } from './data/index.js';
 import { add_cookies_to_headers, get_cookies } from './cookie.js';
 import { create_fetch } from './fetch.js';
@@ -303,18 +303,12 @@ export async function internal_respond(request, options, manifest, state) {
 	if (!state.prerendering?.fallback) {
 		// TODO this could theoretically break — should probably be inside a try-catch
 		const matchers = await manifest._.matchers();
+		const result = find_route(resolved_path, manifest._.routes, matchers);
 
-		for (const candidate of manifest._.routes) {
-			const match = candidate.pattern.exec(resolved_path);
-			if (!match) continue;
-
-			const matched = exec(match, candidate.params, matchers);
-			if (matched) {
-				route = candidate;
-				event.route = { id: route.id };
-				event.params = decode_params(matched);
-				break;
-			}
+		if (result) {
+			route = result.route;
+			event.route = { id: route.id };
+			event.params = result.params;
 		}
 	}
 
diff --git a/packages/kit/src/utils/routing.js b/packages/kit/src/utils/routing.js
@@ -1,4 +1,5 @@
 import { BROWSER } from 'esm-env';
+import { decode_params } from './url.js';
 
 const param_pattern = /^(\[)?(\.\.\.)?(\w+)(?:=(\w+))?(\])?$/;
 
@@ -276,3 +277,27 @@ export function resolve_route(id, params) {
 export function has_server_load(node) {
 	return node.server?.load !== undefined || node.server?.trailingSlash !== undefined;
 }
+
+/**
+ * Find the first route that matches the given path
+ * @template {{pattern: RegExp, params: import('types').RouteParam[]}} Route
+ * @param {string} path - The decoded pathname to match
+ * @param {Route[]} routes
+ * @param {Record<string, import('@sveltejs/kit').ParamMatcher>} matchers
+ * @returns {{ route: Route, params: Record<string, string> } | null}
+ */
+export function find_route(path, routes, matchers) {
+	for (const route of routes) {
+		const match = route.pattern.exec(path);
+		if (!match) continue;
+
+		const matched = exec(match, route.params, matchers);
+		if (matched) {
+			return {
+				route,
+				params: decode_params(matched)
+			};
+		}
+	}
+	return null;
+}
diff --git a/packages/kit/src/utils/routing.spec.js b/packages/kit/src/utils/routing.spec.js
@@ -1,5 +1,5 @@
 import { assert, expect, test, describe } from 'vitest';
-import { exec, parse_route_id, resolve_route } from './routing.js';
+import { exec, parse_route_id, resolve_route, find_route } from './routing.js';
 
 describe('parse_route_id', () => {
 	const tests = {
@@ -359,3 +359,56 @@ describe('resolve_route', () => {
 		);
 	});
 });
+
+describe('find_route', () => {
+	/** @param {string} id */
+	function create_route(id) {
+		const { pattern, params } = parse_route_id(id);
+		return { id, pattern, params };
+	}
+
+	test('finds matching route', () => {
+		const routes = [create_route('/blog'), create_route('/blog/[slug]'), create_route('/about')];
+
+		const result = find_route('/blog/hello-world', routes, {});
+		assert.equal(result?.route.id, '/blog/[slug]');
+		assert.deepEqual(result?.params, { slug: 'hello-world' });
+	});
+
+	test('returns first matching route', () => {
+		const routes = [create_route('/blog/[slug]'), create_route('/blog/[...rest]')];
+
+		const result = find_route('/blog/hello', routes, {});
+		assert.equal(result?.route.id, '/blog/[slug]');
+	});
+
+	test('returns null for no match', () => {
+		const routes = [create_route('/blog'), create_route('/about')];
+
+		const result = find_route('/contact', routes, {});
+		assert.equal(result, null);
+	});
+
+	test('respects matchers', () => {
+		const routes = [create_route('/blog/[slug=word]'), create_route('/blog/[slug]')];
+		/** @type {Record<string, import('@sveltejs/kit').ParamMatcher>} */
+		const matchers = {
+			word: (param) => /^\w+$/.test(param)
+		};
+
+		// "hello" matches the word matcher
+		const result1 = find_route('/blog/hello', routes, matchers);
+		assert.equal(result1?.route.id, '/blog/[slug=word]');
+
+		// "hello-world" doesn't match word matcher, falls through to [slug]
+		const result2 = find_route('/blog/hello-world', routes, matchers);
+		assert.equal(result2?.route.id, '/blog/[slug]');
+	});
+
+	test('decodes params', () => {
+		const routes = [create_route('/blog/[slug]')];
+
+		const result = find_route('/blog/hello%20world', routes, {});
+		assert.equal(result?.params.slug, 'hello world');
+	});
+});
