@vesk/adapter 0.2.42 → 0.2.44

package/dist/client-bundle.d.ts

@@ -67,6 +67,19 @@ interface CompiledNode {
  * eval runs against a live chunk scope where those already exist.
  */
 export declare function isSnippetDrop(node: CompiledNode): boolean;
+/**
+ * When a chunk's esbuild bundle fails to resolve bare specifiers, the
+ * historical fallback strips every import, leaving dangling free identifiers
+ * that surface as a baffling `ReferenceError: X is not defined` at render
+ * time. Native-only `@vesk/*` library imports can NEVER resolve in the
+ * browser dev preview — make that a first-class, readable failure by emitting
+ * a throwing proxy for every binding those imports declare: the binding reads
+ * as a function, so `typeof` stays truthful, and the throw carries the
+ * library, the binding, and the remedy. Other bare specifiers (e.g. `motion`,
+ * dev-preview-provided) are left dangling — genuinely missing packages still
+ * fail as ReferenceErrors, which is honest. AST-only; never a text scan.
+ */
+export declare function nativeLibraryImportStubs(code: string): string;
 /**
  * Demotes surviving value exports to plain declarations (`export const x`
  * becomes `const x`) and drops bare re-export lists (`export { x }`,

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

@@ -1 +1 @@
-{"version":3,"file":"client-bundle.d.ts","sourceRoot":"","sources":["../src/client-bundle.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,kBAAkB,EAAmF,MAAM,yBAAyB,CAAC;AAoCnL;;;;;;;;;;;;;GAaG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CA8BhE;AAED;;;;;GAKG;AACH,UAAU,YAAY;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAC7B,EAAE,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,IAAI,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE;gBAAE,IAAI,CAAC,EAAE,MAAM,CAAC;gBAAC,IAAI,CAAC,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;IACtH,WAAW,CAAC,EAAE;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAC1C,YAAY,CAAC,EAAE,KAAK,CAAC;YAAE,IAAI,CAAC,EAAE;gBAAE,IAAI,CAAC,EAAE,MAAM,CAAC;gBAAC,MAAM,CAAC,EAAE;oBAAE,IAAI,CAAC,EAAE,MAAM,CAAC;oBAAC,IAAI,CAAC,EAAE,MAAM,CAAA;iBAAE,CAAA;aAAE,CAAA;SAAE,CAAC,CAAC;KAC/F,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAmDD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAKzD;AAkCD;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAyBlD;AA4MD;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAmC5D;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAYxD;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,OAAO,GAAG,MAAM,CAwBnG;AAED,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,SAAS,EAAE,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,kBAAkB,CAAC,CAma7B;AAMD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CA+B3D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAUlE;AAoCD;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAI/F"}
+{"version":3,"file":"client-bundle.d.ts","sourceRoot":"","sources":["../src/client-bundle.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,kBAAkB,EAAmF,MAAM,yBAAyB,CAAC;AAoCnL;;;;;;;;;;;;;GAaG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CA8BhE;AAED;;;;;GAKG;AACH,UAAU,YAAY;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAC7B,EAAE,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,IAAI,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE;gBAAE,IAAI,CAAC,EAAE,MAAM,CAAC;gBAAC,IAAI,CAAC,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;IACtH,WAAW,CAAC,EAAE;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAC1C,YAAY,CAAC,EAAE,KAAK,CAAC;YAAE,IAAI,CAAC,EAAE;gBAAE,IAAI,CAAC,EAAE,MAAM,CAAC;gBAAC,MAAM,CAAC,EAAE;oBAAE,IAAI,CAAC,EAAE,MAAM,CAAC;oBAAC,IAAI,CAAC,EAAE,MAAM,CAAA;iBAAE,CAAA;aAAE,CAAA;SAAE,CAAC,CAAC;KAC/F,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAmDD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAKzD;AAkCD;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA+B7D;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAyBlD;AA4MD;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAmC5D;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAYxD;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,OAAO,GAAG,MAAM,CAwBnG;AAED,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,SAAS,EAAE,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,kBAAkB,CAAC,CA+b7B;AAMD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CA+B3D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAUlE;AAoCD;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAI/F"}

package/dist/client-bundle.js

@@ -5,7 +5,8 @@ import { tmpdir } from 'node:os';
 import { build } from './esbuild-fallback.js';
 import { stripCodeTypes } from '@vesk/compiler/src/strip-ts';
 import { parse } from '@vesk/compiler/src/parser';
-import { compileClient, compileClientBoth, nameAllocFor } from '@vesk/compiler/src/client-codegen';
+import { compileClient, compileClientBoth, nameAllocFor, vskComponentNames } from '@vesk/compiler/src/client-codegen';
+import { VskComponentOwners } from '@vesk/compiler/src/vsk-collision';
 import { resolveComponentName } from '@vesk/compiler/src/server-codegen';
 import { collectVskImportPaths, vskImportLines } from '@vesk/compiler/src/vsk-imports';
 import { inlineMdContentAttrs, guessProjectRoots } from '@vesk/compiler/src/md-inline';
@@ -174,6 +175,52 @@ function isModuleLevel(node) {
         || node.type === 'ExportNamedDeclaration'
         || node.type === 'ExportDefaultDeclaration';
 }
+/**
+ * When a chunk's esbuild bundle fails to resolve bare specifiers, the
+ * historical fallback strips every import, leaving dangling free identifiers
+ * that surface as a baffling `ReferenceError: X is not defined` at render
+ * time. Native-only `@vesk/*` library imports can NEVER resolve in the
+ * browser dev preview — make that a first-class, readable failure by emitting
+ * a throwing proxy for every binding those imports declare: the binding reads
+ * as a function, so `typeof` stays truthful, and the throw carries the
+ * library, the binding, and the remedy. Other bare specifiers (e.g. `motion`,
+ * dev-preview-provided) are left dangling — genuinely missing packages still
+ * fail as ReferenceErrors, which is honest. AST-only; never a text scan.
+ */
+export function nativeLibraryImportStubs(code) {
+    let ast;
+    try {
+        ast = parse(code);
+    }
+    catch {
+        return '';
+    }
+    const body = ast.body ?? [];
+    const bindings = [];
+    for (const node of body) {
+        if (node?.type !== 'ImportDeclaration')
+            continue;
+        const src = node.source?.value;
+        if (typeof src !== 'string' || !src.startsWith('@vesk/') || src.startsWith('@vesk/runtime'))
+            continue;
+        for (const spec of node.specifiers ?? []) {
+            if (typeof spec?.local?.name === 'string')
+                bindings.push([spec.local.name, src]);
+        }
+    }
+    if (bindings.length === 0)
+        return '';
+    const lines = bindings.map(([local, spec]) => {
+        const message = `web preview: native library "${spec}" has no browser equivalent on the web ` +
+            `(dev-only) — binding "${local}" cannot be provided in vesk dev --web. Build for Android to use it.`;
+        const thrower = `throw Object.assign(new Error(${JSON.stringify(message)}), { __veskPreviewMissing: ${JSON.stringify(spec)} })`;
+        return (`const ${local} = new Proxy(function () {}, { ` +
+            `get: function () { ${thrower}; }, ` +
+            `apply: function () { ${thrower}; }, ` +
+            `construct: function () { ${thrower}; } });`);
+    });
+    return lines.join('\n') + '\n\n';
+}
 /**
  * Demotes surviving value exports to plain declarations (`export const x`
  * becomes `const x`) and drops bare re-export lists (`export { x }`,
@@ -682,7 +729,9 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
         // One parse/IR pass feeds both client modes AND the component-name
         // lookup — the dev hot path pays the acorn+TS parse once per edit
         // instead of three times.
-        const { comp: rawComp, hyd: rawHyd, name: actualName } = compileClientBoth(src, null, filePath);
+        const { comp: rawComp, hyd: rawHyd, name: actualName, aliases, reexportPaths, componentNames } = compileClientBoth(src, null, filePath);
+        for (const cn of componentNames || [])
+            componentOwners.claim(cn, filePath);
         // Cache keeps the import-carrying codes so a warm build can re-fold them
         // into its own fresh accumulator; the emitted codes are import-stripped.
         // The bodies/specs/scoped artifacts are cached too so warm replay never
@@ -715,6 +764,17 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
             output.push(`Object.defineProperty(__components, ${JSON.stringify(resolvedName)}, { get: () => __components[${JSON.stringify(actualName)}], configurable: true });`);
             output.push(`Object.defineProperty(__hydrators, ${JSON.stringify(resolvedName)}, { get: () => __hydrators[${JSON.stringify(actualName)}], configurable: true });`);
         }
+        // `.vsk` export/import aliases (`export { A as B }`, `import { A as B }`):
+        // nothing is emitted for them, so register lazy getters that resolve to
+        // the canonical name. Lazy because the target may be contributed later.
+        for (const alias of aliases || []) {
+            output.push(`Object.defineProperty(__components, ${JSON.stringify(alias.exported)}, { get: () => __components[${JSON.stringify(alias.local)}], configurable: true });`);
+            output.push(`Object.defineProperty(__hydrators, ${JSON.stringify(alias.exported)}, { get: () => __hydrators[${JSON.stringify(alias.local)}], configurable: true });`);
+        }
+        // `export * from './x.vsk'` / `export { A } from './x.vsk'`: the target is
+        // not reachable through an import statement, so compile it here.
+        for (const reexportPath of reexportPaths || [])
+            compileFile(reexportPath, null, output, imports);
         if (cache && namesBefore) {
             const st = statSync(filePath);
             cache.files.set(filePath, {
@@ -740,6 +800,11 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
     }
     const codeSplit = !!(options?.codeSplit);
     const transformPlugins = options?.plugins || [];
+    // Every `.vsk` component in the bundle shares ONE registry keyed by declared
+    // name, so two files declaring `component X` silently resolve to whichever
+    // compiled last. Warn once per build — see vsk-collision.ts for why this is
+    // a warning and not an error.
+    const componentOwners = new VskComponentOwners();
     /** Run every active plugin's `onTransformJS` over an emitted bundle/chunk source. */
     async function applyTransformPlugins(code, filePath) {
         if (transformPlugins.length === 0)
@@ -863,10 +928,12 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
                     const err = e;
                     console.error('[vesk] chunk bundle failed', entry.name, err?.errors?.map((x) => x.text).join(' | ') || err?.message || String(e));
                     // Fall back to the historical behavior: strip every import so the
-                    // classic script at least parses (referenced values will surface as
-                    // ReferenceErrors at runtime — the pre-existing failure mode).
+                    // classic script at least parses. Bindings imported from native-only
+                    // `@vesk/*` libraries get throwing stubs (a readable degradation
+                    // instead of a baffling `X is not defined`); every other stripped
+                    // name stays dangling, which is the pre-existing failure mode.
                     const stripped = demoteExports(removeCompiledNodes(entry.code, isAnyImport));
-                    finalCode = chunkIIFE(stripped);
+                    finalCode = chunkIIFE(nativeLibraryImportStubs(entry.code) + stripped);
                 }
                 finally {
                     try {
@@ -876,7 +943,12 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
                 }
             }
             else {
-                finalCode = chunkIIFE(entry.code);
+                // No-import chunk: wrap the compiled source in the registry IIFE. The
+                // compiler still emits module-level `export const pageProps` / re-export
+                // lists, and a classic script cannot carry an `export` — demote value
+                // exports to bindings and drop bare re-export lists (components resolve
+                // via the __components / __hydrators registries, matching the mono path).
+                finalCode = chunkIIFE(demoteExports(entry.code));
             }
             chunks.push({ name: entry.name, code: finalCode });
         }
