@vesk/adapter 0.2.15 → 0.2.17

package/dist/dev-config.js

@@ -208,7 +208,7 @@ function tryParseJsObject(src) {
         while (i < src.length && /\s/.test(src[i]))
             i++;
         if (src[i] === '=')
-            return null; // `key = value` — not a literal object; bail
+            return null;
         if (src[i] !== ':')
             return null;
         i++;
@@ -222,10 +222,62 @@ function tryParseJsObject(src) {
     }
     return out;
 }
+/** Skip a balanced (…) expression starting at `i`, returning the index after the closing ')' (or on failure, `i` unchanged). */
+function skipBalancedParens(src, i) {
+    if (src[i] !== '(')
+        return i;
+    let depth = 0;
+    let inStr = null;
+    let esc = false;
+    for (let j = i; j < src.length; j++) {
+        const ch = src[j];
+        if (inStr) {
+            if (esc) {
+                esc = false;
+                continue;
+            }
+            if (ch === '\\') {
+                esc = true;
+                continue;
+            }
+            if (ch === inStr)
+                inStr = null;
+            continue;
+        }
+        if (ch === '"' || ch === "'" || ch === '`') {
+            inStr = ch;
+            continue;
+        }
+        if (ch === '(')
+            depth++;
+        if (ch === ')') {
+            depth--;
+            if (depth === 0)
+                return j + 1;
+        }
+    }
+    return i; // unbalanced — bail
+}
+/**
+ * Return a raw source span (used for function calls, variable refs, spreads
+ * that can't be round-tripped as literals). The value is stored as a wrapper
+ * object so serializeValue can emit it verbatim.
+ */
+function rawSpan(src, from, to) {
+    return { value: { __veskRaw: src.slice(from, to) }, next: to };
+}
 function parseLiteralValue(src, i) {
     const c = src[i];
     if (c === undefined)
         return null;
+    // spread: ...expr
+    if (c === '.' && src.slice(i, i + 3) === '...') {
+        const expr = parseLiteralValue(src, i + 3);
+        if (expr === null || expr.__invalid)
+            return rawSpan(src, i, skipToEndOfRaw(src, i + 3));
+        // preserve spread marker in the serialized output
+        return { value: { __veskRaw: '...' + serializeValue(expr.value) }, next: expr.next };
+    }
     if (c === '{') {
         const end = findMatchingBrace(src, i);
         if (end === -1)
@@ -251,8 +303,10 @@ function parseLiteralValue(src, i) {
                 continue;
             }
             const r = parseLiteralValue(src, j);
-            if (r === null || r.__invalid)
-                return { value: undefined, next: i, __invalid: true };
+            if (r === null || r.__invalid) {
+                // Can't parse this array element — fall back to raw span for the whole array
+                return rawSpan(src, i, skipToEndOfArray(src, i));
+            }
             vals.push(r.value);
             j = r.next;
         }
@@ -268,6 +322,7 @@ function parseLiteralValue(src, i) {
         }
         return { value: s, next: j + 1 };
     }
+    // identifiers, numbers, booleans, null, and tokens followed by '(' (function calls)
     let j = i;
     while (j < src.length && /[\w.\-]/.test(src[j]))
         j++;
@@ -280,8 +335,86 @@ function parseLiteralValue(src, i) {
         return { value: null, next: j };
     if (/^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(token))
         return { value: Number(token), next: j };
+    // token is an identifier or a function name — check if it's followed by '(' (call)
+    if (j < src.length && src[j] === '(') {
+        const end = skipBalancedParens(src, j);
+        return rawSpan(src, i, end);
+    }
+    // bare variable reference (e.g. `testPlugin`, `tailwindcss`)
+    if (token.length > 0)
+        return rawSpan(src, i, j);
     return { value: undefined, next: i, __invalid: true };
 }
