@vesk/compiler 0.2.37 → 0.2.38

package/dist/parser.js

@@ -1,7 +1,7 @@
 import * as acorn from 'acorn';
 import { tsPlugin } from './acorn-ts-plugin/index.js';
 import { VeskParserPlugin } from '@vesk/compiler/src/vesk-plugin';
-import { blankLeadingLineComments, containsForOfIn } from '@vesk/compiler/src/scan';
+import { blankComments, 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);
@@ -257,7 +257,7 @@ export function createBaseParser() {
 }
 export function parse(source, options = {}) {
     const ParserClass = createBaseParser();
-    const { code, annotations } = preprocessForClauses(blankLeadingLineComments(source));
+    const { code, annotations } = preprocessForClauses(blankComments(source));
     try {
         const ast = ParserClass.parse(code, {
             ecmaVersion: 'latest',

package/dist/scan.d.ts

@@ -44,22 +44,28 @@ export declare function skipString(text: string, i: number): number;
  */
 export declare function skipComment(text: string, i: number): number;
 /**
- * Blanks out `//` line comments that begin a line, overwriting the comment
- * characters with spaces so every source offset (and therefore every
- * diagnostic line/column) is preserved.
+ * Blanks comments in the source, overwriting the comment characters with
+ * spaces so every source offset (and therefore every diagnostic line/column)
+ * is preserved. Newlines inside a comment are kept so line numbers hold.
  *
- * In JSX-children position acorn reads `//` as JSXText rather than a
- * comment, so `//<span>old</span>` inside a component still rendered the
- * element and `//{count + 1}` still emitted a live binding. Blanking a
- * line-leading `//` before the parse makes a commented-out line behave like
+ * In JSX-children position acorn reads both `//` and `/* ... *​/` as JSXText
+ * rather than a comment, so commented-out code still ran: `//<span>old</span>`
+ * inside a component rendered the element, `//{count + 1}` emitted a live
+ * binding, and `/* <span>old</span> *​/` leaked the markup as visible text.
+ * Blanking comments before the parse makes a commented-out line behave like
  * a comment in every position of a `.vsk` file.
  *
- * Only line-leading `//` is blanked: a trailing `// note` after code is a
- * real comment acorn already ignores, and blanking a mid-line `//` would
- * corrupt regex literals (`/https:\/\//`) and intentional JSX text. Strings
- * and template literals are skipped, so a `//` inside them is never touched.
+ * `/* ... *​/` is blanked wherever it appears (outside a string) because a
+ * block comment is inert everywhere in JS — and an unescaped `/*` cannot occur
+ * inside a regex literal, since it would terminate the regex there.
+ *
+ * `//` is blanked only when it is the first non-whitespace token on its line: a
+ * trailing `// note` after code is a real comment acorn already ignores, and
+ * blanking a mid-line `//` would corrupt regex literals (`/https:\/\//`) and
+ * intentional JSX text such as `ratio 1//2`. Strings and template literals are
+ * skipped throughout, so a comment marker inside them is never touched.
  */
-export declare function blankLeadingLineComments(text: string): string;
+export declare function blankComments(text: string): string;
 /**
  * Given the index of an opening `(`, `[` or `{`, returns the index of its
  * matching closing delimiter. Strings, `//` and `/* ... *​/` comments are

package/dist/scan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scan.d.ts","sourceRoot":"","sources":["../src/scan.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAEpD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAItD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAOzE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAWrD;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAS5D;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAG9D;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAc9D;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAsB1D;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAY3D;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA6B7D;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAkBvE;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CA2BjE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAgBtD;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAkBrD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAYpD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAOtD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAcnE;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAqB9D;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAY3D;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAexD"}
+{"version":3,"file":"scan.d.ts","sourceRoot":"","sources":["../src/scan.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAEpD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAItD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAOzE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAWrD;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAS5D;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAG9D;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAc9D;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAsB1D;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAY3D;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAuClD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAkBvE;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CA2BjE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAgBtD;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAkBrD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAYpD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAOtD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAcnE;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAqB9D;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAY3D;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAexD"}

package/dist/scan.js

@@ -164,22 +164,28 @@ export function skipComment(text, i) {
     return i;
 }
 /**
- * Blanks out `//` line comments that begin a line, overwriting the comment
- * characters with spaces so every source offset (and therefore every
- * diagnostic line/column) is preserved.
+ * Blanks comments in the source, overwriting the comment characters with
+ * spaces so every source offset (and therefore every diagnostic line/column)
+ * is preserved. Newlines inside a comment are kept so line numbers hold.
  *
- * In JSX-children position acorn reads `//` as JSXText rather than a
- * comment, so `//<span>old</span>` inside a component still rendered the
- * element and `//{count + 1}` still emitted a live binding. Blanking a
- * line-leading `//` before the parse makes a commented-out line behave like
+ * In JSX-children position acorn reads both `//` and `/* ... *​/` as JSXText
+ * rather than a comment, so commented-out code still ran: `//<span>old</span>`
+ * inside a component rendered the element, `//{count + 1}` emitted a live
+ * binding, and `/* <span>old</span> *​/` leaked the markup as visible text.
+ * Blanking comments before the parse makes a commented-out line behave like
  * a comment in every position of a `.vsk` file.
  *
- * Only line-leading `//` is blanked: a trailing `// note` after code is a
- * real comment acorn already ignores, and blanking a mid-line `//` would
- * corrupt regex literals (`/https:\/\//`) and intentional JSX text. Strings
- * and template literals are skipped, so a `//` inside them is never touched.
+ * `/* ... *​/` is blanked wherever it appears (outside a string) because a
+ * block comment is inert everywhere in JS — and an unescaped `/*` cannot occur
+ * inside a regex literal, since it would terminate the regex there.
+ *
+ * `//` is blanked only when it is the first non-whitespace token on its line: a
+ * trailing `// note` after code is a real comment acorn already ignores, and
+ * blanking a mid-line `//` would corrupt regex literals (`/https:\/\//`) and
+ * intentional JSX text such as `ratio 1//2`. Strings and template literals are
+ * skipped throughout, so a comment marker inside them is never touched.
  */
-export function blankLeadingLineComments(text) {
+export function blankComments(text) {
     const chars = text.split('');
     const n = text.length;
     let lineStart = true;
@@ -207,7 +213,11 @@ export function blankLeadingLineComments(text) {
             i = end;
             continue;
         }
-        if (ch === '/' && text[i + 1] === '/' && lineStart) {
+        if (ch === '/' && text[i + 1] === '/') {
+            if (!lineStart) {
+                i += 2;
+                continue;
+            }
             let j = i;
             while (j < n && text[j] !== '\n') {
                 chars[j] = ' ';
@@ -216,6 +226,18 @@ export function blankLeadingLineComments(text) {
             i = j;
             continue;
         }
+        if (ch === '/' && text[i + 1] === '*') {
+            let j = i;
+            while (j < n && !(text[j] === '*' && text[j + 1] === '/'))
+                j++;
+            const end = Math.min(j + 2, n);
+            for (let k = i; k < end; k++)
+                if (text[k] !== '\n')
+                    chars[k] = ' ';
+            lineStart = false;
+            i = end;
+            continue;
+        }
         lineStart = false;
         i++;
     }

package/package.json

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