@skgo/sveltekit-adapter 0.9.5 → 0.10.1

package/package.json

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

package/skgo-adapter/entry.js

@@ -22,7 +22,7 @@ import {
 } from '@sveltejs/kit/internal/server';
 import * as devalue from 'skgo:devalue';
 import { decoders, init_transport, parse } from 'skgo:kit/transport';
-import { components } from 'skgo:nodes';
+import { components, universalLoads } from 'skgo:nodes';
 import { transport } from 'skgo:hooks';
 
 /**
@@ -218,7 +218,7 @@ function node_data(node) {
 	});
 }
 
-function build_props(req, url) {
+async function build_props(req, url, event, state) {
 	const form = req.form ? devalue.parse(req.form, decoders) : null;
 	const page = {
 		error: req.error ?? null,
@@ -248,7 +248,32 @@ function build_props(req, url) {
 	let data = props.page.data;
 
 	for (let i = 0; i < branch.length; i += 1) {
-		data = { ...data, ...node_data(branch[i]) };
+		const server_data = node_data(branch[i]);
+		const load = universalLoads[branch[i].node];
+		const parent_data = data;
+		const result = load
+			? await with_request_store({ event, state }, () =>
+				load.call(null, {
+					url,
+					params: req.params ?? {},
+					data: server_data,
+					route: { id: req.route_id ?? null },
+					parent: async () => parent_data,
+					depends: () => {},
+					untrack: (fn) => fn(),
+					fetch: () => {
+						throw new Error('skgo: universal load fetch is not supported during rendering');
+					},
+					setHeaders: () => {
+						throw new Error('skgo: universal load setHeaders is not supported during rendering');
+					}
+				})
+			)
+			: server_data;
+		if (result != null && Object.getPrototypeOf(result) !== Object.prototype) {
+			throw new Error('skgo: universal load must return a plain object');
+		}
+		data = { ...data, ...result };
 		current_node.data = data;
 
 		if (i < branch.length - 1) {
@@ -344,48 +369,48 @@ globalThis.__skgo_render = function (req_json) {
 	try {
 		const req = JSON.parse(req_json);
 		const url = new URL(req.url);
-		const props = build_props(req, url);
 		const state = make_state();
 		const event = make_event(req, url);
-
-		result.status = props.page.status;
-		result.error = req.error ?? null;
-
-		const options = {
-			context: new Map([['__request__', { page: props.page }]]),
-			// kit's own \`csp.script_needs_nonce ? { nonce: csp.nonce } : {
-			// hash: csp.script_needs_hash }\` (page/render.js:198), passed to
-			// Svelte's own renderer so the one inline script Svelte can still
-			// emit on its own — its hydratable-async-block script
-			// (internal/server/renderer.js's #hydratable_block, for a
-			// component's own top-level await) — carries the same nonce or
-			// hash decision the boot script gets from Go (csp.go). Go decided
-			// which branch this request is in before the engine ever ran;
-			// req.csp carries only the answer.
-			csp: req.csp.nonce ? { nonce: req.csp.nonce } : { hash: !!req.csp.hash },
-			// kit's own (page/render.js): the transform every error boundary's
-			// error passes through on its way to the failed snippet. It is
-			// what makes page.status and page.error inside a rendering
-			// component the values kit would give, and what turns an
-			// unexpected throw into Internal Error rather than a stack trace on
-			// the page. A redirect is rethrown, because a redirect is an answer
-			// for the whole document rather than for one boundary.
-			transformError: (e) => {
-				if (e instanceof Redirect) throw e;
-				const handled = handle_error(e);
-				result.error = handled;
-				result.status = handled.status;
-				props.page.error = handled;
-				props.page.status = handled.status;
-				return handled;
-			}
-		};
-		// seed_form runs inside the request store rather than before it: a
-		// keyed submission's call to for(key) needs the request store, the
-		// same as the page component's own call to it does.
-		const promise = with_request_store({ event, state }, () => {
-			seed_form(req, state);
-			return render(Root, { ...options, props });
+		const props_promise = build_props(req, url, event, state);
+		const promise = props_promise.then((props) => {
+			result.status = props.page.status;
+			result.error = req.error ?? null;
+			const options = {
+				context: new Map([['__request__', { page: props.page }]]),
+				// kit's own \`csp.script_needs_nonce ? { nonce: csp.nonce } : {
+				// hash: csp.script_needs_hash }\` (page/render.js:198), passed to
+				// Svelte's own renderer so the one inline script Svelte can still
+				// emit on its own — its hydratable-async-block script
+				// (internal/server/renderer.js's #hydratable_block, for a
+				// component's own top-level await) — carries the same nonce or
+				// hash decision the boot script gets from Go (csp.go). Go decided
+				// which branch this request is in before the engine ever ran;
+				// req.csp carries only the answer.
+				csp: req.csp.nonce ? { nonce: req.csp.nonce } : { hash: !!req.csp.hash },
+				// kit's own (page/render.js): the transform every error boundary's
+				// error passes through on its way to the failed snippet. It is
+				// what makes page.status and page.error inside a rendering
+				// component the values kit would give, and what turns an
+				// unexpected throw into Internal Error rather than a stack trace on
+				// the page. A redirect is rethrown, because a redirect is an answer
+				// for the whole document rather than for one boundary.
+				transformError: (e) => {
+					if (e instanceof Redirect) throw e;
+					const handled = handle_error(e);
+					result.error = handled;
+					result.status = handled.status;
+					props.page.error = handled;
+					props.page.status = handled.status;
+					return handled;
+				}
+			};
+			// seed_form runs inside the request store rather than before it: a
+			// keyed submission's call to for(key) needs the request store, the
+			// same as the page component's own call to it does.
+			return with_request_store({ event, state }, () => {
+				seed_form(req, state);
+				return render(Root, { ...options, props });
+			});
 		});
 
 		Promise.resolve(promise).then(

package/skgo-adapter/env.js

@@ -428,14 +428,21 @@ function basenameOf(file) {
  * kit's build produced, in the manifest's own node order.
  *
  * @param {string} root
- * @param {Array<{ component: string | null }>} nodes
+ * @param {Array<{ component: string | null, universal: string | null }>} nodes
  */
 export function nodeTable(root, nodes) {
 	/** @type {string[]} */
 	const imports = [];
 	/** @type {string[]} */
 	const table = [];
+	const loads = [];
 	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`);
+		} else {
+			loads.push('undefined');
+		}
 		if (!node.component) {
 			table.push('undefined');
 			return;
@@ -443,7 +450,7 @@ export function nodeTable(root, nodes) {
 		imports.push(`import N${i} from ${JSON.stringify(join(root, node.component))};`);
 		table.push(`N${i}`);
 	});
-	return `${imports.join('\n')}\nexport const components = [${table.join(', ')}];\n`;
+	return `${imports.join('\n')}\nexport const components = [${table.join(', ')}];\nexport const universalLoads = [${loads.join(', ')}];\n`;
 }
 
 /**
@@ -565,7 +572,14 @@ function devNodeTable(manifest, root) {
 	const imports = [];
 	/** @type {string[]} */
 	const table = [];
+	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;
@@ -573,7 +587,7 @@ function devNodeTable(manifest, root) {
 		imports.push(`import N${index} from ${JSON.stringify(resolve(root, node.component))};`);
 		table.push(`N${index}`);
 	}
-	return `${imports.join('\n')}\nexport const components = [${table.join(', ')}];\n`;
+	return `${imports.join('\n')}\nexport const components = [${table.join(', ')}];\nexport const universalLoads = [${loads.join(', ')}];\n`;
 }
 
 /**

package/skgo-adapter.js

@@ -389,16 +389,10 @@ async function readNodes(builder, source, kit) {
 		}
 		const module = await import(pathToFileURL(file).href);
 
-		if (typeof module.universal?.load === 'function') {
-			throw new Error(
-				`skgo: ${module.universal_id} exports a \`load\`. Every load in a skgo app is written in Go; ` +
-					'a universal load would have to run in the browser and in the SSR engine, and skgo runs neither.'
-			);
-		}
-
 		nodes.push({
 			index,
 			server: module.server_id ?? '',
+			universal: typeof module.universal?.load === 'function' ? module.universal_id : null,
 			component: module.component ? componentSource(file, dir) : null,
 			imports: module.imports ?? [],
 			stylesheets: module.stylesheets ?? [],
@@ -415,6 +409,7 @@ async function readNodes(builder, source, kit) {
  * @typedef {{
  *   index: number,
  *   server: string,
+ *   universal: string | null,
  *   component: string | null,
  *   imports: string[],
  *   stylesheets: string[],