@sveltejs/kit 1.0.0-next.445 → 1.0.0-next.448

package/src/runtime/server/index.js

@@ -2,20 +2,16 @@ import { render_endpoint } from './endpoint.js';
 import { render_page } from './page/index.js';
 import { render_response } from './page/render.js';
 import { respond_with_error } from './page/respond_with_error.js';
-import { coalesce_to_error, normalize_error } from '../../utils/error.js';
-import { serialize_error, GENERIC_ERROR, error_to_pojo } from './utils.js';
+import { coalesce_to_error } from '../../utils/error.js';
+import { serialize_error, GENERIC_ERROR } from './utils.js';
 import { decode_params, disable_search, normalize_path } from '../../utils/url.js';
 import { exec } from '../../utils/routing.js';
 import { negotiate } from '../../utils/http.js';
-import { HttpError, Redirect } from '../control.js';
-import { load_server_data } from './page/load_data.js';
-import { json } from '../../exports/index.js';
-import { once } from '../../utils/functions.js';
+import { render_data } from './data/index.js';
+import { DATA_SUFFIX } from '../../constants.js';
 
 /* global __SVELTEKIT_ADAPTER_NAME__ */
 
-const DATA_SUFFIX = '/__data.json';
-
 /** @param {{ html: string }} opts */
 const default_transform = ({ html }) => html;
 
@@ -69,12 +65,7 @@ export async function respond(request, options, state) {
 	}
 
 	const is_data_request = decoded.endsWith(DATA_SUFFIX);
-
-	if (is_data_request) {
-		const data_suffix_length = DATA_SUFFIX.length - (options.trailing_slash === 'always' ? 1 : 0);
-		decoded = decoded.slice(0, -data_suffix_length) || '/';
-		url = new URL(url.origin + url.pathname.slice(0, -data_suffix_length) + url.search);
-	}
+	if (is_data_request) decoded = decoded.slice(0, -DATA_SUFFIX.length);
 
 	if (!state.prerendering?.fallback) {
 		const matchers = await options.manifest._.matchers();
@@ -92,26 +83,19 @@ export async function respond(request, options, state) {
 		}
 	}
 
