@vesk/compiler 0.2.10 → 0.2.12

package/dist/client-codegen.d.ts

@@ -25,7 +25,7 @@ export declare function compileClient(source: string, _componentName: string | n
  * `resolveComponentName`, so callers don't need a second full parse just
  * to learn the name.
  */
-export declare function compileClientBoth(source: string, _componentName: string | null): {
+export declare function compileClientBoth(source: string, _componentName: string | null, sourcePath?: string): {
     comp: string;
     hyd: string;
     name: string | null;

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

@@ -1 +1 @@
-{"version":3,"file":"client-codegen.d.ts","sourceRoot":"","sources":["../src/client-codegen.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAuB,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAGL,cAAc,EAQd,gBAAgB,EAOjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAwCxD,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC;CAC1B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI1D;AAoBD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,gBAAgB,GAAG,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAwGlI;AAID,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAU5E;AAqjCD,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAe3C;AA2HD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO9C;AAoED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CAAO,GAAG,MAAM,CAOnN;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAqBnI;AAED,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"client-codegen.d.ts","sourceRoot":"","sources":["../src/client-codegen.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAuB,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAGL,cAAc,EAQd,gBAAgB,EAOjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAwCxD,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC;CAC1B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI1D;AAiDD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,gBAAgB,GAAG,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAwGlI;AAID,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAU5E;AA8kCD,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAe3C;AA2HD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO9C;AAoED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CAAO,GAAG,MAAM,CAOnN;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAqBxJ;AAED,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/dist/client-codegen.js

@@ -6,8 +6,8 @@ import { StaticNode, TextNode, DynamicBinding, OpaqueDynamicRegion, MapRegion, W
 import { parse } from '@vesk/compiler/src/parser';
 import { generateIR } from '@vesk/compiler/src/ir-generator';
 import { transformTopLevelForActions } from '@vesk/compiler/src/actions';
-import { extractRuntimeNames } from '@vesk/compiler/src/server-utils';
-import { importBindingPairs } from '@vesk/compiler/src/module-imports';
+import { extractRuntimeNames, extractTopLevelNames } from '@vesk/compiler/src/server-utils';
+import { importBindingPairs, localValueImportNames } from '@vesk/compiler/src/module-imports';
 import { stripTrackGeneric } from '@vesk/compiler/src/scan';
 import { inlineMdImportsFrom } from '@vesk/compiler/src/md-inline';
 import { stripTsTypes, hasTsSyntax } from '@vesk/compiler/src/strip-ts';
@@ -69,6 +69,36 @@ function containsJsx(node, depth = 0) {
 function printAst(ast) {
     return print(ast, containsJsx(ast) ? tsx() : ts()).code;
 }
+/**
+ * Converts a bare effect block (`{ <setup>; effect(fn); }`, the shape every
+ * `ctx.effects.push` template produces) into an expression that runs the
+ * block immediately and evaluates to the effect handle:
+ * `(() => { <setup>; return effect(fn); })()`.
+ *
+ * Required when an effect is collected into a per-item effects array
+ * (`__e.push(<block>)`): a raw block in expression position parses as an
+ * object literal, so `let` declarations inside it are a SyntaxError that
+ * kills the entire client chunk — and with it hydration for the whole page.
+ * Falls back to a value-less IIFE when the block shape is unexpected.
+ */
+function effectBlockToHandlerExpr(eff) {
+    try {
+        const ast = parse(eff);
+        const block = ast.body?.[0];
+        const stmts = block?.type === 'BlockStatement' ? block.body ?? [] : [];
+        const last = stmts[stmts.length - 1];
+        if (last?.type === 'ExpressionStatement' && last.expression) {
+            const returning = { ...block, body: [...stmts.slice(0, -1), { type: 'ReturnStatement', argument: last.expression }] };
+            const code = printAst(returning);
+            if (code)
+                return `(() => ${code})()`;
+        }
+    }
+    catch {
+        // fall through to the value-less IIFE below
+    }
+    return `(() => ${eff})()`;
+}
 export function transformTracked(irNode, tracked) {
     const ast = irNode.ast;
     if (!ast)
@@ -260,7 +290,7 @@ function emitNode(ctx, node, tracked, effectsVar, parentVar, compPrefix = '__com
     if (node instanceof ComponentCall)
         return emitComponentCall(ctx, node, tracked, effectsVar, parentVar, compPrefix);
     if (node instanceof OpaqueDynamicRegion)
-        return emitOpaque(ctx, node, tracked, parentVar);
+        return emitOpaque(ctx, node, tracked, effectsVar, parentVar);
     if (node instanceof MapRegion)
         return emitMap(ctx, node, tracked, parentVar);
     if (node instanceof ServerBlock)
@@ -573,10 +603,14 @@ function emitComponentCall(ctx, node, tracked, effectsVar, parentVar, compPrefix
     const propsObj = `{ ${propsEntries.join(', ')} }`;
     const v = ctx.n();
     const awaitKw = ctx.asyncComps.has(node.componentName) ? 'await ' : '';
+    // Member-expression tags (`<it.icon>`) carry the raw component-valued
+    // expression — invoke it directly; it is never a registry name.
+    const calleeExpr = node.calleeExpr ? `(${node.calleeExpr})` : null;
     if (ctx.hydrate) {
-        const access = ctx.importedNames.has(node.componentName)
-            ? node.componentName
-            : `__components[${JSON.stringify(node.componentName)}]`;
+        const access = calleeExpr
+            ?? (ctx.importedNames.has(node.componentName)
+                ? node.componentName
+                : `__components[${JSON.stringify(node.componentName)}]`);
         const subScope = () => ctx.inTryBody
             ? `${ctx.walker}.subWalker(${parentVar})`
             : `${ctx.walker}.subWalker(${ctx.walker}.nextElement())`;
@@ -595,7 +629,7 @@ function emitComponentCall(ctx, node, tracked, effectsVar, parentVar, compPrefix
                     ctx.push(`$f.appendChild(${childVar});`);
             }
             for (const eff of ctx.effects)
-                ctx.push(effectsVar ? `${effectsVar}.push(${eff});` : eff);
+                ctx.push(effectsVar ? `${effectsVar}.push(${effectBlockToHandlerExpr(eff)});` : eff);
             ctx.effects = savedEffects;
             ctx.walker = savedWalker;
             ctx.push(`return $f; })();`);
@@ -618,12 +652,15 @@ function emitComponentCall(ctx, node, tracked, effectsVar, parentVar, compPrefix
                     ctx.push(`$f.appendChild(${childVar});`);
             }
             for (const eff of ctx.effects)
-                ctx.push(effectsVar ? `${effectsVar}.push(${eff});` : eff);
+                ctx.push(effectsVar ? `${effectsVar}.push(${effectBlockToHandlerExpr(eff)});` : eff);
             ctx.effects = savedEffects;
             ctx.push(`return $f; })();`);
             propsEntries.push(`children: ${frag}`);
         }
-        if (ctx.importedNames.has(node.componentName)) {
+        if (calleeExpr) {
+            ctx.push(`const ${v} = ${calleeExpr}({ ${propsEntries.join(', ')} });`);
+        }
+        else if (ctx.importedNames.has(node.componentName)) {
             ctx.push(`const ${v} = ${awaitKw}${node.componentName}({ ${propsEntries.join(', ')} });`);
         }
         else {
@@ -711,7 +748,7 @@ function emitTryCatch(ctx, node, tracked, effectsVar, parentVar) {
   }`);
     return null;
 }
-function emitOpaque(ctx, node, tracked, parentVar) {
+function emitOpaque(ctx, node, tracked, effTarget, parentVar) {
     const condExpr = transformTracked(node.condition, tracked);
     const hasElse = node.alternateNodes.length > 0;
     const anchor = ctx.n();
@@ -778,21 +815,32 @@ function emitOpaque(ctx, node, tracked, parentVar) {
     if (!hyd)
         ctx.push(`${parent}.appendChild(${endAnchor});`);
     ctx.push(`if (${condExpr}) { ${asyncKw}${conRenderName}(); }` + (hasElse ? ` else { ${asyncKw}${altRenderName}(); }` : ''));
-    ctx.effects.push(`{
-    let __iv = ${condExpr};
-    let __first = true;
-    effect(${ctx.isAsyncScope ? 'async () => {' : '() => {'}
+    const renderBranch = `if (__nv) { ${asyncKw}${conRenderName}(); }` + (hasElse ? ` else { ${asyncKw}${altRenderName}(); }` : '');
+    const effectBody = `effect(${ctx.isAsyncScope ? 'async () => {' : '() => {'}
       if (__first) { __first = false; return; }
       const __nv = ${condExpr};
       if (__nv !== __iv) {
         for (const e of ${effectsVar}) destroy_block(e);
         ${effectsVar}.length = 0;
         __cleanup(${anchor}, ${endAnchor});
-        if (__nv) { ${asyncKw}${conRenderName}(); }` + (hasElse ? ` else { ${asyncKw}${altRenderName}(); }` : '') + `
+        ${renderBranch}
         __iv = __nv;
       }
-    });
+    });`;
+    if (effTarget) {
+        ctx.push(`${effTarget}.push((() => {
+    let __iv = ${condExpr};
+    let __first = true;
+    return ${effectBody}
+  })());`);
+    }
+    else {
+        ctx.effects.push(`{
+    let __iv = ${condExpr};
+    let __first = true;
+    ${effectBody}
   }`);
+    }
     return null;
 }
 function emitWhileLoop(ctx, node, tracked, parentVar) {
@@ -1258,13 +1306,20 @@ function buildComponentMap(irRoot, hydrate = false) {
     const mapLines = [];
     mapLines.push(`const __components = {};`);
     const asyncComps = computeAsyncComponents(irRoot.components);
+    // Top-level value bindings (`const MyIcon = Cpu`) live in module scope
+    // alongside the component map, so a same-named JSX tag must invoke that
+    // in-scope value directly — not a registry lookup. File-defined components
+    // keep registry precedence.
+    const componentNames = new Set(irRoot.components.map((c) => c.name));
+    const topValueNames = extractTopLevelNames(irRoot.topLevelCode).filter((n) => !componentNames.has(n));
+    const directNames = new Set([...extractRuntimeNames(irRoot.imports), ...localValueImportNames(irRoot.imports), ...topValueNames]);
     for (const comp of irRoot.components) {
         if (hydrate && isStaticComponent(comp)) {
             const stub = `(props, __registry, __hydrate) => { return __hydrate.root; }`;
             mapLines.push(`__components[${JSON.stringify(comp.name)}] = ${stub};`);
             continue;
         }
-        const code = generateComponent(comp, new Set(extractRuntimeNames(irRoot.imports)), hydrate, asyncComps);
+        const code = generateComponent(comp, directNames, hydrate, asyncComps);
         mapLines.push(`__components[${JSON.stringify(comp.name)}] = ${code};`);
     }
     mapLines.push(`function __cleanup(start, end) {`);
@@ -1556,8 +1611,8 @@ export function compileClient(source, _componentName, options = {}) {
     if (options.sourcePath) {
         source = inlineMdImportsFrom(source, options.sourcePath, options.mdRoots || []);
     }
-    const ast = parse(source);
-    const ir = generateIR(ast, source);
+    const ast = parse(source, options.sourcePath ? { filename: options.sourcePath } : {});
+    const ir = generateIR(ast, source, options.sourcePath);
     return emitClientFromIR(ir, options);
 }
 /**
@@ -1568,14 +1623,14 @@ export function compileClient(source, _componentName, options = {}) {
  * `resolveComponentName`, so callers don't need a second full parse just
  * to learn the name.
  */
-export function compileClientBoth(source, _componentName) {
-    const ast = parse(source);
+export function compileClientBoth(source, _componentName, sourcePath) {
+    const ast = parse(source, sourcePath ? { filename: sourcePath } : {});
     // Downstream type-stripping mutates AST nodes in place (stripTsTypes),
     // so each emit mode needs its own tree. Cloning is far cheaper than the
     // second full acorn+TS parse this replaces.
     const hydAst = structuredClone(ast);
-    const ir = generateIR(ast, source);
-    const irHyd = generateIR(hydAst, source);
+    const ir = generateIR(ast, source, sourcePath);
+    const irHyd = generateIR(hydAst, source, sourcePath);
     const defaultComp = ir.components.find((c) => c.defaultExport);
     let name = null;
     if (defaultComp)

package/dist/errors.d.ts

@@ -1,5 +1,6 @@
 export declare function levenshtein(a: string, b: string): number;
 export declare function didYouMean(name: string, candidates: string[], maxDistance?: number): string | null;
+export declare function codeFrame(source: string, line: number, column: number, before?: number, after?: number): string;
 export interface VeskErrorOptions {
     file?: string;
     line?: number;

package/dist/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAoBxD;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,GAAE,MAAU,GAAG,MAAM,GAAG,IAAI,CAWrG;AAqCD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAgBD,qBAAa,SAAU,SAAQ,KAAK;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;gBAEF,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,gBAAqB;IAYxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IA6BnG,MAAM,CAAC,SAAS,CAAC,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAmB3D,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAkBvF,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAkBvF,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAO3G,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAWvG,MAAM,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAkB/G,QAAQ,IAAI,MAAM;IAgBlB,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAclC"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAoBxD;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,GAAE,MAAU,GAAG,MAAM,GAAG,IAAI,CAWrG;AAqCD,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,SAAI,EAAE,KAAK,SAAI,GAAG,MAAM,CAkBrG;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAgBD,qBAAa,SAAU,SAAQ,KAAK;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;gBAEF,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,gBAAqB;IAYxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IA6BnG,MAAM,CAAC,SAAS,CAAC,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAmB3D,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAkBvF,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAkBvF,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAO3G,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAWvG,MAAM,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAkB/G,QAAQ,IAAI,MAAM;IA0BlB,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAclC"}

package/dist/errors.js

@@ -66,6 +66,26 @@ function findKeywordNumber(message, keywords) {
     }
     return 0;
 }
+export function codeFrame(source, line, column, before = 5, after = 5) {
+    if (line <= 0)
+        return '';
+    const lines = source.split('\n');
+    const start = Math.max(1, line - before);
+    const end = Math.min(lines.length, line + after);
+    const width = String(end).length;
+    let out = '';
+    for (let i = start; i <= end; i++) {
+        const text = lines[i - 1] ?? '';
+        const ln = String(i).padStart(width, ' ');
+        out += `${ln} | ${text}\n`;
+        if (i === line) {
+            const pointerCol = Math.max(0, column - 1);
+            const prefix = ' '.repeat(width) + ' | ';
+            out += prefix + ' '.repeat(pointerCol) + '^\n';
+        }
+    }
+    return out.trimEnd();
+}
 const VESK_BUILTINS = [
     'useFetch', 'useRouter', 'useParams', 'usePathname', 'useSearchParams',
     'useNavigate', 'useHead', 'useTitle',
@@ -204,8 +224,21 @@ export class VeskError extends Error {
     }
     toString() {
         let out = `[vesk] ${this.message}`;
-        if (this.file)
-            out += `\n  File: ${this.file}${this.line ? `:${this.line}` : ''}`;
+        if (this.file) {
+            out += `\n  File: ${this.file}`;
+            if (this.line) {
+                out += `:${this.line}`;
+                if (this.column)
+                    out += `:${this.column}`;
+            }
+            if (this.line && this.column)
+                out += ` (line ${this.line}, column ${this.column})`;
+            else if (this.line)
+                out += ` (line ${this.line})`;
+        }
+        else if (this.line) {
+            out += `\n  at line ${this.line}${this.column ? `, column ${this.column}` : ''}`;
+        }
         if (this.code)
             out += `\n\n${this.code}`;
         if (this.suggestions.length) {

package/dist/ir-generator.d.ts

@@ -6,5 +6,5 @@ export declare function getPropsType(params: Array<{
     typeAnnotation?: any;
     properties?: any[];
 }> | undefined | null, source: string): string | null;
-export declare function generateIR(ast: any, source: string): IRRoot;
+export declare function generateIR(ast: any, source: string, filename?: string): IRRoot;
 //# sourceMappingURL=ir-generator.d.ts.map

package/dist/ir-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ir-generator.d.ts","sourceRoot":"","sources":["../src/ir-generator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EAoBP,MAAM,uBAAuB,CAAC;AAgJ/B,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,GAAG,CAAC;IAAC,cAAc,CAAC,EAAE,GAAG,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC,GAAG,SAAS,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkCnL;AAuxBD,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAiO3D"}
+{"version":3,"file":"ir-generator.d.ts","sourceRoot":"","sources":["../src/ir-generator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EAoBP,MAAM,uBAAuB,CAAC;AA0L/B,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,GAAG,CAAC;IAAC,cAAc,CAAC,EAAE,GAAG,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC,GAAG,SAAS,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkCnL;AAg0BD,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAoO9E"}

package/dist/ir-generator.js

@@ -1,5 +1,5 @@
 import { IRRoot, ComponentIR, StaticNode, TextNode, DynamicBinding, OpaqueDynamicRegion, MapRegion, WhileLoop, SwitchBlock, TryCatch, RuntimeStatement, ForLoop, TrackDecl, ComponentRef, ComponentCall, ServerBlock, ClientBlock, HeadBlock, Expression, SlotNode, } from '@vesk/compiler/src/ir';
-import { VeskError } from '@vesk/compiler/src/errors';
+import { VeskError, codeFrame } from '@vesk/compiler/src/errors';
 import { createBaseParser } from '@vesk/compiler/src/parser';
 import { skipWhitespace, findBalancedEnd, splitTopLevel, startsWithIdentifier, stripDeclKeyword, isWhitespaceChar, collapseNewlineWhitespace } from '@vesk/compiler/src/scan';
 import { stripCodeTypes } from '@vesk/compiler/src/strip-ts';
@@ -83,6 +83,52 @@ function offsetToLineCol(source, offset) {
     }
     return { line, column };
 }
+function calleeIsFetch(callee) {
+    if (!callee || typeof callee !== 'object')
+        return false;
+    const c = callee;
+    if (c.type === 'Identifier')
+        return c.name === 'useFetch';
+    if (c.type === 'MemberExpression') {
+        const object = c.object;
+        if (object && object.type === 'Identifier')
+            return object.name === 'useFetch';
+    }
+    return false;
+}
+/**
+ * Walks an ESTree subtree looking for a real `useFetch(...)` / `useFetch.stream(...)`
+ * call. String and template-literal *content* is not part of the expression tree,
+ * so `const md = \`useFetch.stream(...)\`` no longer counts as a fetch usage.
+ */
+function estreeCallsFetch(ast) {
+    if (!ast)
+        return false;
+    const stack = [ast];
+    while (stack.length > 0) {
+        const candidate = stack.pop();
+        if (!candidate || typeof candidate !== 'object')
+            continue;
+        const node = candidate;
+        if ((node.type === 'CallExpression' || node.type === 'NewExpression') &&
+            calleeIsFetch(node.callee)) {
+            return true;
+        }
+        for (const key of Object.keys(node)) {
+            if (key === 'parent' || key === 'loc' || key === 'start' || key === 'end' || key === 'range')
+                continue;
+            const value = node[key];
+            if (Array.isArray(value)) {
+                for (const item of value)
+                    stack.push(item);
+            }
+            else {
+                stack.push(value);
+            }
+        }
+    }
+    return false;
+}
 function componentUsesFetch(nodes) {
     for (const node of nodes) {
         if (node instanceof ServerBlock || node instanceof ClientBlock) {
@@ -90,11 +136,11 @@ function componentUsesFetch(nodes) {
                 return true;
         }
         else if (node instanceof RuntimeStatement) {
-            if (node.raw.includes('useFetch(') || node.raw.includes('useFetch.'))
+            if (estreeCallsFetch(node.ast))
                 return true;
         }
         else if (node instanceof DynamicBinding) {
-            if (node.expression.raw.includes('useFetch(') || node.expression.raw.includes('useFetch.'))
+            if (estreeCallsFetch(node.expression.ast))
                 return true;
         }
         else if (node instanceof MapRegion) {
@@ -574,12 +620,23 @@ function processJSXCallbackBody(source, body) {
     return exprToIR(source, body);
 }
 function processJSXElement(source, element) {
-    const tagName = getJSXTagName(element.openingElement.name);
+    const nameNode = element.openingElement.name;
+    const tagName = getJSXTagName(nameNode);
     const selfClosing = element.openingElement.selfClosing;
     if (tagName === 'Head') {
         const children = selfClosing ? [] : processJSXChildren(source, element.children || []);
         return [new HeadBlock(children)];
     }
+    // A dotted JSX tag (`<it.icon>`, `<Foo.Bar>`) is a component-valued member
+    // expression — never an HTML element (dots are not valid in tag names) and
+    // never a registry key. Carry the raw expression so codegen invokes the
+    // actual in-scope value instead of `document.createElement("it.icon")` or a
+    // registry lookup by dotted string.
+    if (nameNode && nameNode.type === 'JSXMemberExpression') {
+        const { props, spreadProps } = extractProps(source, element);
+        const children = selfClosing ? [] : processJSXChildren(source, element.children || []);
+        return [new ComponentCall(tagName, props, children, spreadProps, element.start, getSource(source, nameNode))];
+    }
     if (!isHTMLTag(tagName) && selfClosing) {
         const { props, spreadProps } = extractProps(source, element);
         return [new ComponentCall(tagName, props, [], spreadProps, element.start)];
@@ -830,7 +887,7 @@ function processTryStatement(source, stmt) {
     const catchParamName = stmt.handler?.param?.name ?? null;
     return [new TryCatch(bodyTemplate, catchBody, catchParamName)];
 }
-function processStatementModeBody(source, bodyStmts) {
+function processStatementModeBody(source, bodyStmts, filename) {
     const nodes = [];
     for (let i = 0; i < bodyStmts.length; i++) {
         const stmt = bodyStmts[i];
@@ -859,7 +916,7 @@ function processStatementModeBody(source, bodyStmts) {
         else if (stmt.type === 'VeskBlock') {
             if (stmt.tag === 'empty')
                 continue;
-            const inner = processStatementModeBody(source, stmt.body);
+            const inner = processStatementModeBody(source, stmt.body, filename);
             if (stmt.tag === 'server') {
                 nodes.push(new ServerBlock(inner));
             }
@@ -879,6 +936,18 @@ function processStatementModeBody(source, bodyStmts) {
                 nodes.push(new ComponentRef(refName));
         }
         else if (stmt.type === 'IfStatement') {
+            // Guard-clause early return (`if (c) return X` with no else): everything
+            // after this statement becomes the alternate branch, mirroring
+            // expression-mode `buildGuardChain`. Without this the `return` is
+            // silently swallowed and execution falls through into code that
+            // assumes the guard held.
+            const guardArg = !stmt.alternate ? getReturnArgument(stmt.consequent) : null;
+            if (guardArg) {
+                const consequent = exprToIR(source, guardArg);
+                const alternate = processStatementModeBody(source, bodyStmts.slice(i + 1), filename);
+                nodes.push(new OpaqueDynamicRegion(toExpression(source, stmt.test), consequent, alternate));
+                break;
+            }
             nodes.push(...processIfStatement(source, stmt));
         }
         else if (stmt.type === 'ForOfStatement') {
@@ -886,7 +955,7 @@ function processStatementModeBody(source, bodyStmts) {
             let consumed = 1;
             const next = bodyStmts[i + 1];
             if (next && next.type === 'VeskBlock' && next.tag === 'empty') {
-                alternate = processStatementModeBody(source, next.body);
+                alternate = processStatementModeBody(source, next.body, filename);
                 consumed = 2;
             }
             nodes.push(...processForStatement(source, stmt, alternate));
@@ -926,7 +995,8 @@ function processStatementModeBody(source, bodyStmts) {
             }
         }
         else if (stmt.type === 'ClassDeclaration') {
-            throw VeskError.classDecl();
+            const { line, column } = offsetToLineCol(source, stmt.start ?? 0);
+            throw VeskError.classDecl({ file: filename || '', line, column, code: codeFrame(source, line, column) });
         }
         else {
             const raw = getSource(source, stmt);
@@ -953,20 +1023,36 @@ function extractStyle(body) {
     }
     return { body: filtered, css: cssParts.join('\n') || null };
 }
-function validateBlocks(compName, isClient, body) {
+function validateBlocks(compName, isClient, body, file, source) {
     for (const node of body) {
         if (isClient) {
             if (node instanceof ServerBlock) {
-                throw VeskError.serverBlockInClient(compName);
+                const opts = file ? { file } : {};
+                if (source && node.start !== undefined) {
+                    const pos = node.start;
+                    const { line, column } = offsetToLineCol(source, pos);
+                    opts.line = line;
+                    opts.column = column;
+                    opts.code = codeFrame(source, line, column);
+                }
+                throw VeskError.serverBlockInClient(compName, opts);
             }
         }
         else {
             if (node instanceof ClientBlock) {
-                throw VeskError.clientBlockInServer(compName);
+                const opts = file ? { file } : {};
+                if (source && node.start !== undefined) {
+                    const pos = node.start;
+                    const { line, column } = offsetToLineCol(source, pos);
+                    opts.line = line;
+                    opts.column = column;
+                    opts.code = codeFrame(source, line, column);
+                }
+                throw VeskError.clientBlockInServer(compName, opts);
             }
         }
         if (node instanceof StaticNode || node instanceof ServerBlock || node instanceof ClientBlock) {
-            validateBlocks(compName, isClient, node.children || []);
+            validateBlocks(compName, isClient, node.children || [], file, source);
         }
     }
 }
@@ -1024,8 +1110,9 @@ function idxOfQuote(s, from) {
     }
     return -1;
 }
-export function generateIR(ast, source) {
+export function generateIR(ast, source, filename) {
     __vskAnnotations = ast.__vskAnnotations ?? [];
+    const file = filename || '';
     const components = [];
     const imports = [];
     const importedNames = new Set();
@@ -1089,7 +1176,8 @@ export function generateIR(ast, source) {
             // handled below
         }
         else if (inner.type === 'ClassDeclaration') {
-            throw VeskError.classDecl();
+            const { line, column } = offsetToLineCol(source, inner.start ?? 0);
+            throw VeskError.classDecl({ file, line, column, code: codeFrame(source, line, column) });
         }
         else if (inner.type === 'TSEnumDeclaration') {
             const code = processEnum(inner, source, exported);
@@ -1106,9 +1194,9 @@ export function generateIR(ast, source) {
         const bodyStmts = inner.body.body;
         const isClientComp = !!inner.client;
         if (isStatementMode(bodyStmts)) {
-            const raw = processStatementModeBody(source, bodyStmts);
+            const raw = processStatementModeBody(source, bodyStmts, file);
             const { body, css } = extractStyle(raw);
-            validateBlocks(name, isClientComp, body);
+            validateBlocks(name, isClientComp, body, file, source);
             const comp = new ComponentIR(name, paramNames, body, { mode: 'statement', exported, defaultExport, isClient: inner.client, isAsync: inner.async, ssrAwait: componentUsesFetch(body), propsType });
             comp.style = css;
             components.push(comp);
@@ -1119,7 +1207,7 @@ export function generateIR(ast, source) {
             const preamble = [];
             for (const stmt of bodyStmts) {
                 if (stmt.type === 'VeskBlock') {
-                    const innerBody = processStatementModeBody(source, stmt.body);
+                    const innerBody = processStatementModeBody(source, stmt.body, file);
                     if (stmt.tag === 'server') {
                         preamble.push(new ServerBlock(innerBody));
                     }
@@ -1145,7 +1233,8 @@ export function generateIR(ast, source) {
                     guardClauses.push(stmt);
                 }
                 else if (stmt.type === 'ClassDeclaration') {
-                    throw VeskError.classDecl();
+                    const { line, column } = offsetToLineCol(source, stmt.start ?? 0);
+                    throw VeskError.classDecl({ file, line, column, code: codeFrame(source, line, column) });
                 }
                 else {
                     const raw = getSource(source, stmt);
@@ -1155,7 +1244,7 @@ export function generateIR(ast, source) {
             }
             const guardBody = buildGuardChain(source, guardClauses, mainReturn);
             const { body, css } = extractStyle([...preamble, ...guardBody]);
-            validateBlocks(name, isClientComp, body);
+            validateBlocks(name, isClientComp, body, file, source);
             const comp = new ComponentIR(name, paramNames, body, { exported, defaultExport, isClient: inner.client, isAsync: inner.async, ssrAwait: componentUsesFetch(body), propsType });
             comp.style = css;
             components.push(comp);
@@ -1171,7 +1260,7 @@ export function generateIR(ast, source) {
             if (!asyncNames.has(childName))
                 continue;
             const { line, column } = offsetToLineCol(source, start >= 0 ? start : 0);
-            throw VeskError.asyncChildInSyncParent(comp.name, childName, { line, column });
+            throw VeskError.asyncChildInSyncParent(comp.name, childName, { file, line, column, code: codeFrame(source, line, column) });
         }
     }
     const autoImportable = [

package/dist/ir.d.ts

@@ -89,10 +89,17 @@ export declare class ComponentCall {
     spreadProps: Expression[];
     children: IRNode[];
     start: number;
+    /**
+     * Raw JS expression for the component value when the JSX tag is a member
+     * expression (e.g. `<it.icon>` → `it.icon`). Dotted tags can never be HTML
+     * elements or registry names, so codegen must invoke this expression
+     * directly instead of resolving `componentName` through the registry.
+     */
+    calleeExpr: string | null;
     constructor(componentName: string, props: {
         name: string;
         value: Expression;
-    }[], children?: IRNode[], spreadProps?: Expression[], start?: number);
+    }[], children?: IRNode[], spreadProps?: Expression[], start?: number, calleeExpr?: string | null);
 }
 export declare class SlotNode {
     constructor();

package/dist/ir.d.ts.map

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

package/dist/ir.js

@@ -120,12 +120,20 @@ export class ComponentCall {
     spreadProps;
     children;
     start;
-    constructor(componentName, props, children = [], spreadProps = [], start = -1) {
+    /**
+     * Raw JS expression for the component value when the JSX tag is a member
+     * expression (e.g. `<it.icon>` → `it.icon`). Dotted tags can never be HTML
+     * elements or registry names, so codegen must invoke this expression
+     * directly instead of resolving `componentName` through the registry.
+     */
+    calleeExpr;
+    constructor(componentName, props, children = [], spreadProps = [], start = -1, calleeExpr = null) {
         this.componentName = componentName;
         this.props = props;
         this.children = children;
         this.spreadProps = spreadProps;
         this.start = start;
+        this.calleeExpr = calleeExpr;
     }
 }
 export class SlotNode {

package/dist/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAKtC,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,8CAA8C;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,gEAAgE;IAChE,WAAW,EAAE,MAAM,CAAC;IACpB,8CAA8C;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,sDAAsD;IACtD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAYD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,cAAc,EAAE,CAAA;CAAE,CA0KpG;AAED,wBAAgB,gBAAgB,IAAI,OAAO,KAAK,CAAC,MAAM,CAEtD;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAczE"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAMtC,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,8CAA8C;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,gEAAgE;IAChE,WAAW,EAAE,MAAM,CAAC;IACpB,8CAA8C;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,sDAAsD;IACtD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAYD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,cAAc,EAAE,CAAA;CAAE,CA0KpG;AAED,wBAAgB,gBAAgB,IAAI,OAAO,KAAK,CAAC,MAAM,CAEtD;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CA+CzE"}

package/dist/parser.js

@@ -2,6 +2,7 @@ import * as acorn from 'acorn';
 import { tsPlugin } from './acorn-ts-plugin/index.js';
 import { VeskParserPlugin } from '@vesk/compiler/src/vesk-plugin';
 import { containsForOfIn } from '@vesk/compiler/src/scan';
+import { VeskError, codeFrame } from '@vesk/compiler/src/errors';
 function isIdentChar(code) {
     return ((code >= 97 && code <= 122) || (code >= 65 && code <= 90) || (code >= 48 && code <= 57) || code === 95 || code === 36);
 }
@@ -228,15 +229,50 @@ export function createBaseParser() {
 export function parse(source, options = {}) {
     const ParserClass = createBaseParser();
     const { code, annotations } = preprocessForClauses(source);
-    const ast = ParserClass.parse(code, {
-        ecmaVersion: 'latest',
-        sourceType: 'module',
-        locations: true,
-        ranges: true,
-        ...(options.filename ? { sourceFilename: options.filename } : {}),
-    });
-    if (annotations.length > 0) {
-        ast.__vskAnnotations = annotations;
+    try {
+        const ast = ParserClass.parse(code, {
+            ecmaVersion: 'latest',
+            sourceType: 'module',
+            locations: true,
+            ranges: true,
+            ...(options.filename ? { sourceFilename: options.filename } : {}),
+        });
+        if (annotations.length > 0) {
+            ast.__vskAnnotations = annotations;
+        }
+        return ast;
+    }
+    catch (e) {
+        const err = e;
+        // Acorn's SyntaxError already contains "(line:column)" in message and loc
+        let line = 0;
+        let column = 0;
+        if (err.loc && typeof err.loc.line === 'number') {
+            line = err.loc.line;
+            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;
+            }
+        }
+        const filename = options.filename || '';
+        const cleanMessage = err.message.replace(/\s*\(\d+:\d+\)\s*$/, '');
+        const frame = line > 0 ? codeFrame(source, line, column, 5, 5) : '';
+        const hint = filename ? ` in ${filename}` : '';
+        throw new VeskError(`${cleanMessage}${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.',
+            ],
+            tip: 'Vesk parses with Acorn + TypeScript + JSX — use the code frame above to locate the error.',
+        });
     }
-    return ast;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"server-jsgen.d.ts","sourceRoot":"","sources":["../src/server-jsgen.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAOzE,OAAO,EAA4E,KAAK,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAW/I,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,OAAO,GAAE,OAAe,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CA8CjJ;AA4SD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,CAmD1F;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CA4BhG"}
+{"version":3,"file":"server-jsgen.d.ts","sourceRoot":"","sources":["../src/server-jsgen.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAOzE,OAAO,EAA4E,KAAK,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAW/I,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,OAAO,GAAE,OAAe,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CA8CjJ;AAyTD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,CAmD1F;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAkChG"}

package/dist/server-jsgen.js

@@ -358,14 +358,27 @@ function componentCallToJS(node, importedNames, isAsync = false, tracked) {
     }
     const propsObj = `{ ${propsEntries.join(', ')} }`;
     const compName = node.componentName;
-    const isImported = importedNames && importedNames.has(compName);
-    const callee = isImported ? compName : `__registry.get(${JSON.stringify(compName)})`;
+    // Member-expression tags (`<it.icon>`) carry the raw component-valued
+    // expression — invoke it directly; it is never a registry name.
+    const callee = node.calleeExpr
+        ? `(${node.calleeExpr})`
+        : (() => {
+            const isImported = importedNames && importedNames.has(compName);
+            return isImported ? compName : `__registry.get(${JSON.stringify(compName)})`;
+        })();
     const awaitKw = isAsync ? 'await ' : '';
+    // Hoist the callee so its defining-file scope (`__veskScope`, attached in
+    // server-render.ts) is preferred over the merged caller scope. Same-named
+    // top-level bindings in different `.vsk` files must not leak across
+    // components during SSR.
+    const calleeVar = `__cc${nextVskId()}`;
+    lines.push(`const ${calleeVar} = ${callee};`);
+    const callExpr = `${awaitKw}${calleeVar}(${propsObj}, __registry, (${calleeVar}.__veskScope || __vesk))`;
     if (__vskHydrate) {
-        lines.push(`__out.push('<!--vsk--><div>' + (${awaitKw}${callee}(${propsObj}, __registry, __vesk) || '') + '</div>');`);
+        lines.push(`__out.push('<!--vsk--><div>' + (${callExpr} || '') + '</div>');`);
     }
     else {
-        lines.push(`__out.push(${awaitKw}${callee}(${propsObj}, __registry, __vesk) || '');`);
+        lines.push(`__out.push(${callExpr} || '');`);
     }
     return lines.join('\n');
 }
@@ -424,8 +437,14 @@ export function buildComponentMap(irRoot, useSharedScope) {
     const map = new Map();
     const runtimeNames = extractRuntimeNames(irRoot.imports);
     const localValueNames = localValueImportNames(irRoot.imports);
-    const importedNames = new Set([...runtimeNames, ...localValueNames]);
     const topNames = extractTopLevelNames(irRoot.topLevelCode);
+    // Top-level value bindings (`const MyIcon = Cpu`) are destructured into
+    // every component scope from `__vesk` (see `scopeDecl` below), so a
+    // same-named JSX tag must invoke that in-scope value directly — not a
+    // registry lookup. File-defined components keep registry precedence.
+    const componentNames = new Set(irRoot.components.map((c) => c.name));
+    const topValueNames = topNames.filter((n) => !componentNames.has(n));
+    const importedNames = new Set([...runtimeNames, ...localValueNames, ...topValueNames]);
     const hasTracked = irRoot.components.some((c) => c.body.some((n) => n instanceof TrackDecl));
     const extraNames = hasTracked ? ['get', 'set', 'track'] : [];
     const allNames = [...new Set([...runtimeNames, ...topNames, ...extraNames, ...localValueNames])];

package/dist/server-render.d.ts

@@ -8,6 +8,7 @@ export declare function ssg(source: string, componentName?: string, customProps?
     registry?: Map<string, Function>;
     cssUrl?: string;
     cssUrls?: string[];
+    sourcePath?: string;
     [key: string]: unknown;
 }): Promise<SSGResult>;
 export declare function buildDataScripts(ssrProps: Record<string, unknown> | null | undefined, ssrData: Record<string, unknown>, external?: ExternalDataScript | null): string[];

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

@@ -1 +1 @@
-{"version":3,"file":"server-render.d.ts","sourceRoot":"","sources":["../src/server-render.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,SAAS,EAAE,eAAe,EAAqB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAiBvJ,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,iBAAiB,CAEhG;AAsCD,wBAAgB,MAAM,CACpB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAa,EAC3C,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAkC1B;AAED,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAa,EAC3C,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAiE9C;AAcD,wBAAsB,GAAG,CACvB,MAAM,EAAE,MAAM,EACd,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAO,GAC9G,OAAO,CAAC,SAAS,CAAC,CA8DpB;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,EACpD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,QAAQ,CAAC,EAAE,kBAAkB,GAAG,IAAI,GACnC,MAAM,EAAE,CAuBV;AAED,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAa,EAC3C,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,MAAM,CAAC,CAoEjB;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAa,EAC3C,OAAO,GAAE,eAAoB,GAC5B,cAAc,CAAC,MAAM,CAAC,CAsFxB"}
+{"version":3,"file":"server-render.d.ts","sourceRoot":"","sources":["../src/server-render.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,SAAS,EAAE,eAAe,EAAqB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AA6BvJ,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,iBAAiB,CAEhG;AA6CD,wBAAgB,MAAM,CACpB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAa,EAC3C,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAkC1B;AAED,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAa,EAC3C,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAiE9C;AAcD,wBAAsB,GAAG,CACvB,MAAM,EAAE,MAAM,EACd,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAO,GACnI,OAAO,CAAC,SAAS,CAAC,CA8DpB;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,EACpD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,QAAQ,CAAC,EAAE,kBAAkB,GAAG,IAAI,GACnC,MAAM,EAAE,CAuBV;AAED,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAa,EAC3C,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,MAAM,CAAC,CAoEjB;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAa,EAC3C,OAAO,GAAE,eAAoB,GAC5B,cAAc,CAAC,MAAM,CAAC,CA2FxB"}

package/dist/server-render.js

@@ -12,6 +12,15 @@ import { collectVskImportPaths } from '@vesk/compiler/src/vsk-imports';
 import { inlineMdImportsFrom, guessProjectRoots } from '@vesk/compiler/src/md-inline';
 import { withSsrStore, ssrSink } from '@vesk/compiler/src/ssr-store';
 import { applyLocalModuleImports } from '@vesk/compiler/src/module-imports';
+// Registry-hoisted sub components are invoked with the caller's `__vesk`,
+// but each component's scope declaration destructures its DEFINING file's
+// top-level bindings. When two `.vsk` files declare the same top-level name
+// (e.g. both define `const stages`), the hoist-first-wins merge below would
+// hand every component the wrong file's value. Attaching the defining scope
+// lets every call site prefer the callee's own bindings.
+function scopedVesk(fn, fallback) {
+    return fn.__veskScope || fallback;
+}
 export function compileFile(source, options) {
     return compileFileInternal(source, options?.sourcePath, new Set());
 }
@@ -20,9 +29,10 @@ function compileFileInternal(source, sourcePath, seenImportFiles) {
         const dir = dirname(sourcePath);
         source = inlineMdImportsFrom(source, sourcePath, guessProjectRoots(dir));
     }
-    const ast = parse(source);
-    const ir = generateIR(ast, source);
+    const ast = parse(source, sourcePath ? { filename: sourcePath } : {});
+    const ir = generateIR(ast, source, sourcePath);
     const componentMap = buildComponentMap(ir, true);
+    const ownComponentNames = ir.components.map((c) => c.name);
     const __vesk = loadRuntimeImports(ir.imports);
     applyLocalModuleImports(__vesk, ir.imports, sourcePath);
     if (sourcePath) {
@@ -52,6 +62,13 @@ function compileFileInternal(source, sourcePath, seenImportFiles) {
         }
     }
     evalTopLevelCode(transformTopLevelForActions(ir.topLevelCode, 'server'), __vesk);
+    // Sub-file components arrive pre-scoped from the recursive call below;
+    // scope the remaining (own) components to this file's bindings.
+    for (const name of ownComponentNames) {
+        const fn = componentMap.get(name);
+        if (fn && !fn.__veskScope)
+            fn.__veskScope = __vesk;
+    }
     return { ir, componentMap, __vesk };
 }
 export function render(source, componentName, props = {}, registry = new Map(), options = {}) {
@@ -72,7 +89,7 @@ export function render(source, componentName, props = {}, registry = new Map(),
         return withSsrStore(() => (async () => {
             let bodyHtml;
             try {
-                bodyHtml = await renderFn(props, fullRegistry, __vesk);
+                bodyHtml = await renderFn(props, fullRegistry, scopedVesk(renderFn, __vesk));
             }
             finally {
                 delete globalThis.__vsk_ssr;
@@ -83,7 +100,7 @@ export function render(source, componentName, props = {}, registry = new Map(),
     }
     let bodyHtml;
     try {
-        bodyHtml = withSsrStore(() => renderFn(props, fullRegistry, __vesk));
+        bodyHtml = withSsrStore(() => renderFn(props, fullRegistry, scopedVesk(renderFn, __vesk)));
     }
     finally {
         delete globalThis.__vsk_ssr;
@@ -119,7 +136,7 @@ export function renderPage(source, componentName, props = {}, registry = new Map
             return withSsrStore(() => (async () => {
                 let bodyHtml;
                 try {
-                    bodyHtml = await renderFn(ssrProps, fullRegistry, __vesk);
+                    bodyHtml = await renderFn(ssrProps, fullRegistry, scopedVesk(renderFn, __vesk));
                 }
                 finally {
                     delete globalThis.__vsk_ssr;
@@ -134,7 +151,7 @@ export function renderPage(source, componentName, props = {}, registry = new Map
         }
         let bodyHtml;
         try {
-            bodyHtml = withSsrStore(() => renderFn(ssrProps, fullRegistry, __vesk));
+            bodyHtml = withSsrStore(() => renderFn(ssrProps, fullRegistry, scopedVesk(renderFn, __vesk)));
         }
         finally {
             delete globalThis.__vsk_ssr;
@@ -175,8 +192,8 @@ function clearSsrCells(token) {
     }
 }
 export async function ssg(source, componentName, customProps, options = {}) {
-    const ast = parse(source);
-    const ir = generateIR(ast, source);
+    const ast = parse(source, options.sourcePath ? { filename: options.sourcePath } : {});
+    const ir = generateIR(ast, source, options.sourcePath);
     if (!componentName) {
         const defaultComp = ir.components.find((c) => c.defaultExport);
         const exportedComp = ir.components.find((c) => c.exported);
@@ -268,7 +285,7 @@ export async function renderFullPage(source, componentName, props = {}, registry
             let ssrProps = { ...props };
             let serializedProps = null;
             const cached = options.cached || undefined;
-            const ir = cached ? cached.ir : generateIR(parse(source), source);
+            const ir = cached ? cached.ir : generateIR(parse(source, options.sourcePath ? { filename: options.sourcePath } : {}), source, options.sourcePath);
             if (ir.loadFn) {
                 const __vesk = options.__vesk || cached?.__vesk || loadRuntimeImports(ir.imports);
                 const loadResult = await callLoadFunction(ir.loadFn, ssrProps, __vesk);
@@ -334,7 +351,7 @@ ${dataScriptBlock}${clientScript}</body>
 export function renderPageStream(source, componentName, props = {}, registry = new Map(), options = {}) {
     async function* raw() {
         const cached = options.cached || undefined;
-        const ir = cached ? cached.ir : generateIR(parse(source), source);
+        const ir = cached ? cached.ir : generateIR(parse(source, options.sourcePath ? { filename: options.sourcePath } : {}), source, options.sourcePath);
         let ssrProps = { ...props };
         let serializedProps = null;
         let __vesk = options.__vesk || cached?.__vesk || null;
@@ -394,7 +411,7 @@ export function renderPageStream(source, componentName, props = {}, registry = n
         const renderToken = globalThis.__vsk_ssr_token;
         let bodyHtml;
         try {
-            bodyHtml = await Promise.resolve(renderFn(ssrProps, fullRegistry, __vesk));
+            bodyHtml = await Promise.resolve(renderFn(ssrProps, fullRegistry, scopedVesk(renderFn, __vesk)));
         }
         finally {
             delete globalThis.__vsk_ssr;
@@ -404,7 +421,12 @@ export function renderPageStream(source, componentName, props = {}, registry = n
         const ssrData = { ...ssrSink.snapshot() };
         const dataScripts = buildDataScripts(ssrProps, ssrData, options.externalDataScript);
         const dataScriptBlock = dataScripts.length > 0 ? '\n' + dataScripts.join('\n') : '';
-        yield `\n</div>${dataScriptBlock}</body>\n</html>\n`;
+        // Mirror renderFullPage: a full document must carry the client bundle or
+        // the page can never hydrate (dev-server streams hit this path).
+        const clientScript = options.clientScriptUrl
+            ? `\t<script type="module" src="${options.clientScriptUrl}"></script>\n`
+            : '';
+        yield `\n</div>${dataScriptBlock}${clientScript}</body>\n</html>\n`;
     }
     const gen = raw();
     async function* scoped() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/compiler",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "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.10",
+    "@vesk/types": "^0.2.12",
     "acorn": "^8.15.0",
     "esrap": "^2.3.0",
     "is-reference": "^3.0.0",