fix: ignore route groups when generating typed routes (#14050)

Fixes #14043
Fixes #14044
---------

Co-authored-by: Rich Harris <[email protected]>
Co-authored-by: Conduitry <[email protected]>

Author: 3 people

.changeset/tidy-owls-enter.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: ignore route groups when generating typed routes

packages/kit/src/core/sync/write_types/index.js

@@ -6,13 +6,18 @@ import { posixify, rimraf, walk } from '../../../utils/filesystem.js';
 import { compact } from '../../../utils/array.js';
 import { ts } from '../ts.js';
 import { s } from '../../../utils/misc.js';
+import { get_route_segments } from '../../../utils/routing.js';
 
 const remove_relative_parent_traversals = (/** @type {string} */ path) =>
 	path.replace(/\.\.\//g, '');
 const replace_optional_params = (/** @type {string} */ id) =>
 	id.replace(/\/\[\[[^\]]+\]\]/g, '${string}');
 const replace_required_params = (/** @type {string} */ id) =>
 	id.replace(/\/\[[^\]]+\]/g, '/${string}');
+/** Convert route ID to pathname by removing layout groups */
+const remove_group_segments = (/** @type {string} */ id) => {
+	return '/' + get_route_segments(id).join('/');
+};
 const is_whitespace = (/** @type {string} */ char) => /\s/.test(char);
 
 /**
@@ -60,8 +65,8 @@ export function write_all_types(config, manifest_data) {
 		}
 	}
 
-	/** @type {string[]} */
-	const pathnames = [];
+	/** @type {Set<string>} */
+	const pathnames = new Set();
 
 	/** @type {string[]} */
 	const dynamic_routes = [];
@@ -76,9 +81,11 @@ export function write_all_types(config, manifest_data) {
 
 			dynamic_routes.push(route_type);
 
-			pathnames.push(`\`${replace_required_params(replace_optional_params(route.id))}\` & {}`);
+			const pathname = remove_group_segments(route.id);
+			pathnames.add(`\`${replace_required_params(replace_optional_params(pathname))}\` & {}`);
 		} else {
-			pathnames.push(s(route.id));
+			const pathname = remove_group_segments(route.id);
+			pathnames.add(s(pathname));
 		}
 
 		/** @type {Map<string, boolean>} */
@@ -113,7 +120,7 @@ export function write_all_types(config, manifest_data) {
 			`export type RouteId = ${manifest_data.routes.map((r) => s(r.id)).join(' | ')};`,
 			'export type RouteParams<T extends RouteId> = T extends keyof DynamicRoutes ? DynamicRoutes[T] : Record<string, never>;',
 			'export type LayoutParams<T extends RouteId> = Layouts[T] | Record<string, never>;',
-			`export type Pathname = ${pathnames.join(' | ')};`,
+			`export type Pathname = ${Array.from(pathnames).join(' | ')};`,
 			'export type ResolvedPathname = `${"" | `/${string}`}${Pathname}`;',
 			`export type Asset = ${manifest_data.assets.map((asset) => s('/' + asset.file)).join(' | ') || 'never'};`
 		].join('\n\n')

packages/kit/src/core/sync/write_types/index.spec.js

@@ -30,7 +30,7 @@ function run_test(dir) {
 	write_all_types(initial, manifest);
 }
 
-test('Creates correct $types', { timeout: 6000 }, () => {
+test('Creates correct $types', { timeout: 10000 }, () => {
 	// To save us from creating a real SvelteKit project for each of the tests,
 	// we first run the type generation directly for each test case, and then
 	// call `tsc` to check that the generated types are valid.

packages/kit/src/core/sync/write_types/test/app-types/(group)/path-a/+page.ts

@@ -5,6 +5,7 @@ declare let id: RouteId;
 // okay
 id = '/';
 id = '/foo/[bar]/[baz]';
+id = '/(group)/path-a';
 
 // @ts-expect-error
 id = '/nope';
@@ -26,5 +27,10 @@ pathname = '/nope';
 pathname = '/foo';
 pathname = '/foo/1/2';
 
+// Test layout groups
+pathname = '/path-a';
+// @ts-expect-error layout group names are NOT part of the pathname type
+pathname = '/(group)/path-a';
+
 // read `pathname` otherwise it is treated as unused
 pathname;

packages/kit/src/core/sync/write_types/test/app-types/+page.ts

@@ -117,7 +117,7 @@ export function remove_optional_params(id) {
  * @param {string} segment
  */
 function affects_path(segment) {
-	return !/^\([^)]+\)$/.test(segment);
+	return segment !== '' && !/^\([^)]+\)$/.test(segment);
 }
 
 /**