@skgo/sveltekit-adapter 0.32.0 → 0.32.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@skgo/sveltekit-adapter",
-	"version": "0.32.0",
+	"version": "0.32.1",
 	"description": "SvelteKit adapter for skgo: builds a frontend that a Go binary renders and answers",
 	"keywords": [
 		"adapter",

package/skgo-adapter/entry.js

@@ -23,7 +23,7 @@ import {
 import { HandledHttpError } from '@sveltejs/kit/internal';
 import * as devalue from 'skgo:devalue';
 import { decoders, init_transport, parse } from 'skgo:kit/transport';
-import { components, universalLoads } from 'skgo:nodes';
+import { componentLoaders, universalLoaders } from 'skgo:nodes';
 import { transport } from 'skgo:hooks';
 import { serialize_data } from 'skgo:kit/serialize-data';
 import { create_universal_fetch } from 'skgo:kit/load-data';
@@ -227,13 +227,18 @@ async function build_props(req, url, event, state, fetched, serialized) {
 	};
 
 	const branch = req.branch ?? [];
-	const error_components = (req.error_components ?? []).map((i) =>
-		i == null ? undefined : components[i]
-	);
+	const error_components = await Promise.all((req.error_components ?? []).map(async (i) => {
+		try {
+			return i == null ? undefined : await componentLoaders[i]?.();
+		} catch {
+			// Kit skips error components that cannot load (runtime/error-chain.js).
+			return undefined;
+		}
+	}));
 
 	const props = new Props({
 		page,
-		tree: new RenderNode(components[branch[0].node], undefined),
+		tree: new RenderNode(await componentLoaders[branch[0].node]?.(), undefined),
 		form,
 		error: req.error ?? undefined
 	});
@@ -243,7 +248,7 @@ async function build_props(req, url, event, state, fetched, serialized) {
 
 	for (let i = 0; i < branch.length; i += 1) {
 		const server_data = node_data(branch[i]);
-		const load = universalLoads[branch[i].node];
+		const load = await universalLoaders[branch[i].node]?.();
 		const parent_data = data;
 		const result = load
 			? await with_request_store({ event, state }, () =>
@@ -270,7 +275,7 @@ async function build_props(req, url, event, state, fetched, serialized) {
 
 		if (i < branch.length - 1) {
 			current_node = current_node.child = new RenderNode(
-				components[branch[i + 1].node],
+				await componentLoaders[branch[i + 1].node]?.(),
 				error_components[i + 1]
 			);
 		}

package/skgo-adapter/env.js

@@ -460,7 +460,7 @@ export function nodeTable(root, nodes) {
 	nodes.forEach((node, i) => {
 		if (node.universal) {
 			imports.push(`import * as U${i} from ${JSON.stringify(join(root, node.universal))};`);
-			loads.push(`U${i}.load`);
+			loads.push(`() => U${i}.load`);
 		} else {
 			loads.push('undefined');
 		}
@@ -469,9 +469,9 @@ export function nodeTable(root, nodes) {
 			return;
 		}
 		imports.push(`import N${i} from ${JSON.stringify(join(root, node.component))};`);
-		table.push(`N${i}`);
+		table.push(`() => N${i}`);
 	});
-	return `${imports.join('\n')}\nexport const components = [${table.join(', ')}];\nexport const universalLoads = [${loads.join(', ')}];\n`;
+	return `${imports.join('\n')}\nexport const componentLoaders = [${table.join(', ')}];\nexport const universalLoaders = [${loads.join(', ')}];\n`;
 }
 
 /**
@@ -613,26 +613,21 @@ function posix(p) {
  */
 function devNodeTable(manifest, root) {
 	if (!manifest) throw new Error('skgo: the live Kit manifest is not ready');
-	/** @type {string[]} */
-	const imports = [];
-	/** @type {string[]} */
-	const table = [];
+	const components = [];
 	const loads = [];
-	for (const [index, node] of manifest.nodes.entries()) {
-		if (node.universal) {
-			imports.push(`import * as U${index} from ${JSON.stringify(resolve(root, node.universal))};`);
-			loads.push(`U${index}.load`);
-		} else {
-			loads.push('undefined');
-		}
-		if (!node.component) {
-			table.push('undefined');
-			continue;
-		}
-		imports.push(`import N${index} from ${JSON.stringify(resolve(root, node.component))};`);
-		table.push(`N${index}`);
+	for (const node of manifest.nodes) {
+		// Kit's dev manifest supplies lazy component functions and resolves
+		// universal modules only when that node belongs to the requested page
+		// (exports/vite/dev/generate_manifest.js). Keep imports behind calls so
+		// bringing up the renderer cannot evaluate unrelated route modules.
+		components.push(node.component
+			? `() => import(${JSON.stringify(resolve(root, node.component))}).then(m => m.default)`
+			: 'undefined');
+		loads.push(node.universal
+			? `() => import(${JSON.stringify(resolve(root, node.universal))}).then(m => m.load)`
+			: 'undefined');
 	}
-	return `${imports.join('\n')}\nexport const components = [${table.join(', ')}];\nexport const universalLoads = [${loads.join(', ')}];\n`;
+	return `export const componentLoaders = [${components.join(', ')}];\nexport const universalLoaders = [${loads.join(', ')}];\n`;
 }
 
 /**