@vertz/ui-server 0.2.42 → 0.2.43

package/dist/bun-dev-server.js

@@ -1535,9 +1535,16 @@ function createPrefetchManifestManager(options) {
   };
 }
 
-// src/ssr-render.ts
-import { compileTheme } from "@vertz/ui";
-import { EntityStore, MemoryCache, QueryEnvelopeStore } from "@vertz/ui/internals";
+// src/ssr-session.ts
+function createSessionScript(session, nonce) {
+  const json = JSON.stringify(session);
+  const escaped = json.replace(/</g, "\\u003c").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
+  const nonceAttr = nonce ? ` nonce="${escapeAttr2(nonce)}"` : "";
+  return `<script${nonceAttr}>window.__VERTZ_SESSION__=${escaped}</script>`;
+}
+function escapeAttr2(s) {
+  return s.replace(/[&"'<>]/g, (c) => `&#${c.charCodeAt(0)};`);
+}
 
 // src/css-filter.ts
 function extractClassNamesFromHTML(html) {
@@ -2382,14 +2389,14 @@ var RAW_TEXT_ELEMENTS = new Set(["script", "style"]);
 function escapeHtml(text) {
   return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }
-function escapeAttr2(value) {
+function escapeAttr3(value) {
   const str = typeof value === "string" ? value : String(value);
   return str.replace(/&/g, "&amp;").replace(/"/g, "&quot;");
 }
 function serializeAttrs(attrs) {
   const parts = [];
   for (const [key, value] of Object.entries(attrs)) {
-    parts.push(` ${key}="${escapeAttr2(value)}"`);
+    parts.push(` ${key}="${escapeAttr3(value)}"`);
   }
   return parts.join("");
 }
@@ -2457,7 +2464,7 @@ async function streamToString(stream) {
 function createTemplateChunk(slotId, resolvedHtml, nonce) {
   const tmplId = `v-tmpl-${slotId}`;
   const slotRef = `v-slot-${slotId}`;
-  const nonceAttr = nonce != null ? ` nonce="${escapeAttr2(nonce)}"` : "";
+  const nonceAttr = nonce != null ? ` nonce="${escapeAttr3(nonce)}"` : "";
   return `<template id="${tmplId}">${resolvedHtml}</template>` + `<script${nonceAttr}>` + `(function(){` + `var s=document.getElementById("${slotRef}");` + `var t=document.getElementById("${tmplId}");` + `if(s&&t){s.replaceWith(t.content.cloneNode(true));t.remove()}` + `})()` + "</script>";
 }
 
@@ -2487,7 +2494,7 @@ function renderToStream(tree, options) {
       return children.map((child) => walkAndSerialize(child)).join("");
     }
     const isRawText = RAW_TEXT_ELEMENTS.has(tag);
-    const attrStr = Object.entries(attrs).map(([k, v]) => ` ${k}="${escapeAttr2(v)}"`).join("");
+    const attrStr = Object.entries(attrs).map(([k, v]) => ` ${k}="${escapeAttr3(v)}"`).join("");
     if (VOID_ELEMENTS.has(tag)) {
       return `<${tag}${attrStr}>`;
     }
@@ -2525,276 +2532,6 @@ function renderToStream(tree, options) {
   });
 }
 
-// src/ssr-streaming-runtime.ts
-function safeSerialize(data) {
-  return JSON.stringify(data).replace(/</g, "\\u003c");
-}
-
-// src/ssr-render.ts
-var compiledThemeCache = new WeakMap;
-var compiledThemeWithMetricsCache = new WeakMap;
-function compileThemeCached(theme, fallbackMetrics) {
-  const cache = fallbackMetrics ? compiledThemeWithMetricsCache : compiledThemeCache;
-  const cached = cache.get(theme);
-  if (cached)
-    return cached;
-  const compiled = compileTheme(theme, { fallbackMetrics });
-  cache.set(theme, compiled);
-  return compiled;
-}
-function createRequestContext(url) {
-  return {
-    url,
-    adapter: createSSRAdapter(),
-    subscriber: null,
-    readValueCb: null,
-    cleanupStack: [],
-    batchDepth: 0,
-    pendingEffects: new Map,
-    contextScope: null,
-    entityStore: new EntityStore,
-    envelopeStore: new QueryEnvelopeStore,
-    queryCache: new MemoryCache({ maxSize: Infinity }),
-    inflight: new Map,
-    queries: [],
-    errors: [],
-    cssTracker: new Set
-  };
-}
-var domShimInstalled = false;
-function ensureDomShim() {
-  if (domShimInstalled && typeof document !== "undefined")
-    return;
-  domShimInstalled = true;
-  installDomShim();
-}
-function resolveAppFactory(module) {
-  const createApp = module.default || module.App;
-  if (typeof createApp !== "function") {
-    throw new Error("App entry must export a default function or named App function");
-  }
-  return createApp;
-}
-function collectCSS(themeCss, module, renderedHtml) {
-  const alreadyIncluded = new Set;
-  if (themeCss)
-    alreadyIncluded.add(themeCss);
-  if (module.styles) {
-    for (const s of module.styles)
-      alreadyIncluded.add(s);
-  }
-  const ssrCtx = ssrStorage.getStore();
-  const tracker = ssrCtx?.cssTracker;
-  const useTracker = tracker && tracker.size > 0;
-  const rawComponentCss = useTracker ? Array.from(tracker) : module.getInjectedCSS?.() ?? [];
-  let componentCss = rawComponentCss.filter((s) => !alreadyIncluded.has(s));
-  if (!useTracker && componentCss.length > 0 && renderedHtml) {
-    componentCss = filterCSSByHTML(renderedHtml, componentCss);
-  }
-  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>` : "";
-  return [themeTag, globalTag, componentTag].filter(Boolean).join(`
-`);
-}
-async function ssrRenderToString(module, url, options) {
-  const normalizedUrl = url.endsWith("/index.html") ? url.slice(0, -"/index.html".length) || "/" : url;
-  const ssrTimeout = options?.ssrTimeout ?? 300;
-  ensureDomShim();
-  const ctx = createRequestContext(normalizedUrl);
-  if (options?.ssrAuth) {
-    ctx.ssrAuth = options.ssrAuth;
-  }
-  return ssrStorage.run(ctx, async () => {
-    try {
-      setGlobalSSRTimeout(ssrTimeout);
-      const createApp = resolveAppFactory(module);
-      let themeCss = "";
-      let themePreloadTags = "";
-      if (module.theme) {
-        try {
-          const compiled = compileThemeCached(module.theme, options?.fallbackMetrics);
-          themeCss = compiled.css;
-          themePreloadTags = compiled.preloadTags;
-        } catch (e) {
-          console.error("[vertz] Failed to compile theme export. Ensure your theme is created with defineTheme().", e);
-        }
-      }
-      createApp();
-      if (ctx.ssrRedirect) {
-        return {
-          html: "",
-          css: "",
-          ssrData: [],
-          headTags: "",
-          redirect: ctx.ssrRedirect
-        };
-      }
-      const store = ssrStorage.getStore();
-      if (store) {
-        if (store.pendingRouteComponents?.size) {
-          const entries = Array.from(store.pendingRouteComponents.entries());
-          const results = await Promise.allSettled(entries.map(([route, promise]) => Promise.race([
-            promise.then((mod) => ({ route, factory: mod.default })),
-            new Promise((_, reject) => setTimeout(() => reject(new Error("lazy route timeout")), ssrTimeout))
-          ])));
-          store.resolvedComponents = new Map;
-          for (const result of results) {
-            if (result.status === "fulfilled") {
-              const { route, factory } = result.value;
-              store.resolvedComponents.set(route, factory);
-            }
-          }
-          store.pendingRouteComponents = undefined;
-        }
-        if (!store.resolvedComponents) {
-          store.resolvedComponents = new Map;
-        }
-      }
-      const queries = getSSRQueries();
-      const resolvedQueries = [];
-      if (queries.length > 0) {
-        await Promise.allSettled(queries.map(({ promise, timeout, resolve, key }) => Promise.race([
-          promise.then((data) => {
-            resolve(data);
-            resolvedQueries.push({ key, data });
-            return "resolved";
-          }),
-          new Promise((r) => setTimeout(r, timeout || ssrTimeout)).then(() => "timeout")
-        ])));
-        if (store)
-          store.queries = [];
-      }
-      const app = createApp();
-      const vnode = toVNode(app);
-      const stream = renderToStream(vnode);
-      const html = await streamToString(stream);
-      const css = collectCSS(themeCss, module, html);
-      const ssrData = resolvedQueries.length > 0 ? resolvedQueries.map(({ key, data }) => ({ key, data })) : [];
-      return {
-        html,
-        css,
-        ssrData,
-        headTags: themePreloadTags,
-        discoveredRoutes: ctx.discoveredRoutes,
-        matchedRoutePatterns: ctx.matchedRoutePatterns
-      };
-    } finally {
-      clearGlobalSSRTimeout();
-    }
-  });
-}
-async function ssrStreamNavQueries(module, url, options) {
-  const normalizedUrl = url.endsWith("/index.html") ? url.slice(0, -"/index.html".length) || "/" : url;
-  const ssrTimeout = options?.ssrTimeout ?? 300;
-  const navTimeout = options?.navSsrTimeout ?? 5000;
-  ensureDomShim();
-  const ctx = createRequestContext(normalizedUrl);
-  const queries = await ssrStorage.run(ctx, async () => {
-    try {
-      setGlobalSSRTimeout(ssrTimeout);
-      const createApp = resolveAppFactory(module);
-      createApp();
-      const discovered = getSSRQueries();
-      return discovered.map((q) => ({
-        promise: q.promise,
-        timeout: q.timeout || ssrTimeout,
-        resolve: q.resolve,
-        key: q.key
-      }));
-    } finally {
-      clearGlobalSSRTimeout();
-    }
-  });
-  if (queries.length === 0) {
-    const encoder3 = new TextEncoder;
-    return new ReadableStream({
-      start(controller) {
-        controller.enqueue(encoder3.encode(`event: done
-data: {}
-
-`));
-        controller.close();
-      }
-    });
-  }
-  const encoder2 = new TextEncoder;
-  let remaining = queries.length;
-  return new ReadableStream({
-    start(controller) {
-      let closed = false;
-      function safeEnqueue(chunk) {
-        if (closed)
-          return;
-        try {
-          controller.enqueue(chunk);
-        } catch {
-          closed = true;
-        }
-      }
-      function safeClose() {
-        if (closed)
-          return;
-        closed = true;
-        try {
-          controller.close();
-        } catch {}
-      }
-      function checkDone() {
-        if (remaining === 0) {
-          safeEnqueue(encoder2.encode(`event: done
-data: {}
-
-`));
-          safeClose();
-        }
-      }
-      for (const { promise, resolve, key } of queries) {
-        let settled = false;
-        promise.then((data) => {
-          if (settled)
-            return;
-          settled = true;
-          resolve(data);
-          const entry = { key, data };
-          safeEnqueue(encoder2.encode(`event: data
-data: ${safeSerialize(entry)}
-
-`));
-          remaining--;
-          checkDone();
-        }, () => {
-          if (settled)
-            return;
-          settled = true;
-          remaining--;
-          checkDone();
-        });
-        setTimeout(() => {
-          if (settled)
-            return;
-          settled = true;
-          remaining--;
-          checkDone();
-        }, navTimeout);
-      }
-    }
-  });
-}
-
-// src/ssr-session.ts
-function createSessionScript(session, nonce) {
-  const json = JSON.stringify(session);
-  const escaped = json.replace(/</g, "\\u003c").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
-  const nonceAttr = nonce ? ` nonce="${escapeAttr3(nonce)}"` : "";
-  return `<script${nonceAttr}>window.__VERTZ_SESSION__=${escaped}</script>`;
-}
-function escapeAttr3(s) {
-  return s.replace(/[&"'<>]/g, (c) => `&#${c.charCodeAt(0)};`);
-}
-
 // src/ssr-manifest-prefetch.ts
 function reconstructDescriptors(queries, routeParams, apiClient) {
   if (!apiClient)
@@ -2884,6 +2621,40 @@ function resolveQueryBindings(bindings, routeParams) {
   return resolved;
 }
 
+// src/ssr-shared.ts
+import { compileTheme } from "@vertz/ui";
+import { EntityStore, MemoryCache, QueryEnvelopeStore } from "@vertz/ui/internals";
+var compiledThemeCache = new WeakMap;
+var compiledThemeWithMetricsCache = new WeakMap;
+function compileThemeCached(theme, fallbackMetrics) {
+  const cache = fallbackMetrics ? compiledThemeWithMetricsCache : compiledThemeCache;
+  const cached = cache.get(theme);
+  if (cached)
+    return cached;
+  const compiled = compileTheme(theme, { fallbackMetrics });
+  cache.set(theme, compiled);
+  return compiled;
+}
+function createRequestContext(url) {
+  return {
+    url,
+    adapter: createSSRAdapter(),
+    subscriber: null,
+    readValueCb: null,
+    cleanupStack: [],
+    batchDepth: 0,
+    pendingEffects: new Map,
+    contextScope: null,
+    entityStore: new EntityStore,
+    envelopeStore: new QueryEnvelopeStore,
+    queryCache: new MemoryCache({ maxSize: Infinity }),
+    inflight: new Map,
+    queries: [],
+    errors: [],
+    cssTracker: new Set
+  };
+}
+
 // src/ssr-route-matcher.ts
 function matchUrlToPatterns(url, patterns, options) {
   const path = (url.split("?")[0] ?? "").split("#")[0] ?? "";
@@ -2925,14 +2696,16 @@ function matchPattern(path, pattern, exact) {
   return { pattern, params };
 }
 
+// src/ssr-streaming-runtime.ts
+function safeSerialize(data) {
+  return JSON.stringify(data).replace(/</g, "\\u003c");
+}
+
 // src/ssr-single-pass.ts
 async function ssrRenderSinglePass(module, url, options) {
-  if (options?.prefetch === false) {
-    return ssrRenderToString(module, url, options);
-  }
   const normalizedUrl = url.endsWith("/index.html") ? url.slice(0, -"/index.html".length) || "/" : url;
   const ssrTimeout = options?.ssrTimeout ?? 300;
-  ensureDomShim2();
+  ensureDomShim();
   const zeroDiscoveryData = attemptZeroDiscovery(normalizedUrl, module, options, ssrTimeout);
   if (zeroDiscoveryData) {
     return renderWithPrefetchedData(module, normalizedUrl, zeroDiscoveryData, options);
@@ -2961,7 +2734,7 @@ async function ssrRenderSinglePass(module, url, options) {
   return ssrStorage.run(renderCtx, async () => {
     try {
       setGlobalSSRTimeout(ssrTimeout);
-      const createApp = resolveAppFactory2(module);
+      const createApp = resolveAppFactory(module);
       let themeCss = "";
       let themePreloadTags = "";
       if (module.theme) {
@@ -2977,7 +2750,7 @@ async function ssrRenderSinglePass(module, url, options) {
       const vnode = toVNode(app);
       const stream = renderToStream(vnode);
       const html = await streamToString(stream);
-      const css = collectCSS2(themeCss, module, html);
+      const css = collectCSS(themeCss, module, html);
       const ssrData = discoveredData.resolvedQueries.map(({ key, data }) => ({
         key,
         data
@@ -2995,59 +2768,75 @@ async function ssrRenderSinglePass(module, url, options) {
     }
   });
 }
-async function runDiscoveryPhase(normalizedUrl, ssrTimeout, module, options) {
-  const discoveryCtx = createRequestContext(normalizedUrl);
+async function runQueryDiscovery(normalizedUrl, ssrTimeout, module, options) {
+  ensureDomShim();
+  const ctx = createRequestContext(normalizedUrl);
   if (options?.ssrAuth) {
-    discoveryCtx.ssrAuth = options.ssrAuth;
+    ctx.ssrAuth = options.ssrAuth;
   }
   if (options?.cookies) {
-    discoveryCtx.cookies = options.cookies;
+    ctx.cookies = options.cookies;
   }
-  return ssrStorage.run(discoveryCtx, async () => {
+  return ssrStorage.run(ctx, async () => {
     try {
       setGlobalSSRTimeout(ssrTimeout);
-      const createApp = resolveAppFactory2(module);
+      const createApp = resolveAppFactory(module);
       createApp();
-      if (discoveryCtx.ssrRedirect) {
-        return { redirect: discoveryCtx.ssrRedirect };
+      if (ctx.ssrRedirect) {
+        return { redirect: ctx.ssrRedirect, queries: [] };
       }
-      if (discoveryCtx.pendingRouteComponents?.size) {
-        const entries = Array.from(discoveryCtx.pendingRouteComponents.entries());
+      if (ctx.pendingRouteComponents?.size) {
+        const entries = Array.from(ctx.pendingRouteComponents.entries());
         const results = await Promise.allSettled(entries.map(([route, promise]) => Promise.race([
           promise.then((mod) => ({ route, factory: mod.default })),
           new Promise((_, reject) => setTimeout(() => reject(new Error("lazy route timeout")), ssrTimeout))
         ])));
-        discoveryCtx.resolvedComponents = new Map;
+        ctx.resolvedComponents = new Map;
         for (const result of results) {
           if (result.status === "fulfilled") {
             const { route, factory } = result.value;
-            discoveryCtx.resolvedComponents.set(route, factory);
+            ctx.resolvedComponents.set(route, factory);
           }
         }
-        discoveryCtx.pendingRouteComponents = undefined;
+        ctx.pendingRouteComponents = undefined;
       }
       const queries = getSSRQueries();
-      const eligibleQueries = filterByEntityAccess(queries, options?.manifest?.entityAccess, options?.prefetchSession);
-      const resolvedQueries = [];
-      if (eligibleQueries.length > 0) {
-        await Promise.allSettled(eligibleQueries.map(({ promise, timeout, resolve, key }) => Promise.race([
-          promise.then((data) => {
-            resolve(data);
-            resolvedQueries.push({ key, data });
-            return "resolved";
-          }),
-          new Promise((r) => setTimeout(r, timeout || ssrTimeout)).then(() => "timeout")
-        ])));
-      }
       return {
-        resolvedQueries,
-        resolvedComponents: discoveryCtx.resolvedComponents
+        queries: queries.map((q) => ({
+          promise: q.promise,
+          timeout: q.timeout || ssrTimeout,
+          resolve: q.resolve,
+          key: q.key
+        })),
+        resolvedComponents: ctx.resolvedComponents
       };
     } finally {
       clearGlobalSSRTimeout();
     }
   });
 }
+async function runDiscoveryPhase(normalizedUrl, ssrTimeout, module, options) {
+  const discovery = await runQueryDiscovery(normalizedUrl, ssrTimeout, module, options);
+  if ("redirect" in discovery) {
+    return { redirect: discovery.redirect };
+  }
+  const eligibleQueries = filterByEntityAccess(discovery.queries, options?.manifest?.entityAccess, options?.prefetchSession);
+  const resolvedQueries = [];
+  if (eligibleQueries.length > 0) {
+    await Promise.allSettled(eligibleQueries.map(({ promise, timeout, resolve, key }) => Promise.race([
+      promise.then((data) => {
+        resolve(data);
+        resolvedQueries.push({ key, data });
+        return "resolved";
+      }),
+      new Promise((r) => setTimeout(r, timeout)).then(() => "timeout")
+    ])));
+  }
+  return {
+    resolvedQueries,
+    resolvedComponents: discovery.resolvedComponents
+  };
+}
 function attemptZeroDiscovery(url, module, options, ssrTimeout) {
   const manifest = options?.manifest;
   if (!manifest?.routeEntries || !module.api)
@@ -3108,7 +2897,7 @@ async function renderWithPrefetchedData(module, normalizedUrl, prefetchedData, o
   return ssrStorage.run(renderCtx, async () => {
     try {
       setGlobalSSRTimeout(ssrTimeout);
-      const createApp = resolveAppFactory2(module);
+      const createApp = resolveAppFactory(module);
       let themeCss = "";
       let themePreloadTags = "";
       if (module.theme) {
@@ -3135,7 +2924,7 @@ async function renderWithPrefetchedData(module, normalizedUrl, prefetchedData, o
           matchedRoutePatterns: renderCtx.matchedRoutePatterns
         };
       }
-      const css = collectCSS2(themeCss, module, html);
+      const css = collectCSS(themeCss, module, html);
       const ssrData = data.resolvedQueries.map(({ key, data: d }) => ({
         key,
         data: d
@@ -3153,14 +2942,95 @@ async function renderWithPrefetchedData(module, normalizedUrl, prefetchedData, o
     }
   });
 }
-var domShimInstalled2 = false;
-function ensureDomShim2() {
-  if (domShimInstalled2 && typeof document !== "undefined")
+async function ssrStreamNavQueries(module, url, options) {
+  const normalizedUrl = url.endsWith("/index.html") ? url.slice(0, -"/index.html".length) || "/" : url;
+  const ssrTimeout = options?.ssrTimeout ?? 300;
+  const navTimeout = options?.navSsrTimeout ?? 5000;
+  const discovery = await runQueryDiscovery(normalizedUrl, ssrTimeout, module);
+  if ("redirect" in discovery || discovery.queries.length === 0) {
+    const encoder3 = new TextEncoder;
+    return new ReadableStream({
+      start(controller) {
+        controller.enqueue(encoder3.encode(`event: done
+data: {}
+
+`));
+        controller.close();
+      }
+    });
+  }
+  const queries = discovery.queries;
+  const encoder2 = new TextEncoder;
+  let remaining = queries.length;
+  return new ReadableStream({
+    start(controller) {
+      let closed = false;
+      function safeEnqueue(chunk) {
+        if (closed)
+          return;
+        try {
+          controller.enqueue(chunk);
+        } catch {
+          closed = true;
+        }
+      }
+      function safeClose() {
+        if (closed)
+          return;
+        closed = true;
+        try {
+          controller.close();
+        } catch {}
+      }
+      function checkDone() {
+        if (remaining === 0) {
+          safeEnqueue(encoder2.encode(`event: done
+data: {}
+
+`));
+          safeClose();
+        }
+      }
+      for (const { promise, resolve, key } of queries) {
+        let settled = false;
+        promise.then((data) => {
+          if (settled)
+            return;
+          settled = true;
+          resolve(data);
+          const entry = { key, data };
+          safeEnqueue(encoder2.encode(`event: data
+data: ${safeSerialize(entry)}
+
+`));
+          remaining--;
+          checkDone();
+        }, () => {
+          if (settled)
+            return;
+          settled = true;
+          remaining--;
+          checkDone();
+        });
+        setTimeout(() => {
+          if (settled)
+            return;
+          settled = true;
+          remaining--;
+          checkDone();
+        }, navTimeout);
+      }
+    }
+  });
+}
+var domShimInstalled = false;
+function ensureDomShim() {
+  if (domShimInstalled && typeof document !== "undefined")
     return;
-  domShimInstalled2 = true;
+  domShimInstalled = true;
   installDomShim();
 }
-function resolveAppFactory2(module) {
+function resolveAppFactory(module) {
   const createApp = module.default || module.App;
   if (typeof createApp !== "function") {
     throw new Error("App entry must export a default function or named App function");
@@ -3208,7 +3078,7 @@ function extractMethodFromKey(key) {
   const segments = cleanPath.split("/").filter(Boolean);
   return segments.length > 1 ? "get" : "list";
 }
-function collectCSS2(themeCss, module, renderedHtml) {
+function collectCSS(themeCss, module, renderedHtml) {
   const alreadyIncluded = new Set;
   if (themeCss)
     alreadyIncluded.add(themeCss);