npm - @vertz/ui-server - Versions diffs - 0.2.23 → 0.2.24 - Mend

@vertz/ui-server 0.2.23 → 0.2.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/dist/bun-dev-server.d.ts +19 -1
package/dist/bun-dev-server.js +156 -22
package/dist/bun-plugin/fast-refresh-dom-state.js +1 -1
package/dist/bun-plugin/fast-refresh-runtime.js +6 -2
package/dist/bun-plugin/index.js +138 -47
package/dist/dom-shim/index.js +1 -1
package/dist/index.js +2 -2
package/dist/shared/{chunk-2qsqp9xj.js → chunk-eenfpa59.js} +20 -10
package/dist/shared/{chunk-5cny4vzm.js → chunk-g0zqrb60.js} +7 -1
package/dist/shared/{chunk-bm16zy8d.js → chunk-zs75v8qj.js} +19 -3
package/dist/ssr/index.js +2 -2
package/package.json +5 -5

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

@@ -82,6 +82,22 @@ interface BunDevServerOptions {
 	* @default false
 	*/
 	watchDeps?: boolean | string[];
+	/**
+	* Resolve theme from request for SSR. Returns the value for `data-theme`
+	* on the `<html>` tag and patches any `data-theme` attributes in the SSR body.
+	* Use this to read a theme cookie and eliminate dark→light flash on reload.
+	*/
+	themeFromRequest?: (request: Request) => string | null | undefined;
+	/**
+	* Called when the SSR module fails to recover from a broken state and a
+	* process restart is needed. Bun's ESM module cache retains failed imports
+	* process-wide — the only way to clear it is to restart the process.
+	*
+	* The dev server calls stop() before invoking this callback.
+	* Typically, the callback calls `process.exit(75)` and a supervisor
+	* script restarts the process.
+	*/
+	onRestartNeeded?: () => void;
 }
 interface ErrorDetail {
 	message: string;
@@ -157,11 +173,13 @@ interface SSRPageHtmlOptions {
 	headTags?: string;
 	/** Pre-built session + access set script tags for SSR injection. */
 	sessionScript?: string;
+	/** Theme value for `data-theme` attribute on `<html>`. */
+	htmlDataTheme?: string;
 }
 /**
 * Generate a full SSR HTML page with the given content, CSS, SSR data, and script tag.
 */
-declare function generateSSRPageHtml({ title, css, bodyHtml, ssrData, scriptTag, editor, headTags, sessionScript }: SSRPageHtmlOptions): string;
+declare function generateSSRPageHtml({ title, css, bodyHtml, ssrData, scriptTag, editor, headTags, sessionScript, htmlDataTheme }: SSRPageHtmlOptions): string;
 interface FetchInterceptorOptions {
 	apiHandler: (req: Request) => Promise<Response>;
 	origin: string;

package/dist/bun-dev-server.js CHANGED Viewed

@@ -395,6 +395,58 @@ async function extractFontMetrics(fonts, rootDir) {
   return result;
 }
+// src/ready-gate.ts
+function createReadyGate(options) {
+  let ready = false;
+  const pendingClients = new Set;
+  let timeoutHandle = null;
+  function doOpen(currentError) {
+    if (ready)
+      return;
+    ready = true;
+    if (timeoutHandle) {
+      clearTimeout(timeoutHandle);
+      timeoutHandle = null;
+    }
+    for (const ws of pendingClients) {
+      try {
+        ws.sendText(JSON.stringify({ type: "connected" }));
+        if (currentError) {
+          ws.sendText(JSON.stringify({
+            type: "error",
+            category: currentError.category,
+            errors: currentError.errors
+          }));
+        }
+      } catch {}
+    }
+    pendingClients.clear();
+  }
+  if (options?.timeoutMs) {
+    timeoutHandle = setTimeout(() => {
+      if (!ready) {
+        options.onTimeoutWarning?.();
+        doOpen();
+      }
+    }, options.timeoutMs);
+  }
+  return {
+    get isReady() {
+      return ready;
+    },
+    onOpen(ws) {
+      if (ready)
+        return false;
+      pendingClients.add(ws);
+      return true;
+    },
+    onClose(ws) {
+      pendingClients.delete(ws);
+    },
+    open: doOpen
+  };
+}
 // src/source-map-resolver.ts
 import { readFileSync } from "fs";
 import { resolve as resolvePath } from "path";
@@ -1113,19 +1165,35 @@ function installDomShim() {
     cookie: ""
   };
   globalThis.document = fakeDocument;
+  const windowStubs = {
+    scrollTo: () => {},
+    scroll: () => {},
+    addEventListener: () => {},
+    removeEventListener: () => {},
+    dispatchEvent: () => true,
+    getComputedStyle: () => ({}),
+    matchMedia: () => ({ matches: false, addListener: () => {}, removeListener: () => {} })
+  };
   if (typeof window === "undefined") {
     globalThis.window = {
       location: { pathname: ssrStorage.getStore()?.url || "/", search: "", hash: "" },
       history: {
         pushState: () => {},
         replaceState: () => {}
-      }
+      },
+      ...windowStubs
     };
   } else {
-    globalThis.window.location = {
-      ...globalThis.window.location || {},
+    const win = globalThis.window;
+    win.location = {
+      ...win.location || {},
       pathname: ssrStorage.getStore()?.url || "/"
     };
+    for (const [key, val] of Object.entries(windowStubs)) {
+      if (typeof win[key] !== "function") {
+        win[key] = val;
+      }
+    }
   }
   globalThis.Node = SSRNode;
   globalThis.HTMLElement = SSRElement;
@@ -1250,6 +1318,9 @@ function serializeToHtml(node) {
     return node.html;
   }
   const { tag, attrs, children } = node;
+  if (tag === "fragment") {
+    return children.map((child) => serializeToHtml(child)).join("");
+  }
   const attrStr = serializeAttrs(attrs);
   if (VOID_ELEMENTS.has(tag)) {
     return `<${tag}${attrStr}>`;
@@ -1326,6 +1397,9 @@ function renderToStream(tree, options) {
       return serializeToHtml(placeholder);
     }
     const { tag, attrs, children } = node;
+    if (tag === "fragment") {
+      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("");
     if (VOID_ELEMENTS.has(tag)) {
@@ -1981,11 +2055,13 @@ function generateSSRPageHtml({
   scriptTag,
   editor = "vscode",
   headTags = "",
-  sessionScript = ""
+  sessionScript = "",
+  htmlDataTheme
 }) {
   const ssrDataScript = ssrData.length > 0 ? `<script>window.__VERTZ_SSR_DATA__=${safeSerialize(ssrData)};</script>` : "";
+  const htmlAttrs = htmlDataTheme ? ` data-theme="${htmlDataTheme}"` : "";
   return `<!doctype html>
-<html lang="en">
+<html lang="en"${htmlAttrs}>
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -2082,7 +2158,9 @@ function createBunDevServer(options) {
     editor: editorOption,
     headTags: headTagsOption = "",
     sessionResolver,
-    watchDeps
+    watchDeps,
+    themeFromRequest,
+    onRestartNeeded
   } = options;
   const faviconTag = detectFaviconTag(projectRoot);
   const headTags = [faviconTag, headTagsOption].filter(Boolean).join(`
@@ -2099,6 +2177,7 @@ function createBunDevServer(options) {
   let srcWatcherRef = null;
   let refreshTimeout = null;
   let stopped = false;
+  let ssrFallback = false;
   const wsClients = new Set;
   let currentError = null;
   const sourceMapResolver = createSourceMapResolver(projectRoot);
@@ -2412,8 +2491,8 @@ function createBunDevServer(options) {
     }
     if (!pluginsRegistered) {
       const { plugin: serverPlugin, updateManifest } = createVertzBunPlugin({
-        hmr: false,
-        fastRefresh: false,
+        hmr: true,
+        fastRefresh: true,
         logger,
         diagnostics
       });
@@ -2424,16 +2503,34 @@ function createBunDevServer(options) {
     const updateServerManifest = stableUpdateManifest;
     let ssrMod;
     try {
-      ssrMod = await import(entryPath);
+      if (isRestarting) {
+        mkdirSync(devDir, { recursive: true });
+        const ssrBootPath = resolve(devDir, "ssr-reload-entry.ts");
+        const ts = Date.now();
+        writeFileSync2(ssrBootPath, `export * from '${entryPath}';
+`);
+        ssrMod = await import(`${ssrBootPath}?t=${ts}`);
+      } else {
+        ssrMod = await import(entryPath);
+      }
+      ssrFallback = false;
       if (logRequests) {
         console.log("[Server] SSR module loaded");
       }
     } catch (e) {
       console.error("[Server] Failed to load SSR module:", e);
       if (isRestarting) {
-        throw e;
+        ssrFallback = true;
+        ssrMod = {};
+        const errMsg = e instanceof Error ? e.message : String(e);
+        const errStack = e instanceof Error ? e.stack : undefined;
+        const { message: _, ...loc } = errStack ? parseSourceFromStack(errStack) : { message: "" };
+        queueMicrotask(() => {
+          broadcastError("ssr", [{ message: errMsg, ...loc, stack: errStack }]);
+        });
+      } else {
+        process.exit(1);
       }
-      process.exit(1);
     }
     let fontFallbackMetrics;
     if (ssrMod.theme?.fonts) {
@@ -2462,6 +2559,12 @@ if (import.meta.hot) import.meta.hot.accept();
     setupOpenAPIWatcher();
     let bundledScriptUrl = null;
     let hmrBootstrapScript = null;
+    const readyGate = createReadyGate({
+      timeoutMs: 5000,
+      onTimeoutWarning: () => {
+        console.warn("[Server] HMR asset discovery timed out \u2014 unblocking clients");
+      }
+    });
     const routes = {
       "/__vertz_hmr": hmrShellModule
     };
@@ -2605,6 +2708,7 @@ data: {}
         if (logRequests) {
           console.log(`[Server] SSR: ${pathname}`);
         }
+        const ssrTheme = themeFromRequest?.(request) ?? undefined;
         try {
           const interceptor = apiHandler ? createFetchInterceptor({
             apiHandler,
@@ -2668,19 +2772,22 @@ data: {}
                 headers: { Location: result.redirect.to }
               });
             }
+            const bodyHtml = ssrTheme ? result.html.replace(/data-theme="[^"]*"/, `data-theme="${ssrTheme}"`) : result.html;
             const scriptTag = buildScriptTag(bundledScriptUrl, hmrBootstrapScript, clientSrc);
             const combinedHeadTags = [headTags, result.headTags].filter(Boolean).join(`
 `);
             const html = generateSSRPageHtml({
               title,
               css: result.css,
-              bodyHtml: result.html,
+              bodyHtml,
               ssrData: result.ssrData,
               scriptTag,
               editor,
               headTags: combinedHeadTags,
-              sessionScript
+              sessionScript,
+              htmlDataTheme: ssrTheme
             });
+            clearError();
             return new Response(html, {
               status: 200,
               headers: {
@@ -2704,7 +2811,8 @@ data: {}
             ssrData: [],
             scriptTag,
             editor,
-            headTags
+            headTags,
+            htmlDataTheme: ssrTheme
           });
           return new Response(fallbackHtml, {
             status: 200,
@@ -2720,13 +2828,15 @@ data: {}
           wsClients.add(ws);
           diagnostics.recordWebSocketChange(wsClients.size);
           logger.log("ws", "client-connected", { total: wsClients.size });
-          ws.sendText(JSON.stringify({ type: "connected" }));
-          if (currentError) {
-            ws.sendText(JSON.stringify({
-              type: "error",
-              category: currentError.category,
-              errors: currentError.errors
-            }));
+          if (!readyGate.onOpen(ws)) {
+            ws.sendText(JSON.stringify({ type: "connected" }));
+            if (currentError) {
+              ws.sendText(JSON.stringify({
+                type: "error",
+                category: currentError.category,
+                errors: currentError.errors
+              }));
+            }
           }
         },
         message(ws, msg) {
@@ -2818,6 +2928,7 @@ data: {}
         },
         close(ws) {
           wsClients.delete(ws);
+          readyGate.onClose(ws);
           diagnostics.recordWebSocketChange(wsClients.size);
         }
       },
@@ -2829,7 +2940,13 @@ data: {}
     if (logRequests) {
       console.log(`[Server] SSR+HMR dev server running at http://${host}:${server.port}`);
     }
-    await discoverHMRAssets();
+    try {
+      await discoverHMRAssets();
+    } finally {
+      if (!readyGate.isReady) {
+        readyGate.open(currentError);
+      }
+    }
     async function discoverHMRAssets() {
       try {
         const res = await fetch(`http://${host}:${server?.port}/__vertz_hmr`);
@@ -2927,6 +3044,19 @@ data: {}
           }
           if (stopped)
             return;
+          if (ssrFallback) {
+            if (onRestartNeeded) {
+              if (logRequests) {
+                console.log("[Server] SSR in fallback mode \u2014 requesting process restart");
+              }
+              await devServer.stop();
+              onRestartNeeded();
+              return;
+            }
+            if (logRequests) {
+              console.log("[Server] SSR in fallback mode \u2014 attempting re-import (best effort)");
+            }
+          }
           const cacheCleared = clearSSRRequireCache();
           logger.log("watcher", "cache-cleared", { entries: cacheCleared });
           const ssrWrapperPath = resolve(devDir, "ssr-reload-entry.ts");
@@ -2937,6 +3067,7 @@ data: {}
           try {
             const freshMod = await import(`${ssrWrapperPath}?t=${Date.now()}`);
             ssrMod = freshMod;
+            ssrFallback = false;
             if (freshMod.theme?.fonts) {
               try {
                 fontFallbackMetrics = await extractFontMetrics(freshMod.theme.fonts, projectRoot);
@@ -2962,6 +3093,7 @@ data: {}
             try {
               const freshMod = await import(`${ssrWrapperPath}?t=${Date.now()}`);
               ssrMod = freshMod;
+              ssrFallback = false;
               if (freshMod.theme?.fonts) {
                 try {
                   fontFallbackMetrics = await extractFontMetrics(freshMod.theme.fonts, projectRoot);
@@ -2982,6 +3114,7 @@ data: {}
               logger.log("watcher", "ssr-reload", { status: "failed", error: errMsg });
               const { message: _m, ...loc2 } = errStack ? parseSourceFromStack(errStack) : { message: "" };
               broadcastError("ssr", [{ message: errMsg, ...loc2, stack: errStack }]);
+              ssrFallback = true;
             }
           }
         }, 100);
@@ -3048,6 +3181,7 @@ data: {}
       lastBroadcastedError = "";
       lastChangedFile = "";
       clearGraceUntil = 0;
+      ssrFallback = false;
       terminalDedup.reset();
       clearSSRRequireCache();
       sourceMapResolver.invalidate();

package/dist/bun-plugin/fast-refresh-dom-state.js CHANGED Viewed

@@ -2,7 +2,7 @@
 import {
   captureDOMState,
   restoreDOMState
-} from "../shared/chunk-2qsqp9xj.js";
+} from "../shared/chunk-eenfpa59.js";
 import"../shared/chunk-eb80r8e8.js";
 export {
   restoreDOMState,

package/dist/bun-plugin/fast-refresh-runtime.js CHANGED Viewed

@@ -2,7 +2,7 @@
 import {
   captureDOMState,
   restoreDOMState
-} from "../shared/chunk-2qsqp9xj.js";
+} from "../shared/chunk-eenfpa59.js";
 import"../shared/chunk-eb80r8e8.js";
 // src/bun-plugin/fast-refresh-runtime.ts
@@ -40,9 +40,10 @@ function __$refreshReg(moduleId, name, factory, hash) {
       return;
     existing.factory = factory;
     existing.hash = hash;
+    existing.dirty = true;
     dirtyModules.add(moduleId);
   } else {
-    mod.set(name, { factory, instances: [], hash });
+    mod.set(name, { factory, instances: [], hash, dirty: false });
   }
 }
 function __$refreshTrack(moduleId, name, element, args, cleanups, contextScope, signals = []) {
@@ -68,6 +69,9 @@ function __$refreshPerform(moduleId) {
     return;
   performingRefresh = true;
   for (const [name, record] of mod) {
+    if (!record.dirty)
+      continue;
+    record.dirty = false;
     const { factory, instances } = record;
     const updatedInstances = [];
     for (const instance of instances) {

package/dist/bun-plugin/index.js CHANGED Viewed

@@ -22,7 +22,7 @@ import {
   transformRouteSplitting
 } from "@vertz/ui-compiler";
 import MagicString3 from "magic-string";
-import { Project as Project2, ts as ts4 } from "ts-morph";
+import { Project as Project2, ts as ts5 } from "ts-morph";
 // src/bun-plugin/context-stable-ids.ts
 import { ts } from "ts-morph";
@@ -72,19 +72,18 @@ function loadEntitySchema(schemaPath) {
 }
 // src/bun-plugin/fast-refresh-codegen.ts
-function generateRefreshPreamble(moduleId, contentHash) {
+function generateRefreshPreamble(moduleId) {
   const escapedId = moduleId.replace(/['\\]/g, "\\$&");
-  let code = `const __$fr = globalThis[Symbol.for('vertz:fast-refresh')];
-` + `const { __$refreshReg, __$refreshTrack, __$refreshPerform, ` + `pushScope: __$pushScope, popScope: __$popScope, ` + `_tryOnCleanup: __$tryCleanup, runCleanups: __$runCleanups, ` + `getContextScope: __$getCtx, setContextScope: __$setCtx, ` + `startSignalCollection: __$startSigCol, stopSignalCollection: __$stopSigCol } = __$fr;
+  const noop = "() => {}";
+  const noopArr = "() => []";
+  const noopNull = "() => null";
+  const noopPassthrough = "(_m, _n, el) => el";
+  return `const __$fr = globalThis[Symbol.for('vertz:fast-refresh')] ?? {};
+` + `const { ` + `__$refreshReg = ${noop}, ` + `__$refreshTrack = ${noopPassthrough}, ` + `__$refreshPerform = ${noop}, ` + `pushScope: __$pushScope = ${noopArr}, ` + `popScope: __$popScope = ${noop}, ` + `_tryOnCleanup: __$tryCleanup = ${noop}, ` + `runCleanups: __$runCleanups = ${noop}, ` + `getContextScope: __$getCtx = ${noopNull}, ` + `setContextScope: __$setCtx = ${noopNull}, ` + `startSignalCollection: __$startSigCol = ${noop}, ` + `stopSignalCollection: __$stopSigCol = ${noopArr} } = __$fr;
 ` + `const __$moduleId = '${escapedId}';
 `;
-  if (contentHash) {
-    code += `const __$moduleHash = '${contentHash}';
-`;
-  }
-  return code;
 }
-function generateRefreshWrapper(componentName) {
+function generateRefreshWrapper(componentName, componentHash) {
   return `
 const __$orig_${componentName} = ${componentName};
 ` + `${componentName} = function(...__$args) {
@@ -99,20 +98,22 @@ const __$orig_${componentName} = ${componentName};
 ` + `  }
 ` + `  return __$refreshTrack(__$moduleId, '${componentName}', __$ret, __$args, __$scope, __$ctx, __$sigs);
 ` + `};
-` + `__$refreshReg(__$moduleId, '${componentName}', ${componentName}, __$moduleHash);
+` + `__$refreshReg(__$moduleId, '${componentName}', ${componentName}, '${componentHash}');
 `;
 }
 function generateRefreshPerform() {
   return `__$refreshPerform(__$moduleId);
 `;
 }
-function generateRefreshCode(moduleId, components, contentHash) {
+function generateRefreshCode(moduleId, components, source) {
   if (components.length === 0)
     return null;
-  const preamble = generateRefreshPreamble(moduleId, contentHash);
+  const preamble = generateRefreshPreamble(moduleId);
   let epilogue = "";
   for (const comp of components) {
-    epilogue += generateRefreshWrapper(comp.name);
+    const body = source.slice(comp.bodyStart, comp.bodyEnd);
+    const hash = Bun.hash(body).toString(36);
+    epilogue += generateRefreshWrapper(comp.name, hash);
   }
   epilogue += generateRefreshPerform();
   return { preamble, epilogue };
@@ -267,6 +268,8 @@ function resolveCrossFileFields(filePath, propFlows, options) {
       if (childFields.hasOpaqueAccess) {
         hasOpaqueAccess = true;
       }
+    } else {
+      hasOpaqueAccess = true;
     }
   }
   return { fields, hasOpaqueAccess };
@@ -274,9 +277,33 @@ function resolveCrossFileFields(filePath, propFlows, options) {
 // src/bun-plugin/field-selection-manifest.ts
 import { analyzeComponentPropFields } from "@vertz/ui-compiler";
+import { ts as ts2 } from "ts-morph";
+var RE_EXPORT_PATTERN = /export\s+(?:\{|\*)\s*.*?\bfrom\b/;
+function parseReExports(sourceText, filePath) {
+  if (!RE_EXPORT_PATTERN.test(sourceText))
+    return [];
+  const sourceFile = ts2.createSourceFile(filePath, sourceText, ts2.ScriptTarget.Latest, true);
+  const reExports = [];
+  for (const stmt of sourceFile.statements) {
+    if (!ts2.isExportDeclaration(stmt) || !stmt.moduleSpecifier)
+      continue;
+    const source = stmt.moduleSpecifier.getText(sourceFile).replace(/^['"]|['"]$/g, "");
+    if (!stmt.exportClause) {
+      reExports.push({ name: "*", originalName: "*", source });
+    } else if (ts2.isNamedExports(stmt.exportClause)) {
+      for (const el of stmt.exportClause.elements) {
+        const exportedName = el.name.getText(sourceFile);
+        const originalName = el.propertyName ? el.propertyName.getText(sourceFile) : exportedName;
+        reExports.push({ name: exportedName, originalName, source });
+      }
+    }
+  }
+  return reExports;
+}
 class FieldSelectionManifest {
   fileComponents = new Map;
+  fileReExports = new Map;
   importResolver = () => {
     return;
   };
@@ -287,30 +314,68 @@ class FieldSelectionManifest {
   registerFile(filePath, sourceText) {
     const components = analyzeComponentPropFields(filePath, sourceText);
     this.fileComponents.set(filePath, components);
+    const reExports = parseReExports(sourceText, filePath);
+    this.fileReExports.set(filePath, reExports);
     this.resolvedCache.clear();
   }
   updateFile(filePath, sourceText) {
     const oldComponents = this.fileComponents.get(filePath);
     const newComponents = analyzeComponentPropFields(filePath, sourceText);
-    const changed = !componentsEqual(oldComponents, newComponents);
-    if (changed) {
+    const componentsChanged = !componentsEqual(oldComponents, newComponents);
+    if (componentsChanged) {
       this.fileComponents.set(filePath, newComponents);
+    }
+    const oldReExports = this.fileReExports.get(filePath);
+    const newReExports = parseReExports(sourceText, filePath);
+    const reExportsChanged = !reExportsEqual(oldReExports, newReExports);
+    if (reExportsChanged) {
+      this.fileReExports.set(filePath, newReExports);
+    }
+    const changed = componentsChanged || reExportsChanged;
+    if (changed) {
       this.resolvedCache.clear();
     }
     return { changed };
   }
   deleteFile(filePath) {
     this.fileComponents.delete(filePath);
+    this.fileReExports.delete(filePath);
     this.resolvedCache.clear();
   }
   getComponentPropFields(filePath, componentName, propName) {
     const components = this.fileComponents.get(filePath);
-    if (!components)
+    if (components) {
+      const component = components.find((c) => c.componentName === componentName);
+      if (component)
+        return component.props[propName];
+    }
+    return this.followReExports(filePath, componentName, propName, new Set);
+  }
+  followReExports(filePath, componentName, propName, visited) {
+    if (visited.has(filePath))
       return;
-    const component = components.find((c) => c.componentName === componentName);
-    if (!component)
+    visited.add(filePath);
+    const reExports = this.fileReExports.get(filePath);
+    if (!reExports)
       return;
-    return component.props[propName];
+    for (const re of reExports) {
+      if (re.name !== componentName && re.name !== "*")
+        continue;
+      const targetPath = this.importResolver(re.source, filePath);
+      if (!targetPath)
+        continue;
+      const targetName = re.name === "*" ? componentName : re.originalName;
+      const targetComponents = this.fileComponents.get(targetPath);
+      if (targetComponents) {
+        const component = targetComponents.find((c) => c.componentName === targetName);
+        if (component)
+          return component.props[propName];
+      }
+      const result = this.followReExports(targetPath, targetName, propName, visited);
+      if (result)
+        return result;
+    }
+    return;
   }
   getResolvedPropFields(filePath, componentName, propName) {
     const cacheKey = `${filePath}::${componentName}::${propName}`;
@@ -383,10 +448,37 @@ function componentsEqual(a, b) {
         if (aFieldsSorted[k] !== bFieldsSorted[k])
           return false;
       }
+      if (aProp.forwarded.length !== bProp.forwarded.length)
+        return false;
+      for (let f = 0;f < aProp.forwarded.length; f++) {
+        const af = aProp.forwarded[f];
+        const bf = bProp.forwarded[f];
+        if (af.componentName !== bf.componentName)
+          return false;
+        if (af.importSource !== bf.importSource)
+          return false;
+        if (af.propName !== bf.propName)
+          return false;
+      }
     }
   }
   return true;
 }
+function reExportsEqual(a, b) {
+  if (!a)
+    return b.length === 0;
+  if (a.length !== b.length)
+    return false;
+  for (let i = 0;i < a.length; i++) {
+    if (a[i].name !== b[i].name)
+      return false;
+    if (a[i].originalName !== b[i].originalName)
+      return false;
+    if (a[i].source !== b[i].source)
+      return false;
+  }
+  return true;
+}
 // src/bun-plugin/file-path-hash.ts
 function filePathHash(filePath) {
@@ -461,7 +553,7 @@ async function processImage(opts) {
 // src/bun-plugin/image-transform.ts
 import MagicString2 from "magic-string";
-import { Project, ts as ts2 } from "ts-morph";
+import { Project, ts as ts3 } from "ts-morph";
 function escapeAttr(value) {
   return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
@@ -535,13 +627,13 @@ function findImageImportName(source) {
 function findImageJsxElements(sourceFile, localName) {
   const results = [];
   function visit(node) {
-    if (ts2.isJsxSelfClosingElement(node)) {
+    if (ts3.isJsxSelfClosingElement(node)) {
       const tagName = node.tagName.getText(sourceFile.compilerNode);
       if (tagName === localName) {
         results.push(node);
       }
     }
-    ts2.forEachChild(node, visit);
+    ts3.forEachChild(node, visit);
   }
   visit(sourceFile.compilerNode);
   return results;
@@ -549,7 +641,7 @@ function findImageJsxElements(sourceFile, localName) {
 function extractStaticProps(element, sourceFile) {
   const attrs = element.attributes;
   for (const attr of attrs.properties) {
-    if (ts2.isJsxSpreadAttribute(attr))
+    if (ts3.isJsxSpreadAttribute(attr))
       return null;
   }
   let src = null;
@@ -582,7 +674,7 @@ function extractStaticProps(element, sourceFile) {
     "fit"
   ]);
   for (const attr of attrs.properties) {
-    if (!ts2.isJsxAttribute(attr))
+    if (!ts3.isJsxAttribute(attr))
       continue;
     const name = attr.name.getText(sourceFile.compilerNode);
     const value = attr.initializer;
@@ -686,15 +778,15 @@ function extractStaticProps(element, sourceFile) {
 function extractStaticString(value, _sourceFile) {
   if (!value)
     return null;
-  if (ts2.isStringLiteral(value)) {
+  if (ts3.isStringLiteral(value)) {
     return value.text;
   }
-  if (ts2.isJsxExpression(value) && value.expression) {
+  if (ts3.isJsxExpression(value) && value.expression) {
     const expr = value.expression;
-    if (ts2.isStringLiteral(expr)) {
+    if (ts3.isStringLiteral(expr)) {
       return expr.text;
     }
-    if (ts2.isNoSubstitutionTemplateLiteral(expr)) {
+    if (ts3.isNoSubstitutionTemplateLiteral(expr)) {
       return expr.text;
     }
   }
@@ -703,9 +795,9 @@ function extractStaticString(value, _sourceFile) {
 function extractStaticNumber(value, _sourceFile) {
   if (!value)
     return null;
-  if (ts2.isJsxExpression(value) && value.expression) {
+  if (ts3.isJsxExpression(value) && value.expression) {
     const expr = value.expression;
-    if (ts2.isNumericLiteral(expr)) {
+    if (ts3.isNumericLiteral(expr)) {
       return Number(expr.text);
     }
   }
@@ -714,18 +806,18 @@ function extractStaticNumber(value, _sourceFile) {
 function extractStaticBoolean(value, _sourceFile) {
   if (!value)
     return null;
-  if (ts2.isJsxExpression(value) && value.expression) {
+  if (ts3.isJsxExpression(value) && value.expression) {
     const expr = value.expression;
-    if (expr.kind === ts2.SyntaxKind.TrueKeyword)
+    if (expr.kind === ts3.SyntaxKind.TrueKeyword)
       return true;
-    if (expr.kind === ts2.SyntaxKind.FalseKeyword)
+    if (expr.kind === ts3.SyntaxKind.FalseKeyword)
       return false;
   }
   return null;
 }
 // src/bun-plugin/island-id-inject.ts
-import { ts as ts3 } from "ts-morph";
+import { ts as ts4 } from "ts-morph";
 function injectIslandIds(source, sourceFile, relFilePath) {
   const originalSource = source.original;
   if (!originalSource.includes("<Island") && !originalSource.includes("Island")) {
@@ -759,20 +851,20 @@ function findIslandImportName(source) {
 function findIslandJsxElements(sourceFile, localName) {
   const results = [];
   function visit(node) {
-    if (ts3.isJsxSelfClosingElement(node)) {
+    if (ts4.isJsxSelfClosingElement(node)) {
       const tagName = node.tagName.getText(sourceFile.compilerNode);
       if (tagName === localName) {
         results.push(node);
       }
     }
-    ts3.forEachChild(node, visit);
+    ts4.forEachChild(node, visit);
   }
   visit(sourceFile.compilerNode);
   return results;
 }
 function hasIdProp(element, sourceFile) {
   for (const attr of element.attributes.properties) {
-    if (ts3.isJsxAttribute(attr)) {
+    if (ts4.isJsxAttribute(attr)) {
       const name = attr.name.getText(sourceFile.compilerNode);
       if (name === "id")
         return true;
@@ -782,7 +874,7 @@ function hasIdProp(element, sourceFile) {
 }
 function extractComponentName(element, sourceFile) {
   for (const attr of element.attributes.properties) {
-    if (!ts3.isJsxAttribute(attr))
+    if (!ts4.isJsxAttribute(attr))
       continue;
     const name = attr.name.getText(sourceFile.compilerNode);
     if (name !== "component")
@@ -790,8 +882,8 @@ function extractComponentName(element, sourceFile) {
     const value = attr.initializer;
     if (!value)
       return null;
-    if (ts3.isJsxExpression(value) && value.expression) {
-      if (ts3.isIdentifier(value.expression)) {
+    if (ts4.isJsxExpression(value) && value.expression) {
+      if (ts4.isIdentifier(value.expression)) {
         return value.expression.text;
       }
     }
@@ -896,7 +988,7 @@ function createVertzBunPlugin(options) {
   fieldSelectionManifest.setImportResolver(fieldSelectionResolveImport);
   let fieldSelectionFileCount = 0;
   for (const [filePath] of manifests) {
-    if (filePath.endsWith(".tsx")) {
+    if (filePath.endsWith(".tsx") || filePath.endsWith(".ts")) {
       try {
         const sourceText = readFileSync3(filePath, "utf-8");
         fieldSelectionManifest.registerFile(filePath, sourceText);
@@ -953,7 +1045,7 @@ function createVertzBunPlugin(options) {
           const hydrationProject = new Project2({
             useInMemoryFileSystem: true,
             compilerOptions: {
-              jsx: ts4.JsxEmit.Preserve,
+              jsx: ts5.JsxEmit.Preserve,
               strict: true
             }
           });
@@ -1066,8 +1158,7 @@ function createVertzBunPlugin(options) {
           let refreshEpilogue = "";
           if (fastRefresh) {
             const components = componentAnalyzer.analyze(hydrationSourceFile);
-            const contentHash = Bun.hash(source).toString(36);
-            const refreshCode = generateRefreshCode(args.path, components, contentHash);
+            const refreshCode = generateRefreshCode(args.path, components, source);
             if (refreshCode) {
               refreshPreamble = refreshCode.preamble;
               refreshEpilogue = refreshCode.epilogue;
@@ -1094,7 +1185,7 @@ function createVertzBunPlugin(options) {
           }
           if (hmr) {
             contents += `
-import.meta.hot.accept();
+if (import.meta.hot) import.meta.hot.accept();
 `;
           }
           contents += sourceMapComment;
@@ -1164,7 +1255,7 @@ import.meta.hot.accept();
     if (changed) {
       manifestsRecord = null;
     }
-    if (filePath.endsWith(".tsx")) {
+    if (filePath.endsWith(".tsx") || filePath.endsWith(".ts")) {
       fieldSelectionManifest.updateFile(filePath, sourceText);
     }
     if (logger?.isEnabled("manifest")) {

package/dist/dom-shim/index.js CHANGED Viewed

@@ -7,7 +7,7 @@ import {
   installDomShim,
   removeDomShim,
   toVNode
-} from "../shared/chunk-bm16zy8d.js";
+} from "../shared/chunk-zs75v8qj.js";
 export {
   toVNode,
   removeDomShim,

package/dist/index.js CHANGED Viewed

@@ -19,7 +19,7 @@ import {
   ssrDiscoverQueries,
   ssrRenderToString,
   streamToString
-} from "./shared/chunk-5cny4vzm.js";
+} from "./shared/chunk-g0zqrb60.js";
 import {
   clearGlobalSSRTimeout,
   createSSRAdapter,
@@ -31,7 +31,7 @@ import {
   registerSSRQuery,
   setGlobalSSRTimeout,
   ssrStorage
-} from "./shared/chunk-bm16zy8d.js";
+} from "./shared/chunk-zs75v8qj.js";
 // src/asset-pipeline.ts
 function renderAssetTags(assets) {

package/dist/shared/{chunk-2qsqp9xj.js → chunk-eenfpa59.js} RENAMED Viewed

@@ -7,17 +7,28 @@ function captureDOMState(element) {
     scrollPositions: captureScrollPositions(element)
   };
 }
+function formFieldKey(el, index) {
+  const name = el.getAttribute("name");
+  if (name)
+    return `name:${name}`;
+  const id = el.getAttribute("id");
+  if (id)
+    return `id:${id}`;
+  const placeholder = el.getAttribute("placeholder");
+  if (placeholder)
+    return `placeholder:${placeholder}`;
+  return `pos:${el.tagName.toLowerCase()}:${index}`;
+}
 function captureFormFields(element) {
   const fields = new Map;
   const inputs = element.querySelectorAll("input, textarea, select");
-  for (const el of inputs) {
-    const name = el.getAttribute("name");
-    if (!name)
-      continue;
+  for (let i = 0;i < inputs.length; i++) {
+    const el = inputs[i];
     const type = el.type ?? "";
     if (type === "file")
       continue;
-    fields.set(name, {
+    const key = formFieldKey(el, i);
+    fields.set(key, {
       value: el.value ?? "",
       checked: el.checked ?? false,
       selectedIndex: el.selectedIndex ?? -1,
@@ -87,11 +98,10 @@ function restoreFormFields(element, fields) {
   if (fields.size === 0)
     return;
   const inputs = element.querySelectorAll("input, textarea, select");
-  for (const el of inputs) {
-    const name = el.getAttribute("name");
-    if (!name)
-      continue;
-    const saved = fields.get(name);
+  for (let i = 0;i < inputs.length; i++) {
+    const el = inputs[i];
+    const key = formFieldKey(el, i);
+    const saved = fields.get(key);
     if (!saved)
       continue;
     if (saved.type === "file")

package/dist/shared/{chunk-5cny4vzm.js → chunk-g0zqrb60.js} RENAMED Viewed

@@ -6,7 +6,7 @@ import {
   setGlobalSSRTimeout,
   ssrStorage,
   toVNode
-} from "./chunk-bm16zy8d.js";
+} from "./chunk-zs75v8qj.js";
 // src/html-serializer.ts
 var VOID_ELEMENTS = new Set([
@@ -51,6 +51,9 @@ function serializeToHtml(node) {
     return node.html;
   }
   const { tag, attrs, children } = node;
+  if (tag === "fragment") {
+    return children.map((child) => serializeToHtml(child)).join("");
+  }
   const attrStr = serializeAttrs(attrs);
   if (VOID_ELEMENTS.has(tag)) {
     return `<${tag}${attrStr}>`;
@@ -141,6 +144,9 @@ function renderToStream(tree, options) {
       return serializeToHtml(placeholder);
     }
     const { tag, attrs, children } = node;
+    if (tag === "fragment") {
+      return children.map((child) => walkAndSerialize(child)).join("");
+    }
     const isRawText = RAW_TEXT_ELEMENTS.has(tag);
     const attrStr = Object.entries(attrs).map(([k, v]) => ` ${k}="${escapeAttr(v)}"`).join("");
     if (VOID_ELEMENTS.has(tag)) {

package/dist/shared/{chunk-bm16zy8d.js → chunk-zs75v8qj.js} RENAMED Viewed

@@ -568,19 +568,35 @@ function installDomShim() {
     cookie: ""
   };
   globalThis.document = fakeDocument;
+  const windowStubs = {
+    scrollTo: () => {},
+    scroll: () => {},
+    addEventListener: () => {},
+    removeEventListener: () => {},
+    dispatchEvent: () => true,
+    getComputedStyle: () => ({}),
+    matchMedia: () => ({ matches: false, addListener: () => {}, removeListener: () => {} })
+  };
   if (typeof window === "undefined") {
     globalThis.window = {
       location: { pathname: ssrStorage.getStore()?.url || "/", search: "", hash: "" },
       history: {
         pushState: () => {},
         replaceState: () => {}
-      }
+      },
+      ...windowStubs
     };
   } else {
-    globalThis.window.location = {
-      ...globalThis.window.location || {},
+    const win = globalThis.window;
+    win.location = {
+      ...win.location || {},
       pathname: ssrStorage.getStore()?.url || "/"
     };
+    for (const [key, val] of Object.entries(windowStubs)) {
+      if (typeof win[key] !== "function") {
+        win[key] = val;
+      }
+    }
   }
   globalThis.Node = SSRNode;
   globalThis.HTMLElement = SSRElement;

package/dist/ssr/index.js CHANGED Viewed

@@ -3,8 +3,8 @@ import {
   injectIntoTemplate,
   ssrDiscoverQueries,
   ssrRenderToString
-} from "../shared/chunk-5cny4vzm.js";
-import"../shared/chunk-bm16zy8d.js";
+} from "../shared/chunk-g0zqrb60.js";
+import"../shared/chunk-zs75v8qj.js";
 // src/prerender.ts
 async function discoverRoutes(module) {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@vertz/ui-server",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "type": "module",
   "license": "MIT",
   "description": "Vertz UI server-side rendering runtime",
@@ -58,15 +58,15 @@
     "@ampproject/remapping": "^2.3.0",
     "@capsizecss/unpack": "^4.0.0",
     "@jridgewell/trace-mapping": "^0.3.31",
-    "@vertz/core": "^0.2.22",
-    "@vertz/ui": "^0.2.22",
-    "@vertz/ui-compiler": "^0.2.22",
+    "@vertz/core": "^0.2.23",
+    "@vertz/ui": "^0.2.23",
+    "@vertz/ui-compiler": "^0.2.23",
     "magic-string": "^0.30.0",
     "sharp": "^0.34.5",
     "ts-morph": "^27.0.2"
   },
   "devDependencies": {
-    "@vertz/codegen": "^0.2.22",
+    "@vertz/codegen": "^0.2.23",
     "@vertz/ui-auth": "^0.2.19",
     "bun-types": "^1.3.10",
     "bunup": "^0.16.31",