@vertz/ui-server 0.2.36 → 0.2.38

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>` : "";

package/dist/bun-plugin/index.js

@@ -1159,6 +1159,7 @@ function createVertzBunPlugin(options) {
           if (imageQueue.length > 0) {
             await Promise.all(imageQueue.map((opts) => processImage({ ...opts, fit: opts.fit })));
           }
+          let nativeCss;
           const compileResult = nativeCompiler ? (() => {
             if (!nativeManifestWarningLogged && manifests.size > 0) {
               nativeManifestWarningLogged = true;
@@ -1172,6 +1173,9 @@ function createVertzBunPlugin(options) {
               target: options?.target,
               fastRefresh: false
             });
+            if (nativeResult.css) {
+              nativeCss = nativeResult.css;
+            }
             return {
               code: nativeResult.code,
               map: nativeResult.map ? JSON.parse(nativeResult.map) : { version: 3, sources: [], mappings: "", names: [] },
@@ -1197,8 +1201,15 @@ function createVertzBunPlugin(options) {
             mapsToChain.push(routeSplitMap);
           }
           const remapped = remapping(mapsToChain, () => null);
-          const extraction = cssExtractor.extract(source, args.path);
+          const extraction = nativeCss ? { css: nativeCss, blockNames: [] } : cssExtractor.extract(source, args.path);
           let cssImportLine = "";
+          let nativeCssInjection = "";
+          if (nativeCss && extraction.css.length > 0) {
+            const escaped = extraction.css.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$/g, "\\$");
+            nativeCssInjection = `import { injectCSS as __injectCSS } from '@vertz/ui';
+__injectCSS(\`${escaped}\`);
+`;
+          }
           if (extraction.css.length > 0) {
             fileExtractions.set(args.path, extraction);
             if (hmr) {
@@ -1224,6 +1235,9 @@ function createVertzBunPlugin(options) {
             }
           }
           let contents = "";
+          if (nativeCssInjection) {
+            contents += nativeCssInjection;
+          }
           if (cssImportLine) {
             contents += cssImportLine;
           }

package/dist/index.d.ts

@@ -513,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>;

package/dist/index.js

@@ -1,10 +1,10 @@
 import {
   createSSRHandler,
   loadAotManifest
-} from "./shared/chunk-hjsbx25c.js";
+} from "./shared/chunk-595trxsn.js";
 import {
   createNodeHandler
-} from "./shared/chunk-9s2dppdh.js";
+} from "./shared/chunk-d1a3ygv6.js";
 import {
   collectStreamChunks,
   compileThemeCached,
@@ -34,7 +34,7 @@ import {
   ssrRenderToString,
   streamToString,
   toPrefetchSession
-} from "./shared/chunk-wq2ke61r.js";
+} from "./shared/chunk-2ymwre0k.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.js

@@ -1,7 +1,7 @@
 import {
   createNodeHandler
-} from "./shared/chunk-9s2dppdh.js";
-import"./shared/chunk-wq2ke61r.js";
+} from "./shared/chunk-d1a3ygv6.js";
+import"./shared/chunk-2ymwre0k.js";
 import"./shared/chunk-ybftdw1r.js";
 export {
   createNodeHandler

package/dist/shared/{chunk-wq2ke61r.js → chunk-2ymwre0k.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,15 @@ 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 && options.aotDataResolver) {
-    const unresolvedKeys = aotEntry.queryKeys.filter((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);
@@ -1095,8 +1101,8 @@ async function ssrRenderAot(module, url, options) {
       }
     }
   }
-  if (aotEntry.queryKeys && aotEntry.queryKeys.length > 0) {
-    const allKeysResolved = aotEntry.queryKeys.every((k) => queryCache.has(k));
+  if (resolvedQueryKeys && resolvedQueryKeys.length > 0) {
+    const allKeysResolved = resolvedQueryKeys.every((k) => queryCache.has(k));
     if (!allKeysResolved) {
       return ssrRenderSinglePass(module, normalizedUrl, fallbackOptions);
     }
@@ -1114,7 +1120,13 @@ async function ssrRenderAot(module, url, options) {
     for (const [key, value] of queryCache) {
       data[key] = value;
     }
-    const html = aotEntry.render(data, ctx);
+    let html;
+    try {
+      html = aotEntry.render(data, ctx);
+    } catch (renderErr) {
+      console.error("[SSR] AOT render failed for", match.pattern, "— falling back to single-pass:", renderErr instanceof Error ? renderErr.message : renderErr);
+      return ssrRenderSinglePass(module, normalizedUrl, fallbackOptions);
+    }
     if (options.diagnostics && isAotDebugEnabled()) {
       try {
         const domResult = await ssrRenderSinglePass(module, normalizedUrl, fallbackOptions);
@@ -1180,6 +1192,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)
@@ -1212,7 +1227,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/shared/{chunk-hjsbx25c.js → chunk-595trxsn.js}

@@ -11,7 +11,7 @@ import {
   ssrRenderSinglePass,
   ssrStreamNavQueries,
   toPrefetchSession
-} from "./chunk-wq2ke61r.js";
+} from "./chunk-2ymwre0k.js";
 
 // src/aot-manifest-loader.ts
 import { existsSync, readFileSync } from "node:fs";

package/dist/shared/{chunk-9s2dppdh.js → chunk-d1a3ygv6.js}

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

package/dist/ssr/index.js

@@ -1,12 +1,12 @@
 import {
   createSSRHandler,
   loadAotManifest
-} from "../shared/chunk-hjsbx25c.js";
+} from "../shared/chunk-595trxsn.js";
 import {
   injectIntoTemplate,
   ssrDiscoverQueries,
   ssrRenderToString
-} from "../shared/chunk-wq2ke61r.js";
+} from "../shared/chunk-2ymwre0k.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.36",
+  "version": "0.2.38",
   "description": "Vertz UI server-side rendering runtime",
   "license": "MIT",
   "repository": {