@vesk/compiler 0.2.42 → 0.2.44

package/dist/actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../src/actions.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;CACb;AAED,eAAO,MAAM,aAAa,mBAAmB,CAAC;AAE9C,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAW9C;AA6BD;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAqCtF;AAeD,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,EAAE,CAOvG;AAED,iFAAiF;AACjF,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAsBzD"}
+{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../src/actions.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;CACb;AAED,eAAO,MAAM,aAAa,mBAAmB,CAAC;AAE9C,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAW9C;AA6BD;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAqCtF;AAeD,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,EAAE,CAWvG;AAaD,iFAAiF;AACjF,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAsBzD"}

package/dist/actions.js

@@ -3,6 +3,7 @@ import { print } from 'esrap';
 import ts from 'esrap/languages/ts';
 import { parse } from '@vesk/compiler/src/parser';
 import { stripTsTypes, hasTsSyntax, isTypeOnlyStatement, stripCodeTypes } from '@vesk/compiler/src/strip-ts';
+import { stripTrackDeclMarkers } from '@vesk/compiler/src/tokens';
 export const ACTION_PREFIX = '/_vesk/action/';
 export function hashString(str) {
     let h1 = 0x811c9dc5;
@@ -102,12 +103,27 @@ function printWithTypesStripped(ast, code, hadTs = hasTsSyntax(ast)) {
 export function transformTopLevelForActions(topLevelCode, mode) {
     const out = [];
     for (const c of topLevelCode) {
-        const rewritten = rewriteTopLevelActions(c, mode);
+        // A top-level TrackDecl (`const &[count] = track(0)`) is parser-only syntax:
+        // the `&` is still in this text, and both consumers are plain JavaScript
+        // engines — `new Function` on the server, a browser module parse for the
+        // client. Blank the markers before either sees the code.
+        const rewritten = rewriteTopLevelActions(stripTopLevelTrackDecls(c), mode);
         if (rewritten !== '')
             out.push(rewritten);
     }
     return out;
 }
+/** Remove TrackDecl `&` markers from a top-level code chunk. */
+function stripTopLevelTrackDecls(code) {
+    let ast;
+    try {
+        ast = parse(code);
+    }
+    catch {
+        return code;
+    }
+    return stripTrackDeclMarkers(code, 0, ast);
+}
 /** Collect the stable action ids defined by a page source (for the manifest). */
 export function collectActionIds(source) {
     const ids = [];

package/dist/client-codegen.d.ts

@@ -8,6 +8,18 @@ export interface TrackedInfo {
 export declare function semicolonizeStatement(code: string): string;
 export declare function transformTracked(irNode: Expression | RuntimeStatement | DynamicBinding, tracked: Map<string, TrackedInfo>): string;
 export declare function collectTrackedNames(body: IRNode[]): Map<string, TrackedInfo>;
+/**
+ * Collect the tracked bindings a prop expression READS, so a string-returning
+ * component call can be re-rendered when one of them changes.
+ *
+ * `primitive()` / `leaf()` bodies run once and their markup is converted once,
+ * so a tracked read inside them subscribes nothing. The call site passes the
+ * deps to {@link rerenderNode}, which re-reads them inside an effect.
+ *
+ * Property keys and member properties (`obj.bump`, `x.set(...)`) are not
+ * tracked reads — only the object positions are, matching `transformTracked`.
+ */
+export declare function collectTrackedDeps(value: unknown, tracked: Map<string, TrackedInfo>): string[];
 /**
  * Tracked reads inside a track/derived declaration init are re-emitted as
  * `get(…)` subscriptions so a `derived(() => … cell …)` (or
@@ -56,6 +68,19 @@ export declare function compileClientBoth(source: string, _componentName: string
     comp: string;
     hyd: string;
     name: string | null;
+    aliases: Array<{
+        local: string;
+        exported: string;
+    }>;
+    reexportPaths: string[];
+    componentNames: string[];
 };
+/**
+ * The component names a `.vsk` file declares. Used by the bundle to spot
+ * same-name declarations across files, which collide on the single global
+ * registry. Prefer the free `componentNames` from `compileClientBoth`; this
+ * exists for call sites that already have the source but no IR to hand.
+ */
+export declare function vskComponentNames(source: string, sourcePath?: string): string[];
 export { compileClient as compile, isStaticIR };
 //# sourceMappingURL=client-codegen.d.ts.map

package/dist/client-codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-codegen.d.ts","sourceRoot":"","sources":["../src/client-codegen.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAuB,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAGL,cAAc,EAQd,gBAAgB,EASjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAyCxD,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC;CAC1B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI1D;AAiDD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,gBAAgB,GAAG,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAiHlI;AAID,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAU5E;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAY5F;AAoBD,qDAAqD;AACrD,MAAM,MAAM,SAAS,GAAG;IAAE,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtC;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,KAAK,SAAI,GAAG,SAAS,CAQtE;AA83DD,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAe3C;AAmJD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO9C;AAqED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,MAAM,CAOpQ;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,UAAU,CAAC,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CA0BpD;AAED,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"client-codegen.d.ts","sourceRoot":"","sources":["../src/client-codegen.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAuB,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAGL,cAAc,EAQd,gBAAgB,EASjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAkGxD,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC;CAC1B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI1D;AAiDD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,gBAAgB,GAAG,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAgJlI;AAID,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAU5E;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,EAAE,CAuB9F;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAY5F;AAoBD,qDAAqD;AACrD,MAAM,MAAM,SAAS,GAAG;IAAE,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtC;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,KAAK,SAAI,GAAG,SAAS,CAQtE;AAi7DD,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAe3C;AAmJD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO9C;AAuED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,MAAM,CAOpQ;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,UAAU,CAAC,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAyC5J;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAG/E;AAED,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/dist/client-codegen.js

@@ -10,6 +10,7 @@ import { extractRuntimeNames, extractTopLevelNames } from '@vesk/compiler/src/se
 import { importBindingPairs, localValueImportNames } from '@vesk/compiler/src/module-imports';
 import { stripTrackGeneric } from '@vesk/compiler/src/scan';
 import { importModuleTarget } from '@vesk/compiler/src/tokens';
+import { collectVskReexportPaths, vskRegistryAliases } from '@vesk/compiler/src/vsk-imports';
 import { inlineMdImportsFrom } from '@vesk/compiler/src/md-inline';
 import { stripTsTypes, hasTsSyntax } from '@vesk/compiler/src/strip-ts';
 function memberExpr(object, property) {
@@ -42,6 +43,66 @@ function simpleGetName(expr) {
     }
     return inner;
 }
+const BINDING_REF_CALLS = ['bindValue', 'bindChecked', 'bindGroup'];
+/**
+ * A binding ref (`bindValue`/`bindChecked`/`bindGroup`) two-way-binds the raw
+ * tracked CELL — the web runtime expects the cell object, never its current
+ * value. transformTracked rewrites a virtual tracked name read to
+ * `get(cell)`, so `ref={bindValue(name)}` would compile to
+ * `bindValue(get(cell))` and hand the binding the cell's value. Untrack the
+ * first argument back to the bare cell name (`bindValue(cell)`), mirroring
+ * how a plain `ref={cell}` emits `set(cell, el)`. Function-form bindings
+ * (`bindValue(() => get(x), v => set(x, v))`) never start with `get(` and
+ * pass through unchanged. String scan only — no regex.
+ */
+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);
+}
+/**
+ * For a `ref=` binding whose expression resolves to a tracked cell — either a
+ * virtual name (`ref={box}` → emitted `get(boxCell)`) or the raw cell
+ * (`ref={boxCell}` → emitted `boxCell`) — the compiled mount must SET the cell
+ * to the element, not call the cell's current value. The old `(get(x))(el)`
+ * call form is only correct for function refs (`ref={el => x = el}`).
+ * Returns the cell name to assign, or null to keep the call form.
+ */
+function trackedRefTarget(expr, tracked) {
+    const cell = simpleGetName(expr);
+    if (cell !== null)
+        return cell;
+    if (/^[A-Za-z_$][\w$]*$/.test(expr)) {
+        const info = tracked.get(expr);
+        if (info && info.kind === 'cell' && info.cellName === expr)
+            return expr;
+    }
+    return null;
+}
 export function semicolonizeStatement(code) {
     const trimmed = code.trimEnd();
     if (!trimmed || trimmed.endsWith(';') || trimmed.endsWith('}'))
@@ -162,6 +223,25 @@ export function transformTracked(irNode, tracked) {
             }
             return context.next();
         },
+        Property(node, context) {
+            // Shorthand `{ bump }` shares ONE node for key and value, so the key
+            // skip below cannot apply. Rewriting the value makes the property
+            // non-shorthand, and the shorthand flag has to go with it — otherwise
+            // the printer emits `get(cell): get(cell)`, which is not parseable.
+            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) {
@@ -184,6 +264,16 @@ export function transformTracked(irNode, tracked) {
                     parent.key.type === 'Identifier' &&
                     parent.key.name === 'into')
                     return context.next();
+                // A non-computed, non-shorthand property KEY is a name, not a read:
+                // `{ bump: bump }` must keep the key `bump` even when `bump` is a
+                // tracked cell — rewriting it yields the unparseable
+                // `{ get(bump): get(bump) }`. Shorthand keys are the value node, so
+                // they fall through to the rewrite below (with `shorthand` cleared).
+                if (parent.type === 'Property' &&
+                    parent.key === node &&
+                    !parent.computed &&
+                    !parent.shorthand)
+                    return context.next();
                 if (parent.type === 'MemberExpression' &&
                     !parent.computed &&
                     parent.object === node &&
@@ -216,6 +306,42 @@ export function collectTrackedNames(body) {
     }
     return names;
 }
+/**
+ * Collect the tracked bindings a prop expression READS, so a string-returning
+ * component call can be re-rendered when one of them changes.
+ *
+ * `primitive()` / `leaf()` bodies run once and their markup is converted once,
+ * so a tracked read inside them subscribes nothing. The call site passes the
+ * deps to {@link rerenderNode}, which re-reads them inside an effect.
+ *
+ * Property keys and member properties (`obj.bump`, `x.set(...)`) are not
+ * tracked reads — only the object positions are, matching `transformTracked`.
+ */
+export function collectTrackedDeps(value, tracked) {
+    const ast = value?.ast;
+    if (!ast || typeof ast !== 'object' || tracked.size === 0)
+        return [];
+    const found = [];
+    const seen = new Set();
+    walk(ast, tracked, {
+        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;
+}
 /**
  * Tracked reads inside a track/derived declaration init are re-emitted as
  * `get(…)` subscriptions so a `derived(() => … cell …)` (or
@@ -597,8 +723,9 @@ function emitStatic(ctx, node, tracked, effectsVar, skipK = 0, regionBudget) {
                 const target = attr.target || '';
                 const isEvent = target.startsWith('on') && target.length > 2;
                 if (target === 'ref') {
-                    const expr = transformTracked(attr.expression, tracked);
-                    ctx.push(`(${expr})(${ssrEl});`);
+                    const expr = untrackBindingArg(transformTracked(attr.expression, tracked));
+                    const cell = trackedRefTarget(expr, tracked);
+                    ctx.push(cell !== null ? `set(${cell}, ${ssrEl});` : `(${expr})(${ssrEl});`);
                 }
                 else if (isEvent) {
                     const eventName = target.slice(2).toLowerCase();
@@ -689,8 +816,9 @@ function emitStatic(ctx, node, tracked, effectsVar, skipK = 0, regionBudget) {
         const target = attr.target || '';
         const isEvent = target.startsWith('on') && target.length > 2;
         if (target === 'ref') {
-            const expr = transformTracked(attr.expression, tracked);
-            ctx.push(`(${expr})(${el});`);
+            const expr = untrackBindingArg(transformTracked(attr.expression, tracked));
+            const cell = trackedRefTarget(expr, tracked);
+            ctx.push(cell !== null ? `set(${cell}, ${el});` : `(${expr})(${el});`);
         }
         else if (isEvent) {
             const eventName = target.slice(2).toLowerCase();
@@ -962,7 +1090,36 @@ function emitComponentCall(ctx, node, tracked, effectsVar, parentVar, compPrefix
     // as `children`: a fresh DocumentFragment per slot hoisted from the IR.
     const slotChildren = node.children.filter((c) => c instanceof PropSlot);
     const regChildren = node.children.filter((c) => !(c instanceof PropSlot));
-    const callArgs = () => `{ ${propsEntries.join(', ')} }`;
+    // Call targets that are not known compiled components (imported values,
+    // member-expression tags) cannot claim, so the caller adopts their SSR root
+    // itself. They also do not run the `props = reactiveProps(props)` prologue
+    // that compiled components carry, so tracked cells passed as props would
+    // reach them raw — the server unwraps them, so a `primitive()`/`leaf()`
+    // reading `props.bump` would render `0[object Object]` on the client only.
+    // Wrap the literal here to keep both sides reading values.
+    const plainTarget = !!(calleeExpr || ctx.importedNames.has(node.componentName)) && !ctx.selfClaimNames.has(node.componentName);
+    // Tracked bindings this call's markup is derived from. Only a plain target
+    // needs them: a compiled component re-runs its own bindings, but a
+    // `primitive()`/`leaf()`/imported helper that READS a cell through
+    // `reactiveProps` would otherwise leave its markup stale forever.
+    const trackedDeps = [];
+    if (plainTarget) {
+        for (const p of node.props) {
+            if (typeof p.value === 'string')
+                continue;
+            for (const d of collectTrackedDeps(p.value, tracked))
+                if (!trackedDeps.includes(d))
+                    trackedDeps.push(d);
+        }
+        for (const sp of node.spreadProps) {
+            for (const d of collectTrackedDeps(sp, tracked))
+                if (!trackedDeps.includes(d))
+                    trackedDeps.push(d);
+        }
+    }
+    const callArgs = () => (plainTarget
+        ? `reactiveProps({ ${propsEntries.join(', ')} })`
+        : `{ ${propsEntries.join(', ')} }`);
     if (ctx.hydrate) {
         const access = calleeExpr
             ?? (ctx.importedNames.has(node.componentName)
@@ -982,7 +1139,6 @@ function emitComponentCall(ctx, node, tracked, effectsVar, parentVar, compPrefix
         // compiled components (imported values, member-expression tags) cannot
         // claim, so after the call we adopt their SSR root ourselves and replace it
         // with the fresh node they returned — never a duplicate, never a box.
-        const plainTarget = !!(calleeExpr || ctx.importedNames.has(node.componentName)) && !ctx.selfClaimNames.has(node.componentName);
         const walkerArg = ctx.walker;
         // Markerless value-thread offset (Phase 3.c): the residue that precedes THIS
         // call site — a static sibling the walker never claimed (`skipK`), or a
@@ -1001,13 +1157,21 @@ function emitComponentCall(ctx, node, tracked, effectsVar, parentVar, compPrefix
         const maybeReplace = (v) => {
             if (!plainTarget)
                 return;
-            // nodeType 11 = DocumentFragment: self-claiming imports (Link/Md/Form)
+            // nodeType 11 = DocumentFragment. Self-claiming imports (Link/Md/Form)
             // return a fragment when they adopted their SSR root, so there is nothing
-            // to replace — claiming here would steal the NEXT sibling's root.
+            // to replace — claiming here would steal the NEXT sibling's root. Those
+            // are excluded by `plainTarget` above, so a fragment reaching this branch
+            // is a plain target that returned SEVERAL roots (a leaf/primitive string
+            // with siblings in it) and its children must be spliced in. Branch on the
+            // runtime nodeType rather than guessing at the target's authoring style.
             const claim = promptExpr
                 ? `${walkerArg}.claimOnly(undefined, ${promptExpr})`
                 : `${walkerArg}.claimOnly()`;
-            ctx.push(`if (${v} && ${v}.parentNode == null && ${v}.nodeType !== 11) { const __sr = ${claim}; if (__sr && __sr.parentNode) __sr.parentNode.replaceChild(${v}, __sr); }`);
+            // A several-root render owns as many SSR slots as it has roots. Claiming
+            // one and splicing the rest in front of it left the unclaimed SSR
+            // siblings in place, duplicating them; the extra claims are removed with
+            // the first so the fresh roots land exactly where the SSR range sat.
+            ctx.push(`if (${v} && ${v}.parentNode == null) { if (${v}.nodeType === 11) { const __cnt = ${v}.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 (${v}.firstChild) __p.insertBefore(${v}.firstChild, __sr); __p.removeChild(__sr); } } else { const __sr = ${claim}; if (__sr && __sr.parentNode) __sr.parentNode.replaceChild(${v}, __sr); } }`);
             // A plain target consumes the region budget at adoption; subsequent
             // claims in the enclosing branch must resolve positionally from here.
             if (regionBudget && ctx.markerless)
@@ -1058,7 +1222,13 @@ function emitComponentCall(ctx, node, tracked, effectsVar, parentVar, compPrefix
         }
         ctx.push(`let ${v} = undefined;`);
         ctx.push(`if (__hydrate) __hydrate.childFrame = (__hydrate.childFrame || 0) + 1;`);
-        ctx.push(`try { ${v} = ${awaitKw}${access}(${callArgs()}, __registry, ${walkerArg}); } finally { if (__hydrate) __hydrate.childFrame--; }`);
+        ctx.push(`try { ${v} = toDomNode(${awaitKw}${access}(${callArgs()}, __registry, ${walkerArg})); } finally { if (__hydrate) __hydrate.childFrame--; }`);
+        // Snapshot a several-root render's roots HERE, while the fragment still
+        // holds them: adoption drains it, and an emptied fragment is no handle for
+        // `rerenderNode` to follow on the next update.
+        const rootsVar = trackedDeps.length > 0 ? ctx.n() : null;
+        if (rootsVar)
+            ctx.push(`const ${rootsVar} = ${v} && ${v}.nodeType === 11 ? Array.from(${v}.childNodes) : [${v}];`);
         // Spend the region budget only once the call RETURNS: a self-claiming child
         // that throws before claiming (the try/catch fallback in / with fail:true)
         // consumed the takeSkipK deposit but never advanced the walker cursor, so the
@@ -1069,6 +1239,9 @@ function emitComponentCall(ctx, node, tracked, effectsVar, parentVar, compPrefix
             ctx.push(`${regionBudget} = 0;`);
         maybeReplace(v);
         maybeRetire();
+        if (trackedDeps.length > 0) {
+            ctx.push(`rerenderNode(${rootsVar}, [${trackedDeps.join(', ')}], () => ${awaitKw}${access}(${callArgs()}, __registry, ${walkerArg}));`);
+        }
         return v;
     }
     else {
@@ -1093,14 +1266,24 @@ function emitComponentCall(ctx, node, tracked, effectsVar, parentVar, compPrefix
             propsEntries.push(`children: ${frag}`);
         }
         if (calleeExpr) {
-            ctx.push(`const ${v} = ${calleeExpr}(${callArgs()});`);
+            ctx.push(`const ${v} = toDomNode(${calleeExpr}(${callArgs()}));`);
         }
         else if (ctx.importedNames.has(node.componentName)) {
-            ctx.push(`const ${v} = ${awaitKw}${node.componentName}(${callArgs()});`);
+            ctx.push(`const ${v} = toDomNode(${awaitKw}${node.componentName}(${callArgs()}));`);
         }
         else {
             ctx.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.`)});`);
-            ctx.push(`const ${v} = ${awaitKw}${compPrefix}[${JSON.stringify(node.componentName)}](${callArgs()});`);
+            ctx.push(`const ${v} = toDomNode(${awaitKw}${compPrefix}[${JSON.stringify(node.componentName)}](${callArgs()}));`);
+        }
+        if (trackedDeps.length > 0) {
+            const calleeRef = calleeExpr
+                ?? (ctx.importedNames.has(node.componentName)
+                    ? node.componentName
+                    : `${compPrefix}[${JSON.stringify(node.componentName)}]`);
+            // Snapshot the roots while the fragment still holds them — see above.
+            const rootsVar2 = ctx.n();
+            ctx.push(`const ${rootsVar2} = ${v} && ${v}.nodeType === 11 ? Array.from(${v}.childNodes) : [${v}];`);
+            ctx.push(`rerenderNode(${rootsVar2}, [${trackedDeps.join(', ')}], () => ${awaitKw}${calleeRef}(${callArgs()}));`);
         }
     }
     return v;
@@ -2554,7 +2737,9 @@ function emitClientFromIR(ir, options) {
         }
     }
     const exportCode = exportLines.join('\n');
-    const runtimeNames = ['track', 'get', 'set', 'destroy_block', 'getActiveComponent', 'setActiveComponent', 'reactiveProps', 'applyStyle'];
+    // `toDomNode` normalizes a component call's return (a primitive/leaf string)
+    // into a Node; it is emitted at every call site, so it is always needed.
+    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))
@@ -2638,12 +2823,37 @@ export function compileClientBoth(source, _componentName, sourcePath, opts) {
     // allocator: hyd continues after the names comp already consumed.
     const alloc = nameAllocFor(sourcePath);
     const comp = emitClientFromIR(ir, { forceClient: true, nameAllocator: alloc });
+    // `.vsk` modules are registry-keyed, not real ES modules: `export { A as B }`
+    // and `import { A as B } from './x.vsk'` are aliases the client bundle must
+    // register on `__components`, since nothing is emitted for them.
+    const aliases = vskRegistryAliases(ir.imports, ir.exportAliases);
+    // `export * from './x.vsk'` targets must be compiled and registered in this
+    // file's chunk too, exactly like `.vsk` imports.
+    const reexportPaths = sourcePath
+        ? collectVskReexportPaths(ir.reexportSources, sourcePath)
+        : [];
     if (opts?.skipHyd)
-        return { comp, hyd: '', name };
+        return { comp, hyd: '', name, aliases, reexportPaths, componentNames: ir.components.map((c) => c.name) };
     return {
         comp,
         hyd: emitClientFromIR(irHyd, { forceClient: true, hydrate: true, includeTopLevel: false, nameAllocator: alloc, markerless: opts?.markerless !== false }),
         name,
+        aliases,
+        reexportPaths,
+        // Every component NAME this file registers, not just the resolved one —
+        // the bundle needs the full list to spot same-name declarations across
+        // files (see findVskComponentCollisions).
+        componentNames: ir.components.map((c) => c.name),
     };
 }
+/**
+ * The component names a `.vsk` file declares. Used by the bundle to spot
+ * same-name declarations across files, which collide on the single global
+ * registry. Prefer the free `componentNames` from `compileClientBoth`; this
+ * exists for call sites that already have the source but no IR to hand.
+ */
+export function vskComponentNames(source, sourcePath) {
+    const ast = parse(source, sourcePath ? { filename: sourcePath } : {});
+    return generateIR(ast, source, sourcePath).components.map((c) => c.name);
+}
 export { compileClient as compile, isStaticIR };

package/dist/errors.d.ts

@@ -22,6 +22,20 @@ export declare class VeskError extends Error {
     code?: string;
     constructor(message: string, opts?: VeskErrorOptions);
     static notFound(name: string, candidates?: string[], context?: VeskErrorOptions): VeskError;
+    /**
+     * A `.vsk` namespace is resolved at the JSX-tag level: `<ns.Icon />` looks
+     * the component up in the registry by its exported name, exactly like
+     * `import { Icon }`, and no module object is ever built. The two forms that
+     * genuinely need a real module object are reported here.
+     *
+     * - `nested` — `<ns.Sub.Icon />`. A `.vsk` module's exports are flat
+     *   component names, so there is no object to walk into.
+     * - `value` — `ns.max` read as a value. Component tags resolve; plain value
+     *   reads do not, because nothing binds `ns` at runtime.
+     */
+    static vskNamespaceMember(context?: VeskErrorOptions & {
+        form?: 'nested' | 'value';
+    }): VeskError;
     static classDecl(context?: VeskErrorOptions): VeskError;
     static serverBlockInClient(compName: string, context?: VeskErrorOptions): VeskError;
     static clientBlockInServer(compName: string, context?: VeskErrorOptions): VeskError;

package/dist/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAoBxD;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,GAAE,MAAU,GAAG,MAAM,GAAG,IAAI,CAWrG;AAqCD,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,SAAI,EAAE,KAAK,SAAI,GAAG,MAAM,CAkBrG;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAgBD,qBAAa,SAAU,SAAQ,KAAK;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;gBAEF,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,gBAAqB;IAYxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IA8BnG,MAAM,CAAC,SAAS,CAAC,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAoB3D,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAmBvF,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAmBvF,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAO3G,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAYvG,MAAM,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAmB/G,MAAM,CAAC,cAAc,CAAC,OAAO,GAAE,gBAAgB,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,SAAS;IAmBpF,QAAQ,IAAI,MAAM;IA0BlB,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAclC"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAoBxD;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,GAAE,MAAU,GAAG,MAAM,GAAG,IAAI,CAWrG;AAqCD,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,SAAI,EAAE,KAAK,SAAI,GAAG,MAAM,CAkBrG;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAgBD,qBAAa,SAAU,SAAQ,KAAK;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;gBAEF,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,gBAAqB;IAYxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IA8BnG;;;;;;;;;;OAUG;IACH,MAAM,CAAC,kBAAkB,CAAC,OAAO,GAAE,gBAAgB,GAAG;QAAE,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAA;KAAO,GAAG,SAAS;IA6BpG,MAAM,CAAC,SAAS,CAAC,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAoB3D,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAmBvF,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAmBvF,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAO3G,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAYvG,MAAM,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAmB/G,MAAM,CAAC,cAAc,CAAC,OAAO,GAAE,gBAAgB,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,SAAS;IAmBpF,QAAQ,IAAI,MAAM;IA0BlB,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAclC"}

package/dist/errors.js

@@ -150,6 +150,42 @@ export class VeskError extends Error {
                 : '',
         });
     }
+    /**
+     * A `.vsk` namespace is resolved at the JSX-tag level: `<ns.Icon />` looks
+     * the component up in the registry by its exported name, exactly like
+     * `import { Icon }`, and no module object is ever built. The two forms that
+     * genuinely need a real module object are reported here.
+     *
+     * - `nested` — `<ns.Sub.Icon />`. A `.vsk` module's exports are flat
+     *   component names, so there is no object to walk into.
+     * - `value` — `ns.max` read as a value. Component tags resolve; plain value
+     *   reads do not, because nothing binds `ns` at runtime.
+     */
+    static vskNamespaceMember(context = {}) {
+        const nested = context.form === 'nested';
+        return new VeskError(nested
+            ? 'A `.vsk` namespace is flat, so `<ns.Sub.Icon />` cannot be resolved.'
+            : 'A `.vsk` namespace resolves component tags only, so `ns.value` is not available.', {
+            ...context,
+            code: context.code || 'V0410',
+            suggestions: nested
+                ? [
+                    "Import the component by name: import { Icon } from './icons.vsk'",
+                    "Import from the module that owns Sub: import * as Sub from './sub.vsk'",
+                ]
+                : [
+                    "Import the value by name: import { MAX } from './constants.vsk'",
+                    'Move the value into a .ts module and import it from there — those are real ES modules with live bindings.',
+                ],
+            nextSteps: [
+                'A `.vsk` tag resolves by component name in the global registry, not by module exports, so `import * as ns` + `<ns.Icon />` needs no module object.',
+                nested
+                    ? 'Re-export with a flat name (`export { Icon }`) or import the component directly.'
+                    : 'Re-export the value under a flat name and import it directly, or keep the value in a .ts module.',
+            ],
+            tip: '`<ns.Icon />` works; only nested paths and value reads need a real module namespace.',
+        });
+    }
     static classDecl(context = {}) {
         return new VeskError('class declarations are not supported inside Vesk components.', {
             ...context,

package/dist/ir-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ir-generator.d.ts","sourceRoot":"","sources":["../src/ir-generator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EAsBP,MAAM,uBAAuB,CAAC;AA2T/B,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,GAAG,CAAC;IAAC,cAAc,CAAC,EAAE,GAAG,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC,GAAG,SAAS,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkCnL;AA48BD,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CA6N9E"}
+{"version":3,"file":"ir-generator.d.ts","sourceRoot":"","sources":["../src/ir-generator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EAsBP,MAAM,uBAAuB,CAAC;AA2T/B,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,GAAG,CAAC;IAAC,cAAc,CAAC,EAAE,GAAG,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC,GAAG,SAAS,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkCnL;AA6nCD,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAgS9E"}