rip-lang 3.13.134 → 3.13.136

package/src/repl.js

@@ -17,7 +17,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
 import * as vm from 'vm';
-import { Compiler, compileToJS, getStdlibCode, getReactiveRuntime, getComponentRuntime } from './compiler.js';
+import { Compiler, compileToJS, getStdlibCode, getReactiveRuntime, getComponentRuntime, formatError } from './compiler.js';
 import packageJson from '../package.json' with { type: 'json' };
 
 const VERSION = packageJson.version;
@@ -205,6 +205,7 @@ export class RipREPL {
   async evaluate(code) {
     try {
       this.history.push(code);
+      this._lastSource = code;
 
       const compiler = new Compiler({
         showTokens: this.showTokens,
@@ -433,7 +434,7 @@ export class RipREPL {
   }
 
   printError(error) {
-    console.log(`${colors.red}✗${colors.reset} ${colors.red}${error.message}${colors.reset}`);
+    console.log(formatError(error, { source: this._lastSource, color: true }));
     if (error.stack && process.env.RIP_DEBUG) {
       console.log(`${colors.dim}${error.stack}${colors.reset}`);
     }

package/src/sourcemap-utils.js

@@ -109,6 +109,10 @@ export function mapToSourcePos(entry, offset) {
     // match string literals or identifiers in the source.
     if (/^declare\s+function\s/.test(genLineText)) return null;
 
+    // If genToSrc has a mapping for this header line (e.g. imports, declarations),
+    // use it to target the correct source line for word matching.
+    const mappedSrcLine = entry.genToSrc.get(tsLine);
+
     let lineStart = 0, curLine = 0;
     for (let i = 0; i < entry.tsContent.length; i++) {
       if (curLine === tsLine) { lineStart = i; break; }
@@ -121,6 +125,13 @@ export function mapToSourcePos(entry, offset) {
       const srcLines = entry.source.split('\n');
       const re = new RegExp('\\b' + word.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '\\b');
 
+      // If we have a direct line mapping, try that source line first
+      if (mappedSrcLine !== undefined) {
+        const m = re.exec(srcLines[mappedSrcLine]);
+        if (m) return { line: mappedSrcLine, col: m.index };
+        return { line: mappedSrcLine, col: genCol };
+      }
+
       // For let/var declarations, the error word may appear on many source lines
       // (e.g. `Status` referenced in multiple variable annotations). Narrow the
       // search to the source line that declares the same variable.
@@ -253,13 +264,17 @@ export function mapToSourcePos(entry, offset) {
   // Scan ALL source lines for mappings to this gen line — a multi-line Rip
   // expression (e.g. object literal) may compile to a single gen line, so
   // multiple source lines can share one gen line.  Pick the closest genCol.
+  // On ties, prefer the source line that genToSrc already identified (e.g.
+  // from an @rip-src annotation) so that stub render-block expressions land
+  // on their correct source lines instead of a sibling attribute line.
   if (entry.srcColToGen) {
+    const origSrcLine = srcLine;
     let bestDist = Infinity;
     for (const [sl, entries] of entry.srcColToGen) {
       for (const e of entries) {
         if (e.genLine === tsLine) {
           const dist = Math.abs(e.genCol - genCol);
-          if (dist < bestDist) {
+          if (dist < bestDist || (dist === bestDist && sl === origSrcLine)) {
             bestDist = dist;
             srcLine = sl;
             approx = e.srcCol + (genCol - e.genCol);
@@ -310,17 +325,24 @@ export function mapToSourcePos(entry, offset) {
       }
     }
     srcCol = Math.max(0, approx);
+  }
 
-    // Word not found on mapped line — search nearby lines (handles cases where
-    // multiple source lines compress to one generated line, e.g. constructor params)
-    const wordFallback = genText.slice(genCol).match(/^\w+/);
+  // Word not found on mapped line (or line was empty) — search nearby lines
+  // (handles cases where multiple source lines compress to one generated line,
+  // e.g. constructor params, or srcLine is blank)
+  {
+    let wordFallback = genText.slice(genCol).match(/^\w+/);
+    // Quoted string literal — peek inside the quotes (e.g. __RipProps<'inputz'>)
+    if (!wordFallback && (genText[genCol] === "'" || genText[genCol] === '"')) {
+      wordFallback = genText.slice(genCol + 1).match(/^\w+/);
+    }
     if (wordFallback) {
       let word = wordFallback[0];
       if (word.startsWith('__bind_') && word.endsWith('__')) word = word.slice(7, -2);
       const srcLines = entry.source.split('\n');
       const re = new RegExp('\\b' + word.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '\\b');
-      for (let delta = 1; delta <= 10; delta++) {
-        for (const d of [srcLine + delta, srcLine - delta]) {
+      for (let delta = 0; delta <= 10; delta++) {
+        for (const d of delta === 0 ? [srcLine] : [srcLine + delta, srcLine - delta]) {
           if (d >= 0 && d < srcLines.length) {
             const m = re.exec(srcLines[d]);
             if (m) return { line: d, col: m.index };
@@ -329,5 +351,16 @@ export function mapToSourcePos(entry, offset) {
       }
     }
   }
+
+  // When text matching failed entirely (generated identifier like _2 doesn't
+  // exist in source), srcCol may land on whitespace or past EOL.  Fall back to
+  // the first word on the source line so the diagnostic highlights something
+  // meaningful (e.g. the component name on a `Button` line).
+  if (srcText) {
+    if (srcCol >= srcText.length || /^\s*$/.test(srcText.slice(srcCol, srcCol + 1))) {
+      const firstWord = srcText.match(/^\s*(\w+)/);
+      if (firstWord) return { line: srcLine, col: firstWord.index + firstWord[0].length - firstWord[1].length };
+    }
+  }
   return { line: srcLine, col: srcCol };
 }