@vesk/compiler 0.2.42 → 0.2.44

package/dist/server-utils.js

@@ -3,7 +3,7 @@ import * as __defaultRuntimeModule from '@vesk/runtime/src/index-server';
 import { parse } from '@vesk/compiler/src/parser';
 import { generateIR } from '@vesk/compiler/src/ir-generator';
 import { htmlTagName, htmlTagEnd } from '@vesk/compiler/src/scan';
-import { importModuleTarget, extractImportNames } from '@vesk/compiler/src/tokens';
+import { importModuleTarget, extractImportNames, stripTrackDeclMarkers } from '@vesk/compiler/src/tokens';
 const VOID_ELEMENTS = new Set([
     'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr',
 ]);
@@ -1124,6 +1124,18 @@ export function loadRuntimeImports(importStrs) {
     }
     return {};
 }
+/** Binding name of one TrackDecl pattern element, or null for a hole. */
+function patternElementName(element) {
+    if (!element)
+        return null;
+    if (element.type === 'Identifier')
+        return element.name;
+    if (element.type === 'AssignmentPattern' && element.left)
+        return patternElementName(element.left);
+    if (element.type === 'RestElement' && element.argument)
+        return patternElementName(element.argument);
+    return null;
+}
 export function evalTopLevelCode(topLevelCode, __vesk) {
     for (const code of topLevelCode) {
         const ast = tryParseTopLevel(code);
@@ -1135,9 +1147,19 @@ export function evalTopLevelCode(topLevelCode, __vesk) {
                     continue;
                 if (target.type === 'VariableDeclaration') {
                     for (const d of target.declarations) {
-                        if (!d.id || d.id.type !== 'Identifier')
+                        if (!d.id)
+                            continue;
+                        // A TrackDecl declarator's `id` is the parser's `lazy` ArrayPattern
+                        // (`const &[count, rawCell] = track(0)`), not an Identifier. Its
+                        // initializer yields a TUPLE, so each name takes its own index —
+                        // the whole value is not bound to every name.
+                        const isTrack = d.id.type === 'ArrayPattern' && d.id.lazy === true;
+                        const names = isTrack
+                            ? (d.id.elements || []).map(patternElementName)
+                            : d.id.type === 'Identifier' ? [d.id.name] : [];
+                        if (names.every((n) => n === null))
                             continue;
-                        const initSrc = d.init ? code.slice(d.init.start, d.init.end) : 'undefined';
+                        const initSrc = d.init ? stripTrackDeclMarkers(code.slice(d.init.start, d.init.end), d.init.start, d.init) : 'undefined';
                         try {
                             const keys = Object.keys(__vesk);
                             const params = [...keys, '__vesk', 'result'];
@@ -1145,7 +1167,13 @@ export function evalTopLevelCode(topLevelCode, __vesk) {
                             const fn = new Function(...params, body);
                             const result = { value: undefined };
                             fn(...keys.map(k => __vesk[k]), __vesk, result);
-                            __vesk[d.id.name] = result.value;
+                            names.forEach((name, i) => {
+                                if (name === null)
+                                    return;
+                                __vesk[name] = isTrack
+                                    ? (Array.isArray(result.value) ? result.value[i] : undefined)
+                                    : result.value;
+                            });
                         }
                         catch {
                             // skip evaluation errors
@@ -1160,7 +1188,7 @@ export function evalTopLevelCode(topLevelCode, __vesk) {
                         const paramSrc = target.params.length
                             ? code.slice(target.params[0].start, target.params[target.params.length - 1].end)
                             : '';
-                        const bodySrc = code.slice(target.body.start, target.body.end);
+                        const bodySrc = stripTrackDeclMarkers(code.slice(target.body.start, target.body.end), target.body.start, target.body);
                         const asyncKw = target.async ? 'async ' : '';
                         const fn = new Function(...params, `__vesk['${target.id.name}'] = ${asyncKw}function ${target.id.name}(${paramSrc}) ${bodySrc};`);
                         fn(...keys.map(k => __vesk[k]), __vesk);

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/tokens.d.ts

@@ -47,4 +47,32 @@ export declare function extractImportNames(importText: string): string[];
  * after `from` (or the bare side-effect string). `null` when none found.
  */
 export declare function importModuleTarget(importText: string): string | null;
+/**
+ * True when `code` declares `name` as a real top-level value (`const`/`let`/
+ * `var`/`function`/`class`). Used to tell a `.vsk` component — a registry entry
+ * with no binding — apart from an ordinary JS/TS declaration, whose
+ * `export { name }` must keep native module semantics.
+ */
+export declare function hasTopLevelValueDeclaration(code: string, name: string): boolean;
+/** One entry of a same-file `export { A, B as C }` specifier list. */
+export interface VskSpecifierExport {
+    local: string;
+    exported: string;
+    /** Byte span of the whole `export { … }` statement, including any `;`. */
+    start: number;
+    end: number;
+}
+/**
+ * Finds same-file export *specifier lists* — `export { A }`, `export { A as B }`
+ * — and returns them with their source spans so the caller can remove them.
+ *
+ * A `.vsk` component is a registry entry keyed by its declared name, not a
+ * top-level binding, so acorn's module validator rejects `export { A }` with
+ * `Export 'A' is not defined`. Export *declarations* (`export component A`,
+ * `export const A = 1`) and re-exports (`export … from '…'`) are left alone:
+ * those parse fine and are handled in the IR generator.
+ */
+export declare function findSpecifierExports(code: string): VskSpecifierExport[];
+/** `text` must be `source.slice(base, …)`; `node` is AST parsed from `source`. */
+export declare function stripTrackDeclMarkers(text: string, base: number, node: any): string;
 //# sourceMappingURL=tokens.d.ts.map

package/dist/tokens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAYH,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,IAAI,CAqB7D;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CA2BlE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAStE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAqBxE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAuC/D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAOpE"}
+{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAaH,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,IAAI,CA0B7D;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CA2BlE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAStE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAqBxE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAuC/D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAOpE;AAwID;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAkB/E;AAED,sEAAsE;AACtE,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,0EAA0E;IAC1E,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,EAAE,CAkCvE;AA6DD,kFAAkF;AAClF,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,MAAM,CAcnF"}

package/dist/tokens.js

@@ -8,6 +8,7 @@
  * unparsable text.
  */
 import { createBaseParser } from '@vesk/compiler/src/parser';
+import { withStandaloneTokens } from '@vesk/compiler/src/vesk-plugin';
 import { skipString, skipComment, skipWhitespace, skipTrackGeneric, isIdentStart, isIdentChar, } from '@vesk/compiler/src/scan';
 /**
  * Tokenizes `code` with the Vesk parser's tokenizer. Returns an array of
@@ -16,27 +17,32 @@ import { skipString, skipComment, skipWhitespace, skipTrackGeneric, isIdentStart
  * their span so callers can read the actual character via `code[start]`.
  */
 export function tokenizeCode(code) {
-    try {
-        const ParserClass = createBaseParser();
-        const tok = ParserClass.tokenizer(code, {
-            ecmaVersion: 'latest',
-            sourceType: 'module',
-        });
-        const out = [];
-        let t;
-        while ((t = tok.getToken()) && t.type && t.type.label !== 'eof') {
-            out.push({
-                label: t.type.label,
-                value: typeof t.value === 'string' ? t.value : '',
-                start: t.start,
-                end: t.end,
+    // No parser runs here, so the plugin cannot infer component bodies from its
+    // own component-depth counter and every JSX tag would be read as relational
+    // operators. `withStandaloneTokens` asks it to read JSX tags directly.
+    return withStandaloneTokens(() => {
+        try {
+            const ParserClass = createBaseParser();
+            const tok = ParserClass.tokenizer(code, {
+                ecmaVersion: 'latest',
+                sourceType: 'module',
             });
+            const out = [];
+            let t;
+            while ((t = tok.getToken()) && t.type && t.type.label !== 'eof') {
+                out.push({
+                    label: t.type.label,
+                    value: typeof t.value === 'string' ? t.value : '',
+                    start: t.start,
+                    end: t.end,
+                });
+            }
+            return out;
         }
-        return out;
-    }
-    catch {
-        return null;
-    }
+        catch {
+            return null;
+        }
+    });
 }
 /**
  * Returns the set of identifiers in `code` that are called — an identifier
@@ -355,3 +361,178 @@ function manualExtractImportNames(importText) {
     }
     return names;
 }
+/**
+ * True when `code` declares `name` as a real top-level value (`const`/`let`/
+ * `var`/`function`/`class`). Used to tell a `.vsk` component — a registry entry
+ * with no binding — apart from an ordinary JS/TS declaration, whose
+ * `export { name }` must keep native module semantics.
+ */
+export function hasTopLevelValueDeclaration(code, name) {
+    const tokens = tokenizeCode(code);
+    if (tokens === null)
+        return false;
+    const declWords = ['const', 'let', 'var', 'function', 'class'];
+    for (let i = 1; i < tokens.length; i++) {
+        if (tokens[i].label !== 'name' || tokens[i].value !== name)
+            continue;
+        const prev = tokens[i - 1];
+        // Declaration keywords carry their own token label (`const`, `var`,
+        // `function`, `class`); `let` arrives as a plain name. Match on value.
+        if (!prev || !declWords.includes(prev.value))
+            continue;
+        // `export const X` / `export function X` are preceded by `export`.
+        if (i >= 2) {
+            const pp = tokens[i - 2];
+            if (pp && pp.label === 'name' && pp.value === 'export')
+                continue;
+        }
+        return true;
+    }
+    return false;
+}
+/**
+ * Finds same-file export *specifier lists* — `export { A }`, `export { A as B }`
+ * — and returns them with their source spans so the caller can remove them.
+ *
+ * A `.vsk` component is a registry entry keyed by its declared name, not a
+ * top-level binding, so acorn's module validator rejects `export { A }` with
+ * `Export 'A' is not defined`. Export *declarations* (`export component A`,
+ * `export const A = 1`) and re-exports (`export … from '…'`) are left alone:
+ * those parse fine and are handled in the IR generator.
+ */
+export function findSpecifierExports(code) {
+    const tokens = tokenizeCode(code);
+    if (tokens === null)
+        return [];
+    const out = [];
+    for (let i = 0; i < tokens.length; i++) {
+        if (tokens[i].label !== 'export')
+            continue;
+        // A specifier list starts with `{`. `export default`, `export const` and
+        // `export *` take another route and are left for the IR generator.
+        if (!tokens[i + 1] || tokens[i + 1].label !== '{')
+            continue;
+        // Find this statement's `}` and note any module source, which makes it a
+        // re-export (`export { A } from './x.vsk'`) rather than a specifier list.
+        let k = i + 2;
+        let depth = 1;
+        for (; k < tokens.length; k++) {
+            const lbl = tokens[k].label;
+            if (lbl === 'string') {
+                continue;
+            }
+            if (lbl === '{')
+                depth++;
+            else if (lbl === '}') {
+                depth--;
+                if (depth === 0)
+                    break;
+            }
+        }
+        // A re-export puts `from '…'` AFTER the closing brace, so check past it.
+        let isReexport = false;
+        for (let j = k + 1; j < tokens.length; j++) {
+            const lbl = tokens[j].label;
+            if (lbl === 'string') {
+                isReexport = true;
+                break;
+            }
+            if (lbl === ';' || lbl === 'export' || lbl === 'import' || lbl === '}')
+                break;
+        }
+        if (depth !== 0 || isReexport)
+            continue;
+        const pairs = readSpecifierPairs(code, tokens[i + 1].end, tokens[k].end);
+        if (pairs === null)
+            continue;
+        const stmtEnd = tokens[k].end;
+        for (const [local, exported] of pairs)
+            out.push({ local, exported, start: tokens[i].start, end: stmtEnd });
+        i = k;
+    }
+    return out;
+}
+/**
+ * Reads `A, B as C` pairs from the text between a `{` and its matching `}`.
+ * Returns `null` for anything that is not a plain (optionally `as`-aliased)
+ * identifier list, so unusual forms are left to the normal parser.
+ */
+function readSpecifierPairs(code, from, to) {
+    // Wrapped in parens so a leading `{` is a block, not the start of an object.
+    const tokens = tokenizeCode(`(${code.slice(from, to)})`);
+    if (tokens === null || tokens.length < 2)
+        return null;
+    const pairs = [];
+    let i = 1; // skip the '('
+    while (i < tokens.length) {
+        const local = tokens[i];
+        if (!local || local.label === ')' || local.label === ';')
+            break;
+        if (local.label !== 'name')
+            return null;
+        const asTok = tokens[i + 1];
+        if (asTok && asTok.label === 'name' && asTok.value === 'as') {
+            const exported = tokens[i + 2];
+            if (!exported || exported.label !== 'name')
+                return null;
+            pairs.push([local.value, exported.value]);
+            i += 3;
+        }
+        else {
+            pairs.push([local.value, local.value]);
+            i += 1;
+        }
+        const sep = tokens[i];
+        if (!sep || sep.label !== ',')
+            break;
+        i += 1;
+    }
+    return pairs.length > 0 ? pairs : null;
+}
+/**
+ * The Vesk TrackDecl form `const &[count] = track(0)` exists only for the
+ * parser: `VeskParserPlugin` consumes the `&` and returns an `ArrayPattern`
+ * tagged `lazy: true` whose `start` points at the `[`. The marker character
+ * itself survives in the source text, so every raw slice of that text is
+ * invalid JavaScript — `new Function` rejects it, and a browser rejects the
+ * whole module.
+ *
+ * Blank exactly those marker characters. Offsets come from the already parsed
+ * AST (each `lazy` pattern's `start - 1`), never from a text scan.
+ */
+function collectTrackDeclMarkers(node, out) {
+    if (!node || typeof node !== 'object')
+        return;
+    if (Array.isArray(node)) {
+        for (const child of node)
+            collectTrackDeclMarkers(child, out);
+        return;
+    }
+    if (node.type === 'ArrayPattern' && node.lazy === true && typeof node.start === 'number') {
+        out.add(node.start - 1);
+        return;
+    }
+    for (const key of Object.keys(node)) {
+        const value = node[key];
+        if (value && typeof value === 'object')
+            collectTrackDeclMarkers(value, out);
+    }
+}
+/** `text` must be `source.slice(base, …)`; `node` is AST parsed from `source`. */
+export function stripTrackDeclMarkers(text, base, node) {
+    const offsets = new Set();
+    collectTrackDeclMarkers(node, offsets);
+    if (offsets.size === 0)
+        return text;
+    const sorted = [...offsets].sort((a, b) => a - b);
+    let out = '';
+    let prev = 0;
+    for (const offset of sorted) {
+        const i = offset - base;
+        if (i < prev || i >= text.length)
+            continue;
+        out += text.slice(prev, i) + ' ';
+        prev = i + 1;
+    }
+    return out + text.slice(prev);
+}

package/dist/types.d.ts

@@ -1,5 +1,5 @@
 import type { IRRoot } from '@vesk/compiler/src/ir';
-export type { RouteNode, ApiRouteNode, MiddlewareContext, ServerEventContext, VeskEventHandlers, VeskPlugin, VeskCors, VeskRateLimit, VeskSecurityPreset, VeskSecurity, VeskConfig, MdConfig, MdHtmlMode, MdProps, MarkdownOptions, MdHtmlWarning, MiddlewareEntry, MiddlewareChainOptions, RenderPageResult, SSGResult, DataScriptPayload, ExternalDataScript, Tracked, Resource, UseFetchOptions, UseFetchStreamOptions, SsrDataSink, VeskResponse, SetCookieOptions, } from '@vesk/types';
+export type { RouteNode, ApiRouteNode, MiddlewareContext, ServerEventContext, VeskEventHandlers, VeskPlugin, VeskCors, VeskRateLimit, VeskSecurityPreset, VeskSecurity, VeskConfig, MdConfig, MdHtmlMode, MdProps, MarkdownOptions, MdHtmlWarning, VeskLeafComponent, VeskPrimitiveComponent, VeskTaggedLeafComponent, VeskComponentRegistry, VeskScope, MiddlewareEntry, MiddlewareChainOptions, RenderPageResult, SSGResult, DataScriptPayload, ExternalDataScript, Tracked, Resource, UseFetchOptions, UseFetchStreamOptions, SsrDataSink, VeskResponse, SetCookieOptions, } from '@vesk/types';
 export interface CompileFileResult {
     ir: IRRoot;
     componentMap: Map<string, Function>;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,YAAY,EACV,SAAS,EACT,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EACjB,UAAU,EACV,QAAQ,EACR,aAAa,EACb,kBAAkB,EAClB,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,UAAU,EACV,OAAO,EACP,eAAe,EACf,aAAa,EACb,eAAe,EACf,sBAAsB,EACtB,gBAAgB,EAChB,SAAS,EACT,iBAAiB,EACjB,kBAAkB,EAClB,OAAO,EACP,QAAQ,EACR,eAAe,EACf,qBAAqB,EACrB,WAAW,EACX,YAAY,EACZ,gBAAgB,GACjB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,aAAa,EAAE,YAAY,CAAC;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,aAAa,EAAE,kBAAkB,CAAC;IAC9D,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,aAAa,EAAE,UAAU,EAAE,CAAC;IAC7C;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,aAAa,shBAahB,CAAC;AAEX,MAAM,MAAM,WAAW,GAAG,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,YAAY,EACV,SAAS,EACT,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EACjB,UAAU,EACV,QAAQ,EACR,aAAa,EACb,kBAAkB,EAClB,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,UAAU,EACV,OAAO,EACP,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,sBAAsB,EACtB,uBAAuB,EACvB,qBAAqB,EACrB,SAAS,EACT,eAAe,EACf,sBAAsB,EACtB,gBAAgB,EAChB,SAAS,EACT,iBAAiB,EACjB,kBAAkB,EAClB,OAAO,EACP,QAAQ,EACR,eAAe,EACf,qBAAqB,EACrB,WAAW,EACX,YAAY,EACZ,gBAAgB,GACjB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,aAAa,EAAE,YAAY,CAAC;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,aAAa,EAAE,kBAAkB,CAAC;IAC9D,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,aAAa,EAAE,UAAU,EAAE,CAAC;IAC7C;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,aAAa,shBAahB,CAAC;AAEX,MAAM,MAAM,WAAW,GAAG,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC"}

package/dist/vesk-plugin.d.ts

@@ -52,5 +52,7 @@ declare module 'acorn' {
 export interface VeskPluginConfig {
     [key: string]: unknown;
 }
+/** Runs `fn` with JSX tag recognition enabled without a parser driving it. */
+export declare function withStandaloneTokens<T>(fn: () => T): T;
 export declare function VeskParserPlugin(config?: VeskPluginConfig): (Parser: typeof acorn.Parser) => typeof acorn.Parser;
 //# sourceMappingURL=vesk-plugin.d.ts.map

package/dist/vesk-plugin.d.ts.map

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