@vertz/ui-server 0.2.38 → 0.2.41

package/dist/index.d.ts

@@ -281,6 +281,8 @@ interface SSRAotContext {
 	session: PrefetchSession | undefined;
 	/** Route params for the current request. */
 	params: Record<string, string>;
+	/** URL search params for the current request (used by AOT functions with ${sp:name} keys). */
+	searchParams: URLSearchParams | undefined;
 }
 /** An AOT render function: takes props/data and context, returns HTML string. */
 type AotRenderFn = (data: Record<string, unknown>, ctx: SSRAotContext) => string;
@@ -292,6 +294,8 @@ interface AotRouteEntry {
 	holes: string[];
 	/** Query cache keys this route reads via ctx.getData(). */
 	queryKeys?: string[];
+	/** Pre-filtered CSS rules for this route, determined at build time (#1988). */
+	css?: string[];
 }
 /**
 * AOT manifest — maps route patterns to pre-compiled render functions.
@@ -301,6 +305,8 @@ interface AotRouteEntry {
 interface AotManifest {
 	/** Route pattern → AOT entry. */
 	routes: Record<string, AotRouteEntry>;
+	/** Root layout (App) entry — wraps page content via its RouterView hole. */
+	app?: AotRouteEntry;
 }
 /**
 * Resolves custom data for AOT-rendered routes.
@@ -313,7 +319,7 @@ interface AotManifest {
 * @param unresolvedKeys - Query keys not yet populated by entity prefetch
 * @returns Map of cache key → data, or empty Map to skip
 */
