@sveltejs/kit 1.7.2 → 1.8.0

package/src/runtime/server/utils.js

@@ -1,9 +1,8 @@
-import * as devalue from 'devalue';
 import { json, text } from '../../exports/index.js';
 import { coalesce_to_error } from '../../utils/error.js';
 import { negotiate } from '../../utils/http.js';
 import { HttpError } from '../control.js';
-import { fix_stack_trace } from '../shared.js';
+import { fix_stack_trace } from '../shared-server.js';
 
 /** @param {any} body */
 export function is_pojo(body) {
@@ -99,7 +98,7 @@ export async function handle_error_and_jsonify(event, options, error) {
 	if (error instanceof HttpError) {
 		return error.body;
 	} else {
-		if (__SVELTEKIT_DEV__) {
+		if (__SVELTEKIT_DEV__ && typeof error == 'object') {
 			error = new Proxy(error, {
 				get: (target, property) => {
 					if (property === 'stack') {
@@ -148,31 +147,23 @@ export function clarify_devalue_error(event, error) {
 	return error.message;
 }
 
-/** @param {import('types').ServerDataNode | import('types').ServerDataSkippedNode | import('types').ServerErrorNode | null} node */
-export function serialize_data_node(node) {
-	if (!node) return 'null';
-
-	if (node.type === 'error' || node.type === 'skip') {
-		return JSON.stringify(node);
-	}
-
-	const stringified = devalue.stringify(node.data);
-
+/**
+ * @param {import('types').ServerDataNode} node
+ */
+export function stringify_uses(node) {
 	const uses = [];
 
-	if (node.uses.dependencies.size > 0) {
+	if (node.uses && node.uses.dependencies.size > 0) {
 		uses.push(`"dependencies":${JSON.stringify(Array.from(node.uses.dependencies))}`);
 	}
 
-	if (node.uses.params.size > 0) {
+	if (node.uses && node.uses.params.size > 0) {
 		uses.push(`"params":${JSON.stringify(Array.from(node.uses.params))}`);
 	}
 
-	if (node.uses.parent) uses.push(`"parent":1`);
-	if (node.uses.route) uses.push(`"route":1`);
-	if (node.uses.url) uses.push(`"url":1`);
+	if (node.uses?.parent) uses.push(`"parent":1`);
+	if (node.uses?.route) uses.push(`"route":1`);
+	if (node.uses?.url) uses.push(`"url":1`);
 
-	return `{"type":"data","data":${stringified},"uses":{${uses.join(',')}}${
-		node.slash ? `,"slash":${JSON.stringify(node.slash)}` : ''
-	}}`;
+	return `"uses":{${uses.join(',')}}`;
 }

package/src/runtime/{shared.js → shared-server.js}

@@ -1,8 +1,5 @@
 export { set_assets } from '__sveltekit/paths';
 
-export let building = false;
-export let version = '';
-
 /** @type {Record<string, string>} */
 export let private_env = {};
 
@@ -12,11 +9,6 @@ export let public_env = {};
 /** @param {string} stack */
 export let fix_stack_trace = (stack) => stack;
 
-/** @param {boolean} value */
-export function set_building(value) {
-	building = value;
-}
-
 /** @type {(environment: Record<string, string>) => void} */
 export function set_private_env(environment) {
 	private_env = environment;
@@ -27,11 +19,6 @@ export function set_public_env(environment) {
 	public_env = environment;
 }
 
-/** @param {string} value */
-export function set_version(value) {
-	version = value;
-}
-
 /** @param {(stack: string) => string} value */
 export function set_fix_stack_trace(value) {
 	fix_stack_trace = value;

package/src/utils/streaming.js

@@ -0,0 +1,44 @@
+/**
+ * @returns {import("types").Deferred & { promise: Promise<any> }}}
+ */
+function defer() {
+	let fulfil;
+	let reject;
+
+	const promise = new Promise((f, r) => {
+		fulfil = f;
+		reject = r;
+	});
+
+	// @ts-expect-error
+	return { promise, fulfil, reject };
+}
+
+/**
+ * Create an async iterator and a function to push values into it
+ * @returns {{
+ *   iterator: AsyncIterable<any>;
+ *   push: (value: any) => void;
+ *   done: () => void;
+ * }}
+ */
+export function create_async_iterator() {
+	let deferred = defer();
+
+	return {
+		iterator: {
+			[Symbol.asyncIterator]() {
+				return {
+					next: () => deferred.promise
+				};
+			}
+		},
+		push: (value) => {
+			deferred.fulfil({ value, done: false });
+			deferred = defer();
+		},
+		done: () => {
+			deferred.fulfil({ done: true });
+		}
+	};
+}

package/types/index.d.ts

@@ -18,7 +18,7 @@ import {
 	RouteSegment,
 	UniqueInterface
 } from './private.js';
-import { SSRNodeLoader, SSRRoute, ValidatedConfig } from './internal.js';
+import { AssetDependencies, SSRNodeLoader, SSRRoute, ValidatedConfig } from './internal.js';
 
 export { PrerenderOption } from './private.js';
 
@@ -534,7 +534,7 @@ export interface KitConfig {
 	 *
 	 * beforeNavigate(({ willUnload, to }) => {
 	 *   if ($updated && !willUnload && to?.url) {
-	 *     location.href = to.route.url.href;
+	 *     location.href = to.url.href;
 	 *   }
 	 * });
 	 * </script>
@@ -1008,11 +1008,9 @@ export interface SSRManifest {
 
 	/** private fields */
 	_: {
-		entry: {
-			file: string;
-			imports: string[];
-			stylesheets: string[];
-			fonts: string[];
+		client: {
+			start: AssetDependencies;
+			app: AssetDependencies;
 		};
 		nodes: SSRNodeLoader[];
 		routes: SSRRoute[];

package/types/internal.d.ts

@@ -42,16 +42,21 @@ export interface Asset {
 	type: string | null;
 }
 
+export interface AssetDependencies {
+	file: string;
+	imports: string[];
+	stylesheets: string[];
+	fonts: string[];
+}
+
 export interface BuildData {
 	app_dir: string;
 	app_path: string;
 	manifest_data: ManifestData;
 	service_worker: string | null;
-	client_entry: {
-		file: string;
-		imports: string[];
-		stylesheets: string[];
-		fonts: string[];
+	client: {
+		start: AssetDependencies;
+		app: AssetDependencies;
 	} | null;
 	server_manifest: import('vite').Manifest;
 }
@@ -78,6 +83,11 @@ export type CSRRoute = {
 	leaf: [has_server_load: boolean, node_loader: CSRPageNodeLoader];
 };
 
+export interface Deferred {
+	fulfil: (value: any) => void;
+	reject: (error: Error) => void;
+}
+
 export type GetParams = (match: RegExpExecArray) => Record<string, string>;
 
 export interface ServerHooks {
@@ -90,6 +100,11 @@ export interface ClientHooks {
 	handleError: HandleClientError;
 }
 
+export interface Env {
+	private: Record<string, string>;
+	public: Record<string, string>;
+}
+
 export class InternalServer extends Server {
 	init(options: ServerInitOptions): Promise<void>;
 	respond(
@@ -187,18 +202,20 @@ export interface RouteData {
 	} | null;
 }
 
-export type ServerData =
-	| {
-			type: 'redirect';
-			location: string;
-	  }
-	| {
-			type: 'data';
-			/**
-			 * If `null`, then there was no load function
-			 */
-			nodes: Array<ServerDataNode | ServerDataSkippedNode | ServerErrorNode | null>;
-	  };
+export type ServerRedirectNode = {
+	type: 'redirect';
+	location: string;
+};
+
+export type ServerNodesResponse = {
+	type: 'data';
+	/**
+	 * If `null`, then there was no load function <- TODO is this outdated now with the recent changes?
+	 */
+	nodes: Array<ServerDataNode | ServerDataSkippedNode | ServerErrorNode | null>;
+};
+
+export type ServerDataResponse = ServerRedirectNode | ServerNodesResponse;
 
 /**
  * Signals a successful response of the server `load` function.
@@ -207,11 +224,25 @@ export type ServerData =
  */
 export interface ServerDataNode {
 	type: 'data';
+	/**
+	 * The serialized version of this contains a serialized representation of any deferred promises,
+	 * which will be resolved later through chunk nodes.
+	 */
 	data: Record<string, any> | null;
 	uses: Uses;
 	slash?: TrailingSlash;
 }
 
+/**
+ * Resolved data/error of a deferred promise.
+ */
+export interface ServerDataChunkNode {
+	type: 'chunk';
+	id: number;
+	data?: Record<string, any>;
+	error?: any;
+}
+
 /**
  * Signals that the server `load` function was not run, and the
  * client should use what it has in memory
@@ -318,6 +349,7 @@ export interface SSROptions {
 		}): string;
 		error(values: { message: string; status: number }): string;
 	};
+	version_hash: string;
 }
 
 export interface SSRErrorPage {

package/src/runtime/client/ambient.d.ts

@@ -1,30 +0,0 @@
-declare module '__CLIENT__/manifest.js' {
-	import { CSRPageNodeLoader, ClientHooks, ParamMatcher } from 'types';
-
-	/**
-	 * A list of all the error/layout/page nodes used in the app
-	 */
-	export const nodes: CSRPageNodeLoader[];
-
-	/**
-	 * A list of all layout node ids that have a server load function.
-	 * Pages are not present because it's shorter to encode it on the leaf itself.
-	 */
-	export const server_loads: number[];
-
-	/**
-	 * A map of `[routeId: string]: [leaf, layouts, errors]` tuples, which
-	 * is parsed into an array of routes on startup. The numbers refer to the indices in `nodes`.
-	 * If the leaf number is negative, it means it does use a server load function and the complement is the node index.
-	 * The route layout and error nodes are not referenced, they are always number 0 and 1 and always apply.
-	 */
-	export const dictionary: Record<string, [leaf: number, layouts: number[], errors?: number[]]>;
-
-	export const matchers: Record<string, ParamMatcher>;
-
-	export const hooks: ClientHooks;
-}
-
-declare module '__GENERATED__/root.svelte' {
-	export { SvelteComponent as default } from 'svelte';
-}