@sveltejs/kit 1.0.0-next.278 → 1.0.0-next.281

package/assets/client/start.js

@@ -69,8 +69,8 @@ class Router {
 	/**
 	 * @param {{
 	 *    base: string;
-	 *    routes: import('types/internal').CSRRoute[];
-	 *    trailing_slash: import('types/internal').TrailingSlash;
+	 *    routes: import('types').CSRRoute[];
+	 *    trailing_slash: import('types').TrailingSlash;
 	 *    renderer: import('./renderer').Renderer
 	 * }} opts
 	 */
@@ -481,7 +481,7 @@ function coalesce_to_error(err) {
 
 /**
  * Hash using djb2
- * @param {import('types/hooks').StrictBody} value
+ * @param {import('types').StrictBody} value
  */
 function hash(value) {
 	let hash = 5381;
@@ -497,8 +497,8 @@ function hash(value) {
 }
 
 /**
- * @param {import('types/page').LoadOutput} loaded
- * @returns {import('types/internal').NormalizedLoadOutput}
+ * @param {import('types').LoadOutput} loaded
+ * @returns {import('types').NormalizedLoadOutput}
  */
 function normalize(loaded) {
 	const has_error_status =
@@ -558,11 +558,11 @@ function normalize(loaded) {
 		);
 	}
 
-	return /** @type {import('types/internal').NormalizedLoadOutput} */ (loaded);
+	return /** @type {import('types').NormalizedLoadOutput} */ (loaded);
 }
 
 /**
- * @typedef {import('types/internal').CSRComponent} CSRComponent
+ * @typedef {import('types').CSRComponent} CSRComponent
  * @typedef {{ from: URL; to: URL }} Navigating
  */
 
@@ -1208,7 +1208,7 @@ class Renderer {
 		if (module.load) {
 			const { started } = this;
 
-			/** @type {import('types/page').LoadInput | import('types/page').ErrorLoadInput} */
+			/** @type {import('types').LoadInput | import('types').ErrorLoadInput} */
 			const load_input = {
 				params: uses_params,
 				props: props || {},
@@ -1243,8 +1243,8 @@ class Renderer {
 			}
 
 			if (error) {
-				/** @type {import('types/page').ErrorLoadInput} */ (load_input).status = status;
-				/** @type {import('types/page').ErrorLoadInput} */ (load_input).error = error;
+				/** @type {import('types').ErrorLoadInput} */ (load_input).status = status;
+				/** @type {import('types').ErrorLoadInput} */ (load_input).error = error;
 			}
 
 			const loaded = await module.load.call(null, load_input);
@@ -1519,11 +1519,11 @@ class Renderer {
  *   session: any;
  *   route: boolean;
  *   spa: boolean;
- *   trailing_slash: import('types/internal').TrailingSlash;
+ *   trailing_slash: import('types').TrailingSlash;
  *   hydrate: {
  *     status: number;
  *     error: Error;
- *     nodes: Array<Promise<import('types/internal').CSRComponent>>;
+ *     nodes: Array<Promise<import('types').CSRComponent>>;
  *     params: Record<string, string>;
  *   };
  * }} opts

package/assets/server/index.js

@@ -1,4 +1,4 @@
-/** @param {Partial<import('types/helper').ResponseHeaders> | undefined} object */
+/** @param {Partial<import('types').ResponseHeaders> | undefined} object */
 function to_headers(object) {
 	const headers = new Headers();
 
@@ -22,7 +22,7 @@ function to_headers(object) {
 
 /**
  * Hash using djb2
- * @param {import('types/hooks').StrictBody} value
+ * @param {import('types').StrictBody} value
  */
 function hash(value) {
 	let hash = 5381;
@@ -89,7 +89,7 @@ function is_pojo(body) {
 	return true;
 }
 /**
- * @param {import('types/hooks').RequestEvent} event
+ * @param {import('types').RequestEvent} event
  * @returns string
  */
 function normalize_request_method(event) {
@@ -130,14 +130,14 @@ function is_text(content_type) {
 }
 
 /**
- * @param {import('types/hooks').RequestEvent} event
- * @param {{ [method: string]: import('types/endpoint').RequestHandler }} mod
+ * @param {import('types').RequestEvent} event
+ * @param {{ [method: string]: import('types').RequestHandler }} mod
  * @returns {Promise<Response | undefined>}
  */
 async function render_endpoint(event, mod) {
 	const method = normalize_request_method(event);
 
-	/** @type {import('types/endpoint').RequestHandler} */
+	/** @type {import('types').RequestHandler} */
 	let handler = mod[method];
 
 	if (!handler && method === 'head') {
@@ -172,14 +172,14 @@ async function render_endpoint(event, mod) {
 		);
 	}
 
-	/** @type {import('types/hooks').StrictBody} */
+	/** @type {import('types').StrictBody} */
 	let normalized_body;
 
 	if (is_pojo(body) && (!type || type.startsWith('application/json'))) {
 		headers.set('content-type', 'application/json; charset=utf-8');
 		normalized_body = JSON.stringify(body);
 	} else {
-		normalized_body = /** @type {import('types/hooks').StrictBody} */ (body);
+		normalized_body = /** @type {import('types').StrictBody} */ (body);
 	}
 
 	if (
@@ -515,7 +515,7 @@ const escape_json_in_html_regex = new RegExp(
 
 /**
  * Escape a JSONValue that's going to be embedded in a `<script>` tag
- * @param {import("@sveltejs/kit/types/helper").JSONValue} val
+ * @param {import('types').JSONValue} val
  */
 function escape_json_in_html(val) {
 	return JSON.stringify(val).replace(
@@ -525,55 +525,50 @@ function escape_json_in_html(val) {
 }
 
 /**
- * @param str {string} string to escape
- * @param dict {Record<string, string>} dictionary of character replacements
- * @param unicode_encoder {function(number): string} encoder to use for high unicode characters
- * @returns {string}
+ * When inside a double-quoted attribute value, only `&` and `"` hold special meaning.
+ * @see https://html.spec.whatwg.org/multipage/parsing.html#attribute-value-(double-quoted)-state
+ * @type {Record<string, string>}
  */
-function escape(str, dict, unicode_encoder) {
-	let result = '';
-
-	for (let i = 0; i < str.length; i += 1) {
-		const char = str.charAt(i);
-		const code = char.charCodeAt(0);
-
-		if (char in dict) {
-			result += dict[char];
-		} else if (code >= 0xd800 && code <= 0xdfff) {
-			const next = str.charCodeAt(i + 1);
-
-			// If this is the beginning of a [high, low] surrogate pair,
-			// add the next two characters, otherwise escape
-			if (code <= 0xdbff && next >= 0xdc00 && next <= 0xdfff) {
-				result += char + str[++i];
-			} else {
-				result += unicode_encoder(code);
-			}
-		} else {
-			result += char;
-		}
-	}
-
-	return result;
-}
-
-/** @type {Record<string, string>} */
 const escape_html_attr_dict = {
-	'<': '&lt;',
-	'>': '&gt;',
+	'&': '&amp;',
 	'"': '&quot;'
 };
 
+const escape_html_attr_regex = new RegExp(
+	// special characters
+	`[${Object.keys(escape_html_attr_dict).join('')}]|` +
+		// high surrogate without paired low surrogate
+		'[\\ud800-\\udbff](?![\\udc00-\\udfff])|' +
+		// a valid surrogate pair, the only match with 2 code units
+		// we match it so that we can match unpaired low surrogates in the same pass
+		// TODO: use lookbehind assertions once they are widely supported: (?<![\ud800-udbff])[\udc00-\udfff]
+		'[\\ud800-\\udbff][\\udc00-\\udfff]|' +
+		// unpaired low surrogate (see previous match)
+		'[\\udc00-\\udfff]',
+	'g'
+);
+
 /**
- * use for escaping string values to be used html attributes on the page
- * e.g.
- * <script data-url="here">
+ * Formats a string to be used as an attribute's value in raw HTML.
+ *
+ * It escapes unpaired surrogates (which are allowed in js strings but invalid in HTML), escapes
+ * characters that are special in attributes, and surrounds the whole string in double-quotes.
  *
  * @param {string} str
- * @returns string escaped string
+ * @returns {string} Escaped string surrounded by double-quotes.
+ * @example const html = `<tag data-value=${escape_html_attr('value')}>...</tag>`;
  */
 function escape_html_attr(str) {
-	return '"' + escape(str, escape_html_attr_dict, (code) => `&#${code};`) + '"';
+	const escaped_str = str.replace(escape_html_attr_regex, (match) => {
+		if (match.length === 2) {
+			// valid surrogate pair
+			return match;
+		}
+
+		return escape_html_attr_dict[match] ?? `&#${match.charCodeAt(0)};`;
+	});
+
+	return `"${escaped_str}"`;
 }
 
 const s = JSON.stringify;
@@ -887,19 +882,19 @@ class Csp {
 	/** @type {boolean} */
 	#style_needs_csp;
 
-	/** @type {import('types/csp').CspDirectives} */
+	/** @type {import('types').CspDirectives} */
 	#directives;
 
-	/** @type {import('types/csp').Source[]} */
+	/** @type {import('types').Csp.Source[]} */
 	#script_src;
 
-	/** @type {import('types/csp').Source[]} */
+	/** @type {import('types').Csp.Source[]} */
 	#style_src;
 
 	/**
 	 * @param {{
 	 *   mode: string,
-	 *   directives: import('types/csp').CspDirectives
+	 *   directives: import('types').CspDirectives
 	 * }} config
 	 * @param {{
 	 *   dev: boolean;
@@ -1049,15 +1044,15 @@ const updated = {
 /**
  * @param {{
  *   branch: Array<import('./types').Loaded>;
- *   options: import('types/internal').SSROptions;
- *   state: import('types/internal').SSRState;
+ *   options: import('types').SSROptions;
+ *   state: import('types').SSRState;
  *   $session: any;
  *   page_config: { hydrate: boolean, router: boolean };
  *   status: number;
  *   error?: Error;
  *   url: URL;
  *   params: Record<string, string>;
- *   resolve_opts: import('types/hooks').RequiredResolveOptions;
+ *   resolve_opts: import('types').RequiredResolveOptions;
  *   stuff: Record<string, any>;
  * }} opts
  */
@@ -1331,7 +1326,7 @@ async function render_response({
 	const assets =
 		options.paths.assets || (segments.length > 0 ? segments.map(() => '..').join('/') : '.');
 
-	const html = resolve_opts.transformPage({
+	const html = await resolve_opts.transformPage({
 		html: options.template({ head, body, assets, nonce: /** @type {string} */ (csp.nonce) })
 	});
 
@@ -1391,8 +1386,8 @@ function serialize_error(error) {
 }
 
 /**
- * @param {import('types/page').LoadOutput} loaded
- * @returns {import('types/internal').NormalizedLoadOutput}
+ * @param {import('types').LoadOutput} loaded
+ * @returns {import('types').NormalizedLoadOutput}
  */
 function normalize(loaded) {
 	const has_error_status =
@@ -1452,7 +1447,7 @@ function normalize(loaded) {
 		);
 	}
 
-	return /** @type {import('types/internal').NormalizedLoadOutput} */ (loaded);
+	return /** @type {import('types').NormalizedLoadOutput} */ (loaded);
 }
 
 const absolute = /^([a-z]+:)?\/?\//;
@@ -1512,13 +1507,13 @@ function normalize_path(path, trailing_slash) {
 
 /**
  * @param {{
- *   event: import('types/hooks').RequestEvent;
- *   options: import('types/internal').SSROptions;
- *   state: import('types/internal').SSRState;
- *   route: import('types/internal').SSRPage | null;
+ *   event: import('types').RequestEvent;
+ *   options: import('types').SSROptions;
+ *   state: import('types').SSRState;
+ *   route: import('types').SSRPage | null;
  *   url: URL;
  *   params: Record<string, string>;
- *   node: import('types/internal').SSRNode;
+ *   node: import('types').SSRNode;
  *   $session: any;
  *   stuff: Record<string, any>;
  *   is_error: boolean;
@@ -1561,13 +1556,13 @@ async function load_node({
 	 */
 	let set_cookie_headers = [];
 
-	/** @type {import('types/helper').Either<import('types/endpoint').Fallthrough, import('types/page').LoadOutput>} */
+	/** @type {import('types').Either<import('types').Fallthrough, import('types').LoadOutput>} */
 	let loaded;
 
-	/** @type {import('types/endpoint').ShadowData} */
+	/** @type {import('types').ShadowData} */
 	const shadow = is_leaf
 		? await load_shadow_data(
-				/** @type {import('types/internal').SSRPage} */ (route),
+				/** @type {import('types').SSRPage} */ (route),
 				event,
 				options,
 				!!state.prerender
@@ -1591,7 +1586,7 @@ async function load_node({
 			redirect: shadow.redirect
 		};
 	} else if (module.load) {
-		/** @type {import('types/page').LoadInput | import('types/page').ErrorLoadInput} */
+		/** @type {import('types').LoadInput | import('types').ErrorLoadInput} */
 		const load_input = {
 			url: state.prerender ? create_prerendering_url_proxy(url) : url,
 			params,
@@ -1649,7 +1644,7 @@ async function load_node({
 				/** @type {Response} */
 				let response;
 
-				/** @type {import('types/internal').PrerenderDependency} */
+				/** @type {import('types').PrerenderDependency} */
 				let dependency;
 
 				// handle fetch requests for static assets. e.g. prebaked data, etc.
@@ -1744,7 +1739,7 @@ async function load_node({
 						async function text() {
 							const body = await response.text();
 
-							/** @type {import('types/helper').ResponseHeaders} */
+							/** @type {import('types').ResponseHeaders} */
 							const headers = {};
 							for (const [key, value] of response.headers) {
 								if (key === 'set-cookie') {
@@ -1826,8 +1821,8 @@ async function load_node({
 		}
 
 		if (is_error) {
-			/** @type {import('types/page').ErrorLoadInput} */ (load_input).status = status;
-			/** @type {import('types/page').ErrorLoadInput} */ (load_input).error = error;
+			/** @type {import('types').ErrorLoadInput} */ (load_input).status = status;
+			/** @type {import('types').ErrorLoadInput} */ (load_input).error = error;
 		}
 
 		loaded = await module.load.call(null, load_input);
@@ -1872,11 +1867,11 @@ async function load_node({
 
 /**
  *
- * @param {import('types/internal').SSRPage} route
- * @param {import('types/hooks').RequestEvent} event
- * @param {import('types/internal').SSROptions} options
+ * @param {import('types').SSRPage} route
+ * @param {import('types').RequestEvent} event
+ * @param {import('types').SSROptions} options
  * @param {boolean} prerender
- * @returns {Promise<import('types/endpoint').ShadowData>}
+ * @returns {Promise<import('types').ShadowData>}
  */
 async function load_shadow_data(route, event, options, prerender) {
 	if (!route.shadow) return {};
@@ -1899,7 +1894,7 @@ async function load_shadow_data(route, event, options, prerender) {
 			};
 		}
 
-		/** @type {import('types/endpoint').ShadowData} */
+		/** @type {import('types').ShadowData} */
 		const data = {
 			status: 200,
 			cookies: [],
@@ -1969,7 +1964,7 @@ async function load_shadow_data(route, event, options, prerender) {
 
 /**
  * @param {string[]} target
- * @param {Partial<import('types/helper').ResponseHeaders>} headers
+ * @param {Partial<import('types').ResponseHeaders>} headers
  */
 function add_cookies(target, headers) {
 	const cookies = headers['set-cookie'];
@@ -1983,7 +1978,7 @@ function add_cookies(target, headers) {
 }
 
 /**
- * @param {import('types/endpoint').ShadowEndpointOutput} result
+ * @param {import('types').ShadowEndpointOutput} result
  */
 function validate_shadow_output(result) {
 	const { status = 200, body = {} } = result;
@@ -2008,19 +2003,19 @@ function validate_shadow_output(result) {
 
 /**
  * @typedef {import('./types.js').Loaded} Loaded
- * @typedef {import('types/internal').SSROptions} SSROptions
- * @typedef {import('types/internal').SSRState} SSRState
+ * @typedef {import('types').SSROptions} SSROptions
+ * @typedef {import('types').SSRState} SSRState
  */
 
 /**
  * @param {{
- *   event: import('types/hooks').RequestEvent;
+ *   event: import('types').RequestEvent;
  *   options: SSROptions;
  *   state: SSRState;
  *   $session: any;
  *   status: number;
  *   error: Error;
- *   resolve_opts: import('types/hooks').RequiredResolveOptions;
+ *   resolve_opts: import('types').RequiredResolveOptions;
  * }} opts
  */
 async function respond_with_error({
@@ -2102,19 +2097,19 @@ async function respond_with_error({
 
 /**
  * @typedef {import('./types.js').Loaded} Loaded
- * @typedef {import('types/internal').SSRNode} SSRNode
- * @typedef {import('types/internal').SSROptions} SSROptions
- * @typedef {import('types/internal').SSRState} SSRState
+ * @typedef {import('types').SSRNode} SSRNode
+ * @typedef {import('types').SSROptions} SSROptions
+ * @typedef {import('types').SSRState} SSRState
  */
 
 /**
  * @param {{
- *   event: import('types/hooks').RequestEvent;
+ *   event: import('types').RequestEvent;
  *   options: SSROptions;
  *   state: SSRState;
  *   $session: any;
- *   resolve_opts: import('types/hooks').RequiredResolveOptions;
- *   route: import('types/internal').SSRPage;
+ *   resolve_opts: import('types').RequiredResolveOptions;
+ *   route: import('types').SSRPage;
  *   params: Record<string, string>;
  * }} opts
  * @returns {Promise<Response | undefined>}
@@ -2337,7 +2332,7 @@ async function respond$1(opts) {
 }
 
 /**
- * @param {import('types/internal').SSRComponent} leaf
+ * @param {import('types').SSRComponent} leaf
  * @param {SSROptions} options
  */
 function get_page_config(leaf, options) {
@@ -2368,11 +2363,11 @@ function with_cookies(response, set_cookie_headers) {
 }
 
 /**
- * @param {import('types/hooks').RequestEvent} event
- * @param {import('types/internal').SSRPage} route
- * @param {import('types/internal').SSROptions} options
- * @param {import('types/internal').SSRState} state
- * @param {import('types/hooks').RequiredResolveOptions} resolve_opts
+ * @param {import('types').RequestEvent} event
+ * @param {import('types').SSRPage} route
+ * @param {import('types').SSROptions} options
+ * @param {import('types').SSRState} state
+ * @param {import('types').RequiredResolveOptions} resolve_opts
  * @returns {Promise<Response | undefined>}
  */
 async function render_page(event, route, options, state, resolve_opts) {
@@ -2478,7 +2473,7 @@ const DATA_SUFFIX = '/__data.json';
 /** @param {{ html: string }} opts */
 const default_transform = ({ html }) => html;
 
-/** @type {import('types/internal').Respond} */
+/** @type {import('types').Respond} */
 async function respond(request, options, state = {}) {
 	const url = new URL(request.url);
 
@@ -2518,7 +2513,7 @@ async function respond(request, options, state = {}) {
 		}
 	}
 
-	/** @type {import('types/hooks').RequestEvent} */
+	/** @type {import('types').RequestEvent} */
 	const event = {
 		request,
 		url,
@@ -2561,7 +2556,7 @@ async function respond(request, options, state = {}) {
 		rawBody: body_getter
 	});
 
-	/** @type {import('types/hooks').RequiredResolveOptions} */
+	/** @type {import('types').RequiredResolveOptions} */
 	let resolve_opts = {
 		ssr: true,
 		transformPage: default_transform

package/dist/chunks/amp_hook.js

@@ -1,7 +1,7 @@
 /** @type {import('amphtml-validator').Validator} */
 const amp = await (await import('./index8.js').then(function (n) { return n.i; })).getInstance();
 
-/** @type {import('types/hooks').Handle} */
+/** @type {import('types').Handle} */
 async function handle({ event, resolve }) {
 	const response = await resolve(event);
 	if (response.headers.get('content-type') !== 'text/html') {

package/dist/chunks/index.js

@@ -24,12 +24,12 @@ import 'node:url';
 import 'stream';
 
 /**
- * @param {import('types/config').ValidatedConfig} config
+ * @param {import('types').ValidatedConfig} config
  * @param {string} cwd
  * @returns {Promise<import('vite').Plugin>}
  */
 async function create_plugin(config, cwd) {
-	/** @type {import('types/hooks').Handle} */
+	/** @type {import('types').Handle} */
 	let amp;
 
 	if (config.kit.amp) {
@@ -39,7 +39,7 @@ async function create_plugin(config, cwd) {
 
 	process.env.VITE_SVELTEKIT_APP_VERSION_POLL_INTERVAL = '0';
 
-	/** @type {import('types/internal').Respond} */
+	/** @type {import('types').Respond} */
 	const respond = (await import(`${runtime}/server/index.js`)).respond;
 
 	return {
@@ -48,7 +48,7 @@ async function create_plugin(config, cwd) {
 		configureServer(vite) {
 			__fetch_polyfill();
 
-			/** @type {import('types/app').SSRManifest} */
+			/** @type {import('types').SSRManifest} */
 			let manifest;
 
 			function update_manifest() {
@@ -70,7 +70,7 @@ async function create_plugin(config, cwd) {
 							return async () => {
 								const url = id.startsWith('..') ? `/@fs${path__default.posix.resolve(id)}` : `/${id}`;
 
-								const module = /** @type {import('types/internal').SSRComponent} */ (
+								const module = /** @type {import('types').SSRComponent} */ (
 									await vite.ssrLoadModule(url)
 								);
 								const node = await vite.moduleGraph.getModuleByUrl(url);
@@ -183,14 +183,14 @@ async function create_plugin(config, cwd) {
 
 						if (!decoded.startsWith(config.kit.paths.base)) return not_found(res);
 
-						/** @type {Partial<import('types/internal').Hooks>} */
+						/** @type {Partial<import('types').Hooks>} */
 						const user_hooks = resolve_entry(config.kit.files.hooks)
 							? await vite.ssrLoadModule(`/${config.kit.files.hooks}`)
 							: {};
 
 						const handle = user_hooks.handle || (({ event, resolve }) => resolve(event));
 
-						/** @type {import('types/internal').Hooks} */
+						/** @type {import('types').Hooks} */
 						const hooks = {
 							// @ts-expect-error this picks up types that belong to the tests
 							getSession: user_hooks.getSession || (() => ({})),
@@ -375,9 +375,9 @@ function find_deps(node, deps) {
  *   port: number,
  *   host?: string,
  *   https: boolean,
- *   config: import('types/config').ValidatedConfig
+ *   config: import('types').ValidatedConfig
  * }} Options
- * @typedef {import('types/internal').SSRComponent} SSRComponent
+ * @typedef {import('types').SSRComponent} SSRComponent
  */
 
 /** @param {Options} opts */

package/dist/chunks/index2.js

@@ -100,7 +100,7 @@ function write_if_changed(file, code) {
 	}
 }
 
-/** @typedef {import('types/internal').ManifestData} ManifestData */
+/** @typedef {import('types').ManifestData} ManifestData */
 
 /**
  * @param {{
@@ -400,11 +400,11 @@ const specials = new Set(['__layout', '__layout.reset', '__error']);
 
 /**
  * @param {{
- *   config: import('types/config').ValidatedConfig;
+ *   config: import('types').ValidatedConfig;
  *   fallback?: string;
  *   cwd?: string;
  * }} opts
- * @returns {import('types/internal').ManifestData}
+ * @returns {import('types').ManifestData}
  */
 function create_manifest_data({
 	config,
@@ -423,7 +423,7 @@ function create_manifest_data({
 	/** @type {string[]} */
 	const components = [];
 
-	/** @type {import('types/internal').RouteData[]} */
+	/** @type {import('types').RouteData[]} */
 	const routes = [];
 
 	const default_layout = posixify(path__default.relative(cwd, `${fallback}/layout.svelte`));
@@ -806,10 +806,10 @@ function get_pattern(segments, add_trailing_slash) {
 
 /**
  * @param {{
- *  config: import('types/config').ValidatedConfig;
+ *  config: import('types').ValidatedConfig;
  * 	dir: string;
  * 	path: string;
- * 	files?: import('types/internal').Asset[]
+ * 	files?: import('types').Asset[]
  * }} args
  */
 function list_files({ config, dir, path, files = [] }) {