@vesk/vesk-cli 0.2.44 → 0.2.45

package/dist/cli.js

@@ -1659,11 +1659,11 @@ var init_context = __esm({
 
 // ../runtime/src/server-events.ts
 function getStore() {
-  const g2 = globalThis;
-  if (!g2.__vesk_server_ctx || typeof g2.__vesk_server_ctx !== "object") {
-    g2.__vesk_server_ctx = {};
+  const g4 = globalThis;
+  if (!g4.__vesk_server_ctx || typeof g4.__vesk_server_ctx !== "object") {
+    g4.__vesk_server_ctx = {};
   }
-  return g2.__vesk_server_ctx;
+  return g4.__vesk_server_ctx;
 }
 function server_locals() {
   return getStore();
@@ -2032,16 +2032,6 @@ function startRequest(handle2, skipCache) {
         if (getInflight().get(key) === prom2) getInflight().delete(key);
       });
     } else {
-      const ownerToken = g().__vsk_ssr_token || void 0;
-      if (ownerToken) {
-        prom2.then(
-          (data2) => {
-            setSsrData(key, data2, ownerToken);
-          },
-          () => {
-          }
-        );
-      }
       attachSettle(handle2, prom2);
     }
     trackSsrPromise(prom2);
@@ -2663,9 +2653,9 @@ function createHydrateWalker(container, markerList) {
 }
 function bumpNavEpoch() {
   try {
-    const g2 = globalThis;
-    const next = (g2.__vesk_nav_epoch || 0) + 1;
-    g2.__vesk_nav_epoch = next;
+    const g4 = globalThis;
+    const next = (g4.__vesk_nav_epoch || 0) + 1;
+    g4.__vesk_nav_epoch = next;
     return next;
   } catch {
     return 0;
@@ -5345,8 +5335,8 @@ function createRouter(routes, options = {}) {
     },
     _runGuards(to) {
       const from = get(_state.path) || window.location.pathname;
-      for (const g2 of this._beforeGuards ?? []) {
-        const d = g2(to, from);
+      for (const g4 of this._beforeGuards ?? []) {
+        const d = g4(to, from);
         if (d instanceof Promise) {
           return d.then((r) => {
             if (r === false || typeof r === "string") return r;
@@ -5672,8 +5662,8 @@ function createFileRouter(routeTree, options = {}) {
     },
     _runGuards(to) {
       const from = get(_state.path) || window.location.pathname;
-      for (const g2 of this._beforeGuards ?? []) {
-        const d = g2(to, from);
+      for (const g4 of this._beforeGuards ?? []) {
+        const d = g4(to, from);
         if (d instanceof Promise) {
           return d.then((r) => {
             if (r === false || typeof r === "string") return r;
@@ -21759,16 +21749,16 @@ function sha256Bytes(msg) {
       const s1 = rr(w[j - 2], 17) ^ rr(w[j - 2], 19) ^ w[j - 2] >>> 10;
       w[j] = w[j - 16] + s0 + w[j - 7] + s1 >>> 0;
     }
-    let a = h0, b = h1, c = h2, d = h3, e = h4, f = h5, g2 = h6, h = h7;
+    let a = h0, b = h1, c = h2, d = h3, e = h4, f = h5, g4 = h6, h = h7;
     for (let j = 0; j < 64; j++) {
       const S1 = rr(e, 6) ^ rr(e, 11) ^ rr(e, 25);
-      const ch = e & f ^ ~e & g2;
+      const ch = e & f ^ ~e & g4;
       const t1 = h + S1 + ch + SHA_K[j] + w[j] >>> 0;
       const S0 = rr(a, 2) ^ rr(a, 13) ^ rr(a, 22);
       const maj = a & b ^ a & c ^ b & c;
       const t2 = S0 + maj >>> 0;
-      h = g2;
-      g2 = f;
+      h = g4;
+      g4 = f;
       f = e;
       e = d + t1 >>> 0;
       d = c;
@@ -21782,7 +21772,7 @@ function sha256Bytes(msg) {
     h3 = h3 + d >>> 0;
     h4 = h4 + e >>> 0;
     h5 = h5 + f >>> 0;
-    h6 = h6 + g2 >>> 0;
+    h6 = h6 + g4 >>> 0;
     h7 = h7 + h >>> 0;
   }
   const out = new Uint8Array(32);
@@ -22833,23 +22823,23 @@ async function _getImpl() {
   return _signImpl;
 }
 async function signCookie2(name, value, host) {
-  const impl = await _getImpl();
-  if (impl.signCookie) return impl.signCookie(name, value, host);
+  const impl3 = await _getImpl();
+  if (impl3.signCookie) return impl3.signCookie(name, value, host);
   throw new Error("signCookie: @vesk/compiler not available");
 }
 async function unsignCookie2(name, signedValue, host) {
-  const impl = await _getImpl();
-  if (impl.unsignCookie) return impl.unsignCookie(name, signedValue, host);
+  const impl3 = await _getImpl();
+  if (impl3.unsignCookie) return impl3.unsignCookie(name, signedValue, host);
   throw new Error("unsignCookie: @vesk/compiler not available");
 }
 async function setSignedCookie2(name, value, options = {}, host) {
-  const impl = await _getImpl();
-  if (impl.setSignedCookie) return impl.setSignedCookie(name, value, options, host);
+  const impl3 = await _getImpl();
+  if (impl3.setSignedCookie) return impl3.setSignedCookie(name, value, options, host);
   throw new Error("setSignedCookie: @vesk/compiler not available");
 }
 async function readSignedCookie2(name, cookieString, host) {
-  const impl = await _getImpl();
-  if (impl.readSignedCookie) return impl.readSignedCookie(name, cookieString, host);
+  const impl3 = await _getImpl();
+  if (impl3.readSignedCookie) return impl3.readSignedCookie(name, cookieString, host);
   throw new Error("readSignedCookie: @vesk/compiler not available");
 }
 var ServerRequest, ServerResponse, DEFAULT_MAX_BODY_BYTES2, PayloadTooLargeError, VeskRequest, _VeskResponse, VeskResponse, _signImpl;
@@ -26365,9 +26355,9 @@ var init_primitive = __esm({
 
 // ../runtime/src/action.ts
 function getActionRegistry() {
-  const g2 = globalThis;
-  if (!g2[registryKey]) g2[registryKey] = {};
-  return g2[registryKey];
+  const g4 = globalThis;
+  if (!g4[registryKey]) g4[registryKey] = {};
+  return g4[registryKey];
 }
 function hashString(str3) {
   let h1 = 2166136261;
@@ -26405,8 +26395,8 @@ function getAction(id) {
   return getActionRegistry()[id] || null;
 }
 function clearActions() {
-  const g2 = globalThis;
-  g2[registryKey] = {};
+  const g4 = globalThis;
+  g4[registryKey] = {};
 }
 function isFormAction(action) {
   return typeof action === "object" && action !== null && (action.__veskAction === true || typeof action.id === "string" && typeof action.url === "string");
@@ -31810,14 +31800,23 @@ function dropSsrSlot(token) {
 function isSsrSlotLive(token) {
   return liveSlots.has(token);
 }
-var TOKEN_KEY, storage, liveSlots, ssrSink2;
+var TOKEN_KEY, IMPL_KEY, g2, impl, storage, liveSlots, ssrSink2;
 var init_ssr_store = __esm({
   "../compiler/src/ssr-store.ts"() {
     "use strict";
     init_index_server();
     TOKEN_KEY = "__vsk_ssr_token";
-    storage = new AsyncLocalStorage();
-    liveSlots = /* @__PURE__ */ new Map();
+    IMPL_KEY = "__vsk_ssr_store_impl";
+    g2 = globalThis;
+    impl = g2[IMPL_KEY] ?? (g2[IMPL_KEY] = {
+      storage: new AsyncLocalStorage(),
+      liveSlots: /* @__PURE__ */ new Map(),
+      // Only the copy that created the implementation installs the token
+      // accessor; a later copy must not redefine it over the shared storage.
+      ownsAccessor: true
+    });
+    storage = impl.storage;
+    liveSlots = impl.liveSlots;
     ssrSink2 = {
       set: (key, value) => {
         const store = storage.getStore();
@@ -31836,16 +31835,18 @@ var init_ssr_store = __esm({
       }
     };
     setSsrSink(ssrSink2);
-    Object.defineProperty(globalThis, TOKEN_KEY, {
-      configurable: true,
-      get() {
-        return storage.getStore()?.token;
-      },
-      set(value) {
-        const store = storage.getStore();
-        if (store) store.token = value;
-      }
-    });
+    if (impl.ownsAccessor) {
+      Object.defineProperty(globalThis, TOKEN_KEY, {
+        configurable: true,
+        get() {
+          return storage.getStore()?.token;
+        },
+        set(value) {
+          const store = storage.getStore();
+          if (store) store.token = value;
+        }
+      });
+    }
   }
 });
 
@@ -32104,17 +32105,17 @@ async function settleSsrPromises(token) {
   }
 }
 function pruneSsrDataSlots() {
-  const g2 = globalThis;
+  const g4 = globalThis;
   const prefix = "__vsk_ssr_data_";
   const stale = [];
-  for (const k of Object.keys(g2)) {
+  for (const k of Object.keys(g4)) {
     if (typeof k !== "string" || !k.startsWith(prefix)) continue;
     if (isSsrSlotLive(k.slice(prefix.length))) continue;
     stale.push(k);
   }
   if (stale.length <= 40) return;
   stale.sort().slice(0, stale.length - 40).forEach((k) => {
-    delete g2[k];
+    delete g4[k];
   });
 }
 async function applyHeadPlugins(headHtml, plugins, ctx2) {
@@ -34062,7 +34063,7 @@ ${serverStoreLine}
   // SSR already resolved. Entry is consumed on read (bound store).
   if (pathname === '/ssr-data.js') {
     const dataToken = url.searchParams.get('t') || '';
-    const dataStore = (globalThis.__vsk_ssr_data_store || {});
+    const dataStore = (globalThis.__vsk_ssr_payload_store || {});
     const payload = dataStore[dataToken];
     if (payload) delete dataStore[dataToken];
     const dataLines = [];
@@ -37846,9 +37847,9 @@ function getJSXTagName2(el) {
   if (name.type === "JSXNamespacedName") return name.namespace.name + ":" + name.name.name;
   return null;
 }
-function emitJSXText(g2, text, start, end) {
+function emitJSXText(g4, text, start, end) {
   if (text.indexOf("<") === -1 && text.indexOf(">") === -1 && text.indexOf("&") === -1 && text.indexOf("{") === -1 && text.indexOf("}") === -1) {
-    g2.add(text, start, end);
+    g4.add(text, start, end);
     return;
   }
   let out = "";
@@ -37861,7 +37862,7 @@ function emitJSXText(g2, text, start, end) {
     else if (c === "}") out += "&#125;";
     else out += c;
   }
-  g2.add(out, start, end);
+  g4.add(out, start, end);
 }
 function collapseWithMap(value) {
   let out = "";
@@ -38018,31 +38019,31 @@ function stripCallTypeArgs(text) {
   }
   return text;
 }
-function emitTrackDeclStatement(g2, source, stmt, indent4, isLast, opts) {
+function emitTrackDeclStatement(g4, source, stmt, indent4, isLast, opts) {
   const fullText = stripTrailingSemicolons(source.slice(stmt.start, stmt.end).trimEnd());
   const text = fullText + (!fullText.endsWith("}") && !isLast ? ";" : "");
   const decls = stmt.declarations || [];
-  g2.add(indent4);
+  g4.add(indent4);
   let prevEnd = stmt.start;
   for (let di = 0; di < decls.length; di++) {
     const decl = decls[di];
     const id = decl.id;
     const isLazy = id && id.type === "ArrayPattern" && id.lazy === true && decl.init;
     if (!isLazy) {
-      g2.addRaw(source.slice(prevEnd, decl.start));
-      g2.add(source.slice(decl.start, decl.end), decl.start, decl.end);
+      g4.addRaw(source.slice(prevEnd, decl.start));
+      g4.add(source.slice(decl.start, decl.end), decl.start, decl.end);
       prevEnd = decl.end;
       continue;
     }
-    if (di > 0) g2.addRaw(source.slice(prevEnd, decl.start));
+    if (di > 0) g4.addRaw(source.slice(prevEnd, decl.start));
     const ch = text[decl.end - stmt.start] ?? " ";
     const elements = id.elements || [];
     const names = elements.map((el) => el ? el.name : null).filter((n) => typeof n === "string");
     const initText = source.slice(decl.init.start, decl.init.end);
     if (names.length === 0) {
-      g2.add("let _ = ");
-      g2.add(initText, decl.init.start, decl.init.end);
-      if (ch !== ";") g2.addRaw(";");
+      g4.add("let _ = ");
+      g4.add(initText, decl.init.start, decl.init.end);
+      if (ch !== ";") g4.addRaw(";");
       prevEnd = decl.end;
       continue;
     }
@@ -38053,133 +38054,133 @@ function emitTrackDeclStatement(g2, source, stmt, indent4, isLast, opts) {
     const firstRange = [elements[0].start, elements[0].end];
     const dropLastSemi = ch === ";";
     if (opts.typedCells) {
-      const cellName = g2.cellCount === 0 ? "__cell" : `__cell${g2.cellCount}`;
-      g2.cellCount++;
+      const cellName = g4.cellCount === 0 ? "__cell" : `__cell${g4.cellCount}`;
+      g4.cellCount++;
       if (annotation) {
-        g2.add(`const ${cellName}: Tracked<`);
-        g2.add(annotation, annStart, annEnd);
-        g2.add("> = ");
+        g4.add(`const ${cellName}: Tracked<`);
+        g4.add(annotation, annStart, annEnd);
+        g4.add("> = ");
       } else {
-        g2.add(`const ${cellName} = `);
+        g4.add(`const ${cellName} = `);
       }
       const cellInit = annotation ? stripCallTypeArgs(initText) : initText;
-      g2.add(cellInit, decl.init.start, decl.init.end);
-      g2.add(";");
-      g2.add(" let ");
-      g2.add(first, firstRange[0], firstRange[1], REACTIVE_DATA);
+      g4.add(cellInit, decl.init.start, decl.init.end);
+      g4.add(";");
+      g4.add(" let ");
+      g4.add(first, firstRange[0], firstRange[1], REACTIVE_DATA);
       if (annotation) {
-        g2.add(": ");
-        g2.add(annotation, annStart, annEnd);
+        g4.add(": ");
+        g4.add(annotation, annStart, annEnd);
       }
-      g2.add(` = ${cellName}.get();`);
+      g4.add(` = ${cellName}.get();`);
       for (let n = 1; n < names.length; n++) {
-        g2.add(" let ");
-        g2.add(names[n], elements[n].start, elements[n].end, REACTIVE_DATA);
-        g2.add(` = ${cellName};`);
+        g4.add(" let ");
+        g4.add(names[n], elements[n].start, elements[n].end, REACTIVE_DATA);
+        g4.add(` = ${cellName};`);
       }
-      if (dropLastSemi) g2.code = g2.code.slice(0, -1);
+      if (dropLastSemi) g4.code = g4.code.slice(0, -1);
     } else {
       if (annotation) {
-        g2.add("let ");
-        g2.add(first, firstRange[0], firstRange[1], REACTIVE_DATA);
-        g2.add(": ");
-        g2.add(annotation, annStart, annEnd);
-        g2.add(" = (");
-        g2.add(stripCallTypeArgs(initText), decl.init.start, decl.init.end);
-        g2.add(" as unknown as ");
-        g2.add(annotation, annStart, annEnd);
-        g2.add(");");
+        g4.add("let ");
+        g4.add(first, firstRange[0], firstRange[1], REACTIVE_DATA);
+        g4.add(": ");
+        g4.add(annotation, annStart, annEnd);
+        g4.add(" = (");
+        g4.add(stripCallTypeArgs(initText), decl.init.start, decl.init.end);
+        g4.add(" as unknown as ");
+        g4.add(annotation, annStart, annEnd);
+        g4.add(");");
       } else {
-        const cellName = g2.cellCount === 0 ? "__cell" : `__cell${g2.cellCount}`;
-        g2.cellCount++;
-        g2.add(`const ${cellName} = `);
-        g2.add(initText, decl.init.start, decl.init.end);
-        g2.add("; let ");
-        g2.add(first, firstRange[0], firstRange[1], REACTIVE_DATA);
-        g2.add(` = ${cellName}.get();`);
+        const cellName = g4.cellCount === 0 ? "__cell" : `__cell${g4.cellCount}`;
+        g4.cellCount++;
+        g4.add(`const ${cellName} = `);
+        g4.add(initText, decl.init.start, decl.init.end);
+        g4.add("; let ");
+        g4.add(first, firstRange[0], firstRange[1], REACTIVE_DATA);
+        g4.add(` = ${cellName}.get();`);
       }
       for (let n = 1; n < names.length; n++) {
-        g2.add(" let ");
-        g2.add(names[n], elements[n].start, elements[n].end, REACTIVE_DATA);
-        g2.add(": any = ");
-        g2.add(first, firstRange[0], firstRange[1]);
-        g2.add(";");
-        if (n === names.length - 1 && dropLastSemi) g2.code = g2.code.slice(0, -1);
+        g4.add(" let ");
+        g4.add(names[n], elements[n].start, elements[n].end, REACTIVE_DATA);
+        g4.add(": any = ");
+        g4.add(first, firstRange[0], firstRange[1]);
+        g4.add(";");
+        if (n === names.length - 1 && dropLastSemi) g4.code = g4.code.slice(0, -1);
       }
-      if (names.length === 1 && dropLastSemi) g2.code = g2.code.slice(0, -1);
+      if (names.length === 1 && dropLastSemi) g4.code = g4.code.slice(0, -1);
     }
     prevEnd = decl.end;
   }
-  if (!isLast) g2.addRaw(";");
+  if (!isLast) g4.addRaw(";");
 }
-function emitBlock(g2, source, body, indent4, opts) {
+function emitBlock(g4, source, body, indent4, opts) {
   const stmts = body && body.type === "BlockStatement" ? body.body : body ? Array.isArray(body) ? body : [body] : [];
-  g2.addRaw("{\n");
-  emitBody(g2, source, stmts, indent4 + "  ", opts);
-  g2.addRaw("\n");
-  g2.add(indent4);
-  g2.addRaw("}");
+  g4.addRaw("{\n");
+  emitBody(g4, source, stmts, indent4 + "  ", opts);
+  g4.addRaw("\n");
+  g4.add(indent4);
+  g4.addRaw("}");
 }
-function emitJSXAttr(g2, source, attr) {
+function emitJSXAttr(g4, source, attr) {
   if (attr.type === "JSXSpreadAttribute") {
-    g2.add(source.slice(attr.start, attr.end), attr.start, attr.end);
+    g4.add(source.slice(attr.start, attr.end), attr.start, attr.end);
     return;
   }
   const name = attr.name;
-  g2.add(source.slice(name.start, name.end), name.start, name.end);
+  g4.add(source.slice(name.start, name.end), name.start, name.end);
   const v = attr.value;
   if (!v) return;
-  g2.add(source.slice(name.end, v.start), name.end, v.start);
+  g4.add(source.slice(name.end, v.start), name.end, v.start);
   if (v.type === "JSXExpressionContainer") {
-    g2.add(source.slice(v.start, v.expression.start), v.start, v.expression.start);
-    g2.add(source.slice(v.expression.start, v.expression.end), v.expression.start, v.expression.end);
-    g2.add(source.slice(v.expression.end, v.end), v.expression.end, v.end);
+    g4.add(source.slice(v.start, v.expression.start), v.start, v.expression.start);
+    g4.add(source.slice(v.expression.start, v.expression.end), v.expression.start, v.expression.end);
+    g4.add(source.slice(v.expression.end, v.end), v.expression.end, v.end);
   } else {
-    g2.add(source.slice(v.start, v.end), v.start, v.end);
+    g4.add(source.slice(v.start, v.end), v.start, v.end);
   }
 }
-function emitJSXElement(g2, source, el, opts, hoist) {
+function emitJSXElement(g4, source, el, opts, hoist) {
   const op = el.openingElement;
   const name = op.name;
   let prev;
   if (name) {
-    g2.add(source.slice(op.start, name.start), op.start, name.start);
-    g2.add(source.slice(name.start, name.end), name.start, name.end);
+    g4.add(source.slice(op.start, name.start), op.start, name.start);
+    g4.add(source.slice(name.start, name.end), name.start, name.end);
     prev = name.end;
   } else {
     prev = op.start + 1;
   }
   for (const attr of op.attributes ?? []) {
-    g2.add(source.slice(prev, attr.start), prev, attr.start);
-    emitJSXAttr(g2, source, attr);
+    g4.add(source.slice(prev, attr.start), prev, attr.start);
+    emitJSXAttr(g4, source, attr);
     prev = attr.end;
   }
   const tail = source.slice(prev, op.end);
   if (op.selfClosing && !tail.includes("/")) {
     const gt = tail.lastIndexOf(">");
     const head = gt === -1 ? tail : tail.slice(0, gt);
-    if (head) g2.add(head, prev, prev + head.length);
-    g2.addRaw("/>");
+    if (head) g4.add(head, prev, prev + head.length);
+    g4.addRaw("/>");
   } else {
-    g2.add(tail, prev, op.end);
+    g4.add(tail, prev, op.end);
   }
   if (op.selfClosing) return;
-  emitJSXChildren(g2, source, el.children ?? [], opts, hoist);
+  emitJSXChildren(g4, source, el.children ?? [], opts, hoist);
   if (el.closingElement) {
-    g2.add(source.slice(el.closingElement.start, el.closingElement.end), el.closingElement.start, el.closingElement.end);
+    g4.add(source.slice(el.closingElement.start, el.closingElement.end), el.closingElement.start, el.closingElement.end);
   }
 }
-function emitJSXExprBody(g2, source, expr, opts) {
-  if (expr.type === "JSXElement") return emitJSXElement(g2, source, expr, opts);
-  if (expr.type === "JSXFragment") return emitJSXFragment(g2, source, expr, opts);
-  g2.add(source.slice(expr.start, expr.end), expr.start, expr.end);
+function emitJSXExprBody(g4, source, expr, opts) {
+  if (expr.type === "JSXElement") return emitJSXElement(g4, source, expr, opts);
+  if (expr.type === "JSXFragment") return emitJSXFragment(g4, source, expr, opts);
+  g4.add(source.slice(expr.start, expr.end), expr.start, expr.end);
 }
-function emitJSXFragment(g2, source, frag, opts, hoist) {
-  g2.addRaw("<>");
-  emitJSXChildren(g2, source, frag.children ?? [], opts, hoist);
-  g2.addRaw("</>");
+function emitJSXFragment(g4, source, frag, opts, hoist) {
+  g4.addRaw("<>");
+  emitJSXChildren(g4, source, frag.children ?? [], opts, hoist);
+  g4.addRaw("</>");
 }
-function emitForClauseMap(g2, source, child, text, map, clauseStart, bodyEmit, emptyEmit) {
+function emitForClauseMap(g4, source, child, text, map, clauseStart, bodyEmit, emptyEmit) {
   const clauseEnd = findBalancedEnd(text, clauseStart - 1);
   const clause = text.slice(clauseStart, clauseEnd);
   const ofIdx = findTopLevelSep(clause, "of");
@@ -38196,38 +38197,38 @@ function emitForClauseMap(g2, source, child, text, map, clauseStart, bodyEmit, e
   const itemVar = stripDeclKeyword(lhs).trim();
   if (ofIdx !== -1) {
     if (emptyEmit) {
-      g2.addRaw("{ (() => { const _v = ");
-      g2.add(arrExpr, arrStart, arrEnd);
-      g2.addRaw("; return _v.length === 0 ? (");
+      g4.addRaw("{ (() => { const _v = ");
+      g4.add(arrExpr, arrStart, arrEnd);
+      g4.addRaw("; return _v.length === 0 ? (");
       emptyEmit();
-      g2.addRaw(") : _v.map((");
-      g2.addRaw(itemVar);
-      g2.addRaw(": (typeof _v)[number]) => (");
+      g4.addRaw(") : _v.map((");
+      g4.addRaw(itemVar);
+      g4.addRaw(": (typeof _v)[number]) => (");
       bodyEmit();
-      g2.addRaw(")); })() }");
+      g4.addRaw(")); })() }");
     } else {
-      g2.addRaw("{ ");
-      g2.add(arrExpr, arrStart, arrEnd);
-      g2.addRaw(".map((");
-      g2.addRaw(itemVar);
-      g2.addRaw(": (typeof ");
-      g2.add(arrExpr, arrStart, arrEnd);
-      g2.addRaw(")[number]) => (");
+      g4.addRaw("{ ");
+      g4.add(arrExpr, arrStart, arrEnd);
+      g4.addRaw(".map((");
+      g4.addRaw(itemVar);
+      g4.addRaw(": (typeof ");
+      g4.add(arrExpr, arrStart, arrEnd);
+      g4.addRaw(")[number]) => (");
       bodyEmit();
-      g2.addRaw(")) }");
+      g4.addRaw(")) }");
     }
   } else {
-    g2.addRaw("{ Object.keys(");
-    g2.add(arrExpr, arrStart, arrEnd);
-    g2.addRaw(").map((");
-    g2.addRaw(itemVar);
-    g2.addRaw(") => (");
+    g4.addRaw("{ Object.keys(");
+    g4.add(arrExpr, arrStart, arrEnd);
+    g4.addRaw(").map((");
+    g4.addRaw(itemVar);
+    g4.addRaw(") => (");
     bodyEmit();
-    g2.addRaw(")) }");
+    g4.addRaw(")) }");
   }
   return true;
 }
-function emitJSXChildren(g2, source, children, opts, hoist) {
+function emitJSXChildren(g4, source, children, opts, hoist) {
   let i = 0;
   let forPending = false;
   while (i < children.length) {
@@ -38253,46 +38254,46 @@ function emitJSXChildren(g2, source, children, opts, hoist) {
           const emptyContainer = children[i + 3];
           if (emptyTextNode && emptyTextNode.type === "JSXText" && ["#empty", "empty"].includes(emptyTextNode.value.trim()) && emptyContainer && emptyContainer.type === "JSXExpressionContainer" && emptyContainer.expression.type !== "JSXEmptyExpression") {
             consumed = 4;
-            emptyEmit = () => emitJSXExprBody(g2, source, emptyContainer.expression, opts);
+            emptyEmit = () => emitJSXExprBody(g4, source, emptyContainer.expression, opts);
           }
           let matched = false;
           if (nextChild.type === "JSXExpressionContainer") {
             const exprNode = nextChild.expression;
             if (exprNode.type === "JSXEmptyExpression") {
-              g2.add(text, child.start, child.end);
+              g4.add(text, child.start, child.end);
               i++;
               continue;
             }
             matched = emitForClauseMap(
-              g2,
+              g4,
               source,
               child,
               text,
               map,
               clauseStartCollapsed,
-              () => emitJSXExprBody(g2, source, exprNode, opts),
+              () => emitJSXExprBody(g4, source, exprNode, opts),
               emptyEmit
             );
           } else if (nextChild.type === "JSXFragment") {
             matched = emitForClauseMap(
-              g2,
+              g4,
               source,
               child,
               text,
               map,
               clauseStartCollapsed,
-              () => emitJSXFragment(g2, source, nextChild, opts),
+              () => emitJSXFragment(g4, source, nextChild, opts),
               emptyEmit
             );
           } else {
             matched = emitForClauseMap(
-              g2,
+              g4,
               source,
               child,
               text,
               map,
               clauseStartCollapsed,
-              () => emitJSXElement(g2, source, nextChild, opts),
+              () => emitJSXElement(g4, source, nextChild, opts),
               emptyEmit
             );
           }
@@ -38309,184 +38310,184 @@ function emitJSXChildren(g2, source, children, opts, hoist) {
         continue;
       }
       forPending = false;
-      emitJSXText(g2, text, child.start, child.end);
+      emitJSXText(g4, text, child.start, child.end);
       i++;
     } else if (child.type === "JSXExpressionContainer") {
       if (child.expression.type === "JSXEmptyExpression") {
         i++;
         continue;
       }
-      g2.addRaw("{");
-      g2.add(source.slice(child.expression.start, child.expression.end), child.expression.start, child.expression.end);
-      g2.addRaw("}");
+      g4.addRaw("{");
+      g4.add(source.slice(child.expression.start, child.expression.end), child.expression.start, child.expression.end);
+      g4.addRaw("}");
       i++;
     } else if (child.type === "JSXElement") {
       if (getJSXTagName2(child) === "style") {
         const openEnd = child.openingElement?.end ?? child.start;
         const closeStart = child.closingElement?.start ?? child.end;
-        g2.recordStyle(child.start, child.end, source.slice(openEnd, closeStart));
+        g4.recordStyle(child.start, child.end, source.slice(openEnd, closeStart));
         i++;
         continue;
       }
-      emitJSXElement(g2, source, child, opts, hoist);
+      emitJSXElement(g4, source, child, opts, hoist);
       i++;
     } else if (child.type === "JSXFragment") {
-      emitJSXFragment(g2, source, child, opts, hoist);
+      emitJSXFragment(g4, source, child, opts, hoist);
       i++;
     } else if (child.type === "IfStatement" || child.type === "ForOfStatement" || child.type === "ForStatement" || child.type === "ForInStatement" || child.type === "WhileStatement" || child.type === "DoWhileStatement" || child.type === "SwitchStatement" || child.type === "TryStatement" || child.type === "VariableDeclaration" || child.type === "ExpressionStatement") {
       if (hoist && hoist.set.has(child)) {
         i++;
         continue;
       }
-      g2.addRaw("{(() => { ");
-      emitBody(g2, source, [child], "", opts);
-      g2.addRaw(" })()}");
+      g4.addRaw("{(() => { ");
+      emitBody(g4, source, [child], "", opts);
+      g4.addRaw(" })()}");
       i++;
     } else {
       i++;
     }
   }
 }
-function emitIf(g2, source, stmt, indent4, opts) {
-  g2.add(indent4);
-  g2.addRaw("if (");
-  g2.add(source.slice(stmt.test.start, stmt.test.end), stmt.test.start, stmt.test.end);
-  g2.addRaw(") ");
-  emitBlock(g2, source, stmt.consequent, indent4, opts);
+function emitIf(g4, source, stmt, indent4, opts) {
+  g4.add(indent4);
+  g4.addRaw("if (");
+  g4.add(source.slice(stmt.test.start, stmt.test.end), stmt.test.start, stmt.test.end);
+  g4.addRaw(") ");
+  emitBlock(g4, source, stmt.consequent, indent4, opts);
   if (stmt.alternate) {
-    g2.addRaw(" else ");
-    emitBlock(g2, source, stmt.alternate, indent4, opts);
+    g4.addRaw(" else ");
+    emitBlock(g4, source, stmt.alternate, indent4, opts);
   }
 }
-function emitLoopVariable(g2, source, left) {
+function emitLoopVariable(g4, source, left) {
   if (left && left.type === "Identifier") {
-    g2.addRaw("const ");
-    g2.add(source.slice(left.start, left.end), left.start, left.end);
+    g4.addRaw("const ");
+    g4.add(source.slice(left.start, left.end), left.start, left.end);
     return;
   }
-  g2.add(source.slice(left.start, left.end), left.start, left.end);
-}
-function emitForOf(g2, source, stmt, indent4, opts) {
-  g2.add(indent4);
-  g2.addRaw("for (");
-  emitLoopVariable(g2, source, stmt.left);
-  g2.addRaw(" of ");
-  g2.add(source.slice(stmt.right.start, stmt.right.end), stmt.right.start, stmt.right.end);
-  g2.addRaw(") ");
-  emitBlock(g2, source, stmt.body, indent4, opts);
-}
-function emitForIn(g2, source, stmt, indent4, opts) {
-  g2.add(indent4);
-  g2.addRaw("for (");
-  emitLoopVariable(g2, source, stmt.left);
-  g2.addRaw(" in ");
-  g2.add(source.slice(stmt.right.start, stmt.right.end), stmt.right.start, stmt.right.end);
-  g2.addRaw(") ");
-  emitBlock(g2, source, stmt.body, indent4, opts);
-}
-function emitFor(g2, source, stmt, indent4, opts) {
-  g2.add(indent4);
-  g2.addRaw("for (");
-  if (stmt.init) g2.add(source.slice(stmt.init.start, stmt.init.end), stmt.init.start, stmt.init.end);
-  g2.addRaw("; ");
-  if (stmt.test) g2.add(source.slice(stmt.test.start, stmt.test.end), stmt.test.start, stmt.test.end);
-  g2.addRaw("; ");
-  if (stmt.update) g2.add(source.slice(stmt.update.start, stmt.update.end), stmt.update.start, stmt.update.end);
-  g2.addRaw(") ");
-  emitBlock(g2, source, stmt.body, indent4, opts);
-}
-function emitWhile(g2, source, stmt, indent4, opts) {
-  g2.add(indent4);
-  g2.addRaw("while (");
-  g2.add(source.slice(stmt.test.start, stmt.test.end), stmt.test.start, stmt.test.end);
-  g2.addRaw(") ");
-  emitBlock(g2, source, stmt.body, indent4, opts);
-}
-function emitDoWhile(g2, source, stmt, indent4, opts) {
-  g2.add(indent4);
-  g2.addRaw("do ");
-  emitBlock(g2, source, stmt.body, indent4, opts);
-  g2.addRaw(" while (");
-  g2.add(source.slice(stmt.test.start, stmt.test.end), stmt.test.start, stmt.test.end);
-  g2.addRaw(");");
-}
-function emitSwitch(g2, source, stmt, indent4, opts) {
-  g2.add(indent4);
-  g2.addRaw("switch (");
-  g2.add(source.slice(stmt.discriminant.start, stmt.discriminant.end), stmt.discriminant.start, stmt.discriminant.end);
-  g2.addRaw(") {");
+  g4.add(source.slice(left.start, left.end), left.start, left.end);
+}
+function emitForOf(g4, source, stmt, indent4, opts) {
+  g4.add(indent4);
+  g4.addRaw("for (");
+  emitLoopVariable(g4, source, stmt.left);
+  g4.addRaw(" of ");
+  g4.add(source.slice(stmt.right.start, stmt.right.end), stmt.right.start, stmt.right.end);
+  g4.addRaw(") ");
+  emitBlock(g4, source, stmt.body, indent4, opts);
+}
+function emitForIn(g4, source, stmt, indent4, opts) {
+  g4.add(indent4);
+  g4.addRaw("for (");
+  emitLoopVariable(g4, source, stmt.left);
+  g4.addRaw(" in ");
+  g4.add(source.slice(stmt.right.start, stmt.right.end), stmt.right.start, stmt.right.end);
+  g4.addRaw(") ");
+  emitBlock(g4, source, stmt.body, indent4, opts);
+}
+function emitFor(g4, source, stmt, indent4, opts) {
+  g4.add(indent4);
+  g4.addRaw("for (");
+  if (stmt.init) g4.add(source.slice(stmt.init.start, stmt.init.end), stmt.init.start, stmt.init.end);
+  g4.addRaw("; ");
+  if (stmt.test) g4.add(source.slice(stmt.test.start, stmt.test.end), stmt.test.start, stmt.test.end);
+  g4.addRaw("; ");
+  if (stmt.update) g4.add(source.slice(stmt.update.start, stmt.update.end), stmt.update.start, stmt.update.end);
+  g4.addRaw(") ");
+  emitBlock(g4, source, stmt.body, indent4, opts);
+}
+function emitWhile(g4, source, stmt, indent4, opts) {
+  g4.add(indent4);
+  g4.addRaw("while (");
+  g4.add(source.slice(stmt.test.start, stmt.test.end), stmt.test.start, stmt.test.end);
+  g4.addRaw(") ");
+  emitBlock(g4, source, stmt.body, indent4, opts);
+}
+function emitDoWhile(g4, source, stmt, indent4, opts) {
+  g4.add(indent4);
+  g4.addRaw("do ");
+  emitBlock(g4, source, stmt.body, indent4, opts);
+  g4.addRaw(" while (");
+  g4.add(source.slice(stmt.test.start, stmt.test.end), stmt.test.start, stmt.test.end);
+  g4.addRaw(");");
+}
+function emitSwitch(g4, source, stmt, indent4, opts) {
+  g4.add(indent4);
+  g4.addRaw("switch (");
+  g4.add(source.slice(stmt.discriminant.start, stmt.discriminant.end), stmt.discriminant.start, stmt.discriminant.end);
+  g4.addRaw(") {");
   let firstCase = true;
   for (const c of stmt.cases ?? []) {
-    g2.addRaw(firstCase ? "\n" : "\n");
+    g4.addRaw(firstCase ? "\n" : "\n");
     firstCase = false;
-    g2.add(indent4);
-    g2.addRaw("  ");
+    g4.add(indent4);
+    g4.addRaw("  ");
     if (c.test) {
-      g2.addRaw("case ");
-      g2.add(source.slice(c.test.start, c.test.end), c.test.start, c.test.end);
-      g2.addRaw(":");
+      g4.addRaw("case ");
+      g4.add(source.slice(c.test.start, c.test.end), c.test.start, c.test.end);
+      g4.addRaw(":");
     } else {
-      g2.addRaw("default:");
+      g4.addRaw("default:");
     }
-    const before = g2.code.length;
-    emitBody(g2, source, c.consequent, indent4 + "    ", opts);
-    if (g2.code.length > before) g2.addRaw("\n");
+    const before = g4.code.length;
+    emitBody(g4, source, c.consequent, indent4 + "    ", opts);
+    if (g4.code.length > before) g4.addRaw("\n");
   }
-  g2.addRaw("\n");
-  g2.add(indent4);
-  g2.addRaw("}");
+  g4.addRaw("\n");
+  g4.add(indent4);
+  g4.addRaw("}");
 }
-function emitTry(g2, source, stmt, indent4, opts) {
-  g2.add(indent4);
-  g2.addRaw("try ");
-  emitBlock(g2, source, stmt.block, indent4, opts);
+function emitTry(g4, source, stmt, indent4, opts) {
+  g4.add(indent4);
+  g4.addRaw("try ");
+  emitBlock(g4, source, stmt.block, indent4, opts);
   if (stmt.handler) {
-    g2.addRaw(" catch");
+    g4.addRaw(" catch");
     if (stmt.handler.param) {
-      g2.addRaw(" (");
-      g2.add(source.slice(stmt.handler.param.start, stmt.handler.param.end), stmt.handler.param.start, stmt.handler.param.end);
-      g2.addRaw(")");
+      g4.addRaw(" (");
+      g4.add(source.slice(stmt.handler.param.start, stmt.handler.param.end), stmt.handler.param.start, stmt.handler.param.end);
+      g4.addRaw(")");
     }
-    g2.addRaw(" ");
-    emitBlock(g2, source, stmt.handler.body, indent4, opts);
+    g4.addRaw(" ");
+    emitBlock(g4, source, stmt.handler.body, indent4, opts);
   }
   if (stmt.finalizer) {
-    g2.addRaw(" finally ");
-    emitBlock(g2, source, stmt.finalizer, indent4, opts);
+    g4.addRaw(" finally ");
+    emitBlock(g4, source, stmt.finalizer, indent4, opts);
   }
 }
-function emitPlainStatement(g2, source, stmt, indent4, isLast) {
+function emitPlainStatement(g4, source, stmt, indent4, isLast) {
   let text = stripTrailingSemicolons(source.slice(stmt.start, stmt.end).trimEnd());
   if (text === "") return;
-  g2.add(indent4);
-  g2.add(text, stmt.start, stmt.end);
-  if (!text.endsWith("}") && !isLast) g2.addRaw(";");
+  g4.add(indent4);
+  g4.add(text, stmt.start, stmt.end);
+  if (!text.endsWith("}") && !isLast) g4.addRaw(";");
 }
-function emitStatement(g2, source, stmt, indent4, isLast, opts, hoist) {
+function emitStatement(g4, source, stmt, indent4, isLast, opts, hoist) {
   switch (stmt.type) {
     case "JSXElement":
       if (getJSXTagName2(stmt) === "style") {
         const openEnd = stmt.openingElement?.end ?? stmt.start;
         const closeStart = stmt.closingElement?.start ?? stmt.end;
-        g2.recordStyle(stmt.start, stmt.end, source.slice(openEnd, closeStart));
+        g4.recordStyle(stmt.start, stmt.end, source.slice(openEnd, closeStart));
         return;
       }
-      g2.add(indent4);
-      emitJSXElement(g2, source, stmt, opts, hoist);
-      if (!isLast) g2.addRaw(";");
+      g4.add(indent4);
+      emitJSXElement(g4, source, stmt, opts, hoist);
+      if (!isLast) g4.addRaw(";");
       return;
     case "JSXFragment":
-      g2.add(indent4);
-      emitJSXFragment(g2, source, stmt, opts, hoist);
-      if (!isLast) g2.addRaw(";");
+      g4.add(indent4);
+      emitJSXFragment(g4, source, stmt, opts, hoist);
+      if (!isLast) g4.addRaw(";");
       return;
     case "JSXExpressionContainer": {
       if (stmt.expression.type === "JSXEmptyExpression") return;
-      g2.add(indent4);
-      g2.addRaw("{");
-      g2.add(source.slice(stmt.expression.start, stmt.expression.end), stmt.expression.start, stmt.expression.end);
-      g2.addRaw("}");
-      if (!isLast) g2.addRaw(";");
+      g4.add(indent4);
+      g4.addRaw("{");
+      g4.add(source.slice(stmt.expression.start, stmt.expression.end), stmt.expression.start, stmt.expression.end);
+      g4.addRaw("}");
+      if (!isLast) g4.addRaw(";");
       return;
     }
     case "VeskBlock": {
@@ -38494,10 +38495,10 @@ function emitStatement(g2, source, stmt, indent4, isLast, opts, hoist) {
       const innerStmts = stmt.body ?? [];
       let firstLine = true;
       for (let i = 0; i < innerStmts.length; i++) {
-        const before = g2.code.length;
-        emitStatement(g2, source, innerStmts[i], indent4, isLast && i === innerStmts.length - 1, opts, hoist);
-        if (g2.code.length > before) {
-          if (!firstLine) g2.addRaw("\n");
+        const before = g4.code.length;
+        emitStatement(g4, source, innerStmts[i], indent4, isLast && i === innerStmts.length - 1, opts, hoist);
+        if (g4.code.length > before) {
+          if (!firstLine) g4.addRaw("\n");
           firstLine = false;
         }
       }
@@ -38505,38 +38506,38 @@ function emitStatement(g2, source, stmt, indent4, isLast, opts, hoist) {
     }
     case "VariableDeclaration":
       if (isTrackDeclStatement(stmt)) {
-        emitTrackDeclStatement(g2, source, stmt, indent4, isLast, opts);
+        emitTrackDeclStatement(g4, source, stmt, indent4, isLast, opts);
         return;
       }
-      return emitPlainStatement(g2, source, stmt, indent4, isLast);
+      return emitPlainStatement(g4, source, stmt, indent4, isLast);
     case "IfStatement":
-      return emitIf(g2, source, stmt, indent4, opts);
+      return emitIf(g4, source, stmt, indent4, opts);
     case "ForOfStatement":
-      return emitForOf(g2, source, stmt, indent4, opts);
+      return emitForOf(g4, source, stmt, indent4, opts);
     case "ForInStatement":
-      return emitForIn(g2, source, stmt, indent4, opts);
+      return emitForIn(g4, source, stmt, indent4, opts);
     case "ForStatement":
-      return emitFor(g2, source, stmt, indent4, opts);
+      return emitFor(g4, source, stmt, indent4, opts);
     case "WhileStatement":
-      return emitWhile(g2, source, stmt, indent4, opts);
+      return emitWhile(g4, source, stmt, indent4, opts);
     case "DoWhileStatement":
-      return emitDoWhile(g2, source, stmt, indent4, opts);
+      return emitDoWhile(g4, source, stmt, indent4, opts);
     case "SwitchStatement":
-      return emitSwitch(g2, source, stmt, indent4, opts);
+      return emitSwitch(g4, source, stmt, indent4, opts);
     case "TryStatement":
-      return emitTry(g2, source, stmt, indent4, opts);
+      return emitTry(g4, source, stmt, indent4, opts);
     case "LabeledStatement": {
-      g2.add(indent4);
-      g2.add(stmt.label.name, stmt.label.start, stmt.label.end);
-      g2.addRaw(":\n");
-      emitStatement(g2, source, stmt.body, indent4, isLast, opts);
+      g4.add(indent4);
+      g4.add(stmt.label.name, stmt.label.start, stmt.label.end);
+      g4.addRaw(":\n");
+      emitStatement(g4, source, stmt.body, indent4, isLast, opts);
       return;
     }
     default:
-      return emitPlainStatement(g2, source, stmt, indent4, isLast);
+      return emitPlainStatement(g4, source, stmt, indent4, isLast);
   }
 }
-function emitBody(g2, source, stmts, indent4, opts, hoist) {
+function emitBody(g4, source, stmts, indent4, opts, hoist) {
   let firstLine = true;
   let i = 0;
   while (i < stmts.length) {
@@ -38544,34 +38545,34 @@ function emitBody(g2, source, stmts, indent4, opts, hoist) {
     const isLast = i === stmts.length - 1;
     if (stmt.type === "ForOfStatement" && stmts[i + 1] && stmts[i + 1].type === "VeskBlock" && stmts[i + 1].tag === "empty") {
       const empty2 = stmts[i + 1];
-      if (!firstLine) g2.addRaw("\n");
+      if (!firstLine) g4.addRaw("\n");
       firstLine = false;
-      emitForOf(g2, source, stmt, indent4, opts);
+      emitForOf(g4, source, stmt, indent4, opts);
       const inner = empty2.body ?? [];
       if (inner.length > 0) {
-        g2.addRaw("\n");
-        g2.add(indent4);
-        g2.add(source.slice(stmt.right.start, stmt.right.end), stmt.right.start, stmt.right.end);
-        g2.addRaw(".length === 0 && (() => {");
-        g2.addRaw("\n");
-        emitBody(g2, source, inner, indent4 + "  ", opts);
-        g2.addRaw("\n");
-        g2.add(indent4);
-        g2.addRaw("})();");
+        g4.addRaw("\n");
+        g4.add(indent4);
+        g4.add(source.slice(stmt.right.start, stmt.right.end), stmt.right.start, stmt.right.end);
+        g4.addRaw(".length === 0 && (() => {");
+        g4.addRaw("\n");
+        emitBody(g4, source, inner, indent4 + "  ", opts);
+        g4.addRaw("\n");
+        g4.add(indent4);
+        g4.addRaw("})();");
       }
       i += 2;
       continue;
     }
-    const before = g2.code.length;
-    emitStatement(g2, source, stmt, indent4, isLast, opts, hoist);
-    if (g2.code.length > before) {
-      if (!firstLine) g2.addRaw("\n");
+    const before = g4.code.length;
+    emitStatement(g4, source, stmt, indent4, isLast, opts, hoist);
+    if (g4.code.length > before) {
+      if (!firstLine) g4.addRaw("\n");
       firstLine = false;
     }
     i++;
   }
 }
-function emitChunkMapped(g2, source, start, end) {
+function emitChunkMapped(g4, source, start, end) {
   if (end <= start) return;
   let pos = start;
   let i = start;
@@ -38583,8 +38584,8 @@ function emitChunkMapped(g2, source, start, end) {
         if (openEnd !== -1 && openEnd <= end) {
           const closeIdx = source.indexOf("</style>", openEnd);
           if (closeIdx !== -1 && closeIdx + 8 <= end) {
-            g2.add(source.slice(pos, i), pos, i);
-            g2.recordStyle(i, closeIdx + 8, source.slice(openEnd, closeIdx));
+            g4.add(source.slice(pos, i), pos, i);
+            g4.recordStyle(i, closeIdx + 8, source.slice(openEnd, closeIdx));
             pos = closeIdx + 8;
             i = closeIdx + 8;
             continue;
@@ -38594,20 +38595,20 @@ function emitChunkMapped(g2, source, start, end) {
     }
     i++;
   }
-  g2.add(source.slice(pos, end), pos, end);
+  g4.add(source.slice(pos, end), pos, end);
 }
-function emitReturn(g2, source, stmt, opts) {
-  g2.add(source.slice(stmt.start, stmt.start + 6), stmt.start, stmt.start + 6);
+function emitReturn(g4, source, stmt, opts) {
+  g4.add(source.slice(stmt.start, stmt.start + 6), stmt.start, stmt.start + 6);
   const arg = stmt.argument;
   if (!arg) {
-    emitChunkMapped(g2, source, stmt.start + 6, stmt.end);
+    emitChunkMapped(g4, source, stmt.start + 6, stmt.end);
     return;
   }
-  emitChunkMapped(g2, source, stmt.start + 6, arg.start);
-  if (arg.type === "JSXElement") emitJSXElement(g2, source, arg, opts);
-  else if (arg.type === "JSXFragment") emitJSXFragment(g2, source, arg, opts);
-  else emitChunkMapped(g2, source, arg.start, arg.end);
-  emitChunkMapped(g2, source, arg.end, stmt.end);
+  emitChunkMapped(g4, source, stmt.start + 6, arg.start);
+  if (arg.type === "JSXElement") emitJSXElement(g4, source, arg, opts);
+  else if (arg.type === "JSXFragment") emitJSXFragment(g4, source, arg, opts);
+  else emitChunkMapped(g4, source, arg.start, arg.end);
+  emitChunkMapped(g4, source, arg.end, stmt.end);
 }
 function collectHoistEligible(children, set2, list) {
   for (const child of children ?? []) {
@@ -38627,7 +38628,7 @@ function collectHoistEligible(children, set2, list) {
     }
   }
 }
-function emitBodyCore(g2, source, stmts, opts) {
+function emitBodyCore(g4, source, stmts, opts) {
   const hoistSet = /* @__PURE__ */ new Set();
   const byRoot = /* @__PURE__ */ new Map();
   const collectRoot = (root3) => {
@@ -38678,107 +38679,107 @@ function emitBodyCore(g2, source, stmts, opts) {
         byRoot.delete(u.node);
         const n = list.length;
         for (let k = 0; k < n; k++) {
-          const before2 = g2.code.length;
-          emitStatement(g2, source, list[k], "", false, opts, ctx2);
-          if (g2.code.length > before2) g2.addRaw("\n");
+          const before2 = g4.code.length;
+          emitStatement(g4, source, list[k], "", false, opts, ctx2);
+          if (g4.code.length > before2) g4.addRaw("\n");
         }
       }
     }
     if (u.empty !== void 0) {
-      emitForOf(g2, source, u.node, "", opts);
+      emitForOf(g4, source, u.node, "", opts);
       const inner = u.empty.body ?? [];
       if (inner.length > 0) {
-        g2.addRaw("\n");
-        g2.add("");
-        g2.add(
+        g4.addRaw("\n");
+        g4.add("");
+        g4.add(
           source.slice(u.node.right.start, u.node.right.end),
           u.node.right.start,
           u.node.right.end
         );
-        g2.addRaw(".length === 0 && (() => {");
-        g2.addRaw("\n");
-        emitBody(g2, source, inner, "  ", opts);
-        g2.addRaw("\n");
-        g2.add("");
-        g2.addRaw("})();");
+        g4.addRaw(".length === 0 && (() => {");
+        g4.addRaw("\n");
+        emitBody(g4, source, inner, "  ", opts);
+        g4.addRaw("\n");
+        g4.add("");
+        g4.addRaw("})();");
       }
       return;
     }
-    const before = g2.code.length;
-    emitStatement(g2, source, u.node, "", isLast, opts, ctx2);
-    if (g2.code.length > before && !isLast) g2.addRaw("\n");
+    const before = g4.code.length;
+    emitStatement(g4, source, u.node, "", isLast, opts, ctx2);
+    if (g4.code.length > before && !isLast) g4.addRaw("\n");
   };
   for (let i = 0; i < units.length; i++) {
     emitUnit(units[i], i === units.length - 1);
   }
 }
-function emitExpressionBody(g2, source, coreStart, coreEnd, stmts, opts) {
+function emitExpressionBody(g4, source, coreStart, coreEnd, stmts, opts) {
   let pos = coreStart;
   for (const stmt of stmts) {
     if (!stmt) continue;
-    emitChunkMapped(g2, source, pos, stmt.start);
+    emitChunkMapped(g4, source, pos, stmt.start);
     pos = stmt.start;
     if (isTrackDeclStatement(stmt)) {
-      emitTrackDeclStatement(g2, source, stmt, "", true, opts);
+      emitTrackDeclStatement(g4, source, stmt, "", true, opts);
     } else if (stmt.type === "ReturnStatement") {
-      emitReturn(g2, source, stmt, opts);
+      emitReturn(g4, source, stmt, opts);
     } else {
-      emitChunkMapped(g2, source, stmt.start, stmt.end);
+      emitChunkMapped(g4, source, stmt.start, stmt.end);
     }
     pos = stmt.end;
   }
-  emitChunkMapped(g2, source, pos, coreEnd);
+  emitChunkMapped(g4, source, pos, coreEnd);
 }
-function emitRestMapped(g2, text, base, end) {
+function emitRestMapped(g4, text, base, end) {
   let i = 0;
   while (i < text.length && !isIdentStart(text[i])) i++;
   if (i >= text.length) {
-    g2.add(text, base, end);
+    g4.add(text, base, end);
     return;
   }
   let j = i + 1;
   while (j < text.length && isIdentChar(text[j])) j++;
-  g2.add(text.slice(0, i), base, base + i);
-  g2.add(text.slice(i, j), base + i, base + j);
-  g2.add(text.slice(j), base + j, end);
+  g4.add(text.slice(0, i), base, base + i);
+  g4.add(text.slice(i, j), base + i, base + j);
+  g4.add(text.slice(j), base + j, end);
 }
-function emitComponentHeader(g2, source, start, bodyStart) {
+function emitComponentHeader(g4, source, start, bodyStart) {
   const h = source.slice(start, bodyStart);
   const k = findFirstKeyword(h, "component");
   if (k === -1) {
     const { text, end: end2 } = stripTrailingClientRange(h);
     if (!text.includes("(")) {
       const trimmed = text.trimEnd();
-      g2.add(trimmed, start, start + end2 - (text.length - trimmed.length));
-      g2.addRaw("() ");
+      g4.add(trimmed, start, start + end2 - (text.length - trimmed.length));
+      g4.addRaw("() ");
     } else {
-      g2.add(text, start, start + end2);
+      g4.add(text, start, start + end2);
     }
     return;
   }
-  g2.add(h.slice(0, k), start, start + k);
-  g2.add("function", start + k, start + k + "component".length);
+  g4.add(h.slice(0, k), start, start + k);
+  g4.add("function", start + k, start + k + "component".length);
   const restBase = start + k + "component".length;
   const { text: rest, end } = stripTrailingClientRange(h.slice(k + "component".length));
   const transformed = h.slice(0, k) + "function" + rest;
   if (!transformed.includes("(")) {
     const trimmed = rest.trimEnd();
-    emitRestMapped(g2, trimmed, restBase, restBase + end - (rest.length - trimmed.length));
-    g2.addRaw("() ");
+    emitRestMapped(g4, trimmed, restBase, restBase + end - (rest.length - trimmed.length));
+    g4.addRaw("() ");
   } else {
-    emitRestMapped(g2, rest, restBase, restBase + end);
+    emitRestMapped(g4, rest, restBase, restBase + end);
   }
 }
-function emitComponent(g2, source, node, start, opts) {
+function emitComponent(g4, source, node, start, opts) {
   const body = node.body;
   if (!body || body.start == null || body.end == null) return;
-  emitComponentHeader(g2, source, start, body.start);
+  emitComponentHeader(g4, source, start, body.start);
   const statementMode = isStatementMode2(node);
   const stmts = body.body ?? [];
   if (statementMode) {
-    g2.addRaw("{ ");
-    emitBodyCore(g2, source, stmts, opts);
-    g2.addRaw(" }");
+    g4.addRaw("{ ");
+    emitBodyCore(g4, source, stmts, opts);
+    g4.addRaw(" }");
   } else {
     const raw2 = source.slice(body.start, body.end);
     const rawLen = raw2.length;
@@ -38798,9 +38799,9 @@ function emitComponent(g2, source, node, start, opts) {
     }
     while (coreStart < coreEnd && isWhitespaceChar(source[coreStart])) coreStart++;
     while (coreEnd > coreStart && isWhitespaceChar(source[coreEnd - 1])) coreEnd--;
-    if (hasBraces) g2.addRaw("{ ");
-    emitExpressionBody(g2, source, coreStart, coreEnd, stmts, opts);
-    if (hasBraces) g2.addRaw(" }");
+    if (hasBraces) g4.addRaw("{ ");
+    emitExpressionBody(g4, source, coreStart, coreEnd, stmts, opts);
+    if (hasBraces) g4.addRaw(" }");
   }
 }
 function isModuleAst(ast) {
@@ -38830,26 +38831,26 @@ function compileVskCodegen(source, opts = {}) {
     };
   }
   const clean = blankForClauses(source, ast);
-  const g2 = new VskGen();
+  const g4 = new VskGen();
   const components = getComponents(ast).sort((a, b) => a.start - b.start);
   let pos = 0;
   for (const { node, start } of components) {
     const body = node.body;
     if (!body || body.start == null || body.end == null) continue;
-    g2.add(clean.slice(pos, start), pos, start);
-    emitComponent(g2, clean, node, start, opts);
+    g4.add(clean.slice(pos, start), pos, start);
+    emitComponent(g4, clean, node, start, opts);
     pos = body.end;
   }
-  g2.add(clean.slice(pos), pos, source.length);
-  let code = g2.code;
+  g4.add(clean.slice(pos), pos, source.length);
+  let code = g4.code;
   if (isModuleAst(ast) && containsIdentifier(code, "Head") && !isIdentifierImported(code, "Head")) {
-    g2.prepend("declare const Head: (props: { children?: Component }) => Component;\n");
-    code = g2.code;
+    g4.prepend("declare const Head: (props: { children?: Component }) => Component;\n");
+    code = g4.code;
   }
   if (!isModuleAst(ast)) {
     code += "\nexport {};\n";
   }
-  return { code, mappings: g2.mappings, styleRegions: g2.styleRegions, errors: [] };
+  return { code, mappings: g4.mappings, styleRegions: g4.styleRegions, errors: [] };
 }
 function isTypeDecl(stmt) {
   return stmt.type === "TSInterfaceDeclaration" || stmt.type === "TSTypeAliasDeclaration" || stmt.type === "ExportNamedDeclaration" && (stmt.declaration?.type === "TSInterfaceDeclaration" || stmt.declaration?.type === "TSTypeAliasDeclaration");
@@ -40462,7 +40463,7 @@ async function bundleRuntime(appDir, outDir) {
   const runtimeRoot = findRuntimeSrc(appDir);
   const entryFile = resolve3(outDir, "server", `.runtime-entry-${buildId++}.mjs`);
   const entryContent = [
-    `import { renderPage, renderFullPage, renderPageStream, compileFile, setRuntimeModule, setVskHydrate, hydratePrecompile, assertSameOrigin } from ${JSON.stringify(resolve3(compilerRoot, "server-codegen.js"))};`,
+    `import { renderPage, renderFullPage, renderPageStream, compileFile, setRuntimeModule, setVskHydrate, hydratePrecompile, assertSameOrigin, withSsrStore } from ${JSON.stringify(resolve3(compilerRoot, "server-codegen.js"))};`,
     `import { parseCookies } from ${JSON.stringify(resolve3(compilerRoot, "server-cookies.js"))};`,
     `import * as __veskRuntime from ${JSON.stringify(resolve3(runtimeRoot, "index-server.js"))};`,
     "",
@@ -40501,7 +40502,7 @@ async function bundleRuntime(appDir, outDir) {
     "}",
     "",
     "export { renderPage, renderFullPage, renderPageStream, compileFile, setVskHydrate, hydratePrecompile, parseCookies, assertSameOrigin };",
-    'export { withSsrStore } from "@vesk/compiler/src/ssr-store";',
+    "export { withSsrStore };",
     "",
     "// Deliver hydration data as an origin-served script so strict CSP (no unsafe-inline)",
     "// does not block it. The prod server serves /ssr-data.js from the global store.",
@@ -40513,7 +40514,11 @@ async function bundleRuntime(appDir, outDir) {
     "  let tk = '';",
     "  for (const b of bytes) tk += b.toString(16).padStart(2, '0');",
     "  const token = tk;",
-    "  const store = (globalThis.__vsk_ssr_data_store ||= {});",
+    "  // Named __vsk_ssr_payload_store, NOT __vsk_ssr_data_*: the compiler keys",
+    "  // per-request slots `__vsk_ssr_data_<token>` and pruneSsrDataSlots()",
+    "  // reaps that prefix. Sharing it let the reaper wipe every pending",
+    "  // /ssr-data.js payload, so a served page's hydration script 404'd.",
+    "  const store = (globalThis.__vsk_ssr_payload_store ||= {});",
     "  store[token] = payload;",
     "  // Bound the store: if the browser never fetches /ssr-data.js the entry",
     "  // would otherwise linger forever. Evict the oldest entry past 100.",
@@ -40737,6 +40742,7 @@ function precompileFileInternal(source, sourcePath2, seenImportFiles) {
 
 // ../compiler/src/server-codegen.ts
 init_server_render();
+init_ssr_store();
 
 // ../adapter/src/css.ts
 import { readFileSync as readFileSync6, existsSync as existsSync7 } from "node:fs";
@@ -42019,11 +42025,11 @@ var ChunkImports = class {
     const lines = [];
     const sources = [...this.bySource.keys()].sort();
     for (const src2 of sources) {
-      const g2 = this.bySource.get(src2);
+      const g4 = this.bySource.get(src2);
       const parts = [];
-      if (g2.default) parts.push(`import ${g2.default.local} from ${JSON.stringify(src2)}`);
-      if (g2.namespace) parts.push(`import * as ${g2.namespace.local} from ${JSON.stringify(src2)}`);
-      const named = [...g2.named.values()].sort((a, b) => a.imported < b.imported ? -1 : 1);
+      if (g4.default) parts.push(`import ${g4.default.local} from ${JSON.stringify(src2)}`);
+      if (g4.namespace) parts.push(`import * as ${g4.namespace.local} from ${JSON.stringify(src2)}`);
+      const named = [...g4.named.values()].sort((a, b) => a.imported < b.imported ? -1 : 1);
       if (named.length > 0) {
         const specs = named.map((sp) => sp.imported === sp.local ? sp.local : `${sp.imported} as ${sp.local}`).join(", ");
         parts.push(`import { ${specs} } from ${JSON.stringify(src2)}`);
@@ -43070,7 +43076,7 @@ async function startProdServer(outDir, options) {
     }
     if (url.pathname === "/ssr-data.js") {
       const token = url.searchParams.get("t") || "";
-      const store = globalThis.__vsk_ssr_data_store;
+      const store = globalThis.__vsk_ssr_payload_store;
       const payload = store?.[token];
       if (payload) delete store[token];
       const lines = [];
@@ -43885,13 +43891,23 @@ init_server_utils();
 init_server_head();
 init_server_jsgen();
 init_server_render();
+init_ssr_store();
 
 // ../compiler/dist/ssr-store.js
 init_index_server();
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
 var TOKEN_KEY2 = "__vsk_ssr_token";
-var storage2 = new AsyncLocalStorage2();
-var liveSlots2 = /* @__PURE__ */ new Map();
+var IMPL_KEY2 = "__vsk_ssr_store_impl";
+var g3 = globalThis;
+var impl2 = g3[IMPL_KEY2] ?? (g3[IMPL_KEY2] = {
+  storage: new AsyncLocalStorage2(),
+  liveSlots: /* @__PURE__ */ new Map(),
+  // Only the copy that created the implementation installs the token
+  // accessor; a later copy must not redefine it over the shared storage.
+  ownsAccessor: true
+});
+var storage2 = impl2.storage;
+var liveSlots2 = impl2.liveSlots;
 function newSsrToken2() {
   return Math.random().toString(36).slice(2);
 }
@@ -43929,7 +43945,7 @@ function withSsrStore2(fn) {
 function withSsrStoreOf2(store, fn) {
   return storage2.run(store, fn);
 }
-function resetSsrToken() {
+function resetSsrToken2() {
   const store = storage2.getStore();
   const token = newSsrToken2();
   if (store) {
@@ -43976,17 +43992,19 @@ var ssrSink3 = {
   }
 };
 setSsrSink(ssrSink3);
-Object.defineProperty(globalThis, TOKEN_KEY2, {
-  configurable: true,
-  get() {
-    return storage2.getStore()?.token;
-  },
-  set(value) {
-    const store = storage2.getStore();
-    if (store)
-      store.token = value;
-  }
-});
+if (impl2.ownsAccessor) {
+  Object.defineProperty(globalThis, TOKEN_KEY2, {
+    configurable: true,
+    get() {
+      return storage2.getStore()?.token;
+    },
+    set(value) {
+      const store = storage2.getStore();
+      if (store)
+        store.token = value;
+    }
+  });
+}
 
 // ../compiler/dist/client-codegen.js
 init_ir();
@@ -47793,13 +47811,13 @@ var ChunkImports2 = class {
     const lines = [];
     const sources = [...this.bySource.keys()].sort();
     for (const src2 of sources) {
-      const g2 = this.bySource.get(src2);
+      const g4 = this.bySource.get(src2);
       const parts = [];
-      if (g2.default)
-        parts.push(`import ${g2.default.local} from ${JSON.stringify(src2)}`);
-      if (g2.namespace)
-        parts.push(`import * as ${g2.namespace.local} from ${JSON.stringify(src2)}`);
-      const named = [...g2.named.values()].sort((a, b) => a.imported < b.imported ? -1 : 1);
+      if (g4.default)
+        parts.push(`import ${g4.default.local} from ${JSON.stringify(src2)}`);
+      if (g4.namespace)
+        parts.push(`import * as ${g4.namespace.local} from ${JSON.stringify(src2)}`);
+      const named = [...g4.named.values()].sort((a, b) => a.imported < b.imported ? -1 : 1);
       if (named.length > 0) {
         const specs = named.map((sp) => sp.imported === sp.local ? sp.local : `${sp.imported} as ${sp.local}`).join(", ");
         parts.push(`import { ${specs} } from ${JSON.stringify(src2)}`);
@@ -54243,10 +54261,10 @@ function parseCookies3(str3) {
 // ../runtime/dist/action.js
 var registryKey2 = "__vesk_actions";
 function getActionRegistry2() {
-  const g2 = globalThis;
-  if (!g2[registryKey2])
-    g2[registryKey2] = {};
-  return g2[registryKey2];
+  const g4 = globalThis;
+  if (!g4[registryKey2])
+    g4[registryKey2] = {};
+  return g4[registryKey2];
 }
 function getAction2(id) {
   return getActionRegistry2()[id] || null;
@@ -54902,9 +54920,9 @@ function storeDataScript(payload) {
   return "/_vesk/ssr-data.js?t=" + token;
 }
 function currentSsrData() {
-  const g2 = globalThis;
-  const token = g2.__vsk_ssr_token;
-  const slot = (token ? g2[`__vsk_ssr_data_${token}`] : void 0) || {};
+  const g4 = globalThis;
+  const token = g4.__vsk_ssr_token;
+  const slot = (token ? g4[`__vsk_ssr_data_${token}`] : void 0) || {};
   return { ...ssrSink3.snapshot() || {}, ...slot };
 }
 function countPages(nodes) {
@@ -54997,9 +55015,9 @@ async function startDevServer(port, projectDir, config, host) {
     }
   }
   function eventsStore() {
-    const g2 = globalThis;
-    if (!g2.__vesk_server_ctx) g2.__vesk_server_ctx = {};
-    return g2.__vesk_server_ctx;
+    const g4 = globalThis;
+    if (!g4.__vesk_server_ctx) g4.__vesk_server_ctx = {};
+    return g4.__vesk_server_ctx;
   }
   function makeEventCtx(overrides) {
     const store = eventsStore();
@@ -55860,7 +55878,7 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
       let freshToken;
       try {
         return await withSsrStore2(async () => {
-          freshToken = resetSsrToken();
+          freshToken = resetSsrToken2();
           const chain = cleanChain;
           let body = "";
           let head = "";