@vesk/compiler 0.2.92 → 0.2.94

package/dist/parser.js

@@ -573,26 +573,317 @@ export function parse(source, options = {}) {
             column = (err.loc.column ?? 0) + 1;
         }
         else {
-            const m = err.message.match(/\((\d+):(\d+)\)/);
-            if (m) {
-                line = parseInt(m[1], 10);
-                column = parseInt(m[2], 10) + 1;
+            // Parse "(line:column)" from the message without regex.
+            const parenOpen = err.message.indexOf('(');
+            if (parenOpen >= 0) {
+                const parenClose = err.message.indexOf(')', parenOpen);
+                if (parenClose > parenOpen) {
+                    const inside = err.message.slice(parenOpen + 1, parenClose);
+                    const colon = inside.indexOf(':');
+                    if (colon > 0) {
+                        line = parseInt(inside.slice(0, colon), 10);
+                        column = parseInt(inside.slice(colon + 1), 10) + 1;
+                    }
+                }
             }
         }
         const filename = options.filename || '';
-        const cleanMessage = err.message.replace(/\s*\(\d+:\d+\)\s*$/, '');
-        const frame = line > 0 ? codeFrame(source, line, column, 5, 5) : '';
+        // Strip the trailing "(line:column)" acorn appends, without regex.
+        let cleanMessage = err.message;
+        const lastParen = cleanMessage.lastIndexOf('(');
+        if (lastParen >= 0) {
+            const closeParen = cleanMessage.indexOf(')', lastParen);
+            if (closeParen > lastParen) {
+                const inside = cleanMessage.slice(lastParen + 1, closeParen);
+                const colon = inside.indexOf(':');
+                if (colon > 0 &&
+                    inside.slice(0, colon).split('').every((ch) => ch >= '0' && ch <= '9') &&
+                    inside.slice(colon + 1).split('').every((ch) => ch >= '0' && ch <= '9')) {
+                    cleanMessage = cleanMessage.slice(0, lastParen).trimEnd();
+                }
+            }
+        }
+        // --- Convert acorn's raw JSX errors into descriptive Vesk messages ---
+        let message = cleanMessage;
+        let errLine = line;
+        let errColumn = column;
+        let code;
+        const extraHelp = [];
+        const frame = errLine > 0 ? codeFrame(source, errLine, errColumn, 5, 5) : '';
         const hint = filename ? ` in ${filename}` : '';
-        throw new VeskError(`${cleanMessage}${hint}`, {
+        // "Unterminated JSX contents" — acorn hit EOF inside a JSX block.
+        if (cleanMessage.includes('Unterminated JSX contents')) {
+            throw VeskError.jsxUnterminated({
+                file: filename,
+                line: errLine,
+                column: errColumn,
+                frame,
+            });
+        }
+        // "JSX attributes must only be assigned a non-empty expression" — `{}`.
+        if (cleanMessage.includes('JSX attributes must only be assigned a non-empty expression')) {
+            throw VeskError.jsxEmptyExpression({
+                file: filename,
+                line: errLine,
+                column: errColumn,
+                frame,
+            });
+        }
+        // "Expected corresponding JSX closing tag for <X>" — acorn points at the
+        // opening tag, but it could mean either a mismatched closing tag
+        // (<div></span>) or a genuinely unclosed tag (<div><span>...</div>).
+        const jsxClosePrefix = 'Expected corresponding JSX closing tag for <';
+        if (cleanMessage.startsWith(jsxClosePrefix)) {
+            const mismatched = findMismatchedJsxTag(source, errLine);
+            if (mismatched) {
+                throw VeskError.jsxMismatchedTag(mismatched.openingTag, mismatched.closingTag, {
+                    file: filename,
+                    line: mismatched.line,
+                    column: mismatched.column,
+                    frame: codeFrame(source, mismatched.line, mismatched.column, 5, 5),
+                });
+            }
+            const rest = cleanMessage.slice(jsxClosePrefix.length);
+            const gt = rest.indexOf('>');
+            const tagName = gt >= 0 ? rest.slice(0, gt) : rest;
+            throw VeskError.jsxUnclosedTag(tagName, {
+                file: filename,
+                line: errLine,
+                column: errColumn,
+                frame,
+                suggestedFix: `Insert </${tagName}> before the tag that closes the parent element.`,
+            });
+        }
+        // "Unexpected token" inside a component body often means a JSX tag was
+        // opened but never closed — acorn reports it late, at the closing `}`.
+        if (cleanMessage.includes('Unexpected token') && errLine > 0) {
+            const srcLine = (source.split('\n')[errLine - 1] ?? '').trim();
+            const isBlockCloser = srcLine.startsWith('}') || srcLine.startsWith(')');
+            if (isBlockCloser) {
+                const unclosed = findUnclosedJsxTag(source, errLine);
+                if (unclosed) {
+                    throw VeskError.jsxUnclosedTag(unclosed.tagName, {
+                        file: filename,
+                        line: unclosed.line,
+                        column: unclosed.column,
+                        frame: errLine > 0 ? codeFrame(source, unclosed.line, unclosed.column, 5, 5) : '',
+                        suggestedFix: `Insert </${unclosed.tagName}> before the tag that closes the parent element.`,
+                    });
+                }
+            }
+            // `{if (cond) { <jsx/> }}` — LLMs often wrap statements in braces in
+            // statement mode, but Vesk doesn't need them. Look for `{` immediately
+            // before the offending token (skipping whitespace) followed by a
+            // statement keyword (`if`, `for`, `while`, `switch`, `try`, `const`,
+            // `let`, `var`, `function`, `class`, `return`).
+            if (errColumn > 1) {
+                const lineText = source.split('\n')[errLine - 1] ?? '';
+                // Walk back from the error column to find the `{` that opened the
+                // block (or JSX expression container) that shouldn't be there.
+                let j = errColumn - 2; // 0-based index of char before error token
+                while (j >= 0 && (lineText[j] === ' ' || lineText[j] === '\t'))
+                    j--;
+                if (j >= 0 && lineText[j] === '{') {
+                    // Read the keyword after `{` (skipping whitespace)
+                    let k = errColumn - 1; // 0-based index of error token start
+                    while (k < lineText.length && (lineText[k] === ' ' || lineText[k] === '\t'))
+                        k++;
+                    let keyword = '';
+                    while (k < lineText.length && ((lineText[k] >= 'a' && lineText[k] <= 'z') || (lineText[k] >= 'A' && lineText[k] <= 'Z') || lineText[k] === '_' || lineText[k] === '$')) {
+                        keyword += lineText[k];
+                        k++;
+                    }
+                    const statementKeywords = new Set(['if', 'for', 'while', 'switch', 'try', 'const', 'let', 'var', 'function', 'class', 'return', 'do', 'with']);
+                    if (statementKeywords.has(keyword)) {
+                        const startLine = errLine;
+                        const startColumn = j + 1; // 1-based column of `{`
+                        throw VeskError.blockStatementInStatementMode({
+                            file: filename,
+                            line: startLine,
+                            column: startColumn,
+                            frame: codeFrame(source, startLine, startColumn, 5, 5),
+                        });
+                    }
+                }
+            }
+        }
+        // Targeted help for a bare template literal used as a JSX attribute value,
+        // e.g. <Link href=`/admin/learners/${id}`>. JSX attributes must be a quoted
+        // string or a `{...}` expression; a backtick on its own is not valid JSX.
+        if (errLine > 0 &&
+            cleanMessage.includes('JSX value should be either an expression or a quoted JSX text')) {
+            const srcLine = (source.split('\n')[errLine - 1] ?? '');
+            if (srcLine.includes('`')) {
+                extraHelp.push('JSX attribute values must be a quoted string (`href="..."`) or a `{...}` expression (`href={expr}`).', 'A bare backtick template literal is not valid JSX — wrap it in braces:', '  href={`/admin/learners/${id}`}');
+            }
+        }
+        throw new VeskError(`${message}${hint}`, {
             file: filename,
-            line,
-            column,
-            code: frame,
-            nextSteps: [
-                'Check the line indicated by the ^ marker for missing brackets, quotes, or JSX syntax.',
-                'If you wrote literal { or } inside JSX text, escape them as {\'{\'} and {\'}\'} or use &lbrace; &rbrace;.',
-                'Ensure all JSX tags are properly closed and component names start with an uppercase letter.',
-            ],
+            line: errLine,
+            column: errColumn,
+            frame,
+            code,
+            nextSteps: extraHelp.length ? extraHelp : [],
         });
     }
 }
+/**
+ * Scan the source (character by character, no regex) tracking JSX opening and
+ * closing tags up to `upToLine`. Returns the most recently opened tag that
+ * was never closed, or `null` if all tags are balanced. Used only to produce
+ * a better error message when acorn reports a generic "Unexpected token"
+ * for an unclosed JSX tag.
+ */
+function findUnclosedJsxTag(source, upToLine) {
+    const stack = [];
+    let i = 0;
+    let currentLine = 1;
+    const isIdentStart = (code) => (code >= 97 && code <= 122) || (code >= 65 && code <= 90) || code === 95; // a-z A-Z _
+    while (i < source.length) {
+        if (source[i] === '\n') {
+            currentLine++;
+            i++;
+            if (currentLine > upToLine)
+                break;
+            continue;
+        }
+        if (currentLine > upToLine)
+            break;
+        if (source[i] === '<') {
+            // Closing tag: </tagName>
+            if (i + 1 < source.length && source[i + 1] === '/') {
+                let j = i + 2;
+                while (j < source.length && source[j] !== '>' && source[j] !== '\n')
+                    j++;
+                const tagName = source.slice(i + 2, j);
+                // Only pop if it matches the most recently opened unclosed tag.
+                if (stack.length > 0 && stack[stack.length - 1].tagName === tagName) {
+                    stack.pop();
+                }
+                // Skip past the closing >.
+                while (j < source.length && source[j] !== '>')
+                    j++;
+                if (j < source.length)
+                    j++;
+                i = j;
+                continue;
+            }
+            // Opening tag: <tagName ...> (skip namespace prefixes like ns.)
+            let j = i + 1;
+            while (j < source.length &&
+                (source[j] === '.' || source[j] === ':' ||
+                    (source.charCodeAt(j) >= 97 && source.charCodeAt(j) <= 122) ||
+                    (source.charCodeAt(j) >= 65 && source.charCodeAt(j) <= 90) ||
+                    source.charCodeAt(j) === 95)) {
+                j++;
+            }
+            const tagName = source.slice(i + 1, j);
+            if (tagName.length > 0 && isIdentStart(tagName.charCodeAt(0))) {
+                // Check for self-closing: <tagName />
+                let k = j;
+                let selfClosing = false;
+                while (k < source.length && source[k] !== '>') {
+                    if (source[k] === '/' && k + 1 < source.length && source[k + 1] === '>') {
+                        selfClosing = true;
+                        break;
+                    }
+                    k++;
+                }
+                if (!selfClosing) {
+                    const loc = offsetToLineCol(source, i);
+                    stack.push({ tagName, line: loc.line, column: loc.column });
+                }
+            }
+            // Skip past the closing >.
+            while (j < source.length && source[j] !== '>')
+                j++;
+            if (j < source.length)
+                j++;
+            i = j;
+            continue;
+        }
+        i++;
+    }
+    // The most recently opened tag still on the stack is the unclosed one.
+    if (stack.length > 0) {
+        return stack[stack.length - 1];
+    }
+    return null;
+}
+/**
+ * Scan the source tracking JSX tags up to `upToLine`. Returns the first
+ * closing tag that does not match the most recently opened tag,
+ * e.g. `</span>` after `<div>`. Character scan only — no regex.
+ */
+function findMismatchedJsxTag(source, upToLine) {
+    const stack = [];
+    let i = 0;
+    let currentLine = 1;
+    const isIdentStart = (code) => (code >= 97 && code <= 122) || (code >= 65 && code <= 90) || code === 95;
+    while (i < source.length) {
+        if (source[i] === '\n') {
+            currentLine++;
+            i++;
+            if (currentLine > upToLine)
+                break;
+            continue;
+        }
+        if (currentLine > upToLine)
+            break;
+        if (source[i] === '<') {
+            // Closing tag: </tagName>
+            if (i + 1 < source.length && source[i + 1] === '/') {
+                let j = i + 2;
+                while (j < source.length && source[j] !== '>' && source[j] !== '\n')
+                    j++;
+                const closingTag = source.slice(i + 2, j);
+                while (j < source.length && source[j] !== '>')
+                    j++;
+                if (j < source.length)
+                    j++;
+                const loc = offsetToLineCol(source, i);
+                // Mismatch: a closing tag that doesn't match the most recent opening tag.
+                if (stack.length > 0 && stack[stack.length - 1] !== closingTag) {
+                    return { openingTag: stack[stack.length - 1], closingTag, line: loc.line, column: loc.column };
+                }
+                // Match: pop the stack.
+                if (stack.length > 0)
+                    stack.pop();
+                i = j;
+                continue;
+            }
+            // Opening tag: <tagName ...>
+            let j = i + 1;
+            while (j < source.length &&
+                (source[j] === '.' || source[j] === ':' ||
+                    (source.charCodeAt(j) >= 97 && source.charCodeAt(j) <= 122) ||
+                    (source.charCodeAt(j) >= 65 && source.charCodeAt(j) <= 90) ||
+                    source.charCodeAt(j) === 95)) {
+                j++;
+            }
+            const tagName = source.slice(i + 1, j);
+            if (tagName.length > 0 && isIdentStart(tagName.charCodeAt(0))) {
+                // Self-closing: <tagName />
+                let k = j;
+                let selfClosing = false;
+                while (k < source.length && source[k] !== '>') {
+                    if (source[k] === '/' && k + 1 < source.length && source[k + 1] === '>') {
+                        selfClosing = true;
+                        break;
+                    }
+                    k++;
+                }
+                if (!selfClosing)
+                    stack.push(tagName);
+            }
+            while (j < source.length && source[j] !== '>')
+                j++;
+            if (j < source.length)
+                j++;
+            i = j;
+            continue;
+        }
+        i++;
+    }
+    return null;
+}

package/dist/precompile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"precompile.d.ts","sourceRoot":"","sources":["../src/precompile.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,cAAc,EACf,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EACV,kBAAkB,EAGnB,MAAM,uCAAuC,CAAC;AAG/C;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,cAAc,GACxB,kBAAkB,CAapB;AAeD,iFAAiF;AACjF,wBAAgB,oBAAoB,IAAI,IAAI,CAE3C"}
+{"version":3,"file":"precompile.d.ts","sourceRoot":"","sources":["../src/precompile.ts"],"names":[],"mappings":"AASA,OAAO,EAIL,cAAc,EACf,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EACV,kBAAkB,EAGnB,MAAM,uCAAuC,CAAC;AAG/C;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,cAAc,GACxB,kBAAkB,CAsBpB;AA8CD,iFAAiF;AACjF,wBAAgB,oBAAoB,IAAI,IAAI,CAE3C"}

package/dist/precompile.js

@@ -26,16 +26,54 @@ export function precompileFile(source, sourcePath, registry) {
     const hit = precompileCache.get(sourcePath);
     // Compare the source, not just the path: the dev server rebuilds in-process
     // and a stale plan would silently ship yesterday's component.
-    if (hit !== undefined && hit.source === source)
+    if (hit !== undefined && hit.source === source) {
+        // A plan is only half of the output: it references module keys that live
+        // in the caller's registry. A second build in the same process (prod then
+        // dev under `e2e-setup`) starts with a fresh registry, so replaying the
+        // memoized plan without its modules left `__veskModules` empty and every
+        // bare-package import (`vesk-qr`, …) resolved to `undefined`. Keys are
+        // path-derived, so registering the same absPaths here is idempotent.
+        for (const { absPath, entry } of hit.modules)
+            reg.register(absPath, entry);
         return hit.plan;
+    }
     const plan = precompileFileInternal(source, sourcePath, new Set(), reg);
     // Bound it: plans are sizeable on a large app, and a watch session can
     // outlive many builds.
     if (precompileCache.size >= 512)
         precompileCache.clear();
-    precompileCache.set(sourcePath, { source, plan });
+    precompileCache.set(sourcePath, { source, plan, modules: collectPlanModules(plan, reg) });
     return plan;
 }
+/**
+ * Every module entry a plan (and its nested `.vsk` sub-plans) resolves
+ * against, including transitive deps. The shared `__veskModules` registry
+ * must contain the whole closure, not just the keys named by `plan.modules`,
+ * or `evaluateModule` cannot walk `deps` at hydrate time.
+ */
+function collectPlanModules(plan, registry) {
+    const out = [];
+    const seen = new Set();
+    const visitKey = (key) => {
+        if (seen.has(key))
+            return;
+        seen.add(key);
+        const entry = registry.getModule(key);
+        if (!entry || !entry.absPath)
+            return;
+        out.push({ absPath: entry.absPath, entry });
+        for (const depKey of Object.values(entry.deps))
+            visitKey(depKey);
+    };
+    const visitPlan = (p) => {
+        for (const mod of p.modules)
+            visitKey(mod.key);
+        for (const sub of p.subFiles)
+            visitPlan(sub.plan);
+    };
+    visitPlan(plan);
+    return out;
+}
 /**
  * Compiled plans, keyed by absolute path.
  *

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

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

package/dist/server-render.js

@@ -463,23 +463,24 @@ export function buildDataScripts(ssrProps, ssrData, external) {
     return scripts;
 }
 export async function renderFullPage(source, componentName, props = {}, registry = new Map(), options = {}) {
-    return withSsrStore(async () => {
-        globalThis.__vsk_ssr = true;
-        // Reuse the request token when a page/layout render already started one (the
-        // generated adapter handler renders page -> layouts -> document within one
-        // process), otherwise start fresh. One request = one token = one data slot.
-        if (!globalThis.__vsk_ssr_token)
-            globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
-        const renderToken = globalThis.__vsk_ssr_token;
-        keepSsrSlot(renderToken);
-        pruneSsrDataSlots();
-        // Start this render's handoff store fresh: setSsrData mirrors into
-        // globalThis.__vsk_ssr_data (see resource.ts) because the AsyncLocalStorage
-        // sink snapshot can be empty when the write runs in a forked async context.
-        // Resetting here also gives the /about-after-/posts no-leak behavior the
-        // ALS isolation was introduced to fix.
-        globalThis.__vsk_ssr_data = {};
-        try {
+    // Adopt the ambient request store when one is open: renderPage runs in the
+    // enclosing withSsrStore scope and attributes setSsrData writes to that
+    // store's token, so renderFullPage must read the same slot to hand off SSR
+    // data. Only mint a fresh store when called stand-alone (no ambient scope),
+    // which keeps concurrent requests isolated through their distinct tokens.
+    const store = adoptSsrStore();
+    const renderToken = store.token;
+    keepSsrSlot(renderToken);
+    pruneSsrDataSlots();
+    globalThis.__vsk_ssr = true;
+    // Start this render's handoff store fresh: setSsrData mirrors into
+    // globalThis.__vsk_ssr_data (see resource.ts) because the AsyncLocalStorage
+    // sink snapshot can be empty when the write runs in a forked async context.
+    // Resetting here also gives the /about-after-/posts no-leak behavior.
+    globalThis.__vsk_ssr_data = {};
+    let result;
+    try {
+        result = await withSsrStoreOf(store, async () => {
             let ssrProps = { ...props };
             let serializedProps = null;
             const cached = options.cached || undefined;
@@ -500,18 +501,20 @@ export async function renderFullPage(source, componentName, props = {}, registry
             // Defensive settle: page/layout renders already awaited their own SSR
             // promises before cleanup; this covers any resource started here (loadFn).
             await settleSsrPromises(renderToken);
-            // Merge the ALS sink snapshot with the request's per-token data slot. The
-            // slot is the deterministic channel for writes that happened in a forked
-            // async context (native fetch) — the sink alone can miss them. The slot is
-            // request-scoped (deleted below), so a late write can never leak into a
-            // following request the way the flat global would.
+            // Merge the request's per-token data slot. The slot is the deterministic
+            // channel for writes that happened in a forked async context (native fetch
+            // .then() callbacks run outside the ALS scope) and is keyed per render
+            // token, so concurrent renders never mix data. The ALS sink (ssrSink) is
+            // NOT read here because withSsrStore reuses the ambient store when one is
+            // already open, so concurrent renderFullPage calls share a single sink and
+            // their writes would cross-contaminate. Every setSsrData write also lands
+            // in the slot, so the slot alone is a complete handoff source.
             const slot = globalThis[`__vsk_ssr_data_${renderToken}`] || {};
             const ssrData = {
-                ...ssrSink.snapshot(),
                 ...slot,
             };
             if (process.env.VESK_SSR_TRACE) {
-                console.error(`[render-trace] renderFullPage comp=${componentName} keys=${Object.keys(ssrData).join(',') || '∅'} slot=${Object.keys(slot).join(',') || '∅'} sink=${Object.keys(ssrSink.snapshot()).join(',') || '∅'}`);
+                console.error(`[render-trace] renderFullPage comp=${componentName} keys=${Object.keys(ssrData).join(',') || '∅'} slot=${Object.keys(slot).join(',') || '∅'}`);
             }
             let headHtml = rendered.head;
             if (options.pageHead) {
@@ -565,17 +568,15 @@ ${bodyHtml}
 ${dataScriptBlock}${clientScript}</body>
 </html>`;
             return applyHtmlPlugins(docHtml, options.plugins, { sourcePath: options.sourcePath, url: options.__vesk?.url || undefined });
-        }
-        finally {
-            delete globalThis.__vsk_ssr;
-            delete globalThis[`__vsk_ssr_data_${renderToken}`];
-            // The token lives in the AsyncLocalStorage store now (see ssr-store.ts);
-            // it goes away with the scope. Deleting the global would destroy the
-            // request-scoped accessor that generated render code reads.
-            dropSsrSlot(renderToken);
-            pruneSsrDataSlots();
-        }
-    });
+        });
+    }
+    finally {
+        delete globalThis.__vsk_ssr;
+        delete globalThis[`__vsk_ssr_data_${renderToken}`];
+        dropSsrSlot(renderToken);
+        pruneSsrDataSlots();
+    }
+    return result;
 }
 export function renderPageStream(source, componentName, props = {}, registry = new Map(), options = {}) {
     // One store for the whole stream. `next()` is driven by the consumer, so a

package/package.json

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