@sveltejs/kit 1.0.0-next.440 → 1.0.0-next.443

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.440",
+  "version": "1.0.0-next.443",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

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

@@ -109,23 +109,25 @@ function create_routes_and_nodes(cwd, config, fallback) {
 
 			segment_map.set(
 				id,
-				segments.filter(Boolean).map((segment) => {
-					/** @type {import('./types').Part[]} */
-					const parts = [];
-					segment.split(/\[(.+?)\]/).map((content, i) => {
-						const dynamic = !!(i % 2);
-
-						if (!content) return;
-
-						parts.push({
-							content,
-							dynamic,
-							rest: dynamic && content.startsWith('...'),
-							type: (dynamic && content.split('=')[1]) || null
+				segments
+					.filter((segment) => segment !== '' && affects_path(segment))
+					.map((segment) => {
+						/** @type {import('./types').Part[]} */
+						const parts = [];
+						segment.split(/\[(.+?)\]/).map((content, i) => {
+							const dynamic = !!(i % 2);
+
+							if (!content) return;
+
+							parts.push({
+								content,
+								dynamic,
+								rest: dynamic && content.startsWith('...'),
+								type: (dynamic && content.split('=')[1]) || null
+							});
 						});
-					});
-					return parts;
-				})
+						return parts;
+					})
 			);
 
 			/** @type {import('types').RouteData} */

package/src/core/sync/write_root.js

@@ -26,7 +26,7 @@ export function write_root(manifest_data, output) {
 	while (l--) {
 		pyramid = `
 			{#if components[${l + 1}]}
-				<svelte:component this={components[${l}]} data={data_${l}}>
+				<svelte:component this={components[${l}]} data={data_${l}} {errors}>
 					${pyramid.replace(/\n/g, '\n\t\t\t\t\t')}
 				</svelte:component>
 			{:else}

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/runtime/client/client.js

@@ -638,9 +638,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 +653,8 @@ export function create_client({ target, base, trailing_slash }) {
 					url: !!node.uses.url
 				}
 			};
+		} else if (node?.type === 'skip') {
+			return previous ?? null;
 		}
 		return null;
 	}
@@ -765,7 +768,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)
 			});
 		});
 

package/src/runtime/server/index.js

@@ -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/types/internal.d.ts

@@ -194,6 +194,9 @@ export type ServerData =
 	  }
 	| {
 			type: 'data';
+			/**
+			 * If `null`, then there was no load function
+			 */
 			nodes: Array<ServerDataNode | ServerDataSkippedNode | ServerErrorNode | null>;
 	  };