@vertz/ui-server 0.2.35 → 0.2.37

package/dist/bun-dev-server.d.ts

@@ -126,6 +126,7 @@ interface ErrorDetail {
 }
 type ErrorCategory = "build" | "resolve" | "runtime" | "ssr";
 declare function isStaleGraphError(message: string): boolean;
+declare function parsePluginError(text: string): ErrorDetail | null;
 /**
 * Detect Bun's reload stub — the response served when the dev bundler
 * fails to compile a client module. The stub is literally:
@@ -257,4 +258,4 @@ declare function clearSSRRequireCache(): number;
 * SSR is always on. HMR always works. No mode toggle needed.
 */
 declare function createBunDevServer(options: BunDevServerOptions): BunDevServer;
-export { shouldCheckStaleBundler, parseHMRAssets, isStaleGraphError, isReloadStub, generateSSRPageHtml, formatTerminalRuntimeError, detectFaviconTag, createRuntimeErrorDeduplicator, createFetchInterceptor, createBunDevServer, clearSSRRequireCache, buildScriptTag, SSRPageHtmlOptions, HMRAssets, FetchInterceptorOptions, ErrorDetail, ErrorCategory, BunDevServerOptions, BunDevServer };
+export { shouldCheckStaleBundler, parsePluginError, parseHMRAssets, isStaleGraphError, isReloadStub, generateSSRPageHtml, formatTerminalRuntimeError, detectFaviconTag, createRuntimeErrorDeduplicator, createFetchInterceptor, createBunDevServer, clearSSRRequireCache, buildScriptTag, SSRPageHtmlOptions, HMRAssets, FetchInterceptorOptions, ErrorDetail, ErrorCategory, BunDevServerOptions, BunDevServer };

package/dist/bun-dev-server.js

@@ -1814,7 +1814,8 @@ function createRequestContext(url) {
     queryCache: new MemoryCache({ maxSize: Infinity }),
     inflight: new Map,
     queries: [],
-    errors: []
+    errors: [],
+    cssTracker: new Set
   };
 }
 var domShimInstalled = false;
@@ -1839,7 +1840,9 @@ function collectCSS(themeCss, module) {
     for (const s of module.styles)
       alreadyIncluded.add(s);
   }
-  const componentCss = module.getInjectedCSS ? module.getInjectedCSS().filter((s) => !alreadyIncluded.has(s)) : [];
+  const ssrCtx = ssrStorage.getStore();
+  const rawComponentCss = ssrCtx?.cssTracker?.size ? Array.from(ssrCtx.cssTracker) : module.getInjectedCSS?.() ?? [];
+  const componentCss = rawComponentCss.filter((s) => !alreadyIncluded.has(s));
   const themeTag = themeCss ? `<style data-vertz-css>${themeCss}</style>` : "";
   const globalTag = module.styles && module.styles.length > 0 ? `<style data-vertz-css>${module.styles.join(`
 `)}</style>` : "";
@@ -2456,7 +2459,9 @@ function collectCSS2(themeCss, module) {
     for (const s of module.styles)
       alreadyIncluded.add(s);
   }
-  const componentCss = module.getInjectedCSS ? module.getInjectedCSS().filter((s) => !alreadyIncluded.has(s)) : [];
+  const ssrCtx = ssrStorage.getStore();
+  const rawComponentCss = ssrCtx?.cssTracker?.size ? Array.from(ssrCtx.cssTracker) : module.getInjectedCSS?.() ?? [];
+  const componentCss = rawComponentCss.filter((s) => !alreadyIncluded.has(s));
   const themeTag = themeCss ? `<style data-vertz-css>${themeCss}</style>` : "";
   const globalTag = module.styles && module.styles.length > 0 ? `<style data-vertz-css>${module.styles.join(`
 `)}</style>` : "";
