@sveltejs/kit 2.54.0 → 2.55.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "2.54.0",
+  "version": "2.55.0",
   "description": "SvelteKit is the fastest way to build Svelte apps",
   "keywords": [
     "framework",

package/src/core/sync/write_non_ambient.js

@@ -1,5 +1,6 @@
 import path from 'node:path';
 import { GENERATED_COMMENT } from '../../constants.js';
+import { posixify } from '../../utils/filesystem.js';
 import { write_if_changed } from './utils.js';
 import { s } from '../../utils/misc.js';
 import { get_route_segments } from '../../utils/routing.js';
@@ -24,25 +25,25 @@ function get_pathnames_for_trailing_slash(pathname, route) {
 		return [pathname];
 	}
 
-	/** @type {({ trailingSlash?: import('types').TrailingSlash } | null)[]} */
-	const routes = [];
-
-	if (route.leaf) routes.push(route.leaf.page_options ?? null);
-	if (route.endpoint) routes.push(route.endpoint.page_options);
-
 	/** @type {Set<string>} */
 	const pathnames = new Set();
 
-	for (const page_options of routes) {
-		if (page_options === null || page_options.trailingSlash === 'ignore') {
+	/**
+	 * @param {{ trailingSlash?: import('types').TrailingSlash } | null | undefined} page_options
+	 */
+	const add_pathnames = (page_options) => {
+		if (page_options === null || page_options?.trailingSlash === 'ignore') {
 			pathnames.add(pathname);
 			pathnames.add(pathname + '/');
-		} else if (page_options.trailingSlash === 'always') {
+		} else if (page_options?.trailingSlash === 'always') {
 			pathnames.add(pathname + '/');
 		} else {
 			pathnames.add(pathname);
 		}
-	}
+	};
+
+	if (route.leaf) add_pathnames(route.leaf.page_options ?? null);
+	if (route.endpoint) add_pathnames(route.endpoint.page_options);
 
 	return Array.from(pathnames);
 }
@@ -81,8 +82,66 @@ export {};
 /**
  * Generate app types interface extension
  * @param {import('types').ManifestData} manifest_data
+ * @param {import('types').ValidatedKitConfig} config
  */
-function generate_app_types(manifest_data) {
+function generate_app_types(manifest_data, config) {
+	/** @param {string} matcher */
+	const path_to_matcher = (matcher) =>
+		posixify(path.relative(config.outDir, path.join(config.files.params, matcher + '.js')));
+
+	/** @type {Map<string, string>} */
+	const matcher_types = new Map();
+
+	/** @param {string | undefined} matcher */
+	const get_matcher_type = (matcher) => {
+		if (!matcher) return 'string';
+
+		let type = matcher_types.get(matcher);
+		if (!type) {
+			type = `MatcherParam<typeof import('${path_to_matcher(matcher)}').match>`;
+			matcher_types.set(matcher, type);
+		}
+
+		return type;
+	};
+
+	/** @param {Set<string> | null} matchers */
+	const get_matchers_type = (matchers) => {
+		if (matchers === null) return 'string';
+
+		return Array.from(matchers)
+			.map((matcher) => get_matcher_type(matcher))
+			.join(' | ');
+	};
+
+	/** @type {Set<string>} */
+	const route_ids = new Set(manifest_data.routes.map((route) => route.id));
+
+	/**
+	 * @param {string} id
+	 * @returns {string[]}
+	 */
+	const get_ancestor_route_ids = (id) => {
+		/** @type {string[]} */
+		const ancestors = [];
+
+		if (route_ids.has('/')) {
+			ancestors.push('/');
+		}
+
+		let current = '';
+		for (const segment of id.slice(1).split('/')) {
+			if (!segment) continue;
+
+			current += '/' + segment;
+			if (route_ids.has(current)) {
+				ancestors.push(current);
+			}
+		}
+
+		return ancestors;
+	};
+
 	/** @type {Set<string>} */
 	const pathnames = new Set();
 
@@ -92,49 +151,96 @@ function generate_app_types(manifest_data) {
 	/** @type {string[]} */
 	const layouts = [];
 
+	/** @type {Map<string, Map<string, { optional: boolean, matchers: Set<string> | null }>>} */
+	const layout_params_by_route = new Map(
+		manifest_data.routes.map((route) => [
+			route.id,
+			new Map(
+				route.params.map((p) => [
+					p.name,
+					{ optional: p.optional, matchers: p.matcher ? new Set([p.matcher]) : null }
+				])
+			)
+		])
+	);
+
 	for (const route of manifest_data.routes) {
+		const ancestors = get_ancestor_route_ids(route.id);
+
+		for (const ancestor_id of ancestors) {
+			const ancestor_params = layout_params_by_route.get(ancestor_id);
+			if (!ancestor_params) continue;
+
+			for (const p of route.params) {
+				const matcher = p.matcher ?? null;
+				const entry = ancestor_params.get(p.name);
+				if (!entry) {
+					ancestor_params.set(p.name, {
+						optional: true,
+						matchers: matcher === null ? null : new Set([matcher])
+					});
+					continue;
+				}
+
+				if (entry.matchers === null) continue;
+
+				if (matcher === null) {
+					entry.matchers = null;
+					continue;
+				}
+
+				entry.matchers.add(matcher);
+			}
+		}
+	}
+
+	for (const route of manifest_data.routes) {
+		const pathname = remove_group_segments(route.id);
+		let normalized_pathname = pathname;
+
+		/** @type {(path: string) => string} */
+		let serialise = s;
+
 		if (route.params.length > 0) {
-			const params = route.params.map((p) => `${p.name}${p.optional ? '?:' : ':'} string`);
+			const params = route.params.map((p) => {
+				const type = get_matcher_type(p.matcher);
+				return `${p.name}${p.optional ? '?:' : ':'} ${type}`;
+			});
 			const route_type = `${s(route.id)}: { ${params.join('; ')} }`;
 
 			dynamic_routes.push(route_type);
 
-			const pathname = remove_group_segments(route.id);
-			const replaced_pathname = replace_required_params(replace_optional_params(pathname));
+			normalized_pathname = replace_required_params(replace_optional_params(pathname));
+			serialise = (p) => `\`${p}\` & {}`;
+		}
 
-			for (const p of get_pathnames_for_trailing_slash(replaced_pathname, route)) {
-				pathnames.add(`\`${p}\` & {}`);
-			}
-		} else {
-			const pathname = remove_group_segments(route.id);
-			for (const p of get_pathnames_for_trailing_slash(pathname, route)) {
-				pathnames.add(s(p));
-			}
+		for (const p of get_pathnames_for_trailing_slash(normalized_pathname, route)) {
+			pathnames.add(serialise(p));
 		}
 
-		/** @type {Map<string, boolean>} */
-		const child_params = new Map(route.params.map((p) => [p.name, p.optional]));
+		let layout_type = 'Record<string, never>';
 
-		for (const child of manifest_data.routes.filter((r) => r.id.startsWith(route.id))) {
-			for (const p of child.params) {
-				if (!child_params.has(p.name)) {
-					child_params.set(p.name, true); // always optional
-				}
-			}
-		}
+		const layout_params = layout_params_by_route.get(route.id);
+		if (layout_params) {
+			const params = Array.from(layout_params)
+				.map(([name, { optional, matchers }]) => {
+					const type = get_matchers_type(matchers);
+					return `${name}${optional ? '?:' : ':'} ${type}`;
+				})
+				.join('; ');
 
-		const layout_params = Array.from(child_params)
-			.map(([name, optional]) => `${name}${optional ? '?:' : ':'} string`)
-			.join('; ');
+			if (params.length > 0) layout_type = `{ ${params} }`;
+		}
 
-		const layout_type = `${s(route.id)}: ${layout_params.length > 0 ? `{ ${layout_params} }` : 'Record<string, never>'}`;
-		layouts.push(layout_type);
+		layouts.push(`${s(route.id)}: ${layout_type}`);
 	}
 
 	const assets = manifest_data.assets.map((asset) => s('/' + asset.file));
 
 	return [
 		'declare module "$app/types" {',
+		'\ttype MatcherParam<M> = M extends (param : string) => param is (infer U extends string) ? U : string;',
+		'',
 		'\texport interface AppTypes {',
 		`\t\tRouteId(): ${manifest_data.routes.map((r) => s(r.id)).join(' | ')};`,
 		`\t\tRouteParams(): {\n\t\t\t${dynamic_routes.join(';\n\t\t\t')}\n\t\t};`,
@@ -153,7 +259,7 @@ function generate_app_types(manifest_data) {
  * @param {import('types').ManifestData} manifest_data
  */
 export function write_non_ambient(config, manifest_data) {
-	const app_types = generate_app_types(manifest_data);
+	const app_types = generate_app_types(manifest_data, config);
 	const content = [template, app_types].join('\n\n');
 
 	write_if_changed(path.join(config.outDir, 'non-ambient.d.ts'), content);

package/src/core/sync/write_types/index.js

@@ -199,11 +199,7 @@ function update_types(config, routes, route, to_delete = new Set()) {
 
 	// returns the predicate of a matcher's type guard - or string if there is no type guard
 	declarations.push(
-		// TS complains on infer U, which seems weird, therefore ts-ignore it
-		[
-			'// @ts-ignore',
-			'type MatcherParam<M> = M extends (param : string) => param is infer U ? U extends string ? U : string : string;'
-		].join('\n')
+		'type MatcherParam<M> = M extends (param : string) => param is (infer U extends string) ? U : string;'
 	);
 
 	declarations.push(

package/src/runtime/app/state/server.js

@@ -11,7 +11,7 @@ function context_dev(name) {
 		return context();
 	} catch {
 		throw new Error(
-			`Can only read '${name}' on the server during rendering (not in e.g. \`load\` functions), as it is bound to the current request via component context. This prevents state from leaking between users.` +
+			`Can only read '${name}' on the server during rendering (not in e.g. \`load\` functions), as it is bound to the current request via component context. This prevents state from leaking between users. ` +
 				'For more information, see https://svelte.dev/docs/kit/state-management#avoid-shared-state-on-the-server'
 		);
 	}

package/src/version.js

@@ -1,4 +1,4 @@
 // generated during release, do not modify
 
 /** @type {string} */
-export const VERSION = '2.54.0';
+export const VERSION = '2.55.0';