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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.439",
+  "version": "1.0.0-next.441",
   "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_client_manifest.js

@@ -53,17 +53,13 @@ export function write_client_manifest(manifest_data, output) {
 					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) {
+					while (current_node && !uses_server_data) {
 						uses_server_data = !!current_node?.server;
-						current_route = current_route.parent;
-						current_node = current_route?.layout ?? null;
+						current_node = current_node?.parent ?? null;
 					}
 
 					// encode whether or not the route uses the server data

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

@@ -163,14 +163,9 @@ function update_types(config, routes, route) {
 	/** @type {string[]} */
 	const exports = [];
 
-	if (route.names.length > 0) {
-		const params = route.names.map((param) => `${param}: string`).join('; ');
-		declarations.push(
-			`interface RouteParams extends Partial<Record<string, string>> { ${params} }`
-		);
-	} else {
-		declarations.push(`interface RouteParams extends Partial<Record<string, string>> {}`);
-	}
+	declarations.push(
+		`type RouteParams = { ${route.names.map((param) => `${param}: string`).join('; ')} }`
+	);
 
 	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
@@ -212,12 +207,11 @@ function update_types(config, routes, route) {
 			}
 		});
 
-		if (layout_params.size > 0) {
-			const params = Array.from(layout_params).map((param) => `${param}?: string`);
-			declarations.push(`interface LayoutParams extends RouteParams { ${params.join('; ')} }`);
-		} else {
-			declarations.push(`interface LayoutParams extends RouteParams {}`);
-		}
+		declarations.push(
+			`type LayoutParams = RouteParams & { ${Array.from(layout_params).map(
+				(param) => `${param}?: string`
+			)} }`
+		);
 
 		const {
 			exports: e,

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

@@ -1,6 +1,6 @@
 import type * as Kit from '@sveltejs/kit';
 
-interface RouteParams extends Partial<Record<string, string>> {}
+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;
@@ -13,7 +13,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
 type PageServerParentData = EnsureParentData<LayoutServerData>;
 type PageParentData = EnsureParentData<LayoutData>;
-interface LayoutParams extends RouteParams {}
+type LayoutParams = RouteParams & {};
 type LayoutServerParentData = EnsureParentData<{}>;
 type LayoutParentData = EnsureParentData<{}>;
 

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

@@ -1,6 +1,6 @@
 import type * as Kit from '@sveltejs/kit';
 
-interface RouteParams extends Partial<Record<string, string>> {}
+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;
@@ -11,7 +11,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Record<string, any>
 >;
 type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-interface LayoutParams extends RouteParams {}
+type LayoutParams = RouteParams & {};
 type LayoutParentData = EnsureParentData<{}>;
 
 export type LayoutServerData = null;

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

@@ -1,6 +1,6 @@
 import type * as Kit from '@sveltejs/kit';
 
-interface RouteParams extends Partial<Record<string, string>> {}
+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;
@@ -12,7 +12,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 >;
 type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
 type PageParentData = EnsureParentData<import('../$types.js').LayoutData>;
-interface LayoutParams extends RouteParams {}
+type LayoutParams = RouteParams & {};
 type LayoutServerParentData = EnsureParentData<import('../$types.js').LayoutServerData>;
 type LayoutParentData = EnsureParentData<import('../$types.js').LayoutData>;
 

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

@@ -1,6 +1,6 @@
 import type * as Kit from '@sveltejs/kit';
 
-interface RouteParams extends Partial<Record<string, string>> {}
+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;

package/src/core/sync/write_types/test/simple-page-server-and-shared/_expected/$types.d.ts

@@ -1,6 +1,6 @@
 import type * as Kit from '@sveltejs/kit';
 
-interface RouteParams extends Partial<Record<string, string>> {}
+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;
@@ -13,7 +13,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
 type PageServerParentData = EnsureParentData<LayoutServerData>;
 type PageParentData = EnsureParentData<LayoutData>;
-interface LayoutParams extends RouteParams {}
+type LayoutParams = RouteParams & {};
 type LayoutParentData = EnsureParentData<{}>;
 
 export type PageServerLoad<

package/src/core/sync/write_types/test/simple-page-server-only/_expected/$types.d.ts

@@ -1,6 +1,6 @@
 import type * as Kit from '@sveltejs/kit';
 
-interface RouteParams extends Partial<Record<string, string>> {}
+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;
@@ -13,7 +13,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
 type PageServerParentData = EnsureParentData<LayoutServerData>;
 type PageParentData = EnsureParentData<LayoutData>;
-interface LayoutParams extends RouteParams {}
+type LayoutParams = RouteParams & {};
 type LayoutParentData = EnsureParentData<{}>;
 
 export type PageServerLoad<

package/src/core/sync/write_types/test/simple-page-shared-only/_expected/$types.d.ts

@@ -1,6 +1,6 @@
 import type * as Kit from '@sveltejs/kit';
 
-interface RouteParams extends Partial<Record<string, string>> {}
+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;
@@ -12,7 +12,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 >;
 type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
 type PageParentData = EnsureParentData<LayoutData>;
-interface LayoutParams extends RouteParams {}
+type LayoutParams = RouteParams & {};
 type LayoutParentData = EnsureParentData<{}>;
 
 export type PageServerData = null;

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

@@ -1,6 +1,6 @@
 import type * as Kit from '@sveltejs/kit';
 
-interface RouteParams extends Partial<Record<string, string>> {}
+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;
@@ -11,10 +11,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Record<string, any>
 >;
 type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-interface LayoutParams extends RouteParams {
-	rest?: string;
-	slug?: string;
-}
+type LayoutParams = RouteParams & { rest?: string; slug?: string };
 type LayoutParentData = EnsureParentData<{}>;
 
 export type LayoutServerData = null;

package/src/core/sync/write_types/test/slugs/_expected/[...rest]/$types.d.ts

@@ -1,8 +1,6 @@
 import type * as Kit from '@sveltejs/kit';
 
-interface RouteParams extends Partial<Record<string, string>> {
-	rest: string;
-}
+type RouteParams = { rest: string };
 type MaybeWithVoid<T> = {} extends T ? T | void : T;
 export type RequiredKeys<T> = {
 	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;

package/src/core/sync/write_types/test/slugs/_expected/[slug]/$types.d.ts

@@ -1,8 +1,6 @@
 import type * as Kit from '@sveltejs/kit';
 
-interface RouteParams extends Partial<Record<string, string>> {
-	slug: string;
-}
+type RouteParams = { slug: string };
 type MaybeWithVoid<T> = {} extends T ? T | void : T;
 export type RequiredKeys<T> = {
 	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;

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

@@ -1,6 +1,6 @@
 import type * as Kit from '@sveltejs/kit';
 
-interface RouteParams extends Partial<Record<string, string>> {}
+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;
@@ -11,10 +11,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Record<string, any>
 >;
 type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-interface LayoutParams extends RouteParams {
-	rest?: string;
-	slug?: string;
-}
+type LayoutParams = RouteParams & { rest?: string; slug?: string };
 type LayoutParentData = EnsureParentData<{}>;
 
 export type LayoutServerData = null;

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

@@ -1,6 +1,6 @@
 import type * as Kit from '@sveltejs/kit';
 
-interface RouteParams extends Partial<Record<string, string>> {}
+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;
@@ -11,9 +11,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Record<string, any>
 >;
 type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-interface LayoutParams extends RouteParams {
-	rest?: string;
-}
+type LayoutParams = RouteParams & { rest?: string };
 type LayoutParentData = EnsureParentData<import('../$types.js').LayoutData>;
 
 export type LayoutServerData = null;

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

@@ -1,8 +1,6 @@
 import type * as Kit from '@sveltejs/kit';
 
-interface RouteParams extends Partial<Record<string, string>> {
-	rest: string;
-}
+type RouteParams = { rest: string };
 type MaybeWithVoid<T> = {} extends T ? T | void : T;
 export type RequiredKeys<T> = {
 	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;

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

@@ -1,8 +1,6 @@
 import type * as Kit from '@sveltejs/kit';
 
-interface RouteParams extends Partial<Record<string, string>> {
-	slug: string;
-}
+type RouteParams = { slug: string };
 type MaybeWithVoid<T> = {} extends T ? T | void : T;
 export type RequiredKeys<T> = {
 	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;

package/types/index.d.ts

@@ -195,17 +195,17 @@ export interface HandleError {
  */
 export interface Load<
 	Params extends Partial<Record<string, string>> = Partial<Record<string, string>>,
-	InputData extends Record<string, any> | null = Record<string, any> | null,
-	ParentData extends Record<string, any> = Record<string, any>,
-	OutputData extends Record<string, any> | void = Record<string, any> | void
+	InputData extends Record<string, unknown> | null = Record<string, any> | null,
+	ParentData extends Record<string, unknown> = Record<string, any>,
+	OutputData extends Record<string, unknown> | void = Record<string, any> | void
 > {
 	(event: LoadEvent<Params, InputData, ParentData>): MaybePromise<OutputData>;
 }
 
 export interface LoadEvent<
 	Params extends Partial<Record<string, string>> = Partial<Record<string, string>>,
-	Data extends Record<string, any> | null = Record<string, any> | null,
-	ParentData extends Record<string, any> = Record<string, any>
+	Data extends Record<string, unknown> | null = Record<string, any> | null,
+	ParentData extends Record<string, unknown> = Record<string, any>
 > {
 	fetch(info: RequestInfo, init?: RequestInit): Promise<Response>;
 	params: Params;
@@ -253,7 +253,9 @@ export interface RequestEvent<
  *
  * It receives `Params` as the first generic argument, which you can skip by using [generated types](/docs/types#generated-types) instead.
  */
-export interface RequestHandler<Params extends Record<string, string> = Record<string, string>> {
+export interface RequestHandler<
+	Params extends Partial<Record<string, string>> = Partial<Record<string, string>>
+> {
 	(event: RequestEvent<Params>): MaybePromise<Response>;
 }