-	if (route) {
-		if (route.page) {
-			const normalized = normalize_path(url.pathname, options.trailing_slash);
-
-			if (normalized !== url.pathname && !state.prerendering?.fallback) {
-				return new Response(undefined, {
-					status: 301,
-					headers: {
-						'x-sveltekit-normalize': '1',
-						location:
-							// ensure paths starting with '//' are not treated as protocol-relative
-							(normalized.startsWith('//') ? url.origin + normalized : normalized) +
-							(url.search === '?' ? '' : url.search)
-					}
-				});
-			}
-		} else if (is_data_request) {
-			// requesting /__data.json should fail for a standalone endpoint
+	if (route?.page && !is_data_request) {
+		const normalized = normalize_path(url.pathname, options.trailing_slash);
+
+		if (normalized !== url.pathname && !state.prerendering?.fallback) {
 			return new Response(undefined, {
-				status: 404
+				status: 301,
+				headers: {
+					'x-sveltekit-normalize': '1',
+					location:
+						// ensure paths starting with '//' are not treated as protocol-relative
+						(normalized.startsWith('//') ? url.origin + normalized : normalized) +
+						(url.search === '?' ? '' : url.search)
+				}
 			});
 		}
 	}
@@ -250,116 +234,9 @@ export async function respond(request, options, state) {
 				if (route) {
 					/** @type {Response} */
 					let response;
-					if (is_data_request && route.page) {
-						try {
-							const node_ids = [...route.page.layouts, route.page.leaf];
-
-							const invalidated =
-								request.headers.get('x-sveltekit-invalidated')?.split(',').map(Boolean) ??
-								node_ids.map(() => true);
-
-							let aborted = false;
-
-							const functions = node_ids.map((n, i) => {
-								return once(async () => {
-									try {
-										if (aborted) {
-											return /** @type {import('types').ServerDataSkippedNode} */ ({
-												type: 'skip'
-											});
-										}
-
-										// == because it could be undefined (in dev) or null (in build, because of JSON.stringify)
-										const node = n == undefined ? n : await options.manifest._.nodes[n]();
-										return load_server_data({
-											dev: options.dev,
-											event,
-											state,
-											node,
-											parent: async () => {
-												/** @type {Record<string, any>} */
-												const data = {};
-												for (let j = 0; j < i; j += 1) {
-													const parent = /** @type {import('types').ServerDataNode | null} */ (
-														await functions[j]()
-													);
-
-													if (parent) {
-														Object.assign(data, parent.data);
-													}
-												}
-												return data;
-											}
-										});
-									} catch (e) {
-										aborted = true;
-										throw e;
-									}
-								});
-							});
 
-							const promises = functions.map(async (fn, i) => {
-								if (!invalidated[i]) {
-									return /** @type {import('types').ServerDataSkippedNode} */ ({
-										type: 'skip'
-									});
-								}
-
-								return fn();
-							});
-
-							let length = promises.length;
-							const nodes = await Promise.all(
-								promises.map((p, i) =>
-									p.catch((e) => {
-										const error = normalize_error(e);
-
-										if (error instanceof Redirect) {
-											throw error;
-										}
-
-										// Math.min because array isn't guaranteed to resolve in order
-										length = Math.min(length, i + 1);
-
-										if (error instanceof HttpError) {
-											return /** @type {import('types').ServerErrorNode} */ ({
-												type: 'error',
-												httperror: { ...error }
-											});
-										}
-
-										options.handle_error(error, event);
-
-										return /** @type {import('types').ServerErrorNode} */ ({
-											type: 'error',
-											error: error_to_pojo(error, options.get_stack)
-										});
-									})
-								)
-							);
-
-							/** @type {import('types').ServerData} */
-							const server_data = {
-								type: 'data',
-								nodes: nodes.slice(0, length)
-							};
-
-							response = json(server_data);
-						} catch (e) {
-							const error = normalize_error(e);
-
-							if (error instanceof Redirect) {
-								/** @type {import('types').ServerData} */
-								const server_data = {
-									type: 'redirect',
-									location: error.location
-								};
-
-								response = json(server_data);
-							} else {
-								response = json(error_to_pojo(error, options.get_stack), { status: 500 });
-							}
-						}
+					if (is_data_request) {
+						response = await render_data(event, route, options, state);
 					} else if (route.page) {
 						response = await render_page(event, route, route.page, options, state, resolve_opts);
 					} else if (route.endpoint) {
@@ -371,7 +248,7 @@ export async function respond(request, options, state) {
 					}
 
 					if (!is_data_request) {
-						// we only want to set cookies on __data.json requests, we don't
+						// we only want to set cookies on __data.js requests, we don't
 						// want to cache stuff erroneously etc
 						for (const key in headers) {
 							const value = headers[key];

package/src/runtime/server/page/index.js

@@ -1,3 +1,4 @@
+import { devalue } from 'devalue';
 import { negotiate } from '../../../utils/http.js';
 import { render_response } from './render.js';
 import { respond_with_error } from './respond_with_error.js';
@@ -8,6 +9,7 @@ import { error, json } from '../../../exports/index.js';
 import { compact } from '../../../utils/array.js';
 import { normalize_error } from '../../../utils/error.js';
 import { load_data, load_server_data } from './load_data.js';
+import { DATA_SUFFIX } from '../../../constants.js';
 
 /**
  * @typedef {import('./types.js').Loaded} Loaded
@@ -102,7 +104,7 @@ export async function render_page(event, route, page, options, state, resolve_op
 		}
 
 		const should_prerender_data = nodes.some((node) => node?.server);
-		const data_pathname = `${event.url.pathname.replace(/\/$/, '')}/__data.json`;
+		const data_pathname = event.url.pathname.replace(/\/$/, '') + DATA_SUFFIX;
 
 		// it's crucial that we do this before returning the non-SSR response, otherwise
 		// SvelteKit will erroneously believe that the path has been prerendered,
@@ -166,7 +168,6 @@ export async function render_page(event, route, page, options, state, resolve_op
 					}
 
 					return await load_server_data({
-						dev: options.dev,
 						event,
 						state,
 						node,
@@ -231,12 +232,14 @@ export async function render_page(event, route, page, options, state, resolve_op
 
 					if (error instanceof Redirect) {
 						if (state.prerendering && should_prerender_data) {
+							const body = `window.__sveltekit_data = ${JSON.stringify({
+								type: 'redirect',
+								location: error.location
+							})}`;
+
 							state.prerendering.dependencies.set(data_pathname, {
-								response: new Response(undefined),
-								body: JSON.stringify({
-									type: 'redirect',
-									location: error.location
-								})
+								response: new Response(body),
+								body
 							});
 						}
 
@@ -294,12 +297,14 @@ export async function render_page(event, route, page, options, state, resolve_op
 		}
 
 		if (state.prerendering && should_prerender_data) {
+			const body = `window.__sveltekit_data = ${devalue({
+				type: 'data',
+				nodes: branch.map((branch_node) => branch_node?.server_data)
+			})}`;
+
 			state.prerendering.dependencies.set(data_pathname, {
-				response: new Response(undefined),
-				body: JSON.stringify({
-					type: 'data',
-					nodes: branch.map((branch_node) => branch_node?.server_data)
-				})
+				response: new Response(body),
+				body
 			});
 		}
 

package/src/runtime/server/page/load_data.js

@@ -3,7 +3,6 @@ import { disable_search, make_trackable } from '../../../utils/url.js';
 /**
  * Calls the user's `load` function.
  * @param {{
- *   dev: boolean;
  *   event: import('types').RequestEvent;
  *   state: import('types').SSRState;
  *   node: import('types').SSRNode | undefined;
@@ -11,7 +10,7 @@ import { disable_search, make_trackable } from '../../../utils/url.js';
  * }} opts
  * @returns {Promise<import('types').ServerDataNode | null>}
  */
-export async function load_server_data({ dev, event, state, node, parent }) {
+export async function load_server_data({ event, state, node, parent }) {
 	if (!node?.server) return null;
 
 	const uses = {
@@ -53,10 +52,6 @@ export async function load_server_data({ dev, event, state, node, parent }) {
 
 	const data = result ? await unwrap_promises(result) : null;
 
-	if (dev) {
-		check_serializability(data, /** @type {string} */ (node.server_id), 'data');
-	}
-
 	return {
 		type: 'data',
 		data,
@@ -127,42 +122,3 @@ async function unwrap_promises(object) {
 
 	return unwrapped;
 }
-
-/**
- * Check that the data can safely be serialized to JSON
- * @param {any} value
- * @param {string} id
- * @param {string} path
- */
-function check_serializability(value, id, path) {
-	const type = typeof value;
-
-	if (type === 'string' || type === 'boolean' || type === 'number' || type === 'undefined') {
-		// primitives are fine
-		return;
-	}
-
-	if (type === 'object') {
-		// nulls are fine...
-		if (!value) return;
-
-		// ...so are plain arrays...
-		if (Array.isArray(value)) {
-			value.forEach((child, i) => {
-				check_serializability(child, id, `${path}[${i}]`);
-			});
-			return;
-		}
-
-		// ...and objects
-		const tag = Object.prototype.toString.call(value);
-		if (tag === '[object Object]') {
-			for (const key in value) {
-				check_serializability(value[key], id, `${path}.${key}`);
-			}
-			return;
-		}
-	}
-
-	throw new Error(`${path} returned from 'load' in ${id} cannot be serialized as JSON`);
-}

package/src/runtime/server/page/render.js

@@ -1,4 +1,4 @@
-import devalue from 'devalue';
+import { devalue } from 'devalue';
 import { readable, writable } from 'svelte/store';
 import * as cookie from 'cookie';
 import { hash } from '../../hash.js';
@@ -174,6 +174,31 @@ export async function render_response({
 	/** @param {string} path */
 	const prefixed = (path) => (path.startsWith('/') ? path : `${assets}/${path}`);
 
+	const serialized = { data: '', errors: 'null' };
+
+	try {
+		serialized.data = devalue(branch.map(({ server_data }) => server_data));
+	} catch (e) {
+		// If we're here, the data could not be serialized with devalue
+		// TODO if we wanted to get super fancy we could track down the origin of the `load`
+		// function, but it would mean passing more stuff around than we currently do
+		const error = /** @type {any} */ (e);
+		const match = /\[(\d+)\]\.data\.(.+)/.exec(error.path);
+		if (match) throw new Error(`${error.message} (data.${match[2]})`);
+		throw error;
+	}
+
+	if (validation_errors) {
+		try {
+			serialized.errors = devalue(validation_errors);
+		} catch (e) {
+			// If we're here, the data could not be serialized with devalue
+			const error = /** @type {any} */ (e);
+			if (error.path) throw new Error(`${error.message} (errors.${error.path})`);
+			throw error;
+		}
+	}
+
 	// prettier-ignore
 	const init_app = `
 		import { set_public_env, start } from ${s(prefixed(entry.file))};
@@ -191,7 +216,9 @@ export async function render_response({
 				error: ${error && serialize_error(error, e => e.stack)},
 				node_ids: [${branch.map(({ node }) => node.index).join(', ')}],
 				params: ${devalue(event.params)},
-				routeId: ${s(event.routeId)}
+				routeId: ${s(event.routeId)},
+				data: ${serialized.data},
+				errors: ${serialized.errors}
 			}` : 'null'}
 		});
 	`;
@@ -272,15 +299,6 @@ export async function render_response({
 			);
 		}
 
-		if (branch.some((node) => node.server_data)) {
-			serialized_data.push(
-				render_json_payload_script(
-					{ type: 'server_data' },
-					branch.map(({ server_data }) => server_data)
-				)
-			);
-		}
-
 		if (validation_errors) {
 			serialized_data.push(
 				render_json_payload_script({ type: 'validation_errors' }, validation_errors)

package/src/runtime/server/page/respond_with_error.js

@@ -35,7 +35,6 @@ export async function respond_with_error({ event, options, state, status, error,
 			const default_layout = await options.manifest._.nodes[0](); // 0 is always the root layout
 
 			const server_data_promise = load_server_data({
-				dev: options.dev,
 				event,
 				state,
 				node: default_layout,

package/src/runtime/server/utils.js

@@ -1,3 +1,4 @@
+import { devalue } from 'devalue';
 import { HttpError } from '../control.js';
 
 /** @param {any} body */
@@ -114,3 +115,23 @@ export function allowed_methods(mod) {
 
 	return allowed;
 }
+
+/** @param {any} data */
+export function data_response(data) {
+	try {
+		return new Response(`window.__sveltekit_data = ${devalue(data)}`, {
+			headers: {
+				'content-type': 'application/javascript'
+			}
+		});
+	} catch (e) {
+		const error = /** @type {any} */ (e);
+		const match = /\[(\d+)\]\.data\.(.+)/.exec(error.path);
+		const message = match ? `${error.message} (data.${match[2]})` : error.message;
+		return new Response(`throw new Error(${JSON.stringify(message)})`, {
+			headers: {
+				'content-type': 'application/javascript'
+			}
+		});
+	}
+}

package/types/internal.d.ts

@@ -133,7 +133,6 @@ export interface PageNode {
 
 export type PayloadScriptAttributes =
 	| { type: 'data'; url: string; body?: string }
-	| { type: 'server_data' }
 	| { type: 'validation_errors' };
 
 export interface PrerenderDependency {

package/src/core/sync/write_types/test/layout/+layout.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		shared: 'shared'
-	};
-}

package/src/core/sync/write_types/test/layout/+layout.server.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		server: 'server'
-	};
-}

package/src/core/sync/write_types/test/layout/+page.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		pageShared: 'pageShared'
-	};
-}

package/src/core/sync/write_types/test/layout/+page.server.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		pageServer: 'pageServer'
-	};
-}

package/src/core/sync/write_types/test/layout/_expected/$types.d.ts

@@ -1,67 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = {};
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type PageServerParentData = EnsureParentData<LayoutServerData>;
-type PageParentData = EnsureParentData<LayoutData>;
-type LayoutParams = RouteParams & {};
-type LayoutServerParentData = EnsureParentData<{}>;
-type LayoutParentData = EnsureParentData<{}>;
-
-export type PageServerLoad<
-	OutputData extends (Partial<App.PageData> & Record<string, any>) | void =
-		| (Partial<App.PageData> & Record<string, any>)
-		| void
-> = Kit.ServerLoad<RouteParams, PageServerParentData, OutputData>;
-export type PageServerLoadEvent = Parameters<PageServerLoad>[0];
-export type Errors = null;
-export type PageServerData = Kit.AwaitedProperties<
-	Awaited<ReturnType<typeof import('../../../../../../../../+page.server.js').load>>
->;
-export type PageLoad<
-	OutputData extends OutputDataShape<PageParentData> = OutputDataShape<PageParentData>
-> = Kit.Load<RouteParams, PageServerData, PageParentData, OutputData>;
-export type PageLoadEvent = Parameters<PageLoad>[0];
-export type PageData = Omit<
-	PageParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+page.js').load>>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+page.js').load>>
-	>;
-export type Action = Kit.Action<RouteParams>;
-export type LayoutServerLoad<
-	OutputData extends (Partial<App.PageData> & Record<string, any>) | void =
-		| (Partial<App.PageData> & Record<string, any>)
-		| void
-> = Kit.ServerLoad<LayoutParams, LayoutServerParentData, OutputData>;
-export type LayoutServerLoadEvent = Parameters<LayoutServerLoad>[0];
-export type LayoutServerData = Kit.AwaitedProperties<
-	Awaited<ReturnType<typeof import('../../../../../../../../+layout.server.js').load>>
->;
-export type LayoutLoad<
-	OutputData extends (Partial<App.PageData> & Record<string, any>) | void =
-		| (Partial<App.PageData> & Record<string, any>)
-		| void
-> = Kit.Load<LayoutParams, LayoutServerData, LayoutParentData, OutputData>;
-export type LayoutLoadEvent = Parameters<LayoutLoad>[0];
-export type LayoutData = Omit<
-	LayoutParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+layout.js').load>>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+layout.js').load>>
-	>;

package/src/core/sync/write_types/test/layout-advanced/(main)/+layout.server.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		main: 'main'
-	};
-}

package/src/core/sync/write_types/test/layout-advanced/(main)/+page.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		page: 'page'
-	};
-}

package/src/core/sync/write_types/test/layout-advanced/(main)/sub/+page.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		sub: 'sub'
-	};
-}

package/src/core/sync/write_types/test/layout-advanced/+layout.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		root: 'root'
-	};
-}

package/src/core/sync/write_types/test/layout-advanced/_expected/$types.d.ts

@@ -1,32 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = {};
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type LayoutParams = RouteParams & {};
-type LayoutParentData = EnsureParentData<{}>;
-
-export type LayoutServerData = null;
-export type LayoutLoad<
-	OutputData extends (Partial<App.PageData> & Record<string, any>) | void =
-		| (Partial<App.PageData> & Record<string, any>)
-		| void
-> = Kit.Load<LayoutParams, LayoutServerData, LayoutParentData, OutputData>;
-export type LayoutLoadEvent = Parameters<LayoutLoad>[0];
-export type LayoutData = Omit<
-	LayoutParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+layout.js').load>>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+layout.js').load>>
-	>;

package/src/core/sync/write_types/test/layout-advanced/_expected/(main)/$types.d.ts

@@ -1,42 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = {};
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type PageParentData = EnsureParentData<import('../$types.js').LayoutData>;
-type LayoutParams = RouteParams & {};
-type LayoutServerParentData = EnsureParentData<import('../$types.js').LayoutServerData>;
-type LayoutParentData = EnsureParentData<import('../$types.js').LayoutData>;
-
-export type PageServerData = null;
-export type PageLoad<
-	OutputData extends OutputDataShape<PageParentData> = OutputDataShape<PageParentData>
-> = Kit.Load<RouteParams, PageServerData, PageParentData, OutputData>;
-export type PageLoadEvent = Parameters<PageLoad>[0];
-export type PageData = Omit<
-	PageParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../../(main)/+page.js').load>>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../../(main)/+page.js').load>>
-	>;
-export type LayoutServerLoad<
-	OutputData extends (Partial<App.PageData> & Record<string, any>) | void =
-		| (Partial<App.PageData> & Record<string, any>)
-		| void
-> = Kit.ServerLoad<LayoutParams, LayoutServerParentData, OutputData>;
-export type LayoutServerLoadEvent = Parameters<LayoutServerLoad>[0];
-export type LayoutServerData = Kit.AwaitedProperties<
-	Awaited<ReturnType<typeof import('../../../../../../../../../(main)/+layout.server.js').load>>
->;
-export type LayoutData = Omit<LayoutParentData, keyof LayoutServerData> & LayoutServerData;