@sveltejs/kit 1.0.11 → 1.0.13

package/src/runtime/server/utils.js

@@ -3,6 +3,7 @@ import { coalesce_to_error } from '../../utils/error.js';
 import { negotiate } from '../../utils/http.js';
 import { has_data_suffix } from '../../utils/url.js';
 import { HttpError } from '../control.js';
+import { fix_stack_trace } from '../shared.js';
 
 /** @param {any} body */
 export function is_pojo(body) {
@@ -74,7 +75,7 @@ export function get_option(nodes, option) {
  * @param {string} message
  */
 export function static_error_page(options, status, message) {
-	return new Response(options.error_template({ status, message }), {
+	return new Response(options.templates.error({ status, message }), {
 		headers: { 'content-type': 'text/html; charset=utf-8' },
 		status
 	});
@@ -110,13 +111,29 @@ export async function handle_fatal_error(event, options, error) {
  * @param {import('types').RequestEvent} event
  * @param {import('types').SSROptions} options
  * @param {any} error
- * @returns {import('types').MaybePromise<App.Error>}
+ * @returns {Promise<App.Error>}
  */
-export function handle_error_and_jsonify(event, options, error) {
+export async function handle_error_and_jsonify(event, options, error) {
 	if (error instanceof HttpError) {
 		return error.body;
 	} else {
-		return options.handle_error(error, event);
+		if (__SVELTEKIT_DEV__) {
+			error = new Proxy(error, {
+				get: (target, property) => {
+					if (property === 'stack') {
+						return fix_stack_trace(target.stack);
+					}
+
+					return Reflect.get(target, property, target);
+				}
+			});
+		}
+
+		return (
+			(await options.hooks.handleError({ error, event })) ?? {
+				message: event.route.id != null ? 'Internal Error' : 'Not Found'
+			}
+		);
 	}
 }
 

package/src/runtime/shared.js

@@ -0,0 +1,28 @@
+export let assets = '';
+export let base = '';
+export let building = false;
+export let version = '';
+
+/** @param {string} stack */
+export let fix_stack_trace = (stack) => stack;
+
+/** @param {{ base: string, assets: string }} paths */
+export function set_paths(paths) {
+	base = paths.base;
+	assets = paths.assets || base;
+}
+
+/** @param {boolean} value */
+export function set_building(value) {
+	building = value;
+}
+
+/** @param {string} value */
+export function set_version(value) {
+	version = value;
+}
+
+/** @param {(stack: string) => string} value */
+export function set_fix_stack_trace(value) {
+	fix_stack_trace = value;
+}

package/types/index.d.ts

@@ -1080,7 +1080,7 @@ export type ActionResult<
  * Creates an `HttpError` object with an HTTP status code and an optional message.
  * This object, if thrown during request handling, will cause SvelteKit to
  * return an error response without invoking `handleError`
- * @param status The HTTP status code
+ * @param 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 body An object that conforms to the App.Error type. If a string is passed, it will be used as the message property.
  */
 export function error(status: number, body: App.Error): HttpError;
@@ -1094,15 +1094,16 @@ export function error(
  * The object returned by the [`error`](https://kit.svelte.dev/docs/modules#sveltejs-kit-error) function.
  */
 export interface HttpError {
-	/** The [HTTP status code](https://httpstatusdogs.com), in the range 400-599 */
+	/** The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#client_error_responses), in the range 400-599. */
 	status: number;
 	/** The content of the error. */
 	body: App.Error;
 }
 
 /**
- * Create a `Redirect` object. If thrown during request handling, SvelteKit will
- * return a redirect response.
+ * Create a `Redirect` object. If thrown during request handling, SvelteKit will return a redirect response.
+ * @param status The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#redirection_messages). Must be in the range 300-308.
+ * @param location The location to redirect to.
  */
 export function redirect(
 	status: 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308,
@@ -1113,7 +1114,7 @@ export function redirect(
  * The object returned by the [`redirect`](https://kit.svelte.dev/docs/modules#sveltejs-kit-redirect) function
  */
 export interface Redirect {
-	/** The [HTTP status code](https://httpstatusdogs.com), in the range 300-308. */
+	/** The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#redirection_messages), in the range 300-308. */
 	status: 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308;
 	/** The location to redirect to. */
 	location: string;
@@ -1128,6 +1129,8 @@ export function json(data: any, init?: ResponseInit): Response;
 
 /**
  * Create an `ActionFailure` object.
+ * @param 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 data Data associated with the failure (e.g. validation errors)
  */
 export function fail<T extends Record<string, unknown> | undefined>(
 	status: number,
@@ -1139,7 +1142,9 @@ export function fail<T extends Record<string, unknown> | undefined>(
  */
 export interface ActionFailure<T extends Record<string, unknown> | undefined = undefined>
 	extends UniqueInterface {
+	/** The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#client_error_responses), in the range 400-599. */
 	status: number;
+	/** Data associated with the failure (e.g. validation errors) */
 	data: T;
 }
 

package/types/internal.d.ts

@@ -27,16 +27,13 @@ import {
 
 export interface ServerModule {
 	Server: typeof InternalServer;
+}
 
-	override(options: {
-		building: boolean;
-		paths: {
-			base: string;
-			assets: string;
-		};
-		protocol?: 'http' | 'https';
-		read(file: string): Buffer;
-	}): void;
+export interface ServerInternalModule {
+	set_building(building: boolean): void;
+	set_paths(paths: { base: string; assets: string }): void;
+	set_version(version: string): void;
+	set_fix_stack_trace(fix_stack_trace: (stack: string) => string): void;
 }
 
 export interface Asset {
@@ -74,7 +71,7 @@ export interface CSRPageNode {
 		load?: Load;
 		trailingSlash?: TrailingSlash;
 	};
-	server: boolean;
+	has_server_load: boolean;
 }
 
 export type CSRPageNodeLoader = () => Promise<CSRPageNode>;
@@ -109,6 +106,7 @@ export class InternalServer extends Server {
 		request: Request,
 		options: RequestOptions & {
 			prerendering?: PrerenderOptions;
+			read: (file: string) => Buffer;
 		}
 	): Promise<Response>;
 }
@@ -155,7 +153,12 @@ export type RecursiveRequired<T> = {
 export type RequiredResolveOptions = Required<ResolveOptions>;
 
 export interface Respond {
-	(request: Request, options: SSROptions, state: SSRState): Promise<Response>;
+	(
+		request: Request,
+		options: SSROptions,
+		manifest: SSRManifest,
+		state: SSRState
+	): Promise<Response>;
 }
 
 export interface RouteParam {
@@ -294,37 +297,18 @@ export interface SSRNode {
 export type SSRNodeLoader = () => Promise<SSRNode>;
 
 export interface SSROptions {
+	app_template_contains_nonce: boolean;
 	csp: ValidatedConfig['kit']['csp'];
-	csrf: {
-		check_origin: boolean;
-	};
-	dev: boolean;
+	csrf_check_origin: boolean;
 	embedded: boolean;
-	handle_error(error: Error & { frame?: string }, event: RequestEvent): MaybePromise<App.Error>;
+	env_public_prefix: string;
 	hooks: ServerHooks;
-	manifest: SSRManifest;
-	paths: {
-		base: string;
-		assets: string;
-	};
-	public_env: Record<string, string>;
-	read(file: string): Buffer;
 	root: SSRComponent['default'];
 	service_worker: boolean;
-	app_template({
-		head,
-		body,
-		assets,
-		nonce
-	}: {
-		head: string;
-		body: string;
-		assets: string;
-		nonce: string;
-	}): string;
-	app_template_contains_nonce: boolean;
-	error_template({ message, status }: { message: string; status: number }): string;
-	version: string;
+	templates: {
+		app(values: { head: string; body: string; assets: string; nonce: string }): string;
+		error(values: { message: string; status: number }): string;
+	};
 }
 
 export interface SSRErrorPage {
@@ -362,6 +346,7 @@ export interface SSRState {
 	 * prerender option is inherited by the endpoint, unless overridden
 	 */
 	prerender_default?: PrerenderOption;
+	read?: (file: string) => Buffer;
 }
 
 export type StrictBody = string | ArrayBufferView;
@@ -383,10 +368,8 @@ export * from './private';
 
 declare global {
 	const __SVELTEKIT_ADAPTER_NAME__: string;
-	const __SVELTEKIT_APP_VERSION__: string;
 	const __SVELTEKIT_APP_VERSION_FILE__: string;
 	const __SVELTEKIT_APP_VERSION_POLL_INTERVAL__: number;
-	const __SVELTEKIT_BROWSER__: boolean;
 	const __SVELTEKIT_DEV__: boolean;
 	const __SVELTEKIT_EMBEDDED__: boolean;
 	var Bun: object;

package/src/runtime/env.js

@@ -1,12 +0,0 @@
-export let building = false;
-export let version = '';
-
-/** @param {boolean} value */
-export function set_building(value) {
-	building = value;
-}
-
-/** @param {string} value */
-export function set_version(value) {
-	version = value;
-}

package/src/runtime/paths.js

@@ -1,11 +0,0 @@
-/** @type {string} */
-export let base = '';
-
-/** @type {string} */
-export let assets = '';
-
-/** @param {{ base: string, assets: string }} paths */
-export function set_paths(paths) {
-	base = paths.base;
-	assets = paths.assets || base;
-}