@skgo/sveltekit-adapter 0.12.0 → 0.13.1

package/package.json

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

package/skgo-adapter/app-server.js

@@ -18,7 +18,7 @@
 // host binding is the only path by which a value can reach the engine.
 //
 // Everything this file does not name is kit's, by `export *`: `read`,
-// `getRequestEvent`, `prerender` and `requested` come from kit's own module,
+// `getRequestEvent` and `requested` come from kit's own module,
 // and an export kit adds arrives without an edit here. An explicit export
 // below shadows the star, which is how the four substitutions take effect.
 import * as real from 'skgo:kit/remote';
@@ -62,6 +62,14 @@ export function query(validate_or_fn, maybe_fn) {
 	return wrapper;
 }
 
+export function prerender(validate_or_fn, maybe_fn, options) {
+	const fn = (arg) => host(wrapper.__.id, stringify_remote_arg(arg));
+	const wrapper = typeof maybe_fn === 'function'
+		? real.prerender(validate_or_fn, fn, options)
+		: real.prerender(fn, maybe_fn);
+	return wrapper;
+}
+
 /**
  * Calls Go once for a whole batch. Kit's own enqueue has already collected
  * every call made to this function in one macrotask and deduplicated them by

package/skgo-adapter.js

@@ -84,6 +84,7 @@ export default function skgo({ out = 'build', precompress = true } = {}) {
 	let prerenderRoot;
 	let prerenderBuild;
 	let unflatten;
+	let stringify;
 	let transportDecoders = {};
 	async function buildPrerenderBinary() {
 		if (!prerenderBuild) {
@@ -92,11 +93,11 @@ export default function skgo({ out = 'build', precompress = true } = {}) {
 				if (!generated.prerender) throw new Error('skgo: generated prerender command is missing');
 				prerenderRoot = resolve(process.cwd(), generated.prerender.root);
 				const dir = mkdtempSync(join(tmpdir(), 'skgo-prerender-'));
-				prerenderBinary = join(dir, 'loads');
+				prerenderBinary = join(dir, 'build');
 				await runPrerenderCommand('go', ['build', '-o', prerenderBinary, generated.prerender.package], prerenderRoot);
 				process.on('exit', () => rmSync(dir, { recursive: true, force: true }));
 				const fromKit = createRequire(realpathSync(join(process.cwd(), 'node_modules/@sveltejs/kit/package.json')));
-				({ unflatten } = await import(pathToFileURL(fromKit.resolve('devalue')).href));
+				({ unflatten, stringify } = await import(pathToFileURL(fromKit.resolve('devalue')).href));
 				const hooks = join(process.cwd(), '.svelte-kit/output/server/entries/hooks.universal.js');
 				if (existsSync(hooks)) {
 					const { transport = {} } = await import(pathToFileURL(hooks).href);
@@ -122,6 +123,7 @@ export default function skgo({ out = 'build', precompress = true } = {}) {
 							headers.cookie = [cookies.map(({ name, value }) => `${encodeURIComponent(name)}=${encodeURIComponent(value)}`).join('; ')];
 						}
 						const request = {
+							kind: 'load',
 							module,
 							url: event.url.href,
 							routeId: event.route.id,
@@ -165,6 +167,17 @@ export default function skgo({ out = 'build', precompress = true } = {}) {
 							}
 						}
 						return answer;
+					},
+					async skgoPrerenderRemote(module, name, arg, event) {
+						await buildPrerenderBinary();
+						const payload = arg === undefined ? '' : Buffer.from(stringify(arg)).toString('base64url');
+						const request = {
+							kind: 'remote', module, name, payload, url: event.url.href,
+							headers: Object.fromEntries([...event.request.headers].map(([key, value]) => [key, [value]]))
+						};
+						const raw = await runPrerenderCommand(prerenderBinary, [], prerenderRoot, JSON.stringify(request));
+						const answer = JSON.parse(raw);
+						return unflatten(JSON.parse(answer.data), transportDecoders)._;
 					}
 				})
 			};
@@ -194,8 +207,10 @@ export default function skgo({ out = 'build', precompress = true } = {}) {
 			checkRemoteIds(`${out}/client`, generated.remotes, hashes);
 
 			builder.writePrerendered(`${out}/prerendered`);
-			for (const file of walk(`${out}/prerendered`)) {
-				if (file.endsWith('.html')) authorizePrerenderedScripts(file);
+			if (existsSync(`${out}/prerendered`)) {
+				for (const file of walk(`${out}/prerendered`)) {
+					if (file.endsWith('.html')) authorizePrerenderedScripts(file);
+				}
 			}
 			const prerendered = readPrerendered(builder);
 			// The SPA shell is still emitted: it is what a page whose branch turns
@@ -228,7 +243,7 @@ export default function skgo({ out = 'build', precompress = true } = {}) {
 			// `precompress: true` default.
 			if (precompress) {
 				await builder.compress(`${out}/client`);
-				await builder.compress(`${out}/prerendered`);
+				if (existsSync(`${out}/prerendered`)) await builder.compress(`${out}/prerendered`);
 			}
 
 			// `builder` has no writeJson in kit 3.0.0-next.27 (it existed on the