@vertz/ui-server 0.2.23 → 0.2.25

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

@@ -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

@@ -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.d.ts

@@ -1,6 +1,6 @@
 type ErrorCategory = "build" | "resolve" | "runtime" | "ssr";
 import { CSSExtractionResult } from "@vertz/ui-compiler";
-type DebugCategory = "fields" | "manifest" | "plugin" | "ssr" | "watcher" | "ws";
+type DebugCategory = "fields" | "manifest" | "plugin" | "prefetch" | "ssr" | "watcher" | "ws";
 interface DebugLogger {
 	log(category: DebugCategory, message: string, data?: Record<string, unknown>): void;
 	isEnabled(category: DebugCategory): boolean;

package/dist/bun-plugin/index.js

@@ -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.d.ts

@@ -13,6 +13,7 @@ interface VNode {
 * Base Node class for SSR — matches the browser's Node interface minimally
 */
 declare class SSRNode {
+	nodeType: number;
 	childNodes: SSRNode[];
 	parentNode: SSRNode | null;
 	get firstChild(): SSRNode | null;
@@ -28,6 +29,7 @@ declare class SSRNode {
 * hydration cursor can claim during mount.
 */
 declare class SSRComment extends SSRNode {
+	nodeType: number;
 	text: string;
 	constructor(text: string);
 	get data(): string;
@@ -37,6 +39,7 @@ declare class SSRComment extends SSRNode {
 * SSR text node
 */
 declare class SSRTextNode extends SSRNode {
+	nodeType: number;
 	text: string;
 	constructor(text: string);
 	get data(): string;
@@ -46,6 +49,7 @@ declare class SSRTextNode extends SSRNode {
 * SSR document fragment
 */
 declare class SSRDocumentFragment extends SSRNode {
+	nodeType: number;
 	children: (SSRElement | string)[];
 	appendChild(child: SSRElement | SSRTextNode | SSRDocumentFragment): void;
 }

package/dist/dom-shim/index.js

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