@pracht/core 0.2.2 → 0.2.4

package/dist/index.d.mts

@@ -157,6 +157,9 @@ type LoaderData<TLoader extends LoaderLike> = TLoader extends ((...args: any[])
 interface HeadArgs<TLoader extends LoaderLike = undefined, TContext = any> extends BaseRouteArgs<TContext> {
   data: LoaderData<TLoader>;
 }
+interface HeadersArgs<TLoader extends LoaderLike = undefined, TContext = any> extends BaseRouteArgs<TContext> {
+  data: LoaderData<TLoader>;
+}
 interface RouteComponentProps<TLoader extends LoaderLike = undefined> {
   data: LoaderData<TLoader>;
   params: RouteParams;
@@ -171,6 +174,7 @@ type LoaderFn<TContext = any, TData = unknown> = (args: LoaderArgs<TContext>) =>
 interface RouteModule<TContext = any, TLoader extends LoaderLike = undefined> {
   loader?: LoaderFn<TContext>;
   head?: (args: HeadArgs<TLoader, TContext>) => MaybePromise<HeadMetadata>;
+  headers?: (args: HeadersArgs<TLoader, TContext>) => MaybePromise<HeadersInit>;
   Component?: FunctionComponent<RouteComponentProps<TLoader>>;
   default?: FunctionComponent<RouteComponentProps<TLoader>>;
   ErrorBoundary?: FunctionComponent<ErrorBoundaryProps>;
@@ -180,6 +184,7 @@ interface ShellModule<TContext = any> {
   Shell: FunctionComponent<ShellProps>;
   Loading?: FunctionComponent;
   head?: (args: BaseRouteArgs<TContext>) => MaybePromise<HeadMetadata>;
+  headers?: (args: BaseRouteArgs<TContext>) => MaybePromise<HeadersInit>;
 }
 type MiddlewareResult<TContext = any> = void | Response | {
   redirect: string;
@@ -351,6 +356,7 @@ declare function applyDefaultSecurityHeaders(headers: Headers): Headers;
 interface PrerenderResult {
   path: string;
   html: string;
+  headers?: Record<string, string>;
 }
 interface ISGManifestEntry {
   revalidate: RouteRevalidate;
@@ -365,6 +371,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[];
 }
@@ -395,4 +403,4 @@ interface InitClientRouterOptions {
 }
 declare function initClientRouter(options: InitClientRouterOptions): Promise<void>;
 //#endregion
-export { type ApiConfig, type ApiRouteArgs, type ApiRouteHandler, type ApiRouteMatch, type ApiRouteModule, type BaseRouteArgs, type DataModule, type ErrorBoundaryProps, Form, type FormProps, type GroupDefinition, type GroupMeta, type HandlePrachtRequestOptions, type HeadArgs, type HeadMetadata, type HttpMethod, type ISGManifestEntry, type InitClientRouterOptions, type LoaderArgs, type LoaderData, type LoaderFn, type Location, type MiddlewareArgs, type MiddlewareFn, type MiddlewareModule, type MiddlewareResult, type ModuleImporter, type ModuleRef, type ModuleRegistry, type NavigateFn, type PrachtApp, type PrachtAppConfig, PrachtHttpError, type PrachtHydrationState, type PrachtRuntimeDiagnosticPhase, type PrachtRuntimeDiagnostics, PrachtRuntimeProvider, type PrefetchStrategy, type PrerenderAppOptions, type PrerenderAppResult, type PrerenderResult, type Register, type RenderMode, type ResolvedApiRoute, type ResolvedPrachtApp, type ResolvedRoute, type RouteComponentProps, type RouteConfig, type RouteDefinition, type RouteMatch, type RouteMeta, type RouteModule, type RouteParams, type RouteRevalidate, type RouteStateResult, type RouteTreeNode, type SerializedRouteError, type ShellModule, type ShellProps, type StartAppOptions, Suspense, type TimeRevalidatePolicy, applyDefaultSecurityHeaders, buildPathFromSegments, defineApp, forwardRef, group, handlePrachtRequest, initClientRouter, lazy, matchApiRoute, matchAppRoute, prerenderApp, readHydrationState, resolveApiRoutes, resolveApp, route, startApp, timeRevalidate, useIsHydrated, useLocation, useNavigate, useParams, useRevalidate, useRevalidateRoute, useRouteData };
+export { type ApiConfig, type ApiRouteArgs, type ApiRouteHandler, type ApiRouteMatch, type ApiRouteModule, type BaseRouteArgs, type DataModule, type ErrorBoundaryProps, Form, type FormProps, type GroupDefinition, type GroupMeta, type HandlePrachtRequestOptions, type HeadArgs, type HeadMetadata, type HeadersArgs, type HttpMethod, type ISGManifestEntry, type InitClientRouterOptions, type LoaderArgs, type LoaderData, type LoaderFn, type Location, type MiddlewareArgs, type MiddlewareFn, type MiddlewareModule, type MiddlewareResult, type ModuleImporter, type ModuleRef, type ModuleRegistry, type NavigateFn, type PrachtApp, type PrachtAppConfig, PrachtHttpError, type PrachtHydrationState, type PrachtRuntimeDiagnosticPhase, type PrachtRuntimeDiagnostics, PrachtRuntimeProvider, type PrefetchStrategy, type PrerenderAppOptions, type PrerenderAppResult, type PrerenderResult, type Register, type RenderMode, type ResolvedApiRoute, type ResolvedPrachtApp, type ResolvedRoute, type RouteComponentProps, type RouteConfig, type RouteDefinition, type RouteMatch, type RouteMeta, type RouteModule, type RouteParams, type RouteRevalidate, type RouteStateResult, type RouteTreeNode, type SerializedRouteError, type ShellModule, type ShellProps, type StartAppOptions, Suspense, type TimeRevalidatePolicy, applyDefaultSecurityHeaders, buildPathFromSegments, defineApp, forwardRef, group, handlePrachtRequest, initClientRouter, lazy, matchApiRoute, matchAppRoute, prerenderApp, readHydrationState, resolveApiRoutes, resolveApp, route, startApp, timeRevalidate, useIsHydrated, useLocation, useNavigate, useParams, useRevalidate, useRevalidateRoute, useRouteData };

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);
@@ -327,16 +333,16 @@ async function handlePrachtRequest(options) {
 		currentPhase = "render";
 		shellModule = match.route.shellFile ? await resolveRegistryModule(registry.shellModules, match.route.shellFile) : void 0;
 		const head = await mergeHeadMetadata(shellModule, routeModule, routeArgs, data);
+		const documentHeaders = await mergeDocumentHeaders(shellModule, routeModule, routeArgs, data);
 		const cssUrls = resolvePageCssUrls(options, match.route.shellFile, match.route.file);
 		const modulePreloadUrls = resolvePageJsUrls(options, match.route.shellFile, match.route.file);
 		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,
@@ -351,26 +357,26 @@ async function handlePrachtRequest(options) {
 				clientEntryUrl: options.clientEntryUrl,
 				cssUrls,
 				modulePreloadUrls
-			}));
+			}), 200, documentHeaders);
 		}
 		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 ?? "",
