generate types

Author: dummdidumm

packages/kit/src/core/sync/write_types/index.js

@@ -195,7 +195,9 @@ function update_types(config, routes, route, to_delete = new Set()) {
 	// Makes sure a type is "repackaged" and therefore more readable
 	declarations.push('type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never;');
 	declarations.push(
-		`type RouteParams = { ${route.names.map((param) => `${param}: string`).join('; ')} }`
+		`type RouteParams = { ${route.names
+			.map((param, idx) => `${param}${route.optional[idx] ? '?' : ''}: 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

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

@@ -12,7 +12,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Record<string, any>
 >;
 type EnsureDefined<T> = T extends null | undefined ? {} : T;
-type LayoutParams = RouteParams & { rest?: string; slug?: string; optional?: string | void };
+type LayoutParams = RouteParams & { optional?: string; rest?: string; slug?: string };
 type LayoutParentData = EnsureDefined<{}>;
 
 export type LayoutServerData = null;

packages/kit/src/core/sync/write_types/test/slugs/_expected/x/[[optional]]/$types.d.ts

@@ -1,14 +1,38 @@
 import type * as Kit from '@sveltejs/kit';
 
 type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never;
-type RouteParams = { optional: string | void }
+type RouteParams = { optional?: 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; }[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<Omit<App.PageData, RequiredKeys<T>> & Partial<Pick<App.PageData, keyof T & keyof App.PageData>> & Record<string, any>>
+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 EnsureDefined<T> = T extends null | undefined ? {} : T;
 type PageParentData = EnsureDefined<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 PageLoad<
+	OutputData extends OutputDataShape<PageParentData> = OutputDataShape<PageParentData>
+> = Kit.Load<RouteParams, PageServerData, PageParentData, OutputData>;
 export type PageLoadEvent = Parameters<PageLoad>[0];
-export type PageData = Expand<Omit<PageParentData, keyof Kit.AwaitedProperties<Awaited<ReturnType<typeof import('../../../../../../x/[[optional]]/+page.js').load>>>> & EnsureDefined<Kit.AwaitedProperties<Awaited<ReturnType<typeof import('../../../../../../x/[[optional]]/+page.js').load>>>>>;
+export type PageData = Expand<
+	Omit<
+		PageParentData,
+		keyof Kit.AwaitedProperties<
+			Awaited<
+				ReturnType<typeof import('../../../../../../../../../../x/[[optional]]/+page.js').load>
+			>
+		>
+	> &
+		EnsureDefined<
+			Kit.AwaitedProperties<
+				Awaited<
+					ReturnType<typeof import('../../../../../../../../../../x/[[optional]]/+page.js').load>
+				>
+			>
+		>
+>;