-type AotDataResolver = (pattern: string, params: Record<string, string>, unresolvedKeys: string[]) => Promise<Map<string, unknown>> | Map<string, unknown>;
+type AotDataResolver = (pattern: string, params: Record<string, string>, unresolvedKeys: string[], searchParams?: URLSearchParams) => Promise<Map<string, unknown>> | Map<string, unknown>;
 /** Options for `ssrRenderAot()`. */
 interface SSRRenderAotOptions {
 	/** AOT manifest with pre-compiled render functions. */
@@ -369,6 +375,8 @@ declare function createHoles(holeNames: string[], module: SSRModule, url: string
 declare function ssrRenderAot(module: SSRModule, url: string, options: SSRRenderAotOptions): Promise<SSRRenderResult>;
 /** Check if VERTZ_DEBUG includes the 'aot' category. */
 declare function isAotDebugEnabled(): boolean;
+/** Reset the route CSS cache (used when module reloads in dev). */
+declare function clearRouteCssCache(): void;
 import { AccessSet } from "@vertz/ui/auth";
 interface SessionData {
 	user: {
@@ -506,6 +514,8 @@ interface AotCompiledFile {
 	code: string;
 	/** Per-component AOT info from the compilation. */
 	components: AotComponentInfo[];
+	/** Extracted CSS rule blocks from static css() calls (#1989). */
+	css?: string[];
 }
 /** Route map entry for the AOT manifest JSON. */
 interface AotRouteMapEntry {
@@ -517,12 +527,17 @@ interface AotRouteMapEntry {
 	queryKeys: string[];
 	/** Route param names referenced in queryKeys. Present only when queryKeys have ${...} placeholders. */
 	paramBindings?: string[];
+	/** Pre-filtered CSS rules for this route, determined at build time (#1988).
+	*  Includes only rules whose class selectors appear in the component's __ssr_* function. */
+	css?: string[];
 }
 interface AotBuildManifest {
 	components: Record<string, AotBuildComponentEntry>;
 	/** Compiled files keyed by source file path. */
 	compiledFiles: Record<string, AotCompiledFile>;
 	classificationLog: string[];
+	/** Aggregated CSS from all compiled files (#1989). */
+	css: string[];
 }
 /**
 * Scan all TSX files in srcDir and generate an AOT build manifest.
@@ -554,7 +569,27 @@ interface AotBarrelResult {
 * Returns the barrel source code and a mapping of temp filenames → compiled code
 * that must be written alongside the barrel for bundling.
 */
-declare function generateAotBarrel(compiledFiles: Record<string, AotCompiledFile>, routeMap: Record<string, AotRouteMapEntry>): AotBarrelResult;
+declare function generateAotBarrel(compiledFiles: Record<string, AotCompiledFile>, routeMap: Record<string, AotRouteMapEntry>, appEntry?: AotRouteMapEntry): AotBarrelResult;
+/**
+* Find the root layout (App) component — the one with RouterView as a hole.
+*
+* Returns the component name and its AOT route map entry, or undefined if
+* no component has a RouterView hole or it's a runtime-fallback.
+*/
+declare function findAppComponent(components: Record<string, AotBuildComponentEntry>): AotRouteMapEntry | undefined;
+/**
+* Attach pre-filtered CSS rules to each route entry at build time (#1988, #1989).
+*
+* Transitively collects CSS from the full component tree: the route's own
+* `__ssr_*` function, all local child `__ssr_*` calls it invokes, AND all
+* hole components (imported from other files). This is critical for non-Bun
+* bundlers (esbuild/workerd) where `getInjectedCSS()` doesn't work because
+* `css()` side effects land in a different module instance or are tree-shaken.
+*
+* Also attaches CSS to the app entry (root layout) so the runtime can
+* merge app + route CSS with a simple concat.
+*/
+declare function attachPerRouteCss(compiledFiles: Record<string, AotCompiledFile>, routeMap: Record<string, AotRouteMapEntry>, appEntry?: AotRouteMapEntry): void;
 /**
 * Load AOT manifest and routes module from a server build directory.
 *
@@ -1158,4 +1193,4 @@ declare function collectStreamChunks(stream: ReadableStream<Uint8Array>): Promis
 * @param nonce - Optional CSP nonce to add to the inline script tag.
 */
 declare function createTemplateChunk(slotId: number, resolvedHtml: string, nonce?: string): string;
-export { wrapWithHydrationMarkers, toPrefetchSession, streamToString, ssrStorage, ssrRenderToString, ssrRenderSinglePass, ssrRenderAot, ssrDiscoverQueries, setGlobalSSRTimeout, serializeToHtml, safeSerialize, resetSlotCounter, renderToStream, renderToHTMLStream, renderToHTML, renderPage, renderHeadToHtml, renderAssetTags, registerSSRQuery, reconstructDescriptors, rawHtml, matchUrlToPatterns, loadAotManifest, isInSSR, isAotDebugEnabled, inlineCriticalCss, getStreamingRuntimeScript, getSSRUrl, getSSRQueries, getGlobalSSRTimeout, getAccessSetForSSR, generateSSRHtml, generateAotBuildManifest, generateAotBarrel, extractRoutes, extractFontMetrics, evaluateAccessRule, encodeChunk, detectFallbackFont, createTemplateChunk, createSlotPlaceholder, createSessionScript, createSSRHandler, createSSRDataChunk, createSSRAdapter, createPrefetchManifestManager, createNodeHandler, createHoles, createAotManifestManager, createAccessSetScript, collectStreamChunks, clearGlobalSSRTimeout, buildAotRouteMap, __ssr_style_object, __ssr_spread, __esc_attr, __esc, VNode, SessionResolver, SessionData, SerializedAccessRule, SSRSinglePassOptions, SSRSessionInfo, SSRRenderResult, SSRRenderAotOptions, SSRQueryEntry2 as SSRQueryEntry, SSRPrefetchManifest, SSRModule, SSRHandlerOptions, SSRDiscoverResult, SSRAotContext, RenderToStreamOptions, RenderToHTMLStreamOptions, RenderToHTMLOptions, ReconstructedDescriptor, RawHtml, PrefetchSession, PrefetchManifestSnapshot, PrefetchManifestManagerOptions, PrefetchManifestManager, PageOptions, NodeHandlerOptions, MatchedRoute, MatchOptions, HydrationOptions, HeadEntry, HeadCollector, GenerateSSRHtmlOptions, FontFallbackMetrics7 as FontFallbackMetrics, FallbackFontName2 as FallbackFontName, ExtractedRoute, EntityAccessMap, AssetDescriptor, AotTier, AotRouteMapEntry, AotRouteEntry, AotRenderFn, AotManifestSnapshot, AotManifestManagerOptions, AotManifestManager, AotManifest, AotDivergenceEntry, AotDiagnosticsSnapshot, AotDiagnostics, AotDevManifest, AotDevComponentEntry, AotDataResolver, AotComponentDiagnostic, AotCompiledFile, AotBuildManifest, AotBuildComponentEntry, AotBarrelResult };
+export { wrapWithHydrationMarkers, toPrefetchSession, streamToString, ssrStorage, ssrRenderToString, ssrRenderSinglePass, ssrRenderAot, ssrDiscoverQueries, setGlobalSSRTimeout, serializeToHtml, safeSerialize, resetSlotCounter, renderToStream, renderToHTMLStream, renderToHTML, renderPage, renderHeadToHtml, renderAssetTags, registerSSRQuery, reconstructDescriptors, rawHtml, matchUrlToPatterns, loadAotManifest, isInSSR, isAotDebugEnabled, inlineCriticalCss, getStreamingRuntimeScript, getSSRUrl, getSSRQueries, getGlobalSSRTimeout, getAccessSetForSSR, generateSSRHtml, generateAotBuildManifest, generateAotBarrel, findAppComponent, extractRoutes, extractFontMetrics, evaluateAccessRule, encodeChunk, detectFallbackFont, createTemplateChunk, createSlotPlaceholder, createSessionScript, createSSRHandler, createSSRDataChunk, createSSRAdapter, createPrefetchManifestManager, createNodeHandler, createHoles, createAotManifestManager, createAccessSetScript, collectStreamChunks, clearRouteCssCache, clearGlobalSSRTimeout, buildAotRouteMap, attachPerRouteCss, __ssr_style_object, __ssr_spread, __esc_attr, __esc, VNode, SessionResolver, SessionData, SerializedAccessRule, SSRSinglePassOptions, SSRSessionInfo, SSRRenderResult, SSRRenderAotOptions, SSRQueryEntry2 as SSRQueryEntry, SSRPrefetchManifest, SSRModule, SSRHandlerOptions, SSRDiscoverResult, SSRAotContext, RenderToStreamOptions, RenderToHTMLStreamOptions, RenderToHTMLOptions, ReconstructedDescriptor, RawHtml, PrefetchSession, PrefetchManifestSnapshot, PrefetchManifestManagerOptions, PrefetchManifestManager, PageOptions, NodeHandlerOptions, MatchedRoute, MatchOptions, HydrationOptions, HeadEntry, HeadCollector, GenerateSSRHtmlOptions, FontFallbackMetrics7 as FontFallbackMetrics, FallbackFontName2 as FallbackFontName, ExtractedRoute, EntityAccessMap, AssetDescriptor, AotTier, AotRouteMapEntry, AotRouteEntry, AotRenderFn, AotManifestSnapshot, AotManifestManagerOptions, AotManifestManager, AotManifest, AotDivergenceEntry, AotDiagnosticsSnapshot, AotDiagnostics, AotDevManifest, AotDevComponentEntry, AotDataResolver, AotComponentDiagnostic, AotCompiledFile, AotBuildManifest, AotBuildComponentEntry, AotBarrelResult };

package/dist/index.js

@@ -1,11 +1,12 @@
 import {
   createSSRHandler,
   loadAotManifest
-} from "./shared/chunk-595trxsn.js";
+} from "./shared/chunk-j18fewkf.js";
 import {
   createNodeHandler
-} from "./shared/chunk-d1a3ygv6.js";
+} from "./shared/chunk-gqvkycnj.js";
 import {
+  clearRouteCssCache,
   collectStreamChunks,
   compileThemeCached,
   createAccessSetScript,
@@ -34,7 +35,7 @@ import {
   ssrRenderToString,
   streamToString,
   toPrefetchSession
-} from "./shared/chunk-2ymwre0k.js";
+} from "./shared/chunk-15kac8x8.js";
 import {
   clearGlobalSSRTimeout,
   createSSRAdapter,
@@ -59,6 +60,7 @@ function generateAotBuildManifest(srcDir) {
   const components = {};
   const compiledFiles = {};
   const classificationLog = [];
+  const cssSet = new Set;
   const tsxFiles = collectTsxFiles(srcDir);
   for (const filePath of tsxFiles) {
     try {
@@ -74,9 +76,14 @@ function generateAotBuildManifest(srcDir) {
       if (result.components.length > 0) {
         compiledFiles[filePath] = {
           code: result.code,
-          components: result.components
+          components: result.components,
+          css: result.css
         };
       }
+      if (result.css) {
+        for (const rule of result.css)
+          cssSet.add(rule);
+      }
     } catch (e) {
       classificationLog.push(`⚠ ${filePath}: ${e instanceof Error ? e.message : "compilation failed"}`);
     }
@@ -101,7 +108,7 @@ function generateAotBuildManifest(srcDir) {
     const pct = Math.round(aotCount / total * 100);
     classificationLog.push(`Coverage: ${aotCount}/${total} components (${pct}%)`);
   }
-  return { components, compiledFiles, classificationLog };
+  return { components, compiledFiles, classificationLog, css: [...cssSet] };
 }
 function buildAotRouteMap(components, routes) {
   const routeMap = {};
@@ -128,11 +135,14 @@ function buildAotRouteMap(components, routes) {
   }
   return routeMap;
 }
-function generateAotBarrel(compiledFiles, routeMap) {
+function generateAotBarrel(compiledFiles, routeMap, appEntry) {
   const neededFns = new Set;
   for (const entry of Object.values(routeMap)) {
     neededFns.add(entry.renderFn);
   }
+  if (appEntry) {
+    neededFns.add(appEntry.renderFn);
+  }
   const fnToFile = new Map;
   for (const [filePath, compiled] of Object.entries(compiledFiles)) {
     for (const comp of compiled.components) {
@@ -156,13 +166,15 @@ function generateAotBarrel(compiledFiles, routeMap) {
   for (const [filePath, fns] of fileToFns) {
     const moduleName = basename(filePath, ".tsx").replace(/[^a-zA-Z0-9_-]/g, "_");
     const tempFileName = `__aot_${fileIndex}_${moduleName}`;
-    const moduleRef = `./${tempFileName}`;
+    const moduleRef = `./${tempFileName}.ts`;
     lines.push(`export { ${fns.sort().join(", ")} } from '${moduleRef}';`);
     const compiled = compiledFiles[filePath];
     if (compiled) {
       const helperImport = `import { __esc, __esc_attr, __ssr_spread, __ssr_style_object } from '@vertz/ui-server';
+` + `import type { SSRAotContext } from '@vertz/ui-server';
 `;
-      files[`${tempFileName}.tsx`] = helperImport + compiled.code;
+      const extracted = extractSsrFunctions(compiled.code, fns);
+      files[`${tempFileName}.ts`] = helperImport + extracted;
     }
     fileIndex++;
   }
@@ -172,6 +184,129 @@ function generateAotBarrel(compiledFiles, routeMap) {
     files
   };
 }
+function extractSsrFunctions(code, fnNames) {
+  const extracted = [];
+  for (const fnName of fnNames) {
+    const marker = `export function ${fnName}(`;
+    const startIdx = code.indexOf(marker);
+    if (startIdx === -1)
+      continue;
+    const bodyStart = code.indexOf("{", startIdx + marker.length);
+    if (bodyStart === -1)
+      continue;
+    let depth = 1;
+    let i = bodyStart + 1;
+    while (i < code.length && depth > 0) {
+      if (code[i] === "{")
+        depth++;
+      else if (code[i] === "}")
+        depth--;
+      i++;
+    }
+    extracted.push(code.slice(startIdx, i));
+  }
+  return extracted.join(`
+`);
+}
+function findAppComponent(components) {
+  for (const [name, comp] of Object.entries(components)) {
+    if (comp.tier === "runtime-fallback")
+      continue;
+    if (comp.holes.includes("RouterView")) {
+      return {
+        renderFn: `__ssr_${name}`,
+        holes: comp.holes,
+        queryKeys: comp.queryKeys
+      };
+    }
+  }
+  return;
+}
+function attachPerRouteCss(compiledFiles, routeMap, appEntry) {
+  const classToRule = new Map;
+  for (const file of Object.values(compiledFiles)) {
+    if (!file.css)
+      continue;
+    for (const rule of file.css) {
+      const match = /\.(_[0-9a-f]{8})/.exec(rule);
+      if (match)
+        classToRule.set(match[1], rule);
+    }
+  }
+  if (classToRule.size === 0)
+    return;
+  const componentCode = new Map;
+  const componentHoles = new Map;
+  for (const file of Object.values(compiledFiles)) {
+    for (const comp of file.components) {
+      const fnName = `__ssr_${comp.name}`;
+      const code = extractSsrFunctions(file.code, [fnName]);
+      if (code)
+        componentCode.set(comp.name, code);
+      if (comp.holes.length > 0)
+        componentHoles.set(comp.name, comp.holes);
+    }
+  }
+  const classNamePattern = /_([\da-f]{8})/g;
+  function findUsedCss(code, seenClasses) {
+    const rules = [];
+    let m;
+    while ((m = classNamePattern.exec(code)) !== null) {
+      const cls = `_${m[1]}`;
+      if (seenClasses.has(cls))
+        continue;
+      seenClasses.add(cls);
+      const rule = classToRule.get(cls);
+      if (rule)
+        rules.push(rule);
+    }
+    classNamePattern.lastIndex = 0;
+    return rules;
+  }
+  function collectTreeCss(rootName) {
+    const allRules = [];
+    const seenClasses = new Set;
+    const visited = new Set;
+    const queue = [rootName];
+    while (queue.length > 0) {
+      const name = queue.pop();
+      if (visited.has(name))
+        continue;
+      visited.add(name);
+      const code = componentCode.get(name);
+      if (code) {
+        allRules.push(...findUsedCss(code, seenClasses));
+        const localCallPattern = /__ssr_(\w+)\(/g;
+        let lm;
+        while ((lm = localCallPattern.exec(code)) !== null) {
+          const childName = lm[1];
+          if (!visited.has(childName))
+            queue.push(childName);
+        }
+      }
+      const holes = componentHoles.get(name);
+      if (holes) {
+        for (const hole of holes) {
+          if (!visited.has(hole))
+            queue.push(hole);
+        }
+      }
+    }
+    return allRules;
+  }
+  if (appEntry) {
+    const appName = appEntry.renderFn.replace(/^__ssr_/, "");
+    const appCss = collectTreeCss(appName);
+    if (appCss.length > 0)
+      appEntry.css = appCss;
+  }
+  for (const entry of Object.values(routeMap)) {
+    const compName = entry.renderFn.replace(/^__ssr_/, "");
+    const routeCss = collectTreeCss(compName);
+    if (routeCss.length > 0)
+      entry.css = routeCss;
+  }
+}
 function collectTsxFiles(dir) {
   const files = [];
   for (const entry of readdirSync(dir, { withFileTypes: true })) {
@@ -212,7 +347,7 @@ function inlineCriticalCss(css) {
 // src/font-metrics.ts
 import { access as fsAccess } from "node:fs/promises";
 import { readFile } from "node:fs/promises";
-import { join as join2 } from "node:path";
+import { isAbsolute, join as join2 } from "node:path";
 import { fromBuffer } from "@capsizecss/unpack";
 var SYSTEM_FONT_METRICS = {
   Arial: {
@@ -280,6 +415,12 @@ function getPrimarySrcPath(descriptor) {
   return null;
 }
 async function resolveFilePath(urlPath, rootDir) {
+  if (isAbsolute(urlPath)) {
+    try {
+      await fsAccess(urlPath);
+      return urlPath;
+    } catch {}
+  }
   const cleaned = urlPath.startsWith("/") ? urlPath.slice(1) : urlPath;
   const direct = join2(rootDir, cleaned);
   try {
@@ -1048,6 +1189,7 @@ export {
   generateSSRHtml,
   generateAotBuildManifest,
   generateAotBarrel,
+  findAppComponent,
   extractRoutes,
   extractFontMetrics,
   evaluateAccessRule,
@@ -1065,8 +1207,10 @@ export {
   createAotManifestManager,
   createAccessSetScript,
   collectStreamChunks,
+  clearRouteCssCache,
   clearGlobalSSRTimeout,
   buildAotRouteMap,
+  attachPerRouteCss,
   __ssr_style_object,
   __ssr_spread,
   __esc_attr,

package/dist/node-handler.d.ts

@@ -94,6 +94,8 @@ interface SSRAotContext {
 	session: PrefetchSession | undefined;
 	/** Route params for the current request. */
 	params: Record<string, string>;
+	/** URL search params for the current request (used by AOT functions with ${sp:name} keys). */
+	searchParams: URLSearchParams | undefined;
 }
 /** An AOT render function: takes props/data and context, returns HTML string. */
 type AotRenderFn = (data: Record<string, unknown>, ctx: SSRAotContext) => string;
@@ -105,6 +107,8 @@ interface AotRouteEntry {
 	holes: string[];
 	/** Query cache keys this route reads via ctx.getData(). */
 	queryKeys?: string[];
+	/** Pre-filtered CSS rules for this route, determined at build time (#1988). */
+	css?: string[];
 }
 /**
 * AOT manifest — maps route patterns to pre-compiled render functions.
@@ -114,6 +118,8 @@ interface AotRouteEntry {
 interface AotManifest {
 	/** Route pattern → AOT entry. */
 	routes: Record<string, AotRouteEntry>;
+	/** Root layout (App) entry — wraps page content via its RouterView hole. */
+	app?: AotRouteEntry;
 }
 /**
 * Resolves custom data for AOT-rendered routes.
@@ -126,7 +132,7 @@ interface AotManifest {
 * @param unresolvedKeys - Query keys not yet populated by entity prefetch
 * @returns Map of cache key → data, or empty Map to skip
 */
-type AotDataResolver = (pattern: string, params: Record<string, string>, unresolvedKeys: string[]) => Promise<Map<string, unknown>> | Map<string, unknown>;
+type AotDataResolver = (pattern: string, params: Record<string, string>, unresolvedKeys: string[], searchParams?: URLSearchParams) => Promise<Map<string, unknown>> | Map<string, unknown>;
 import { AccessSet } from "@vertz/ui/auth";
 interface SessionData {
 	user: {

package/dist/node-handler.js

@@ -1,7 +1,7 @@
 import {
   createNodeHandler
-} from "./shared/chunk-d1a3ygv6.js";
-import"./shared/chunk-2ymwre0k.js";
+} from "./shared/chunk-gqvkycnj.js";
+import"./shared/chunk-15kac8x8.js";
 import"./shared/chunk-ybftdw1r.js";
 export {
   createNodeHandler