@@ -380,7 +386,7 @@ async function handlePrachtRequest(options) {
 			clientEntryUrl: options.clientEntryUrl,
 			cssUrls,
 			modulePreloadUrls
-		}));
+		}), 200, documentHeaders);
 	} catch (error) {
 		return renderRouteErrorResponse({
 			error,
@@ -397,15 +403,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 +448,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 +547,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);
@@ -567,16 +597,17 @@ async function renderRouteErrorResponse(options) {
 	if (options.isRouteStateRequest) return jsonErrorResponse(routeErrorWithDiagnostics, { isRouteStateRequest: true });
 	const shellModule = options.shellModule ?? (options.shellFile ? await resolveRegistryModule(options.options.registry?.shellModules, options.shellFile) : void 0);
 	const head = shellModule?.head ? await shellModule.head(options.routeArgs) : {};
+	const documentHeaders = await mergeDocumentHeaders(shellModule, void 0, options.routeArgs, void 0);
 	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
@@ -590,7 +621,7 @@ async function renderRouteErrorResponse(options) {
 		clientEntryUrl: options.options.clientEntryUrl,
 		cssUrls,
 		modulePreloadUrls
-	}), routeErrorWithDiagnostics.status);
+	}), routeErrorWithDiagnostics.status, documentHeaders);
 }
 async function runMiddlewareChain(options) {
 	let context = options.context;
@@ -636,8 +667,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) : {};
@@ -652,6 +683,22 @@ async function mergeHeadMetadata(shellModule, routeModule, routeArgs, data) {
 		link: [...shellHead.link ?? [], ...routeHead.link ?? []]
 	};
 }
+async function mergeDocumentHeaders(shellModule, routeModule, routeArgs, data) {
+	const headers = new Headers();
+	const shellHeaders = shellModule?.headers ? await shellModule.headers(routeArgs) : void 0;
+	if (shellHeaders) applyHeaders(headers, shellHeaders);
+	const routeHeaders = routeModule?.headers ? await routeModule.headers({
+		...routeArgs,
+		data
+	}) : void 0;
+	if (routeHeaders) applyHeaders(headers, routeHeaders);
+	return headers;
+}
+function applyHeaders(headers, init) {
+	new Headers(init).forEach((value, key) => {
+		headers.set(key, value);
+	});
+}
 function buildHtmlDocument(options) {
 	const { head, body, hydrationState, clientEntryUrl, cssUrls = [], modulePreloadUrls = [] } = options;
 	const titleTag = head.title ? `<title>${escapeHtml(head.title)}</title>` : "";
@@ -678,11 +725,14 @@ function buildHtmlDocument(options) {
   </body>
 </html>`;
 }
-function htmlResponse(html, status = 200) {
-	return withRouteResponseHeaders(new Response(html, {
+function htmlResponse(html, status = 200, initHeaders) {
+	const headers = new Headers({ "content-type": "text/html; charset=utf-8" });
+	if (initHeaders) applyHeaders(headers, initHeaders);
+	applySecurityAndRouteHeaders(headers, { 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 +741,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 +759,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 +788,49 @@ 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 {
+				headers: Object.fromEntries(response.headers),
+				html,
+				item
+			};
+		}));
+		for (const result of batchResults) {
+			if (!result) continue;
 			results.push({
-				path: pathname,
-				html
+				path: result.item.pathname,
+				html: result.html,
+				headers: result.headers
 			});
-			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.4",
   "homepage": "https://github.com/JoviDeCroock/pracht/tree/main/packages/framework",
   "bugs": {
     "url": "https://github.com/JoviDeCroock/pracht/issues"