@vesk/compiler 0.2.40 → 0.2.41

package/dist/typecheck.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typecheck.d.ts","sourceRoot":"","sources":["../src/typecheck.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAKD,eAAO,MAAM,OAAO,6xoBAkhBnB,CAAC;AAEF,eAAO,MAAM,gBAAgB,uZAS5B,CAAC;AA6LF,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,QAAQ,EAAE,cAAc,EAAE,CAAC;CAC5B;AAED,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,GAAE,gBAAqB,GAAG,eAAe,CA4FlG;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,CAItE;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,MAAM,CAI1E"}
+{"version":3,"file":"typecheck.d.ts","sourceRoot":"","sources":["../src/typecheck.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAKD,eAAO,MAAM,OAAO,6xoBAkhBnB,CAAC;AAEF,eAAO,MAAM,gBAAgB,uZAS5B,CAAC;AA6LF,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,QAAQ,EAAE,cAAc,EAAE,CAAC;CAC5B;AAuCD,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,GAAE,gBAAqB,GAAG,eAAe,CA2GlG;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,CAItE;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,MAAM,CAI1E"}

package/dist/typecheck.js

@@ -2,7 +2,7 @@ import { readFileSync, readdirSync, statSync } from 'node:fs';
 import { join, dirname, normalize, relative, resolve, sep } from 'node:path';
 import * as ts from 'typescript';
 import { parse } from '@vesk/compiler/src/parser';
-import { vskToTsx, generateVskDts } from '@vesk/compiler/src/vsk-tsx';
+import { compileVskCodegen, generateVskDts } from '@vesk/compiler/src/vsk-tsx';
 import { resolveAliasModule } from '@vesk/compiler/src/module-imports';
 const SKIP_DIRS = new Set(['node_modules', '.vesk', '.git', 'dist', 'tarballs', '.next']);
 const SKIP_FILES = new Set(['__vesk_ambient.d.ts', '__vesk_runtime_override.d.ts']);
@@ -642,7 +642,7 @@ function createTypecheckHost(projectRoot, appDir, vskFiles) {
                 content = '';
             }
             else if (vskFiles.has(file)) {
-                content = vskToTsx(vskFiles.get(file));
+                content = compileVskCodegen(vskFiles.get(file)).code;
             }
             else if (ts.sys.fileExists(file)) {
                 content = ts.sys.readFile(file);
@@ -684,7 +684,7 @@ function createTypecheckHost(projectRoot, appDir, vskFiles) {
             if (file.endsWith('.css.d.ts'))
                 return '';
             if (vskFiles.has(file))
-                return vskToTsx(vskFiles.get(file));
+                return compileVskCodegen(vskFiles.get(file)).code;
             return ts.sys.readFile(file);
         },
         writeFile: () => { },
@@ -739,6 +739,35 @@ function createTypecheckHost(projectRoot, appDir, vskFiles) {
     };
     return host;
 }
+function mapGeneratedOffset(mappings, generatedOffset) {
+    let nearest = null;
+    for (const mapping of mappings) {
+        for (let i = 0; i < mapping.generatedOffsets.length; i++) {
+            const generated = mapping.generatedOffsets[i];
+            const length = mapping.lengths[i] ?? 0;
+            const source = mapping.sourceOffsets[i];
+            if (generated <= generatedOffset && generated + length >= generatedOffset) {
+                return source + (generatedOffset - generated);
+            }
+            if (generated <= generatedOffset && (!nearest || generated > nearest.generated)) {
+                nearest = { source, generated, length };
+            }
+        }
+    }
+    return nearest ? nearest.source + Math.min(nearest.length, Math.max(0, generatedOffset - nearest.generated)) : null;
+}
+function sourcePosition(source, offset) {
+    const bounded = Math.max(0, Math.min(offset, source.length));
+    let line = 1;
+    let lineStart = 0;
+    for (let i = 0; i < bounded; i++) {
+        if (source.charCodeAt(i) === 10) {
+            line++;
+            lineStart = i + 1;
+        }
+    }
+    return { line, character: bounded - lineStart + 1 };
+}
 export function typecheckProject(projectRoot, opts = {}) {
     const appDir = opts.appDir ?? join(projectRoot, 'app');
     const vskFiles = new Map();
@@ -820,12 +849,29 @@ export function typecheckProject(projectRoot, opts = {}) {
         }
         if (!rootSet.has(filePath) && !vskSet.has(filePath))
             continue;
-        const pos = file.getLineAndCharacterOfPosition(diag.start ?? 0);
+        let sourceOffset = diag.start ?? 0;
+        let line;
+        let column;
+        if (vskFiles.has(filePath)) {
+            const source = vskFiles.get(filePath);
+            const generated = compileVskCodegen(source);
+            const mapped = mapGeneratedOffset(generated.mappings, sourceOffset);
+            if (mapped !== null)
+                sourceOffset = mapped;
+            const pos = sourcePosition(source, sourceOffset);
+            line = pos.line;
+            column = pos.character;
+        }
+        else {
+            const pos = file.getLineAndCharacterOfPosition(diag.start ?? 0);
+            line = pos.line + 1;
+            column = pos.character + 1;
+        }
         const code = typeof diag.code === 'number' ? `TS${diag.code}` : String(diag.code);
         errors.push({
             file: relative(projectRoot, filePath),
-            line: pos.line + 1,
-            column: pos.character + 1,
+            line,
+            column,
             code,
             message: ts.flattenDiagnosticMessageText(diag.messageText, '\n'),
         });

package/package.json

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