@@ -2559,6 +2564,19 @@ var STALE_GRAPH_PATTERNS = [
 function isStaleGraphError(message) {
   return STALE_GRAPH_PATTERNS.some((pattern) => pattern.test(message));
 }
+var PLUGIN_ERROR_PATTERN = /\[vertz-bun-plugin\] Failed to process (.+?): ([\s\S]*)/;
+var LINE_COL_PATTERN = /\((\d+):(\d+)\)/;
+function parsePluginError(text) {
+  const match = text.match(PLUGIN_ERROR_PATTERN);
+  if (!match)
+    return null;
+  const file = match[1];
+  const message = match[2]?.trim() || "Compilation failed";
+  const locMatch = message.match(LINE_COL_PATTERN);
+  const line = locMatch ? Number(locMatch[1]) : undefined;
+  const column = locMatch ? Number(locMatch[2]) : undefined;
+  return { message, file, line, column };
+}
 function isReloadStub(text) {
   return text.trimStart().startsWith("try{location.reload()}");
 }
@@ -3125,7 +3143,13 @@ function createBunDevServer(options) {
     const text = args.map((a) => typeof a === "string" ? a : String(a)).join(" ");
     if (!text.startsWith("[Server]")) {
       lastBuildError = text;
-      if (resolvePatterns.some((p) => text.includes(p)) && text !== lastBroadcastedError) {
+      const pluginErr = parsePluginError(text);
+      if (pluginErr && text !== lastBroadcastedError) {
+        lastBroadcastedError = text;
+        const absFile = pluginErr.file ? resolve(projectRoot, pluginErr.file) : undefined;
+        const lineText = pluginErr.line && absFile ? readLineText(absFile, pluginErr.line) : undefined;
+        broadcastError("build", [{ ...pluginErr, absFile, lineText }]);
+      } else if (resolvePatterns.some((p) => text.includes(p)) && text !== lastBroadcastedError) {
         lastBroadcastedError = text;
         broadcastError("resolve", [{ message: text }]);
       } else {
@@ -4196,6 +4220,7 @@ data: {}
 }
 export {
   shouldCheckStaleBundler,
+  parsePluginError,
   parseHMRAssets,
   isStaleGraphError,
   isReloadStub,

package/dist/bun-plugin/index.js

@@ -9,7 +9,7 @@ import {
 
 // src/bun-plugin/plugin.ts
 import { mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
-import { dirname, relative, resolve as resolve2 } from "path";
+import { dirname, relative, resolve as resolve3 } from "path";
 import remapping from "@ampproject/remapping";
 import {
   ComponentAnalyzer,
@@ -55,6 +55,39 @@ function injectContextStableIds(source, sourceFile, relFilePath) {
   }
 }
 
+// src/bun-plugin/native-compiler-loader.ts
+import { existsSync } from "fs";
+import { join, resolve } from "path";
+var __dirname = "/home/runner/work/vertz/vertz/packages/ui-server/src/bun-plugin";
+function tryLoadNativeCompiler() {
+  if (process.env.VERTZ_NATIVE_COMPILER !== "1") {
+    return null;
+  }
+  const platform = process.platform === "darwin" ? "darwin" : "linux";
+  const arch = process.arch === "arm64" ? "arm64" : "x64";
+  const binaryName = `vertz-compiler.${platform}-${arch}.node`;
+  try {
+    const modulePath = __require.resolve(`@vertz/native-compiler/${binaryName}`);
+    return __require(modulePath);
+  } catch {}
+  let dir = resolve(__dirname);
+  for (let i = 0;i < 10; i++) {
+    const candidate = join(dir, "native", "vertz-compiler", binaryName);
+    if (existsSync(candidate)) {
+      try {
+        return __require(candidate);
+      } catch {
+        return null;
+      }
+    }
+    const parent = resolve(dir, "..");
+    if (parent === dir)
+      break;
+    dir = parent;
+  }
+  return null;
+}
+
 // src/bun-plugin/entity-schema-loader.ts
 import { readFileSync } from "fs";
 function loadEntitySchema(schemaPath) {
@@ -491,8 +524,8 @@ function filePathHash(filePath) {
 
 // src/bun-plugin/image-processor.ts
 import { createHash } from "crypto";
-import { existsSync, mkdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
-import { basename, extname, resolve } from "path";
+import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
+import { basename, extname, resolve as resolve2 } from "path";
 import sharp from "sharp";
 var FORMAT_MAP = {
   jpeg: { ext: ".jpg", mime: "image/jpeg" },
@@ -505,7 +538,7 @@ var FORMAT_MAP = {
 };
 async function processImage(opts) {
   const { sourcePath, width, height, quality, fit, outputDir } = opts;
-  if (!existsSync(sourcePath)) {
+  if (!existsSync2(sourcePath)) {
     return { ok: false, error: `Image not found: ${sourcePath}` };
   }
   const sourceBuffer = readFileSync2(sourcePath);
@@ -518,10 +551,10 @@ async function processImage(opts) {
   const webp1xName = `${name}-${hash}-${width}w.webp`;
   const webp2xName = `${name}-${hash}-${width * 2}w.webp`;
   const fallbackName = `${name}-${hash}-${width * 2}w${formatInfo.ext}`;
-  const webp1xPath = resolve(outputDir, webp1xName);
-  const webp2xPath = resolve(outputDir, webp2xName);
-  const fallbackPath = resolve(outputDir, fallbackName);
-  if (existsSync(webp1xPath) && existsSync(webp2xPath) && existsSync(fallbackPath)) {
+  const webp1xPath = resolve2(outputDir, webp1xName);
+  const webp2xPath = resolve2(outputDir, webp2xName);
+  const fallbackPath = resolve2(outputDir, fallbackName);
+  if (existsSync2(webp1xPath) && existsSync2(webp2xPath) && existsSync2(fallbackPath)) {
     return {
       ok: true,
       webp1x: { path: webp1xPath, url: `/__vertz_img/${webp1xName}` },
@@ -935,14 +968,14 @@ function createVertzBunPlugin(options) {
   const fastRefresh = options?.fastRefresh ?? hmr;
   const routeSplitting = options?.routeSplitting ?? false;
   const projectRoot = options?.projectRoot ?? process.cwd();
-  const cssOutDir = options?.cssOutDir ?? resolve2(projectRoot, ".vertz", "css");
+  const cssOutDir = options?.cssOutDir ?? resolve3(projectRoot, ".vertz", "css");
   const cssExtractor = new CSSExtractor;
   const componentAnalyzer = new ComponentAnalyzer;
   const logger = options?.logger;
   const diagnostics = options?.diagnostics;
   const fileExtractions = new Map;
   const cssSidecarMap = new Map;
-  const srcDir = options?.srcDir ?? resolve2(projectRoot, "src");
+  const srcDir = options?.srcDir ?? resolve3(projectRoot, "src");
   const frameworkManifestJson = __require(__require.resolve("@vertz/ui/reactivity.json"));
   const manifestResult = generateAllManifests({
     srcDir,
@@ -997,7 +1030,7 @@ function createVertzBunPlugin(options) {
     }
   }
   diagnostics?.recordFieldSelectionManifest(fieldSelectionFileCount);
-  const entitySchemaPath = options?.entitySchemaPath ?? resolve2(projectRoot, ".vertz", "generated", "entity-schema.json");
+  const entitySchemaPath = options?.entitySchemaPath ?? resolve3(projectRoot, ".vertz", "generated", "entity-schema.json");
   let entitySchema = loadEntitySchema(entitySchemaPath);
   if (logger?.isEnabled("fields") && entitySchema) {
     logger.log("fields", "entity-schema-loaded", {
@@ -1005,6 +1038,8 @@ function createVertzBunPlugin(options) {
       entities: Object.keys(entitySchema).length
     });
   }
+  const nativeCompiler = tryLoadNativeCompiler();
+  let nativeManifestWarningLogged = false;
   mkdirSync2(cssOutDir, { recursive: true });
   const plugin = {
     name: "vertz-bun-plugin",
@@ -1094,7 +1129,7 @@ function createVertzBunPlugin(options) {
               }))
             });
           }
-          const imageOutputDir = resolve2(projectRoot, ".vertz", "images");
+          const imageOutputDir = resolve3(projectRoot, ".vertz", "images");
           const imageQueue = [];
           const imageResult = transformImages(codeForCompile, args.path, {
             projectRoot,
@@ -1124,7 +1159,31 @@ function createVertzBunPlugin(options) {
           if (imageQueue.length > 0) {
             await Promise.all(imageQueue.map((opts) => processImage({ ...opts, fit: opts.fit })));
           }
-          const compileResult = compile(codeAfterImageTransform, {
+          const compileResult = nativeCompiler ? (() => {
+            if (!nativeManifestWarningLogged && manifests.size > 0) {
+              nativeManifestWarningLogged = true;
+              const userManifestCount = [...manifests.keys()].filter((k) => !k.includes("node_modules")).length;
+              if (userManifestCount > 0) {
+                console.warn(`[vertz-bun-plugin] Native compiler does not support cross-file reactivity manifests. ` + `${userManifestCount} user module(s) with exported signal APIs will not have ` + `.value insertion for their signal properties. ` + `Set VERTZ_NATIVE_COMPILER=0 if cross-file reactivity is needed.`);
+              }
+            }
+            const nativeResult = nativeCompiler.compile(codeAfterImageTransform, {
+              filename: args.path,
+              target: options?.target,
+              fastRefresh: false
+            });
+            return {
+              code: nativeResult.code,
+              map: nativeResult.map ? JSON.parse(nativeResult.map) : { version: 3, sources: [], mappings: "", names: [] },
+              diagnostics: (nativeResult.diagnostics ?? []).map((d) => ({
+                code: "native-diagnostic",
+                message: d.message,
+                severity: "warning",
+                line: d.line ?? 1,
+                column: d.column ?? 0
+              }))
+            };
+          })() : compile(codeAfterImageTransform, {
             filename: args.path,
             target: options?.target,
             manifests: getManifestsRecord()
@@ -1145,7 +1204,7 @@ function createVertzBunPlugin(options) {
             if (hmr) {
               const hash = filePathHash(args.path);
               const cssFileName = `${hash}.css`;
-              const cssFilePath = resolve2(cssOutDir, cssFileName);
+              const cssFilePath = resolve3(cssOutDir, cssFileName);
               writeFileSync2(cssFilePath, extraction.css);
               cssSidecarMap.set(args.path, cssFilePath);
               const relPath2 = relative(dirname(args.path), cssFilePath);

package/dist/index.d.ts

@@ -302,6 +302,18 @@ interface AotManifest {
 	/** Route pattern → AOT entry. */
 	routes: Record<string, AotRouteEntry>;
 }
+/**
+* Resolves custom data for AOT-rendered routes.
+*
+* Called after the entity prefetch pipeline, before the `allKeysResolved` bail check.
+* Only called when there are unresolved query keys remaining.
+*
+* @param pattern - Matched route pattern (e.g., '/products/:id')
+* @param params - Route params (e.g., \{ id: 'abc-123' \})
+* @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>;
 /** Options for `ssrRenderAot()`. */
 interface SSRRenderAotOptions {
 	/** AOT manifest with pre-compiled render functions. */
@@ -318,6 +330,8 @@ interface SSRRenderAotOptions {
 	prefetchSession?: PrefetchSession;
 	/** AOT diagnostics collector (dev mode). When provided with VERTZ_DEBUG=aot, enables dual rendering and divergence detection. */
 	diagnostics?: AotDiagnostics;
+	/** Custom data resolver for non-entity AOT routes. */
+	aotDataResolver?: AotDataResolver;
 }
 /**
 * Create closure-based runtime fallback renderers for components
@@ -465,6 +479,14 @@ interface SSRHandlerOptions {
 	* Load via `loadAotManifest(serverDir)` at startup.
 	*/
 	aotManifest?: AotManifest;
+	/**
+	* Custom data resolver for AOT routes with non-entity data sources.
+	*
+	* Called after entity prefetch, with only the unresolved query keys.
+	* Enables AOT rendering for routes that use custom data layers
+	* (JSON files, third-party APIs, custom DB clients).
+	*/
+	aotDataResolver?: AotDataResolver;
 }
 declare function createSSRHandler(options: SSRHandlerOptions): (request: Request) => Promise<Response>;
 type NodeHandlerOptions = SSRHandlerOptions;
@@ -491,8 +513,10 @@ interface AotRouteMapEntry {
 	renderFn: string;
 	/** Component names that need runtime fallback rendering. */
 	holes: string[];
-	/** Query cache keys this route reads via ctx.getData(). */
+	/** Query cache keys this route reads via ctx.getData(). May contain ${paramName} placeholders. */
 	queryKeys: string[];
+	/** Route param names referenced in queryKeys. Present only when queryKeys have ${...} placeholders. */
+	paramBindings?: string[];
 }
 interface AotBuildManifest {
 	components: Record<string, AotBuildComponentEntry>;
@@ -1134,4 +1158,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, 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, 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 };

package/dist/index.js

@@ -1,10 +1,10 @@
 import {
   createSSRHandler,
   loadAotManifest
-} from "./shared/chunk-tqa618t8.js";
+} from "./shared/chunk-rwa95knv.js";
 import {
   createNodeHandler
-} from "./shared/chunk-fv51ctcf.js";
+} from "./shared/chunk-4qb2xcyb.js";
 import {
   collectStreamChunks,
   compileThemeCached,
@@ -34,7 +34,7 @@ import {
   ssrRenderToString,
   streamToString,
   toPrefetchSession
-} from "./shared/chunk-bggdy77b.js";
+} from "./shared/chunk-vcpk8fs6.js";
 import {
   clearGlobalSSRTimeout,
   createSSRAdapter,
@@ -109,11 +109,22 @@ function buildAotRouteMap(components, routes) {
     const comp = components[route.componentName];
     if (!comp || comp.tier === "runtime-fallback")
       continue;
-    routeMap[route.pattern] = {
+    const paramNames = new Set;
+    for (const key of comp.queryKeys) {
+      const matches = key.matchAll(/\$\{(\w+)\}/g);
+      for (const m of matches) {
+        paramNames.add(m[1]);
+      }
+    }
+    const entry = {
       renderFn: `__ssr_${route.componentName}`,
       holes: comp.holes,
       queryKeys: comp.queryKeys
     };
+    if (paramNames.size > 0) {
+      entry.paramBindings = [...paramNames];
+    }
+    routeMap[route.pattern] = entry;
   }
   return routeMap;
 }
@@ -484,7 +495,8 @@ async function twoPassRender(options) {
   }
   const pendingQueries = queries.filter((q) => !q.resolved);
   const vnode = options.app();
-  const collectedCSS = getInjectedCSS();
+  const ssrCtx = ssrStorage.getStore();
+  const collectedCSS = ssrCtx?.cssTracker?.size ? Array.from(ssrCtx.cssTracker) : getInjectedCSS();
   const themeCss = options.theme ? compileThemeCached(options.theme, options.fallbackMetrics).css : "";
   const allStyles = [themeCss, ...options.styles ?? [], ...collectedCSS].filter(Boolean);
   const styleTags = allStyles.length > 0 ? `<style>${allStyles.join(`

package/dist/node-handler.d.ts

@@ -115,6 +115,18 @@ interface AotManifest {
 	/** Route pattern → AOT entry. */
 	routes: Record<string, AotRouteEntry>;
 }
+/**
+* Resolves custom data for AOT-rendered routes.
+*
+* Called after the entity prefetch pipeline, before the `allKeysResolved` bail check.
+* Only called when there are unresolved query keys remaining.
+*
+* @param pattern - Matched route pattern (e.g., '/products/:id')
+* @param params - Route params (e.g., \{ id: 'abc-123' \})
+* @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>;
 import { AccessSet } from "@vertz/ui/auth";
 interface SessionData {
 	user: {
@@ -217,6 +229,14 @@ interface SSRHandlerOptions {
 	* Load via `loadAotManifest(serverDir)` at startup.
 	*/
 	aotManifest?: AotManifest;
+	/**
+	* Custom data resolver for AOT routes with non-entity data sources.
+	*
+	* Called after entity prefetch, with only the unresolved query keys.
+	* Enables AOT rendering for routes that use custom data layers
+	* (JSON files, third-party APIs, custom DB clients).
+	*/
+	aotDataResolver?: AotDataResolver;
 }
 type NodeHandlerOptions = SSRHandlerOptions;
 declare function createNodeHandler(options: NodeHandlerOptions): (req: IncomingMessage, res: ServerResponse) => void;

package/dist/node-handler.js

@@ -1,7 +1,7 @@
 import {
   createNodeHandler
-} from "./shared/chunk-fv51ctcf.js";
-import"./shared/chunk-bggdy77b.js";
+} from "./shared/chunk-4qb2xcyb.js";
+import"./shared/chunk-vcpk8fs6.js";
 import"./shared/chunk-ybftdw1r.js";
 export {
   createNodeHandler

package/dist/shared/{chunk-fv51ctcf.js → chunk-4qb2xcyb.js}

@@ -10,7 +10,7 @@ import {
   ssrRenderSinglePass,
   ssrStreamNavQueries,
   toPrefetchSession
-} from "./chunk-bggdy77b.js";
+} from "./chunk-vcpk8fs6.js";
 
 // src/node-handler.ts
 function createNodeHandler(options) {

package/dist/shared/{chunk-tqa618t8.js → chunk-rwa95knv.js}

@@ -11,7 +11,7 @@ import {
   ssrRenderSinglePass,
   ssrStreamNavQueries,
   toPrefetchSession
-} from "./chunk-bggdy77b.js";
+} from "./chunk-vcpk8fs6.js";
 
 // src/aot-manifest-loader.ts
 import { existsSync, readFileSync } from "node:fs";
@@ -108,7 +108,8 @@ function createSSRHandler(options) {
     sessionResolver,
     manifest,
     progressiveHTML,
-    aotManifest
+    aotManifest,
+    aotDataResolver
   } = options;
   const { template, linkHeader, modulepreloadTags, splitResult } = precomputeHandlerState(options);
   return async (request) => {
@@ -128,7 +129,7 @@ function createSSRHandler(options) {
     if (useProgressive) {
       return handleProgressiveHTMLRequest(module, splitResult, pathname + url.search, ssrTimeout, nonce, fallbackMetrics, linkHeader, modulepreloadTags, routeChunkManifest, cacheControl, sessionScript, ssrAuth, manifest);
     }
-    return handleHTMLRequest(module, template, pathname + url.search, ssrTimeout, nonce, fallbackMetrics, linkHeader, modulepreloadTags, routeChunkManifest, cacheControl, sessionScript, ssrAuth, manifest, aotManifest);
+    return handleHTMLRequest(module, template, pathname + url.search, ssrTimeout, nonce, fallbackMetrics, linkHeader, modulepreloadTags, routeChunkManifest, cacheControl, sessionScript, ssrAuth, manifest, aotManifest, aotDataResolver);
   };
 }
 async function handleNavRequest(module, url, ssrTimeout) {
@@ -217,7 +218,7 @@ async function handleProgressiveHTMLRequest(module, split, url, ssrTimeout, nonc
     });
   }
 }
-async function handleHTMLRequest(module, template, url, ssrTimeout, nonce, fallbackMetrics, linkHeader, staticModulepreloadTags, routeChunkManifest, cacheControl, sessionScript, ssrAuth, manifest, aotManifest) {
+async function handleHTMLRequest(module, template, url, ssrTimeout, nonce, fallbackMetrics, linkHeader, staticModulepreloadTags, routeChunkManifest, cacheControl, sessionScript, ssrAuth, manifest, aotManifest, aotDataResolver) {
   try {
     const prefetchSession = ssrAuth ? toPrefetchSession(ssrAuth) : undefined;
     const result = aotManifest ? await ssrRenderAot(module, url, {
@@ -226,7 +227,8 @@ async function handleHTMLRequest(module, template, url, ssrTimeout, nonce, fallb
       ssrTimeout,
       fallbackMetrics,
       ssrAuth,
-      prefetchSession
+      prefetchSession,
+      aotDataResolver
     }) : await ssrRenderSinglePass(module, url, {
       ssrTimeout,
       fallbackMetrics,

package/dist/shared/{chunk-bggdy77b.js → chunk-vcpk8fs6.js}

@@ -359,7 +359,8 @@ function createRequestContext(url) {
     queryCache: new MemoryCache({ maxSize: Infinity }),
     inflight: new Map,
     queries: [],
-    errors: []
+    errors: [],
+    cssTracker: new Set
   };
 }
 var domShimInstalled = false;
@@ -384,7 +385,9 @@ function collectCSS(themeCss, module) {
     for (const s of module.styles)
       alreadyIncluded.add(s);
   }
-  const componentCss = module.getInjectedCSS ? module.getInjectedCSS().filter((s) => !alreadyIncluded.has(s)) : [];
+  const ssrCtx = ssrStorage.getStore();
+  const rawComponentCss = ssrCtx?.cssTracker?.size ? Array.from(ssrCtx.cssTracker) : module.getInjectedCSS?.() ?? [];
+  const componentCss = rawComponentCss.filter((s) => !alreadyIncluded.has(s));
   const themeTag = themeCss ? `<style data-vertz-css>${themeCss}</style>` : "";
   const globalTag = module.styles && module.styles.length > 0 ? `<style data-vertz-css>${module.styles.join(`
 `)}</style>` : "";
@@ -1004,7 +1007,9 @@ function collectCSS2(themeCss, module) {
     for (const s of module.styles)
       alreadyIncluded.add(s);
   }
-  const componentCss = module.getInjectedCSS ? module.getInjectedCSS().filter((s) => !alreadyIncluded.has(s)) : [];
+  const ssrCtx = ssrStorage.getStore();
+  const rawComponentCss = ssrCtx?.cssTracker?.size ? Array.from(ssrCtx.cssTracker) : module.getInjectedCSS?.() ?? [];
+  const componentCss = rawComponentCss.filter((s) => !alreadyIncluded.has(s));
   const themeTag = themeCss ? `<style data-vertz-css>${themeCss}</style>` : "";
   const globalTag = module.styles && module.styles.length > 0 ? `<style data-vertz-css>${module.styles.join(`
 `)}</style>` : "";
@@ -1076,14 +1081,28 @@ async function ssrRenderAot(module, url, options) {
     return ssrRenderSinglePass(module, normalizedUrl, fallbackOptions);
   }
   const queryCache = new Map;
-  if (aotEntry.queryKeys && aotEntry.queryKeys.length > 0 && manifest?.routeEntries) {
+  const resolvedQueryKeys = aotEntry.queryKeys ? resolveParamQueryKeys(aotEntry.queryKeys, match.params) : undefined;
+  if (resolvedQueryKeys && resolvedQueryKeys.length > 0 && manifest?.routeEntries) {
     const apiClient = module.api;
     if (apiClient) {
-      await prefetchForAot(aotEntry.queryKeys, manifest.routeEntries, match, apiClient, ssrTimeout, queryCache);
+      await prefetchForAot(resolvedQueryKeys, manifest.routeEntries, match, apiClient, ssrTimeout, queryCache);
     }
   }
-  if (aotEntry.queryKeys && aotEntry.queryKeys.length > 0) {
-    const allKeysResolved = aotEntry.queryKeys.every((k) => queryCache.has(k));
+  if (resolvedQueryKeys && resolvedQueryKeys.length > 0 && options.aotDataResolver) {
+    const unresolvedKeys = resolvedQueryKeys.filter((k) => !queryCache.has(k));
+    if (unresolvedKeys.length > 0) {
+      try {
+        const resolved = await options.aotDataResolver(match.pattern, match.params, unresolvedKeys);
+        for (const [key, value] of resolved) {
+          queryCache.set(key, value);
+        }
+      } catch {
+        return ssrRenderSinglePass(module, normalizedUrl, fallbackOptions);
+      }
+    }
+  }
+  if (resolvedQueryKeys && resolvedQueryKeys.length > 0) {
+    const allKeysResolved = resolvedQueryKeys.every((k) => queryCache.has(k));
     if (!allKeysResolved) {
       return ssrRenderSinglePass(module, normalizedUrl, fallbackOptions);
     }
@@ -1167,6 +1186,9 @@ function unwrapResult2(result) {
   }
   return result;
 }
+function resolveParamQueryKeys(queryKeys, params) {
+  return queryKeys.map((key) => key.replace(/\$\{(\w+)\}/g, (_, paramName) => params[paramName] ?? ""));
+}
 function isAotDebugEnabled() {
   const env = process.env.VERTZ_DEBUG;
   if (!env)
@@ -1199,7 +1221,9 @@ function collectCSSFromModule(module, fallbackMetrics) {
     for (const s of module.styles)
       alreadyIncluded.add(s);
   }
-  const componentCss = module.getInjectedCSS ? module.getInjectedCSS().filter((s) => !alreadyIncluded.has(s)) : [];
+  const ssrCtx = ssrStorage.getStore();
+  const rawComponentCss = ssrCtx?.cssTracker?.size ? Array.from(ssrCtx.cssTracker) : module.getInjectedCSS?.() ?? [];
+  const componentCss = rawComponentCss.filter((s) => !alreadyIncluded.has(s));
   const themeTag = themeCss ? `<style data-vertz-css>${themeCss}</style>` : "";
   const globalTag = module.styles && module.styles.length > 0 ? `<style data-vertz-css>${module.styles.join(`
 `)}</style>` : "";

package/dist/ssr/index.d.ts

@@ -162,6 +162,18 @@ interface AotManifest {
 	routes: Record<string, AotRouteEntry>;
 }
 /**
+* Resolves custom data for AOT-rendered routes.
+*
+* Called after the entity prefetch pipeline, before the `allKeysResolved` bail check.
+* Only called when there are unresolved query keys remaining.
+*
+* @param pattern - Matched route pattern (e.g., '/products/:id')
+* @param params - Route params (e.g., \{ id: 'abc-123' \})
+* @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>;
+/**
 * Load AOT manifest and routes module from a server build directory.
 *
 * Returns `null` if either `aot-manifest.json` or `aot-routes.js` is missing,
@@ -335,6 +347,14 @@ interface SSRHandlerOptions {
 	* Load via `loadAotManifest(serverDir)` at startup.
 	*/
 	aotManifest?: AotManifest;
+	/**
+	* Custom data resolver for AOT routes with non-entity data sources.
+	*
+	* Called after entity prefetch, with only the unresolved query keys.
+	* Enables AOT rendering for routes that use custom data layers
+	* (JSON files, third-party APIs, custom DB clients).
+	*/
+	aotDataResolver?: AotDataResolver;
 }
 declare function createSSRHandler(options: SSRHandlerOptions): (request: Request) => Promise<Response>;
 interface InjectIntoTemplateOptions {
@@ -357,4 +377,4 @@ interface InjectIntoTemplateOptions {
 * injects CSS before </head>, and ssrData before </body>.
 */
 declare function injectIntoTemplate(options: InjectIntoTemplateOptions): string;
-export { stripScriptsFromStaticHTML, ssrRenderToString, ssrDiscoverQueries, prerenderRoutes, loadAotManifest, injectIntoTemplate, filterPrerenderableRoutes, discoverRoutes, createSSRHandler, collectPrerenderPaths, SSRRenderResult, SSRModule, SSRHandlerOptions, SSRDiscoverResult, PrerenderResult, PrerenderOptions, AotManifest };
+export { stripScriptsFromStaticHTML, ssrRenderToString, ssrDiscoverQueries, prerenderRoutes, loadAotManifest, injectIntoTemplate, filterPrerenderableRoutes, discoverRoutes, createSSRHandler, collectPrerenderPaths, SSRRenderResult, SSRModule, SSRHandlerOptions, SSRDiscoverResult, PrerenderResult, PrerenderOptions, AotManifest, AotDataResolver };

package/dist/ssr/index.js

@@ -1,12 +1,12 @@
 import {
   createSSRHandler,
   loadAotManifest
-} from "../shared/chunk-tqa618t8.js";
+} from "../shared/chunk-rwa95knv.js";
 import {
   injectIntoTemplate,
   ssrDiscoverQueries,
   ssrRenderToString
-} from "../shared/chunk-bggdy77b.js";
+} from "../shared/chunk-vcpk8fs6.js";
 import"../shared/chunk-ybftdw1r.js";
 // src/prerender.ts
 async function discoverRoutes(module) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vertz/ui-server",
-  "version": "0.2.35",
+  "version": "0.2.37",
   "description": "Vertz UI server-side rendering runtime",
   "license": "MIT",
   "repository": {
@@ -67,9 +67,9 @@
     "@ampproject/remapping": "^2.3.0",
     "@capsizecss/unpack": "^4.0.0",
     "@jridgewell/trace-mapping": "^0.3.31",
-    "@vertz/core": "^0.2.31",
-    "@vertz/ui": "^0.2.31",
-    "@vertz/ui-compiler": "^0.2.31",
+    "@vertz/core": "^0.2.35",
+    "@vertz/ui": "^0.2.35",
+    "@vertz/ui-compiler": "^0.2.35",
     "magic-string": "^0.30.0",
     "sharp": "^0.34.5",
     "ts-morph": "^27.0.2"
@@ -77,7 +77,7 @@
   "devDependencies": {
     "@happy-dom/global-registrator": "^20.8.3",
     "@playwright/test": "^1.58.2",
-    "@vertz/codegen": "^0.2.31",
+    "@vertz/codegen": "^0.2.35",
     "@vertz/ui-auth": "^0.2.19",
     "bun-types": "^1.3.10",
     "bunup": "^0.16.31",