@sveltejs/kit 1.0.0-next.484 → 1.0.0-next.486

package/package.json

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

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

@@ -159,6 +159,9 @@ function update_types(config, routes, route) {
 	/** @type {string[]} */
 	const exports = [];
 
+	// add 'Expand' helper
+	// 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('; ')} }`
 	);
@@ -278,7 +281,7 @@ function process_node(node, outdir, is_page, all_pages_have_load = true) {
 			written_proxies.push(`proxy${basename}`);
 		}
 
-		server_data = get_data_type(node.server, 'null', proxy);
+		server_data = get_data_type(node.server, 'null', proxy, true);
 
 		const parent_type = `${prefix}ServerParentData`;
 
@@ -305,7 +308,7 @@ function process_node(node, outdir, is_page, all_pages_have_load = true) {
 						? `./proxy${replace_ext_with_js(basename)}`
 						: path_to_original(outdir, node.server);
 
-					type = `Kit.AwaitedActions<typeof import('${from}').actions>`;
+					type = `Expand<Kit.AwaitedActions<typeof import('${from}').actions>>`;
 				}
 			}
 			exports.push(`export type ActionData = ${type};`);
@@ -328,7 +331,7 @@ function process_node(node, outdir, is_page, all_pages_have_load = true) {
 
 		const type = get_data_type(node.shared, `${parent_type} & ${prefix}ServerData`, proxy);
 
-		data = `Omit<${parent_type}, keyof ${type}> & ${type}`;
+		data = `Expand<Omit<${parent_type}, keyof ${type}> & ${type}>`;
 
 		const output_data_shape =
 			!is_page && all_pages_have_load
@@ -340,9 +343,9 @@ function process_node(node, outdir, is_page, all_pages_have_load = true) {
 
 		exports.push(`export type ${prefix}LoadEvent = Parameters<${prefix}Load>[0];`);
 	} else if (server_data === 'null') {
-		data = parent_type;
+		data = `Expand<${parent_type}>`;
 	} else {
-		data = `Omit<${parent_type}, keyof ${prefix}ServerData> & ${prefix}ServerData`;
+		data = `Expand<Omit<${parent_type}, keyof ${prefix}ServerData> & ${prefix}ServerData>`;
 	}
 
 	exports.push(`export type ${prefix}Data = ${data};`);
@@ -353,8 +356,9 @@ function process_node(node, outdir, is_page, all_pages_have_load = true) {
 	 * @param {string} file_path
 	 * @param {string} fallback
 	 * @param {Proxy} proxy
+	 * @param {boolean} expand
 	 */
-	function get_data_type(file_path, fallback, proxy) {
+	function get_data_type(file_path, fallback, proxy, expand = false) {
 		if (proxy) {
 			if (proxy.exports.includes('load')) {
 				// If the file wasn't tweaked, we can use the return type of the original file.
@@ -362,7 +366,8 @@ function process_node(node, outdir, is_page, all_pages_have_load = true) {
 				const from = proxy.modified
 					? `./proxy${replace_ext_with_js(path.basename(file_path))}`
 					: path_to_original(outdir, file_path);
-				return `Kit.AwaitedProperties<Awaited<ReturnType<typeof import('${from}').load>>>`;
+				const type = `Kit.AwaitedProperties<Awaited<ReturnType<typeof import('${from}').load>>>`;
+				return expand ? `Expand<${type}>` : type;
 			} else {
 				return fallback;
 			}
@@ -484,7 +489,7 @@ export function tweak_types(content, is_server) {
 			if (node.jsDoc) {
 				// @ts-ignore
 				for (const comment of node.jsDoc) {
-					for (const tag of comment.tags) {
+					for (const tag of comment.tags ?? []) {
 						if (ts.isJSDocTypeTag(tag)) {
 							const is_fn =
 								ts.isFunctionDeclaration(value) ||

package/types/index.d.ts

@@ -25,7 +25,7 @@ export interface Adapter {
 	adapt(builder: Builder): MaybePromise<void>;
 }
 
-export type AwaitedProperties<input extends Record<string, any> | void> = input extends void
+type AwaitedPropertiesUnion<input extends Record<string, any> | void> = input extends void
 	? undefined // needs to be undefined, because void will break intellisense
 	: input extends Record<string, any>
 	? {
@@ -35,10 +35,22 @@ export type AwaitedProperties<input extends Record<string, any> | void> = input
 	? input
 	: unknown;
 
+export type AwaitedProperties<input extends Record<string, any> | void> =
+	AwaitedPropertiesUnion<input> extends Record<string, any>
+		? OptionalUnion<AwaitedPropertiesUnion<input>>
+		: AwaitedPropertiesUnion<input>;
+
 export type AwaitedActions<T extends Record<string, (...args: any) => any>> = {
-	[Key in keyof T]: UnpackValidationError<Awaited<ReturnType<T[Key]>>>;
+	[Key in keyof T]: OptionalUnion<UnpackValidationError<Awaited<ReturnType<T[Key]>>>>;
 }[keyof T];
 
+// Takes a union type and returns a union type where each type also has all properties
+// of all possible types (typed as undefined), making accessing them more ergonomic
+type OptionalUnion<
+	U extends Record<string, any>, // not unknown, else interfaces don't satisfy this constraint
+	A extends keyof U = U extends U ? keyof U : never
+> = U extends unknown ? { [P in Exclude<A, keyof U>]?: never } & U : never;
+
 // Needs to be here, else ActionData will be resolved to unknown - probably because of "d.ts file imports .js file" in combination with allowJs
 interface ValidationError<T extends Record<string, unknown> | undefined = undefined> {
 	status: number;
@@ -128,7 +140,7 @@ export interface Cookies {
 	/**
 	 * Gets a cookie that was previously set with `cookies.set`, or from the request headers.
 	 */
-	get(name: string, opts?: import('cookie').CookieParseOptions): string | void;
+	get(name: string, opts?: import('cookie').CookieParseOptions): string | undefined;
 
 	/**
 	 * Sets a cookie. This will add a `set-cookie` header to the response, but also make the cookie available via `cookies.get` during the current request.