@sveltejs/kit 2.53.4 → 2.55.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "2.53.4",
+  "version": "2.55.0",
   "description": "SvelteKit is the fastest way to build Svelte apps",
   "keywords": [
     "framework",
@@ -23,7 +23,7 @@
     "@types/cookie": "^0.6.0",
     "acorn": "^8.14.1",
     "cookie": "^0.6.0",
-    "devalue": "^5.6.3",
+    "devalue": "^5.6.4",
     "esm-env": "^1.2.2",
     "kleur": "^4.1.5",
     "magic-string": "^0.30.5",

package/src/core/config/options.js

@@ -133,23 +133,24 @@ const options = object(
 					server: boolean(false)
 				}),
 				remoteFunctions: boolean(false),
-				forkPreloads: boolean(false)
+				forkPreloads: boolean(false),
+				handleRenderingErrors: boolean(false)
 			}),
 
 			files: object({
-				src: deprecate(string('src')),
-				assets: deprecate(string('static')),
+				src: string('src'),
+				assets: string('static'),
 				hooks: object({
-					client: deprecate(string(null)),
-					server: deprecate(string(null)),
-					universal: deprecate(string(null))
+					client: string(null),
+					server: string(null),
+					universal: string(null)
 				}),
-				lib: deprecate(string(null)),
-				params: deprecate(string(null)),
-				routes: deprecate(string(null)),
-				serviceWorker: deprecate(string(null)),
-				appTemplate: deprecate(string(null)),
-				errorTemplate: deprecate(string(null))
+				lib: string(null),
+				params: string(null),
+				routes: string(null),
+				serviceWorker: string(null),
+				appTemplate: string(null),
+				errorTemplate: string(null)
 			}),
 
 			inlineStyleThreshold: number(0),

package/src/core/sync/sync.js

