@sveltejs/kit 1.0.0-next.441 → 1.0.0-next.444

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.441",
+  "version": "1.0.0-next.444",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -60,20 +60,20 @@
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "import": "./src/index/index.js",
+      "import": "./src/exports/index.js",
       "types": "./types/index.d.ts"
     },
     "./node": {
-      "import": "./src/node/index.js"
+      "import": "./src/exports/node/index.js"
     },
     "./node/polyfills": {
-      "import": "./src/node/polyfills.js"
+      "import": "./src/exports/node/polyfills.js"
     },
     "./hooks": {
-      "import": "./src/hooks.js"
+      "import": "./src/exports/hooks/index.js"
     },
     "./vite": {
-      "import": "./src/vite/index.js"
+      "import": "./src/exports/vite/index.js"
     }
   },
   "types": "types/index.d.ts",

package/src/core/prerender/prerender.js

@@ -2,7 +2,7 @@ import { readFileSync, writeFileSync } from 'fs';
 import { dirname, join } from 'path';
 import { pathToFileURL, URL } from 'url';
 import { mkdirp, posixify, walk } from '../../utils/filesystem.js';
-import { installPolyfills } from '../../node/polyfills.js';
+import { installPolyfills } from '../../exports/node/polyfills.js';
 import { is_root_relative, resolve } from '../../utils/url.js';
 import { queue } from './queue.js';
 import { crawl } from './crawl.js';

package/src/core/sync/write_ambient.js

@@ -1,5 +1,5 @@
 import path from 'path';
-import { get_env } from '../../vite/utils.js';
+import { get_env } from '../../exports/vite/utils.js';
 import { GENERATED_COMMENT } from '../constants.js';
 import { create_types } from '../env.js';
 import { write_if_changed } from './utils.js';

package/src/core/sync/write_client_manifest.js

