@sveltejs/kit 3.0.0-next.18 → 3.0.0-next.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "3.0.0-next.18",
+  "version": "3.0.0-next.19",
   "description": "SvelteKit is the fastest way to build Svelte apps",
   "keywords": [
     "framework",
@@ -33,6 +33,7 @@
     "@playwright/test": "^1.62.0",
     "@sveltejs/vite-plugin-svelte": "^7.0.0",
     "@types/connect": "^3.4.38",
+    "@typescript/native": "npm:typescript@^7.0.2",
     "@types/node": "^22.19.19",
     "dts-buddy": "^0.8.3",
     "jsdom": "^30.0.0",
@@ -75,6 +76,7 @@
       "default": "./src/runtime/app/internal/transport.js"
     },
     "#app/paths": {
+      "types": "./src/runtime/app/paths/internal.d.ts",
       "workerd": "./src/runtime/app/paths/server.js",
       "browser": "./src/runtime/app/paths/client.js",
       "default": "./src/runtime/app/paths/server.js"
@@ -123,6 +125,10 @@
       "types": "./types/index.d.ts",
       "import": "./src/exports/env/index.js"
     },
+    "./params": {
+      "types": "./types/index.d.ts",
+      "import": "./src/exports/params/index.js"
+    },
     "./vite": {
       "types": "./types/index.d.ts",
       "import": "./src/exports/vite/index.js"
@@ -133,10 +139,10 @@
     "node": ">=22.17"
   },
   "scripts": {
-    "lint": "prettier --config ../../.prettierrc --check .",
-    "check": "tsc && cd ./test/types && tsc && cd ./app-error-enhanced && tsc",
-    "check:all": "tsc && pnpm -r --filter=\"./**\" check",
-    "format": "prettier --config ../../.prettierrc --write .",
+    "lint": "oxfmt --check .",
+    "check": "pnpm tsc-native && pnpm tsc-native --project test/types/tsconfig.json && pnpm tsc-native --project test/types/app-error-enhanced/tsconfig.json",
+    "check:all": "pnpm tsc-native && pnpm -r --filter=\"./**\" check",
+    "format": "oxfmt --write .",
     "test": "pnpm test:unit && pnpm test:integration",
     "test:integration": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test",
     "test:dev": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:dev",
@@ -148,6 +154,7 @@
     "test:svelte-async:dev": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:svelte-async:dev",
     "test:svelte-async:build": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:svelte-async:build",
     "test:unit": "vitest run ./",
+    "tsc-native": "node node_modules/@typescript/native/bin/tsc",
     "generate:version": "node scripts/generate-version.js",
     "generate:types": "node scripts/generate-dts.js"
   }

package/src/cli.js