@@ -905,6 +977,7 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
         for (const chunk of chunks) {
             transformedChunks.push({ ...chunk, code: await applyTransformPlugins(chunk.code, chunk.name) });
         }
+        componentOwners.report('client bundle');
         return { main: await applyTransformPlugins(main, 'client.js'), chunks: transformedChunks, cachedFileHits, compiledFiles, mainFromCache, editedSources, editedNames };
     }
     else {
@@ -918,6 +991,8 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
             seen.add(filePath);
             const src = readFileSync(filePath, 'utf-8');
             resolveVskImports(filePath, (p, n) => compileFileMono(p, n || ''));
+            for (const cn of vskComponentNames(src, filePath))
+                componentOwners.claim(cn, filePath);
             // Share one name allocator so the comp and hyd contributions (which are
             // joined into a single scoped block below) never reuse `$n` names.
             const monoAlloc = nameAllocFor(filePath);
@@ -974,6 +1049,7 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
             componentLines, hydratorLines, aliasLines, hydratorAliasLines,
         }, !!options?.hmr, !!options?.importRuntime, runtimeImportNames, options?.routeDataCache);
         // Mono (non-codeSplit) builds are the production path — no incremental cache.
+        componentOwners.report('client bundle');
         return { main: await applyTransformPlugins(main, 'client.js'), chunks: [] };
     }
 }
