@vesk/vesk-cli 0.2.41 → 0.2.43

package/dist/cli.js

@@ -184,6 +184,24 @@ var init_errors = __esm({
           tip: isBuiltin ? `"${name}" is a Vesk built-in. Use it directly \u2014 no manual import needed.` : ""
         });
       }
+      static vskNamespaceTag(context = {}) {
+        return new _VeskError(
+          "Namespace imports are not supported for `.vsk` modules.",
+          {
+            ...context,
+            code: context.code || "V0410",
+            suggestions: [
+              "Import the component by name: import { MyIcon } from './icons.vsk'",
+              "Rename on import: import { MyIcon as Icon } from './icons.vsk'"
+            ],
+            nextSteps: [
+              "A `.vsk` component is a registry entry keyed by its name, not a module namespace object, so `<ns.Icon />` cannot be resolved.",
+              "If you need a namespace object, import from a `.ts`/`.js` module instead \u2014 those are real ES modules."
+            ],
+            tip: "A `.vsk` module exposes its components as named exports; use a named or renamed import rather than `import * as ns`."
+          }
+        );
+      }
       static classDecl(context = {}) {
         return new _VeskError(
           "class declarations are not supported inside Vesk components.",
@@ -367,13 +385,30 @@ var init_ir = __esm({
       staticProps;
       loadFn;
       topLevelCode;
-      constructor(components, imports = [], importedNames = /* @__PURE__ */ new Set(), staticProps = null, loadFn = null, topLevelCode = []) {
+      /**
+       * Same-file specifier exports (`export { A }`, `export { A as B }`) as
+       * `{ local, exported }` pairs. These are NOT emitted as JS: components live
+       * in the component registry rather than as top-level bindings, so a raw
+       * `export { A }` would reference an undefined identifier. The pairs become
+       * registry alias entries so the exported name is importable.
+       */
+      exportAliases;
+      /**
+       * Module specifiers re-exported from this file (`export * from './x.vsk'`,
+       * `export { A } from './x.vsk'`, `export * as ns from './x.vsk'`). The
+       * statements themselves are dropped — the target file is compiled and
+       * merged into this one's component registry instead.
+       */
+      reexportSources;
+      constructor(components, imports = [], importedNames = /* @__PURE__ */ new Set(), staticProps = null, loadFn = null, topLevelCode = [], exportAliases = [], reexportSources = []) {
         this.components = components;
         this.imports = imports;
         this.importedNames = importedNames;
         this.staticProps = staticProps;
         this.loadFn = loadFn;
         this.topLevelCode = topLevelCode;
+        this.exportAliases = exportAliases;
+        this.reexportSources = reexportSources;
       }
     };
     ComponentIR = class {
@@ -2283,6 +2318,16 @@ function runInHydrateBlock(fn) {
     throw error;
   }
 }
+function recordClaim(root3, record) {
+  claimRegistry.set(record.el, record);
+  if (!root3) return;
+  const records = walkerClaimRecords.get(root3);
+  if (records) records.push(record);
+  else walkerClaimRecords.set(root3, [record]);
+}
+function isAdopted(el) {
+  return claimRegistry.get(el)?.state === "adopted";
+}
 function reportHydrationIssue(issue) {
   if (!__mismatchHandler) return;
   try {
@@ -2304,13 +2349,15 @@ function reportMiss(kind, detail, loud) {
   }
   if (loud) devWarn(`${kind}: ${detail}`);
 }
-function stampClaimed(el) {
-  if (__hydrateDevMode) {
-    try {
-      el.setAttribute(CLAIMED_ATTR, "");
-    } catch {
-    }
-  }
+function recordAdopted(root3, el, expectedTag) {
+  recordClaim(root3, {
+    state: "adopted",
+    el,
+    owner: root3,
+    expectedTag,
+    actualTag: el.tagName.toLowerCase(),
+    detached: false
+  });
 }
 function stripDirectTextNodes(el) {
   let text = "";
@@ -2361,8 +2408,8 @@ function scanTwins(container) {
     let a = false;
     let b = false;
     try {
-      a = el.hasAttribute(CLAIMED_ATTR);
-      b = prev.hasAttribute(CLAIMED_ATTR);
+      a = isAdopted(el);
+      b = isAdopted(prev);
     } catch {
       continue;
     }
@@ -2405,6 +2452,30 @@ function auditHydration(container) {
     }
     if (!sample && container.outerHTML) sample = String(container.outerHTML).slice(0, 800);
   }
+  const structuralRecords = [];
+  const seenRecords = /* @__PURE__ */ new Set();
+  const collectWalkerRecords = (el) => {
+    const records = walkerClaimRecords.get(el);
+    if (records) {
+      for (const record of records) {
+        if (!seenRecords.has(record)) {
+          seenRecords.add(record);
+          structuralRecords.push(record);
+        }
+      }
+    }
+    for (let i = 0; i < el.children.length; i++) collectWalkerRecords(el.children[i]);
+  };
+  collectWalkerRecords(container);
+  const structuralGhosts = structuralRecords.filter((record) => record.state === "ghost");
+  if (structuralGhosts.length > 0) {
+    unclaimed += structuralGhosts.length;
+    if (orphanNames.length < 5) {
+      orphanNames.push(
+        `${structuralGhosts.length} structural hydration ghost(s) (${structuralGhosts.slice(0, 3).map((record) => `<${record.actualTag}> expected <${record.expectedTag}>`).join(", ")})`
+      );
+    }
+  }
   const twinRes = scanTwins(container);
   const issues = [];
   if (unclaimed > 0) {
@@ -2432,6 +2503,14 @@ function auditHydration(container) {
       } catch {
       }
     }
+    for (const record of structuralGhosts) {
+      try {
+        if (record.detached || !record.owner || record.el.parentNode !== record.owner) continue;
+        record.el.remove();
+        record.detached = true;
+      } catch {
+      }
+    }
   }
   if (__mismatchHandler) {
     for (const issue of issues) {
@@ -2462,7 +2541,7 @@ ${report.sample}`
 }
 function underClaimedAncestor(el, container) {
   for (let n = el; n && n !== container; n = n.parentElement) {
-    if (n.nodeType === 1 && n.hasAttribute(CLAIMED_ATTR)) return true;
+    if (n.nodeType === 1 && isAdopted(n)) return true;
   }
   return false;
 }
@@ -2523,7 +2602,7 @@ function checkMarkerIdentity(marker, el) {
     }
   }
 }
-function adoptElement(marker, tag) {
+function adoptElement(root3, marker, tag) {
   const el = marker.nextElementSibling;
   if (!el) {
     marker.remove();
@@ -2534,10 +2613,10 @@ function adoptElement(marker, tag) {
   marker.remove();
   stripDirectTextNodes(el);
   captureSsrElementChildren(el);
-  stampClaimed(el);
+  recordAdopted(root3, el, tag || el.tagName.toLowerCase());
   return el;
 }
-function adoptElementRaw(marker, tag) {
+function adoptElementRaw(root3, marker, tag) {
   const el = marker.nextElementSibling;
   if (!el) {
     marker.remove();
@@ -2547,7 +2626,7 @@ function adoptElementRaw(marker, tag) {
   checkMarkerIdentity(marker, el);
   marker.remove();
   captureSsrElementChildren(el);
-  stampClaimed(el);
+  recordAdopted(root3, el, tag || el.tagName.toLowerCase());
   return el;
 }
 function createHydrateWalker(container, markerList) {
@@ -2752,14 +2831,15 @@ function hydrateOnInteraction(container, componentFn, props, options = {}) {
     }
   };
 }
-var __hydrateDevMode, CLAIMED_ATTR, __hydrateStrict, __mismatchHandler, _SHOW_COMMENT, _FILTER_ACCEPT, _FILTER_SKIP, WalkerEngine, StructuralWalker;
+var __hydrateDevMode, claimRegistry, walkerClaimRecords, __hydrateStrict, __mismatchHandler, _SHOW_COMMENT, _FILTER_ACCEPT, _FILTER_SKIP, WalkerEngine, StructuralWalker;
 var init_hydrate = __esm({
   "../runtime/src/hydrate.ts"() {
     "use strict";
     init_ripple_runtime();
     init_ripple_blocks();
     __hydrateDevMode = true;
-    CLAIMED_ATTR = "data-vsk-claimed";
+    claimRegistry = /* @__PURE__ */ new WeakMap();
+    walkerClaimRecords = /* @__PURE__ */ new WeakMap();
     __hydrateStrict = false;
     __mismatchHandler = null;
     _SHOW_COMMENT = 128;
@@ -2844,7 +2924,7 @@ var init_hydrate = __esm({
             break;
           }
           this.idx++;
-          const adopted = adoptElement(tm.comment, tag);
+          const adopted = adoptElement(this.root, tm.comment, tag);
           if (adopted === null) {
             tm.state = "claimed";
             break;
@@ -2896,7 +2976,7 @@ ${String(this.root.outerHTML).slice(0, 800)}` : ""),
             break;
           }
           this.idx++;
-          const adopted = adoptElementRaw(tm.comment, tag);
+          const adopted = adoptElementRaw(this.root, tm.comment, tag);
           if (adopted === null) {
             tm.state = "claimed";
             break;
@@ -2986,7 +3066,7 @@ ${String(this.root.outerHTML).slice(0, 800)}` : ""),
         tm.comment.remove();
         stripDirectTextNodes(el);
         captureSsrElementChildren(el);
-        stampClaimed(el);
+        recordAdopted(this.root, el, el.tagName.toLowerCase());
         return { el };
       }
       claimByKey(key, options) {
@@ -3160,12 +3240,37 @@ ${String(this.root.outerHTML).slice(0, 800)}` : ""),
           const el = this.els[target];
           if (tag && el.tagName.toLowerCase() !== tag) {
             this.idx = this.advancePastSkippable(target + 1);
+            const ghost = {
+              state: "ghost",
+              el,
+              owner: this.root,
+              expectedTag: tag || "div",
+              actualTag: el.tagName.toLowerCase(),
+              detached: false
+            };
+            recordClaim(this.root, ghost);
+            if (this.root && el.parentNode === this.root) {
+              try {
+                el.remove();
+                ghost.detached = true;
+              } catch {
+              }
+            }
+            const fresh2 = document.createElement(tag || "div");
+            recordClaim(this.root, {
+              state: "fresh",
+              el: fresh2,
+              owner: this.root,
+              expectedTag: tag || "div",
+              actualTag: fresh2.tagName.toLowerCase(),
+              detached: false
+            });
             reportMiss(
               "tag-mismatch",
-              `descriptor wanted <${tag}> but the SSR slot holds <${el.tagName.toLowerCase()}>; consuming one slot and rendering fresh.`,
+              `descriptor wanted <${tag}> but the SSR slot holds <${el.tagName.toLowerCase()}>; consumed one slot, detached the local ghost, and rendered fresh.`,
               false
             );
-            return document.createElement(tag || "div");
+            return fresh2;
           }
           if (this.adopted.has(el)) {
             target = this.advancePastSkippable(target + 1);
@@ -3175,10 +3280,19 @@ ${String(this.root.outerHTML).slice(0, 800)}` : ""),
           this.adopted.add(el);
           if (!raw2) stripDirectTextNodes(el);
           captureSsrElementChildren(el);
-          stampClaimed(el);
+          recordAdopted(this.root, el, tag || el.tagName.toLowerCase());
           return el;
         }
         this.idx = this.els.length;
+        const fresh = document.createElement(tag || "div");
+        recordClaim(this.root, {
+          state: "fresh",
+          el: fresh,
+          owner: this.root,
+          expectedTag: tag || "div",
+          actualTag: fresh.tagName.toLowerCase(),
+          detached: false
+        });
         reportMiss(
           "exhausted",
           `hydration claim missed <${tag || "element"}>; the client rendered more or different content than SSR.`,
@@ -3187,7 +3301,7 @@ ${String(this.root.outerHTML).slice(0, 800)}` : ""),
           // nodes) — telemetry-only, mirroring the marker engine.
           false
         );
-        return document.createElement(tag || "div");
+        return fresh;
       }
       nextElement(tag, skipK = 0) {
         return this.claimAt(tag, skipK, false);
@@ -3236,7 +3350,7 @@ ${String(this.root.outerHTML).slice(0, 800)}` : ""),
           this.adopted.add(el);
           stripDirectTextNodes(el);
           captureSsrElementChildren(el);
-          stampClaimed(el);
+          recordAdopted(this.root, el, el.tagName.toLowerCase());
           return { el };
         }
         this.idx = this.els.length;
@@ -3361,10 +3475,10 @@ function flattenLayoutChain(tree, pathParts, result = []) {
     if (matched) {
       const consumeCount = node.isCatchAll ? pathParts.length : segCount;
       const remaining = pathParts.slice(consumeCount);
-      const isLeaf = remaining.length === 0 || remaining.every((p) => p === "");
+      const isLeaf2 = remaining.length === 0 || remaining.every((p) => p === "");
       if (node.standalone) result.length = 0;
       result.push(node);
-      if (isLeaf) {
+      if (isLeaf2) {
         break;
       } else if ((node.children || []).length > 0) {
         flattenLayoutChain(node.children || [], remaining, result);
@@ -16774,9 +16888,9 @@ function looksLikeTypeAssertionAt(input, pos) {
   while (i < input.length && isIdentCharCode(input.charCodeAt(i))) i++;
   const name = input.slice(nameStart, i);
   if (HTML_TAGS.has(name) || VOID_ELEMENTS.has(name)) return false;
-  const isPrimitive = TS_PRIMITIVE_TYPES.has(name);
+  const isPrimitive2 = TS_PRIMITIVE_TYPES.has(name);
   const isCapitalized = name[0] >= "A" && name[0] <= "Z";
-  if (!isPrimitive && !isCapitalized) return false;
+  if (!isPrimitive2 && !isCapitalized) return false;
   if (input.charCodeAt(i) === 60) {
     let depth = 0;
     let j = i;
@@ -16825,6 +16939,15 @@ function matchKeywordSequence(input, words) {
   const c = input.charCodeAt(p);
   return isWsChar(c) || c === 123;
 }
+function withStandaloneTokens(fn) {
+  const prev = standaloneTokens;
+  standaloneTokens = true;
+  try {
+    return fn();
+  } finally {
+    standaloneTokens = prev;
+  }
+}
 function VeskParserPlugin(config = {}) {
   return (Parser3) => {
     const tt = Parser3.tokTypes || types$1;
@@ -16840,6 +16963,10 @@ function VeskParserPlugin(config = {}) {
       constructor(options, input) {
         super(options, input);
       }
+      /** True when JSX tags are recognised without parser-driven componentDepth. */
+      #jsxAllowed() {
+        return this.#componentDepth > 0 || standaloneTokens;
+      }
       #isBlockContext() {
         const ctx2 = this.curContext();
         return ctx2 && (ctx2.token === "{" || ctx2.token === "function");
@@ -17069,7 +17196,7 @@ function VeskParserPlugin(config = {}) {
           }
           return super.readToken(this.input.codePointAt(this.pos));
         }
-        if (this.#componentDepth > 0 && code === 60 && this.#isBlockContext()) {
+        if (this.#jsxAllowed() && code === 60 && this.#isBlockContext()) {
           const next = this.input.charCodeAt(this.pos + 1);
           const startsNewStatement = this.hasPrecedingLineBreak();
           const inType = this.inType;
@@ -17520,7 +17647,7 @@ function VeskParserPlugin(config = {}) {
     return VeskParser;
   };
 }
-var VOID_ELEMENTS, TS_PRIMITIVE_TYPES, HTML_TAGS;
+var VOID_ELEMENTS, TS_PRIMITIVE_TYPES, HTML_TAGS, standaloneTokens;
 var init_vesk_plugin = __esm({
   "../compiler/src/vesk-plugin.ts"() {
     "use strict";
@@ -17543,6 +17670,7 @@ var init_vesk_plugin = __esm({
     ]);
     TS_PRIMITIVE_TYPES = /* @__PURE__ */ new Set(["number", "string", "boolean", "any", "unknown", "never", "void", "object", "symbol", "bigint", "undefined", "null"]);
     HTML_TAGS = /* @__PURE__ */ new Set(["a", "abbr", "address", "area", "article", "aside", "audio", "b", "base", "bdi", "bdo", "blockquote", "body", "br", "button", "canvas", "caption", "cite", "code", "col", "colgroup", "data", "datalist", "dd", "del", "details", "dfn", "dialog", "div", "dl", "dt", "em", "embed", "fieldset", "figcaption", "figure", "footer", "form", "h1", "h2", "h3", "h4", "h5", "h6", "head", "header", "hgroup", "hr", "html", "i", "iframe", "img", "input", "ins", "kbd", "label", "legend", "li", "link", "main", "map", "mark", "menu", "meta", "meter", "nav", "noscript", "object", "ol", "optgroup", "option", "output", "p", "picture", "pre", "progress", "q", "rp", "rt", "ruby", "s", "samp", "script", "section", "select", "slot", "small", "source", "span", "strong", "style", "sub", "summary", "sup", "table", "tbody", "td", "template", "textarea", "tfoot", "th", "thead", "time", "title", "tr", "track", "u", "ul", "var", "video", "wbr"]);
+    standaloneTokens = false;
   }
 });
 
@@ -17914,6 +18042,340 @@ var init_scan = __esm({
   }
 });
 
+// ../compiler/src/tokens.ts
+function tokenizeCode(code) {
+  return withStandaloneTokens(() => {
+    try {
+      const ParserClass = createBaseParser();
+      const tok = ParserClass.tokenizer(code, {
+        ecmaVersion: "latest",
+        sourceType: "module"
+      });
+      const out = [];
+      let t;
+      while ((t = tok.getToken()) && t.type && t.type.label !== "eof") {
+        out.push({
+          label: t.type.label,
+          value: typeof t.value === "string" ? t.value : "",
+          start: t.start,
+          end: t.end
+        });
+      }
+      return out;
+    } catch {
+      return null;
+    }
+  });
+}
+function containsIdentifier(code, name) {
+  const tokens = tokenizeCode(code);
+  if (tokens !== null) {
+    for (const t of tokens) {
+      if ((t.label === "name" || t.label === "jsxName") && t.value === name) return true;
+    }
+    return false;
+  }
+  return manualContainsIdentifier(code, name);
+}
+function isIdentifierImported(code, name) {
+  const tokens = tokenizeCode(code);
+  if (tokens !== null) {
+    for (let i = 0; i < tokens.length; i++) {
+      if (tokens[i].label !== "import") continue;
+      let j = i + 1;
+      while (j < tokens.length && tokens[j].label !== ";" && !(tokens[j].label === "name" && tokens[j].value === "from")) {
+        j++;
+      }
+      for (let k = i + 1; k < j; k++) {
+        if ((tokens[k].label === "name" || tokens[k].label === "jsxName") && tokens[k].value === name) return true;
+      }
+      i = j;
+    }
+    return false;
+  }
+  return manualIsIdentifierImported(code, name);
+}
+function extractImportNames(importText) {
+  const tokens = tokenizeCode(importText);
+  if (tokens !== null) {
+    const names = [];
+    let i = 0;
+    while (i < tokens.length && tokens[i].label !== "import") i++;
+    if (i >= tokens.length) return names;
+    i++;
+    if (i < tokens.length && tokens[i].label === "name" && tokens[i].value === "type") i++;
+    if (i < tokens.length && tokens[i].label === "{") {
+      i++;
+      while (i < tokens.length && tokens[i].label !== "}") {
+        const t = tokens[i];
+        if (t.label === "name") {
+          if (t.value === "type" || t.value === "typeof") {
+            i++;
+            continue;
+          }
+          let name = t.value;
+          if (i + 2 < tokens.length && tokens[i + 1].label === "name" && tokens[i + 1].value === "as" && tokens[i + 2].label === "name") {
+            name = tokens[i + 2].value;
+            i += 2;
+          }
+          names.push(name);
+        }
+        i++;
+      }
+      return names;
+    }
+    if (i < tokens.length && tokens[i].label === "*") {
+      while (i < tokens.length && tokens[i].label !== "name") i++;
+      if (i < tokens.length) names.push(tokens[i].value);
+    } else if (i < tokens.length && tokens[i].label === "name") {
+      names.push(tokens[i].value);
+    }
+    return names;
+  }
+  return manualExtractImportNames(importText);
+}
+function importModuleTarget(importText) {
+  const tokens = tokenizeCode(importText);
+  if (tokens === null) return null;
+  for (let i = tokens.length - 1; i >= 0; i--) {
+    if (tokens[i].label === "string") return tokens[i].value;
+  }
+  return null;
+}
+function manualContainsIdentifier(code, name) {
+  let i = 0;
+  while (i < code.length) {
+    const c = code[i];
+    if (c === '"' || c === "'" || c === "`") {
+      i = skipString(code, i);
+      continue;
+    }
+    if (c === "/" && (code[i + 1] === "/" || code[i + 1] === "*")) {
+      i = skipComment(code, i);
+      continue;
+    }
+    if (isIdentStart(c) && code.slice(i, i + name.length) === name) {
+      const after = i + name.length;
+      if ((after >= code.length || !isIdentChar(code[after])) && (i === 0 || !isIdentChar(code[i - 1]))) return true;
+    }
+    i++;
+  }
+  return false;
+}
+function manualIsIdentifierImported(code, name) {
+  let i = 0;
+  while (i < code.length) {
+    const c = code[i];
+    if (c === '"' || c === "'" || c === "`") {
+      i = skipString(code, i);
+      continue;
+    }
+    if (c === "/" && (code[i + 1] === "/" || code[i + 1] === "*")) {
+      i = skipComment(code, i);
+      continue;
+    }
+    if (isIdentStart(c)) {
+      let j = i + 1;
+      while (j < code.length && isIdentChar(code[j])) j++;
+      const word = code.slice(i, j);
+      if (word === "import") {
+        let k = j;
+        while (k < code.length) {
+          if (code[k] === ";" || code[k] === "\n") break;
+          if (code[k] === '"' || code[k] === "'" || code[k] === "`") {
+            k = skipString(code, k);
+            continue;
+          }
+          if (isIdentStart(code[k]) && code.slice(k, k + name.length) === name) {
+            const a = k + name.length;
+            if ((a >= code.length || !isIdentChar(code[a])) && (k === 0 || !isIdentChar(code[k - 1]))) return true;
+          }
+          k++;
+        }
+      }
+      i = j;
+      continue;
+    }
+    i++;
+  }
+  return false;
+}
+function manualExtractImportNames(importText) {
+  const names = [];
+  const open = importText.indexOf("{");
+  if (open !== -1) {
+    const close = importText.indexOf("}", open + 1);
+    if (close !== -1) {
+      let i2 = open + 1;
+      while (i2 < close) {
+        const c = importText[i2];
+        if (c === '"' || c === "'" || c === "`") {
+          i2 = skipString(importText, i2);
+          continue;
+        }
+        if (isIdentStart(c)) {
+          let j = i2 + 1;
+          while (j < close && isIdentChar(importText[j])) j++;
+          let word = importText.slice(i2, j);
+          if (word === "type" || word === "typeof") {
+            i2 = j;
+            continue;
+          }
+          let k = skipWhitespace(importText, j);
+          if (importText.slice(k, k + 2) === "as" && !isIdentChar(importText[k + 2])) {
+            let m = skipWhitespace(importText, k + 2);
+            if (isIdentStart(importText[m])) {
+              let n = m + 1;
+              while (n < close && isIdentChar(importText[n])) n++;
+              word = importText.slice(m, n);
+            }
+          }
+          names.push(word);
+          i2 = j;
+          continue;
+        }
+        i2++;
+      }
+      return names;
+    }
+  }
+  let i = 0;
+  while (i < importText.length && !isIdentStart(importText[i])) i++;
+  while (i < importText.length && isIdentChar(importText[i])) i++;
+  i = skipWhitespace(importText, i);
+  if (importText[i] === "*") {
+    i = skipWhitespace(importText, i + 1);
+    if (importText.slice(i, i + 2) === "as") i = skipWhitespace(importText, i + 2);
+    if (isIdentStart(importText[i])) {
+      let j = i + 1;
+      while (j < importText.length && isIdentChar(importText[j])) j++;
+      names.push(importText.slice(i, j));
+    }
+  } else if (isIdentStart(importText[i])) {
+    let j = i + 1;
+    while (j < importText.length && isIdentChar(importText[j])) j++;
+    names.push(importText.slice(i, j));
+  }
+  return names;
+}
+function hasTopLevelValueDeclaration(code, name) {
+  const tokens = tokenizeCode(code);
+  if (tokens === null) return false;
+  const declWords = ["const", "let", "var", "function", "class"];
+  for (let i = 1; i < tokens.length; i++) {
+    if (tokens[i].label !== "name" || tokens[i].value !== name) continue;
+    const prev = tokens[i - 1];
+    if (!prev || !declWords.includes(prev.value)) continue;
+    if (i >= 2) {
+      const pp2 = tokens[i - 2];
+      if (pp2 && pp2.label === "name" && pp2.value === "export") continue;
+    }
+    return true;
+  }
+  return false;
+}
+function findSpecifierExports(code) {
+  const tokens = tokenizeCode(code);
+  if (tokens === null) return [];
+  const out = [];
+  for (let i = 0; i < tokens.length; i++) {
+    if (tokens[i].label !== "export") continue;
+    if (!tokens[i + 1] || tokens[i + 1].label !== "{") continue;
+    let k = i + 2;
+    let depth = 1;
+    for (; k < tokens.length; k++) {
+      const lbl = tokens[k].label;
+      if (lbl === "string") {
+        continue;
+      }
+      if (lbl === "{") depth++;
+      else if (lbl === "}") {
+        depth--;
+        if (depth === 0) break;
+      }
+    }
+    let isReexport = false;
+    for (let j = k + 1; j < tokens.length; j++) {
+      const lbl = tokens[j].label;
+      if (lbl === "string") {
+        isReexport = true;
+        break;
+      }
+      if (lbl === ";" || lbl === "export" || lbl === "import" || lbl === "}") break;
+    }
+    if (depth !== 0 || isReexport) continue;
+    const pairs = readSpecifierPairs(code, tokens[i + 1].end, tokens[k].end);
+    if (pairs === null) continue;
+    const stmtEnd = tokens[k].end;
+    for (const [local, exported] of pairs) out.push({ local, exported, start: tokens[i].start, end: stmtEnd });
+    i = k;
+  }
+  return out;
+}
+function readSpecifierPairs(code, from, to) {
+  const tokens = tokenizeCode(`(${code.slice(from, to)})`);
+  if (tokens === null || tokens.length < 2) return null;
+  const pairs = [];
+  let i = 1;
+  while (i < tokens.length) {
+    const local = tokens[i];
+    if (!local || local.label === ")" || local.label === ";") break;
+    if (local.label !== "name") return null;
+    const asTok = tokens[i + 1];
+    if (asTok && asTok.label === "name" && asTok.value === "as") {
+      const exported = tokens[i + 2];
+      if (!exported || exported.label !== "name") return null;
+      pairs.push([local.value, exported.value]);
+      i += 3;
+    } else {
+      pairs.push([local.value, local.value]);
+      i += 1;
+    }
+    const sep8 = tokens[i];
+    if (!sep8 || sep8.label !== ",") break;
+    i += 1;
+  }
+  return pairs.length > 0 ? pairs : null;
+}
+function collectTrackDeclMarkers(node, out) {
+  if (!node || typeof node !== "object") return;
+  if (Array.isArray(node)) {
+    for (const child of node) collectTrackDeclMarkers(child, out);
+    return;
+  }
+  if (node.type === "ArrayPattern" && node.lazy === true && typeof node.start === "number") {
+    out.add(node.start - 1);
+    return;
+  }
+  for (const key of Object.keys(node)) {
+    const value = node[key];
+    if (value && typeof value === "object") collectTrackDeclMarkers(value, out);
+  }
+}
+function stripTrackDeclMarkers(text, base, node) {
+  const offsets = /* @__PURE__ */ new Set();
+  collectTrackDeclMarkers(node, offsets);
+  if (offsets.size === 0) return text;
+  const sorted = [...offsets].sort((a, b) => a - b);
+  let out = "";
+  let prev = 0;
+  for (const offset2 of sorted) {
+    const i = offset2 - base;
+    if (i < prev || i >= text.length) continue;
+    out += text.slice(prev, i) + " ";
+    prev = i + 1;
+  }
+  return out + text.slice(prev);
+}
+var init_tokens = __esm({
+  "../compiler/src/tokens.ts"() {
+    "use strict";
+    init_parser();
+    init_vesk_plugin();
+    init_scan();
+  }
+});
+
 // ../compiler/src/parser.ts
 function isIdentChar2(code) {
   return code >= 97 && code <= 122 || code >= 65 && code <= 90 || code >= 48 && code <= 57 || code === 95 || code === 36;
@@ -18134,8 +18596,19 @@ function createBaseParser() {
 function parse4(source, options = {}) {
   const ParserClass = createBaseParser();
   const { code, annotations } = preprocessForClauses(blankComments(source));
+  const vskSource = !options.filename || String(options.filename).endsWith(".vsk");
+  const specifierExports = vskSource ? findSpecifierExports(code).filter((e) => !hasTopLevelValueDeclaration(code, e.local)) : [];
+  let parseable = code;
+  if (specifierExports.length > 0) {
+    const edits = specifierExports.map((e) => code.slice(e.start, e.end)).map((text) => text.split("").map((ch) => ch === "\n" ? "\n" : " ").join(""));
+    let cut = 0;
+    for (const spec of specifierExports) {
+      const blanked = edits[cut++];
+      parseable = parseable.slice(0, spec.start) + blanked + parseable.slice(spec.end);
+    }
+  }
   try {
-    const ast = ParserClass.parse(code, {
+    const ast = ParserClass.parse(parseable, {
       ecmaVersion: "latest",
       sourceType: "module",
       locations: true,
@@ -18145,6 +18618,11 @@ function parse4(source, options = {}) {
     if (annotations.length > 0) {
       ast.__vskAnnotations = annotations;
     }
+    if (specifierExports.length > 0) {
+      ast.__vskSpecifierExports = specifierExports.map(
+        (e) => ({ local: e.local, exported: e.exported })
+      );
+    }
     return ast;
   } catch (e) {
     const err = e;
@@ -18185,6 +18663,7 @@ var init_parser = __esm({
     init_vesk_plugin();
     init_scan();
     init_errors();
+    init_tokens();
   }
 });
 
@@ -18379,228 +18858,6 @@ var init_strip_ts = __esm({
   }
 });
 
-// ../compiler/src/tokens.ts
-function tokenizeCode(code) {
-  try {
-    const ParserClass = createBaseParser();
-    const tok = ParserClass.tokenizer(code, {
-      ecmaVersion: "latest",
-      sourceType: "module"
-    });
-    const out = [];
-    let t;
-    while ((t = tok.getToken()) && t.type && t.type.label !== "eof") {
-      out.push({
-        label: t.type.label,
-        value: typeof t.value === "string" ? t.value : "",
-        start: t.start,
-        end: t.end
-      });
-    }
-    return out;
-  } catch {
-    return null;
-  }
-}
-function containsIdentifier(code, name) {
-  const tokens = tokenizeCode(code);
-  if (tokens !== null) {
-    for (const t of tokens) {
-      if ((t.label === "name" || t.label === "jsxName") && t.value === name) return true;
-    }
-    return false;
-  }
-  return manualContainsIdentifier(code, name);
-}
-function isIdentifierImported(code, name) {
-  const tokens = tokenizeCode(code);
-  if (tokens !== null) {
-    for (let i = 0; i < tokens.length; i++) {
-      if (tokens[i].label !== "import") continue;
-      let j = i + 1;
-      while (j < tokens.length && tokens[j].label !== ";" && !(tokens[j].label === "name" && tokens[j].value === "from")) {
-        j++;
-      }
-      for (let k = i + 1; k < j; k++) {
-        if ((tokens[k].label === "name" || tokens[k].label === "jsxName") && tokens[k].value === name) return true;
-      }
-      i = j;
-    }
-    return false;
-  }
-  return manualIsIdentifierImported(code, name);
-}
-function extractImportNames(importText) {
-  const tokens = tokenizeCode(importText);
-  if (tokens !== null) {
-    const names = [];
-    let i = 0;
-    while (i < tokens.length && tokens[i].label !== "import") i++;
-    if (i >= tokens.length) return names;
-    i++;
-    if (i < tokens.length && tokens[i].label === "name" && tokens[i].value === "type") i++;
-    if (i < tokens.length && tokens[i].label === "{") {
-      i++;
-      while (i < tokens.length && tokens[i].label !== "}") {
-        const t = tokens[i];
-        if (t.label === "name") {
-          if (t.value === "type" || t.value === "typeof") {
-            i++;
-            continue;
-          }
-          let name = t.value;
-          if (i + 2 < tokens.length && tokens[i + 1].label === "name" && tokens[i + 1].value === "as" && tokens[i + 2].label === "name") {
-            name = tokens[i + 2].value;
-            i += 2;
-          }
-          names.push(name);
-        }
-        i++;
-      }
-      return names;
-    }
-    if (i < tokens.length && tokens[i].label === "*") {
-      while (i < tokens.length && tokens[i].label !== "name") i++;
-      if (i < tokens.length) names.push(tokens[i].value);
-    } else if (i < tokens.length && tokens[i].label === "name") {
-      names.push(tokens[i].value);
-    }
-    return names;
-  }
-  return manualExtractImportNames(importText);
-}
-function importModuleTarget(importText) {
-  const tokens = tokenizeCode(importText);
-  if (tokens === null) return null;
-  for (let i = tokens.length - 1; i >= 0; i--) {
-    if (tokens[i].label === "string") return tokens[i].value;
-  }
-  return null;
-}
-function manualContainsIdentifier(code, name) {
-  let i = 0;
-  while (i < code.length) {
-    const c = code[i];
-    if (c === '"' || c === "'" || c === "`") {
-      i = skipString(code, i);
-      continue;
-    }
-    if (c === "/" && (code[i + 1] === "/" || code[i + 1] === "*")) {
-      i = skipComment(code, i);
-      continue;
-    }
-    if (isIdentStart(c) && code.slice(i, i + name.length) === name) {
-      const after = i + name.length;
-      if ((after >= code.length || !isIdentChar(code[after])) && (i === 0 || !isIdentChar(code[i - 1]))) return true;
-    }
-    i++;
-  }
-  return false;
-}
-function manualIsIdentifierImported(code, name) {
-  let i = 0;
-  while (i < code.length) {
-    const c = code[i];
-    if (c === '"' || c === "'" || c === "`") {
-      i = skipString(code, i);
-      continue;
-    }
-    if (c === "/" && (code[i + 1] === "/" || code[i + 1] === "*")) {
-      i = skipComment(code, i);
-      continue;
-    }
-    if (isIdentStart(c)) {
-      let j = i + 1;
-      while (j < code.length && isIdentChar(code[j])) j++;
-      const word = code.slice(i, j);
-      if (word === "import") {
-        let k = j;
-        while (k < code.length) {
-          if (code[k] === ";" || code[k] === "\n") break;
-          if (code[k] === '"' || code[k] === "'" || code[k] === "`") {
-            k = skipString(code, k);
-            continue;
-          }
-          if (isIdentStart(code[k]) && code.slice(k, k + name.length) === name) {
-            const a = k + name.length;
-            if ((a >= code.length || !isIdentChar(code[a])) && (k === 0 || !isIdentChar(code[k - 1]))) return true;
-          }
-          k++;
-        }
-      }
-      i = j;
-      continue;
-    }
-    i++;
-  }
-  return false;
-}
-function manualExtractImportNames(importText) {
-  const names = [];
-  const open = importText.indexOf("{");
-  if (open !== -1) {
-    const close = importText.indexOf("}", open + 1);
-    if (close !== -1) {
-      let i2 = open + 1;
-      while (i2 < close) {
-        const c = importText[i2];
-        if (c === '"' || c === "'" || c === "`") {
-          i2 = skipString(importText, i2);
-          continue;
-        }
-        if (isIdentStart(c)) {
-          let j = i2 + 1;
-          while (j < close && isIdentChar(importText[j])) j++;
-          let word = importText.slice(i2, j);
-          if (word === "type" || word === "typeof") {
-            i2 = j;
-            continue;
-          }
-          let k = skipWhitespace(importText, j);
-          if (importText.slice(k, k + 2) === "as" && !isIdentChar(importText[k + 2])) {
-            let m = skipWhitespace(importText, k + 2);
-            if (isIdentStart(importText[m])) {
-              let n = m + 1;
-              while (n < close && isIdentChar(importText[n])) n++;
-              word = importText.slice(m, n);
-            }
-          }
-          names.push(word);
-          i2 = j;
-          continue;
-        }
-        i2++;
-      }
-      return names;
-    }
-  }
-  let i = 0;
-  while (i < importText.length && !isIdentStart(importText[i])) i++;
-  while (i < importText.length && isIdentChar(importText[i])) i++;
-  i = skipWhitespace(importText, i);
-  if (importText[i] === "*") {
-    i = skipWhitespace(importText, i + 1);
-    if (importText.slice(i, i + 2) === "as") i = skipWhitespace(importText, i + 2);
-    if (isIdentStart(importText[i])) {
-      let j = i + 1;
-      while (j < importText.length && isIdentChar(importText[j])) j++;
-      names.push(importText.slice(i, j));
-    }
-  } else if (isIdentStart(importText[i])) {
-    let j = i + 1;
-    while (j < importText.length && isIdentChar(importText[j])) j++;
-    names.push(importText.slice(i, j));
-  }
-  return names;
-}
-var init_tokens = __esm({
-  "../compiler/src/tokens.ts"() {
-    "use strict";
-    init_parser();
-    init_scan();
-  }
-});
-
 // ../compiler/src/module-imports.ts
 import { readFileSync as readFileSync2, existsSync as existsSync2, realpathSync, statSync } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
@@ -19550,19 +19807,65 @@ function collectVskImportPaths(imports, sourcePath2) {
     if (stripTypeImport(imp) === null) continue;
     const target = vskImportTarget(imp);
     if (!target) continue;
-    if (target.startsWith(".")) {
-      const full = resolve2(dirname3(sourcePath2), target);
-      if (existsSync3(full)) out.push(full);
-      continue;
-    }
-    const aliased = resolveImportPath(target, dirname3(sourcePath2));
-    if (aliased !== target && existsSync3(aliased)) out.push(aliased);
+    const full = resolveVskTarget(target, sourcePath2);
+    if (full) out.push(full);
   }
   return out;
 }
+function collectVskReexportPaths(reexportSources, sourcePath2) {
+  const out = [];
+  for (const spec of reexportSources) {
+    if (!spec.endsWith(".vsk")) continue;
+    const full = resolveVskTarget(spec, sourcePath2);
+    if (full) out.push(full);
+  }
+  return out;
+}
+function resolveVskTarget(target, sourcePath2) {
+  if (target.startsWith(".")) {
+    const full = resolve2(dirname3(sourcePath2), target);
+    return existsSync3(full) ? full : null;
+  }
+  const aliased = resolveImportPath(target, dirname3(sourcePath2));
+  return aliased !== target && existsSync3(aliased) ? aliased : null;
+}
+function vskImportValueNames(imports) {
+  const names = [];
+  for (const imp of imports) {
+    if (stripTypeImport(imp) === null) continue;
+    if (vskImportTarget(imp) === null) continue;
+    for (const pair of importBindingPairs(imp)) {
+      if (pair.imported === "default" || pair.imported === "*") continue;
+      names.push(pair.local);
+    }
+  }
+  return names;
+}
 function vskImportLines(source) {
   return extractImportStatements(source).filter((imp) => vskImportTarget(imp) !== null && stripTypeImport(imp) !== null);
 }
+function vskRegistryAliases(importLines, exportAliases) {
+  const aliases = [];
+  for (const alias of exportAliases) {
+    if (alias.local !== alias.exported) aliases.push({ local: alias.local, exported: alias.exported });
+  }
+  for (const imp of importLines) {
+    if (stripTypeImport(imp) === null) continue;
+    if (vskImportTarget(imp) === null) continue;
+    for (const pair of importBindingPairs(imp)) {
+      if (pair.imported === "default" || pair.imported === "*") continue;
+      if (pair.local !== pair.imported) aliases.push({ local: pair.imported, exported: pair.local });
+    }
+  }
+  return aliases;
+}
+function applyVskRegistryAliases(componentMap, aliases) {
+  for (const { local, exported } of aliases) {
+    if (componentMap.has(exported)) continue;
+    const fn = componentMap.get(local);
+    if (fn) componentMap.set(exported, fn);
+  }
+}
 function isTypeOnlyImport(stmt) {
   if (!stmt || stmt.type !== "ImportDeclaration") return false;
   if (stmt.importKind === "type") return true;
@@ -19873,6 +20176,22 @@ function getJSXTagName(nameNode) {
   }
   return "unknown";
 }
+function jsxTagRootName(nameNode) {
+  let node = nameNode;
+  while (node && node.type === "JSXMemberExpression") node = node.object;
+  return node && node.type === "JSXIdentifier" ? node.name : "";
+}
+function collectVskNamespaceLocals(ast) {
+  const out = /* @__PURE__ */ new Set();
+  for (const node of ast.body || []) {
+    if (node.type !== "ImportDeclaration") continue;
+    if (typeof node.source?.value !== "string" || !node.source.value.endsWith(".vsk")) continue;
+    for (const spec of node.specifiers || []) {
+      if (spec.type === "ImportNamespaceSpecifier" && spec.local?.name) out.add(spec.local.name);
+    }
+  }
+  return out;
+}
 function isHTMLTag(name) {
   return name.length > 0 && name[0] === name[0].toLowerCase();
 }
@@ -20241,6 +20560,11 @@ function processJSXElement(source, element) {
     return [new HeadBlock(children2)];
   }
   if (nameNode && nameNode.type === "JSXMemberExpression") {
+    const root3 = jsxTagRootName(nameNode);
+    if (currentVskNamespaceLocals && currentVskNamespaceLocals.has(root3)) {
+      const { line, column } = offsetToLineCol2(source, nameNode.start ?? 0);
+      throw VeskError.vskNamespaceTag({ file: currentSourceFile, line, column, code: codeFrame(source, line, column) });
+    }
     const { props, spreadProps, slots } = extractProps(source, element);
     const children2 = selfClosing ? [] : processJSXChildren(source, element.children || []);
     return [new ComponentCall(tagName, props, [...children2, ...slots.map((s) => new PropSlot(s.name, s.nodes))], spreadProps, element.start, getSource(source, nameNode))];
@@ -20656,217 +20980,263 @@ function generateIR(ast, source, filename) {
   let staticProps = null;
   let loadFn = null;
   const topLevelCode = [];
-  for (const node of ast.body) {
-    if (node.type === "ImportDeclaration") {
-      const raw2 = getSource(source, node);
-      let cleaned = stripTypeImport(raw2);
-      if (cleaned === null) continue;
-      cleaned = normalizeRuntimeSpecifier(cleaned);
-      imports.push(cleaned);
-      for (const spec of node.specifiers) {
-        if (spec.importKind === "type") continue;
-        if (spec.type === "ImportSpecifier") {
-          importedNames.add(spec.local.name);
+  const exportAliases = [];
+  const reexportSources = [];
+  for (const pair of ast.__vskSpecifierExports || []) {
+    exportAliases.push({ local: pair.local, exported: pair.exported });
+  }
+  const vskNamespaceLocals = collectVskNamespaceLocals(ast);
+  const prevNamespaceLocals = currentVskNamespaceLocals;
+  const prevSourceFile = currentSourceFile;
+  currentVskNamespaceLocals = vskNamespaceLocals;
+  currentSourceFile = file;
+  try {
+    for (const node of ast.body) {
+      if (node.type === "ImportDeclaration") {
+        const raw2 = getSource(source, node);
+        let cleaned = stripTypeImport(raw2);
+        if (cleaned === null) continue;
+        cleaned = normalizeRuntimeSpecifier(cleaned);
+        imports.push(cleaned);
+        for (const spec of node.specifiers) {
+          if (spec.importKind === "type") continue;
+          if (spec.type === "ImportSpecifier") {
+            importedNames.add(spec.local.name);
+          }
         }
+        continue;
       }
-      continue;
-    }
-    if (node.type === "ExportNamedDeclaration" && node.declaration && !staticProps) {
-      const decl = node.declaration;
-      const fnName = decl.type === "FunctionDeclaration" ? decl.id?.name : decl.type === "VariableDeclaration" ? decl.declarations[0]?.id?.name : null;
-      if (fnName === "getStaticProps") {
-        staticProps = stripCodeTypes(getSource(source, decl));
+      if (node.type === "ExportNamedDeclaration" && node.declaration && !staticProps) {
+        const decl = node.declaration;
+        const fnName = decl.type === "FunctionDeclaration" ? decl.id?.name : decl.type === "VariableDeclaration" ? decl.declarations[0]?.id?.name : null;
+        if (fnName === "getStaticProps") {
+          staticProps = stripCodeTypes(getSource(source, decl));
+          continue;
+        }
+      }
+      if (node.type === "ExportNamedDeclaration" && node.declaration && !loadFn) {
+        const decl = node.declaration;
+        const fnName = decl.type === "FunctionDeclaration" ? decl.id?.name : decl.type === "VariableDeclaration" ? decl.declarations[0]?.id?.name : null;
+        if (fnName === "load") {
+          loadFn = stripCodeTypes(getSource(source, decl));
+          continue;
+        }
+      }
+      if (node.type === "ExportNamedDeclaration" && node.declaration) {
+        const decl = node.declaration;
+        if (decl.type === "VariableDeclaration") {
+          const declName = decl.declarations[0]?.id?.name;
+          if (declName === "standalone") {
+            continue;
+          }
+        }
+      }
+      if (node.type === "ExportNamedDeclaration" && !node.declaration) {
+        if (node.source) {
+          if (typeof node.source.value === "string") reexportSources.push(node.source.value);
+          for (const spec of node.specifiers || []) {
+            if (spec.type === "ExportSpecifier") {
+              const localName = spec.local && spec.local.name;
+              const exportedName = spec.exported && spec.exported.name;
+              if (typeof localName === "string" && typeof exportedName === "string") {
+                exportAliases.push({ local: localName, exported: exportedName });
+              }
+            }
+          }
+          continue;
+        }
+        for (const spec of node.specifiers || []) {
+          if (spec.type === "ExportSpecifier") {
+            const localName = spec.local && spec.local.name;
+            const exportedName = spec.exported && spec.exported.name;
+            if (typeof localName === "string" && typeof exportedName === "string") {
+              exportAliases.push({ local: localName, exported: exportedName });
+            }
+          }
+        }
         continue;
       }
-    }
-    if (node.type === "ExportNamedDeclaration" && node.declaration && !loadFn) {
-      const decl = node.declaration;
-      const fnName = decl.type === "FunctionDeclaration" ? decl.id?.name : decl.type === "VariableDeclaration" ? decl.declarations[0]?.id?.name : null;
-      if (fnName === "load") {
-        loadFn = stripCodeTypes(getSource(source, decl));
+      if (node.type === "ExportAllDeclaration") {
+        if (node.source && typeof node.source.value === "string") reexportSources.push(node.source.value);
         continue;
       }
-    }
-    if (node.type === "ExportNamedDeclaration" && node.declaration) {
-      const decl = node.declaration;
-      if (decl.type === "VariableDeclaration") {
-        const declName = decl.declarations[0]?.id?.name;
-        if (declName === "standalone") {
-          continue;
+      let inner = node;
+      let exported = false;
+      let defaultExport = false;
+      if (node.type === "ExportNamedDeclaration" && node.declaration) {
+        inner = node.declaration;
+        exported = true;
+      } else if (node.type === "ExportDefaultDeclaration" && node.declaration) {
+        inner = node.declaration;
+        exported = true;
+        defaultExport = true;
+      }
+      if (inner.type === "ComponentDeclaration") {
+      } else if (inner.type === "ClassDeclaration") {
+        const { line, column } = offsetToLineCol2(source, inner.start ?? 0);
+        throw VeskError.classDecl({ file, line, column, code: codeFrame(source, line, column) });
+      } else if (inner.type === "TSEnumDeclaration") {
+        const code = processEnum(inner, source, exported);
+        topLevelCode.push(code);
+        continue;
+      } else {
+        topLevelCode.push(getSource(source, node));
+        continue;
+      }
+      const name = inner.id.name;
+      const paramNames = getParamNames(inner.params, source);
+      const firstParam = inner.params?.[0];
+      const propsAlias = firstParam && firstParam.type === "Identifier" ? firstParam.name : null;
+      const propsType = getPropsType(inner.params, source);
+      const bodyStmts = inner.body.body;
+      const isClientComp = !!inner.client;
+      const prevSlotProps = __slotProps;
+      __slotProps = slotPropNamesFromType(propsType);
+      __propsParam = propsAlias || null;
+      if (isStatementMode(bodyStmts)) {
+        const raw2 = processStatementModeBody(source, bodyStmts, file);
+        const { body, css } = extractStyle(raw2);
+        validateBlocks(name, isClientComp, body, file, source);
+        const comp = new ComponentIR(name, paramNames, body, { mode: "statement", exported, defaultExport, isClient: inner.client, isAsync: inner.async, ssrAwait: componentUsesFetch(body), propsType, propsAlias });
+        comp.style = css;
+        components.push(comp);
+        __slotProps = prevSlotProps;
+      } else {
+        const guardClauses = [];
+        let mainReturn = null;
+        const preamble = [];
+        for (const stmt of bodyStmts) {
+          if (stmt.type === "VeskBlock") {
+            const innerBody = processStatementModeBody(source, stmt.body, file);
+            if (stmt.tag === "server") {
+              preamble.push(new ServerBlock(innerBody));
+            } else if (stmt.tag === "client") {
+              preamble.push(new ClientBlock(innerBody));
+            }
+          } else if (stmt.type === "ReturnStatement") {
+            mainReturn = stmt;
+          } else if (isTrackDeclaration(stmt)) {
+            const elements = stmt.declarations[0].id.elements;
+            const trackName = elements[0]?.name;
+            const rawName = elements.length > 1 ? elements[1]?.name : null;
+            const init = getSource(source, stmt.declarations[0].init);
+            if (trackName) preamble.push(new TrackDecl(trackName, init, rawName));
+            const refName = getComponentRefName(stmt);
+            if (refName) preamble.push(new ComponentRef(refName));
+          } else if (stmt.type === "IfStatement" && !mainReturn && stmt.consequent.type !== "ThrowStatement") {
+            guardClauses.push(stmt);
+          } else if (stmt.type === "ClassDeclaration") {
+            const { line, column } = offsetToLineCol2(source, stmt.start ?? 0);
+            throw VeskError.classDecl({ file, line, column, code: codeFrame(source, line, column) });
+          } else {
+            const raw2 = getSource(source, stmt);
+            if (raw2) preamble.push(new RuntimeStatement(raw2, stmt, source));
+          }
         }
+        const guardBody = buildGuardChain(source, guardClauses, mainReturn);
+        const { body, css } = extractStyle([...preamble, ...guardBody]);
+        validateBlocks(name, isClientComp, body, file, source);
+        const comp = new ComponentIR(name, paramNames, body, { exported, defaultExport, isClient: inner.client, isAsync: inner.async, ssrAwait: componentUsesFetch(body), propsType, propsAlias });
+        comp.style = css;
+        components.push(comp);
+        __slotProps = prevSlotProps;
       }
     }
-    let inner = node;
-    let exported = false;
-    let defaultExport = false;
-    if (node.type === "ExportNamedDeclaration" && node.declaration) {
-      inner = node.declaration;
-      exported = true;
-    } else if (node.type === "ExportDefaultDeclaration" && node.declaration) {
-      inner = node.declaration;
-      exported = true;
-      defaultExport = true;
-    }
-    if (inner.type === "ComponentDeclaration") {
-    } else if (inner.type === "ClassDeclaration") {
-      const { line, column } = offsetToLineCol2(source, inner.start ?? 0);
-      throw VeskError.classDecl({ file, line, column, code: codeFrame(source, line, column) });
-    } else if (inner.type === "TSEnumDeclaration") {
-      const code = processEnum(inner, source, exported);
-      topLevelCode.push(code);
-      continue;
-    } else {
-      topLevelCode.push(getSource(source, node));
-      continue;
-    }
-    const name = inner.id.name;
-    const paramNames = getParamNames(inner.params, source);
-    const firstParam = inner.params?.[0];
-    const propsAlias = firstParam && firstParam.type === "Identifier" ? firstParam.name : null;
-    const propsType = getPropsType(inner.params, source);
-    const bodyStmts = inner.body.body;
-    const isClientComp = !!inner.client;
-    const prevSlotProps = __slotProps;
-    __slotProps = slotPropNamesFromType(propsType);
-    __propsParam = propsAlias || null;
-    if (isStatementMode(bodyStmts)) {
-      const raw2 = processStatementModeBody(source, bodyStmts, file);
-      const { body, css } = extractStyle(raw2);
-      validateBlocks(name, isClientComp, body, file, source);
-      const comp = new ComponentIR(name, paramNames, body, { mode: "statement", exported, defaultExport, isClient: inner.client, isAsync: inner.async, ssrAwait: componentUsesFetch(body), propsType, propsAlias });
-      comp.style = css;
-      components.push(comp);
-      __slotProps = prevSlotProps;
-    } else {
-      const guardClauses = [];
-      let mainReturn = null;
-      const preamble = [];
-      for (const stmt of bodyStmts) {
-        if (stmt.type === "VeskBlock") {
-          const innerBody = processStatementModeBody(source, stmt.body, file);
-          if (stmt.tag === "server") {
-            preamble.push(new ServerBlock(innerBody));
-          } else if (stmt.tag === "client") {
-            preamble.push(new ClientBlock(innerBody));
-          }
-        } else if (stmt.type === "ReturnStatement") {
-          mainReturn = stmt;
-        } else if (isTrackDeclaration(stmt)) {
-          const elements = stmt.declarations[0].id.elements;
-          const trackName = elements[0]?.name;
-          const rawName = elements.length > 1 ? elements[1]?.name : null;
-          const init = getSource(source, stmt.declarations[0].init);
-          if (trackName) preamble.push(new TrackDecl(trackName, init, rawName));
-          const refName = getComponentRefName(stmt);
-          if (refName) preamble.push(new ComponentRef(refName));
-        } else if (stmt.type === "IfStatement" && !mainReturn && stmt.consequent.type !== "ThrowStatement") {
-          guardClauses.push(stmt);
-        } else if (stmt.type === "ClassDeclaration") {
-          const { line, column } = offsetToLineCol2(source, stmt.start ?? 0);
-          throw VeskError.classDecl({ file, line, column, code: codeFrame(source, line, column) });
-        } else {
-          const raw2 = getSource(source, stmt);
-          if (raw2) preamble.push(new RuntimeStatement(raw2, stmt, source));
-        }
-      }
-      const guardBody = buildGuardChain(source, guardClauses, mainReturn);
-      const { body, css } = extractStyle([...preamble, ...guardBody]);
-      validateBlocks(name, isClientComp, body, file, source);
-      const comp = new ComponentIR(name, paramNames, body, { exported, defaultExport, isClient: inner.client, isAsync: inner.async, ssrAwait: componentUsesFetch(body), propsType, propsAlias });
-      comp.style = css;
-      components.push(comp);
-      __slotProps = prevSlotProps;
-    }
-  }
-  const asyncNames = new Set(components.filter((c) => c.isAsync || c.ssrAwait).map((c) => c.name));
-  for (const comp of components) {
-    if (asyncNames.has(comp.name)) continue;
-    const called2 = /* @__PURE__ */ new Map();
-    collectComponentCalls(comp.body, called2);
-    for (const [childName, start] of called2) {
-      if (!asyncNames.has(childName)) continue;
-      const { line, column } = offsetToLineCol2(source, start >= 0 ? start : 0);
-      throw VeskError.asyncChildInSyncParent(comp.name, childName, { file, line, column, code: codeFrame(source, line, column) });
-    }
-  }
-  const autoImportable = [
-    "useFetch",
-    "useRouter",
-    "useParams",
-    "usePathname",
-    "useSearchParams",
-    "useNavigate",
-    "defineAction",
-    "Form",
-    "Field",
-    "required",
-    "email",
-    "minLength",
-    "maxLength",
-    "pattern",
-    "custom",
-    "Link",
-    "NavLink",
-    "Outlet",
-    "Redirect",
-    "Image",
-    "Portal",
-    "Experiment",
-    "LoadingIndicator",
-    "useLoadingIndicator",
-    "JsonLd",
-    "ArticleSchema",
-    "ProductSchema",
-    "FAQPageSchema",
-    "BreadcrumbListSchema",
-    "OrganizationSchema",
-    "LocalBusinessSchema",
-    "VideoSchema",
-    "effect",
-    "derived",
-    "untrack",
-    "peek",
-    "tick",
-    "flushSync",
-    "on_destroy",
-    "createContext",
-    "redirect",
-    "permanentRedirect",
-    "notFound",
-    "NotFoundError",
-    "createResource",
-    "getAction",
-    "validateActionInput",
-    "issuesToFieldMap",
-    "isFormAction",
-    "Show",
-    "For",
-    "Switch",
-    "Match"
-  ];
-  const called = collectCallAndJsxTargets(ast);
-  const usedFunctions = /* @__PURE__ */ new Set();
-  for (const fn of autoImportable) {
-    if (called.has(fn)) usedFunctions.add(fn);
-  }
-  if (usedFunctions.size > 0) {
-    const existing = /* @__PURE__ */ new Set();
-    for (const imp of imports) {
-      if (importModuleTarget(imp) !== "@vesk/runtime") continue;
-      for (const n of extractImportNames(imp)) existing.add(n);
+    const asyncNames = new Set(components.filter((c) => c.isAsync || c.ssrAwait).map((c) => c.name));
+    for (const comp of components) {
+      if (asyncNames.has(comp.name)) continue;
+      const called2 = /* @__PURE__ */ new Map();
+      collectComponentCalls(comp.body, called2);
+      for (const [childName, start] of called2) {
+        if (!asyncNames.has(childName)) continue;
+        const { line, column } = offsetToLineCol2(source, start >= 0 ? start : 0);
+        throw VeskError.asyncChildInSyncParent(comp.name, childName, { file, line, column, code: codeFrame(source, line, column) });
+      }
     }
-    const boundLocally = /* @__PURE__ */ new Set();
-    for (const imp of imports) {
-      for (const pair of importBindingPairs(imp)) boundLocally.add(pair.local);
+    const autoImportable = [
+      "useFetch",
+      "useRouter",
+      "useParams",
+      "usePathname",
+      "useSearchParams",
+      "useNavigate",
+      "defineAction",
+      "Form",
+      "Field",
+      "required",
+      "email",
+      "minLength",
+      "maxLength",
+      "pattern",
+      "custom",
+      "Link",
+      "NavLink",
+      "Outlet",
+      "Redirect",
+      "Image",
+      "Portal",
+      "Experiment",
+      "LoadingIndicator",
+      "useLoadingIndicator",
+      "JsonLd",
+      "ArticleSchema",
+      "ProductSchema",
+      "FAQPageSchema",
+      "BreadcrumbListSchema",
+      "OrganizationSchema",
+      "LocalBusinessSchema",
+      "VideoSchema",
+      "effect",
+      "derived",
+      "untrack",
+      "peek",
+      "tick",
+      "flushSync",
+      "on_destroy",
+      "createContext",
+      "redirect",
+      "permanentRedirect",
+      "notFound",
+      "NotFoundError",
+      "createResource",
+      "getAction",
+      "validateActionInput",
+      "issuesToFieldMap",
+      "isFormAction",
+      "Show",
+      "For",
+      "Switch",
+      "Match",
+      "primitive",
+      "leaf"
+    ];
+    const called = collectCallAndJsxTargets(ast);
+    const usedFunctions = /* @__PURE__ */ new Set();
+    for (const fn of autoImportable) {
+      if (called.has(fn)) usedFunctions.add(fn);
     }
-    const missing = [...usedFunctions].filter((f) => !existing.has(f) && !boundLocally.has(f));
-    if (missing.length > 0) {
-      imports.push(`import { ${missing.join(", ")} } from '@vesk/runtime';`);
+    if (usedFunctions.size > 0) {
+      const existing = /* @__PURE__ */ new Set();
+      for (const imp of imports) {
+        if (importModuleTarget(imp) !== "@vesk/runtime") continue;
+        for (const n of extractImportNames(imp)) existing.add(n);
+      }
+      const boundLocally = /* @__PURE__ */ new Set();
+      for (const imp of imports) {
+        for (const pair of importBindingPairs(imp)) boundLocally.add(pair.local);
+      }
+      const missing = [...usedFunctions].filter((f) => !existing.has(f) && !boundLocally.has(f));
+      if (missing.length > 0) {
+        imports.push(`import { ${missing.join(", ")} } from '@vesk/runtime';`);
+      }
     }
+    return new IRRoot(components, imports, importedNames, staticProps, loadFn, topLevelCode, exportAliases, reexportSources);
+  } finally {
+    currentVskNamespaceLocals = prevNamespaceLocals;
+    currentSourceFile = prevSourceFile;
   }
-  return new IRRoot(components, imports, importedNames, staticProps, loadFn, topLevelCode);
 }
-var __vskAnnotations, __slotProps, __propsParam;
+var __vskAnnotations, __slotProps, __propsParam, currentVskNamespaceLocals, currentSourceFile;
 var init_ir_generator = __esm({
   "../compiler/src/ir-generator.ts"() {
     "use strict";
@@ -20881,6 +21251,7 @@ var init_ir_generator = __esm({
     __vskAnnotations = [];
     __slotProps = null;
     __propsParam = null;
+    currentVskNamespaceLocals = null;
   }
 });
 
@@ -21774,6 +22145,13 @@ function loadRuntimeImports(importStrs) {
   }
   return {};
 }
+function patternElementName(element) {
+  if (!element) return null;
+  if (element.type === "Identifier") return element.name;
+  if (element.type === "AssignmentPattern" && element.left) return patternElementName(element.left);
+  if (element.type === "RestElement" && element.argument) return patternElementName(element.argument);
+  return null;
+}
 function evalTopLevelCode(topLevelCode, __vesk) {
   for (const code of topLevelCode) {
     const ast = tryParseTopLevel(code);
@@ -21784,8 +22162,11 @@ function evalTopLevelCode(topLevelCode, __vesk) {
         if (!target) continue;
         if (target.type === "VariableDeclaration") {
           for (const d of target.declarations) {
-            if (!d.id || d.id.type !== "Identifier") continue;
-            const initSrc = d.init ? code.slice(d.init.start, d.init.end) : "undefined";
+            if (!d.id) continue;
+            const isTrack = d.id.type === "ArrayPattern" && d.id.lazy === true;
+            const names = isTrack ? (d.id.elements || []).map(patternElementName) : d.id.type === "Identifier" ? [d.id.name] : [];
+            if (names.every((n) => n === null)) continue;
+            const initSrc = d.init ? stripTrackDeclMarkers(code.slice(d.init.start, d.init.end), d.init.start, d.init) : "undefined";
             try {
               const keys = Object.keys(__vesk);
               const params = [...keys, "__vesk", "result"];
@@ -21793,7 +22174,10 @@ function evalTopLevelCode(topLevelCode, __vesk) {
               const fn = new Function(...params, body);
               const result = { value: void 0 };
               fn(...keys.map((k) => __vesk[k]), __vesk, result);
-              __vesk[d.id.name] = result.value;
+              names.forEach((name, i) => {
+                if (name === null) return;
+                __vesk[name] = isTrack ? Array.isArray(result.value) ? result.value[i] : void 0 : result.value;
+              });
             } catch {
             }
           }
@@ -21803,7 +22187,7 @@ function evalTopLevelCode(topLevelCode, __vesk) {
             const keys = Object.keys(__vesk);
             const params = [...keys, "__vesk"];
             const paramSrc = target.params.length ? code.slice(target.params[0].start, target.params[target.params.length - 1].end) : "";
-            const bodySrc = code.slice(target.body.start, target.body.end);
+            const bodySrc = stripTrackDeclMarkers(code.slice(target.body.start, target.body.end), target.body.start, target.body);
             const asyncKw = target.async ? "async " : "";
             const fn = new Function(...params, `__vesk['${target.id.name}'] = ${asyncKw}function ${target.id.name}(${paramSrc}) ${bodySrc};`);
             fn(...keys.map((k) => __vesk[k]), __vesk);
@@ -23367,7 +23751,8 @@ function Form(props, registry, hydrate) {
     return `<form ${attrStr}>${children || ""}</form>`;
   }
   if (hydrate && hydrate.nextElement) {
-    let form2 = hydrate.nextElement("form");
+    const skipK = typeof hydrate.takeSkipK === "function" ? hydrate.takeSkipK() : 0;
+    let form2 = hydrate.nextElement("form", skipK);
     if (form2 && !form2.parentNode && hydrate.root) {
       const existing = hydrate.root.querySelector("form");
       if (existing) form2 = existing;
@@ -25750,6 +26135,96 @@ var init_headless = __esm({
   }
 });
 
+// ../runtime/src/primitive.ts
+function primitive(fn) {
+  const wrapped = ((props, registry, scope2) => {
+    return fn(props == null ? EMPTY_PROPS : props, registry, scope2);
+  });
+  wrapped.__veskPrimitive = true;
+  return wrapped;
+}
+function leaf(fn) {
+  fn.__veskLeaf = true;
+  return fn;
+}
+function isPrimitive(value) {
+  return typeof value === "function" && value.__veskPrimitive === true;
+}
+function isLeaf(value) {
+  return typeof value === "function" && value.__veskLeaf === true;
+}
+function isVeskComponent(value) {
+  return typeof value === "function";
+}
+function toDomNode(value) {
+  if (typeof document === "undefined") return value;
+  if (value == null || typeof value === "boolean") return value;
+  if (typeof value.nodeType === "number") {
+    return value;
+  }
+  if (typeof value !== "string") return value;
+  if (value === "") return document.createDocumentFragment();
+  const template = document.createElement("template");
+  template.innerHTML = value;
+  const { content } = template;
+  if (content.childNodes.length === 1) {
+    const only = content.firstChild;
+    content.removeChild(only);
+    return only;
+  }
+  return content;
+}
+function isCell2(value) {
+  return typeof value === "object" && value !== null && typeof value.f === "number";
+}
+function readDep(dep) {
+  return isCell2(dep) ? get(dep) : dep;
+}
+function rerenderNode(node, deps, call) {
+  if (typeof document === "undefined") return node;
+  if (deps.length === 0) return node;
+  let owned = null;
+  let current2 = null;
+  if (Array.isArray(node)) {
+    const roots = node.filter((n) => n && typeof n.nodeType === "number");
+    owned = roots.length ? roots : null;
+    current2 = owned ? owned[0] : null;
+  } else if (node && typeof node.nodeType === "number") {
+    current2 = node;
+  }
+  if (!current2) return node;
+  const liveRange = () => {
+    if (owned) return owned;
+    return current2 && current2.parentNode ? [current2] : null;
+  };
+  let seen = deps.map(readDep);
+  effect(() => {
+    const now2 = deps.map(readDep);
+    if (now2.length === seen.length && now2.every((v, i) => Object.is(v, seen[i]))) return;
+    seen = now2;
+    const old = liveRange();
+    if (!old || !old[0].parentNode) return;
+    const next = toDomNode(call());
+    if (!next || typeof next.nodeType !== "number") return;
+    const fresh = next.nodeType === 11 ? Array.from(next.childNodes) : [next];
+    const parent = old[0].parentNode;
+    for (const freshNode of fresh) parent.insertBefore(freshNode, old[0]);
+    for (const oldNode of old) if (oldNode.parentNode) oldNode.parentNode.removeChild(oldNode);
+    owned = next.nodeType === 11 ? fresh : null;
+    current2 = fresh[0] ?? current2;
+  });
+  return node;
+}
+var EMPTY_PROPS;
+var init_primitive = __esm({
+  "../runtime/src/primitive.ts"() {
+    "use strict";
+    init_ripple_runtime();
+    init_ripple_blocks();
+    EMPTY_PROPS = Object.freeze({});
+  }
+});
+
 // ../runtime/src/action.ts
 function getActionRegistry() {
   const g2 = globalThis;
@@ -25903,11 +26378,15 @@ __export(index_server_exports, {
   get_server_context: () => get_server_context,
   headers: () => headers,
   isFormAction: () => isFormAction,
+  isLeaf: () => isLeaf,
   isLoadingActive: () => isLoadingActive,
+  isPrimitive: () => isPrimitive,
+  isVeskComponent: () => isVeskComponent,
   is_destroyed: () => is_destroyed,
   isr: () => isr,
   isrConfigToRevalidate: () => isrConfigToRevalidate,
   issuesToFieldMap: () => issuesToFieldMap,
+  leaf: () => leaf,
   locals: () => locals,
   maxLength: () => maxLength,
   minLength: () => minLength,
@@ -25921,12 +26400,14 @@ __export(index_server_exports, {
   permanentRedirect: () => permanentRedirect,
   pop_component: () => pop_component,
   pre_effect: () => pre_effect,
+  primitive: () => primitive,
   push_component: () => push_component,
   readSignedCookie: () => readSignedCookie2,
   redirect: () => redirect,
   removeHook: () => removeHook,
   render: () => render,
   required: () => required,
+  rerenderNode: () => rerenderNode,
   resolveSsrResources: () => resolveSsrResources,
   resume_block: () => resume_block,
   revalidateComponent: () => revalidateComponent,
@@ -25950,6 +26431,7 @@ __export(index_server_exports, {
   set_server_context: () => set_server_context,
   signCookie: () => signCookie2,
   tick: () => tick,
+  toDomNode: () => toDomNode,
   track: () => track,
   unlink_block: () => unlink_block,
   unsignCookie: () => unsignCookie2,
@@ -25988,6 +26470,7 @@ var init_index_server = __esm({
     init_form();
     init_md();
     init_headless();
+    init_primitive();
     init_loading_indicator();
     init_action();
   }
@@ -28417,11 +28900,20 @@ function printWithTypesStripped(ast, code, hadTs = hasTsSyntax(ast)) {
 function transformTopLevelForActions(topLevelCode, mode) {
   const out = [];
   for (const c of topLevelCode) {
-    const rewritten = rewriteTopLevelActions(c, mode);
+    const rewritten = rewriteTopLevelActions(stripTopLevelTrackDecls(c), mode);
     if (rewritten !== "") out.push(rewritten);
   }
   return out;
 }
+function stripTopLevelTrackDecls(code) {
+  let ast;
+  try {
+    ast = parse4(code);
+  } catch {
+    return code;
+  }
+  return stripTrackDeclMarkers(code, 0, ast);
+}
 function collectActionIds(source) {
   const ids = [];
   const stmts = collectTopLevelStatements(source);
@@ -28477,6 +28969,7 @@ var init_actions = __esm({
     "use strict";
     init_parser();
     init_strip_ts();
+    init_tokens();
     ACTION_PREFIX = "/_vesk/action/";
   }
 });
@@ -28604,6 +29097,39 @@ function simpleGetName(expr) {
   }
   return inner;
 }
+function untrackBindingArg(expr) {
+  let head = -1;
+  for (const name of BINDING_REF_CALLS) {
+    if (expr.startsWith(`${name}(`)) {
+      head = name.length;
+      break;
+    }
+  }
+  if (head < 0) return expr;
+  const rest = expr.slice(head + 1);
+  if (rest[0] !== "g" || rest[1] !== "e" || rest[2] !== "t" || rest[3] !== "(") return expr;
+  let i = 4;
+  let word = "";
+  for (; i < rest.length; i++) {
+    const c = rest.charCodeAt(i);
+    const ok = c >= 48 && c <= 57 || c >= 65 && c <= 90 || c >= 97 && c <= 122 || c === 95 || c === 36;
+    if (!ok) break;
+    word += rest[i];
+  }
+  if (word.length === 0 || rest[i] !== ")") return expr;
+  const after = i + 1;
+  if (rest[after] !== "," && rest[after] !== ")") return expr;
+  return expr.slice(0, head + 1) + word + rest.slice(after);
+}
+function trackedRefTarget(expr, tracked2) {
+  const cell = simpleGetName(expr);
+  if (cell !== null) return cell;
+  if (/^[A-Za-z_$][\w$]*$/.test(expr)) {
+    const info = tracked2.get(expr);
+    if (info && info.kind === "cell" && info.cellName === expr) return expr;
+  }
+  return null;
+}
 function semicolonizeStatement(code) {
   const trimmed = code.trimEnd();
   if (!trimmed || trimmed.endsWith(";") || trimmed.endsWith("}")) return code;
@@ -28702,6 +29228,21 @@ function transformTracked(irNode, tracked2) {
       }
       return context.next();
     },
+    Property(node, context) {
+      if (node.shorthand && node.value && node.value.type === "Identifier" && !node.computed) {
+        const info = context.state.get(node.value.name);
+        if (info && info.kind === "virtual") {
+          return {
+            ...node,
+            shorthand: false,
+            value: callExpr({ type: "Identifier", name: "get" }, [
+              { type: "Identifier", name: info.cellName }
+            ])
+          };
+        }
+      }
+      return context.next();
+    },
     Identifier(node, context) {
       const parent = context.path.at(-1);
       if (parent) {
@@ -28713,6 +29254,8 @@ function transformTracked(irNode, tracked2) {
           return context.next();
         if (parent.type === "Property" && parent.value === node && parent.key && parent.key.type === "Identifier" && parent.key.name === "into")
           return context.next();
+        if (parent.type === "Property" && parent.key === node && !parent.computed && !parent.shorthand)
+          return context.next();
         if (parent.type === "MemberExpression" && !parent.computed && parent.object === node && parent.property && parent.property.type === "Identifier" && parent.property.name === "set")
           return context.next();
       }
@@ -28739,6 +29282,28 @@ function collectTrackedNames(body) {
   }
   return names;
 }
+function collectTrackedDeps(value, tracked2) {
+  const ast = value?.ast;
+  if (!ast || typeof ast !== "object" || tracked2.size === 0) return [];
+  const found = [];
+  const seen = /* @__PURE__ */ new Set();
+  walk4(ast, tracked2, {
+    Identifier(node, context) {
+      const parent = context.path.at(-1);
+      if (parent) {
+        if (parent.type === "MemberExpression" && !parent.computed && parent.property === node) return context.next();
+        if (parent.type === "Property" && parent.key === node) return context.next();
+      }
+      const info = context.state.get(node.name);
+      if (info && !seen.has(node.name)) {
+        seen.add(node.name);
+        found.push(node.name);
+      }
+      return context.next();
+    }
+  });
+  return found;
+}
 function transformTrackedInit(init, tracked2) {
   if (!init) return init;
   let expr = null;
@@ -28932,8 +29497,9 @@ function emitStatic(ctx2, node, tracked2, effectsVar, skipK = 0, regionBudget) {
         const target = attr.target || "";
         const isEvent2 = target.startsWith("on") && target.length > 2;
         if (target === "ref") {
-          const expr = transformTracked(attr.expression, tracked2);
-          ctx2.push(`(${expr})(${ssrEl});`);
+          const expr = untrackBindingArg(transformTracked(attr.expression, tracked2));
+          const cell = trackedRefTarget(expr, tracked2);
+          ctx2.push(cell !== null ? `set(${cell}, ${ssrEl});` : `(${expr})(${ssrEl});`);
         } else if (isEvent2) {
           const eventName = target.slice(2).toLowerCase();
           const handler = transformTracked(attr.expression, tracked2);
@@ -28990,8 +29556,9 @@ function emitStatic(ctx2, node, tracked2, effectsVar, skipK = 0, regionBudget) {
     const target = attr.target || "";
     const isEvent2 = target.startsWith("on") && target.length > 2;
     if (target === "ref") {
-      const expr = transformTracked(attr.expression, tracked2);
-      ctx2.push(`(${expr})(${el});`);
+      const expr = untrackBindingArg(transformTracked(attr.expression, tracked2));
+      const cell = trackedRefTarget(expr, tracked2);
+      ctx2.push(cell !== null ? `set(${cell}, ${el});` : `(${expr})(${el});`);
     } else if (isEvent2) {
       const eventName = target.slice(2).toLowerCase();
       const handler = transformTracked(attr.expression, tracked2);
@@ -29185,19 +29752,29 @@ function emitComponentCall(ctx2, node, tracked2, effectsVar, parentVar, compPref
   const calleeExpr = node.calleeExpr ? `(${node.calleeExpr})` : null;
   const slotChildren = node.children.filter((c) => c instanceof PropSlot);
   const regChildren = node.children.filter((c) => !(c instanceof PropSlot));
-  const callArgs = () => `{ ${propsEntries.join(", ")} }`;
+  const plainTarget = !!(calleeExpr || ctx2.importedNames.has(node.componentName)) && !ctx2.selfClaimNames.has(node.componentName);
+  const trackedDeps = [];
+  if (plainTarget) {
+    for (const p of node.props) {
+      if (typeof p.value === "string") continue;
+      for (const d of collectTrackedDeps(p.value, tracked2)) if (!trackedDeps.includes(d)) trackedDeps.push(d);
+    }
+    for (const sp of node.spreadProps) {
+      for (const d of collectTrackedDeps(sp, tracked2)) if (!trackedDeps.includes(d)) trackedDeps.push(d);
+    }
+  }
+  const callArgs = () => plainTarget ? `reactiveProps({ ${propsEntries.join(", ")} })` : `{ ${propsEntries.join(", ")} }`;
   if (ctx2.hydrate) {
     const access = calleeExpr ?? (ctx2.importedNames.has(node.componentName) ? node.componentName : `__components[${JSON.stringify(node.componentName)}]`);
     if (!calleeExpr && !ctx2.importedNames.has(node.componentName)) {
       ctx2.push(`if (${access} == null) throw new Error(${JSON.stringify(`Component "${node.componentName}" was not found while rendering. Declare it with the \`component\` keyword, import it, or register it in the component registry.`)});`);
     }
-    const plainTarget = !!(calleeExpr || ctx2.importedNames.has(node.componentName)) && !ctx2.selfClaimNames.has(node.componentName);
     const walkerArg = ctx2.walker;
     const promptExpr = ctx2.markerless && (regionBudget || skipK > 0) ? markerlessSkipExpr(regionBudget, skipK) : null;
     const maybeReplace = (v2) => {
       if (!plainTarget) return;
       const claim = promptExpr ? `${walkerArg}.claimOnly(undefined, ${promptExpr})` : `${walkerArg}.claimOnly()`;
-      ctx2.push(`if (${v2} && ${v2}.parentNode == null && ${v2}.nodeType !== 11) { const __sr = ${claim}; if (__sr && __sr.parentNode) __sr.parentNode.replaceChild(${v2}, __sr); }`);
+      ctx2.push(`if (${v2} && ${v2}.parentNode == null) { if (${v2}.nodeType === 11) { const __cnt = ${v2}.childNodes.length; let __sr = null; for (let __i = 0; __i < __cnt; __i++) { const __c = ${claim}; if (__c && __c.parentNode) { if (__sr) { __c.remove(); } else { __sr = __c; } } } if (__sr) { const __p = __sr.parentNode; while (${v2}.firstChild) __p.insertBefore(${v2}.firstChild, __sr); __p.removeChild(__sr); } } else { const __sr = ${claim}; if (__sr && __sr.parentNode) __sr.parentNode.replaceChild(${v2}, __sr); } }`);
       if (regionBudget && ctx2.markerless) ctx2.push(`${regionBudget} = 0;`);
     };
     const maybeRetire = () => {
@@ -29213,7 +29790,7 @@ function emitComponentCall(ctx2, node, tracked2, effectsVar, parentVar, compPref
       const frag = ctx2.n();
       const wipeMount = ctx2.linkNames.has(node.componentName);
       const savedHydrate = ctx2.hydrate;
-      if (wipeMount) ctx2.hydrate = false;
+      if (wipeMount || ctx2.selfClaimNames.has(node.componentName)) ctx2.hydrate = false;
       ctx2.push(`const ${frag} = (() => { const $f = document.createDocumentFragment();`);
       const savedEffects = ctx2.effects;
       ctx2.effects = [];
@@ -29232,10 +29809,15 @@ function emitComponentCall(ctx2, node, tracked2, effectsVar, parentVar, compPref
     }
     ctx2.push(`let ${v} = undefined;`);
     ctx2.push(`if (__hydrate) __hydrate.childFrame = (__hydrate.childFrame || 0) + 1;`);
-    ctx2.push(`try { ${v} = ${awaitKw}${access}(${callArgs()}, __registry, ${walkerArg}); } finally { if (__hydrate) __hydrate.childFrame--; }`);
+    ctx2.push(`try { ${v} = toDomNode(${awaitKw}${access}(${callArgs()}, __registry, ${walkerArg})); } finally { if (__hydrate) __hydrate.childFrame--; }`);
+    const rootsVar = trackedDeps.length > 0 ? ctx2.n() : null;
+    if (rootsVar) ctx2.push(`const ${rootsVar} = ${v} && ${v}.nodeType === 11 ? Array.from(${v}.childNodes) : [${v}];`);
     if (ctx2.markerless && promptExpr && !plainTarget && regionBudget) ctx2.push(`${regionBudget} = 0;`);
     maybeReplace(v);
     maybeRetire();
+    if (trackedDeps.length > 0) {
+      ctx2.push(`rerenderNode(${rootsVar}, [${trackedDeps.join(", ")}], () => ${awaitKw}${access}(${callArgs()}, __registry, ${walkerArg}));`);
+    }
     return v;
   } else {
     for (const slot of slotChildren) {
@@ -29257,12 +29839,18 @@ function emitComponentCall(ctx2, node, tracked2, effectsVar, parentVar, compPref
       propsEntries.push(`children: ${frag}`);
     }
     if (calleeExpr) {
-      ctx2.push(`const ${v} = ${calleeExpr}(${callArgs()});`);
+      ctx2.push(`const ${v} = toDomNode(${calleeExpr}(${callArgs()}));`);
     } else if (ctx2.importedNames.has(node.componentName)) {
-      ctx2.push(`const ${v} = ${awaitKw}${node.componentName}(${callArgs()});`);
+      ctx2.push(`const ${v} = toDomNode(${awaitKw}${node.componentName}(${callArgs()}));`);
     } else {
       ctx2.push(`if (${compPrefix}[${JSON.stringify(node.componentName)}] == null) throw new Error(${JSON.stringify(`Component "${node.componentName}" was not found while rendering. Declare it with the \`component\` keyword, import it, or register it in the component registry.`)});`);
-      ctx2.push(`const ${v} = ${awaitKw}${compPrefix}[${JSON.stringify(node.componentName)}](${callArgs()});`);
+      ctx2.push(`const ${v} = toDomNode(${awaitKw}${compPrefix}[${JSON.stringify(node.componentName)}](${callArgs()}));`);
+    }
+    if (trackedDeps.length > 0) {
+      const calleeRef = calleeExpr ?? (ctx2.importedNames.has(node.componentName) ? node.componentName : `${compPrefix}[${JSON.stringify(node.componentName)}]`);
+      const rootsVar2 = ctx2.n();
+      ctx2.push(`const ${rootsVar2} = ${v} && ${v}.nodeType === 11 ? Array.from(${v}.childNodes) : [${v}];`);
+      ctx2.push(`rerenderNode(${rootsVar2}, [${trackedDeps.join(", ")}], () => ${awaitKw}${calleeRef}(${callArgs()}));`);
     }
   }
   return v;
@@ -30348,7 +30936,7 @@ function emitClientFromIR(ir, options) {
     }
   }
   const exportCode = exportLines.join("\n");
-  const runtimeNames = ["track", "get", "set", "destroy_block", "getActiveComponent", "setActiveComponent", "reactiveProps", "applyStyle"];
+  const runtimeNames = ["track", "get", "set", "destroy_block", "getActiveComponent", "setActiveComponent", "reactiveProps", "applyStyle", "toDomNode", "rerenderNode"];
   if (ir.components.some((c) => !isStaticIR(c.body))) runtimeNames.push("effect");
   for (const name of usedRuntimeBindings(ir)) runtimeNames.push(name);
   for (const name of ["derived"]) {
@@ -30409,14 +30997,18 @@ function compileClientBoth(source, _componentName, sourcePath2, opts) {
   }
   const alloc = nameAllocFor(sourcePath2);
   const comp = emitClientFromIR(ir, { forceClient: true, nameAllocator: alloc });
-  if (opts?.skipHyd) return { comp, hyd: "", name };
+  const aliases = vskRegistryAliases(ir.imports, ir.exportAliases);
+  const reexportPaths = sourcePath2 ? collectVskReexportPaths(ir.reexportSources, sourcePath2) : [];
+  if (opts?.skipHyd) return { comp, hyd: "", name, aliases, reexportPaths };
   return {
     comp,
     hyd: emitClientFromIR(irHyd, { forceClient: true, hydrate: true, includeTopLevel: false, nameAllocator: alloc, markerless: opts?.markerless !== false }),
-    name
+    name,
+    aliases,
+    reexportPaths
   };
 }
-var NON_BUBBLING_EVENTS, Ctx, PROPERTY_ATTRS;
+var BINDING_REF_CALLS, NON_BUBBLING_EVENTS, Ctx, PROPERTY_ATTRS;
 var init_client_codegen = __esm({
   "../compiler/src/client-codegen.ts"() {
     "use strict";
@@ -30428,8 +31020,10 @@ var init_client_codegen = __esm({
     init_module_imports();
     init_scan();
     init_tokens();
+    init_vsk_imports();
     init_md_inline();
     init_strip_ts();
+    BINDING_REF_CALLS = ["bindValue", "bindChecked", "bindGroup"];
     NON_BUBBLING_EVENTS = /* @__PURE__ */ new Set([
       "focus",
       "blur",
@@ -30965,7 +31559,8 @@ function buildComponentEntries(irRoot) {
   const importedNames = /* @__PURE__ */ new Set([...runtimeNames, ...localValueNames, ...topValueNames]);
   const hasTracked = irRoot.components.some((c) => c.body.some((n) => n instanceof TrackDecl));
   const extraNames = hasTracked ? ["get", "set", "track"] : [];
-  const allNames = [.../* @__PURE__ */ new Set([...runtimeNames, ...topNames, ...extraNames, ...localValueNames])];
+  const vskValueNames = vskImportValueNames(irRoot.imports);
+  const allNames = [.../* @__PURE__ */ new Set([...runtimeNames, ...topNames, ...extraNames, ...localValueNames, ...vskValueNames])];
   const scopeDecl = allNames.length > 0 ? `const { ${allNames.join(", ")} } = __vesk;
 ` : "";
   setVskImportedNames(importedNames);
@@ -31006,6 +31601,7 @@ var init_server_jsgen = __esm({
     init_scan();
     init_server_utils();
     init_module_imports();
+    init_vsk_imports();
     __currentCompName = "";
   }
 });
@@ -31078,7 +31674,11 @@ function compileFileInternal(source, sourcePath2, seenImportFiles) {
   const __vesk = loadRuntimeImports(ir.imports);
   applyLocalModuleImports(__vesk, ir.imports, sourcePath2);
   if (sourcePath2) {
-    for (const importPath of collectVskImportPaths(ir.imports, sourcePath2)) {
+    const vskPaths = [
+      ...collectVskImportPaths(ir.imports, sourcePath2),
+      ...collectVskReexportPaths(ir.reexportSources, sourcePath2)
+    ];
+    for (const importPath of vskPaths) {
       if (seenImportFiles.has(importPath)) continue;
       seenImportFiles.add(importPath);
       let importedSrc;
@@ -31098,6 +31698,7 @@ function compileFileInternal(source, sourcePath2, seenImportFiles) {
     }
   }
   evalTopLevelCode(transformTopLevelForActions(ir.topLevelCode, "server"), __vesk);
+  applyVskRegistryAliases(componentMap, vskRegistryAliases(ir.imports, ir.exportAliases));
   for (const name of ownComponentNames) {
     const fn = componentMap.get(name);
     if (fn && !fn.__veskScope) fn.__veskScope = __vesk;
@@ -34067,7 +34668,7 @@ function unwrapMaybeCell2(v) {
   }
   return v;
 }
-function isCell2(v) {
+function isCell3(v) {
   return v !== null && typeof v === "object" && typeof v.get === "function";
 }
 function escapeHtml7(s) {
@@ -36072,7 +36673,7 @@ function Md2(props, _registry, hydrate) {
   if (propFg && propFg !== "none")
     wrapperParts.push(`--md-code-fg:${propFg}`);
   const wrapperStyle = wrapperParts.length > 0 ? escapeHtml7(wrapperParts.join(";")) : "";
-  const reactive = isCell2(contentCell);
+  const reactive = isCell3(contentCell);
   const pathMode = isPublicMarkdownPath2(content);
   if (mdIsSSR2()) {
     const attrs = className ? ` class="${escapeHtml7(className)}"` : "";
@@ -36733,6 +37334,21 @@ var init_errors2 = __esm({
           tip: isBuiltin ? `"${name}" is a Vesk built-in. Use it directly \u2014 no manual import needed.` : ""
         });
       }
+      static vskNamespaceTag(context = {}) {
+        return new _VeskError("Namespace imports are not supported for `.vsk` modules.", {
+          ...context,
+          code: context.code || "V0410",
+          suggestions: [
+            "Import the component by name: import { MyIcon } from './icons.vsk'",
+            "Rename on import: import { MyIcon as Icon } from './icons.vsk'"
+          ],
+          nextSteps: [
+            "A `.vsk` component is a registry entry keyed by its name, not a module namespace object, so `<ns.Icon />` cannot be resolved.",
+            "If you need a namespace object, import from a `.ts`/`.js` module instead \u2014 those are real ES modules."
+          ],
+          tip: "A `.vsk` module exposes its components as named exports; use a named or renamed import rather than `import * as ns`."
+        });
+      }
       static classDecl(context = {}) {
         return new _VeskError("class declarations are not supported inside Vesk components.", {
           ...context,
@@ -39698,6 +40314,7 @@ init_server_jsgen();
 // ../compiler/src/precompile-runtime.ts
 init_ir();
 init_server_utils();
+init_vsk_imports();
 var IR_CLASSES = [
   ["Expression", Expression.prototype],
   ["IRRoot", IRRoot.prototype],
@@ -39784,7 +40401,11 @@ function precompileFileInternal(source, sourcePath2, seenImportFiles) {
   const bindings = sourcePath2 !== void 0 ? collectModuleBundle(ir.imports, dirname6(sourcePath2), collector) : [];
   const subFiles = [];
   if (sourcePath2 !== void 0) {
-    for (const importPath of collectVskImportPaths(ir.imports, sourcePath2)) {
+    const vskPaths = [
+      ...collectVskImportPaths(ir.imports, sourcePath2),
+      ...collectVskReexportPaths(ir.reexportSources, sourcePath2)
+    ];
+    for (const importPath of vskPaths) {
       if (seenImportFiles.has(importPath)) continue;
       seenImportFiles.add(importPath);
       try {
@@ -40921,6 +41542,31 @@ function extractCompiledNodes(code, isTarget) {
 function isModuleLevel(node) {
   return node.type === "ImportDeclaration" || node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration";
 }
+function nativeLibraryImportStubs(code) {
+  let ast;
+  try {
+    ast = parse4(code);
+  } catch {
+    return "";
+  }
+  const body = ast.body ?? [];
+  const bindings = [];
+  for (const node of body) {
+    if (node?.type !== "ImportDeclaration") continue;
+    const src2 = node.source?.value;
+    if (typeof src2 !== "string" || !src2.startsWith("@vesk/") || src2.startsWith("@vesk/runtime")) continue;
+    for (const spec of node.specifiers ?? []) {
+      if (typeof spec?.local?.name === "string") bindings.push([spec.local.name, src2]);
+    }
+  }
+  if (bindings.length === 0) return "";
+  const lines = bindings.map(([local, spec]) => {
+    const message = `web preview: native library "${spec}" has no browser equivalent on the web (dev-only) \u2014 binding "${local}" cannot be provided in vesk dev --web. Build for Android to use it.`;
+    const thrower = `throw Object.assign(new Error(${JSON.stringify(message)}), { __veskPreviewMissing: ${JSON.stringify(spec)} })`;
+    return `const ${local} = new Proxy(function () {}, { get: function () { ${thrower}; }, apply: function () { ${thrower}; }, construct: function () { ${thrower}; } });`;
+  });
+  return lines.join("\n") + "\n\n";
+}
 function demoteExports(code) {
   let ast;
   try {
@@ -41254,7 +41900,7 @@ async function generateClientBundle(routeTree, appDir, componentMap, options) {
     }
     const namesBefore = cache2 ? new Set(runtimeImportNames) : null;
     const importedPaths = resolveVskImports(filePath, (p, n) => compileFile2(p, n, output, imports));
-    const { comp: rawComp, hyd: rawHyd, name: actualName } = compileClientBoth(src2, null, filePath);
+    const { comp: rawComp, hyd: rawHyd, name: actualName, aliases, reexportPaths } = compileClientBoth(src2, null, filePath);
     const compWithImports = rawComp ? stripExports(stripVskImports(stripRuntimeImport(rawComp))) : "";
     const hydWithImports = rawHyd ? stripExports(stripVskImports(stripRuntimeImport(rawHyd))) : "";
     const compSpecs = [];
@@ -41274,6 +41920,11 @@ async function generateClientBundle(routeTree, appDir, componentMap, options) {
       output.push(`Object.defineProperty(__components, ${JSON.stringify(resolvedName)}, { get: () => __components[${JSON.stringify(actualName)}], configurable: true });`);
       output.push(`Object.defineProperty(__hydrators, ${JSON.stringify(resolvedName)}, { get: () => __hydrators[${JSON.stringify(actualName)}], configurable: true });`);
     }
+    for (const alias of aliases || []) {
+      output.push(`Object.defineProperty(__components, ${JSON.stringify(alias.exported)}, { get: () => __components[${JSON.stringify(alias.local)}], configurable: true });`);
+      output.push(`Object.defineProperty(__hydrators, ${JSON.stringify(alias.exported)}, { get: () => __hydrators[${JSON.stringify(alias.local)}], configurable: true });`);
+    }
+    for (const reexportPath of reexportPaths || []) compileFile2(reexportPath, null, output, imports);
     if (cache2 && namesBefore) {
       const st = statSync3(filePath);
       cache2.files.set(filePath, {
@@ -41411,7 +42062,7 @@ ${entry.code}
           const err = e;
           console.error("[vesk] chunk bundle failed", entry.name, err?.errors?.map((x) => x.text).join(" | ") || err?.message || String(e));
           const stripped = demoteExports(removeCompiledNodes(entry.code, isAnyImport));
-          finalCode = chunkIIFE(stripped);
+          finalCode = chunkIIFE(nativeLibraryImportStubs(entry.code) + stripped);
         } finally {
           try {
             rmSync(tmpBase, { recursive: true, force: true });
@@ -41419,7 +42070,7 @@ ${entry.code}
           }
         }
       } else {
-        finalCode = chunkIIFE(entry.code);
+        finalCode = chunkIIFE(demoteExports(entry.code));
       }
       chunks.push({ name: entry.name, code: finalCode });
     }
@@ -41628,7 +42279,7 @@ function appendHmrGlobals(code) {
   return code + "globalThis.__vesk_hmr_eval = (code, n) => {\n  if (!n || n !== globalThis.__vesk_hmr_nonce) throw new Error('vesk hmr: invalid nonce');\n  return eval(code);\n};\n";
 }
 async function buildMainBundle(routeTree, runtimeDir, codeSplit, mono, hmr, importRuntime, runtimeImportNames, routeDataCache) {
-  const baseRuntimeImports = ["createFileRouter", "get", "set", "effect", "track", "destroy_block", "getActiveComponent", "setActiveComponent", "NavLink", "Link", "reactiveProps", "matchRoute", "ensureChunk"];
+  const baseRuntimeImports = ["createFileRouter", "get", "set", "effect", "track", "destroy_block", "getActiveComponent", "setActiveComponent", "NavLink", "Link", "reactiveProps", "matchRoute", "ensureChunk", "toDomNode", "rerenderNode"];
   const allRuntimeImports = runtimeImportNames && runtimeImportNames.size > 0 ? [.../* @__PURE__ */ new Set([...baseRuntimeImports, ...runtimeImportNames])] : baseRuntimeImports;
   const runtimeGlobals = [
     "reconcile",
@@ -42948,6 +43599,7 @@ init_server_utils();
 init_module_imports();
 init_scan();
 init_tokens();
+init_vsk_imports();
 init_md_inline();
 init_strip_ts();
 import { walk as walk6 } from "zimmerframe";
@@ -42971,6 +43623,47 @@ function simpleGetName2(expr) {
   }
   return inner;
 }
+var BINDING_REF_CALLS2 = ["bindValue", "bindChecked", "bindGroup"];
+function untrackBindingArg2(expr) {
+  let head = -1;
+  for (const name of BINDING_REF_CALLS2) {
+    if (expr.startsWith(`${name}(`)) {
+      head = name.length;
+      break;
+    }
+  }
+  if (head < 0)
+    return expr;
+  const rest = expr.slice(head + 1);
+  if (rest[0] !== "g" || rest[1] !== "e" || rest[2] !== "t" || rest[3] !== "(")
+    return expr;
+  let i = 4;
+  let word = "";
+  for (; i < rest.length; i++) {
+    const c = rest.charCodeAt(i);
+    const ok = c >= 48 && c <= 57 || c >= 65 && c <= 90 || c >= 97 && c <= 122 || c === 95 || c === 36;
+    if (!ok)
+      break;
+    word += rest[i];
+  }
+  if (word.length === 0 || rest[i] !== ")")
+    return expr;
+  const after = i + 1;
+  if (rest[after] !== "," && rest[after] !== ")")
+    return expr;
+  return expr.slice(0, head + 1) + word + rest.slice(after);
+}
+function trackedRefTarget2(expr, tracked2) {
+  const cell = simpleGetName2(expr);
+  if (cell !== null)
+    return cell;
+  if (/^[A-Za-z_$][\w$]*$/.test(expr)) {
+    const info = tracked2.get(expr);
+    if (info && info.kind === "cell" && info.cellName === expr)
+      return expr;
+  }
+  return null;
+}
 function semicolonizeStatement2(code) {
   const trimmed = code.trimEnd();
   if (!trimmed || trimmed.endsWith(";") || trimmed.endsWith("}"))
@@ -43077,6 +43770,21 @@ function transformTracked2(irNode, tracked2) {
       }
       return context.next();
     },
+    Property(node, context) {
+      if (node.shorthand && node.value && node.value.type === "Identifier" && !node.computed) {
+        const info = context.state.get(node.value.name);
+        if (info && info.kind === "virtual") {
+          return {
+            ...node,
+            shorthand: false,
+            value: callExpr2({ type: "Identifier", name: "get" }, [
+              { type: "Identifier", name: info.cellName }
+            ])
+          };
+        }
+      }
+      return context.next();
+    },
     Identifier(node, context) {
       const parent = context.path.at(-1);
       if (parent) {
@@ -43088,6 +43796,8 @@ function transformTracked2(irNode, tracked2) {
           return context.next();
         if (parent.type === "Property" && parent.value === node && parent.key && parent.key.type === "Identifier" && parent.key.name === "into")
           return context.next();
+        if (parent.type === "Property" && parent.key === node && !parent.computed && !parent.shorthand)
+          return context.next();
         if (parent.type === "MemberExpression" && !parent.computed && parent.object === node && parent.property && parent.property.type === "Identifier" && parent.property.name === "set")
           return context.next();
       }
@@ -43115,6 +43825,31 @@ function collectTrackedNames2(body) {
   }
   return names;
 }
+function collectTrackedDeps2(value, tracked2) {
+  const ast = value?.ast;
+  if (!ast || typeof ast !== "object" || tracked2.size === 0)
+    return [];
+  const found = [];
+  const seen = /* @__PURE__ */ new Set();
+  walk6(ast, tracked2, {
+    Identifier(node, context) {
+      const parent = context.path.at(-1);
+      if (parent) {
+        if (parent.type === "MemberExpression" && !parent.computed && parent.property === node)
+          return context.next();
+        if (parent.type === "Property" && parent.key === node)
+          return context.next();
+      }
+      const info = context.state.get(node.name);
+      if (info && !seen.has(node.name)) {
+        seen.add(node.name);
+        found.push(node.name);
+      }
+      return context.next();
+    }
+  });
+  return found;
+}
 function transformTrackedInit2(init, tracked2) {
   if (!init)
     return init;
@@ -43451,8 +44186,9 @@ function emitStatic2(ctx2, node, tracked2, effectsVar, skipK = 0, regionBudget)
         const target = attr.target || "";
         const isEvent2 = target.startsWith("on") && target.length > 2;
         if (target === "ref") {
-          const expr = transformTracked2(attr.expression, tracked2);
-          ctx2.push(`(${expr})(${ssrEl});`);
+          const expr = untrackBindingArg2(transformTracked2(attr.expression, tracked2));
+          const cell = trackedRefTarget2(expr, tracked2);
+          ctx2.push(cell !== null ? `set(${cell}, ${ssrEl});` : `(${expr})(${ssrEl});`);
         } else if (isEvent2) {
           const eventName = target.slice(2).toLowerCase();
           const handler = transformTracked2(attr.expression, tracked2);
@@ -43510,8 +44246,9 @@ function emitStatic2(ctx2, node, tracked2, effectsVar, skipK = 0, regionBudget)
     const target = attr.target || "";
     const isEvent2 = target.startsWith("on") && target.length > 2;
     if (target === "ref") {
-      const expr = transformTracked2(attr.expression, tracked2);
-      ctx2.push(`(${expr})(${el});`);
+      const expr = untrackBindingArg2(transformTracked2(attr.expression, tracked2));
+      const cell = trackedRefTarget2(expr, tracked2);
+      ctx2.push(cell !== null ? `set(${cell}, ${el});` : `(${expr})(${el});`);
     } else if (isEvent2) {
       const eventName = target.slice(2).toLowerCase();
       const handler = transformTracked2(attr.expression, tracked2);
@@ -43730,20 +44467,35 @@ function emitComponentCall2(ctx2, node, tracked2, effectsVar, parentVar, compPre
   const calleeExpr = node.calleeExpr ? `(${node.calleeExpr})` : null;
   const slotChildren = node.children.filter((c) => c instanceof PropSlot);
   const regChildren = node.children.filter((c) => !(c instanceof PropSlot));
-  const callArgs = () => `{ ${propsEntries.join(", ")} }`;
+  const plainTarget = !!(calleeExpr || ctx2.importedNames.has(node.componentName)) && !ctx2.selfClaimNames.has(node.componentName);
+  const trackedDeps = [];
+  if (plainTarget) {
+    for (const p of node.props) {
+      if (typeof p.value === "string")
+        continue;
+      for (const d of collectTrackedDeps2(p.value, tracked2))
+        if (!trackedDeps.includes(d))
+          trackedDeps.push(d);
+    }
+    for (const sp of node.spreadProps) {
+      for (const d of collectTrackedDeps2(sp, tracked2))
+        if (!trackedDeps.includes(d))
+          trackedDeps.push(d);
+    }
+  }
+  const callArgs = () => plainTarget ? `reactiveProps({ ${propsEntries.join(", ")} })` : `{ ${propsEntries.join(", ")} }`;
   if (ctx2.hydrate) {
     const access = calleeExpr ?? (ctx2.importedNames.has(node.componentName) ? node.componentName : `__components[${JSON.stringify(node.componentName)}]`);
     if (!calleeExpr && !ctx2.importedNames.has(node.componentName)) {
       ctx2.push(`if (${access} == null) throw new Error(${JSON.stringify(`Component "${node.componentName}" was not found while rendering. Declare it with the \`component\` keyword, import it, or register it in the component registry.`)});`);
     }
-    const plainTarget = !!(calleeExpr || ctx2.importedNames.has(node.componentName)) && !ctx2.selfClaimNames.has(node.componentName);
     const walkerArg = ctx2.walker;
     const promptExpr = ctx2.markerless && (regionBudget || skipK > 0) ? markerlessSkipExpr2(regionBudget, skipK) : null;
     const maybeReplace = (v2) => {
       if (!plainTarget)
         return;
       const claim = promptExpr ? `${walkerArg}.claimOnly(undefined, ${promptExpr})` : `${walkerArg}.claimOnly()`;
-      ctx2.push(`if (${v2} && ${v2}.parentNode == null && ${v2}.nodeType !== 11) { const __sr = ${claim}; if (__sr && __sr.parentNode) __sr.parentNode.replaceChild(${v2}, __sr); }`);
+      ctx2.push(`if (${v2} && ${v2}.parentNode == null) { if (${v2}.nodeType === 11) { const __cnt = ${v2}.childNodes.length; let __sr = null; for (let __i = 0; __i < __cnt; __i++) { const __c = ${claim}; if (__c && __c.parentNode) { if (__sr) { __c.remove(); } else { __sr = __c; } } } if (__sr) { const __p = __sr.parentNode; while (${v2}.firstChild) __p.insertBefore(${v2}.firstChild, __sr); __p.removeChild(__sr); } } else { const __sr = ${claim}; if (__sr && __sr.parentNode) __sr.parentNode.replaceChild(${v2}, __sr); } }`);
       if (regionBudget && ctx2.markerless)
         ctx2.push(`${regionBudget} = 0;`);
     };
@@ -43760,7 +44512,7 @@ function emitComponentCall2(ctx2, node, tracked2, effectsVar, parentVar, compPre
       const frag = ctx2.n();
       const wipeMount = ctx2.linkNames.has(node.componentName);
       const savedHydrate = ctx2.hydrate;
-      if (wipeMount)
+      if (wipeMount || ctx2.selfClaimNames.has(node.componentName))
         ctx2.hydrate = false;
       ctx2.push(`const ${frag} = (() => { const $f = document.createDocumentFragment();`);
       const savedEffects = ctx2.effects;
@@ -43782,11 +44534,17 @@ function emitComponentCall2(ctx2, node, tracked2, effectsVar, parentVar, compPre
     }
     ctx2.push(`let ${v} = undefined;`);
     ctx2.push(`if (__hydrate) __hydrate.childFrame = (__hydrate.childFrame || 0) + 1;`);
-    ctx2.push(`try { ${v} = ${awaitKw}${access}(${callArgs()}, __registry, ${walkerArg}); } finally { if (__hydrate) __hydrate.childFrame--; }`);
+    ctx2.push(`try { ${v} = toDomNode(${awaitKw}${access}(${callArgs()}, __registry, ${walkerArg})); } finally { if (__hydrate) __hydrate.childFrame--; }`);
+    const rootsVar = trackedDeps.length > 0 ? ctx2.n() : null;
+    if (rootsVar)
+      ctx2.push(`const ${rootsVar} = ${v} && ${v}.nodeType === 11 ? Array.from(${v}.childNodes) : [${v}];`);
     if (ctx2.markerless && promptExpr && !plainTarget && regionBudget)
       ctx2.push(`${regionBudget} = 0;`);
     maybeReplace(v);
     maybeRetire();
+    if (trackedDeps.length > 0) {
+      ctx2.push(`rerenderNode(${rootsVar}, [${trackedDeps.join(", ")}], () => ${awaitKw}${access}(${callArgs()}, __registry, ${walkerArg}));`);
+    }
     return v;
   } else {
     for (const slot of slotChildren) {
@@ -43810,12 +44568,18 @@ function emitComponentCall2(ctx2, node, tracked2, effectsVar, parentVar, compPre
       propsEntries.push(`children: ${frag}`);
     }
     if (calleeExpr) {
-      ctx2.push(`const ${v} = ${calleeExpr}(${callArgs()});`);
+      ctx2.push(`const ${v} = toDomNode(${calleeExpr}(${callArgs()}));`);
     } else if (ctx2.importedNames.has(node.componentName)) {
-      ctx2.push(`const ${v} = ${awaitKw}${node.componentName}(${callArgs()});`);
+      ctx2.push(`const ${v} = toDomNode(${awaitKw}${node.componentName}(${callArgs()}));`);
     } else {
       ctx2.push(`if (${compPrefix}[${JSON.stringify(node.componentName)}] == null) throw new Error(${JSON.stringify(`Component "${node.componentName}" was not found while rendering. Declare it with the \`component\` keyword, import it, or register it in the component registry.`)});`);
-      ctx2.push(`const ${v} = ${awaitKw}${compPrefix}[${JSON.stringify(node.componentName)}](${callArgs()});`);
+      ctx2.push(`const ${v} = toDomNode(${awaitKw}${compPrefix}[${JSON.stringify(node.componentName)}](${callArgs()}));`);
+    }
+    if (trackedDeps.length > 0) {
+      const calleeRef = calleeExpr ?? (ctx2.importedNames.has(node.componentName) ? node.componentName : `${compPrefix}[${JSON.stringify(node.componentName)}]`);
+      const rootsVar2 = ctx2.n();
+      ctx2.push(`const ${rootsVar2} = ${v} && ${v}.nodeType === 11 ? Array.from(${v}.childNodes) : [${v}];`);
+      ctx2.push(`rerenderNode(${rootsVar2}, [${trackedDeps.join(", ")}], () => ${awaitKw}${calleeRef}(${callArgs()}));`);
     }
   }
   return v;
@@ -45055,7 +45819,7 @@ function emitClientFromIR2(ir, options) {
     }
   }
   const exportCode = exportLines.join("\n");
-  const runtimeNames = ["track", "get", "set", "destroy_block", "getActiveComponent", "setActiveComponent", "reactiveProps", "applyStyle"];
+  const runtimeNames = ["track", "get", "set", "destroy_block", "getActiveComponent", "setActiveComponent", "reactiveProps", "applyStyle", "toDomNode", "rerenderNode"];
   if (ir.components.some((c) => !isStaticIR2(c.body)))
     runtimeNames.push("effect");
   for (const name of usedRuntimeBindings2(ir))
@@ -45123,12 +45887,16 @@ function compileClientBoth2(source, _componentName, sourcePath2, opts) {
   }
   const alloc = nameAllocFor2(sourcePath2);
   const comp = emitClientFromIR2(ir, { forceClient: true, nameAllocator: alloc });
+  const aliases = vskRegistryAliases(ir.imports, ir.exportAliases);
+  const reexportPaths = sourcePath2 ? collectVskReexportPaths(ir.reexportSources, sourcePath2) : [];
   if (opts?.skipHyd)
-    return { comp, hyd: "", name };
+    return { comp, hyd: "", name, aliases, reexportPaths };
   return {
     comp,
     hyd: emitClientFromIR2(irHyd, { forceClient: true, hydrate: true, includeTopLevel: false, nameAllocator: alloc, markerless: opts?.markerless !== false }),
-    name
+    name,
+    aliases,
+    reexportPaths
   };
 }
 
@@ -46449,6 +47217,35 @@ function extractCompiledNodes2(code, isTarget) {
 function isModuleLevel2(node) {
   return node.type === "ImportDeclaration" || node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration";
 }
+function nativeLibraryImportStubs2(code) {
+  let ast;
+  try {
+    ast = parse4(code);
+  } catch {
+    return "";
+  }
+  const body = ast.body ?? [];
+  const bindings = [];
+  for (const node of body) {
+    if (node?.type !== "ImportDeclaration")
+      continue;
+    const src2 = node.source?.value;
+    if (typeof src2 !== "string" || !src2.startsWith("@vesk/") || src2.startsWith("@vesk/runtime"))
+      continue;
+    for (const spec of node.specifiers ?? []) {
+      if (typeof spec?.local?.name === "string")
+        bindings.push([spec.local.name, src2]);
+    }
+  }
+  if (bindings.length === 0)
+    return "";
+  const lines = bindings.map(([local, spec]) => {
+    const message = `web preview: native library "${spec}" has no browser equivalent on the web (dev-only) \u2014 binding "${local}" cannot be provided in vesk dev --web. Build for Android to use it.`;
+    const thrower = `throw Object.assign(new Error(${JSON.stringify(message)}), { __veskPreviewMissing: ${JSON.stringify(spec)} })`;
+    return `const ${local} = new Proxy(function () {}, { get: function () { ${thrower}; }, apply: function () { ${thrower}; }, construct: function () { ${thrower}; } });`;
+  });
+  return lines.join("\n") + "\n\n";
+}
 function demoteExports2(code) {
   let ast;
   try {
@@ -46815,7 +47612,7 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options) {
     }
     const namesBefore = cache2 ? new Set(runtimeImportNames) : null;
     const importedPaths = resolveVskImports(filePath, (p, n) => compileFile2(p, n, output, imports));
-    const { comp: rawComp, hyd: rawHyd, name: actualName } = compileClientBoth(src2, null, filePath);
+    const { comp: rawComp, hyd: rawHyd, name: actualName, aliases, reexportPaths } = compileClientBoth(src2, null, filePath);
     const compWithImports = rawComp ? stripExports(stripVskImports(stripRuntimeImport(rawComp))) : "";
     const hydWithImports = rawHyd ? stripExports(stripVskImports(stripRuntimeImport(rawHyd))) : "";
     const compSpecs = [];
@@ -46838,6 +47635,12 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options) {
       output.push(`Object.defineProperty(__components, ${JSON.stringify(resolvedName)}, { get: () => __components[${JSON.stringify(actualName)}], configurable: true });`);
       output.push(`Object.defineProperty(__hydrators, ${JSON.stringify(resolvedName)}, { get: () => __hydrators[${JSON.stringify(actualName)}], configurable: true });`);
     }
+    for (const alias of aliases || []) {
+      output.push(`Object.defineProperty(__components, ${JSON.stringify(alias.exported)}, { get: () => __components[${JSON.stringify(alias.local)}], configurable: true });`);
+      output.push(`Object.defineProperty(__hydrators, ${JSON.stringify(alias.exported)}, { get: () => __hydrators[${JSON.stringify(alias.local)}], configurable: true });`);
+    }
+    for (const reexportPath of reexportPaths || [])
+      compileFile2(reexportPath, null, output, imports);
     if (cache2 && namesBefore) {
       const st = statSync14(filePath);
       cache2.files.set(filePath, {
@@ -46981,7 +47784,7 @@ ${entry.code}
           const err = e;
           console.error("[vesk] chunk bundle failed", entry.name, err?.errors?.map((x) => x.text).join(" | ") || err?.message || String(e));
           const stripped = demoteExports2(removeCompiledNodes2(entry.code, isAnyImport2));
-          finalCode = chunkIIFE(stripped);
+          finalCode = chunkIIFE(nativeLibraryImportStubs2(entry.code) + stripped);
         } finally {
           try {
             rmSync4(tmpBase, { recursive: true, force: true });
@@ -46989,7 +47792,7 @@ ${entry.code}
           }
         }
       } else {
-        finalCode = chunkIIFE(entry.code);
+        finalCode = chunkIIFE(demoteExports2(entry.code));
       }
       chunks.push({ name: entry.name, code: finalCode });
     }
@@ -47212,7 +48015,7 @@ function appendHmrGlobals2(code) {
   return code + "globalThis.__vesk_hmr_eval = (code, n) => {\n  if (!n || n !== globalThis.__vesk_hmr_nonce) throw new Error('vesk hmr: invalid nonce');\n  return eval(code);\n};\n";
 }
 async function buildMainBundle2(routeTree, runtimeDir, codeSplit, mono, hmr, importRuntime, runtimeImportNames, routeDataCache) {
-  const baseRuntimeImports = ["createFileRouter", "get", "set", "effect", "track", "destroy_block", "getActiveComponent", "setActiveComponent", "NavLink", "Link", "reactiveProps", "matchRoute", "ensureChunk"];
+  const baseRuntimeImports = ["createFileRouter", "get", "set", "effect", "track", "destroy_block", "getActiveComponent", "setActiveComponent", "NavLink", "Link", "reactiveProps", "matchRoute", "ensureChunk", "toDomNode", "rerenderNode"];
   const allRuntimeImports = runtimeImportNames && runtimeImportNames.size > 0 ? [.../* @__PURE__ */ new Set([...baseRuntimeImports, ...runtimeImportNames])] : baseRuntimeImports;
   const runtimeGlobals = [
     "reconcile",
@@ -53212,11 +54015,11 @@ ${prettifyHtml(body)}
 </html>`;
     return applyHtmlPlugins(fullHtml, ctx2.plugins, { sourcePath: ctx2.url.pathname });
   }
-  const leaf = chain.find((n) => n.page);
-  if (!leaf) return null;
-  const src2 = readFileSync37(resolve37(ctx2.appDirPath, leaf.sourceDir, "page.vsk"), "utf-8");
-  const compName = resolveComponentName(src2) || leaf.page;
-  const html = await renderFullPage(src2, compName, { params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: actionCssUrls(ctx2.appDirPath), security: ctx2.security, sourcePath: resolve37(ctx2.appDirPath, leaf.sourceDir, "page.vsk"), plugins: ctx2.plugins });
+  const leaf2 = chain.find((n) => n.page);
+  if (!leaf2) return null;
+  const src2 = readFileSync37(resolve37(ctx2.appDirPath, leaf2.sourceDir, "page.vsk"), "utf-8");
+  const compName = resolveComponentName(src2) || leaf2.page;
+  const html = await renderFullPage(src2, compName, { params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: actionCssUrls(ctx2.appDirPath), security: ctx2.security, sourcePath: resolve37(ctx2.appDirPath, leaf2.sourceDir, "page.vsk"), plugins: ctx2.plugins });
   return applyHtmlPlugins(html.replace("</body>", '	<script type="module" src="/_vesk/hmr.js"></script>\n</body>'), ctx2.plugins, { sourcePath: ctx2.url.pathname });
 }
 async function handleActionRequest(req, res, ctx2) {
@@ -54673,11 +55476,11 @@ ${prettifyHtml(body)}
             html = injectDevScripts(html);
             html = await applyHtmlPlugins(html, getActiveDevPlugins(), { sourcePath: url.pathname });
           } else {
-            const leaf = chain.find((n) => n.page);
-            if (leaf) {
-              const src2 = readFileSync38(resolve38(appDirPath, leaf.sourceDir, "page.vsk"), "utf-8");
-              const compName = extractCompName2(src2) || leaf.page;
-              html = await renderFullPage(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: resolve38(appDirPath, leaf.sourceDir, "page.vsk"), cached: cachedSsrCompile(ssrCompileCache, src2, resolve38(appDirPath, leaf.sourceDir, "page.vsk")), plugins: getActiveDevPlugins() });
+            const leaf2 = chain.find((n) => n.page);
+            if (leaf2) {
+              const src2 = readFileSync38(resolve38(appDirPath, leaf2.sourceDir, "page.vsk"), "utf-8");
+              const compName = extractCompName2(src2) || leaf2.page;
+              html = await renderFullPage(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: resolve38(appDirPath, leaf2.sourceDir, "page.vsk"), cached: cachedSsrCompile(ssrCompileCache, src2, resolve38(appDirPath, leaf2.sourceDir, "page.vsk")), plugins: getActiveDevPlugins() });
               html = html.replace("</body>", '	<script type="module" src="/_vesk/hmr.js"></script>\n</body>');
               html = await applyHtmlPlugins(html, getActiveDevPlugins(), { sourcePath: url.pathname });
             } else {
@@ -54703,11 +55506,11 @@ ${prettifyHtml(body)}
         const chain = cleanChain;
         const hasLayout = chain.some((n) => n.layout && existsSync42(resolve38(appDirPath, n.sourceDir, "layout.vsk")));
         if (!hasLayout) {
-          const leaf = chain.find((n) => n.page);
-          if (leaf) {
-            const src2 = readFileSync38(resolve38(appDirPath, leaf.sourceDir, "page.vsk"), "utf-8");
-            const compName = extractCompName2(src2) || leaf.page;
-            yield* renderPageStream(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: resolve38(appDirPath, leaf.sourceDir, "page.vsk"), cached: cachedSsrCompile(ssrCompileCache, src2, resolve38(appDirPath, leaf.sourceDir, "page.vsk")), plugins: getActiveDevPlugins() });
+          const leaf2 = chain.find((n) => n.page);
+          if (leaf2) {
+            const src2 = readFileSync38(resolve38(appDirPath, leaf2.sourceDir, "page.vsk"), "utf-8");
+            const compName = extractCompName2(src2) || leaf2.page;
+            yield* renderPageStream(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: resolve38(appDirPath, leaf2.sourceDir, "page.vsk"), cached: cachedSsrCompile(ssrCompileCache, src2, resolve38(appDirPath, leaf2.sourceDir, "page.vsk")), plugins: getActiveDevPlugins() });
           } else {
             throw new Error("No page or layout matched");
           }
@@ -55162,11 +55965,15 @@ __export(index_server_exports2, {
   get_server_context: () => get_server_context,
   headers: () => headers,
   isFormAction: () => isFormAction,
+  isLeaf: () => isLeaf,
   isLoadingActive: () => isLoadingActive,
+  isPrimitive: () => isPrimitive,
+  isVeskComponent: () => isVeskComponent,
   is_destroyed: () => is_destroyed,
   isr: () => isr,
   isrConfigToRevalidate: () => isrConfigToRevalidate,
   issuesToFieldMap: () => issuesToFieldMap,
+  leaf: () => leaf,
   locals: () => locals,
   maxLength: () => maxLength,
   minLength: () => minLength,
@@ -55180,12 +55987,14 @@ __export(index_server_exports2, {
   permanentRedirect: () => permanentRedirect,
   pop_component: () => pop_component,
   pre_effect: () => pre_effect,
+  primitive: () => primitive,
   push_component: () => push_component,
   readSignedCookie: () => readSignedCookie2,
   redirect: () => redirect,
   removeHook: () => removeHook,
   render: () => render,
   required: () => required,
+  rerenderNode: () => rerenderNode,
   resolveSsrResources: () => resolveSsrResources,
   resume_block: () => resume_block,
   revalidateComponent: () => revalidateComponent,
@@ -55209,6 +56018,7 @@ __export(index_server_exports2, {
   set_server_context: () => set_server_context,
   signCookie: () => signCookie2,
   tick: () => tick,
+  toDomNode: () => toDomNode,
   track: () => track,
   unlink_block: () => unlink_block,
   unsignCookie: () => unsignCookie2,
@@ -55244,6 +56054,7 @@ init_experiment();
 init_form();
 init_md();
 init_headless();
+init_primitive();
 init_loading_indicator();
 init_action();