@@ -97,7 +97,7 @@ if (command === 'sync') {
 	}
 
 	try {
-		const vite = /** @type {import('vite')} */ (await import_peer('vite', process.cwd()));
+		const vite = /** @type {typeof import('vite')} */ (await import_peer('vite', process.cwd()));
 
 		const vite_config = await load_vite_config(values.config, vite);
 		const sveltekit_config = extract_svelte_config(vite_config);

package/src/constants.js

@@ -13,3 +13,6 @@ export const MUTATIVE_METHODS = ['POST', 'PUT', 'PATCH', 'DELETE'];
 export const PAGE_METHODS = ['GET', 'POST', 'HEAD'];
 
 export const SRC_ROOT = import.meta.dirname;
+
+// eslint-disable-next-line n/prefer-global/process
+export const IN_WEBCONTAINER = !!globalThis.process?.versions?.webcontainer;

package/src/core/config/index.js

@@ -123,7 +123,7 @@ export function load_error_page(config) {
  * @param {typeof import('vite')} [vite]
  */
 export async function load_vite_config(config, vite) {
-	vite ??= /** @type {import('vite')} */ (await import_peer('vite', process.cwd()));
+	vite ??= /** @type {typeof import('vite')} */ (await import_peer('vite', process.cwd()));
 
 	return vite.resolveConfig({ configFile: config }, 'build', process.env.MODE ?? 'production');
 }

package/src/core/env.js

@@ -55,7 +55,7 @@ export async function load_explicit_env(vite, kit, file, root, mode) {
 
 	const runner = get_runner(vite, server);
 
-	/** @type {import('../runtime/app/env/internal.js')} */ (
+	/** @type {typeof import('../runtime/app/env/internal.js')} */ (
 		await runner.import(`${runtime_directory}/app/env/internal.js`)
 	).set_building();
 

package/src/core/postbuild/analyse.js

@@ -54,7 +54,7 @@ async function analyse({
 
 	// `set_env` lives in a separate module that imports the user's `src/env` config. We import it
 	// *after* `set_building()` so that `building`-dependent expressions resolve correctly
-	/** @type {import('__sveltekit/env')} */
+	/** @type {typeof import('__sveltekit/env')} */
 	const { set_env } = await import(pathToFileURL(`${server_root}/server/env.js`).href);
 	set_env(env);
 

package/src/core/postbuild/prerender.js

@@ -52,7 +52,7 @@ async function prerender({ hash, out, manifest_path, metadata, verbose, env, vit
 
 	// `set_env` and `Server` live in modules that import the user's `src/env` config. We import them
 	// *after* `set_building()` so that `building`-dependent expressions resolve correctly
-	/** @type {import('__sveltekit/env')} */
+	/** @type {typeof import('__sveltekit/env')} */
 	const { set_env } = await import(pathToFileURL(`${out}/server/env.js`).href);
 	set_env(env);
 

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

@@ -251,6 +251,15 @@ function create_routes_and_nodes(cwd, config, fallback) {
 					continue;
 				}
 
+				// allow e.g. `+page.stories.svelte` or `+server.test.ts`
+				if (
+					file.name.includes('.test.') ||
+					file.name.includes('.spec.') ||
+					file.name.includes('.stories.')
+				) {
+					continue;
+				}
+
 				if (file.name.endsWith('.d.ts')) {
 					let name = file.name.slice(0, -5);
 					const ext = valid_extensions.find((ext) => name.endsWith(ext));

package/src/core/sync/sync.js

@@ -47,22 +47,35 @@ export function create(config, root) {
  * @param {import('types').ManifestData} manifest_data
  * @param {string} file
  * @param {string} root The project root directory
+ * @returns {boolean} Whether the update completed, or a full manifest rebuild is needed
  */
 export function update(config, manifest_data, file, root) {
-	const node_analyser = create_node_analyser(root);
+	try {
+		const node_analyser = create_node_analyser(root);
 
-	for (const node of manifest_data.nodes) {
-		node.page_options = node_analyser.get_page_options(node);
-	}
+		for (const node of manifest_data.nodes) {
+			node.page_options = node_analyser.get_page_options(node);
+		}
+
+		for (const route of manifest_data.routes) {
+			if (route.endpoint) {
+				route.endpoint.page_options = get_page_options(route.endpoint.file, root);
+			}
+		}
 
-	for (const route of manifest_data.routes) {
-		if (route.endpoint) {
-			route.endpoint.page_options = get_page_options(route.endpoint.file, root);
+		write_types(config, manifest_data, file, root);
+		write_app_types(config.kit, manifest_data, root);
+	} catch (error) {
+		// A route file can disappear before the watcher delivers its unlink event. In that case,
+		// the manifest is stale and must be rebuilt instead of incrementally updated.
+		if (error && typeof error === 'object' && 'code' in error && error.code === 'ENOENT') {
+			return false;
 		}
+
+		throw error;
 	}
 
-	write_types(config, manifest_data, file, root);
-	write_app_types(config.kit, manifest_data, root);
+	return true;
 }
 
 /**

package/src/core/sync/ts.js

@@ -1,4 +1,4 @@
-/** @type {import('typescript')} */
+/** @type {typeof import('typescript')} */
 // @ts-ignore
 export let ts = undefined;
 try {

package/src/core/sync/write_app_types.js

@@ -122,7 +122,7 @@ function generate_app_types(manifest_data, config, dir) {
 				return posixify(path.relative(dir, params_file));
 			};
 
-			type = `import('@sveltejs/kit').MatcherParam<(typeof import('${path_to_params()}').params)[${JSON.stringify(matcher)}]>`;
+			type = `import('@sveltejs/kit/params').MatcherParam<(typeof import('${path_to_params()}').params)[${JSON.stringify(matcher)}]>`;
 			matcher_types.set(matcher, type);
 		}
 

package/src/core/sync/write_client_manifest.js

@@ -155,7 +155,7 @@ export function write_client_manifest(kit, manifest_data, output, metadata) {
 			export const hooks = {
 				handleError: ${
 					client_hooks_file ? 'client_hooks.handleError || ' : ''
-				}(({ error }) => { console.error(error) }),
+				}(({ kind, error }) => { if (kind === 'unknown') { console.error(error); } }),
 				${client_hooks_file ? 'init: client_hooks.init,' : ''}
 				reroute: ${universal_hooks_file ? 'universal_hooks.reroute || ' : ''}(() => {}),
 				transport: ${universal_hooks_file ? 'universal_hooks.transport || ' : ''}{}

package/src/core/sync/write_server.js

@@ -61,9 +61,8 @@ export async function get_hooks() {
 	let handle;
 	let handleFetch;
 	let handleError;
-	let handleValidationError;
 	let init;
-	${server_hooks ? `({ handle, handleFetch, handleError, handleValidationError, init } = await import(${s(server_hooks)}));` : ''}
+	${server_hooks ? `({ handle, handleFetch, handleError, init } = await import(${s(server_hooks)}));` : ''}
 
 	let reroute;
 	let transport;
@@ -73,7 +72,6 @@ export async function get_hooks() {
 		handle,
 		handleFetch,
 		handleError,
-		handleValidationError,
 		init,
 		reroute,
 		transport

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

@@ -13,7 +13,7 @@ import {
 } from './utils.js';
 import { extends_id, validate_resolved_config } from './validate.js';
 
-/** @type {import('typescript')} */
+/** @type {typeof import('typescript')} */
 let ts;
 try {
 	ts = await import('typescript');

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

@@ -187,7 +187,10 @@ function update_types(config, routes, route, root, to_delete = new Set()) {
 	const outdir = path.join(config.kit.outDir, 'types', routes_dir, route.id);
 
 	// now generate new types
-	const imports = ["import type * as Kit from '@sveltejs/kit';"];
+	const imports = [
+		"import type * as Kit from '@sveltejs/kit';",
+		"import { MatcherParam } from '@sveltejs/kit/params';"
+	];
 
 	/** @type {string[]} */
 	const declarations = [];
@@ -431,7 +434,7 @@ function process_node(node, outdir, is_page, proxies, root, all_pages_have_load
 					'type ExtractActionFailure<T> = T extends Kit.ActionFailure<infer X>	? X extends void ? never : X : never;',
 					'type ActionsFailure<T extends Record<string, (...args: any) => any>> = { [Key in keyof T]: Exclude<ExtractActionFailure<Awaited<ReturnType<T[Key]>>>, void>; }[keyof T];',
 					`type ActionsExport = typeof import('${from}').actions`,
-					'export type SubmitFunction = Kit.SubmitFunction<Expand<ActionsSuccess<ActionsExport>>, Expand<ActionsFailure<ActionsExport>>>'
+					"export type SubmitFunction = import('$app/forms').SubmitFunction<Expand<ActionsSuccess<ActionsExport>>, Expand<ActionsFailure<ActionsExport>>>"
 				);
 
 				type = 'Expand<Kit.AwaitedActions<ActionsExport>> | null';
@@ -613,7 +616,7 @@ function generate_params_type(params, outdir, config) {
 			(param) =>
 				`${/^\w+$/.test(param.name) ? param.name : `'${param.name}'`}${param.optional ? '?' : ''}: ${
 					param.matcher
-						? `Kit.MatcherParam<(typeof import('${params_import}').params)[${JSON.stringify(param.matcher)}]>`
+						? `MatcherParam<(typeof import('${params_import}').params)[${JSON.stringify(param.matcher)}]>`
 						: 'string'
 				}${param.optional ? ' | undefined' : ''}`
 		)

package/src/exports/index.js

@@ -8,12 +8,12 @@ import {
 	has_resolution_suffix,
 	strip_data_suffix,
 	strip_resolution_suffix
-} from '../runtime/pathname.js';
-import { text_encoder } from '../runtime/utils.js';
+} from '../pathname.js';
 import { validate_redirect_location } from './url.js';
 
+const text_encoder = new TextEncoder();
+
 export { VERSION } from '../version.js';
-export { defineParams } from './params.js';
 
 // Keep the status codes as `number` because restricting to certain numbers makes it unnecessarily hard to use compared to the benefits
 // (we have runtime errors already to check for invalid codes). Also see https://github.com/sveltejs/kit/issues/11780
@@ -24,7 +24,7 @@ export { defineParams } from './params.js';
 /**
  * Throws an error with a HTTP status code and an optional message.
  * When called during request handling, this will cause SvelteKit to
- * return an error response without invoking `handleError`.
+ * return an error response; the error will be passed to `handleError` as an _expected_ error.
  * Make sure you're not catching the thrown error, which would prevent SvelteKit from handling it.
  * @param {number} status The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#client_error_responses). Must be in the range 400-599.
  * @param {string} [message] The error message.
@@ -38,15 +38,15 @@ export { defineParams } from './params.js';
 /**
  * Throws an error with a HTTP status code and an optional message.
  * When called during request handling, this will cause SvelteKit to
- * return an error response without invoking `handleError`.
+ * return an error response; the error will be passed to `handleError` as an _expected_ error.
  * Make sure you're not catching the thrown error, which would prevent SvelteKit from handling it.
  * @param {number} status The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#client_error_responses). Must be in the range 400-599.
  * @param {string} message The error message.
- * @param {{ status: number; message: string } extends App.Error ? never : Omit<App.Error, 'status' | 'message'>} properties Additional properties of the App.Error type.
+ * @param {keyof Omit<App.Error, 'status' | 'message'> extends never ? never : Omit<App.Error, 'status' | 'message'>} properties Additional properties of the App.Error type.
  * @overload
  * @param {number} status
  * @param {string} message
- * @param {{ status: number; message: string } extends App.Error ? never : Omit<App.Error, 'status' | 'message'>} properties
+ * @param {keyof Omit<App.Error, 'status' | 'message'> extends never ? never : Omit<App.Error, 'status' | 'message'>} properties
  * @return {never}
  * @throws {import('./public.js').HttpError} This error instructs SvelteKit to initiate HTTP error handling.
  * @throws {Error} If the provided status is invalid (not between 400 and 599).
@@ -54,7 +54,7 @@ export { defineParams } from './params.js';
 /**
  * Throws an error with a HTTP status code and an optional message.
  * When called during request handling, this will cause SvelteKit to
- * return an error response without invoking `handleError`.
+ * return an error response; the error will be passed to `handleError` as an _expected_ error.
  * Make sure you're not catching the thrown error, which would prevent SvelteKit from handling it.
  * @deprecated Passing an `App.Error` body as the second argument is deprecated — pass the `message` as the second argument, and any additional properties as the third
  * @param {number} status The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#client_error_responses). Must be in the range 400-599.
@@ -69,7 +69,7 @@ export { defineParams } from './params.js';
 /**
  * Throws an error with a HTTP status code and an optional message.
  * When called during request handling, this will cause SvelteKit to
- * return an error response without invoking `handleError`.
+ * return an error response; the error will be passed to `handleError` as an _expected_ error.
  * Make sure you're not catching the thrown error, which would prevent SvelteKit from handling it.
  * @param {any} status The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#client_error_responses). Must be in the range 400-599.
  * @param {any} [message] A string, or (deprecated) a partial App.Error object

package/src/exports/internal/server/event.js

@@ -1,7 +1,7 @@
 /** @import { RequestEvent } from '@sveltejs/kit' */
 /** @import { RequestStore } from 'types' */
 /** @import { AsyncLocalStorage } from 'node:async_hooks' */
-import { IN_WEBCONTAINER } from '../../../runtime/server/constants.js';
+import { IN_WEBCONTAINER } from '../../../constants.js';
 
 /** @type {RequestStore | null} */
 let sync_store = null;

package/src/exports/internal/server/telemetry.js

@@ -1,7 +1,7 @@
 /** @import { Tracer, SpanStatusCode, PropagationAPI, ContextAPI } from '@opentelemetry/api' */
 /** @import { RecordSpan } from 'types' */
 import { HttpError, Redirect } from '../shared.js';
-import { noop_span } from '../../../runtime/telemetry/noop.js';
+import { noop_span } from '../../../telemetry.js';
 
 // Import this module by its bare specifier so bundled and external code share its state.
 

package/src/exports/internal/shared.js

@@ -14,6 +14,15 @@ export class HttpError {
 	}
 }
 
+/**
+ * An `HttpError` whose body is already in its final, user-facing form — either produced by the
+ * `handleError` hook on the server and reconstructed here from the response, or authored directly
+ * by the client runtime. Unlike a plain `HttpError` (which represents a fresh `error(...)` call
+ * that the hook has yet to see), `handleError` must not run on it.
+ * @extends HttpError
+ */
+export class HandledHttpError extends HttpError {}
+
 export class Redirect {
 	/**
 	 * @param {300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308} status

package/src/exports/{params.js → params/index.js}

@@ -1,9 +1,11 @@
+/** @import { ParamDefinition, ParamMatcher } from '@sveltejs/kit/params' */
+
 /**
  * Define [parameter matchers](https://svelte.dev/docs/kit/advanced-routing#Matching) for your app.
  *
  * @example
  * ```js
- * import { defineParams } from '@sveltejs/kit';
+ * import { defineParams } from '@sveltejs/kit/params';
  * import * as v from 'valibot';
  *
  * export const params = defineParams({
@@ -31,8 +33,8 @@ export function defineParams(definitions) {
 }
 
 /**
- * @param {import('@sveltejs/kit').ParamDefinition} definition
- * @returns {import('@sveltejs/kit').ParamMatcher}
+ * @param {ParamDefinition} definition
+ * @returns {ParamMatcher}
  */
 export function normalize_param_definition(definition) {
 	// standard schemas can be callable (e.g. ArkType), so this must be checked before the function case
@@ -45,7 +47,7 @@ export function normalize_param_definition(definition) {
 	}
 
 	if (typeof definition === 'function') {
-		return /** @type {import('@sveltejs/kit').ParamMatcher} */ (
+		return /** @type {ParamMatcher} */ (
 			/** @type {unknown} */ ({
 				'~standard': {
 					validate(/** @type {unknown} */ value) {

package/src/exports/params/public.d.ts

@@ -0,0 +1,63 @@
+import { StandardSchemaV1 } from '@standard-schema/spec';
+
+/**
+ * The shape of a param matcher. See [matching](https://svelte.dev/docs/kit/advanced-routing#Matching) for more info.
+ */
+export type ParamMatcher<Output = any> = StandardSchemaV1<string, Output>;
+
+/**
+ * A value that can be parsed from a URL param and losslessly encoded with `String(...)`.
+ */
+export type ParamValue = string | number | boolean | bigint;
+
+/**
+ * A param matcher definition passed to [`defineParams`](https://svelte.dev/docs/kit/@sveltejs-kit#defineParams).
+ */
+export type ParamDefinition =
+	| ((param: string) => ParamValue | undefined)
+	| StandardSchemaV1<string, ParamValue>;
+
+/**
+ * The return type of [`defineParams`](https://svelte.dev/docs/kit/@sveltejs-kit#defineParams).
+ */
+export type DefinedParams<T extends Record<string, ParamDefinition>> = {
+	readonly [K in keyof T]: ParamEntry<T[K]>;
+};
+
+/**
+ * Normalizes a property of defineParams (schema or function) to standard schema.
+ */
+type ParamEntry<M> =
+	M extends StandardSchemaV1<any, any>
+		? StandardSchemaV1.InferOutput<M> extends ParamValue
+			? StandardSchemaV1<any, M>
+			: StandardSchemaV1<any, never>
+		: M extends (param: string) => infer R
+			? Exclude<R, undefined> extends ParamValue
+				? StandardSchemaV1<any, Exclude<R, undefined>>
+				: StandardSchemaV1<any, never>
+			: never;
+
+/**
+ * Extracts the param type from a matcher.
+ */
+export type MatcherParam<M extends StandardSchemaV1<any, any>> =
+	M extends StandardSchemaV1<any, infer Inner>
+		? Inner extends ParamValue
+			? Inner
+			: Inner extends StandardSchemaV1<any, any>
+				? StandardSchemaV1.InferOutput<Inner> extends ParamValue
+					? StandardSchemaV1.InferOutput<Inner>
+					: never
+				: never
+		: never;
+
+/**
+ * Define [parameter matchers](https://svelte.dev/docs/kit/advanced-routing#Matching) for your app.
+ *
+ * @template T
+ * @param definitions
+ */
+export function defineParams<T extends Record<string, ParamDefinition>>(
+	definitions: T
+): DefinedParams<T>;