@skgo/sveltekit-adapter 0.16.2 → 0.16.4

package/package.json

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

package/skgo-adapter/app-server.js

@@ -23,7 +23,8 @@
 // below shadows the star, which is how the four substitutions take effect.
 import * as real from 'skgo:kit/remote';
 import { stringify_remote_arg } from 'skgo:kit/shared';
-import { HttpError, Redirect } from '@sveltejs/kit/internal/server';
+import { HandledHttpError, HttpError, Redirect } from '@sveltejs/kit/internal';
+import { DEV } from 'esm-env';
 import { parse } from 'skgo:kit/transport';
 
 export * from 'skgo:kit/app-server';
@@ -47,6 +48,9 @@ export * from 'skgo:kit/app-server';
 async function host(id, payload) {
 	const raw = await globalThis.__skgo_remote(id, payload);
 	const res = JSON.parse(raw);
+	if (res.h) {
+		throw new HandledHttpError(res.h);
+	}
 	if (res.r) {
 		throw new Redirect(res.r.status, res.r.location);
 	}
@@ -64,9 +68,13 @@ export function query(validate_or_fn, maybe_fn) {
 
 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);
+	const hasValidator = typeof maybe_fn === 'function';
+	const normalizedOptions = options ?? (hasValidator ? undefined : maybe_fn);
+	const wrapper = !DEV && !normalizedOptions?.dynamic
+		? real.prerender('unchecked', fn, normalizedOptions)
+		: hasValidator
+			? real.prerender(validate_or_fn, fn, options)
+			: real.prerender(fn, maybe_fn);
 	return wrapper;
 }
 

package/skgo-adapter/entry.js

@@ -20,6 +20,7 @@ import {
 	SvelteKitError,
 	ValidationError
 } from '@sveltejs/kit/internal/server';
+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';
@@ -47,6 +48,7 @@ init_transport(transport ?? {});
  * skgo has no handleError hook, so there is nothing here to await or merge.
  */
 function handle_error(error) {
+	if (error instanceof HandledHttpError) return error.body;
 	if (error instanceof HttpError) return error.body;
 	if (error instanceof SvelteKitError) return { status: error.status, message: error.text };
 	if (error instanceof ValidationError) return { status: 400, message: 'Bad Request' };
@@ -418,6 +420,8 @@ globalThis.__skgo_render = function (req_json) {
 			(err) => {
 				if (err instanceof Redirect) {
 					result.redirect = { status: err.status, location: err.location };
+				} else if (err instanceof HandledHttpError) {
+					result.handled_error = err.body;
 				} else {
 					result.failure = (err && (err.stack || err.message)) || String(err);
 				}
@@ -427,6 +431,8 @@ globalThis.__skgo_render = function (req_json) {
 	} catch (err) {
 		if (err instanceof Redirect) {
 			result.redirect = { status: err.status, location: err.location };
+		} else if (err instanceof HandledHttpError) {
+			result.handled_error = err.body;
 		} else {
 			result.failure = (err && (err.stack || err.message)) || String(err);
 		}

package/skgo-adapter.js

@@ -1,4 +1,5 @@
 import {
+	linkSync,
 	existsSync,
 	mkdtempSync,
 	mkdirSync,
@@ -7,12 +8,14 @@ import {
 	realpathSync,
 	rmSync,
 	statSync,
+	unlinkSync,
 	writeFileSync
 } from 'node:fs';
+import { createHash } from 'node:crypto';
 import { spawn } from 'node:child_process';
 import { createRequire } from 'node:module';
 import { tmpdir } from 'node:os';
-import { basename, dirname, join, relative, resolve } from 'node:path';
+import { basename, dirname, join, relative, resolve, sep } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { gojaDevEnvironment, gojaDevUnchangedFiles, gojaEnvironment, goEnvironmentValues, nodeTable, SSR_TARGET } from './skgo-adapter/env.js';
 import { identity } from './skgo-adapter/identity.js';
@@ -250,6 +253,7 @@ export default function skgo({ out = 'build', precompress = true } = {}) {
 				await builder.compress(`${out}/client`);
 				if (existsSync(`${out}/prerendered`)) await builder.compress(`${out}/prerendered`);
 			}
+			const prerenderedFiles = relocateQueryPrerenderedFiles(`${out}/prerendered`, out);
 
 			// `builder` has no writeJson in kit 3.0.0-next.27 (it existed on the
 			// kit 2 line); write the manifest ourselves.
@@ -314,6 +318,7 @@ export default function skgo({ out = 'build', precompress = true } = {}) {
 						})),
 						remotes: generated.remotes,
 						prerendered,
+						...(Object.keys(prerenderedFiles).length > 0 ? { prerenderedFiles } : {}),
 						precompressed: precompress
 					},
 					null,
@@ -331,6 +336,37 @@ export default function skgo({ out = 'build', precompress = true } = {}) {
 	};
 }
 
+/**
+ * Kit's native prerender filenames include query strings. Move only the
+ * adapter-owned copy of those files to safe build paths so Go's embed patterns
+ * can include them, while retaining the exact Kit filename as the manifest key.
+ * Hard-link-then-unlink publishes without replacing an existing destination.
+ *
+ * @param {string} root
+ * @param {string} out
+ * @returns {Record<string, string>}
+ */
+function relocateQueryPrerenderedFiles(root, out) {
+	if (!existsSync(root)) return {};
+	const mapping = {};
+	for (const file of walk(root)) {
+		const logical = relative(root, file).split(sep).join('/');
+		if (!logical.includes('?')) continue;
+		const digest = createHash('sha256').update(logical, 'utf8').digest('hex');
+		const physical = `prerendered-files/${digest}`;
+		const destination = join(out, physical);
+		mkdirSync(dirname(destination), { recursive: true });
+		try {
+			linkSync(file, destination);
+		} catch (error) {
+			throw new Error(`skgo: cannot publish query prerendered file ${logical} at ${physical}: ${error}`);
+		}
+		unlinkSync(file);
+		mapping[logical] = physical;
+	}
+	return mapping;
+}
+
 /**
  * Reads what `skgo generate` emitted.
  *