+/** Skip forward from `i` to find the end of a raw expression (used for spread fallback). */
+function skipToEndOfRaw(src, i) {
+    let depth = 0;
+    let inStr = null;
+    let esc = false;
+    for (let j = i; j < src.length; j++) {
+        const ch = src[j];
+        if (inStr) {
+            if (esc) {
+                esc = false;
+                continue;
+            }
+            if (ch === '\\') {
+                esc = true;
+                continue;
+            }
+            if (ch === inStr)
+                inStr = null;
+            continue;
+        }
+        if (ch === '"' || ch === "'" || ch === '`') {
+            inStr = ch;
+            continue;
+        }
+        if (ch === '(')
+            depth++;
+        if (ch === ')') {
+            if (depth === 0)
+                return j;
+            depth--;
+        }
+        if (depth === 0 && (ch === ',' || ch === '}' || ch === ']'))
+            return j;
+    }
+    return src.length;
+}
+/** Skip to the matching ']' for a raw array span. */
+function skipToEndOfArray(src, i) {
+    let depth = 0;
+    let inStr = null;
+    let esc = false;
+    for (let j = i; j < src.length; j++) {
+        const ch = src[j];
+        if (inStr) {
+            if (esc) {
+                esc = false;
+                continue;
+            }
+            if (ch === '\\') {
+                esc = true;
+                continue;
+            }
+            if (ch === inStr)
+                inStr = null;
+            continue;
+        }
+        if (ch === '"' || ch === "'" || ch === '`') {
+            inStr = ch;
+            continue;
+        }
+        if (ch === '[')
+            depth++;
+        if (ch === ']') {
+            depth--;
+            if (depth === 0)
+                return j + 1;
+        }
+    }
+    return src.length;
+}
 function serializeObject(obj) {
     return Object.keys(obj)
         .map((k) => `${isBareKey(k) ? k : JSON.stringify(k)}: ${serializeValue(obj[k])}`)
@@ -291,6 +424,9 @@ function isBareKey(k) {
     return /^[a-zA-Z_$][\w$]*$/.test(k);
 }
 function serializeValue(v) {
+    if (v !== null && typeof v === 'object' && '__veskRaw' in v) {
+        return String(v.__veskRaw);
+    }
     if (v === null)
         return 'null';
     if (typeof v === 'string')

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,CAuevG"}
+{"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,CAikBvG"}

package/dist/dev-server.js

@@ -260,7 +260,10 @@ export async function startDevServer(appDir, options) {
     async function buildAdapterAgenticProvider(cfg) {
         const providerName = String(cfg.provider || loadAgenticConfig(agenticProjectDir).provider || 'openai');
         const apiKey = cfg.apiKey || getApiKey(agenticProjectDir, providerName) || '';
-        const model = cfg.model || loadAgenticConfig(agenticProjectDir).model || (providerName === 'anthropic' ? 'claude-sonnet-4-6' : providerName === 'google' ? 'gemini-2.0-flash' : providerName === 'ollama' ? 'llama3.1' : providerName === 'opencode' ? 'claude-sonnet-4-6' : providerName === 'opencode-go' ? 'opencode-go/kimi-k3' : providerName === 'openrouter' ? 'openrouter/auto' : 'gpt-4o-mini');
+        const model = cfg.model || loadAgenticConfig(agenticProjectDir).model || '';
+        if (!model) {
+            throw new Error('no model configured — open Settings → Agentic and pick a model');
+        }
         const baseUrl = cfg.baseUrl || loadAgenticConfig(agenticProjectDir).baseUrl || undefined;
         const maxTokens = typeof cfg.maxTokens === 'number' ? cfg.maxTokens : undefined;
         if (providerName === 'anthropic')
@@ -355,6 +358,20 @@ export async function startDevServer(appDir, options) {
     let ssrVersion = Date.now();
     let routeTree = [];
     let runtimeBundle = '';
+    let eventsMod = null;
+    async function reloadEventsMod() {
+        const eventsPath = resolve(devDir, 'server', 'events.js');
+        if (existsSync(eventsPath)) {
+            try {
+                eventsMod = await import(`${eventsPath}?t=${Date.now()}`);
+                return;
+            }
+            catch {
+                // ignore — events file present but failed to load
+            }
+        }
+        eventsMod = null;
+    }
     async function doBuild() {
         const start = Date.now();
         try {
@@ -368,6 +385,7 @@ export async function startDevServer(appDir, options) {
             const monorepoRoot = resolve(__dirname, '..', '..', '..');
             const runtimeDir = resolve(monorepoRoot, 'packages', 'runtime', 'dist');
             runtimeBundle = buildRuntimeCode(runtimeDir);
+            await reloadEventsMod();
             lastBuild = Date.now();
             console.error(`vesk dev: rebuilt in ${Date.now() - start}ms`);
         }
@@ -505,6 +523,24 @@ export async function startDevServer(appDir, options) {
                 return;
             }
         }
+        if (eventsMod) {
+            const serverStore = globalThis.__vesk_server_ctx || {};
+            const webRequest = makeWebRequest(req, url.href, maxBodyBytes);
+            const evtCtx = {
+                request: webRequest,
+                params: {},
+                url,
+                locals: Object.assign({}, serverStore),
+                cookies: {},
+            };
+            globalThis.__vesk_request = evtCtx;
+            try {
+                await eventsMod.executeRequest?.(evtCtx);
+            }
+            catch (e) {
+                console.error('vesk request: onRequest error:', e instanceof Error ? e.message : e);
+            }
+        }
         if (config && url.pathname.startsWith('/_vesk/action/')) {
             const actionId = url.pathname.replace('/_vesk/action/', '');
             const actionEntry = config.actions && config.actions.find(a => a.id === actionId);
@@ -619,6 +655,41 @@ export async function startDevServer(appDir, options) {
     });
     const hmr = createHmrServer(server, appDir, devDir, componentMap);
     hmrSession = hmr;
+    // ── Console streaming to devtool ────────────────────────────────────────
+    // Read `logs` from vesk.config and wire up server-side console interception
+    // so console.log/warn/error/info/debug are forwarded to the devtool Log tab.
+    {
+        let logsLevels = null;
+        try {
+            const { readConfig } = await import('@vesk/adapter/src/dev-config');
+            const cfgResult = await readConfig(resolve(appDir, '..'));
+            const logsCfg = cfgResult.config?.logs;
+            if (logsCfg === false) {
+                logsLevels = null; // disabled
+            }
+            else if (typeof logsCfg === 'object' && logsCfg !== null) {
+                logsLevels = { log: true, warn: true, error: true, info: true, debug: true, ...logsCfg };
+            }
+            else {
+                logsLevels = { log: true, warn: true, error: true, info: true, debug: true };
+            }
+        }
+        catch {
+            logsLevels = { log: true, warn: true, error: true, info: true, debug: true };
+        }
+        if (logsLevels) {
+            const origFns = {};
+            for (const lvl of ['log', 'warn', 'error', 'info', 'debug']) {
+                origFns[lvl] = console[lvl].bind(console);
+                console[lvl] = (...args) => {
+                    origFns[lvl](...args);
+                    if (!logsLevels[lvl])
+                        return;
+                    hmr.broadcast('console', { level: lvl, message: args.map(String).join(' ') });
+                };
+            }
+        }
+    }
     const srcDir = resolve(appDir, '..', 'src');
     try {
         if (existsSync(srcDir)) {
@@ -676,6 +747,24 @@ export async function startDevServer(appDir, options) {
     catch (e) {
         console.error('vesk dev: file watching unavailable');
     }
+    const bootEventsMod = eventsMod;
+    try {
+        await bootEventsMod?.executeStart?.({ server, port, host });
+    }
+    catch (e) {
+        console.error('vesk dev: onStart error:', e instanceof Error ? e.message : e);
+    }
+    server.on('close', () => {
+        void (async () => {
+            const stopEventsMod = eventsMod;
+            try {
+                await stopEventsMod?.executeStop?.({ server, port, host });
+            }
+            catch (e) {
+                console.error('vesk dev: onStop error:', e instanceof Error ? e.message : e);
+            }
+        })();
+    });
     await new Promise(resolve => {
         server.listen(port, host, () => {
             console.error(`vesk dev server at http://localhost:${port} (listening on ${host})`);

package/dist/events.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Compile the app's `_events.ts` (if present) into a self-contained
+ * `server/events.js` next to the server runtime. Returns true when an events
+ * file existed and was compiled. Relative imports inside `_events.ts` are
+ * bundled by esbuild; node builtins stay external so node (prod-server) and
+ * edge (platform handler) can both resolve them.
+ */
+export declare function compileEvents(appDir: string, outDir: string): Promise<boolean>;
+//# sourceMappingURL=events.d.ts.map

package/dist/events.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"AAqEA;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAiCpF"}

package/dist/events.js

@@ -0,0 +1,109 @@
+import { writeFileSync, unlinkSync, mkdirSync } from 'node:fs';
+import { resolve } from 'node:path';
+import * as esbuild from './esbuild-fallback.js';
+import { collectEventsFile } from '@vesk/compiler/src/events';
+let buildId = 0;
+/**
+ * Wrapper module bundled into `server/events.js`. It lifts the user's
+ * `_events.ts` exports into `executeStart` / `executeRequest` / `executeStop`
+ * entry points with a context that routes `set`/`get` into the process-wide
+ * server context (`globalThis.__vesk_server_ctx`).
+ *
+ * The `__vesk_events_started` guard is global (not module-local) so lazy edge
+ * isolates and the Node prod server share one lifetime; `onStop` clears it so
+ * dev HMR reloads can boot a fresh module.
+ */
+function buildEntry(sourcePath) {
+    return [
+        `import * as __events from ${JSON.stringify(sourcePath)};`,
+        '',
+        'const __store = () => (globalThis.__vesk_server_ctx ||= {});',
+        '',
+        'const __handlers = {};',
+        "for (const __name of ['onStart', 'onRequest', 'onStop']) {",
+        '  const __fn = __events[__name];',
+        "  if (typeof __fn === 'function') __handlers[__name] = __fn;",
+        '}',
+        '',
+        'function __makeCtx(base) {',
+        '  const store = __store();',
+        '  const start = base && typeof base === \'object\' ? base : {};',
+        '  return Object.assign({}, start, {',
+        '    server: start.server !== undefined ? start.server : null,',
+        '    port: start.port !== undefined ? start.port : 0,',
+        '    host: start.host,',
+        '    serverLocals: store,',
+        '    set(key, value) { store[key] = value; return value; },',
+        '    get(key) { return store[key]; },',
+        '  });',
+        '}',
+        '',
+        'export async function executeStart(base) {',
+        '  if (globalThis.__vesk_events_started) return;',
+        '  globalThis.__vesk_events_started = true;',
+        '  if (typeof __handlers.onStart === \'function\') await __handlers.onStart(__makeCtx(base));',
+        '}',
+        '',
+        'export async function executeRequest(base) {',
+        '  if (typeof __handlers.onRequest !== \'function\') return;',
+        '  await __handlers.onRequest(__makeCtx(base));',
+        '}',
+        '',
+        'export async function executeStop(base) {',
+        '  if (typeof __handlers.onStop !== \'function\') return;',
+        '  try {',
+        '    await __handlers.onStop(__makeCtx(base));',
+        '  } finally {',
+        '    globalThis.__vesk_events_started = false;',
+        '  }',
+        '}',
+        '',
+        'export const onStart = __handlers.onStart;',
+        'export const onRequest = __handlers.onRequest;',
+        'export const onStop = __handlers.onStop;',
+        '',
+    ].join('\n');
+}
+/**
+ * Compile the app's `_events.ts` (if present) into a self-contained
+ * `server/events.js` next to the server runtime. Returns true when an events
+ * file existed and was compiled. Relative imports inside `_events.ts` are
+ * bundled by esbuild; node builtins stay external so node (prod-server) and
+ * edge (platform handler) can both resolve them.
+ */
+export async function compileEvents(appDir, outDir) {
+    const sourcePath = collectEventsFile(appDir);
+    if (!sourcePath)
+        return false;
+    const serverDir = resolve(outDir, 'server');
+    mkdirSync(serverDir, { recursive: true });
+    const entryFile = resolve(serverDir, `.events-entry-${buildId++}.mjs`);
+    writeFileSync(entryFile, buildEntry(sourcePath), 'utf-8');
+    try {
+        const result = await esbuild.build({
+            entryPoints: [entryFile],
+            bundle: true,
+            platform: 'neutral',
+            format: 'esm',
+            minify: true,
+            outfile: resolve(serverDir, 'events.js'),
+            external: ['fs', 'node:fs', 'path', 'node:path', 'module', 'node:module', 'node:async_hooks'],
+            target: ['es2022'],
+            treeShaking: true,
+        });
+        if (result.errors.length > 0) {
+            throw new Error(`esbuild errors: ${result.errors.map((e) => e.text).join(', ')}`);
+        }
+        if (result.warnings.length > 0) {
+            for (const w of result.warnings)
+                console.error('vesk build warning:', w.text);
+        }
+        return true;
+    }
+    finally {
+        try {
+            unlinkSync(entryFile);
+        }
+        catch { /* ignore */ }
+    }
+}

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,CAsEjB;AA0RD,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,CAyJA"}
+{"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,CAsEjB;AAoRD,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,CAyJA"}

package/dist/hmr.js

@@ -6,7 +6,7 @@ import { compileClient } from '@vesk/compiler/src/client-codegen';
 import { buildHmrEvalSnippet } from './client-bundle';
 import { resolveComponentName, randomToken } from '@vesk/compiler/src/server-codegen';
 import { resolveErrorFile } from '@vesk/adapter/src/ssr-function';
-import { resolveCssUrls, hasUserCss, hasBuiltTailwindCss } from '@vesk/adapter/src/css';
+import { resolveCssUrls, hasBuiltGlobalCss } from '@vesk/adapter/src/css';
 import { isAllowedWsUpgrade } from '@vesk/adapter/src/paths';
 import { parseCompilerError, buildCodeframe } from '@vesk/adapter/src/error-codeframe';
 import { suggestFor } from '@vesk/adapter/src/error-tips';
@@ -243,10 +243,8 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
     const ancestorLayouts = options?.ancestorLayouts || [];
     const headExtra = options?.headExtra || null;
     const pagePath = resolve(appDir, routeNode.sourceDir, 'page.vsk');
-    const layoutPath = resolve(appDir, routeNode.sourceDir, 'layout.vsk');
     const cssUrls = resolveCssUrls({
-        tailwind: hasBuiltTailwindCss(outDir),
-        userCss: hasUserCss(appDir),
+        enabled: hasBuiltGlobalCss(outDir),
     });
     const cssOption = cssUrls.length > 0 ? `, cssUrls: ${JSON.stringify(cssUrls)}` : '';
     const headExtraOption = headExtra ? `, headExtra: ${JSON.stringify(headExtra)}` : '';
@@ -255,10 +253,25 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
     const name = routeName(parts);
     const funcDir = resolve(outDir, 'server', 'functions');
     const funcPath = resolve(funcDir, `${name}.js`);
-    const hasLayout = !!routeNode.layout;
-    const hasAncestorLayout = ancestorLayouts.length > 0;
     const pageSrc = readFileSync(pagePath, 'utf-8');
     const pageComp = extractCompName(pageSrc) || 'Page';
+    const layoutStack = [
+        ...ancestorLayouts.map((a) => ({ sourceDir: a.sourceDir, layoutCompName: a.layoutCompName })),
+        ...(routeNode.layout ? [{ sourceDir: routeNode.sourceDir, layoutCompName: routeNode.layout }] : []),
+    ];
+    const layoutDecls = [];
+    for (const entry of layoutStack) {
+        const entryPath = resolve(appDir, entry.sourceDir, 'layout.vsk');
+        const entrySrc = readFileSync(entryPath, 'utf-8');
+        const entryComp = extractCompName(entrySrc) || 'Layout';
+        const escaped = escapeSource(entrySrc);
+        layoutDecls.push({
+            src: `\`${escaped}\``,
+            comp: JSON.stringify(entryComp),
+            path: JSON.stringify(entryPath),
+            compiled: `(() => { try { setVskHydrate(true); return compileFile(\`${escaped}\`, { sourcePath: ${JSON.stringify(entryPath)} }); } catch { return null; } finally { setVskHydrate(false); } })()`,
+        });
+    }
     const errorPath = resolveErrorFile(routeNode.sourceDir, appDir);
     const errorSrc = errorPath ? readFileSync(errorPath, 'utf-8') : null;
     const errorComp = errorPath ? (extractCompName(errorSrc) || 'Error') : null;
@@ -268,28 +281,15 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
     const clientScriptOption = ', clientScriptUrl: "/_vesk/static/client.js"';
     const dataScriptOption = ', externalDataScript: storeDataScriptGlobal';
     let src = '';
-    if (hasLayout) {
-        const layoutSrc = readFileSync(layoutPath, 'utf-8');
-        const layoutComp = extractCompName(layoutSrc) || 'Layout';
-        src = `const _layoutSrc = \`${escapeSource(layoutSrc)}\`;\nconst _pageSrc = \`${escapeSource(pageSrc)}\`;\n`;
-        src += `const _layoutComp = ${JSON.stringify(layoutComp)};\nconst _pageComp = ${JSON.stringify(pageComp)};\n`;
-        src += `const _layoutPath = ${JSON.stringify(layoutPath)};\nconst _pagePath = ${JSON.stringify(pagePath)};\n`;
-        src += `const _layoutCompiled = (() => { try { setVskHydrate(true); return compileFile(_layoutSrc, { sourcePath: _layoutPath }); } catch { return null; } finally { setVskHydrate(false); } })();\n`;
-        src += `const _pageCompiled = (() => { try { setVskHydrate(true); return compileFile(_pageSrc, { sourcePath: _pagePath }); } catch { return null; } finally { setVskHydrate(false); } })();\n`;
-        src += errorVars;
-    }
-    else if (hasAncestorLayout) {
-        const outerLayout = ancestorLayouts[0];
-        const outerLayoutPath = resolve(appDir, outerLayout.sourceDir, 'layout.vsk');
-        const outerLayoutSrc = readFileSync(outerLayoutPath, 'utf-8');
-        const outerLayoutComp = extractCompName(outerLayoutSrc) || 'Layout';
+    if (layoutDecls.length > 0) {
         src = `const _pageSrc = \`${escapeSource(pageSrc)}\`;\n`;
         src += `const _pageComp = ${JSON.stringify(pageComp)};\n`;
-        src += `const _layoutSrc = \`${escapeSource(outerLayoutSrc)}\`;\n`;
-        src += `const _layoutComp = ${JSON.stringify(outerLayoutComp)};\n`;
-        src += `const _layoutPath = ${JSON.stringify(outerLayoutPath)};\nconst _pagePath = ${JSON.stringify(pagePath)};\n`;
-        src += `const _layoutCompiled = (() => { try { setVskHydrate(true); return compileFile(_layoutSrc, { sourcePath: _layoutPath }); } catch { return null; } finally { setVskHydrate(false); } })();\n`;
+        src += `const _pagePath = ${JSON.stringify(pagePath)};\n`;
         src += `const _pageCompiled = (() => { try { setVskHydrate(true); return compileFile(_pageSrc, { sourcePath: _pagePath }); } catch { return null; } finally { setVskHydrate(false); } })();\n`;
+        src += `const _layoutSrcList = [\n${layoutDecls.map((d) => '  ' + d.src + ',').join('\n')}\n];\n`;
+        src += `const _layoutCompList = [${layoutDecls.map((d) => d.comp).join(', ')}];\n`;
+        src += `const _layoutPathList = [${layoutDecls.map((d) => d.path).join(', ')}];\n`;
+        src += `const _layoutCompiledList = [\n${layoutDecls.map((d) => '  ' + d.compiled + ',').join('\n')}\n];\n`;
         src += errorVars;
     }
     else {
@@ -316,7 +316,7 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
         registryCode = 'const __componentRegistry = new Map();\n';
     }
     let renderCode;
-    if (hasLayout) {
+    if (layoutDecls.length > 0) {
         renderCode = [
             '  let page;',
             '  let caughtError = null;',
@@ -329,24 +329,14 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
             "    const stack = err && typeof err === 'object' && 'stack' in err ? String(err.stack) : '';",
             "    page = { body: await __renderErrorBody({ params, statusCode: 500, error: message, stack, url: url.href }), head: '' };",
             '  }',
-            '  const html = await renderFullPage(_layoutSrc, _layoutComp, { params, children: (caughtError ? \'<!--vesk-ssr-error:\' + (caughtError && typeof caughtError === \'object\' && \'message\' in caughtError ? encodeURIComponent(String(caughtError.message)) : \'\') + \'-->\' : \'\') + page.body }, __componentRegistry, { hydrate: true, cached: _layoutCompiled' + bakedOptions + clientScriptOption + dataScriptOption + ', pageHead: page.head, sourcePath: _layoutPath });',
-            "  return new Response(html, { headers: { 'Content-Type': 'text/html' }, status: caughtError ? 500 : 200 });",
-        ].join('\n');
-    }
-    else if (hasAncestorLayout) {
-        renderCode = [
-            '  let page;',
-            '  let caughtError = null;',
-            '  try {',
-            '    page = await renderPage(_pageSrc, _pageComp, { params }, __componentRegistry, { hydrate: true, cached: _pageCompiled, sourcePath: _pagePath });',
-            '  } catch (err) {',
-            "    if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
-            '    caughtError = 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) : '';",
-            "    page = { body: await __renderErrorBody({ params, statusCode: 500, error: message, stack, url: url.href }), head: '' };",
+            "  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--) {",
+            "    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(_layoutSrc, _layoutComp, { params, children: (caughtError ? \'<!--vesk-ssr-error:\' + (caughtError && typeof caughtError === \'object\' && \'message\' in caughtError ? encodeURIComponent(String(caughtError.message)) : \'\') + \'-->\' : \'\') + page.body }, __componentRegistry, { hydrate: true, cached: _layoutCompiled' + bakedOptions + clientScriptOption + dataScriptOption + ', pageHead: page.head, sourcePath: _layoutPath });',
+            "  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');
     }

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EACe,YAAY,EAAE,WAAW,EAC7B,UAAU,EAChC,MAAM,yBAAyB,CAAC;AAiBjC;;;;;;GAMG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;CACjB;AACD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,iBAAiB,EAAE,CAAC;CAC9B;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,UAAU,EAAE,EACrB,OAAO,EAAE,iBAAiB,EAAE,GAAG,IAAI,GAAG,SAAS,GAC9C,UAAU,EAAE,CAQd;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,EAAE,EACrB,KAAK,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GACxC,UAAU,EAAE,CAGd;AA+BD,wBAAsB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAqUpG;AAED,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAIhE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,yBAAyB,EACzB,eAAe,GAChB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,mBAAmB,EACnB,YAAY,EACZ,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,aAAa,GACd,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACe,YAAY,EAAE,WAAW,EAC7B,UAAU,EAChC,MAAM,yBAAyB,CAAC;AAiBjC;;;;;;GAMG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;CACjB;AACD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,iBAAiB,EAAE,CAAC;CAC9B;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,UAAU,EAAE,EACrB,OAAO,EAAE,iBAAiB,EAAE,GAAG,IAAI,GAAG,SAAS,GAC9C,UAAU,EAAE,CAQd;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,EAAE,EACrB,KAAK,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GACxC,UAAU,EAAE,CAGd;AA+BD,wBAAsB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAuTpG;AAED,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAIhE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,yBAAyB,EACzB,eAAe,GAChB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,mBAAmB,EACnB,YAAY,EACZ,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,aAAa,GACd,MAAM,2BAA2B,CAAC"}