@vertz/ui-server 0.2.32 → 0.2.33

package/README.md

@@ -85,14 +85,14 @@ const html = await renderToHTML(App, {
 
 **Options:**
 
-| Option | Type | Description |
-|---|---|---|
-| `app` | `() => VNode` | App component function |
-| `url` | `string` | Request URL for SSR routing |
-| `theme` | `Theme` | Theme definition for CSS vars |
-| `styles` | `string[]` | Global CSS strings to inject |
-| `head` | `object` | Head config: `title`, `meta[]`, `links[]` |
-| `container` | `string` | Container selector (default `'#app'`) |
+| Option      | Type          | Description                               |
+| ----------- | ------------- | ----------------------------------------- |
+| `app`       | `() => VNode` | App component function                    |
+| `url`       | `string`      | Request URL for SSR routing               |
+| `theme`     | `Theme`       | Theme definition for CSS vars             |
+| `styles`    | `string[]`    | Global CSS strings to inject              |
+| `head`      | `object`      | Head config: `title`, `meta[]`, `links[]` |
+| `container` | `string`      | Container selector (default `'#app'`)     |
 
 ### `renderPage(vnode, options?)`
 
@@ -113,18 +113,18 @@ return renderPage(<App />, {
 
 **Options:**
 
-| Option | Type | Description |
-|---|---|---|
-| `status` | `number` | HTTP status code (default `200`) |
-| `title` | `string` | Page title |
-| `description` | `string` | Meta description |
-| `lang` | `string` | HTML lang attribute (default `'en'`) |
-| `favicon` | `string` | Favicon URL |
-| `og` | `object` | Open Graph: `title`, `description`, `image`, `url`, `type` |
-| `twitter` | `object` | Twitter card: `card`, `site` |
-| `scripts` | `string[]` | Script URLs for end of body |
-| `styles` | `string[]` | Stylesheet URLs for head |
-| `head` | `string` | Raw HTML escape hatch for head |
+| Option        | Type       | Description                                                |
+| ------------- | ---------- | ---------------------------------------------------------- |
+| `status`      | `number`   | HTTP status code (default `200`)                           |
+| `title`       | `string`   | Page title                                                 |
+| `description` | `string`   | Meta description                                           |
+| `lang`        | `string`   | HTML lang attribute (default `'en'`)                       |
+| `favicon`     | `string`   | Favicon URL                                                |
+| `og`          | `object`   | Open Graph: `title`, `description`, `image`, `url`, `type` |
+| `twitter`     | `object`   | Twitter card: `card`, `site`                               |
+| `scripts`     | `string[]` | Script URLs for end of body                                |
+| `styles`      | `string[]` | Stylesheet URLs for head                                   |
+| `head`        | `string`   | Raw HTML escape hatch for head                             |
 
 ### `renderToStream(tree, options?)`
 
@@ -148,6 +148,7 @@ return new Response(stream, {
 ```
 
 **Options:**
+
 - `nonce?: string` — CSP nonce for inline scripts
 
 ### `serializeToHtml(node)`
@@ -203,11 +204,11 @@ removeDomShim();
 
 **Note:** `renderToHTML` handles DOM shim setup and teardown automatically. You only need these when using lower-level rendering APIs.
 
-| Export | Description |
-|---|---|
+| Export             | Description                                  |
+| ------------------ | -------------------------------------------- |
 | `installDomShim()` | Install the minimal DOM shim on `globalThis` |
-| `removeDomShim()` | Remove the DOM shim from `globalThis` |
-| `toVNode(element)` | Convert an SSR element to a VNode |
+| `removeDomShim()`  | Remove the DOM shim from `globalThis`        |
+| `toVNode(element)` | Convert an SSR element to a VNode            |
 
 ---
 
@@ -228,6 +229,7 @@ const headHtml = renderHeadToHtml(headCollector.getEntries());
 ```
 
 **`HeadCollector` methods:**
+
 - `addTitle(text)` — Add a `<title>` tag
 - `addMeta(attrs)` — Add a `<meta>` tag
 - `addLink(attrs)` — Add a `<link>` tag
@@ -266,7 +268,9 @@ const hydratedNode = wrapWithHydrationMarkers(counterNode, {
 <div data-v-id="Counter" data-v-key="counter-0">
   <span>Count: 0</span>
   <button>+</button>
-  <script type="application/json">{"initial":0}</script>
+  <script type="application/json">
+    { "initial": 0 }
+  </script>
 </div>
 ```
 
@@ -363,24 +367,24 @@ await server.listen();
 
 **Options:**
 
-| Option | Type | Default | Description |
-|---|---|---|---|
-| `entry` | `string` | (required) | Path to the SSR entry module |
-| `port` | `number` | `5173` | Port to listen on |
-| `host` | `string` | `'0.0.0.0'` | Host to bind to |
-| `viteConfig` | `InlineConfig` | `{}` | Custom Vite configuration |
-| `middleware` | `function` | — | Custom middleware before SSR handler |
-| `skipModuleInvalidation` | `boolean` | `false` | Skip invalidating modules on each request |
-| `logRequests` | `boolean` | `true` | Log requests to console |
+| Option                   | Type           | Default     | Description                               |
+| ------------------------ | -------------- | ----------- | ----------------------------------------- |
+| `entry`                  | `string`       | (required)  | Path to the SSR entry module              |
+| `port`                   | `number`       | `5173`      | Port to listen on                         |
+| `host`                   | `string`       | `'0.0.0.0'` | Host to bind to                           |
+| `viteConfig`             | `InlineConfig` | `{}`        | Custom Vite configuration                 |
+| `middleware`             | `function`     | —           | Custom middleware before SSR handler      |
+| `skipModuleInvalidation` | `boolean`      | `false`     | Skip invalidating modules on each request |
+| `logRequests`            | `boolean`      | `true`      | Log requests to console                   |
 
 **`DevServer` interface:**
 
-| Property/Method | Description |
-|---|---|
-| `listen()` | Start the server |
-| `close()` | Stop the server |
-| `vite` | The underlying `ViteDevServer` |
-| `httpServer` | The underlying `http.Server` |
+| Property/Method | Description                    |
+| --------------- | ------------------------------ |
+| `listen()`      | Start the server               |
+| `close()`       | Stop the server                |
+| `vite`          | The underlying `ViteDevServer` |
+| `httpServer`    | The underlying `http.Server`   |
 
 The entry module should export a `renderToString(url: string)` function that returns HTML.
 
@@ -390,11 +394,11 @@ The entry module should export a `renderToString(url: string)` function that ret
 
 The `@vertz/ui-server/jsx-runtime` subpath provides a server-side JSX factory that produces VNode trees compatible with `renderToStream`. During SSR, Vite's `ssrLoadModule` swaps this in automatically.
 
-| Export | Description |
-|---|---|
-| `jsx` | JSX factory for single-child elements |
-| `jsxs` | JSX factory for multi-child elements |
-| `Fragment` | Fragment component |
+| Export     | Description                           |
+| ---------- | ------------------------------------- |
+| `jsx`      | JSX factory for single-child elements |
+| `jsxs`     | JSX factory for multi-child elements  |
+| `Fragment` | Fragment component                    |
 
 ---
 
@@ -430,11 +434,11 @@ import type {
 
 ## Utilities
 
-| Export | Description |
-|---|---|
-| `streamToString(stream)` | Convert a `ReadableStream<Uint8Array>` to a string |
-| `collectStreamChunks(stream)` | Collect stream chunks as a `string[]` |
-| `encodeChunk(html)` | Encode a string to a `Uint8Array` chunk |
+| Export                        | Description                                        |
+| ----------------------------- | -------------------------------------------------- |
+| `streamToString(stream)`      | Convert a `ReadableStream<Uint8Array>` to a string |
+| `collectStreamChunks(stream)` | Collect stream chunks as a `string[]`              |
+| `encodeChunk(html)`           | Encode a string to a `Uint8Array` chunk            |
 
 ---
 

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

@@ -133,6 +133,19 @@ declare function isStaleGraphError(message: string): boolean;
 *   addEventListener("DOMContentLoaded",function(event){location.reload()})
 */
 declare function isReloadStub(text: string): boolean;
+/**
+* Determine whether the dev server should check for a stale dev bundler
+* (and potentially restart) after a file change.
+*
+* When the bundle hash changed, the dev bundler processed the update
+* successfully — HMR will deliver it. Checking for a reload stub would
+* race with Bun's internal update and produce false positives.
+*
+* When the hash did NOT change, the dev bundler may be stuck (e.g. new
+* file imported for the first time). The stale check is needed to detect
+* this and auto-restart.
+*/
+declare function shouldCheckStaleBundler(hashChanged: boolean): boolean;
 /** A resolved stack frame for terminal logging. */
 interface TerminalStackFrame {
 	functionName: string | null;
@@ -244,4 +257,4 @@ declare function clearSSRRequireCache(): number;
 * SSR is always on. HMR always works. No mode toggle needed.
 */
 declare function createBunDevServer(options: BunDevServerOptions): BunDevServer;
-export { parseHMRAssets, isStaleGraphError, isReloadStub, generateSSRPageHtml, formatTerminalRuntimeError, detectFaviconTag, createRuntimeErrorDeduplicator, createFetchInterceptor, createBunDevServer, clearSSRRequireCache, buildScriptTag, SSRPageHtmlOptions, HMRAssets, FetchInterceptorOptions, ErrorDetail, ErrorCategory, BunDevServerOptions, BunDevServer };
+export { shouldCheckStaleBundler, parseHMRAssets, isStaleGraphError, isReloadStub, generateSSRPageHtml, formatTerminalRuntimeError, detectFaviconTag, createRuntimeErrorDeduplicator, createFetchInterceptor, createBunDevServer, clearSSRRequireCache, buildScriptTag, SSRPageHtmlOptions, HMRAssets, FetchInterceptorOptions, ErrorDetail, ErrorCategory, BunDevServerOptions, BunDevServer };

package/dist/bun-dev-server.js

@@ -2556,6 +2556,9 @@ function isStaleGraphError(message) {
 function isReloadStub(text) {
   return text.trimStart().startsWith("try{location.reload()}");
 }
+function shouldCheckStaleBundler(hashChanged) {
+  return !hashChanged;
+}
 var MAX_TERMINAL_STACK_FRAMES = 5;
 function formatTerminalRuntimeError(errors, parsedStack) {
   const primary = errors[0];
@@ -3913,6 +3916,7 @@ data: {}
           await discoverHMRAssets();
           if (stopped)
             return;
+          let hashChanged = false;
           try {
             const clientRelative = rawClientSrc.replace(/^\//, "");
             const result = await Bun.build({
@@ -3944,10 +3948,12 @@ data: {}
                 if (stopped)
                   return;
                 await discoverHMRAssets();
-                if (bundledScriptUrl !== prevUrl)
+                if (bundledScriptUrl !== prevUrl) {
+                  hashChanged = true;
                   break;
+                }
               }
-              if (bundledScriptUrl && server && !isRestarting) {
+              if (!hashChanged && bundledScriptUrl && server && !isRestarting) {
                 try {
                   const bundleRes = await fetch(`http://${host}:${server.port}${bundledScriptUrl}`);
                   const bundleText = await bundleRes.text();
@@ -4041,7 +4047,7 @@ data: {}
             if (logRequests) {
               console.log("[Server] SSR module refreshed");
             }
-            if (await checkAndRestartIfBundlerStale())
+            if (!hashChanged && await checkAndRestartIfBundlerStale())
               return;
             clearErrorForFileChange();
           } catch {
@@ -4070,7 +4076,7 @@ data: {}
               if (logRequests) {
                 console.log("[Server] SSR module refreshed (retry)");
               }
-              if (await checkAndRestartIfBundlerStale())
+              if (!hashChanged && await checkAndRestartIfBundlerStale())
                 return;
               clearErrorForFileChange();
             } catch (e2) {
@@ -4183,6 +4189,7 @@ data: {}
   return devServer;
 }
 export {
+  shouldCheckStaleBundler,
   parseHMRAssets,
   isStaleGraphError,
   isReloadStub,

package/dist/index.js

@@ -1,17 +1,15 @@
 import {
-  createHoles,
   createSSRHandler,
-  isAotDebugEnabled,
-  loadAotManifest,
-  ssrRenderAot
-} from "./shared/chunk-gbcsa7h1.js";
+  loadAotManifest
+} from "./shared/chunk-2kx402c1.js";
 import {
   createNodeHandler
-} from "./shared/chunk-es0406qq.js";
+} from "./shared/chunk-xdb8qn68.js";
 import {
   collectStreamChunks,
   compileThemeCached,
   createAccessSetScript,
+  createHoles,
   createRequestContext,
   createSSRDataChunk,
   createSessionScript,
@@ -23,6 +21,7 @@ import {
   evaluateAccessRule,
   getAccessSetForSSR,
   getStreamingRuntimeScript,
+  isAotDebugEnabled,
   matchUrlToPatterns,
   reconstructDescriptors,
   renderToStream,
@@ -30,11 +29,12 @@ import {
   safeSerialize,
   serializeToHtml,
   ssrDiscoverQueries,
+  ssrRenderAot,
   ssrRenderSinglePass,
   ssrRenderToString,
   streamToString,
   toPrefetchSession
-} from "./shared/chunk-34fexgex.js";
+} from "./shared/chunk-hx7drzm3.js";
 import {
   clearGlobalSSRTimeout,
   createSSRAdapter,

package/dist/node-handler.js

@@ -1,7 +1,7 @@
 import {
   createNodeHandler
-} from "./shared/chunk-es0406qq.js";
-import"./shared/chunk-34fexgex.js";
+} from "./shared/chunk-xdb8qn68.js";
+import"./shared/chunk-hx7drzm3.js";
 import"./shared/chunk-ybftdw1r.js";
 export {
   createNodeHandler

package/dist/shared/{chunk-gbcsa7h1.js → chunk-2kx402c1.js}

@@ -1,28 +1,17 @@
 import {
-  compileThemeCached,
-  createRequestContext,
   encodeChunk,
   escapeAttr,
   injectIntoTemplate,
-  matchUrlToPatterns,
   precomputeHandlerState,
-  reconstructDescriptors,
   resolveRouteModulepreload,
   resolveSession,
   safeSerialize,
-  serializeToHtml,
+  ssrRenderAot,
   ssrRenderProgressive,
   ssrRenderSinglePass,
   ssrStreamNavQueries,
   toPrefetchSession
-} from "./chunk-34fexgex.js";
-import {
-  clearGlobalSSRTimeout,
-  installDomShim,
-  setGlobalSSRTimeout,
-  ssrStorage,
-  toVNode
-} from "./chunk-ybftdw1r.js";
+} from "./chunk-hx7drzm3.js";
 
 // src/aot-manifest-loader.ts
 import { existsSync, readFileSync } from "node:fs";
@@ -66,196 +55,6 @@ async function loadAotManifest(serverDir) {
   return { routes };
 }
 
-// src/ssr-aot-pipeline.ts
-function createHoles(holeNames, module, url, queryCache, ssrAuth) {
-  if (holeNames.length === 0)
-    return {};
-  const holes = {};
-  for (const name of holeNames) {
-    holes[name] = () => {
-      const holeCtx = createRequestContext(url);
-      for (const [key, data] of queryCache) {
-        holeCtx.queryCache.set(key, data);
-      }
-      if (ssrAuth) {
-        holeCtx.ssrAuth = ssrAuth;
-      }
-      holeCtx.resolvedComponents = new Map;
-      return ssrStorage.run(holeCtx, () => {
-        ensureDomShim();
-        const factory = resolveHoleComponent(module, name);
-        if (!factory) {
-          return `<!-- AOT hole: ${name} not found -->`;
-        }
-        const node = factory();
-        const vnode = toVNode(node);
-        return serializeToHtml(vnode);
-      });
-    };
-  }
-  return holes;
-}
-function resolveHoleComponent(module, name) {
-  const moduleRecord = module;
-  const exported = moduleRecord[name];
-  if (typeof exported === "function") {
-    return exported;
-  }
-  return;
-}
-async function ssrRenderAot(module, url, options) {
-  const { aotManifest, manifest } = options;
-  const ssrTimeout = options.ssrTimeout ?? 300;
-  const normalizedUrl = url.endsWith("/index.html") ? url.slice(0, -"/index.html".length) || "/" : url;
-  const fallbackOptions = {
-    ssrTimeout,
-    fallbackMetrics: options.fallbackMetrics,
-    ssrAuth: options.ssrAuth,
-    manifest,
-    prefetchSession: options.prefetchSession
-  };
-  const aotPatterns = Object.keys(aotManifest.routes);
-  const matches = matchUrlToPatterns(normalizedUrl, aotPatterns);
-  if (matches.length === 0) {
-    return ssrRenderSinglePass(module, normalizedUrl, fallbackOptions);
-  }
-  const match = matches[matches.length - 1];
-  if (!match) {
-    return ssrRenderSinglePass(module, normalizedUrl, fallbackOptions);
-  }
-  const aotEntry = aotManifest.routes[match.pattern];
-  if (!aotEntry) {
-    return ssrRenderSinglePass(module, normalizedUrl, fallbackOptions);
-  }
-  const queryCache = new Map;
-  if (aotEntry.queryKeys && aotEntry.queryKeys.length > 0 && manifest?.routeEntries) {
-    const apiClient = module.api;
-    if (apiClient) {
-      await prefetchForAot(aotEntry.queryKeys, manifest.routeEntries, match, apiClient, ssrTimeout, queryCache);
-    }
-  }
-  try {
-    setGlobalSSRTimeout(ssrTimeout);
-    const holes = createHoles(aotEntry.holes, module, normalizedUrl, queryCache, options.ssrAuth);
-    const ctx = {
-      holes,
-      getData: (key) => queryCache.get(key),
-      session: options.prefetchSession,
-      params: match.params
-    };
-    const data = {};
-    for (const [key, value] of queryCache) {
-      data[key] = value;
-    }
-    const html = aotEntry.render(data, ctx);
-    if (options.diagnostics && isAotDebugEnabled()) {
-      try {
-        const domResult = await ssrRenderSinglePass(module, normalizedUrl, fallbackOptions);
-        if (domResult.html !== html) {
-          options.diagnostics.recordDivergence(match.pattern, html, domResult.html);
-        }
-      } catch {}
-    }
-    const css = collectCSSFromModule(module, options.fallbackMetrics);
-    const ssrData = [];
-    for (const [key, data2] of queryCache) {
-      ssrData.push({ key, data: data2 });
-    }
-    return {
-      html,
-      css: css.cssString,
-      ssrData,
-      headTags: css.preloadTags,
-      matchedRoutePatterns: [match.pattern]
-    };
-  } finally {
-    clearGlobalSSRTimeout();
-  }
-}
-async function prefetchForAot(queryKeys, routeEntries, match, apiClient, ssrTimeout, queryCache) {
-  const entry = routeEntries[match.pattern];
-  if (!entry)
-    return;
-  const queryKeySet = new Set(queryKeys);
-  const fetchJobs = [];
-  for (const query of entry.queries) {
-    if (!query.entity || !query.operation)
-      continue;
-    const aotKey = `${query.entity}-${query.operation}`;
-    if (!queryKeySet.has(aotKey))
-      continue;
-    const descriptors = reconstructDescriptors([query], match.params, apiClient);
-    if (descriptors.length > 0 && descriptors[0]) {
-      fetchJobs.push({ aotKey, fetchFn: descriptors[0].fetch });
-    }
-  }
-  if (fetchJobs.length === 0)
-    return;
-  await Promise.allSettled(fetchJobs.map(({ aotKey, fetchFn }) => {
-    let timer;
-    return Promise.race([
-      fetchFn().then((result) => {
-        clearTimeout(timer);
-        const data = unwrapResult(result);
-        queryCache.set(aotKey, data);
-      }),
-      new Promise((r) => {
-        timer = setTimeout(r, ssrTimeout);
-      })
-    ]);
-  }));
-}
-function unwrapResult(result) {
-  if (result && typeof result === "object" && "ok" in result && "data" in result) {
-    const r = result;
-    if (r.ok)
-      return r.data;
-  }
-  return result;
-}
-function isAotDebugEnabled() {
-  const env = process.env.VERTZ_DEBUG;
-  if (!env)
-    return false;
-  return env === "1" || env.split(",").includes("aot");
-}
-var domShimInstalled = false;
-function ensureDomShim() {
-  if (domShimInstalled && typeof document !== "undefined")
-    return;
-  domShimInstalled = true;
-  installDomShim();
-}
-function collectCSSFromModule(module, fallbackMetrics) {
-  let themeCss = "";
-  let preloadTags = "";
-  if (module.theme) {
-    try {
-      const compiled = compileThemeCached(module.theme, fallbackMetrics);
-      themeCss = compiled.css;
-      preloadTags = compiled.preloadTags;
-    } catch (e) {
-      console.error("[vertz] Failed to compile theme export. Ensure your theme is created with defineTheme().", e);
-    }
-  }
-  const alreadyIncluded = new Set;
-  if (themeCss)
-    alreadyIncluded.add(themeCss);
-  if (module.styles) {
-    for (const s of module.styles)
-      alreadyIncluded.add(s);
-  }
-  const componentCss = module.getInjectedCSS ? module.getInjectedCSS().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>` : "";
-  const componentTag = componentCss.length > 0 ? `<style data-vertz-css>${componentCss.join(`
-`)}</style>` : "";
-  const cssString = [themeTag, globalTag, componentTag].filter(Boolean).join(`
-`);
-  return { cssString, preloadTags };
-}
-
 // src/ssr-progressive-response.ts
 function buildProgressiveResponse(options) {
   const { headChunk, renderStream, tailChunk, ssrData, nonce, headers } = options;
@@ -468,4 +267,4 @@ async function handleHTMLRequest(module, template, url, ssrTimeout, nonce, fallb
   }
 }
 
-export { loadAotManifest, createHoles, ssrRenderAot, isAotDebugEnabled, createSSRHandler };
+export { loadAotManifest, createSSRHandler };