@@ -48,23 +48,17 @@ export function write_client_manifest(manifest_data, output) {
 			.map((route) => {
 				if (route.page) {
 					const errors = route.page.errors.slice(1).map((n) => n ?? '');
-					const layouts = route.page.layouts.slice(1).map((n) => n ?? '');
+					const layouts = route.page.layouts.slice(1).map((n) => {
+						if (n == undefined) {
+							return '';
+						}
+						return get_node_id(manifest_data.nodes, n);
+					});
 
 					while (layouts.at(-1) === '') layouts.pop();
 					while (errors.at(-1) === '') errors.pop();
 
-					/** @type {import('types').PageNode | null} */
-					let current_node = route.leaf;
-
-					let uses_server_data = false;
-					while (current_node && !uses_server_data) {
-						uses_server_data = !!current_node?.server;
-						current_node = current_node?.parent ?? null;
-					}
-
-					// encode whether or not the route uses the server data
-					// using the ones' complement, to save space
-					const array = [`${uses_server_data ? '~' : ''}${route.page.leaf}`];
+					const array = [get_node_id(manifest_data.nodes, route.page.leaf)];
 
 					// only include non-root layout/error nodes if they exist
 					if (layouts.length > 0 || errors.length > 0) array.push(`[${layouts.join(',')}]`);
@@ -77,6 +71,7 @@ export function write_client_manifest(manifest_data, output) {
 			.join(',\n\t\t')}
 	}`.replace(/^\t/gm, '');
 
+	// String representation of __GENERATED__/client-manifest.js
 	write_if_changed(
 		`${output}/client-manifest.js`,
 		trim(`
@@ -90,3 +85,13 @@ export function write_client_manifest(manifest_data, output) {
 		`)
 	);
 }
+
+/**
+ * Encode whether or not the route uses the server data
+ * using the ones' complement, to save space
+ * @param {import('types').PageNode[]} nodes
+ * @param {number} id
+ */
+function get_node_id(nodes, id) {
+	return `${nodes[id].server ? '~' : ''}${id}`;
+}

package/src/core/sync/write_root.js

@@ -21,7 +21,7 @@ export function write_root(manifest_data, output) {
 
 	let l = max_depth;
 
-	let pyramid = `<svelte:component this={components[${l}]} data={data_${l}}/>`;
+	let pyramid = `<svelte:component this={components[${l}]} data={data_${l}} {errors}/>`;
 
 	while (l--) {
 		pyramid = `

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

@@ -167,15 +167,20 @@ function update_types(config, routes, route) {
 		`type RouteParams = { ${route.names.map((param) => `${param}: string`).join('; ')} }`
 	);
 
+	// These could also be placed in our public types, but it would bloat them unnecessarily and we may want to change these in the future
 	if (route.layout || route.leaf) {
-		// These could also be placed in our public types, but it would bloat them unnecessarily and we may want to change these in the future
+		// If T extends the empty object, void is also allowed as a return type
 		declarations.push(`type MaybeWithVoid<T> = {} extends T ? T | void : T;`);
+		// Returns the key of the object whose values are required.
 		declarations.push(
 			`export type RequiredKeys<T> = { [K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K; }[keyof T];`
 		);
+		// Helper type to get the correct output type for load functions. It should be passed the parent type to check what types from App.PageData are still required.
+		// If none, void is also allowed as a return type.
 		declarations.push(
 			`type OutputDataShape<T> = MaybeWithVoid<Omit<App.PageData, RequiredKeys<T>> & Partial<Pick<App.PageData, keyof T & keyof App.PageData>> & Record<string, any>>`
 		);
+		// null & {} == null, we need to prevent that in some situations
 		declarations.push(`type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;`);
 	}
 
@@ -277,9 +282,7 @@ function process_node(node, outdir, is_page, all_pages_have_load = true) {
 
 		const parent_type = `${prefix}ServerParentData`;
 
-		declarations.push(
-			`type ${parent_type} = EnsureParentData<${get_parent_type(node, 'LayoutServerData')}>;`
-		);
+		declarations.push(`type ${parent_type} = ${get_parent_type(node, 'LayoutServerData')};`);
 
 		// +page.js load present -> server can return all-optional data
 		const output_data_shape =
@@ -317,9 +320,7 @@ function process_node(node, outdir, is_page, all_pages_have_load = true) {
 	exports.push(`export type ${prefix}ServerData = ${server_data};`);
 
 	const parent_type = `${prefix}ParentData`;
-	declarations.push(
-		`type ${parent_type} = EnsureParentData<${get_parent_type(node, 'LayoutData')}>;`
-	);
+	declarations.push(`type ${parent_type} = ${get_parent_type(node, 'LayoutData')};`);
 
 	if (node.shared) {
 		const content = fs.readFileSync(node.shared, 'utf8');
@@ -394,12 +395,14 @@ function get_parent_type(node, type) {
 		parent = parent.parent;
 	}
 
-	let parent_str = parent_imports[0] || '{}';
+	let parent_str = `EnsureParentData<${parent_imports[0] || '{}'}>`;
 	for (let i = 1; i < parent_imports.length; i++) {
 		// Omit is necessary because a parent could have a property with the same key which would
 		// cause a type conflict. At runtime the child overwrites the parent property in this case,
 		// so reflect that in the type definition.
-		parent_str = `Omit<${parent_str}, keyof ${parent_imports[i]}> & ${parent_imports[i]}`;
+		// EnsureParentData is necessary because {something: string} & null becomes null.
+		// Output types of server loads can be null but when passed in through the `parent` parameter they are the empty object instead.
+		parent_str = `Omit<${parent_str}, keyof ${parent_imports[i]}> & EnsureParentData<${parent_imports[i]}>`;
 	}
 	return parent_str;
 }
@@ -556,7 +559,13 @@ export function tweak_types(content, names) {
 										arg.name.end,
 										`: Parameters<${type}>[0]` + (add_parens ? ')' : '')
 									);
+								} else {
+									// prevent "type X is imported but not used" (isn't silenced by @ts-nocheck) when svelte-check runs
+									code.append(`;${type};`);
 								}
+							} else {
+								// prevent "type X is imported but not used" (isn't silenced by @ts-nocheck) when svelte-check runs
+								code.append(`;${type};`);
 							}
 
 							modified = true;
@@ -566,6 +575,16 @@ export function tweak_types(content, names) {
 			}
 		});
 
+		if (modified) {
+			// Ignore all type errors so they don't show up twice when svelte-check runs
+			// Account for possible @ts-check which would overwrite @ts-nocheck
+			if (code.original.startsWith('// @ts-check')) {
+				code.prependLeft('// @ts-check'.length, '\n// @ts-nocheck\n');
+			} else {
+				code.prepend('// @ts-nocheck\n');
+			}
+		}
+
 		return {
 			modified,
 			code: code.toString(),

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

@@ -11,10 +11,11 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Record<string, any>
 >;
 type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type PageParentData = EnsureParentData<
-	Omit<import('../../$types.js').LayoutData, keyof import('../$types.js').LayoutData> &
-		import('../$types.js').LayoutData
->;
+type PageParentData = Omit<
+	EnsureParentData<import('../../$types.js').LayoutData>,
+	keyof import('../$types.js').LayoutData
+> &
+	EnsureParentData<import('../$types.js').LayoutData>;
 
 export type PageServerData = null;
 export type PageLoad<

package/src/core/sync/write_types/test/slugs-layout-not-all-pages-have-load/_expected/nested/[...rest]/$types.d.ts

@@ -11,10 +11,11 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Record<string, any>
 >;
 type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type PageParentData = EnsureParentData<
-	Omit<import('../../$types.js').LayoutData, keyof import('../$types.js').LayoutData> &
-		import('../$types.js').LayoutData
->;
+type PageParentData = Omit<
+	EnsureParentData<import('../../$types.js').LayoutData>,
+	keyof import('../$types.js').LayoutData
+> &
+	EnsureParentData<import('../$types.js').LayoutData>;
 
 export type PageServerData = null;
 export type PageLoad<

package/src/exports/hooks/index.js

@@ -0,0 +1 @@
+export { sequence } from './sequence.js';

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

@@ -1,4 +1,4 @@
-import { HttpError, Redirect } from './private.js';
+import { HttpError, Redirect } from '../runtime/control.js';
 
 /**
  * Creates an `HttpError` object with an HTTP status code and an optional message.

package/src/{vite → exports/vite}/build/build_server.js

@@ -1,11 +1,11 @@
 import fs from 'fs';
 import path from 'path';
-import { mkdirp, posixify } from '../../utils/filesystem.js';
+import { mkdirp, posixify } from '../../../utils/filesystem.js';
 import { get_vite_config, merge_vite_configs, resolve_entry } from '../utils.js';
-import { load_template } from '../../core/config/index.js';
-import { runtime_directory } from '../../core/utils.js';
+import { load_template } from '../../../core/config/index.js';
+import { runtime_directory } from '../../../core/utils.js';
 import { create_build, find_deps, get_default_build_config, is_http_method } from './utils.js';
-import { s } from '../../utils/misc.js';
+import { s } from '../../../utils/misc.js';
 
 /**
  * @param {{

package/src/{vite → exports/vite}/build/build_service_worker.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import * as vite from 'vite';
-import { s } from '../../utils/misc.js';
+import { s } from '../../../utils/misc.js';
 import { assets_base } from './utils.js';
 
 /**

package/src/{vite → exports/vite}/dev/index.js

@@ -3,16 +3,16 @@ import colors from 'kleur';
 import path from 'path';
 import sirv from 'sirv';
 import { URL } from 'url';
-import { getRequest, setResponse } from '../../node/index.js';
-import { installPolyfills } from '../../node/polyfills.js';
-import { coalesce_to_error } from '../../utils/error.js';
-import { posixify } from '../../utils/filesystem.js';
-import { load_template } from '../../core/config/index.js';
-import { SVELTE_KIT_ASSETS } from '../../core/constants.js';
-import * as sync from '../../core/sync/sync.js';
-import { get_mime_lookup, runtime_base, runtime_prefix } from '../../core/utils.js';
+import { getRequest, setResponse } from '../../../exports/node/index.js';
+import { installPolyfills } from '../../../exports/node/polyfills.js';
+import { coalesce_to_error } from '../../../utils/error.js';
+import { posixify } from '../../../utils/filesystem.js';
+import { load_template } from '../../../core/config/index.js';
+import { SVELTE_KIT_ASSETS } from '../../../core/constants.js';
+import * as sync from '../../../core/sync/sync.js';
+import { get_mime_lookup, runtime_base, runtime_prefix } from '../../../core/utils.js';
 import { get_env, prevent_illegal_vite_imports, resolve_entry } from '../utils.js';
-import { compact } from '../../utils/array.js';
+import { compact } from '../../../utils/array.js';
 
 // Vite doesn't expose this so we just copy the list for now
 // https://github.com/vitejs/vite/blob/3edd1af56e980aef56641a5a51cf2932bb580d41/packages/vite/src/node/plugins/css.ts#L96

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

@@ -4,19 +4,19 @@ import path from 'node:path';
 import colors from 'kleur';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import * as vite from 'vite';
-import { mkdirp, posixify, rimraf } from '../utils/filesystem.js';
-import * as sync from '../core/sync/sync.js';
+import { mkdirp, posixify, rimraf } from '../../utils/filesystem.js';
+import * as sync from '../../core/sync/sync.js';
 import { build_server } from './build/build_server.js';
 import { build_service_worker } from './build/build_service_worker.js';
-import { load_config } from '../core/config/index.js';
+import { load_config } from '../../core/config/index.js';
 import { dev } from './dev/index.js';
-import { generate_manifest } from '../core/generate_manifest/index.js';
-import { runtime_directory, logger } from '../core/utils.js';
+import { generate_manifest } from '../../core/generate_manifest/index.js';
+import { runtime_directory, logger } from '../../core/utils.js';
 import { find_deps, get_default_build_config } from './build/utils.js';
 import { preview } from './preview/index.js';
 import { get_aliases, resolve_entry, prevent_illegal_rollup_imports, get_env } from './utils.js';
 import { fileURLToPath } from 'node:url';
-import { create_static_module, create_dynamic_module } from '../core/env.js';
+import { create_static_module, create_dynamic_module } from '../../core/env.js';
 
 const cwd = process.cwd();
 
@@ -405,7 +405,7 @@ function kit() {
 				const results_path = `${svelte_config.kit.outDir}/generated/prerendered.json`;
 
 				// do prerendering in a subprocess so any dangling stuff gets killed upon completion
-				const script = fileURLToPath(new URL('../core/prerender/prerender.js', import.meta.url));
+				const script = fileURLToPath(new URL('../../core/prerender/prerender.js', import.meta.url));
 
 				const child = fork(
 					script,
@@ -465,7 +465,7 @@ function kit() {
 			}
 
 			if (svelte_config.kit.adapter) {
-				const { adapt } = await import('../core/adapt/index.js');
+				const { adapt } = await import('../../core/adapt/index.js');
 				await adapt(svelte_config, build_data, prerendered, { log });
 			} else {
 				console.log(colors.bold().yellow('\nNo adapter specified'));

package/src/{vite → exports/vite}/preview/index.js

@@ -2,9 +2,9 @@ import fs from 'fs';
 import { join } from 'path';
 import sirv from 'sirv';
 import { pathToFileURL } from 'url';
-import { getRequest, setResponse } from '../../node/index.js';
-import { installPolyfills } from '../../node/polyfills.js';
-import { SVELTE_KIT_ASSETS } from '../../core/constants.js';
+import { getRequest, setResponse } from '../../../exports/node/index.js';
+import { installPolyfills } from '../../../exports/node/polyfills.js';
+import { SVELTE_KIT_ASSETS } from '../../../core/constants.js';
 import { loadEnv } from 'vite';
 
 /** @typedef {import('http').IncomingMessage} Req */

package/src/{vite → exports/vite}/utils.js

@@ -1,8 +1,8 @@
 import fs from 'fs';
 import path from 'path';
 import { loadConfigFromFile, loadEnv, normalizePath } from 'vite';
-import { runtime_directory } from '../core/utils.js';
-import { posixify } from '../utils/filesystem.js';
+import { runtime_directory } from '../../core/utils.js';
+import { posixify } from '../../utils/filesystem.js';
 
 /**
  * @param {import('vite').ResolvedConfig} config

package/src/runtime/client/ambient.d.ts

@@ -8,9 +8,9 @@ declare module '__GENERATED__/client-manifest.js' {
 
 	/**
 	 * A map of `[routeId: string]: [leaf, layouts, errors]` tuples, which
-	 * is parsed into an array of routes on startup. The numbers refer to the
-	 * indices in `nodes`. The route layout and error nodes are not referenced,
-	 * they are always number 0 and 1 and always apply.
+	 * is parsed into an array of routes on startup. The numbers refer to the indices in `nodes`.
+	 * If the number is negative, it means it does use a server load function and the complement is the node index.
+	 * The route layout and error nodes are not referenced, they are always number 0 and 1 and always apply.
 	 */
 	export const dictionary: Record<string, [leaf: number, layouts?: number[], errors?: number[]]>;
 

package/src/runtime/client/client.js

@@ -4,11 +4,11 @@ import { make_trackable, decode_params, normalize_path } from '../../utils/url.j
 import { find_anchor, get_base_uri, get_href, scroll_state } from './utils.js';
 import { lock_fetch, unlock_fetch, initial_fetch, native_fetch } from './fetcher.js';
 import { parse } from './parse.js';
-import { error } from '../../index/index.js';
+import { error } from '../../exports/index.js';
 
 import Root from '__GENERATED__/root.svelte';
 import { nodes, dictionary, matchers } from '__GENERATED__/client-manifest.js';
-import { HttpError, Redirect } from '../../index/private.js';
+import { HttpError, Redirect } from '../control.js';
 import { stores } from './singletons.js';
 
 const SCROLL_KEY = 'sveltekit:scroll';
@@ -424,21 +424,37 @@ export function create_client({ target, base, trailing_slash }) {
 		};
 
 		let data = {};
-		let data_changed = false;
+		let data_changed = !page;
 		for (let i = 0; i < filtered.length; i += 1) {
-			data = { ...data, ...filtered[i].data };
+			const node = filtered[i];
+			data = { ...data, ...node.data };
+
 			// Only set props if the node actually updated. This prevents needless rerenders.
-			if (data_changed || !current.branch.some((node) => node === filtered[i])) {
+			if (data_changed || !current.branch.some((previous) => previous === node)) {
 				result.props[`data_${i}`] = data;
-				data_changed = true;
+				data_changed = data_changed || Object.keys(node.data ?? {}).length > 0;
 			}
 		}
+		if (!data_changed) {
+			// If nothing was added, and the object entries are the same length, this means
+			// that nothing was removed either and therefore the data is the same as the previous one.
+			// This would be more readable with a separate boolean but that would cost us some bytes.
+			data_changed = Object.keys(page.data).length !== Object.keys(data).length;
+		}
 
 		const page_changed =
 			!current.url || url.href !== current.url.href || current.error !== error || data_changed;
 
 		if (page_changed) {
-			result.props.page = { error, params, routeId, status, url, data };
+			result.props.page = {
+				error,
+				params,
+				routeId,
+				status,
+				url,
+				// The whole page store is updated, but this way the object reference stays the same
+				data: data_changed ? data : page.data
+			};
 
 			// TODO remove this for 1.0
 			/**
@@ -638,9 +654,10 @@ export function create_client({ target, base, trailing_slash }) {
 
 	/**
 	 * @param {import('types').ServerDataNode | import('types').ServerDataSkippedNode | null} node
+	 * @param {import('./types').DataNode | null} [previous]
 	 * @returns {import('./types').DataNode | null}
 	 */
-	function create_data_node(node) {
+	function create_data_node(node, previous) {
 		if (node?.type === 'data') {
 			return {
 				type: 'data',
@@ -652,6 +669,8 @@ export function create_client({ target, base, trailing_slash }) {
 					url: !!node.uses.url
 				}
 			};
+		} else if (node?.type === 'skip') {
+			return previous ?? null;
 		}
 		return null;
 	}
@@ -672,14 +691,13 @@ export function create_client({ target, base, trailing_slash }) {
 			params: Object.keys(params).filter((key) => current.params[key] !== params[key])
 		};
 
+		const loaders = [...layouts, leaf];
+
 		// preload modules to avoid waterfall, but handle rejections
 		// so they don't get reported to Sentry et al (we don't need
 		// to act on the failures at this point)
-		[...errors, ...layouts, leaf].forEach((loader) => loader?.().catch(() => {}));
-
-		const loaders = [...layouts, leaf];
-
-		// To avoid waterfalls when someone awaits a parent, compute as much as possible here already
+		errors.forEach((loader) => loader?.().catch(() => {}));
+		loaders.forEach((loader) => loader?.[1]().catch(() => {}));
 
 		/** @type {import('types').ServerData | null} */
 		let server_data = null;
@@ -687,15 +705,15 @@ export function create_client({ target, base, trailing_slash }) {
 		const invalid_server_nodes = loaders.reduce((acc, loader, i) => {
 			const previous = current.branch[i];
 			const invalid =
-				loader &&
-				(previous?.loader !== loader ||
+				!!loader?.[0] &&
+				(previous?.loader !== loader[1] ||
 					has_changed(changed, acc.some(Boolean), previous.server?.uses));
 
 			acc.push(invalid);
 			return acc;
 		}, /** @type {boolean[]} */ ([]));
 
-		if (route.uses_server_data && invalid_server_nodes.some(Boolean)) {
+		if (invalid_server_nodes.some(Boolean)) {
 			try {
 				const res = await native_fetch(
 					`${url.pathname}${url.pathname.endsWith('/') ? '' : '/'}__data.json${url.search}`,
@@ -738,7 +756,7 @@ export function create_client({ target, base, trailing_slash }) {
 			// re-use data from previous load if it's still valid
 			const valid =
 				can_reuse_server_data &&
-				loader === previous?.loader &&
+				loader[1] === previous?.loader &&
 				!has_changed(changed, parent_changed, previous.shared?.uses);
 			if (valid) return previous;
 
@@ -754,7 +772,7 @@ export function create_client({ target, base, trailing_slash }) {
 			}
 
 			return load_node({
-				loader,
+				loader: loader[1],
 				url,
 				params,
 				routeId: route.id,
@@ -765,7 +783,7 @@ export function create_client({ target, base, trailing_slash }) {
 					}
 					return data;
 				},
-				server_data_node: create_data_node(server_data_node) ?? previous?.server ?? null
+				server_data_node: create_data_node(server_data_node, previous?.server)
 			});
 		});
 
@@ -798,11 +816,10 @@ export function create_client({ target, base, trailing_slash }) {
 
 							let j = i;
 							while (!branch[j]) j -= 1;
-
 							try {
 								error_loaded = {
-									node: await errors[i](),
-									loader: errors[i],
+									node: await /** @type {import('types').CSRPageNodeLoader } */ (errors[i])(),
+									loader: /** @type {import('types').CSRPageNodeLoader } */ (errors[i]),
 									data: {},
 									server: null,
 									shared: null
@@ -1084,7 +1101,7 @@ export function create_client({ target, base, trailing_slash }) {
 				: routes;
 
 			const promises = matching.map((r) => {
-				return Promise.all([...r.layouts, r.leaf].map((load) => load?.()));
+				return Promise.all([...r.layouts, r.leaf].map((load) => load?.[1]()));
 			});
 
 			await Promise.all(promises);

package/src/runtime/client/parse.js

@@ -10,11 +10,6 @@ export function parse(nodes, dictionary, matchers) {
 	return Object.entries(dictionary).map(([id, [leaf, layouts, errors]]) => {
 		const { pattern, names, types } = parse_route_id(id);
 
-		// whether or not the route uses the server data is
-		// encoded using the ones' complement, to save space
-		const uses_server_data = leaf < 0;
-		if (uses_server_data) leaf = ~leaf;
-
 		const route = {
 			id,
 			/** @param {string} path */
@@ -23,9 +18,8 @@ export function parse(nodes, dictionary, matchers) {
 				if (match) return exec(match, names, types, matchers);
 			},
 			errors: [1, ...(errors || [])].map((n) => nodes[n]),
-			layouts: [0, ...(layouts || [])].map((n) => nodes[n]),
-			leaf: nodes[leaf],
-			uses_server_data
+			layouts: [0, ...(layouts || [])].map(create_loader),
+			leaf: create_loader(leaf)
 		};
 
 		// bit of a hack, but ensures that layout/error node lists are the same
@@ -38,4 +32,16 @@ export function parse(nodes, dictionary, matchers) {
 
 		return route;
 	});
+
+	/**
+	 * @param {number} id
+	 * @returns {[boolean, import('types').CSRPageNodeLoader]}
+	 */
+	function create_loader(id) {
+		// whether or not the route uses the server data is
+		// encoded using the ones' complement, to save space
+		const uses_server_data = id < 0;
+		if (uses_server_data) id = ~id;
+		return [uses_server_data, nodes[id]];
+	}
 }

package/src/runtime/client/types.d.ts

@@ -6,8 +6,8 @@ import {
 	prefetch,
 	prefetchRoutes
 } from '$app/navigation';
-import { CSRPageNode, CSRPageNodeLoader, CSRRoute, ServerErrorNode, Uses } from 'types';
-import { HttpError } from '../../index/private.js';
+import { CSRPageNode, CSRPageNodeLoader, CSRRoute, Uses } from 'types';
+import { HttpError } from '../control.js';
 import { SerializedHttpError } from '../server/page/types.js';
 
 export interface Client {

package/src/runtime/server/endpoint.js

@@ -1,4 +1,4 @@
-import { HttpError, Redirect } from '../../index/private.js';
+import { HttpError, Redirect } from '../control.js';
 import { check_method_names, method_not_allowed } from './utils.js';
 
 /**

package/src/runtime/server/index.js

@@ -7,9 +7,9 @@ import { serialize_error, GENERIC_ERROR, error_to_pojo } 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 '../../index/private.js';
+import { HttpError, Redirect } from '../control.js';
 import { load_server_data } from './page/load_data.js';
-import { json } from '../../index/index.js';
+import { json } from '../../exports/index.js';
 import { once } from '../../utils/functions.js';
 
 /* global __SVELTEKIT_ADAPTER_NAME__ */
@@ -280,10 +280,13 @@ export async function respond(request, options, state) {
 												/** @type {Record<string, any>} */
 												const data = {};
 												for (let j = 0; j < i; j += 1) {
-													const parent = /** @type {import('types').ServerDataNode} */ (
+													const parent = /** @type {import('types').ServerDataNode | null} */ (
 														await functions[j]()
 													);
-													Object.assign(data, parent.data);
+
+													if (parent) {
+														Object.assign(data, parent.data);
+													}
 												}
 												return data;
 											}

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

@@ -3,8 +3,8 @@ import { render_response } from './render.js';
 import { respond_with_error } from './respond_with_error.js';
 import { method_not_allowed, error_to_pojo, allowed_methods } from '../utils.js';
 import { create_fetch } from './fetch.js';
-import { HttpError, Redirect } from '../../../index/private.js';
-import { error, json } from '../../../index/index.js';
+import { HttpError, Redirect } from '../../control.js';
+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';

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

@@ -6,7 +6,7 @@ import { render_json_payload_script } from '../../../utils/escape.js';
 import { s } from '../../../utils/misc.js';
 import { Csp } from './csp.js';
 import { serialize_error } from '../utils.js';
-import { HttpError } from '../../../index/private.js';
+import { HttpError } from '../../control.js';
 
 // TODO rename this function/module
 

package/src/runtime/server/page/types.d.ts

@@ -1,5 +1,5 @@
 import { ResponseHeaders, SSRNode, CspDirectives } from 'types';
-import { HttpError } from '../../../index/private';
+import { HttpError } from '../../control.js';
 
 export interface Fetched {
 	url: string;

package/src/runtime/server/utils.js

@@ -1,4 +1,4 @@
-import { HttpError } from '../../index/private.js';
+import { HttpError } from '../control.js';
 
 /** @param {any} body */
 export function is_pojo(body) {

package/src/utils/error.js

@@ -1,4 +1,4 @@
-import { HttpError, Redirect } from '../index/private.js';
+import { HttpError, Redirect } from '../runtime/control.js';
 
 /**
  * @param {unknown} err

package/types/index.d.ts

@@ -17,7 +17,7 @@ import {
 	TrailingSlash
 } from './private.js';
 import { SSRNodeLoader, SSRRoute, ValidatedConfig } from './internal.js';
-import { HttpError, Redirect } from '../src/index/private.js';
+import { HttpError, Redirect } from '../src/runtime/control.js';
 
 export interface Adapter {
 	name: string;

package/types/internal.d.ts

@@ -71,13 +71,16 @@ export interface CSRPageNode {
 
 export type CSRPageNodeLoader = () => Promise<CSRPageNode>;
 
+/**
+ * Definition of a client side route.
+ * The boolean in the tuples indicates whether the route has a server load.
+ */
 export type CSRRoute = {
 	id: string;
 	exec: (path: string) => undefined | Record<string, string>;
-	errors: CSRPageNodeLoader[];
-	layouts: CSRPageNodeLoader[];
-	leaf: CSRPageNodeLoader;
-	uses_server_data: boolean;
+	errors: Array<CSRPageNodeLoader | undefined>;
+	layouts: Array<[boolean, CSRPageNodeLoader] | undefined>;
+	leaf: [boolean, CSRPageNodeLoader];
 };
 
 export type GetParams = (match: RegExpExecArray) => Record<string, string>;
@@ -194,6 +197,9 @@ export type ServerData =
 	  }
 	| {
 			type: 'data';
+			/**
+			 * If `null`, then there was no load function
+			 */
 			nodes: Array<ServerDataNode | ServerDataSkippedNode | ServerErrorNode | null>;
 	  };