@skgo/sveltekit-adapter 0.22.0 → 0.28.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@skgo/sveltekit-adapter",
-	"version": "0.22.0",
+	"version": "0.28.2",
 	"description": "SvelteKit adapter for skgo: builds a frontend that a Go binary renders and answers",
 	"keywords": [
 		"adapter",
@@ -44,6 +44,7 @@
 		"skgo-adapter/identity.js",
 		"skgo-adapter/polyfill.js",
 		"skgo-adapter/prerender-csp.js",
+		"skgo-adapter/prerender-modules.js",
 		"skgo-adapter/prerender.js",
 		"skgo-adapter/prerender.d.ts"
 	],

package/skgo-adapter/env.js

@@ -1067,7 +1067,12 @@ export function gojaDevUnchangedFiles({ out = 'build' } = {}) {
 
 		config(config) {
 			const emitted = posix(resolve(config.root ?? process.cwd(), out));
-			return { server: { watch: { ignored: [emitted, `${emitted}/**`] } } };
+			// Chokidar's ordinary change path drops a second edit inside 50 ms.
+			// Its supported pending-write path instead delivers settled contents.
+			const stability = config.server?.watch?.awaitWriteFinish === undefined
+				? { awaitWriteFinish: { stabilityThreshold: 200, pollInterval: 25 } }
+				: {};
+			return { server: { watch: { ...stability, ignored: [emitted, `${emitted}/**`] } } };
 		},
 
 		configureServer(server) {
@@ -1087,13 +1092,18 @@ export function gojaDevUnchangedFiles({ out = 'build' } = {}) {
 			// Kit validates templates synchronously from its watcher. An in-place
 			// save can expose truncated bytes; report that validation error but
 			// keep the watcher alive so the completed save can regenerate Kit.
+			// Kit's listener was registered before this post plugin; wrapping emit
+			// catches its synchronous throw before it escapes the filesystem callback.
 			const notify = (receiver, event, args, file) => {
 				try {
 					return emit.call(receiver, event, ...args);
 				} catch (error) {
 					const authored = typeof file === 'string' ? relative(server.config.root, file) : null;
-					if (!(error instanceof Error) || authored === null ||
-						!['%sveltekit.head%', '%sveltekit.body%'].some(tag => error.message === `${authored} is missing ${tag}`)) throw error;
+					const [code, body] = error instanceof Error ? error.message.split('\n') : [];
+					const templateError = code === 'app_template_missing'
+						? body === `${authored} does not exist`
+						: code === 'app_template_tag_missing' && ['%sveltekit.head%', '%sveltekit.body%'].some(tag => body === `${authored} is missing \`${tag}\``);
+					if (!(error instanceof Error) || error.name !== 'SvelteKit error' || authored === null || !templateError) throw error;
 					known.delete(posix(file));
 					server.config.logger.error(error.stack ?? error.message);
 					server.ws.send({ type: 'error', err: { message: error.message, stack: error.stack ?? '', plugin: 'skgo-dev-unchanged-files' } });

package/skgo-adapter/generated.js

@@ -64,7 +64,7 @@ export function validateGenerated(parsed) {
 			);
 		}
 	}
-	return { remotes: parsed.remotes, loads: parsed.loads, actions: parsed.actions, endpoints: parsed.endpoints, prerender: parsed.prerender };
+	return { remotes: parsed.remotes, loads: parsed.loads, actions: parsed.actions, endpoints: parsed.endpoints, prerender: parsed.prerender, build: parsed.build };
 }
 
 /**

package/skgo-adapter/prerender-modules.js

@@ -0,0 +1,134 @@
+import { readFileSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import { join, relative } from 'node:path';
+import { pathToFileURL } from 'node:url';
+import { validateGenerated } from './generated.js';
+
+// Use the parser shipped with the application's Vite, as the goja environment
+// does. Parsing the original TS/JS declarations preserves Kit's native wrappers,
+// actions, types and module identities; only build callback bodies change.
+const app = createRequire(join(process.cwd(), 'package.json'));
+const { parseSync } = await import(pathToFileURL(app.resolve('vite/rolldown/experimental')).href);
+const header = '// Code generated by skgo. DO NOT EDIT.';
+const helper = '@skgo/sveltekit-adapter/prerender';
+
+export function prerenderModules() {
+	let root;
+	let generated;
+	return {
+		name: 'skgo-prerender-modules',
+		apply: 'build',
+		applyToEnvironment: (environment) => environment.name === 'ssr',
+		configResolved(config) { root = config.root; },
+		buildStart() {
+			generated = validateGenerated(JSON.parse(readFileSync(join(root, 'skgo.remotes.json'), 'utf8')));
+			if (!generated.build || typeof generated.build !== 'object' || Array.isArray(generated.build)) {
+				throw new Error('skgo: missing build declarations; run `go generate ./...`.');
+			}
+			for (const [module, declaration] of Object.entries(generated.build)) {
+				if (!module.startsWith('src/') || module.split('/').some((part) => part === '.' || part === '..') || !/\.(ts|js)$/.test(module) || !declaration || typeof declaration !== 'object' || Array.isArray(declaration)) {
+					throw new Error(`skgo: malformed build declaration for ${module}; run \`go generate ./...\`.`);
+				}
+				const fields = Object.keys(declaration);
+				if (fields.length !== 1 || !['source', 'remotes', 'endpoint', 'hook'].includes(fields[0]) ||
+					('source' in declaration && (typeof declaration.source !== 'string' || !declaration.source)) ||
+					('remotes' in declaration && (!Array.isArray(declaration.remotes) || !declaration.remotes.length)) ||
+					('endpoint' in declaration && declaration.endpoint !== true) ||
+					('hook' in declaration && declaration.hook !== true)) {
+					throw new Error(`skgo: malformed build declaration for ${module}; run \`go generate ./...\`.`);
+				}
+			}
+			for (const module of generated.loads) {
+				if (typeof generated.build[module]?.source !== 'string' || !generated.build[module].source) {
+					throw new Error(`skgo: missing Go load source for ${module}; run \`go generate ./...\`.`);
+				}
+			}
+		},
+		load(id) {
+			const module = relative(root, id).split('\\').join('/');
+			if (!/\.(ts|js)$/.test(module)) return;
+			const declaration = generated.build[module];
+			// Inspect server declarations even without metadata, so a missing
+			// entry cannot quietly execute a generated throwing stub at build time.
+			if (!declaration && !/(\.remote|\/\+(page|layout)\.server|\/\+server|\/hooks\.server)\.(ts|js)$/.test(module)) return;
+			const code = readFileSync(id, 'utf8');
+			if (!code.startsWith(header)) {
+				if (declaration) throw new Error(`skgo: build declaration for authored module ${module}`);
+				return;
+			}
+			const parsed = parseSync(id, code);
+			if (parsed.errors.length) throw new Error(`skgo: cannot parse generated module ${module}`);
+			const exports = new Map();
+			for (const node of parsed.program.body) {
+				if (node.type !== 'ExportNamedDeclaration' || node.exportKind === 'type') continue;
+				for (const item of node.declaration?.declarations ?? []) exports.set(item.id.name, item.init);
+			}
+			const fail = () => { throw new Error(`skgo: build declarations disagree with ${module}; run \`go generate ./...\`.`); };
+			const edits = [];
+			let imports = '';
+			if (exports.has('load')) {
+				if (!declaration?.source || !generated.loads.includes(module)) fail();
+				const fn = exports.get('load');
+				if (fn?.type !== 'ArrowFunctionExpression' || fn.params.length !== 1) fail();
+				const event = fn.params[0].name;
+				imports += "import { error as $skgoError, redirect as $skgoRedirect } from '@sveltejs/kit';\n";
+				edits.push([fn.body.start, fn.body.end, `{
+	const bridge = ${event}.platform?.skgoPrerenderLoad;
+	if (!bridge) throw new Error('skgo: prerender Go load bridge unavailable');
+	const answer = await bridge(${JSON.stringify(module)}, ${JSON.stringify(declaration.source)}, ${event});
+	if (answer.redirect) $skgoRedirect(answer.redirect.status, answer.redirect.location);
+	if (answer.error) $skgoError(answer.error.status, answer.error.message);
+	if (answer.data === undefined) throw new Error('skgo: prerender Go load returned no data');
+	return answer.data;
+}`]);
+			} else if (declaration?.source) fail();
+			if (/\/\+server\.(ts|js)$/.test(module)) {
+				if (declaration?.endpoint !== true) fail();
+				for (const fn of exports.values()) {
+					if (!fn) fail();
+					edits.push([fn.start, fn.end, `(event) => {
+	const bridge = event.platform?.skgoPrerenderEndpoint;
+	if (!bridge) throw new Error('skgo: prerender Go endpoint bridge unavailable');
+	return bridge(event);
+}`]);
+				}
+			}
+			const remotes = declaration?.remotes ?? [];
+			if (!Array.isArray(remotes)) fail();
+			const prerenders = [...exports].filter(([, fn]) => fn?.type === 'CallExpression' && fn.callee.name === 'prerender');
+			if (prerenders.length !== remotes.length) fail();
+			if (remotes.length) imports += "import { getRequestEvent as $skgoEvent } from '$app/server';\n";
+			if (remotes.some((fn) => fn.inputs)) imports += `import { remoteInputs as $skgoInputs } from '${helper}';\n`;
+			const seen = new Set();
+			for (const remote of remotes) {
+				const call = exports.get(remote.name);
+				if (seen.has(remote.name) || typeof remote.argument !== 'boolean' || typeof remote.inputs !== 'boolean' || call?.callee.name !== 'prerender') fail();
+				seen.add(remote.name);
+				const callback = call.arguments[remote.argument ? 1 : 0];
+				if (call.arguments.length !== (remote.argument ? 2 : 1) || callback?.type !== 'ArrowFunctionExpression' || callback.params.length !== (remote.argument ? 1 : 0)) fail();
+				const arg = remote.argument ? callback.params[0].name : 'undefined';
+				edits.push([callback.body.start, callback.body.end, `{
+	const event = $skgoEvent();
+	const bridge = event.platform?.skgoPrerenderRemote;
+	if (!bridge) throw new Error('skgo: prerender Go remote bridge unavailable');
+	return bridge(${JSON.stringify(module)}, ${JSON.stringify(remote.name)}, ${arg}, event);
+}`]);
+				if (remote.inputs) edits.push([callback.end, callback.end, `, { inputs: () => $skgoInputs(${JSON.stringify(module)}, ${JSON.stringify(remote.name)}) }`]);
+			}
+			if (/\/hooks\.server\.(ts|js)$/.test(module)) {
+				if (declaration?.hook !== true || exports.has('handle') || exports.has('handleFetch')) fail();
+				return `import { requestHandle, requestFetch } from '${helper}';
+${code}
+export const handle = ({ event, resolve }) => requestHandle(event, resolve);
+export const handleFetch = (input) => requestFetch(input);
+`;
+			}
+			if (!edits.length) return;
+			let result = code;
+			for (const [start, end, replacement] of edits.sort((a, b) => b[0] - a[0])) {
+				result = result.slice(0, start) + replacement + result.slice(end);
+			}
+			return imports + result;
+		}
+	};
+}

package/skgo-adapter/prerender.d.ts

@@ -1,6 +1,6 @@
-/** Internal bridge used by generated declared-prerender input modules. */
+/** Internal bridge used by adapter build modules. */
 export function remoteInputs<Input = unknown>(module: string, name: string): Promise<Input[]>;
 
-/** Build-only logical request lifecycle used by generated server hooks. */
+/** Build-only logical request lifecycle used by adapter build hooks. */
 export function requestHandle(event: import('@sveltejs/kit').RequestEvent, resolve: (event: import('@sveltejs/kit').RequestEvent, options?: import('@sveltejs/kit/hooks').ResolveOptions) => Promise<Response>): Promise<Response>;
 export function requestFetch(input: Parameters<import('@sveltejs/kit/hooks').HandleFetch>[0]): Promise<Response>;

package/skgo-adapter.js

@@ -22,6 +22,7 @@ import {
 	remoteLoad
 } from './skgo-adapter/prerender.js';
 import { gojaDevEnvironment, gojaDevUnchangedFiles, gojaEnvironment, goEnvironmentValues, nodeTable, SSR_TARGET } from './skgo-adapter/env.js';
+import { prerenderModules } from './skgo-adapter/prerender-modules.js';
 import { identity } from './skgo-adapter/identity.js';
 import { checkEndpoints, validateGenerated } from './skgo-adapter/generated.js';
 import { authorizePrerenderedScripts } from './skgo-adapter/prerender-csp.js';
@@ -115,7 +116,7 @@ export default function skgo({ out = 'build', precompress = true, prerenderPacka
 		// compiles the SSR bundle in is also declared in `vite dev`, where Go
 		// pulls one transformed module at a time out of it instead. Each plugin
 		// states its own `apply`, so only one of them is ever live.
-		vite: { plugins: { pre: [prerenderOwnerPlugin], post: [environment.plugin, goja.plugin, gojaDevEnvironment(), gojaDevUnchangedFiles({ out })] } },
+		vite: { plugins: { pre: [prerenderOwnerPlugin, prerenderModules()], post: [environment.plugin, goja.plugin, gojaDevEnvironment(), gojaDevUnchangedFiles({ out })] } },
 		async adapt(builder) {
 			let failure;
 			try {