@@ -1142,7 +1218,7 @@ function appendHmrGlobals(code) {
         "};\n";
 }
 async function buildMainBundle(routeTree, runtimeDir, codeSplit, mono, hmr, importRuntime, runtimeImportNames, routeDataCache) {
-    const baseRuntimeImports = ['createFileRouter', 'get', 'set', 'effect', 'track', 'destroy_block', 'getActiveComponent', 'setActiveComponent', 'NavLink', 'Link', 'reactiveProps', 'matchRoute', 'ensureChunk'];
+    const baseRuntimeImports = ['createFileRouter', 'get', 'set', 'effect', 'track', 'destroy_block', 'getActiveComponent', 'setActiveComponent', 'NavLink', 'Link', 'reactiveProps', 'matchRoute', 'ensureChunk', 'toDomNode', 'rerenderNode'];
     const allRuntimeImports = runtimeImportNames && runtimeImportNames.size > 0
         ? [...new Set([...baseRuntimeImports, ...runtimeImportNames])]
         : baseRuntimeImports;

package/dist/hmr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hmr.d.ts","sourceRoot":"","sources":["../src/hmr.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAUxC,OAAO,EAAsC,KAAK,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAEvG,OAAO,KAAK,EAAE,SAAS,EAAkB,MAAM,yBAAyB,CAAC;AAIzE;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gFAAgF;IAChF,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAaD,wBAAgB,WAAW,IAAI;IAC7B,MAAM,EAAE,IAAI,GAAG,QAAQ,CAAC;IACxB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,eAAe,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAQA;AAED,MAAM,WAAW,wBAAwB;IACvC,8EAA8E;IAC9E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wEAAwE;IACxE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,wBAA6B,GAClC,eAAe,CAsGjB;AAwRD,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC;IACD,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAClE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvH,WAAW,EAAE,MAAM,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;CACnD,CA6KA"}
+{"version":3,"file":"hmr.d.ts","sourceRoot":"","sources":["../src/hmr.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAUxC,OAAO,EAAsC,KAAK,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAEvG,OAAO,KAAK,EAAE,SAAS,EAAkB,MAAM,yBAAyB,CAAC;AAIzE;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gFAAgF;IAChF,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAaD,wBAAgB,WAAW,IAAI;IAC7B,MAAM,EAAE,IAAI,GAAG,QAAQ,CAAC;IACxB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,eAAe,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAQA;AAED,MAAM,WAAW,wBAAwB;IACvC,8EAA8E;IAC9E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wEAAwE;IACxE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,wBAA6B,GAClC,eAAe,CAsGjB;AAoSD,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC;IACD,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAClE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvH,WAAW,EAAE,MAAM,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;CACnD,CA6KA"}

package/dist/hmr.js

@@ -355,6 +355,14 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
     let renderCode;
     if (layoutDecls.length > 0) {
         renderCode = [
+            // One store per request, mirroring ssr-function.ts. The page, every
+            // nested layout and the document must share a single SSR token: each
+            // `renderPage`/`renderFullPage` call below resolves
+            // `globalThis.__vsk_ssr_token` for its data slot, and outside a scope that
+            // global is undefined — so `useFetch` settled under one token would be
+            // serialized by `renderFullPage` under another and the page would ship
+            // with no ssr-data script.
+            '  return withSsrStore(async () => {',
             '  let page;',
             '  let caughtError = null;',
             '  try {',
@@ -368,22 +376,24 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
             '  }',
             "  let _body = (caughtError ? '<!--vesk-ssr-error:' + (caughtError && typeof caughtError === 'object' && 'message' in caughtError ? encodeURIComponent(String(caughtError.message)) : '') + '-->' : '') + page.body;",
             "  let _head = page.head || '';",
-            "  for (let _i = _layoutSrcList.length - 1; _i > 0; _i--) {",
+            '  for (let _i = _layoutSrcList.length - 1; _i > 0; _i--) {',
             "    const _inner = await renderPage(_layoutSrcList[_i], _layoutCompList[_i], { params, children: _body }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[_i], sourcePath: _layoutPathList[_i] });",
             '    _body = _inner.body;',
             "    if (_inner.head) _head = _inner.head + _head;",
             '  }',
             "  const html = await renderFullPage(_layoutSrcList[0], _layoutCompList[0], { params, children: _body }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[0]" + bakedOptions + clientScriptOption + dataScriptOption + ', pageHead: _head, sourcePath: _layoutPathList[0] });',
             "  return new Response(html, { headers: { 'Content-Type': 'text/html' }, status: caughtError ? 500 : 200 });",
+            '  });',
         ].join('\n');
     }
     else {
         renderCode = [
+            '  return withSsrStore(async () => {',
             '  let stream;',
             '  try {',
             '    stream = renderPageStream(_src, _comp, { params }, __componentRegistry, { hydrate: true, cached: _srcCompiled' + bakedOptions + clientScriptOption + dataScriptOption + ", sourcePath: _srcPath });",
             '  } catch (err) {',
-            '    if (err && (err.name === \'NotFoundError\' || err.name === \'Redirect\')) throw err;',
+            "    if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
             '    if (!_errorSrc) throw err;',
             "    const message = err && typeof err === 'object' && 'message' in err ? String(err.message) : String(err);",
             "    const stack = err && typeof err === 'object' && 'stack' in err ? String(err.stack) : '';",
@@ -399,6 +409,7 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
             '      controller.close();',
             '    },',
             "  }), { headers: { 'Content-Type': 'text/html' } });",
+            '  });',
         ].join('\n');
     }
     const errorBodyFnCode = [
@@ -413,7 +424,7 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
         '}',
     ].join('\n');
     const funcCode = [
-        "import { renderFullPage, renderPageStream, renderPage, compileFile, setVskHydrate, storeDataScriptGlobal } from '../runtime.js';",
+        "import { renderFullPage, renderPageStream, renderPage, compileFile, setVskHydrate, storeDataScriptGlobal, withSsrStore } from '../runtime.js';",
         '', registryCode, src, '',
         errorBodyFnCode,
         '',

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

@@ -1 +1 @@
-{"version":3,"file":"ssr-function.d.ts","sourceRoot":"","sources":["../src/ssr-function.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAkB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAI7F,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQjF;AAgED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,kBAAkB,GAC3B;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAoYtD"}
+{"version":3,"file":"ssr-function.d.ts","sourceRoot":"","sources":["../src/ssr-function.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAkB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAI7F,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQjF;AAgED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,kBAAkB,GAC3B;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAoZtD"}

package/dist/ssr-function.js

@@ -241,35 +241,49 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
     // the next full-page render can't reuse the stale token and serialize the
     // previous nav's SSR data into its page (ssr-data leak).
     const dataNavCleanup = [
-        '  } finally {',
-        '    const __dnToken = globalThis.__vsk_ssr_token;',
-        '    delete globalThis.__vsk_ssr;',
-        '    if (__dnToken) delete globalThis[`__vsk_ssr_data_${__dnToken}`];',
-        '    delete globalThis.__vsk_ssr_token;',
-        '    delete globalThis.__vsk_ssr_data;',
-        '  }',
+        '    } finally {',
+        '      const __dnToken = globalThis.__vsk_ssr_token;',
+        '      delete globalThis.__vsk_ssr;',
+        '      if (__dnToken) delete globalThis[`__vsk_ssr_data_${__dnToken}`];',
+        // NOT `delete globalThis.__vsk_ssr_token`: that global is a
+        // configurable AsyncLocalStorage accessor (ssr-store.ts), so `delete`
+        // removes the property definition and the process silently reverts to a
+        // process-global token — the cross-request data-slot race, for good. The
+        // token dies with the withSsrStore scope wrapped around this block instead.
+        '      delete globalThis.__vsk_ssr_data;',
+        '    }',
+    ];
+    // The data-nav branch never runs renderFullPage/renderPageStream, so it needs
+    // its own request scope — otherwise its renderPage mints a token that is
+    // still live when the full-page render starts and the two share a data slot.
+    const dataNavWrap = (body) => [
+        '  return withSsrStore(async () => {',
+        ...body.map((l) => (l ? '  ' + l : l)),
+        '  });',
     ];
     if (layoutDecls.length > 0) {
         dataCode = [
             "  if (request.headers.get('x-vesk-data') === '1') {",
-            '    try {',
-            '      let dataPage;',
-            '      try {',
-            "        dataPage = await renderPage('', _pageComp, { params }, __componentRegistry, { hydrate: true, cached: _pageCompiled });",
-            '      } catch (err) {',
-            "        if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
-            '        const message = err && typeof err === \'object\' && \'message\' in err ? String(err.message) : String(err);',
-            `        return new Response(JSON.stringify({ error: ${exposeErr} ? message : 'Internal Server Error' }), { status: 500, headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' } });`,
-            '      }',
-            '      let _dataHead = dataPage.head || \'\';',
-            '      for (let _i = _layoutCompList.length - 1; _i >= 0; _i--) {',
-            "        const _dl = await renderPage('', _layoutCompList[_i], { params, children: '' }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[_i] });",
-            '        _dataHead = (_dl.head || \'\') + _dataHead;',
-            '      }',
-            "      return new Response(JSON.stringify({ path: url.pathname, params, props: dataPage.props || { params }, head: _dataHead }), {",
-            "        headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' },",
-            '      });',
-            ...dataNavCleanup,
+            ...dataNavWrap([
+                '    try {',
+                '      let dataPage;',
+                '      try {',
+                "        dataPage = await renderPage('', _pageComp, { params }, __componentRegistry, { hydrate: true, cached: _pageCompiled });",
+                '      } catch (err) {',
+                "        if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
+                '        const message = err && typeof err === \'object\' && \'message\' in err ? String(err.message) : String(err);',
+                `        return new Response(JSON.stringify({ error: ${exposeErr} ? message : 'Internal Server Error' }), { status: 500, headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' } });`,
+                '      }',
+                '      let _dataHead = dataPage.head || \'\';',
+                '      for (let _i = _layoutCompList.length - 1; _i >= 0; _i--) {',
+                "        const _dl = await renderPage('', _layoutCompList[_i], { params, children: '' }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[_i] });",
+                '        _dataHead = (_dl.head || \'\') + _dataHead;',
+                '      }',
+                "      return new Response(JSON.stringify({ path: url.pathname, params, props: dataPage.props || { params }, head: _dataHead }), {",
+                "        headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' },",
+                '      });',
+                ...dataNavCleanup,
+            ]),
             '  }',
             '  return __renderHtml(params, url.href);',
         ].join('\n');
@@ -277,19 +291,21 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
     else {
         dataCode = [
             "  if (request.headers.get('x-vesk-data') === '1') {",
-            '    try {',
-            '      let dataPage;',
-            '      try {',
-            "        dataPage = await renderPage('', _comp, { params }, __componentRegistry, { hydrate: true, cached: _compiled });",
-            '      } catch (err) {',
-            "        if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
-            '        const message = err && typeof err === \'object\' && \'message\' in err ? String(err.message) : String(err);',
-            `        return new Response(JSON.stringify({ error: ${exposeErr} ? message : 'Internal Server Error' }), { status: 500, headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' } });`,
-            '      }',
-            "      return new Response(JSON.stringify({ path: url.pathname, params, props: dataPage.props || { params }, head: dataPage.head || '' }), {",
-            "        headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' },",
-            '      });',
-            ...dataNavCleanup,
+            ...dataNavWrap([
+                '    try {',
+                '      let dataPage;',
+                '      try {',
+                "        dataPage = await renderPage('', _comp, { params }, __componentRegistry, { hydrate: true, cached: _compiled });",
+                '      } catch (err) {',
+                "        if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
+                '        const message = err && typeof err === \'object\' && \'message\' in err ? String(err.message) : String(err);',
+                `        return new Response(JSON.stringify({ error: ${exposeErr} ? message : 'Internal Server Error' }), { status: 500, headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' } });`,
+                '      }',
+                "      return new Response(JSON.stringify({ path: url.pathname, params, props: dataPage.props || { params }, head: dataPage.head || '' }), {",
+                "        headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' },",
+                '      });',
+                ...dataNavCleanup,
+            ]),
             '  }',
             '  return __renderHtml(params, url.href);',
         ].join('\n');

package/dist/types.d.ts

@@ -1,2 +1,2 @@
-export type { RouteNode, ApiRouteNode, VeskPlugin, ServerEventContext, VeskEventHandlers, VeskSecurity, VeskCors, VeskRateLimit, VeskSecurityPreset, SecurityConfig, MiddlewareChainItem, MiddlewareExtractResult, AncestorLayout, BuildOptions, DevServerOptions, ProdServerOptions, SsrFunctionOptions, ApiFunctionOptions, ClientBundleOptions, ClientBundleFileEntry, ClientBundleChunkSpec, ClientBundleCache, ChunkEntry, ClientBundleResult, MonolithicBundleParts, Manifest, ManifestRouteEntry, ManifestActionEntry, ManifestPrerenderedEntry, SsgRouteResult, BuildResult, ImageRef, ImageResult, SeoCheckIssue, SeoAuditResult, CombinedPageInfo, Tracked, Resource, UseFetchOptions, UseFetchStreamOptions, VeskRequest, VeskResponse, SetCookieOptions, CookieStore, ServerRequest, SsrDataSink, MdProps, MdConfig, MdHtmlMode, MarkdownOptions, MdHtmlWarning, } from '@vesk/types';
+export type { RouteNode, ApiRouteNode, VeskPlugin, ServerEventContext, VeskEventHandlers, VeskSecurity, VeskCors, VeskRateLimit, VeskSecurityPreset, SecurityConfig, MiddlewareChainItem, MiddlewareExtractResult, AncestorLayout, BuildOptions, DevServerOptions, ProdServerOptions, SsrFunctionOptions, ApiFunctionOptions, ClientBundleOptions, ClientBundleFileEntry, ClientBundleChunkSpec, ClientBundleCache, ChunkEntry, ClientBundleResult, MonolithicBundleParts, Manifest, ManifestRouteEntry, ManifestActionEntry, ManifestPrerenderedEntry, SsgRouteResult, BuildResult, ImageRef, ImageResult, SeoCheckIssue, SeoAuditResult, CombinedPageInfo, Tracked, Resource, UseFetchOptions, UseFetchStreamOptions, VeskRequest, VeskResponse, SetCookieOptions, CookieStore, ServerRequest, SsrDataSink, MdProps, MdConfig, MdHtmlMode, MarkdownOptions, MdHtmlWarning, VeskLeafComponent, VeskPrimitiveComponent, VeskTaggedLeafComponent, VeskComponentRegistry, VeskScope, } from '@vesk/types';
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,YAAY,EACV,SAAS,EACT,YAAY,EACZ,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,YAAY,EACZ,QAAQ,EACR,aAAa,EACb,kBAAkB,EAClB,cAAc,EACd,mBAAmB,EACnB,uBAAuB,EACvB,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,iBAAiB,EACjB,UAAU,EACV,kBAAkB,EAClB,qBAAqB,EACrB,QAAQ,EACR,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACxB,cAAc,EACd,WAAW,EACX,QAAQ,EACR,WAAW,EACX,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,OAAO,EACP,QAAQ,EACR,eAAe,EACf,qBAAqB,EACrB,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,WAAW,EACX,aAAa,EACb,WAAW,EACX,OAAO,EACP,QAAQ,EACR,UAAU,EACV,eAAe,EACf,aAAa,GACd,MAAM,aAAa,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,YAAY,EACV,SAAS,EACT,YAAY,EACZ,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,YAAY,EACZ,QAAQ,EACR,aAAa,EACb,kBAAkB,EAClB,cAAc,EACd,mBAAmB,EACnB,uBAAuB,EACvB,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,iBAAiB,EACjB,UAAU,EACV,kBAAkB,EAClB,qBAAqB,EACrB,QAAQ,EACR,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACxB,cAAc,EACd,WAAW,EACX,QAAQ,EACR,WAAW,EACX,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,OAAO,EACP,QAAQ,EACR,eAAe,EACf,qBAAqB,EACrB,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,WAAW,EACX,aAAa,EACb,WAAW,EACX,OAAO,EACP,QAAQ,EACR,UAAU,EACV,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,sBAAsB,EACtB,uBAAuB,EACvB,qBAAqB,EACrB,SAAS,GACV,MAAM,aAAa,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/adapter",
-  "version": "0.2.42",
+  "version": "0.2.44",
   "type": "module",
   "description": "Vesk adapter — builds deployable .vesk/ output for Deno and Node serverless",
   "main": "./dist/index.js",
@@ -23,9 +23,9 @@
     "sharp": "^0.35.3"
   },
   "dependencies": {
-    "@vesk/compiler": "^0.2.42",
-    "@vesk/runtime": "^0.2.42",
-    "@vesk/types": "^0.2.42"
+    "@vesk/compiler": "^0.2.44",
+    "@vesk/runtime": "^0.2.44",
+    "@vesk/types": "^0.2.44"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",