@pracht/core 0.2.2 → 0.2.3

package/dist/index.d.mts

@@ -365,6 +365,8 @@ interface PrerenderAppOptions {
   clientEntryUrl?: string;
   /** Per-source-file CSS map produced by the vite plugin (preferred over cssUrls). */
   cssManifest?: Record<string, string[]>;
+  /** Per-source-file JS map produced by the vite plugin for modulepreload hints. */
+  jsManifest?: Record<string, string[]>;
   /** @deprecated Pass cssManifest instead for per-page CSS resolution. */
   cssUrls?: string[];
 }

package/dist/index.mjs

@@ -80,6 +80,12 @@ const SAFE_METHODS = new Set(["GET", "HEAD"]);
 const HYDRATION_STATE_ELEMENT_ID = "pracht-state";
 const ROUTE_STATE_REQUEST_HEADER = "x-pracht-route-state-request";
 const ROUTE_STATE_CACHE_CONTROL = "no-store";
+let _renderToStringAsync;
+async function getRenderToStringAsync() {
+	if (_renderToStringAsync) return _renderToStringAsync;
+	_renderToStringAsync = (await import("preact-render-to-string")).renderToStringAsync;
+	return _renderToStringAsync;
+}
 const RouteDataContext = createContext(void 0);
 function PrachtRuntimeProvider({ children, data, params = {}, routeId, url }) {
 	const [routeData, setRouteData] = useState(data);
@@ -332,11 +338,10 @@ async function handlePrachtRequest(options) {
 		if (match.route.render === "spa") {
 			let body = "";
 			if (shellModule?.Shell || shellModule?.Loading) {
-				const { renderToStringAsync } = await import("preact-render-to-string");
 				const Shell = shellModule?.Shell;
 				const Loading = shellModule?.Loading;
 				const loadingTree = Shell != null ? h(Shell, null, Loading ? h(Loading, null) : null) : Loading ? h(Loading, null) : null;
-				if (loadingTree) body = await renderToStringAsync(loadingTree);
+				if (loadingTree) body = await (await getRenderToStringAsync())(loadingTree);
 			}
 			return htmlResponse(buildHtmlDocument({
 				head,
@@ -356,21 +361,21 @@ async function handlePrachtRequest(options) {
 		const DefaultComponent = typeof routeModule.default === "function" ? routeModule.default : void 0;
 		const Component = routeModule.Component ?? DefaultComponent;
 		if (!Component) throw new Error("Route has no Component or default export");
-		const { renderToStringAsync } = await import("preact-render-to-string");
 		const Shell = shellModule?.Shell;
 		const componentProps = {
 			data,
 			params: match.params
 		};
 		const componentTree = Shell ? h(Shell, null, h(Component, componentProps)) : h(Component, componentProps);
+		const tree = h(PrachtRuntimeProvider, {
+			data,
+			params: match.params,
+			routeId: match.route.id ?? "",
+			url: url.pathname
+		}, componentTree);
 		return htmlResponse(buildHtmlDocument({
 			head,
-			body: await renderToStringAsync(h(PrachtRuntimeProvider, {
-				data,
-				params: match.params,
-				routeId: match.route.id ?? "",
-				url: url.pathname
-			}, componentTree)),
+			body: await (await getRenderToStringAsync())(tree),
 			hydrationState: {
 				url: url.pathname,
 				routeId: match.route.id ?? "",
@@ -397,15 +402,42 @@ async function handlePrachtRequest(options) {
 		});
 	}
 }
+/** Strip leading `./` and `/` so all module paths share one canonical form. */
+function normalizeModulePath(path) {
+	return path.replace(/^\.?\//, "");
+}
+function buildSuffixIndex(manifest) {
+	const index = /* @__PURE__ */ new Map();
+	for (const key of Object.keys(manifest)) {
+		const normalized = normalizeModulePath(key);
+		if (!normalized) continue;
+		if (!index.has(normalized)) index.set(normalized, key);
+		for (let i = normalized.indexOf("/"); i !== -1; i = normalized.indexOf("/", i + 1)) {
+			const suffix = normalized.slice(i + 1);
+			if (suffix && !index.has(suffix)) index.set(suffix, key);
+		}
+	}
+	return index;
+}
+const suffixIndexCache = /* @__PURE__ */ new WeakMap();
+function getSuffixIndex(manifest) {
+	let index = suffixIndexCache.get(manifest);
+	if (index) return index;
+	index = buildSuffixIndex(manifest);
+	suffixIndexCache.set(manifest, index);
+	return index;
+}
+function resolveManifestEntries(manifest, file) {
+	if (file in manifest) return manifest[file];
+	const resolved = getSuffixIndex(manifest).get(normalizeModulePath(file));
+	if (resolved) return manifest[resolved];
+}
 function resolvePageCssUrls(options, shellFile, routeFile) {
 	if (!options.cssManifest) return options.cssUrls ?? [];
 	const css = /* @__PURE__ */ new Set();
 	function addFromManifest(file) {
-		const suffix = file.replace(/^\.\//, "");
-		for (const [key, cssFiles] of Object.entries(options.cssManifest)) if (key === file || key.endsWith(`/${suffix}`) || key.endsWith(suffix)) {
-			for (const c of cssFiles) css.add(c);
-			break;
-		}
+		const entries = resolveManifestEntries(options.cssManifest, file);
+		if (entries) for (const c of entries) css.add(c);
 	}
 	if (shellFile) addFromManifest(shellFile);
 	addFromManifest(routeFile);
@@ -415,11 +447,8 @@ function resolvePageJsUrls(options, shellFile, routeFile) {
 	if (!options.jsManifest) return [];
 	const js = /* @__PURE__ */ new Set();
 	function addFromManifest(file) {
-		const suffix = file.replace(/^\.\//, "");
-		for (const [key, jsFiles] of Object.entries(options.jsManifest)) if (key === file || key.endsWith(`/${suffix}`) || key.endsWith(suffix)) {
-			for (const j of jsFiles) js.add(j);
-			break;
-		}
+		const entries = resolveManifestEntries(options.jsManifest, file);
+		if (entries) for (const j of entries) js.add(j);
 	}
 	if (shellFile) addFromManifest(shellFile);
 	addFromManifest(routeFile);
@@ -517,11 +546,11 @@ function deserializeRouteError$1(error) {
 	return result;
 }
 function jsonErrorResponse(routeError, options) {
-	const response = new Response(JSON.stringify({ error: routeError }), {
+	const headers = applySecurityAndRouteHeaders(new Headers({ "content-type": "application/json; charset=utf-8" }), options.isRouteStateRequest ? { isRouteStateRequest: true } : void 0);
+	return new Response(JSON.stringify({ error: routeError }), {
 		status: routeError.status,
-		headers: { "content-type": "application/json; charset=utf-8" }
+		headers
 	});
-	return options.isRouteStateRequest ? withRouteResponseHeaders(response, { isRouteStateRequest: true }) : withDefaultSecurityHeaders(response);
 }
 function renderApiErrorResponse(options) {
 	const exposeDetails = shouldExposeServerErrors(options.options);
@@ -569,14 +598,14 @@ async function renderRouteErrorResponse(options) {
 	const head = shellModule?.head ? await shellModule.head(options.routeArgs) : {};
 	const cssUrls = resolvePageCssUrls(options.options, options.shellFile, options.routeArgs.route.file);
 	const modulePreloadUrls = resolvePageJsUrls(options.options, options.shellFile, options.routeArgs.route.file);
-	const { renderToStringAsync } = await import("preact-render-to-string");
+	const renderToString = await getRenderToStringAsync();
 	const ErrorBoundary = options.routeModule.ErrorBoundary;
 	const Shell = shellModule?.Shell;
 	const errorValue = deserializeRouteError$1(routeErrorWithDiagnostics);
 	const componentTree = Shell ? h(Shell, null, h(ErrorBoundary, { error: errorValue })) : h(ErrorBoundary, { error: errorValue });
 	return htmlResponse(buildHtmlDocument({
 		head,
-		body: await renderToStringAsync(h(PrachtRuntimeProvider, {
+		body: await renderToString(h(PrachtRuntimeProvider, {
 			data: null,
 			routeId: options.routeId,
 			url: options.urlPathname
@@ -636,8 +665,8 @@ async function resolveDataFunctions(route, routeModule, registry) {
 async function resolveRegistryModule(modules, file) {
 	if (!modules) return void 0;
 	if (file in modules) return modules[file]();
-	const suffix = file.replace(/^\.\//, "");
-	for (const key of Object.keys(modules)) if (key.endsWith(`/${suffix}`) || key.endsWith(suffix)) return modules[key]();
+	const resolved = getSuffixIndex(modules).get(normalizeModulePath(file));
+	if (resolved) return modules[resolved]();
 }
 async function mergeHeadMetadata(shellModule, routeModule, routeArgs, data) {
 	const shellHead = shellModule?.head ? await shellModule.head(routeArgs) : {};
@@ -679,10 +708,11 @@ function buildHtmlDocument(options) {
 </html>`;
 }
 function htmlResponse(html, status = 200) {
-	return withRouteResponseHeaders(new Response(html, {
+	const headers = applySecurityAndRouteHeaders(new Headers({ "content-type": "text/html; charset=utf-8" }), { isRouteStateRequest: false });
+	return new Response(html, {
 		status,
-		headers: { "content-type": "text/html; charset=utf-8" }
-	}), { isRouteStateRequest: false });
+		headers
+	});
 }
 function applyDefaultSecurityHeaders(headers) {
 	if (!headers.has("permissions-policy")) headers.set("permissions-policy", "accelerometer=(), camera=(), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), payment=(), usb=()");
@@ -691,8 +721,17 @@ function applyDefaultSecurityHeaders(headers) {
 	if (!headers.has("x-frame-options")) headers.set("x-frame-options", "SAMEORIGIN");
 	return headers;
 }
+function applySecurityAndRouteHeaders(headers, options) {
+	applyDefaultSecurityHeaders(headers);
+	if (options) {
+		appendVaryHeader(headers, ROUTE_STATE_REQUEST_HEADER);
+		if (options.isRouteStateRequest && !headers.has("cache-control")) headers.set("cache-control", ROUTE_STATE_CACHE_CONTROL);
+	}
+	return headers;
+}
 function withDefaultSecurityHeaders(response) {
-	const headers = applyDefaultSecurityHeaders(new Headers(response.headers));
+	const headers = new Headers(response.headers);
+	applySecurityAndRouteHeaders(headers);
 	return new Response(response.body, {
 		status: response.status,
 		statusText: response.statusText,
@@ -700,9 +739,8 @@ function withDefaultSecurityHeaders(response) {
 	});
 }
 function withRouteResponseHeaders(response, options) {
-	const headers = applyDefaultSecurityHeaders(new Headers(response.headers));
-	appendVaryHeader(headers, ROUTE_STATE_REQUEST_HEADER);
-	if (options.isRouteStateRequest && !headers.has("cache-control")) headers.set("cache-control", ROUTE_STATE_CACHE_CONTROL);
+	const headers = new Headers(response.headers);
+	applySecurityAndRouteHeaders(headers, options);
 	return new Response(response.body, {
 		status: response.status,
 		statusText: response.statusText,
@@ -730,29 +768,46 @@ async function prerenderApp(options) {
 	const resolved = resolveApp(options.app);
 	const results = [];
 	const isgManifest = {};
+	const work = [];
 	for (const route of resolved.routes) {
 		if (route.render !== "ssg" && route.render !== "isg") continue;
 		const paths = await collectSSGPaths(route, options.registry);
-		for (const pathname of paths) {
-			const url = new URL(pathname, "http://localhost");
+		for (const pathname of paths) work.push({
+			pathname,
+			render: route.render,
+			revalidate: route.revalidate
+		});
+	}
+	const CONCURRENCY = 10;
+	for (let i = 0; i < work.length; i += CONCURRENCY) {
+		const batch = work.slice(i, i + CONCURRENCY);
+		const batchResults = await Promise.all(batch.map(async (item) => {
+			const url = new URL(item.pathname, "http://localhost");
 			const request = new Request(url, { method: "GET" });
 			const response = await handlePrachtRequest({
 				app: options.app,
 				request,
 				registry: options.registry,
 				clientEntryUrl: options.clientEntryUrl,
-				cssManifest: options.cssManifest
+				cssManifest: options.cssManifest,
+				jsManifest: options.jsManifest
 			});
 			if (response.status !== 200) {
-				console.warn(`  Warning: ${route.render.toUpperCase()} route "${pathname}" returned status ${response.status}, skipping.`);
-				continue;
+				console.warn(`  Warning: ${item.render.toUpperCase()} route "${item.pathname}" returned status ${response.status}, skipping.`);
+				return null;
 			}
-			const html = await response.text();
+			return {
+				item,
+				html: await response.text()
+			};
+		}));
+		for (const result of batchResults) {
+			if (!result) continue;
 			results.push({
-				path: pathname,
-				html
+				path: result.item.pathname,
+				html: result.html
 			});
-			if (route.render === "isg" && route.revalidate) isgManifest[pathname] = { revalidate: route.revalidate };
+			if (result.item.render === "isg" && result.item.revalidate) isgManifest[result.item.pathname] = { revalidate: result.item.revalidate };
 		}
 	}
 	if (options.withISGManifest) return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pracht/core",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "homepage": "https://github.com/JoviDeCroock/pracht/tree/main/packages/framework",
   "bugs": {
     "url": "https://github.com/JoviDeCroock/pracht/issues"