@vertz/ui-server 0.2.11 → 0.2.12

package/dist/bun-plugin/fast-refresh-runtime.d.ts

@@ -7,6 +7,8 @@ type ContextScope = NonNullable<ReturnType<typeof getContextScope>>;
 interface SignalRef {
 	peek(): unknown;
 	value: unknown;
+	/** Optional HMR key for name-based signal matching (set by compiler). */
+	_hmrKey?: string;
 }
 /**
 * Register or update a component factory in the registry.
@@ -15,7 +17,7 @@ interface SignalRef {
 * On first load: creates a new record. On HMR re-evaluation: updates
 * the factory reference (instances are preserved for __$refreshPerform).
 */
-declare function __$refreshReg(moduleId: string, name: string, factory: (...args: unknown[]) => HTMLElement): void;
+declare function __$refreshReg(moduleId: string, name: string, factory: (...args: unknown[]) => HTMLElement, hash?: string): void;
 /**
 * Track a live component instance for HMR replacement.
 *

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

@@ -32,14 +32,17 @@ function getModule(moduleId) {
   }
   return mod;
 }
-function __$refreshReg(moduleId, name, factory) {
+function __$refreshReg(moduleId, name, factory, hash) {
   const mod = getModule(moduleId);
   const existing = mod.get(name);
   if (existing) {
+    if (hash && existing.hash === hash)
+      return;
     existing.factory = factory;
+    existing.hash = hash;
     dirtyModules.add(moduleId);
   } else {
-    mod.set(name, { factory, instances: [] });
+    mod.set(name, { factory, instances: [], hash });
   }
 }
 function __$refreshTrack(moduleId, name, element, args, cleanups, contextScope, signals = []) {
@@ -93,21 +96,33 @@ function __$refreshPerform(moduleId) {
         updatedInstances.push(instance);
         continue;
       }
-      if (savedValues.length > 0 && newSignals.length === savedValues.length) {
-        for (let i = 0;i < newSignals.length; i++) {
-          const sig = newSignals[i];
-          if (sig)
-            sig.value = savedValues[i];
+      try {
+        if (savedValues.length > 0) {
+          const namedSaved = new Map;
+          const unnamedSaved = [];
+          for (const s of oldSignals) {
+            if (s._hmrKey)
+              namedSaved.set(s._hmrKey, s.peek());
+            else
+              unnamedSaved.push(s.peek());
+          }
+          let unnamedIdx = 0;
+          for (const sig of newSignals) {
+            if (sig._hmrKey && namedSaved.has(sig._hmrKey)) {
+              sig.value = namedSaved.get(sig._hmrKey);
+            } else if (!sig._hmrKey && unnamedIdx < unnamedSaved.length) {
+              sig.value = unnamedSaved[unnamedIdx++];
+            }
+          }
         }
-      } else if (savedValues.length > 0 && newSignals.length !== savedValues.length) {
-        console.warn(`[vertz-hmr] Signal count changed in ${name} ` + `(${savedValues.length} \u2192 ${newSignals.length}). State reset.`);
-      }
-      popScope();
-      runCleanups(cleanups);
-      if (newCleanups.length > 0) {
-        _tryOnCleanup(() => runCleanups(newCleanups));
+        popScope();
+        runCleanups(cleanups);
+        if (newCleanups.length > 0) {
+          _tryOnCleanup(() => runCleanups(newCleanups));
+        }
+      } finally {
+        setContextScope(prevScope);
       }
-      setContextScope(prevScope);
       let domSnapshot = null;
       try {
         domSnapshot = captureDOMState(element);

package/dist/bun-plugin/index.js

@@ -41,12 +41,17 @@ function injectContextStableIds(source, sourceFile, relFilePath) {
 }
 
 // src/bun-plugin/fast-refresh-codegen.ts
-function generateRefreshPreamble(moduleId) {
+function generateRefreshPreamble(moduleId, contentHash) {
   const escapedId = moduleId.replace(/['\\]/g, "\\$&");
-  return `const __$fr = globalThis[Symbol.for('vertz:fast-refresh')];
+  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 __$moduleId = '${escapedId}';
 `;
+  if (contentHash) {
+    code += `const __$moduleHash = '${contentHash}';
+`;
+  }
+  return code;
 }
 function generateRefreshWrapper(componentName) {
   return `
@@ -63,17 +68,17 @@ const __$orig_${componentName} = ${componentName};
 ` + `  }
 ` + `  return __$refreshTrack(__$moduleId, '${componentName}', __$ret, __$args, __$scope, __$ctx, __$sigs);
 ` + `};
-` + `__$refreshReg(__$moduleId, '${componentName}', ${componentName});
+` + `__$refreshReg(__$moduleId, '${componentName}', ${componentName}, __$moduleHash);
 `;
 }
 function generateRefreshPerform() {
   return `__$refreshPerform(__$moduleId);
 `;
 }
-function generateRefreshCode(moduleId, components) {
+function generateRefreshCode(moduleId, components, contentHash) {
   if (components.length === 0)
     return null;
-  const preamble = generateRefreshPreamble(moduleId);
+  const preamble = generateRefreshPreamble(moduleId, contentHash);
   let epilogue = "";
   for (const comp of components) {
     epilogue += generateRefreshWrapper(comp.name);
@@ -159,7 +164,8 @@ function createVertzBunPlugin(options) {
           let refreshEpilogue = "";
           if (fastRefresh) {
             const components = componentAnalyzer.analyze(hydrationSourceFile);
-            const refreshCode = generateRefreshCode(args.path, components);
+            const contentHash = Bun.hash(source).toString(36);
+            const refreshCode = generateRefreshCode(args.path, components, contentHash);
             if (refreshCode) {
               refreshPreamble = refreshCode.preamble;
               refreshEpilogue = refreshCode.epilogue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vertz/ui-server",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "type": "module",
   "license": "MIT",
   "description": "Vertz UI server-side rendering runtime",