@vesk/adapter 0.2.26 → 0.2.28

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

@@ -1 +1 @@
-{"version":3,"file":"client-bundle.d.ts","sourceRoot":"","sources":["../src/client-bundle.ts"],"names":[],"mappings":"AAWA,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;AAoWD;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAkBxD;AAmCD,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,CA4Z7B;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;AAYD;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAuCrG"}
+{"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;AAqVD;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAkBxD;AAmCD,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;AAYD;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAuCrG"}

package/dist/client-bundle.js

@@ -4,10 +4,11 @@ import { fileURLToPath } from 'node:url';
 import { build } from './esbuild-fallback.js';
 import { stripCodeTypes } from '@vesk/compiler/src/strip-ts';
 import { parse } from '@vesk/compiler/src/parser';
-import { compileClient, compileClientBoth } from '@vesk/compiler/src/client-codegen';
+import { compileClient, compileClientBoth, nameAllocFor } from '@vesk/compiler/src/client-codegen';
 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';
+import { resolveImportPath, findTsconfigPath } from '@vesk/compiler/src/module-imports';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 function fileUnchanged(filePath, cached) {
     try {
@@ -207,20 +208,6 @@ function demoteExports(code) {
 function chunkHasImports(headLen, mergeAborted) {
     return headLen > 0 || mergeAborted;
 }
-/**
- * Rewrites a compiled file's source specifier so esbuild can resolve it from
- * the temp bundle entry. Bare package specifiers (e.g. `lucide-vesk`) stay
- * as-is; relative specifiers are resolved to absolute filesystem paths with a
- * `.ts` extension appended so esbuild loads the module as TypeScript and
- * inlines its exported values. Offset-based on the parser AST — never a text
- * scan.
- */
-function resolveImportSource(src, filePath) {
-    if (src.startsWith('./') || src.startsWith('../')) {
-        return resolve(dirname(filePath), src) + '.ts';
-    }
-    return src;
-}
 /**
  * Accumulates every import a code-split chunk needs and rebuilds it as a
  * single deduped import block.
@@ -273,7 +260,7 @@ class ChunkImports {
             const src = node.source?.value;
             if (typeof src !== 'string')
                 continue;
-            const resolved = resolveImportSource(src, filePath);
+            const resolved = resolveImportPath(src, dirname(filePath));
             for (const spec of node.specifiers ?? []) {
                 const s = spec;
                 const local = s.local?.name;
@@ -793,6 +780,9 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
                 const toBundle = `const __components = globalThis.__components || (globalThis.__components = {});\nconst __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});\n${entry.code}\n`;
                 writeFileSync(tmpFile, toBundle);
                 try {
+                    // Pass the app tsconfig so esbuild resolves tsconfig `paths` aliases
+                    // (`@/x`, `@app/x`) inside transitively bundled modules too.
+                    const appTsconfig = findTsconfigPath(appDir);
                     const result = await build({
                         entryPoints: [tmpFile],
                         bundle: true,
@@ -801,6 +791,7 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
                         write: false,
                         logLevel: 'silent',
                         loader: { '.js': 'tsx' },
+                        ...(appTsconfig ? { tsconfig: appTsconfig } : {}),
                     });
                     finalCode = result.outputFiles[0].text;
                 }
@@ -863,8 +854,11 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
             seen.add(filePath);
             const src = readFileSync(filePath, 'utf-8');
             resolveVskImports(filePath, (p, n) => compileFileMono(p, n || ''));
-            const compCode = compileClient(src, null, { forceClient: true, sourcePath: filePath });
-            const hydCode = compileClient(src, null, { hydrate: true, forceClient: true, includeTopLevel: false, sourcePath: 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);
+            const compCode = compileClient(src, null, { forceClient: true, sourcePath: filePath, nameAllocator: monoAlloc });
+            const hydCode = compileClient(src, null, { hydrate: true, forceClient: true, includeTopLevel: false, sourcePath: filePath, nameAllocator: monoAlloc });
             if (compCode)
                 collectRuntimeImports(compCode);
             if (hydCode)

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

@@ -1 +1 @@
-{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../src/dev-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,MAAM,EAA6C,MAAM,WAAW,CAAC;AAOjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAI7C,OAAO,KAAK,EAAa,gBAAgB,EAAwB,MAAM,yBAAyB,CAAC;AAgBjG;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,IAAI,GAAG,WAAW,GAAG,OAAO,GAAG,MAAM,CAAC;IAC9C,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACxD,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB;+EAC2E;IAC3E,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,mEAAmE;AACnE,wBAAgB,kBAAkB,IAAI,WAAW,CAEhD;AAuCD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAIzE;AAkBD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,mHAAmH;IACnH,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B;;8BAE0B;IAC1B,MAAM,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,UAAU,GAAG,YAAY,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IACrE,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,WAAW,CAAC;IAChC,8EAA8E;IAC9E,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,wBAAwB,GAAG;IACvE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;CAChH,CAUA;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAa3C;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIrD;AA8CD,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwnBvG"}
+{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../src/dev-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,MAAM,EAA6C,MAAM,WAAW,CAAC;AAOjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAK7C,OAAO,KAAK,EAAa,gBAAgB,EAAwB,MAAM,yBAAyB,CAAC;AAgBjG;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,IAAI,GAAG,WAAW,GAAG,OAAO,GAAG,MAAM,CAAC;IAC9C,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACxD,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB;+EAC2E;IAC3E,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,mEAAmE;AACnE,wBAAgB,kBAAkB,IAAI,WAAW,CAEhD;AAuCD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAIzE;AAkBD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,mHAAmH;IACnH,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B;;8BAE0B;IAC1B,MAAM,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,UAAU,GAAG,YAAY,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IACrE,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,WAAW,CAAC;IAChC,8EAA8E;IAC9E,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,wBAAwB,GAAG;IACvE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;CAChH,CAUA;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAa3C;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIrD;AA8CD,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA2oBvG"}

package/dist/dev-server.js

@@ -8,6 +8,7 @@ import { build } from '@vesk/adapter/src/index';
 import { buildErrorPayload, createHmrServer } from './hmr';
 import * as hmrApi from './hmr';
 import { createDevApiRouter } from './dev-api';
+import { resolveRuntimeErrorPayload, renderDevErrorPage } from './ssr-error';
 import { buildTreeShakenRuntime, runtimeExportNames } from '@vesk/adapter/src/client-bundle';
 import { resolveWithin, installMdReadHook } from '@vesk/adapter/src/paths';
 import { getPluginRecords } from './plugins';
@@ -359,6 +360,25 @@ export async function startDevServer(appDir, options) {
     let routeTree = [];
     let runtimeBundle = '';
     let pendingInitialError = null;
+    /**
+     * Render an SSR failure as the unified dev error page (same payload shape
+     * the HMR overlay shows): the `.vsk`/`.ts` source site, codeframe, tips,
+     * and the `VeskError` code when present — never a bare `500` page. Best
+     * effort: on any failure falls back to the old generic 500 HTML.
+     */
+    function renderSsrErrorPage(e, pathname) {
+        try {
+            const payload = resolveRuntimeErrorPayload(e, {
+                appDir,
+                projectDir: resolve(appDir, '..'),
+                componentMap,
+            });
+            return injectDevScripts(renderDevErrorPage(payload, { status: 500, url: pathname }));
+        }
+        catch {
+            return '<!DOCTYPE html><html><body><h1>500</h1><pre>Internal Server Error</pre></body></html>';
+        }
+    }
     let eventsMod = null;
     async function reloadEventsMod() {
         const eventsPath = resolve(devDir, 'server', 'events.js');
@@ -671,7 +691,7 @@ export async function startDevServer(appDir, options) {
                     }
                     catch (e) {
                         res.writeHead(500, { 'Content-Type': 'text/html' });
-                        res.end('<!DOCTYPE html><html><body><h1>500</h1><pre>Internal Server Error</pre></body></html>');
+                        res.end(renderSsrErrorPage(e, url.pathname));
                     }
                     return;
                 }
@@ -698,7 +718,7 @@ export async function startDevServer(appDir, options) {
                     }
                     catch (e) {
                         res.writeHead(500, { 'Content-Type': 'text/html' });
-                        res.end('<!DOCTYPE html><html><body><h1>500</h1><pre>Internal Server Error</pre></body></html>');
+                        res.end(renderSsrErrorPage(e, url.pathname));
                     }
                     return;
                 }

package/dist/error-codeframe.d.ts

@@ -18,6 +18,8 @@ export interface ErroredLocation {
     message: string;
     stack: string | null;
     codeframe: Codeframe | null;
+    /** VeskError-style `.code` (e.g. `V0412`) when the thrown error carries one. */
+    code?: string;
 }
 export declare function parseCompilerError(err: unknown, file: string, src?: string): ErroredLocation | null;
 //# sourceMappingURL=error-codeframe.d.ts.map

package/dist/error-codeframe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-codeframe.d.ts","sourceRoot":"","sources":["../src/error-codeframe.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,QAAQ,EAAE,CAAC;CAClB;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,SAAI,GAAG,SAAS,GAAG,IAAI,CAcxG;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;CAC7B;AAuBD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAwFnG"}
+{"version":3,"file":"error-codeframe.d.ts","sourceRoot":"","sources":["../src/error-codeframe.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,QAAQ,EAAE,CAAC;CAClB;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,SAAI,GAAG,SAAS,GAAG,IAAI,CAcxG;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,gFAAgF;IAChF,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAuBD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CA4FnG"}

package/dist/error-codeframe.js

@@ -116,6 +116,9 @@ export function parseCompilerError(err, file, src) {
         if (codeframe)
             codeframe.file = fileResolved;
     }
+    let code;
+    if (record && typeof record.code === 'string' && record.code)
+        code = record.code;
     return {
         file: fileResolved,
         line,
@@ -123,5 +126,6 @@ export function parseCompilerError(err, file, src) {
         message,
         stack,
         codeframe,
+        code,
     };
 }

package/dist/hmr.d.ts

@@ -17,6 +17,8 @@ export interface HmrErrorPayload {
     suggestions?: string[];
     nextSteps?: string[];
     stack?: string;
+    /** Optional VeskError-style code (e.g. `V0412`) carried on the thrown error. */
+    code?: string;
 }
 export declare function getHmrState(): {
     status: 'up' | 'closed';

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;CAChB;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,CA6FjB;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;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"}

package/dist/hmr.js

@@ -103,6 +103,13 @@ export function buildErrorPayload(error, filename, opts = {}) {
     const filePath = resolvedAbsPath ?? (typeof opts.appDir === 'string'
         ? resolve(opts.appDir, file)
         : undefined);
+    // VeskError throws carry a stable `.code` (e.g. `V0412`) — surface it in the
+    // payload so the HMR overlay, SSR error page, and diagnostics can show it.
+    const errorCode = parsed && typeof parsed.code === 'string' && parsed.code
+        ? parsed.code
+        : error?.code
+            ? String(error.code)
+            : undefined;
     // The file header already shows the location; strip the redundant
     // " in <file>" suffix compilers append to messages (e.g. acorn's
     // "Unexpected token in /abs/app/page.vsk").
@@ -117,6 +124,8 @@ export function buildErrorPayload(error, filename, opts = {}) {
         column,
         message: cleanMessage,
     };
+    if (errorCode)
+        payload.code = errorCode;
     if (filePath)
         payload.filePath = filePath;
     if (codeframe)

package/dist/ssr-error.d.ts

@@ -0,0 +1,92 @@
+import { type HmrErrorPayload } from './hmr';
+export interface RuntimeErrorContext {
+    /** Absolute path of the app dir (`.../app`). Used to resolve sources for codeframes. */
+    appDir: string;
+    /** Absolute path of the project root (`.../`, parent of `app/`). Defaults to `resolve(appDir, '..')`. */
+    projectDir?: string;
+    /** Absolute `.vsk` files for the failing route (page first). Scanned for the failing identifier. */
+    routeFiles?: string[];
+    /** `componentName -> absolute .vsk path` for shared `components/` (from `scanComponents`). */
+    componentMap?: Map<string, string>;
+    /** `componentName -> absolute .vsk path` for route files (from `collectSources`). */
+    routeSources?: Map<string, string>;
+}
+export interface ClientErrorReport {
+    message?: unknown;
+    stack?: unknown;
+    /** Compiled-bundle URL/path from `window.onerror` — display fallback only, never the payload file. */
+    filename?: unknown;
+    line?: unknown;
+    column?: unknown;
+    /** VeskError-style code (e.g. `V0412`) when the client error carried one. */
+    code?: unknown;
+}
+/**
+ * Extract the undeclared identifier from `ReferenceError`-style messages:
+ * `Menu is not defined`, `ReferenceError: Menu is not defined`,
+ * `Cannot find name 'Menu'`, `Can't find variable: Menu`.
+ */
+export declare function extractUndefinedName(message: string): string | null;
+/**
+ * Component names from a compiled render stack, innermost frame first:
+ * `__components.SiteHeader`, `__components["SiteHeader"]`, `__components['Home']`.
+ */
+export declare function extractComponentNames(stack: string): string[];
+export interface StackFrame {
+    /** Path or URL as it appears in the stack frame (may be a bundle URL). */
+    path: string;
+    line: number;
+    column: number;
+}
+/**
+ * Parse V8-style stack lines into `path:line:col` frames (1-based column,
+ * matching the codeframe caret). Supports both parenthesized frames
+ * (`at fn (/abs/file.ts:12:5)`) and bare path frames (`at file.ts:12:5`).
+ */
+export declare function extractSourceFrames(stack: string | undefined | null): StackFrame[];
+/**
+ * First stack frame that names a real source file inside the project
+ * (`.ts`/`.tsx`/`.js`/`.vsk`, existing on disk, not node_modules/dist/.vesk
+ * or the dev bundle). Innermost (topmost) real frame is the throw site —
+ * e.g. `ReferenceError` inside `lib/helper.ts` imported by a `.vsk` page.
+ */
+export declare function firstSourceFileFrame(stack: string | undefined | null, projectRoot: string): StackFrame | null;
+/**
+ * First use of an identifier in a `.vsk` source file (1-based line/column).
+ * Import lines are skipped — an undeclared name's *use* site is the error site.
+ */
+export declare function findIdentifierUsage(src: string, name: string): {
+    line: number;
+    column: number;
+} | null;
+/** Display path for a payload: app-relative (`page.vsk`), else project-relative (`components/X.vsk`). */
+export declare function displayPath(absPath: string, ctx: RuntimeErrorContext): string;
+/** Ordered absolute candidate files: stack-named components first, then route files. */
+export declare function candidateFiles(message: string, stack: string | undefined, ctx: RuntimeErrorContext): string[];
+/**
+ * Resolve a server-side throw to the HMR payload shape. Never throws — on any
+ * failure returns the message + stack + generic tips (the old behavior, but in
+ * the overlay-renderable shape).
+ */
+export declare function resolveRuntimeErrorPayload(err: unknown, ctx: RuntimeErrorContext): HmrErrorPayload;
+/**
+ * Resolve a client-side `{ message, stack }` report (compiled-bundle
+ * coordinates) to the HMR payload shape. Same core as the server path, but
+ * stack-named components outrank route files — the throw site is named by the
+ * `__components.Foo` frames, as in `ReferenceError: Menu is not defined` from
+ * `__components.SiteHeader` inside `__components.Home`.
+ */
+export declare function resolveClientErrorReport(report: ClientErrorReport, ctx: RuntimeErrorContext): HmrErrorPayload;
+/** `file:line:col` (or `file`, or `''`) for one-line terminal logs. */
+export declare function formatErrorLocation(payload: HmrErrorPayload): string;
+/**
+ * Standalone dev 500 page in the overlay's visual language (file header,
+ * message, codeframe with caret, TIPS/SUGGESTIONS/NEXT STEPS, collapsible
+ * stack). The HTML keeps a `</body>` so callers can run `injectDevScripts`
+ * over it — the HMR client then pops the same payload as an overlay on load.
+ */
+export declare function renderDevErrorPage(payload: HmrErrorPayload, opts?: {
+    status?: number;
+    url?: string;
+}): string;
+//# sourceMappingURL=ssr-error.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ssr-error.d.ts","sourceRoot":"","sources":["../src/ssr-error.ts"],"names":[],"mappings":"AAkCA,OAAO,EAAqB,KAAK,eAAe,EAAE,MAAM,OAAO,CAAC;AAEhE,MAAM,WAAW,mBAAmB;IAClC,wFAAwF;IACxF,MAAM,EAAE,MAAM,CAAC;IACf,yGAAyG;IACzG,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oGAAoG;IACpG,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,8FAA8F;IAC9F,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,qFAAqF;IACrF,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,sGAAsG;IACtG,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,6EAA6E;IAC7E,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAkBD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAqBnE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CA4B7D;AAED,MAAM,WAAW,UAAU;IACzB,0EAA0E;IAC1E,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AA8BD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,UAAU,EAAE,CAiBlF;AAoBD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,EAChC,WAAW,EAAE,MAAM,GAClB,UAAU,GAAG,IAAI,CAiBnB;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAmBtG;AAMD,yGAAyG;AACzG,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,mBAAmB,GAAG,MAAM,CAM7E;AA0BD,wFAAwF;AACxF,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,mBAAmB,GAAG,MAAM,EAAE,CAe7G;AAgBD;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,mBAAmB,GAAG,eAAe,CAsDlG;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,mBAAmB,GAAG,eAAe,CAM7G;AAED,uEAAuE;AACvE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,CAMpE;AAUD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,eAAe,EACxB,IAAI,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GACvC,MAAM,CAuER"}

package/dist/ssr-error.js

@@ -0,0 +1,482 @@
+/**
+ * Dev-only runtime-error → HMR-payload resolver.
+ *
+ * HMR compile errors already report through the canonical `HmrErrorPayload`
+ * (file + line/column + codeframe + tips/suggestions/nextSteps + stack,
+ * rendered by the client's error overlay). SSR render failures and client
+ * runtime failures historically did NOT: the dev server swallowed them into a
+ * generic `<h1>500</h1>` page (or a raw `<pre>` stack dump), and the client
+ * overlay showed compiled-bundle coordinates (`page-index.js:833`) that point
+ * nowhere in user source.
+ *
+ * This module closes that gap. Given a thrown value (or a client-side
+ * `{ message, stack }` report) plus the dev server's knowledge of the app
+ * (route files, shared `components/`, route/component name maps), it resolves
+ * the failure back to a `.vsk` file/line and returns the SAME payload shape
+ * the HMR channel broadcasts — so SSR 500s and client `ReferenceError`s render
+ * in the same overlay with the same codeframe + tips.
+ *
+ * Resolution strategy (best-effort, never throws):
+ *   1. Errors that already carry a location (VeskError/acorn `.loc`,
+ *      `.position`, `.line`) go straight through `buildErrorPayload`.
+ *   2. `X is not defined` (and the `Cannot find name 'X'` / Safari
+ *      `Can't find variable: X` variants): the identifier plus the
+ *      `__components.Foo` frames in the stack name the exact `.vsk` files to
+ *      scan; the first use of the identifier in the best candidate yields the
+ *      line/column for the codeframe.
+ *   3. Other errors with `__components.Foo` frames: the payload at least names
+ *      the innermost `.vsk` file instead of the compiled bundle.
+ *   4. Anything else: message + stack + generic tips, same as before — but in
+ *      the HMR payload shape so the overlay still renders it.
+ */
+import { existsSync, readFileSync } from 'node:fs';
+import { relative, resolve } from 'node:path';
+import { buildCodeframe } from './error-codeframe';
+import { buildErrorPayload } from './hmr';
+function isIdentStart(ch) {
+    return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch === '_' || ch === '$';
+}
+function isIdentPart(ch) {
+    return isIdentStart(ch) || (ch >= '0' && ch <= '9');
+}
+function takeIdentifier(s) {
+    if (!s)
+        return null;
+    if (!isIdentStart(s.charAt(0)))
+        return null;
+    let i = 1;
+    while (i < s.length && isIdentPart(s.charAt(i)))
+        i++;
+    return s.slice(0, i);
+}
+/**
+ * Extract the undeclared identifier from `ReferenceError`-style messages:
+ * `Menu is not defined`, `ReferenceError: Menu is not defined`,
+ * `Cannot find name 'Menu'`, `Can't find variable: Menu`.
+ */
+export function extractUndefinedName(message) {
+    if (typeof message !== 'string' || !message)
+        return null;
+    const notDefined = message.indexOf(' is not defined');
+    if (notDefined > 0) {
+        const head = message.slice(0, notDefined);
+        let i = head.length - 1;
+        while (i >= 0 && isIdentPart(head.charAt(i)))
+            i--;
+        return takeIdentifier(head.slice(i + 1));
+    }
+    const findName = message.indexOf("Cannot find name '");
+    if (findName >= 0) {
+        const rest = message.slice(findName + "Cannot find name '".length);
+        const end = rest.indexOf("'");
+        if (end > 0)
+            return takeIdentifier(rest.slice(0, end));
+        return null;
+    }
+    const findVar = message.indexOf("Can't find variable:");
+    if (findVar >= 0) {
+        return takeIdentifier(message.slice(findVar + "Can't find variable:".length).trim());
+    }
+    return null;
+}
+/**
+ * Component names from a compiled render stack, innermost frame first:
+ * `__components.SiteHeader`, `__components["SiteHeader"]`, `__components['Home']`.
+ */
+export function extractComponentNames(stack) {
+    const names = [];
+    if (typeof stack !== 'string' || !stack)
+        return names;
+    const marker = '__components';
+    let i = 0;
+    while (i < stack.length) {
+        const at = stack.indexOf(marker, i);
+        if (at < 0)
+            break;
+        let j = at + marker.length;
+        let name = null;
+        if (stack.charAt(j) === '.') {
+            name = takeIdentifier(stack.slice(j + 1));
+            j += (name ? name.length : 0) + 1;
+        }
+        else if (stack.charAt(j) === '[') {
+            const quote = stack.charAt(j + 1);
+            if (quote === '"' || quote === "'") {
+                const end = stack.indexOf(quote, j + 2);
+                if (end > j + 2) {
+                    const raw = stack.slice(j + 2, end);
+                    name = takeIdentifier(raw) !== null && takeIdentifier(raw) === raw ? raw : null;
+                    j = end + 1;
+                }
+            }
+        }
+        if (name && !names.includes(name))
+            names.push(name);
+        i = j > at ? j : at + 1;
+    }
+    return names;
+}
+const SOURCE_EXTENSIONS = new Set(['.ts', '.tsx', '.mts', '.cts', '.js', '.mjs', '.cjs', '.vsk']);
+function scanFrameLocation(seg) {
+    if (!seg)
+        return null;
+    let i = seg.length;
+    let column = 0;
+    let digits = 0;
+    while (i > 0 && seg.charCodeAt(i - 1) >= 48 && seg.charCodeAt(i - 1) <= 57) {
+        column = (seg.charCodeAt(i - 1) - 48) * Math.pow(10, digits) + column;
+        digits++;
+        i--;
+    }
+    if (digits === 0 || i === 0 || seg.charAt(i - 1) !== ':')
+        return null;
+    i--;
+    let line = 0;
+    digits = 0;
+    while (i > 0 && seg.charCodeAt(i - 1) >= 48 && seg.charCodeAt(i - 1) <= 57) {
+        line = (seg.charCodeAt(i - 1) - 48) * Math.pow(10, digits) + line;
+        digits++;
+        i--;
+    }
+    if (digits === 0 || i === 0 || seg.charAt(i - 1) !== ':')
+        return null;
+    i--;
+    const path = seg.slice(0, i);
+    if (!path)
+        return null;
+    return { path, line, column: column + 1 };
+}
+/**
+ * Parse V8-style stack lines into `path:line:col` frames (1-based column,
+ * matching the codeframe caret). Supports both parenthesized frames
+ * (`at fn (/abs/file.ts:12:5)`) and bare path frames (`at file.ts:12:5`).
+ */
+export function extractSourceFrames(stack) {
+    const frames = [];
+    if (typeof stack !== 'string' || !stack)
+        return frames;
+    for (const raw of stack.split('\n')) {
+        const line = raw.trim();
+        if (!line.startsWith('at '))
+            continue;
+        let seg = line.slice(3).trim();
+        if (seg.startsWith('async '))
+            seg = seg.slice(6).trim();
+        const close = seg.lastIndexOf(')');
+        if (close >= 0) {
+            const open = seg.lastIndexOf('(', close);
+            if (open >= 0)
+                seg = seg.slice(open + 1, close);
+        }
+        const loc = scanFrameLocation(seg);
+        if (loc)
+            frames.push(loc);
+    }
+    return frames;
+}
+function isInsideRoot(absPath, root) {
+    if (!root)
+        return false;
+    const base = root.endsWith('/') ? root : root + '/';
+    if (absPath === root)
+        return true;
+    return absPath.startsWith(base);
+}
+const GENERATED_SEGMENTS = ['node_modules', '.vesk'];
+function isGeneratedPath(absPath) {
+    for (const seg of GENERATED_SEGMENTS) {
+        if (absPath.split('/').includes(seg))
+            return true;
+    }
+    if (absPath.includes('/_vesk/static/'))
+        return true;
+    if (absPath.includes('/dist/'))
+        return true;
+    return false;
+}
+/**
+ * First stack frame that names a real source file inside the project
+ * (`.ts`/`.tsx`/`.js`/`.vsk`, existing on disk, not node_modules/dist/.vesk
+ * or the dev bundle). Innermost (topmost) real frame is the throw site —
+ * e.g. `ReferenceError` inside `lib/helper.ts` imported by a `.vsk` page.
+ */
+export function firstSourceFileFrame(stack, projectRoot) {
+    for (const frame of extractSourceFrames(stack)) {
+        let p = frame.path;
+        if (p.startsWith('file://'))
+            p = p.slice('file://'.length);
+        if (!p.startsWith('/'))
+            continue; // bundle URLs (http://) and relative frames
+        const ext = p.slice(p.lastIndexOf('.')).split(':')[0].toLowerCase();
+        if (!SOURCE_EXTENSIONS.has(ext))
+            continue;
+        if (isGeneratedPath(p))
+            continue;
+        if (!isInsideRoot(p, projectRoot))
+            continue;
+        try {
+            if (!existsSync(p))
+                continue;
+        }
+        catch {
+            continue;
+        }
+        return { ...frame, path: p };
+    }
+    return null;
+}
+/**
+ * First use of an identifier in a `.vsk` source file (1-based line/column).
+ * Import lines are skipped — an undeclared name's *use* site is the error site.
+ */
+export function findIdentifierUsage(src, name) {
+    if (typeof src !== 'string' || !src || typeof name !== 'string' || !takeIdentifier(name) || takeIdentifier(name) !== name) {
+        return null;
+    }
+    const lines = src.split('\n');
+    for (let ln = 0; ln < lines.length; ln++) {
+        const text = lines[ln];
+        if (/^\s*import[\s('"]/.test(text))
+            continue;
+        let idx = text.indexOf(name);
+        while (idx >= 0) {
+            const before = idx > 0 ? text.charAt(idx - 1) : '';
+            const after = idx + name.length < text.length ? text.charAt(idx + name.length) : '';
+            if (!isIdentPart(before) && !isIdentPart(after)) {
+                return { line: ln + 1, column: idx + 1 };
+            }
+            idx = text.indexOf(name, idx + 1);
+        }
+    }
+    return null;
+}
+function projectOf(ctx) {
+    return ctx.projectDir || resolve(ctx.appDir, '..');
+}
+/** Display path for a payload: app-relative (`page.vsk`), else project-relative (`components/X.vsk`). */
+export function displayPath(absPath, ctx) {
+    const appRel = relative(ctx.appDir, absPath);
+    if (appRel && !appRel.startsWith('..'))
+        return appRel || absPath;
+    const projRel = relative(projectOf(ctx), absPath);
+    if (projRel && !projRel.startsWith('..'))
+        return projRel;
+    return absPath;
+}
+function readIfFile(absPath) {
+    try {
+        if (!existsSync(absPath))
+            return null;
+        return readFileSync(absPath, 'utf-8');
+    }
+    catch {
+        return null;
+    }
+}
+function resolveComponentFile(name, ctx) {
+    const fromRoutes = ctx.routeSources?.get(name);
+    if (fromRoutes) {
+        const abs = resolve(ctx.appDir, fromRoutes);
+        if (readIfFile(abs) !== null)
+            return abs;
+    }
+    const fromShared = ctx.componentMap?.get(name);
+    if (fromShared) {
+        const abs = resolve(projectOf(ctx), fromShared);
+        if (readIfFile(abs) !== null)
+            return abs;
+        if (readIfFile(fromShared) !== null)
+            return fromShared;
+    }
+    return null;
+}
+/** Ordered absolute candidate files: stack-named components first, then route files. */
+export function candidateFiles(message, stack, ctx) {
+    const out = [];
+    const push = (abs) => {
+        if (!abs || out.includes(abs))
+            return;
+        if (readIfFile(abs) === null)
+            return;
+        out.push(abs);
+    };
+    if (stack) {
+        for (const name of extractComponentNames(stack)) {
+            const f = resolveComponentFile(name, ctx);
+            if (f)
+                push(f);
+        }
+    }
+    for (const f of ctx.routeFiles || [])
+        push(f);
+    return out.slice(0, 12);
+}
+function withCodeframe(payload, absPath, line, column) {
+    if (!payload.codeframe) {
+        const src = readIfFile(absPath);
+        if (src) {
+            const cf = buildCodeframe(src, line, column);
+            if (cf) {
+                cf.file = payload.file || cf.file;
+                payload.codeframe = cf;
+            }
+        }
+    }
+    return payload;
+}
+/**
+ * Resolve a server-side throw to the HMR payload shape. Never throws — on any
+ * failure returns the message + stack + generic tips (the old behavior, but in
+ * the overlay-renderable shape).
+ */
+export function resolveRuntimeErrorPayload(err, ctx) {
+    const rec = (typeof err === 'object' && err !== null ? err : null);
+    const message = rec && typeof rec.message === 'string' && rec.message
+        ? rec.message
+        : err instanceof Error ? err.message : String(err ?? 'Unknown error');
+    const stack = rec && typeof rec.stack === 'string' && rec.stack
+        ? rec.stack
+        : err instanceof Error && err.stack ? err.stack : undefined;
+    const code = rec && typeof rec.code === 'string' && rec.code ? rec.code
+        : err instanceof Error && typeof err.code === 'string'
+            ? err.code
+            : undefined;
+    const candidates = candidateFiles(message, stack, ctx);
+    const firstFile = candidates.length > 0 ? displayPath(candidates[0], ctx) : 'app';
+    // Errors that already carry a location keep full fidelity.
+    const direct = buildErrorPayload(err, firstFile, { appDir: ctx.appDir });
+    if (direct.line !== null)
+        return direct;
+    // A stack frame naming a real source file (`.ts` imported into a `.vsk`,
+    // a `.ts` api/middleware module, etc.) is the exact throw site — point the
+    // payload there instead of scanning `__components` bundle coords.
+    const frame = firstSourceFileFrame(stack, projectOf(ctx));
+    if (frame) {
+        const payload = buildErrorPayload({ message: direct.message || message, stack, line: frame.line, column: frame.column, ...(code ? { code } : {}) }, displayPath(frame.path, ctx), { appDir: ctx.appDir });
+        return withCodeframe(payload, frame.path, frame.line, frame.column);
+    }
+    const name = extractUndefinedName(direct.message || message);
+    if (name) {
+        for (const abs of candidates) {
+            const src = readIfFile(abs);
+            if (!src)
+                continue;
+            const use = findIdentifierUsage(src, name);
+            if (!use)
+                continue;
+            const payload = buildErrorPayload({ message: direct.message || message, stack, line: use.line, column: use.column, ...(code ? { code } : {}) }, displayPath(abs, ctx), { appDir: ctx.appDir });
+            return withCodeframe(payload, abs, use.line, use.column);
+        }
+    }
+    // No pinpoint: still name the innermost .vsk file instead of the bundle.
+    if (candidates.length > 0) {
+        return buildErrorPayload(err, displayPath(candidates[0], ctx), { appDir: ctx.appDir });
+    }
+    return direct;
+}
+/**
+ * Resolve a client-side `{ message, stack }` report (compiled-bundle
+ * coordinates) to the HMR payload shape. Same core as the server path, but
+ * stack-named components outrank route files — the throw site is named by the
+ * `__components.Foo` frames, as in `ReferenceError: Menu is not defined` from
+ * `__components.SiteHeader` inside `__components.Home`.
+ */
+export function resolveClientErrorReport(report, ctx) {
+    const raw = (report || {});
+    const message = typeof raw.message === 'string' && raw.message ? raw.message.slice(0, 5000) : 'Unknown error';
+    const stack = typeof raw.stack === 'string' ? raw.stack.slice(0, 20000) : undefined;
+    const code = typeof raw.code === 'string' && raw.code ? raw.code : undefined;
+    return resolveRuntimeErrorPayload({ message, stack, ...(code ? { code } : {}) }, ctx);
+}
+/** `file:line:col` (or `file`, or `''`) for one-line terminal logs. */
+export function formatErrorLocation(payload) {
+    const file = payload.file || '';
+    if (payload.line != null) {
+        return `${file}:${payload.line}${payload.column != null ? `:${payload.column}` : ''}`;
+    }
+    return file;
+}
+function escapeHtml(s) {
+    return String(s ?? '')
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;');
+}
+/**
+ * Standalone dev 500 page in the overlay's visual language (file header,
+ * message, codeframe with caret, TIPS/SUGGESTIONS/NEXT STEPS, collapsible
+ * stack). The HTML keeps a `</body>` so callers can run `injectDevScripts`
+ * over it — the HMR client then pops the same payload as an overlay on load.
+ */
+export function renderDevErrorPage(payload, opts) {
+    const status = opts?.status ?? 500;
+    const url = opts?.url ? escapeHtml(opts.url) : '';
+    const file = payload.file ? escapeHtml(payload.file) : 'unknown file';
+    const code = payload.code ? escapeHtml(payload.code) : '';
+    const loc = payload.line != null
+        ? `:${payload.line}${payload.column != null ? `:${payload.column}` : ''}`
+        : '';
+    const message = escapeHtml(payload.message || 'Unknown error');
+    let codeHtml = '';
+    const frame = payload.codeframe;
+    if (frame && Array.isArray(frame.code) && frame.code.length > 0) {
+        let maxNo = 0;
+        for (const l of frame.code)
+            if (l.no > maxNo)
+                maxNo = l.no;
+        const gutterW = String(maxNo).length;
+        const pad = (n) => {
+            let s = String(n);
+            while (s.length < gutterW)
+                s = ' ' + s;
+            return s;
+        };
+        const rows = [];
+        for (const l of frame.code) {
+            const marker = l.isError ? '&gt;' : '&nbsp;';
+            rows.push(`<div${l.isError ? ' class="err"' : ''}>${marker} <span class="ln">${pad(l.no)}</span> ${escapeHtml(l.text)}</div>`);
+            if (l.isError && frame.column != null && frame.column > 0) {
+                rows.push(`<div class="caret">${' '.repeat(gutterW + 3 + Math.max(0, frame.column - 1)).replace(/ /g, '&nbsp;')}^</div>`);
+            }
+        }
+        codeHtml = `<div class="code">${rows.join('\n')}</div>`;
+    }
+    const list = (title, items) => {
+        if (!items || items.length === 0)
+            return '';
+        return `<div class="sec"><div class="sec-t">&gt; ${escapeHtml(title)}</div>` +
+            items.slice(0, 6).map((t) => `<div class="item">${escapeHtml(t)}</div>`).join('') + '</div>';
+    };
+    const lists = list('TIPS', payload.tips) + list('SUGGESTIONS', payload.suggestions) + list('NEXT STEPS', payload.nextSteps);
+    const stack = payload.stack
+        ? `<details class="stack"><summary>Stack trace</summary><pre>${escapeHtml(payload.stack)}</pre></details>`
+        : '';
+    return '<!DOCTYPE html><html><head><meta charset="utf-8"><title>' + status + ' — Vesk dev</title>' +
+        '<style>' +
+        'body{background:#000;color:#e8e8e8;font-family:ui-monospace,Menlo,Consolas,monospace;margin:0;padding:32px;}' +
+        '.panel{max-width:900px;margin:0 auto;border:1px solid #e8e8e8;}' +
+        '.head{border-bottom:1px solid #e8e8e8;padding:12px 16px;font-weight:700;letter-spacing:.08em;}' +
+        '.body{padding:16px;}' +
+        '.file{font-weight:700;margin-bottom:8px;}' +
+        '.msg{margin:8px 0 16px;white-space:pre-wrap;}' +
+        '.code{background:#0a0a0a;border:1px solid #333;padding:12px;white-space:pre;overflow-x:auto;margin-bottom:16px;}' +
+        '.code .ln{color:#888;}' +
+        '.code .err{background:#3d0a0a;}' +
+        '.code .caret{color:#ff5555;}' +
+        '.sec{margin:12px 0;}' +
+        '.sec-t{font-weight:700;margin-bottom:4px;}' +
+        '.item{padding-left:16px;color:#ccc;}' +
+        '.stack{margin-top:16px;color:#999;}' +
+        '.stack pre{white-space:pre-wrap;font-size:12px;}' +
+        '.foot{border-top:1px solid #e8e8e8;padding:8px 16px;color:#888;font-size:12px;letter-spacing:.08em;}' +
+        '</style></head><body>' +
+        '<div class="panel"><div class="head">&gt; SSR ERROR — ' + status + '</div>' +
+        '<div class="body">' +
+        `<div class="file">${code ? code + ' — ' : ''}${file}${loc}</div>` +
+        (url ? `<div class="file" style="font-weight:400;color:#888;">${url}</div>` : '') +
+        `<div class="msg">${message}</div>` +
+        codeHtml + lists + stack +
+        '</div><div class="foot">VESK DEV — FIX THE FILE AND SAVE TO RELOAD</div></div>' +
+        '</body></html>';
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/adapter",
-  "version": "0.2.26",
+  "version": "0.2.28",
   "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.26",
-    "@vesk/runtime": "^0.2.26",
-    "@vesk/types": "^0.2.26"
+    "@vesk/compiler": "^0.2.28",
+    "@vesk/runtime": "^0.2.28",
+    "@vesk/types": "^0.2.28"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",