@kasperrt/smolter 0.3.0 → 0.3.2

package/dist/server/index.d.ts

@@ -6,5 +6,5 @@ import { type Route, type Router } from "../core/index.ts";
 /** Create one router per server request, await this, then render the provider. */
 export declare function loadRouter(routes: readonly Route[], input: string | Request): Promise<Router>;
 export { serialize } from "../core/index.ts";
-/** Dispatch an HTTP data request to a registered server loader or action. */
+/** Dispatch a server data request with an explicit private cache policy. */
 export declare function handleRequest(routes: readonly Route[], request: Request): Promise<Response>;

package/dist/server/index.js

@@ -2,6 +2,7 @@ import { safeWrapAsync } from "../core/errors.js";
 import { matchRoutes } from "../core/match.js";
 import { createDataRouter } from "../core/router.js";
 import { serialize } from "../core/serialize.js";
+import { privateResponse } from "./private-response.js";
 //#region .generated/server/index.ts
 /**
 * Request-scoped server rendering and HTTP data dispatch.
@@ -46,7 +47,7 @@ async function loadRouter(routes, input) {
 	return router;
 }
 /** Dispatch an HTTP data request to a registered server loader or action. */
-async function handleRequest(routes, request) {
+async function dispatchRequest(routes, request) {
 	const match = matchRoutes(routes, new URL(request.url).pathname);
 	const reading = request.method === "GET";
 	if (!match) return Response.json({ error: "No route" }, { status: 404 });
@@ -67,10 +68,19 @@ async function handleRequest(routes, request) {
 	if (error) return Response.json({ error: error.message }, { status: 500 });
 	if (result.data instanceof Response) {
 		const location = result.data.headers.get("Location");
-		if (location) return new Response(null, { headers: { "X-Smolter-Redirect": location } });
+		if (location) {
+			const headers = new Headers(result.data.headers);
+			headers.delete("Location");
+			headers.set("X-Smolter-Redirect", location);
+			return new Response(null, { headers });
+		}
 		return result.data;
 	}
 	return Response.json(result.data ?? null, { headers: { "Cache-Control": "no-store" } });
 }
+/** Dispatch a server data request with an explicit private cache policy. */
+async function handleRequest(routes, request) {
+	return privateResponse(await dispatchRequest(routes, request));
+}
 //#endregion
 export { handleRequest, loadRouter, serialize };

package/dist/server/preact.d.ts

@@ -1,3 +1,3 @@
 /** Preact server rendering and HTTP data dispatch. @module */
-export { dispatchRoute, renderApplication, } from "./application.tsx";
+export { dispatchRoute, type RenderApplicationOptions, renderApplication, } from "./application.tsx";
 export * from "./index.ts";

package/dist/server/private-response.d.ts

@@ -0,0 +1,2 @@
+/** Transport data must not be cached by shared intermediaries or the browser. */
+export declare function privateResponse(response: Response): Response;

package/dist/server/private-response.js

@@ -0,0 +1,13 @@
+//#region .generated/server/private-response.ts
+/** Transport data must not be cached by shared intermediaries or the browser. */
+function privateResponse(response) {
+	const headers = new Headers(response.headers);
+	headers.set("Cache-Control", "private, no-store");
+	return new Response(response.body, {
+		status: response.status,
+		statusText: response.statusText,
+		headers
+	});
+}
+//#endregion
+export { privateResponse };

package/dist/server/stream-document.d.ts

@@ -0,0 +1,9 @@
+export declare function resolveHydration(value: unknown): Promise<unknown>;
+export interface StreamDocumentOptions {
+    hydration: Promise<unknown>;
+    nonce?: string;
+    signal: AbortSignal;
+    dispose: () => void;
+}
+/** Stream the shell immediately, then finalize the JSON snapshot before module scripts execute. */
+export declare function streamDocument(source: ReadableStream<Uint8Array>, options: StreamDocumentOptions): ReadableStream<Uint8Array>;

package/dist/server/stream-document.js

@@ -0,0 +1,78 @@
+import { serializeData } from "../core/serialize.js";
+//#region .generated/server/stream-document.ts
+async function resolveHydration(value) {
+	if (value instanceof Promise) return value.then(resolveHydration, (error) => ({ __smolterRejected: { message: error instanceof Error ? error.message : String(error) } }));
+	if (Array.isArray(value)) return Promise.all(value.map(resolveHydration));
+	if (value && typeof value === "object" && Object.getPrototypeOf(value) === Object.prototype) {
+		const entries = await Promise.all(Object.entries(value).map(async ([key, field]) => [key, await resolveHydration(field)]));
+		return Object.fromEntries(entries);
+	}
+	return value;
+}
+/** Stream the shell immediately, then finalize the JSON snapshot before module scripts execute. */
+function streamDocument(source, options) {
+	const reader = source.getReader();
+	const encoder = new TextEncoder();
+	const decoder = new TextDecoder();
+	let suffix = "";
+	let first = true;
+	let cancelled = false;
+	let finish;
+	const interrupted = new Promise((resolve) => {
+		finish = resolve;
+	});
+	const abort = () => {
+		finish();
+		reader.cancel().catch(() => {});
+	};
+	options.signal.addEventListener("abort", abort, { once: true });
+	if (options.signal.aborted) abort();
+	function dispose() {
+		options.signal.removeEventListener("abort", abort);
+		options.dispose();
+	}
+	return new ReadableStream({
+		async pull(controller) {
+			const result = await reader.read().catch((error) => ({ error }));
+			if ("error" in result) {
+				dispose();
+				controller.error(result.error);
+				return;
+			}
+			if (result.done) {
+				if (!options.signal.aborted) {
+					const value = await Promise.race([options.hydration, interrupted]);
+					if (cancelled) return;
+					if (options.signal.aborted) {
+						dispose();
+						controller.close();
+						return;
+					}
+					const hydration = serializeData(value);
+					const nonce = options.nonce ? ` nonce="${options.nonce.replaceAll("&", "&amp;").replaceAll("\"", "&quot;").replaceAll("<", "&lt;")}"` : "";
+					controller.enqueue(encoder.encode(`<script type="application/json"${nonce}>${hydration}<\/script><script${nonce}>(function(){var script=document.currentScript,payload=script.previousElementSibling,data=document.getElementById("smolter-data");if(data)data.textContent=payload.textContent;payload.remove();script.remove()})()<\/script>${suffix}`));
+				}
+				dispose();
+				controller.close();
+				return;
+			}
+			let chunk = decoder.decode(result.value, { stream: true });
+			if (first && !/^<!doctype/i.test(chunk)) chunk = `<!doctype html>${chunk}`;
+			first = false;
+			const closing = chunk.lastIndexOf("</body>");
+			if (closing !== -1) {
+				suffix = chunk.slice(closing);
+				chunk = chunk.slice(0, closing);
+			}
+			controller.enqueue(encoder.encode(chunk));
+		},
+		async cancel() {
+			cancelled = true;
+			finish();
+			dispose();
+			await reader.cancel();
+		}
+	});
+}
+//#endregion
+export { resolveHydration, streamDocument };

package/dist/vite/application/lazy-files.d.ts

@@ -1,2 +1,2 @@
 import { type Plugin } from "vite";
-export declare function lazyFiles(directory: string): Plugin;
+export declare function lazyFiles(directory: string, dataEndpoint?: string): Plugin;

package/dist/vite/application/lazy-files.js

@@ -3,7 +3,7 @@ import { readFile } from "node:fs/promises";
 import { resolve } from "node:path";
 import { transformWithOxc } from "vite";
 //#region .generated/vite/application/lazy-files.ts
-function lazyFiles(directory) {
+function lazyFiles(directory, dataEndpoint = "/_smolter") {
 	let root;
 	const modules = /* @__PURE__ */ new Map();
 	return {
@@ -45,13 +45,17 @@ function lazyFiles(directory) {
 			if (id !== "\0virtual:smolter/routes" || options?.ssr) return;
 			const routes = await flatRoutes(root);
 			if (routes instanceof Error) return this.error(routes.message);
+			modules.clear();
 			const definitions = [];
 			for (const route of routes) {
 				this.addWatchFile(route.file);
 				const source = await readFile(route.file, "utf8");
 				const transformed = await transformWithOxc(source, route.file);
 				const ast = this.parse(transformed.code);
-				const fields = { path: route.path };
+				const fields = {
+					path: route.path,
+					dataEndpoint
+				};
 				for (const statement of ast.body) {
 					if (statement.type === "ExportDefaultDeclaration") {
 						fields.default = true;

package/dist/vite/application/vite.d.ts

@@ -1,9 +1,10 @@
 import type { Plugin, UserConfig } from "vite";
 export interface ApplicationOptions {
     directory?: string;
+    dataEndpoint?: string;
     ssr?: boolean;
     splitRoutes?: boolean;
     resourceRequest?: (url: string) => boolean;
 }
 export declare const preactConfig: UserConfig;
-export declare function applicationPlugins({ directory, ssr, splitRoutes, resourceRequest, }?: ApplicationOptions): Plugin[];
+export declare function applicationPlugins({ directory, dataEndpoint, ssr, splitRoutes, resourceRequest, }?: ApplicationOptions): Plugin[];

package/dist/vite/application/vite.js

@@ -43,7 +43,7 @@ var preactConfig = {
 		"@kasperrt/smolter/preact/lazy-route"
 	] }
 };
-function applicationPlugins({ directory = "src/routes", ssr = true, splitRoutes = true, resourceRequest } = {}) {
+function applicationPlugins({ directory = "src/routes", dataEndpoint = "/_smolter", ssr = true, splitRoutes = true, resourceRequest } = {}) {
 	return [
 		{
 			name: "smolter-application",
@@ -60,7 +60,8 @@ function applicationPlugins({ directory = "src/routes", ssr = true, splitRoutes
 			},
 			configureServer(server) {
 				server.middlewares.use((incoming, outgoing, next) => {
-					if (!incoming.url?.startsWith("/_smolter?")) return next();
+					if (!incoming.url?.startsWith(`${dataEndpoint}?`)) return next();
+					outgoing.setHeader("Cache-Control", "private, no-store");
 					const run = async () => {
 						const target = new URL(incoming.url, "http://local").searchParams.get("url");
 						if (!target?.startsWith("/") || target.startsWith("//")) return send(new Response("Invalid route URL", { status: 400 }), outgoing);
@@ -74,6 +75,7 @@ function applicationPlugins({ directory = "src/routes", ssr = true, splitRoutes
 				return () => {
 					server.middlewares.use((incoming, outgoing, next) => {
 						if (!incoming.headers.accept?.includes("text/html") && !resourceRequest?.(incoming.originalUrl ?? incoming.url ?? "")) return next();
+						outgoing.setHeader("Cache-Control", "private, no-store");
 						const run = async () => {
 							const request = await webRequest(incoming, outgoing);
 							const response = await (await server.ssrLoadModule("/src/entry.server.tsx")).default(request, "/src/entry.client.tsx");
@@ -90,10 +92,11 @@ function applicationPlugins({ directory = "src/routes", ssr = true, splitRoutes
 			}
 		},
 		browserBoundary(),
-		...splitRoutes ? [lazyFiles(directory)] : [],
+		...splitRoutes ? [lazyFiles(directory, dataEndpoint)] : [],
 		routerPlugin({
 			directory,
-			framework: "preact"
+			framework: "preact",
+			dataEndpoint
 		})
 	];
 }

package/dist/vite/deployment.d.ts

@@ -0,0 +1,8 @@
+import type { Plugin } from "vite";
+/** Deployment manifest configuration. Serve the emitted file with Cache-Control: no-store. */
+export interface DeploymentPluginOptions {
+    /** Public URL, optionally on an asset host. Defaults to Vite base + smolter-manifest.json. */
+    manifestURL?: string;
+}
+/** Emit a build manifest and expose its identity through virtual:smolter/deployment. */
+export declare function deploymentPlugin(options?: DeploymentPluginOptions): Plugin;

package/dist/vite/deployment.js

@@ -0,0 +1,36 @@
+import { randomUUID } from "node:crypto";
+//#region .generated/vite/deployment.ts
+/** Emit a build manifest and expose its identity through virtual:smolter/deployment. */
+function deploymentPlugin(options = {}) {
+	const version = randomUUID();
+	const virtualId = "\0virtual:smolter/deployment";
+	let enabled = false;
+	let manifestURL = "";
+	return {
+		name: "smolter-deployment",
+		configResolved(config) {
+			enabled = config.command === "build" && !config.build.ssr;
+			manifestURL = options.manifestURL ?? `${config.base}smolter-manifest.json`;
+		},
+		resolveId(id) {
+			if (id === "virtual:smolter/deployment") return virtualId;
+		},
+		load(id) {
+			if (id !== virtualId) return;
+			return `export default ${JSON.stringify(enabled ? {
+				version,
+				manifestURL
+			} : null)};`;
+		},
+		generateBundle() {
+			if (!enabled) return;
+			this.emitFile({
+				type: "asset",
+				fileName: "smolter-manifest.json",
+				source: JSON.stringify({ version })
+			});
+		}
+	};
+}
+//#endregion
+export { deploymentPlugin };

package/dist/vite/index.d.ts

@@ -1,11 +1,12 @@
 import { type Plugin } from "vite";
 export interface FileRouterOptions {
     directory?: string;
+    dataEndpoint?: string;
     clientRoutes?: string;
     serverRoutes?: string;
     framework?: "react" | "preact";
 }
 /** Build-time flat route discovery and the optional server data transport. */
-export declare function routerPlugin({ directory, clientRoutes, serverRoutes, framework, }?: FileRouterOptions): Plugin;
+export declare function routerPlugin({ directory, dataEndpoint, clientRoutes, serverRoutes, framework, }?: FileRouterOptions): Plugin;
 /** File routing is the default; this alias keeps configuration explicit. */
 export declare const fileRouter: typeof routerPlugin;

package/dist/vite/index.js

@@ -1,11 +1,11 @@
 import { flatRoutes } from "../files/index.js";
 import { configureTransport } from "./transport.js";
 import { readFile } from "node:fs/promises";
-import { resolve } from "node:path";
+import { relative, resolve } from "node:path";
 import { transformWithOxc } from "vite";
 //#region .generated/vite/index.ts
 /** Build-time flat route discovery and the optional server data transport. */
-function routerPlugin({ directory = "src/routes", clientRoutes, serverRoutes, framework = "react" } = {}) {
+function routerPlugin({ directory = "src/routes", dataEndpoint = "/_smolter", clientRoutes, serverRoutes, framework = "react" } = {}) {
 	let root;
 	let projectRoot;
 	const publicId = "virtual:smolter/routes";
@@ -75,7 +75,10 @@ function routerPlugin({ directory = "src/routes", clientRoutes, serverRoutes, fr
 					}
 				}
 				imports.push(`import * as route${index} from ${JSON.stringify(file + (options?.ssr ? "" : suffix))};`);
-				definitions.push(options?.ssr || !Object.keys(handlers).length ? `{ ...route${index}, path: ${JSON.stringify(route.path)} }` : `serverRoute(${JSON.stringify(route.path)}, route${index}, ${JSON.stringify(handlers)})`);
+				definitions.push(options?.ssr || !Object.keys(handlers).length ? `{ ...route${index}, path: ${JSON.stringify(route.path)} }` : `serverRoute(${JSON.stringify(route.path)}, route${index}, ${JSON.stringify({
+					...handlers,
+					dataEndpoint
+				})})`);
 			}
 			if (!options?.ssr && definitions.some((definition) => definition.startsWith("serverRoute("))) imports.unshift(`import { serverRoute } from "@kasperrt/smolter/${framework}/client";`);
 			return `${imports.join("\n")}\nexport default [${definitions.join(",\n")}];\n`;
@@ -83,9 +86,14 @@ function routerPlugin({ directory = "src/routes", clientRoutes, serverRoutes, fr
 		configureServer(server) {
 			server.watcher.add(root);
 			const refresh = (file) => {
-				if (!file.startsWith(`${root}/`)) return;
-				const module = server.moduleGraph.getModuleById(virtualId);
-				if (module) server.moduleGraph.invalidateModule(module);
+				if (clientRoutes || serverRoutes) return;
+				const path = relative(root, file).replaceAll("\\", "/");
+				if (!/^(?:[^/]+\.[jt]sx?|[^/]+\/route\.[jt]sx?)$/.test(path)) return;
+				if (path.endsWith(".d.ts")) return;
+				for (const environment of Object.values(server.environments)) {
+					const module = environment.moduleGraph.getModuleById(virtualId);
+					if (module) environment.moduleGraph.invalidateModule(module);
+				}
 				server.ws.send({ type: "full-reload" });
 			};
 			server.watcher.on("add", refresh);
@@ -96,7 +104,7 @@ function routerPlugin({ directory = "src/routes", clientRoutes, serverRoutes, fr
 				server.watcher.off("change", refresh);
 				server.watcher.off("unlink", refresh);
 			});
-			configureTransport(server, publicId, framework);
+			configureTransport(server, publicId, framework, dataEndpoint);
 		}
 	};
 }

package/dist/vite/preact.d.ts

@@ -9,3 +9,4 @@ export declare function routerPlugin(options?: FileRouterOptions): Plugin;
 export declare const fileRouter: typeof routerPlugin;
 export type { ApplicationOptions } from "./application/vite.ts";
 export { applicationPlugins, preactConfig, } from "./application/vite.ts";
+export { type DeploymentPluginOptions, deploymentPlugin, } from "./deployment.ts";

package/dist/vite/preact.js

@@ -1,5 +1,6 @@
 import { flatRoutes } from "../files/index.js";
 import { routerPlugin as routerPlugin$1 } from "./index.js";
+import { deploymentPlugin } from "./deployment.js";
 import { applicationPlugins, preactConfig } from "./application/vite.js";
 //#region .generated/vite/preact.ts
 /** Configure flat routes and server transport for Preact. */
@@ -12,4 +13,4 @@ function routerPlugin(options = {}) {
 /** File routing is the default; this alias keeps configuration explicit. */
 var fileRouter = routerPlugin;
 //#endregion
-export { applicationPlugins, fileRouter, flatRoutes, preactConfig, routerPlugin };
+export { applicationPlugins, deploymentPlugin, fileRouter, flatRoutes, preactConfig, routerPlugin };

package/dist/vite/react.d.ts

@@ -7,3 +7,4 @@ export type { FileRouterOptions } from "./index.ts";
 export declare function routerPlugin(options?: FileRouterOptions): Plugin;
 /** File routing is the default; this alias keeps configuration explicit. */
 export declare const fileRouter: typeof routerPlugin;
+export { type DeploymentPluginOptions, deploymentPlugin, } from "./deployment.ts";

package/dist/vite/react.js

@@ -1,5 +1,6 @@
 import { flatRoutes } from "../files/index.js";
 import { routerPlugin as routerPlugin$1 } from "./index.js";
+import { deploymentPlugin } from "./deployment.js";
 //#region .generated/vite/react.ts
 /** Configure flat routes and server transport for React. */
 function routerPlugin(options = {}) {
@@ -11,4 +12,4 @@ function routerPlugin(options = {}) {
 /** File routing is the default; this alias keeps configuration explicit. */
 var fileRouter = routerPlugin;
 //#endregion
-export { fileRouter, flatRoutes, routerPlugin };
+export { deploymentPlugin, fileRouter, flatRoutes, routerPlugin };

package/dist/vite/transport.d.ts

@@ -1,2 +1,2 @@
 import type { ViteDevServer } from "vite";
-export declare function configureTransport(server: ViteDevServer, publicId: string, framework?: "react" | "preact"): void;
+export declare function configureTransport(server: ViteDevServer, publicId: string, framework?: "react" | "preact", dataEndpoint?: string): void;

package/dist/vite/transport.js

@@ -1,7 +1,8 @@
 //#region .generated/vite/transport.ts
-function configureTransport(server, publicId, framework = "react") {
+function configureTransport(server, publicId, framework = "react", dataEndpoint = "/_smolter") {
 	server.middlewares.use((incoming, outgoing, next) => {
-		if (!incoming.url?.startsWith("/_smolter?")) return next();
+		if (!incoming.url?.startsWith(`${dataEndpoint}?`)) return next();
+		outgoing.setHeader("Cache-Control", "private, no-store");
 		const dispatch = async () => {
 			const origin = `http://${incoming.headers.host}`;
 			const target = new URL(incoming.url, origin).searchParams.get("url");

package/jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "@kasperrt/smolter",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "exports": {
     "./react": "./.generated/react/index.ts",
     "./preact": "./.generated/preact/index.ts",

package/package.json

@@ -56,7 +56,7 @@
     "wouter": "3.13.0",
     "wouter-preact": "3.13.0"
   },
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "A tiny typed data router for React and Preact.",
   "sideEffects": false,
   "license": "MIT",
@@ -138,7 +138,7 @@
     "react": ">=18",
     "preact": ">=11.0.1",
     "vite": ">=8",
-    "preact-render-to-string": ">=6"
+    "preact-render-to-string": ">=6.8.1"
   },
   "peerDependenciesMeta": {
     "react": {
@@ -154,7 +154,7 @@
       "optional": true
     }
   },
-  "author": "Kasper Rynning-T\u00f8nnesen <kasperrt@users.noreply.github.com> (https://github.com/kasperrt)",
+  "author": "Kasper Rynning-Tønnesen <kasperrt@users.noreply.github.com> (https://github.com/kasperrt)",
   "homepage": "https://kasperrt.github.io/smolter/",
   "bugs": {
     "url": "https://github.com/kasperrt/smolter/issues"