@@ -33,7 +33,7 @@ export function create(config) {
 
 	write_client_manifest(config.kit, manifest_data, `${output}/client`);
 	write_server(config, output);
-	write_root(manifest_data, output);
+	write_root(manifest_data, config, output);
 	write_all_types(config, manifest_data);
 	write_non_ambient(config.kit, manifest_data);
 

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_root.js

@@ -2,11 +2,14 @@ import { dedent, isSvelte5Plus, write_if_changed } from './utils.js';
 
 /**
  * @param {import('types').ManifestData} manifest_data
+ * @param {import('types').ValidatedConfig} config
  * @param {string} output
  */
-export function write_root(manifest_data, output) {
+export function write_root(manifest_data, config, output) {
 	// TODO remove default layout altogether
 
+	const use_boundaries = config.kit.experimental.handleRenderingErrors && isSvelte5Plus();
+
 	const max_depth = Math.max(
 		...manifest_data.routes.map((route) =>
 			route.page ? route.page.layouts.filter(Boolean).length + 1 : 0
@@ -20,8 +23,38 @@ export function write_root(manifest_data, output) {
 	}
 
 	let l = max_depth;
+	/** @type {string} */
+	let pyramid;
 
-	let pyramid = dedent`
+	if (isSvelte5Plus() && use_boundaries) {
+		// with the @const we force the data[depth] access to be derived, which is important to not fire updates needlessly
+		// TODO in Svelte 5 we should rethink the client.js side, we can likely make data a $state and only update indexes that changed there, simplifying this a lot
+		pyramid = dedent`
+			{#snippet pyramid(depth)}
+				{@const Pyramid = constructors[depth]}
+				{#snippet failed(error)}
+					{@const ErrorPage = errors[depth]}
+					<ErrorPage {error} />
+				{/snippet}
+				<svelte:boundary failed={errors[depth] ? failed : undefined}>
+					{#if constructors[depth + 1]}
+						{@const d = data[depth]}
+						<!-- svelte-ignore binding_property_non_reactive -->
+						<Pyramid bind:this={components[depth]} data={d} {form} params={page.params}>
+							{@render pyramid(depth + 1)}
+						</Pyramid>
+					{:else}
+						{@const d = data[depth]}
+						<!-- svelte-ignore binding_property_non_reactive -->
+						<Pyramid bind:this={components[depth]} data={d} {form} params={page.params} {error} />
+					{/if}
+				</svelte:boundary>
+			{/snippet}
+
+			{@render pyramid(0)}
+		`;
+	} else {
+		pyramid = dedent`
 	${
 		isSvelte5Plus()
 			? `<!-- svelte-ignore binding_property_non_reactive -->
@@ -29,8 +62,8 @@ export function write_root(manifest_data, output) {
 			: `<svelte:component this={constructors[${l}]} bind:this={components[${l}]} data={data_${l}} {form} params={page.params} />`
 	}`;
 
-	while (l--) {
-		pyramid = dedent`
+		while (l--) {
+			pyramid = dedent`
 			{#if constructors[${l + 1}]}
 				${
 					isSvelte5Plus()
@@ -57,6 +90,7 @@ export function write_root(manifest_data, output) {
 
 			{/if}
 		`;
+		}
 	}
 
 	write_if_changed(
@@ -72,9 +106,10 @@ export function write_root(manifest_data, output) {
 				${
 					isSvelte5Plus()
 						? dedent`
-							let { stores, page, constructors, components = [], form, ${levels
+							let { stores, page, constructors, components = [], form, ${use_boundaries ? 'errors = [], error, ' : ''}${levels
 								.map((l) => `data_${l} = null`)
 								.join(', ')} } = $props();
+							${use_boundaries ? `let data = $derived({${levels.map((l) => `'${l}': data_${l}`).join(', ')}})` : ''}
 						`
 						: dedent`
 							export let stores;
@@ -108,7 +143,7 @@ export function write_root(manifest_data, output) {
 					isSvelte5Plus()
 						? dedent`
 							$effect(() => {
-								stores;page;constructors;components;form;${levels.map((l) => `data_${l}`).join(';')};
+								stores;page;constructors;components;form;${use_boundaries ? 'errors;error;' : ''}${levels.map((l) => `data_${l}`).join(';')};
 								stores.page.notify();
 							});
 						`

package/src/core/sync/write_server.js

@@ -50,6 +50,7 @@ export const options = {
 	root,
 	service_worker: ${has_service_worker},
 	service_worker_options: ${config.kit.serviceWorker.register ? s(config.kit.serviceWorker.options) : 'null'},
+	server_error_boundaries: ${s(!!config.kit.experimental.handleRenderingErrors)},
 	templates: {
 		app: ({ head, body, assets, nonce, env }) => ${s(template)
 			.replace('%sveltekit.head%', '" + head + "')

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/exports/index.js

@@ -276,7 +276,7 @@ export function isValidationError(e) {
  * @since 2.18.0
  */
 export function normalizeUrl(url) {
-	url = new URL(url, 'http://internal');
+	url = new URL(url, 'a://a');
 
 	const is_route_resolution = has_resolution_suffix(url.pathname);
 	const is_data_request = has_data_suffix(url.pathname);

package/src/exports/public.d.ts

@@ -513,79 +513,88 @@ export interface KitConfig {
 		 * @default false
 		 */
 		forkPreloads?: boolean;
+
+		/**
+		 * Whether to enable the experimental handling of rendering errors.
+		 * When enabled, `<svelte:boundary>` is used to wrap components at each level
+		 * where there's an `+error.svelte`, rendering the error page if the component fails.
+		 * In addition, error boundaries also work on the server and the error object goes through `handleError`.
+		 * @default false
+		 */
+		handleRenderingErrors?: boolean;
 	};
 	/**
 	 * Where to find various files within your project.
-	 * @deprecated
+	 * @deprecated this feature is still supported, but it's generally recommended to use [monorepos](https://levelup.video/tutorials/monorepos-with-pnpm) instead
 	 */
 	files?: {
 		/**
-		 * the location of your source code
-		 * @deprecated
+		 * The location of your source code.
+		 * @deprecated this feature is still supported, but it's generally recommended to use [monorepos](https://levelup.video/tutorials/monorepos-with-pnpm) instead
 		 * @default "src"
 		 * @since 2.28
 		 */
 		src?: string;
 		/**
-		 * a place to put static files that should have stable URLs and undergo no processing, such as `favicon.ico` or `manifest.json`
-		 * @deprecated
+		 * A place to put static files that should have stable URLs and undergo no processing, such as `favicon.ico` or `manifest.json`.
+		 * @deprecated this feature is still supported, but it's generally recommended to use [monorepos](https://levelup.video/tutorials/monorepos-with-pnpm) instead
 		 * @default "static"
 		 */
 		assets?: string;
 		hooks?: {
 			/**
 			 * The location of your client [hooks](https://svelte.dev/docs/kit/hooks).
-			 * @deprecated
+			 * @deprecated this feature is still supported, but it's generally recommended to use [monorepos](https://levelup.video/tutorials/monorepos-with-pnpm) instead
 			 * @default "src/hooks.client"
 			 */
 			client?: string;
 			/**
 			 * The location of your server [hooks](https://svelte.dev/docs/kit/hooks).
-			 * @deprecated
+			 * @deprecated this feature is still supported, but it's generally recommended to use [monorepos](https://levelup.video/tutorials/monorepos-with-pnpm) instead
 			 * @default "src/hooks.server"
 			 */
 			server?: string;
 			/**
 			 * The location of your universal [hooks](https://svelte.dev/docs/kit/hooks).
-			 * @deprecated
+			 * @deprecated this feature is still supported, but it's generally recommended to use [monorepos](https://levelup.video/tutorials/monorepos-with-pnpm) instead
 			 * @default "src/hooks"
 			 * @since 2.3.0
 			 */
 			universal?: string;
 		};
 		/**
-		 * your app's internal library, accessible throughout the codebase as `$lib`
-		 * @deprecated
+		 * Your app's internal library, accessible throughout the codebase as `$lib`.
+		 * @deprecated this feature is still supported, but it's generally recommended to use [monorepos](https://levelup.video/tutorials/monorepos-with-pnpm) instead
 		 * @default "src/lib"
 		 */
 		lib?: string;
 		/**
-		 * a directory containing [parameter matchers](https://svelte.dev/docs/kit/advanced-routing#Matching)
-		 * @deprecated
+		 * A directory containing [parameter matchers](https://svelte.dev/docs/kit/advanced-routing#Matching).
+		 * @deprecated this feature is still supported, but it's generally recommended to use [monorepos](https://levelup.video/tutorials/monorepos-with-pnpm) instead
 		 * @default "src/params"
 		 */
 		params?: string;
 		/**
-		 * the files that define the structure of your app (see [Routing](https://svelte.dev/docs/kit/routing))
-		 * @deprecated
+		 * The files that define the structure of your app (see [Routing](https://svelte.dev/docs/kit/routing)).
+		 * @deprecated this feature is still supported, but it's generally recommended to use [monorepos](https://levelup.video/tutorials/monorepos-with-pnpm) instead
 		 * @default "src/routes"
 		 */
 		routes?: string;
 		/**
-		 * the location of your service worker's entry point (see [Service workers](https://svelte.dev/docs/kit/service-workers))
-		 * @deprecated
+		 * The location of your service worker's entry point (see [Service workers](https://svelte.dev/docs/kit/service-workers)).
+		 * @deprecated this feature is still supported, but it's generally recommended to use [monorepos](https://levelup.video/tutorials/monorepos-with-pnpm) instead
 		 * @default "src/service-worker"
 		 */
 		serviceWorker?: string;
 		/**
-		 * the location of the template for HTML responses
-		 * @deprecated
+		 * The location of the template for HTML responses.
+		 * @deprecated this feature is still supported, but it's generally recommended to use [monorepos](https://levelup.video/tutorials/monorepos-with-pnpm) instead
 		 * @default "src/app.html"
 		 */
 		appTemplate?: string;
 		/**
-		 * the location of the template for fallback error responses
-		 * @deprecated
+		 * The location of the template for fallback error responses.
+		 * @deprecated this feature is still supported, but it's generally recommended to use [monorepos](https://levelup.video/tutorials/monorepos-with-pnpm) instead
 		 * @default "src/error.html"
 		 */
 		errorTemplate?: string;
@@ -1236,7 +1245,7 @@ export interface NavigationBase {
 	 */
 	to: NavigationTarget | null;
 	/**
-	 * Whether or not the navigation will result in the page being unloaded (i.e. not a client-side navigation)
+	 * Whether or not the navigation will result in the page being unloaded (i.e. not a client-side navigation).
 	 */
 	willUnload: boolean;
 	/**
@@ -1249,11 +1258,7 @@ export interface NavigationBase {
 export interface NavigationEnter extends NavigationBase {
 	/**
 	 * The type of navigation:
-	 * - `form`: The user submitted a `<form method="GET">`
-	 * - `leave`: The app is being left either because the tab is being closed or a navigation to a different document is occurring
-	 * - `link`: Navigation was triggered by a link click
-	 * - `goto`: Navigation was triggered by a `goto(...)` call or a redirect
-	 * - `popstate`: Navigation was triggered by back/forward navigation
+	 * - `enter`: The app has hydrated/started
 	 */
 	type: 'enter';
 
@@ -1268,16 +1273,29 @@ export interface NavigationEnter extends NavigationBase {
 	event?: undefined;
 }
 
-export interface NavigationExternal extends NavigationBase {
+export type NavigationExternal = NavigationGoto | NavigationLeave;
+
+export interface NavigationGoto extends NavigationBase {
 	/**
 	 * The type of navigation:
-	 * - `form`: The user submitted a `<form method="GET">`
-	 * - `leave`: The app is being left either because the tab is being closed or a navigation to a different document is occurring
-	 * - `link`: Navigation was triggered by a link click
 	 * - `goto`: Navigation was triggered by a `goto(...)` call or a redirect
-	 * - `popstate`: Navigation was triggered by back/forward navigation
 	 */
-	type: Exclude<NavigationType, 'enter' | 'popstate' | 'link' | 'form'>;
+	type: 'goto';
+
+	// TODO 3.0 remove this property, so that it only exists when type is 'popstate'
+	// (would possibly be a breaking change to do it prior to that)
+	/**
+	 * In case of a history back/forward navigation, the number of steps to go back/forward
+	 */
+	delta?: undefined;
+}
+
+export interface NavigationLeave extends NavigationBase {
+	/**
+	 * The type of navigation:
+	 * - `leave`: The app is being left either because the tab is being closed or a navigation to a different document is occurring
+	 */
+	type: 'leave';
 
 	// TODO 3.0 remove this property, so that it only exists when type is 'popstate'
 	// (would possibly be a breaking change to do it prior to that)
@@ -1291,10 +1309,6 @@ export interface NavigationFormSubmit extends NavigationBase {
 	/**
 	 * The type of navigation:
 	 * - `form`: The user submitted a `<form method="GET">`
-	 * - `leave`: The app is being left either because the tab is being closed or a navigation to a different document is occurring
-	 * - `link`: Navigation was triggered by a link click
-	 * - `goto`: Navigation was triggered by a `goto(...)` call or a redirect
-	 * - `popstate`: Navigation was triggered by back/forward navigation
 	 */
 	type: 'form';
 
@@ -1314,10 +1328,6 @@ export interface NavigationFormSubmit extends NavigationBase {
 export interface NavigationPopState extends NavigationBase {
 	/**
 	 * The type of navigation:
-	 * - `form`: The user submitted a `<form method="GET">`
-	 * - `leave`: The app is being left either because the tab is being closed or a navigation to a different document is occurring
-	 * - `link`: Navigation was triggered by a link click
-	 * - `goto`: Navigation was triggered by a `goto(...)` call or a redirect
 	 * - `popstate`: Navigation was triggered by back/forward navigation
 	 */
 	type: 'popstate';
@@ -1336,11 +1346,7 @@ export interface NavigationPopState extends NavigationBase {
 export interface NavigationLink extends NavigationBase {
 	/**
 	 * The type of navigation:
-	 * - `form`: The user submitted a `<form method="GET">`
-	 * - `leave`: The app is being left either because the tab is being closed or a navigation to a different document is occurring
 	 * - `link`: Navigation was triggered by a link click
-	 * - `goto`: Navigation was triggered by a `goto(...)` call or a redirect
-	 * - `popstate`: Navigation was triggered by back/forward navigation
 	 */
 	type: 'link';
 
@@ -1377,13 +1383,6 @@ export type BeforeNavigate = Navigation & {
  * The argument passed to [`onNavigate`](https://svelte.dev/docs/kit/$app-navigation#onNavigate) callbacks.
  */
 export type OnNavigate = Navigation & {
-	/**
-	 * The type of navigation:
-	 * - `form`: The user submitted a `<form method="GET">`
-	 * - `link`: Navigation was triggered by a link click
-	 * - `goto`: Navigation was triggered by a `goto(...)` call or a redirect
-	 * - `popstate`: Navigation was triggered by back/forward navigation
-	 */
 	type: Exclude<NavigationType, 'enter' | 'leave'>;
 	/**
 	 * Since `onNavigate` callbacks are called immediately before a client-side navigation, they will never be called with a navigation that unloads the page.
@@ -1395,14 +1394,6 @@ export type OnNavigate = Navigation & {
  * The argument passed to [`afterNavigate`](https://svelte.dev/docs/kit/$app-navigation#afterNavigate) callbacks.
  */
 export type AfterNavigate = (Navigation | NavigationEnter) & {
-	/**
-	 * The type of navigation:
-	 * - `enter`: The app has hydrated/started
-	 * - `form`: The user submitted a `<form method="GET">`
-	 * - `link`: Navigation was triggered by a link click
-	 * - `goto`: Navigation was triggered by a `goto(...)` call or a redirect
-	 * - `popstate`: Navigation was triggered by back/forward navigation
-	 */
 	type: Exclude<NavigationType, 'leave'>;
 	/**
 	 * Since `afterNavigate` callbacks are called after a navigation completes, they will never be called with a navigation that unloads the page.