@vesk/compiler 0.2.43 → 0.2.44

package/dist/client-codegen.d.ts

@@ -73,6 +73,14 @@ export declare function compileClientBoth(source: string, _componentName: 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;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,CAAA;CAAE,CAqClI;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

@@ -2833,13 +2833,27 @@ export function compileClientBoth(source, _componentName, sourcePath, opts) {
         ? collectVskReexportPaths(ir.reexportSources, sourcePath)
         : [];
     if (opts?.skipHyd)
-        return { comp, hyd: '', name, aliases, reexportPaths };
+        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,7 +22,20 @@ export declare class VeskError extends Error {
     code?: string;
     constructor(message: string, opts?: VeskErrorOptions);
     static notFound(name: string, candidates?: string[], context?: VeskErrorOptions): VeskError;
-    static vskNamespaceTag(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,eAAe,CAAC,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAmBjE,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,19 +150,40 @@ export class VeskError extends Error {
                 : '',
         });
     }
-    static vskNamespaceTag(context = {}) {
-        return new VeskError('Namespace imports are not supported for `.vsk` modules.', {
+    /**
+     * 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: [
-                "Import the component by name: import { MyIcon } from './icons.vsk'",
-                "Rename on import: import { MyIcon as Icon } from './icons.vsk'",
-            ],
+            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` 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 — those are real ES modules.',
+                '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: 'A `.vsk` module exposes its components as named exports; use a named or renamed import rather than `import * as ns`.',
+            tip: '`<ns.Icon />` works; only nested paths and value reads need a real module namespace.',
         });
     }
     static classDecl(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;AA++BD,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAgS9E"}
+{"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"}

package/dist/ir-generator.js

@@ -407,6 +407,26 @@ function jsxTagRootName(nameNode) {
         node = node.object;
     return node && node.type === 'JSXIdentifier' ? node.name : '';
 }
+/** The final property of a dotted JSX tag: `NS.A.B` → `B`. */
+function jsxTagMemberName(nameNode) {
+    let node = nameNode;
+    while (node && node.type === 'JSXMemberExpression') {
+        node = node.property;
+        if (node && node.type === 'JSXIdentifier')
+            return node.name;
+    }
+    return '';
+}
+/** How many member hops a dotted tag has: `NS.A` → 1, `NS.A.B` → 2. */
+function jsxTagDepth(nameNode) {
+    let depth = 0;
+    let node = nameNode;
+    while (node && node.type === 'JSXMemberExpression') {
+        depth++;
+        node = node.object;
+    }
+    return depth;
+}
 // Set for the duration of one `generateIR` call so `processJSXElement` — which
 // is reached from eleven call sites and would otherwise need a context
 // parameter threaded through all of them — can reject `<ns.Tag />` for a
@@ -414,24 +434,154 @@ function jsxTagRootName(nameNode) {
 let currentVskNamespaceLocals = null;
 let currentSourceFile;
 /**
- * Local names bound by `import * as ns from './x.vsk'`. Only `.vsk` targets are
- * collected — a namespace import from a real module (`./x.ts`, a package) is a
- * genuine object and `<ns.Tag />` works there.
+ * Local names bound by `import * as ns from './x.vsk'` that are NOT shadowed by
+ * any other binding in the file. A `.vsk` namespace is only special when the
+ * name still refers to the import: if a parameter or a local shadows it, the
+ * tag is an ordinary member expression on a real object and must keep the
+ * `calleeExpr` path. Names the file re-binds are therefore dropped here, which
+ * also keeps the value-position check from rejecting valid shadowed code.
  */
 function collectVskNamespaceLocals(ast) {
-    const out = new Set();
+    const namespaceLocals = new Map();
     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);
+            if (spec.type === 'ImportNamespaceSpecifier' && spec.local?.name) {
+                namespaceLocals.set(spec.local.name, { path: node.source.value, shadowed: false });
+            }
         }
     }
+    if (namespaceLocals.size === 0)
+        return new Set();
+    markShadowedBindings(ast, namespaceLocals);
+    return new Set([...namespaceLocals].filter(([, v]) => !v.shadowed).map(([k]) => k));
+}
+/**
+ * Flags every namespace local that the file also binds by some other means.
+ * The namespace import itself is the only declaration that does NOT shadow —
+ * everything else (var/let/const, function and class declarations, any
+ * parameter list, catch bindings) means the name is a plain local from here on.
+ */
+function markShadowedBindings(node, namespaceLocals) {
+    if (!node || typeof node !== 'object')
+        return;
+    if (Array.isArray(node)) {
+        for (const child of node)
+            markShadowedBindings(child, namespaceLocals);
+        return;
+    }
+    if (typeof node.type === 'string') {
+        if (node.type === 'ImportNamespaceSpecifier')
+            return; // the import itself
+        for (const name of declaredBindingNames(node)) {
+            const entry = namespaceLocals.get(name);
+            if (entry)
+                entry.shadowed = true;
+        }
+    }
+    for (const key of Object.keys(node)) {
+        if (key === 'loc' || key === 'range' || key === 'start' || key === 'end')
+            continue;
+        markShadowedBindings(node[key], namespaceLocals);
+    }
+}
+/** Names a single binding-bearing node introduces. */
+function declaredBindingNames(node) {
+    const out = [];
+    const pushPattern = (id) => {
+        if (!id)
+            return;
+        if (id.type === 'Identifier') {
+            out.push(id.name);
+            return;
+        }
+        if (id.type === 'ObjectPattern') {
+            for (const prop of id.properties || []) {
+                if (prop.type === 'RestElement')
+                    pushPattern(prop.argument);
+                else
+                    pushPattern(prop.value);
+            }
+            return;
+        }
+        if (id.type === 'ArrayPattern') {
+            for (const el of id.elements || [])
+                if (el)
+                    pushPattern(el.type === 'RestElement' ? el.argument : el);
+            return;
+        }
+        if (id.type === 'AssignmentPattern')
+            pushPattern(id.left);
+        if (id.type === 'RestElement')
+            pushPattern(id.argument);
+    };
+    switch (node.type) {
+        case 'VariableDeclarator':
+            pushPattern(node.id);
+            break;
+        case 'FunctionDeclaration':
+        case 'FunctionExpression':
+        case 'ArrowFunctionExpression':
+            if (node.id)
+                pushPattern(node.id);
+            for (const param of node.params || [])
+                pushPattern(param);
+            break;
+        case 'ClassDeclaration':
+        case 'ClassExpression':
+            if (node.id)
+                pushPattern(node.id);
+            break;
+        case 'CatchClause':
+            pushPattern(node.param);
+            break;
+        default:
+            break;
+    }
     return out;
 }
+/**
+ * Rejects reading a member off a `.vsk` namespace in *value* position. A
+ * namespace is resolved only for component tags, so `ns.max` in an expression
+ * has nothing bound to it at runtime — say so here instead of failing later
+ * with a bare `ReferenceError: ns is not defined`.
+ */
+function assertNoVskNamespaceValue(source, expr) {
+    if (!currentVskNamespaceLocals || currentVskNamespaceLocals.size === 0)
+        return;
+    const hit = findNamespaceValueUse(expr, currentVskNamespaceLocals);
+    if (!hit)
+        return;
+    const { line, column } = offsetToLineCol(source, hit.start ?? 0);
+    throw VeskError.vskNamespaceMember({ file: currentSourceFile, line, column, code: codeFrame(source, line, column), form: 'value' });
+}
+function findNamespaceValueUse(node, locals) {
+    if (!node || typeof node !== 'object')
+        return null;
+    if (Array.isArray(node)) {
+        for (const child of node) {
+            const hit = findNamespaceValueUse(child, locals);
+            if (hit)
+                return hit;
+        }
+        return null;
+    }
+    if (typeof node.type !== 'string')
+        return null;
+    if (node.type === 'MemberExpression' && node.object?.type === 'Identifier' && locals.has(node.object.name))
+        return node;
+    for (const key of Object.keys(node)) {
+        if (key === 'loc' || key === 'range' || key === 'start' || key === 'end')
+            continue;
+        const hit = findNamespaceValueUse(node[key], locals);
+        if (hit)
+            return hit;
+    }
+    return null;
+}
 function isHTMLTag(name) {
     return name.length > 0 && name[0] === name[0].toLowerCase();
 }
@@ -443,6 +593,7 @@ function isMapCall(expr) {
         expr.arguments[0].type === 'ArrowFunctionExpression');
 }
 function toExpression(source, expr) {
+    assertNoVskNamespaceValue(source, expr);
     return new Expression(getSource(source, expr), [], expr, source);
 }
 function processAttribute(source, attr) {
@@ -920,12 +1071,24 @@ function processJSXElement(source, element) {
     // registry lookup by dotted string.
     if (nameNode && nameNode.type === 'JSXMemberExpression') {
         const root = jsxTagRootName(nameNode);
-        if (currentVskNamespaceLocals && currentVskNamespaceLocals.has(root)) {
+        const isVskNamespace = !!currentVskNamespaceLocals && currentVskNamespaceLocals.has(root);
+        if (isVskNamespace && jsxTagDepth(nameNode) > 1) {
+            // A `.vsk` module's exports are flat component names, so there is no
+            // nested namespace object to walk into.
             const { line, column } = offsetToLineCol(source, nameNode.start ?? 0);
-            throw VeskError.vskNamespaceTag({ file: currentSourceFile, line, column, code: codeFrame(source, line, column) });
+            throw VeskError.vskNamespaceMember({ file: currentSourceFile, line, column, code: codeFrame(source, line, column), form: 'nested' });
         }
         const { props, spreadProps, slots } = extractProps(source, element);
         const children = selfClosing ? [] : processJSXChildren(source, element.children || []);
+        if (isVskNamespace) {
+            // `<ns.Icon />` after `import * as ns from './lib.vsk'` resolves to the
+            // same registry entry `import { Icon }` would, keyed by the EXPORTED name.
+            // Deliberately carries no `calleeExpr`: both codegen paths must take the
+            // registry branch so `<ns.Icon />` keeps the "component was not found"
+            // guard and hydrates like any other compiled component. The namespace
+            // object itself is never built.
+            return [new ComponentCall(jsxTagMemberName(nameNode), props, [...children, ...slots.map((s) => new PropSlot(s.name, s.nodes))], spreadProps, element.start)];
+        }
         return [new ComponentCall(tagName, props, [...children, ...slots.map((s) => new PropSlot(s.name, s.nodes))], spreadProps, element.start, getSource(source, nameNode))];
     }
     if (!isHTMLTag(tagName) && selfClosing) {

package/dist/server-render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-render.d.ts","sourceRoot":"","sources":["../src/server-render.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server-render.d.ts","sourceRoot":"","sources":["../src/server-render.ts"],"names":[],"mappings":"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"}

package/dist/server-render.js

@@ -10,8 +10,9 @@ import { buildComponentMap } from '@vesk/compiler/src/server-jsgen';
 import { transformTopLevelForActions } from '@vesk/compiler/src/actions';
 import { collectVskImportPaths, collectVskReexportPaths, vskRegistryAliases, applyVskRegistryAliases } from '@vesk/compiler/src/vsk-imports';
 import { inlineMdImportsFrom, guessProjectRoots } from '@vesk/compiler/src/md-inline';
-import { withSsrStore, ssrSink } from '@vesk/compiler/src/ssr-store';
+import { withSsrStore, withSsrStoreOf, adoptSsrStore, ssrSink, keepSsrSlot, dropSsrSlot, isSsrSlotLive } from '@vesk/compiler/src/ssr-store';
 import { applyLocalModuleImports } from '@vesk/compiler/src/module-imports';
+import { VskComponentOwners } from '@vesk/compiler/src/vsk-collision';
 // Registry-hoisted sub components are invoked with the caller's `__vesk`,
 // but each component's scope declaration destructures its DEFINING file's
 // top-level bindings. When two `.vsk` files declare the same top-level name
@@ -22,9 +23,12 @@ function scopedVesk(fn, fallback) {
     return fn.__veskScope || fallback;
 }
 export function compileFile(source, options) {
-    return compileFileInternal(source, options?.sourcePath, new Set());
+    const owners = new VskComponentOwners();
+    const result = compileFileInternal(source, options?.sourcePath, new Set(), owners);
+    owners.report('SSR');
+    return result;
 }
-function compileFileInternal(source, sourcePath, seenImportFiles) {
+function compileFileInternal(source, sourcePath, seenImportFiles, owners) {
     if (sourcePath) {
         const dir = dirname(sourcePath);
         source = inlineMdImportsFrom(source, sourcePath, guessProjectRoots(dir));
@@ -33,6 +37,12 @@ function compileFileInternal(source, sourcePath, seenImportFiles) {
     const ir = generateIR(ast, source, sourcePath);
     const componentMap = buildComponentMap(ir, true);
     const ownComponentNames = ir.components.map((c) => c.name);
+    // Every component shares one registry, so a name declared in two files
+    // resolves to one of them. SSR keeps the FIRST, the client keeps the LAST —
+    // report it rather than letting the two sides render different components.
+    if (sourcePath && owners)
+        for (const n of ownComponentNames)
+            owners.claim(n, sourcePath);
     const __vesk = loadRuntimeImports(ir.imports);
     applyLocalModuleImports(__vesk, ir.imports, sourcePath);
     if (sourcePath) {
@@ -55,7 +65,7 @@ function compileFileInternal(source, sourcePath, seenImportFiles) {
             catch {
                 continue;
             }
-            const sub = compileFileInternal(importedSrc, importPath, seenImportFiles);
+            const sub = compileFileInternal(importedSrc, importPath, seenImportFiles, owners);
             for (const [name, fn] of sub.componentMap) {
                 if (!componentMap.has(name))
                     componentMap.set(name, fn);
@@ -95,32 +105,39 @@ export function render(source, componentName, props = {}, registry = new Map(),
     const targetComp = compiled.ir.components.find((c) => c.name === componentName);
     const isAsyncComp = !!(targetComp && (targetComp.isAsync || targetComp.ssrAwait));
     globalThis.__vsk_ssr = true;
-    if (!globalThis.__vsk_ssr_token)
-        globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
-    const renderToken = globalThis.__vsk_ssr_token;
-    if (isAsyncComp) {
-        return withSsrStore(() => (async () => {
-            let bodyHtml;
-            try {
-                bodyHtml = await renderFn(props, fullRegistry, scopedVesk(renderFn, __vesk));
-            }
-            finally {
-                delete globalThis.__vsk_ssr;
-                await settleSsrPromises(renderToken);
-                clearSsrCells(renderToken);
-            }
-            return bodyHtml;
-        })());
-    }
-    let bodyHtml;
-    try {
-        bodyHtml = withSsrStore(() => renderFn(props, fullRegistry, scopedVesk(renderFn, __vesk)));
-    }
-    finally {
-        delete globalThis.__vsk_ssr;
-        clearSsrCells(renderToken);
-    }
-    return bodyHtml;
+    // Resolve the token INSIDE the render scope. The global is an AsyncLocalStorage
+    // accessor (see ssr-store.ts), so outside a scope it reads undefined and any
+    // assignment is dropped — reading it first would leave renderToken undefined
+    // and silently skip the settle/cleanup below.
+    return withSsrStore(() => {
+        if (!globalThis.__vsk_ssr_token)
+            globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
+        const renderToken = globalThis.__vsk_ssr_token;
+        keepSsrSlot(renderToken);
+        if (isAsyncComp) {
+            return (async () => {
+                let bodyHtml;
+                try {
+                    bodyHtml = await renderFn(props, fullRegistry, scopedVesk(renderFn, __vesk));
+                }
+                finally {
+                    delete globalThis.__vsk_ssr;
+                    await settleSsrPromises(renderToken);
+                    clearSsrCells(renderToken);
+                }
+                return bodyHtml;
+            })();
+        }
+        let bodyHtml;
+        try {
+            bodyHtml = renderFn(props, fullRegistry, scopedVesk(renderFn, __vesk));
+        }
+        finally {
+            delete globalThis.__vsk_ssr;
+            clearSsrCells(renderToken);
+        }
+        return bodyHtml;
+    });
 }
 export function renderPage(source, componentName, props = {}, registry = new Map(), options = {}) {
     resetVskState(!!options.hydrate, options.markerless !== false);
@@ -151,9 +168,10 @@ export function renderPage(source, componentName, props = {}, registry = new Map
         if (!globalThis.__vsk_ssr_token)
             globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
         const renderToken = globalThis.__vsk_ssr_token;
+        keepSsrSlot(renderToken);
         pruneSsrDataSlots();
         if (targetComp && (targetComp.isAsync || targetComp.ssrAwait)) {
-            return withSsrStore(() => (async () => {
+            return (async () => {
                 let bodyHtml;
                 try {
                     bodyHtml = await renderFn(ssrProps, fullRegistry, scopedVesk(renderFn, __vesk));
@@ -172,11 +190,11 @@ export function renderPage(source, componentName, props = {}, registry = new Map
                     head: renderHeadHtml(targetComp, ssrProps),
                     props: ssrProps
                 };
-            })());
+            })();
         }
         let bodyHtml;
         try {
-            bodyHtml = withSsrStore(() => renderFn(ssrProps, fullRegistry, scopedVesk(renderFn, __vesk)));
+            bodyHtml = renderFn(ssrProps, fullRegistry, scopedVesk(renderFn, __vesk));
         }
         finally {
             delete globalThis.__vsk_ssr;
@@ -186,11 +204,11 @@ export function renderPage(source, componentName, props = {}, registry = new Map
         if (pending && pending.length > 0) {
             // A sync component still started server resources (useFetch): settle them
             // before returning so the handoff serializes real data, not loading state.
-            return withSsrStore(() => (async () => {
+            return (async () => {
                 await settleSsrPromises(renderToken);
                 clearSsrCells(renderToken);
                 return { body: bodyHtml, head: headHtml, props: ssrProps };
-            })());
+            })();
         }
         clearSsrCells(renderToken);
         return { body: bodyHtml, head: headHtml, props: ssrProps };
@@ -217,6 +235,10 @@ function clearSsrCells(token) {
         return;
     delete globalThis[`__vsk_ssr_promises_${token}`];
     delete globalThis[`__vsk_ssr_failures_${token}`];
+    // This render is done with the token: release the slot so the reaper below
+    // can collect paths that never run renderFullPage (a bare renderPage/render
+    // leaves its data slot behind for the full-page merge).
+    dropSsrSlot(token);
     const cells = globalThis.__vsk_ssr_cells;
     if (!cells || !(cells instanceof Map))
         return;
@@ -233,24 +255,50 @@ function clearSsrCells(token) {
 async function settleSsrPromises(token) {
     if (!token)
         return;
-    const pending = globalThis[`__vsk_ssr_promises_${token}`];
-    if (!pending || pending.length === 0)
-        return;
-    await Promise.allSettled(pending);
+    const key = `__vsk_ssr_promises_${token}`;
+    // Drain until the queue stops growing. The runtime only ever pushes onto
+    // this array, and settling one promise can register another: an async
+    // component body re-runs after its previous await and starts the next
+    // fetch. A single allSettled over a snapshot returns before that lands, so
+    // the render serializes an empty data slot and ships without its ssr-data
+    // script — the client then refetches what SSR already had.
+    for (let round = 0; round < 10; round++) {
+        const pending = globalThis[key];
+        if (!pending || pending.length === 0)
+            return;
+        const before = pending.length;
+        await Promise.allSettled(pending.slice());
+        const after = globalThis[key];
+        if (!after || after.length <= before)
+            return;
+    }
 }
 /**
  * Bound the per-token SSR data slots against abandonment (dev-partial
  * renderPage / render() that never runs renderFullPage). Slots are keyed by
- * Math.random tokens, so deleted-slot accounting by token can't be cleaned by
+ * per-request tokens, so deleted-slot accounting by token can't be cleaned by
  * an owning render; cap the map instead. RenderFullPage/RenderPageStream delete
  * their own slot + token in every path, so this only guards the untracked ones.
+ *
+ * Live renders are exempt. Slots are only reapable once no render owns them
+ * (see isSsrSlotLive) — a cap that ignored ownership would delete a
+ * *concurrent* request's handoff, which is the empty-ssr-data bug again, just
+ * triggered by load rather than by interleaving.
  */
 function pruneSsrDataSlots() {
     const g = globalThis;
-    const keys = Object.keys(g).filter((k) => typeof k === 'string' && k.startsWith('__vsk_ssr_data_'));
-    if (keys.length <= 40)
+    const prefix = '__vsk_ssr_data_';
+    const stale = [];
+    for (const k of Object.keys(g)) {
+        if (typeof k !== 'string' || !k.startsWith(prefix))
+            continue;
+        if (isSsrSlotLive(k.slice(prefix.length)))
+            continue;
+        stale.push(k);
+    }
+    if (stale.length <= 40)
         return;
-    keys.sort().slice(0, keys.length - 40).forEach((k) => {
+    stale.sort().slice(0, stale.length - 40).forEach((k) => {
         delete g[k];
     });
 }
@@ -411,6 +459,7 @@ export async function renderFullPage(source, componentName, props = {}, registry
         if (!globalThis.__vsk_ssr_token)
             globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
         const renderToken = globalThis.__vsk_ssr_token;
+        keepSsrSlot(renderToken);
         pruneSsrDataSlots();
         // Start this render's handoff store fresh: setSsrData mirrors into
         // globalThis.__vsk_ssr_data (see resource.ts) because the AsyncLocalStorage
@@ -505,12 +554,24 @@ ${dataScriptBlock}${clientScript}</body>
         finally {
             delete globalThis.__vsk_ssr;
             delete globalThis[`__vsk_ssr_data_${renderToken}`];
-            delete globalThis.__vsk_ssr_token;
+            // The token lives in the AsyncLocalStorage store now (see ssr-store.ts);
+            // it goes away with the scope. Deleting the global would destroy the
+            // request-scoped accessor that generated render code reads.
+            dropSsrSlot(renderToken);
             pruneSsrDataSlots();
         }
     });
 }
 export function renderPageStream(source, componentName, props = {}, registry = new Map(), options = {}) {
+    // One store for the whole stream. `next()` is driven by the consumer, so a
+    // per-`next()` scope would mint a new token every chunk, orphan the slots
+    // written by earlier chunks, and leave the tail merge reading an untouched
+    // slot (the page then streams with no ssr-data script). Adopting the ambient
+    // store keeps the chunks, the promise tracker and that merge on the request's
+    // single token; every pull below runs through `withSsrStoreOf(streamStore)`.
+    const streamStore = adoptSsrStore();
+    keepSsrSlot(streamStore.token);
+    const streamToken = streamStore.token;
     async function* raw() {
         const cached = options.cached || undefined;
         const ir = cached ? cached.ir : generateIR(parse(source, options.sourcePath ? { filename: options.sourcePath } : {}), source, options.sourcePath);
@@ -584,9 +645,7 @@ export function renderPageStream(source, componentName, props = {}, registry = n
         globalThis.__vsk_ssr = true;
         // Fresh handoff store per render; see renderFullPage note.
         globalThis.__vsk_ssr_data = {};
-        if (!globalThis.__vsk_ssr_token)
-            globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
-        const renderToken = globalThis.__vsk_ssr_token;
+        const renderToken = streamToken;
         pruneSsrDataSlots();
         let bodyHtml;
         try {
@@ -607,7 +666,7 @@ export function renderPageStream(source, componentName, props = {}, registry = n
             console.error(`[render-trace] renderPageStream comp=${componentName} keys=${Object.keys(ssrData).join(',') || '∅'} slot=${Object.keys(slot).join(',') || '∅'} sink=${Object.keys(ssrSink.snapshot()).join(',') || '∅'}`);
         }
         delete globalThis[`__vsk_ssr_data_${renderToken}`];
-        delete globalThis.__vsk_ssr_token;
+        dropSsrSlot(renderToken);
         pruneSsrDataSlots();
         const dataScripts = buildDataScripts(ssrProps, ssrData, options.externalDataScript);
         const dataScriptBlock = dataScripts.length > 0 ? '\n' + dataScripts.join('\n') : '';
@@ -619,13 +678,29 @@ export function renderPageStream(source, componentName, props = {}, registry = n
         yield `\n</div>${dataScriptBlock}${clientScript}</body>\n</html>\n`;
     }
     const gen = raw();
+    // Drive every pull in the stream's own store. `gen.next()` is called by the
+    // consumer, so it runs in the consumer's context — without this the render
+    // would see whatever token the caller's request happens to hold (or none),
+    // while the merge above reads `streamToken`.
     async function* scoped() {
-        let result;
-        do {
-            result = (await withSsrStore(() => gen.next()));
-            if (!result.done)
-                yield result.value;
-        } while (!result.done);
+        try {
+            let result;
+            do {
+                result = (await withSsrStoreOf(streamStore, () => gen.next()));
+                if (!result.done)
+                    yield result.value;
+            } while (!result.done);
+        }
+        finally {
+            // Release the claim `raw()`'s own clearSsrCells already balanced, then
+            // sweep anything the stream left behind.
+            dropSsrSlot(streamToken);
+            delete globalThis[`__vsk_ssr_data_${streamToken}`];
+            delete globalThis[`__vsk_ssr_promises_${streamToken}`];
+            delete globalThis[`__vsk_ssr_failures_${streamToken}`];
+            delete globalThis.__vsk_ssr_data;
+            pruneSsrDataSlots();
+        }
     }
     return scoped();
 }

package/dist/ssr-store.d.ts

@@ -1,4 +1,64 @@
 import type { SsrDataSink } from '@vesk/runtime/src/resource';
+export interface SsrStore {
+    /** Per-request token. Keyed data slots hang off this, so it must be unique
+     *  per concurrent render — a shared token lets a finishing render delete a
+     *  stranger's data slot. */
+    token?: string;
+    /** Handoff data for the current request. */
+    data: Record<string, unknown>;
+}
+/**
+ * A store that is not yet attached to a scope. Callers that drive several
+ * scopes (streaming renders) own it and hand it to `withSsrStoreOf` so the
+ * token and sink survive across the boundary.
+ */
+export declare function createSsrStore(): SsrStore;
+/**
+ * The store for the current request: the ambient one when a scope is already
+ * open, otherwise a fresh caller-owned one. Callers that outlive a single
+ * `withSsrStore` (streaming renders drive chunks from the consumer, long after
+ * the scope's promise resolved) use this so their work still lands on the
+ * request's token instead of minting a second one.
+ */
+export declare function adoptSsrStore(): SsrStore;
+/**
+ * Run `fn` in a request scope, reusing the ambient store when one is open.
+ *
+ * The scope owns a claim on its token for its whole lifetime, which is what
+ * keeps a request's data slot reap-exempt between its stages. A request runs
+ * `renderPage` (page) -> `renderPage` (each nested layout) -> `renderFullPage`
+ * (document), and each of those claims and releases the slot on entry/exit.
+ * Without the scope-level claim the token is briefly unowned between stages, so
+ * with more than ~40 renders in flight a concurrent reaper sees the slot as
+ * abandoned and deletes the data the document render still has to serialize.
+ */
 export declare function withSsrStore<T>(fn: () => T): T;
+/**
+ * Run `fn` in a scope backed by a caller-owned store, so the token and the sink
+ * survive across `yield`s. Streaming renders need this: each `next()` is driven
+ * by the consumer, not by the generator, so a per-`next()` `withSsrStore` would
+ * mint a new token every chunk and every data slot written by an earlier chunk
+ * would be orphaned.
+ */
+export declare function withSsrStoreOf<T>(store: SsrStore, fn: () => T): T;
+/** The current request's token, or undefined outside a render scope. */
+export declare function currentSsrToken(): string | undefined;
+/**
+ * Mint a fresh token for the current scope. Used by the dev servers' data-nav
+ * path, which renders several routes within one request and must not let an
+ * earlier route's slot settle into a later one.
+ */
+export declare function resetSsrToken(): string;
+/** Claim a token's data slot so the reaper never deletes it mid-render. */
+export declare function keepSsrSlot(token: string | undefined): void;
+/** Release one claim on a token's data slot. */
+export declare function dropSsrSlot(token: string | undefined): void;
+/**
+ * True while a render still owns this token's slot. Slots are keyed by
+ * per-request tokens, so a cap-based reaper that ignores ownership deletes a
+ * *concurrent* request's handoff and the second page ships with no ssr-data
+ * script — the original bug, just triggered by load instead of interleaving.
+ */
+export declare function isSsrSlotLive(token: string): boolean;
 export declare const ssrSink: SsrDataSink;
 //# sourceMappingURL=ssr-store.d.ts.map

package/dist/ssr-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-store.d.ts","sourceRoot":"","sources":["../src/ssr-store.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAI9D,wBAAgB,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAI9C;AAED,eAAO,MAAM,OAAO,EAAE,WAgBrB,CAAC"}
+{"version":3,"file":"ssr-store.d.ts","sourceRoot":"","sources":["../src/ssr-store.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAI9D,MAAM,WAAW,QAAQ;IACvB;;gCAE4B;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/B;AAkBD;;;;GAIG;AACH,wBAAgB,cAAc,IAAI,QAAQ,CAEzC;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,IAAI,QAAQ,CAExC;AAMD;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAuB9C;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAEjE;AAED,wEAAwE;AACxE,wBAAgB,eAAe,IAAI,MAAM,GAAG,SAAS,CAEpD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAYtC;AAED,2EAA2E;AAC3E,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAG3D;AAED,gDAAgD;AAChD,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAM3D;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEpD;AAED,eAAO,MAAM,OAAO,EAAE,WAgBrB,CAAC"}

package/dist/ssr-store.js

@@ -3,30 +3,181 @@ import { AsyncLocalStorage } from 'node:async_hooks';
 // checkout the compiler typechecks BEFORE @vesk/runtime's dist exists, and
 // resolving types through the barrel then fails.
 import { setSsrSink } from '@vesk/runtime/src/index-server';
+const TOKEN_KEY = '__vsk_ssr_token';
 const storage = new AsyncLocalStorage();
+/**
+ * Tokens whose `__vsk_ssr_data_<token>` slot a live render still owns, with a
+ * refcount. A request runs `renderPage` (page) -> `renderPage` (each nested
+ * layout) -> `renderFullPage` (document) inside ONE store, and each of those
+ * claims the slot on entry and releases it on exit. A plain Set would let the
+ * first inner release revoke the claim the document render still depends on,
+ * so the reaper could reap a live request's handoff. Counts balance instead.
+ */
+const liveSlots = new Map();
+function newSsrToken() {
+    return Math.random().toString(36).slice(2);
+}
+/**
+ * A store that is not yet attached to a scope. Callers that drive several
+ * scopes (streaming renders) own it and hand it to `withSsrStoreOf` so the
+ * token and sink survive across the boundary.
+ */
+export function createSsrStore() {
+    return { token: newSsrToken(), data: {} };
+}
+/**
+ * The store for the current request: the ambient one when a scope is already
+ * open, otherwise a fresh caller-owned one. Callers that outlive a single
+ * `withSsrStore` (streaming renders drive chunks from the consumer, long after
+ * the scope's promise resolved) use this so their work still lands on the
+ * request's token instead of minting a second one.
+ */
+export function adoptSsrStore() {
+    return storage.getStore() ?? createSsrStore();
+}
+function isThenable(value) {
+    return typeof value?.then === 'function';
+}
+/**
+ * Run `fn` in a request scope, reusing the ambient store when one is open.
+ *
+ * The scope owns a claim on its token for its whole lifetime, which is what
+ * keeps a request's data slot reap-exempt between its stages. A request runs
+ * `renderPage` (page) -> `renderPage` (each nested layout) -> `renderFullPage`
+ * (document), and each of those claims and releases the slot on entry/exit.
+ * Without the scope-level claim the token is briefly unowned between stages, so
+ * with more than ~40 renders in flight a concurrent reaper sees the slot as
+ * abandoned and deletes the data the document render still has to serialize.
+ */
 export function withSsrStore(fn) {
     const existing = storage.getStore();
     if (existing)
         return fn();
-    return storage.run({}, fn);
+    const store = createSsrStore();
+    keepSsrSlot(store.token);
+    let result;
+    try {
+        result = storage.run(store, fn);
+    }
+    catch (err) {
+        dropSsrSlot(store.token);
+        throw err;
+    }
+    // A streaming render hands back a Response while its body is still pending;
+    // releasing on promise settlement is exactly right for both cases, because a
+    // render that outlives the scope claims the token itself (renderPageStream).
+    if (isThenable(result)) {
+        return result.then((value) => { dropSsrSlot(store.token); return value; }, (err) => { dropSsrSlot(store.token); throw err; });
+    }
+    dropSsrSlot(store.token);
+    return result;
+}
+/**
+ * Run `fn` in a scope backed by a caller-owned store, so the token and the sink
+ * survive across `yield`s. Streaming renders need this: each `next()` is driven
+ * by the consumer, not by the generator, so a per-`next()` `withSsrStore` would
+ * mint a new token every chunk and every data slot written by an earlier chunk
+ * would be orphaned.
+ */
+export function withSsrStoreOf(store, fn) {
+    return storage.run(store, fn);
+}
+/** The current request's token, or undefined outside a render scope. */
+export function currentSsrToken() {
+    return storage.getStore()?.token;
+}
+/**
+ * Mint a fresh token for the current scope. Used by the dev servers' data-nav
+ * path, which renders several routes within one request and must not let an
+ * earlier route's slot settle into a later one.
+ */
+export function resetSsrToken() {
+    const store = storage.getStore();
+    const token = newSsrToken();
+    if (store) {
+        if (store.token)
+            liveSlots.delete(store.token);
+        store.token = token;
+    }
+    // The caller owns the request from here, so hold the claim for the whole
+    // scope: nested page/layout renders each add and remove their own count, and
+    // this one keeps the slot reap-exempt until the caller is done with it.
+    liveSlots.set(token, 1);
+    return token;
+}
+/** Claim a token's data slot so the reaper never deletes it mid-render. */
+export function keepSsrSlot(token) {
+    if (!token)
+        return;
+    liveSlots.set(token, (liveSlots.get(token) ?? 0) + 1);
+}
+/** Release one claim on a token's data slot. */
+export function dropSsrSlot(token) {
+    if (!token)
+        return;
+    const count = liveSlots.get(token);
+    if (count === undefined)
+        return;
+    if (count <= 1)
+        liveSlots.delete(token);
+    else
+        liveSlots.set(token, count - 1);
+}
+/**
+ * True while a render still owns this token's slot. Slots are keyed by
+ * per-request tokens, so a cap-based reaper that ignores ownership deletes a
+ * *concurrent* request's handoff and the second page ships with no ssr-data
+ * script — the original bug, just triggered by load instead of interleaving.
+ */
+export function isSsrSlotLive(token) {
+    return liveSlots.has(token);
 }
 export const ssrSink = {
     set: (key, value) => {
         const store = storage.getStore();
         if (store)
-            store[key] = value;
+            store.data[key] = value;
     },
     get: (key) => {
         const store = storage.getStore();
-        return store ? store[key] : undefined;
+        return store ? store.data[key] : undefined;
     },
-    snapshot: () => ({ ...(storage.getStore() ?? {}) }),
+    snapshot: () => ({ ...(storage.getStore()?.data ?? {}) }),
     clear: () => {
         const store = storage.getStore();
         if (store) {
-            for (const key of Object.keys(store))
-                delete store[key];
+            for (const key of Object.keys(store.data))
+                delete store.data[key];
         }
     },
 };
 setSsrSink(ssrSink);
+// The generated server code reads `globalThis.__vsk_ssr_token` synchronously
+// at the top of every component render, and the runtime's promise tracker and
+// data writers read it the same way. Back that global with the ALS store so
+// those readers become request-scoped instead of process-global. Before this,
+// two concurrent renders adopted the same token and whichever finished first
+// deleted the other's data slot, so the second page shipped with an empty
+// handoff and the client refetched what SSR already had.
+//
+// Outside a render scope the accessor reads/writes nothing, which is what
+// keeps a stray write from leaking into the next request. Bundles that never
+// load this module keep the plain global and the previous behaviour.
+//
+// NEVER `delete globalThis.__vsk_ssr_token`. This is a configurable accessor,
+// so `delete` removes the property definition outright — it does not route
+// through the setter — and the process silently falls back to a
+// process-global token, reintroducing the race for every later request. Clear
+// a token by assigning through `globalThis` inside a scope, or with
+// `resetSsrToken`.
+Object.defineProperty(globalThis, TOKEN_KEY, {
+    configurable: true,
+    get() {
+        return storage.getStore()?.token;
+    },
+    set(value) {
+        const store = storage.getStore();
+        if (store)
+            store.token = value;
+    },
+});

package/dist/vsk-collision.d.ts

@@ -0,0 +1,44 @@
+/**
+ * Same-name component declarations across `.vsk` files.
+ *
+ * `.vsk` components are not module-local bindings — every component a bundle
+ * compiles is registered in ONE global registry under its declared name
+ * (`__components["Helper"]`, `__registry.get("Helper")`). Two files that each
+ * declare `component Helper` therefore land on the same key, and which one wins
+ * depends on the order the bundle graph happened to walk. There is no type
+ * error and no runtime error: the page just renders somebody else's component.
+ *
+ * That is the failure mode worth reporting. It is *not* the same as importing a
+ * non-exported component: making `export` load-bearing would not prevent a
+ * collision, because two files can both `export component Helper` and still
+ * overwrite one key. So this check looks only at declaration names, never at
+ * the registry (the registry holds no ownership metadata and cannot say which
+ * file a symbol came from).
+ *
+ * Deliberately a WARNING, not an error. The loose name-keyed registry is
+ * long-standing and load-bearing, and a hard error here would break builds that
+ * render correctly today.
+ */
+export interface VskComponentCollision {
+    name: string;
+    files: string[];
+}
+export declare class VskComponentOwners {
+    private owners;
+    /** Records that `file` declares a component called `name`. */
+    claim(name: string, file: string): void;
+    /** Names declared by more than one file, each with its declaring files. */
+    collisions(): VskComponentCollision[];
+    /**
+     * Warns once per colliding name. Returns the message per collision so a
+     * caller (or a test) can assert on the text without capturing stderr.
+     *
+     * Deduped by name for the life of the process: the SSR path compiles one
+     * file graph per `compileFile` call, so without this a single build would
+     * repeat the same warning once per entry page.
+     */
+    report(context: string): string[];
+}
+/** Test hook: forget which collisions have been reported. */
+export declare function resetVskCollisionReports(): void;
+//# sourceMappingURL=vsk-collision.d.ts.map

package/dist/vsk-collision.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vsk-collision.d.ts","sourceRoot":"","sources":["../src/vsk-collision.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAAkC;IAEhD,8DAA8D;IAC9D,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IASvC,2EAA2E;IAC3E,UAAU,IAAI,qBAAqB,EAAE;IAQrC;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE;CAelC;AAQD,6DAA6D;AAC7D,wBAAgB,wBAAwB,IAAI,IAAI,CAE/C"}

package/dist/vsk-collision.js

@@ -0,0 +1,73 @@
+/**
+ * Same-name component declarations across `.vsk` files.
+ *
+ * `.vsk` components are not module-local bindings — every component a bundle
+ * compiles is registered in ONE global registry under its declared name
+ * (`__components["Helper"]`, `__registry.get("Helper")`). Two files that each
+ * declare `component Helper` therefore land on the same key, and which one wins
+ * depends on the order the bundle graph happened to walk. There is no type
+ * error and no runtime error: the page just renders somebody else's component.
+ *
+ * That is the failure mode worth reporting. It is *not* the same as importing a
+ * non-exported component: making `export` load-bearing would not prevent a
+ * collision, because two files can both `export component Helper` and still
+ * overwrite one key. So this check looks only at declaration names, never at
+ * the registry (the registry holds no ownership metadata and cannot say which
+ * file a symbol came from).
+ *
+ * Deliberately a WARNING, not an error. The loose name-keyed registry is
+ * long-standing and load-bearing, and a hard error here would break builds that
+ * render correctly today.
+ */
+export class VskComponentOwners {
+    owners = new Map();
+    /** Records that `file` declares a component called `name`. */
+    claim(name, file) {
+        let set = this.owners.get(name);
+        if (!set) {
+            set = new Set();
+            this.owners.set(name, set);
+        }
+        set.add(file);
+    }
+    /** Names declared by more than one file, each with its declaring files. */
+    collisions() {
+        const out = [];
+        for (const [name, files] of this.owners) {
+            if (files.size > 1)
+                out.push({ name, files: [...files] });
+        }
+        return out.sort((a, b) => a.name.localeCompare(b.name));
+    }
+    /**
+     * Warns once per colliding name. Returns the message per collision so a
+     * caller (or a test) can assert on the text without capturing stderr.
+     *
+     * Deduped by name for the life of the process: the SSR path compiles one
+     * file graph per `compileFile` call, so without this a single build would
+     * repeat the same warning once per entry page.
+     */
+    report(context) {
+        const collisions = this.collisions();
+        const fresh = [];
+        for (const { name, files } of collisions) {
+            if (reportedCollisions.has(name))
+                continue;
+            reportedCollisions.add(name);
+            fresh.push(`${name}: ${files.join(', ')}`);
+            console.warn(`[vesk] ${context}: component "${name}" is declared in ${files.length} files and resolves to only one of them — `
+                + `${files.join(', ')}. Which one wins depends on compile order, and the client and server registries pick differently, `
+                + `so this can render a different component in the browser than in the SSR HTML. Rename one of them.`);
+        }
+        return fresh;
+    }
+}
+/**
+ * Names already warned about. The client bundle and the SSR path each compile
+ * overlapping file graphs, so a per-instance set would double-report.
+ */
+const reportedCollisions = new Set();
+/** Test hook: forget which collisions have been reported. */
+export function resetVskCollisionReports() {
+    reportedCollisions.clear();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/compiler",
-  "version": "0.2.43",
+  "version": "0.2.44",
   "type": "module",
   "description": "Vesk compiler — lexer, parser, semantic analysis, IR, codegen",
   "main": "./dist/index.js",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@sveltejs/acorn-typescript": "^1.0.0",
-    "@vesk/types": "^0.2.43",
+    "@vesk/types": "^0.2.44",
     "acorn": "^8.15.0",
     "esrap": "^2.3.0",
     "is-reference": "^3.0.0",