@sveltejs/kit 1.0.0-next.430 → 1.0.0-next.433

package/src/core/sync/create_manifest_data/types.d.ts

@@ -9,7 +9,7 @@ interface Part {
 
 interface RouteTreeNode {
 	error: PageNode | undefined;
-	layouts: Record<string, PageNode>;
+	layout: PageNode | undefined;
 }
 
 export type RouteTree = Map<string, RouteTreeNode>;
@@ -20,21 +20,18 @@ interface RouteComponent {
 	is_layout: boolean;
 	is_error: boolean;
 	uses_layout: string | undefined;
-	declares_layout: string | undefined;
 }
 
 interface RouteSharedModule {
 	kind: 'shared';
 	is_page: boolean;
 	is_layout: boolean;
-	declares_layout: string | undefined;
 }
 
 interface RouteServerModule {
 	kind: 'server';
 	is_page: boolean;
 	is_layout: boolean;
-	declares_layout: string | undefined;
 }
 
 export type RouteFile = RouteComponent | RouteSharedModule | RouteServerModule;

package/src/core/sync/sync.js

@@ -4,7 +4,7 @@ import { write_client_manifest } from './write_client_manifest.js';
 import { write_matchers } from './write_matchers.js';
 import { write_root } from './write_root.js';
 import { write_tsconfig } from './write_tsconfig.js';
-import { write_type, write_types } from './write_types.js';
+import { write_types, write_all_types } from './write_types.js';
 import { write_ambient } from './write_ambient.js';
 
 /**
@@ -29,7 +29,7 @@ export async function create(config) {
 	write_client_manifest(manifest_data, output);
 	write_root(manifest_data, output);
 	write_matchers(manifest_data, output);
-	await write_types(config, manifest_data);
+	await write_all_types(config, manifest_data);
 
 	return { manifest_data };
 }
@@ -43,7 +43,7 @@ export async function create(config) {
  * @param {string} file
  */
 export async function update(config, manifest_data, file) {
-	await write_type(config, manifest_data, file);
+	await write_types(config, manifest_data, file);
 
 	return { manifest_data };
 }

package/src/core/sync/utils.js

@@ -25,17 +25,6 @@ export function write(file, code) {
 	fs.writeFileSync(file, code);
 }
 
-/**
- * @param {(file: string) => boolean} should_remove
- */
-export function remove_from_previous(should_remove) {
-	for (const key of previous_contents.keys()) {
-		if (should_remove(key)) {
-			previous_contents.delete(key);
-		}
-	}
-}
-
 /** @param {string} str */
 export function trim(str) {
 	const indentation = /** @type {RegExpExecArray} */ (/\n?(\s*)/.exec(str))[1];

package/src/core/sync/write_client_manifest.js

@@ -9,9 +9,6 @@ import { trim, write_if_changed } from './utils.js';
  * @param {string} output
  */
 export function write_client_manifest(manifest_data, output) {
-	/** @type {Map<import('types').PageNode, number>} */
-	const node_indexes = new Map();
-
 	/**
 	 * Creates a module that exports a `CSRPageNode`
 	 * @param {import('types').PageNode} node
@@ -41,7 +38,6 @@ export function write_client_manifest(manifest_data, output) {
 
 	const nodes = manifest_data.nodes
 		.map((node, i) => {
-			node_indexes.set(node, i);
 			write_if_changed(`${output}/nodes/${i}.js`, generate_node(node));
 			return `() => import('./nodes/${i}')`;
 		})
@@ -50,17 +46,35 @@ export function write_client_manifest(manifest_data, output) {
 	const dictionary = `{
 		${manifest_data.routes
 			.map((route) => {
-				if (route.type === 'page') {
-					const errors = route.errors.map((node) => (node ? node_indexes.get(node) : '')).join(',');
-					const layouts = route.layouts
-						.map((node) => (node ? node_indexes.get(node) : ''))
-						.join(',');
-					const leaf = route.leaf ? node_indexes.get(route.leaf) : '';
+				if (route.page) {
+					const errors = route.page.errors.slice(1).map((n) => n ?? '');
+					const layouts = route.page.layouts.slice(1).map((n) => n ?? '');
+
+					while (layouts.at(-1) === '') layouts.pop();
+					while (errors.at(-1) === '') errors.pop();
+
+					/** @type {import('types').RouteData | null} */
+					let current_route = route;
+
+					/** @type {import('types').PageNode | null} */
+					let current_node = route.leaf;
+
+					let uses_server_data = false;
+					while (current_route && !uses_server_data) {
+						uses_server_data = !!current_node?.server;
+						current_route = current_route.parent;
+						current_node = current_route?.layout ?? 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 uses_server_data = [...route.layouts, route.leaf].some((node) => node?.server);
-					const suffix = uses_server_data ? ', 1' : '';
+					// only include non-root layout/error nodes if they exist
+					if (layouts.length > 0 || errors.length > 0) array.push(`[${layouts.join(',')}]`);
+					if (errors.length > 0) array.push(`[${errors.join(',')}]`);
 
-					return `${s(route.id)}: [[${errors}], [${layouts}], ${leaf}${suffix}]`;
+					return `${s(route.id)}: [${array.join(',')}]`;
 				}
 			})
 			.filter(Boolean)

package/src/core/sync/write_root.js

@@ -9,7 +9,7 @@ export function write_root(manifest_data, output) {
 
 	const max_depth = Math.max(
 		...manifest_data.routes.map((route) =>
-			route.type === 'page' ? route.layouts.filter(Boolean).length + 1 : 0
+			route.page ? route.page.layouts.filter(Boolean).length + 1 : 0
 		),
 		1
 	);