@vesk/compiler 0.2.95 → 0.2.97

package/dist/ir-generator.js

@@ -710,7 +710,7 @@ function assertNoVskNamespaceValue(source, expr) {
     if (!hit)
         return;
     const { line, column } = offsetToLineCol(source, hit.start ?? 0);
-    throw VeskError.vskNamespaceMember({ file: currentSourceFile, line, column, code: codeFrame(source, line, column), form: 'value' });
+    throw VeskError.vskNamespaceMember({ file: currentSourceFile, line, column, frame: codeFrame(source, line, column), form: 'value' });
 }
 function findNamespaceValueUse(node, locals) {
     if (!node || typeof node !== 'object')
@@ -1526,7 +1526,7 @@ function processJSXElement(source, element) {
             // A `.vsk` module's exports are flat component names, so there is no
             // nested namespace object to walk into.
             const { line, column } = offsetToLineCol(source, nameNode.start ?? 0);
-            throw VeskError.vskNamespaceMember({ file: currentSourceFile, line, column, code: codeFrame(source, line, column), form: 'nested' });
+            throw VeskError.vskNamespaceMember({ file: currentSourceFile, line, column, frame: codeFrame(source, line, column), form: 'nested' });
         }
         const { props, spreadProps, slots } = extractProps(source, element);
         const children = selfClosing ? [] : processJSXChildren(source, element.children || []);
@@ -1973,7 +1973,7 @@ function processStatementModeBody(source, bodyStmts, filename) {
                     file: filename || '',
                     line,
                     column,
-                    code: codeFrame(source, line, column),
+                    frame: codeFrame(source, line, column),
                 });
             }
             // Pure JSX block: unwrap the children directly.
@@ -2074,7 +2074,7 @@ function processStatementModeBody(source, bodyStmts, filename) {
         }
         else if (stmt.type === 'ClassDeclaration') {
             const { line, column } = offsetToLineCol(source, stmt.start ?? 0);
-            throw VeskError.classDecl({ file: filename || '', line, column, code: codeFrame(source, line, column) });
+            throw VeskError.classDecl({ file: filename || '', line, column, frame: codeFrame(source, line, column) });
         }
         else if (stmt.type === 'ContinueStatement') {
             // An unconditional `continue` at the top level of a loop body: everything
@@ -2564,7 +2564,7 @@ export function generateIR(ast, source, filename) {
             }
             else if (inner.type === 'ClassDeclaration') {
                 const { line, column } = offsetToLineCol(source, inner.start ?? 0);
-                throw VeskError.classDecl({ file, line, column, code: codeFrame(source, line, column) });
+                throw VeskError.classDecl({ file, line, column, frame: codeFrame(source, line, column) });
             }
             else if (inner.type === 'TSEnumDeclaration') {
                 const code = processEnum(inner, source, exported);
@@ -2639,7 +2639,7 @@ export function generateIR(ast, source, filename) {
                         }
                         else if (stmt.type === 'ClassDeclaration') {
                             const { line, column } = offsetToLineCol(source, stmt.start ?? 0);
-                            throw VeskError.classDecl({ file, line, column, code: codeFrame(source, line, column) });
+                            throw VeskError.classDecl({ file, line, column, frame: codeFrame(source, line, column) });
                         }
                         else {
                             const raw = getSource(source, stmt);
@@ -2670,7 +2670,7 @@ export function generateIR(ast, source, filename) {
                 if (!asyncNames.has(childName))
                     continue;
                 const { line, column } = offsetToLineCol(source, start >= 0 ? start : 0);
-                throw VeskError.asyncChildInSyncParent(comp.name, childName, { file, line, column, code: codeFrame(source, line, column) });
+                throw VeskError.asyncChildInSyncParent(comp.name, childName, { file, line, column, frame: codeFrame(source, line, column) });
             }
         }
         const autoImportable = [

package/dist/parser.d.ts

@@ -39,7 +39,7 @@ export interface VeskAnnotation {
  * tokenization pass it in; when it is unavailable the scan falls back to the
  * plain lexical skip so mid-edit source never crashes it.
  */
-export declare function preprocessForClauses(source: string, delimiters?: Set<number> | null): {
+export declare function preprocessForClauses(source: string, delimiters?: Set<number> | null, filename?: string): {
     code: string;
     annotations: VeskAnnotation[];
 };

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;AAOtC,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;AA0BD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,GAC9B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,cAAc,EAAE,CAAA;CAAE,CAmMjD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAwFlE;AA2DD,wBAAgB,gBAAgB,IAAI,OAAO,KAAK,CAAC,MAAM,CAEtD;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAM/D;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CA+NzE"}
+{"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;AAOtC,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;AA0BD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,EAC/B,QAAQ,SAAK,GACZ;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,cAAc,EAAE,CAAA;CAAE,CAqMjD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAwFlE;AA2DD,wBAAgB,gBAAgB,IAAI,OAAO,KAAK,CAAC,MAAM,CAEtD;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAM/D;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CA+NzE"}

package/dist/parser.js

@@ -39,7 +39,7 @@ function offsetToLineCol(source, offset) {
  * tokenization pass it in; when it is unavailable the scan falls back to the
  * plain lexical skip so mid-edit source never crashes it.
  */
-export function preprocessForClauses(source, delimiters) {
+export function preprocessForClauses(source, delimiters, filename = '') {
     const annotations = [];
     const chars = source.split('');
     const isString = (ch) => ch === '"' || ch === "'" || ch === '`';
@@ -219,9 +219,11 @@ export function preprocessForClauses(source, delimiters) {
                                     // through used to emit a broken reconciliation key.
                                     const { line, column } = offsetToLineCol(source, start);
                                     throw new VeskError(`Invalid \`; key\` clause — write the key expression after \`key\` without a colon: \`key ${expr.slice(1).trim()}\`.`, {
+                                        file: filename || '',
                                         line,
                                         column,
-                                        code: codeFrame(source, line, column),
+                                        code: 'V0411',
+                                        frame: codeFrame(source, line, column),
                                         nextSteps: [
                                             'Use `; key <expr>` (no colon), e.g. `for (const item of items; key item.id)`.',
                                             'For the iteration index use `; index <name>`, e.g. `for (const item of items; key item.id; index i)`.',
@@ -526,7 +528,8 @@ export function parse(source, options = {}) {
     const delimiters = sourceTokens === null
         ? null
         : collectStringDelimiters(source, sourceTokens);
-    const { code, annotations } = preprocessForClauses(blankGenericArrowTypeParams(blankComments(source)), delimiters);
+    const filename = options.filename || '';
+    const { code, annotations } = preprocessForClauses(blankGenericArrowTypeParams(blankComments(source)), delimiters, filename);
     // Acorn validates that every `export { X }` names a real top-level binding.
     // A `.vsk` component is a registry entry, not a binding, so acorn rejects
     // `export { MyComponent }`. Remove only those specifier lists — one whose
@@ -587,7 +590,6 @@ export function parse(source, options = {}) {
                 }
             }
         }
-        const filename = options.filename || '';
         // Strip the trailing "(line:column)" acorn appends, without regex.
         let cleanMessage = err.message;
         const lastParen = cleanMessage.lastIndexOf('(');

package/package.json

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