juxscript 1.1.155 → 1.1.157

package/machinery/compiler4.js

@@ -374,17 +374,24 @@ export class JuxCompiler {
         views.forEach((v, index) => {
             const functionName = `renderJux${index}`;
 
+            let codeBody = v.originalContent || v.content;
+            const originalLines = codeBody.split('\n');
+            codeBody = this._stripImportsAndExports(codeBody);
+            const strippedLines = codeBody.split('\n');
+
+            // Build a line map: for each stripped line, find its original line number
+            const lineMap = this._buildLineMap(originalLines, strippedLines);
+
             sourceSnapshot[v.file] = {
                 name: v.name,
                 file: v.file,
                 content: v.originalContent || v.content,
-                lines: (v.originalContent || v.content).split('\n'),
+                lines: originalLines,
+                strippedLines: strippedLines,
+                lineMap: lineMap,
                 functionName
             };
 
-            let codeBody = v.originalContent || v.content;
-            codeBody = this._stripImportsAndExports(codeBody);
-
             entry += `\nasync function ${functionName}() {\n${codeBody}\n}\n`;
 
             // Generate route path
@@ -843,4 +850,39 @@ window.navigateTo = (path) => {
             .replace(/_+/g, '_')                // Collapse multiple consecutive underscores
             .replace(/^_|_$/g, '');             // Remove leading/trailing underscores
     }
+
+    /**
+     * Build a mapping from stripped line index to original source line number.
+     * For each line in strippedLines, find the best matching line in originalLines.
+     */
+    _buildLineMap(originalLines, strippedLines) {
+        const lineMap = [];
+        let searchFrom = 0;
+
+        for (let i = 0; i < strippedLines.length; i++) {
+            const stripped = strippedLines[i].trim();
+            if (!stripped) {
+                // Empty line — estimate position
+                lineMap.push(searchFrom < originalLines.length ? searchFrom + 1 : originalLines.length);
+                continue;
+            }
+
+            let found = false;
+            for (let j = searchFrom; j < originalLines.length; j++) {
+                if (originalLines[j].trim() === stripped) {
+                    lineMap.push(j + 1); // 1-based
+                    searchFrom = j + 1;
+                    found = true;
+                    break;
+                }
+            }
+
+            if (!found) {
+                // Fallback: use last known position
+                lineMap.push(searchFrom < originalLines.length ? searchFrom + 1 : originalLines.length);
+            }
+        }
+
+        return lineMap;
+    }
 }

package/machinery/errors.js

@@ -61,8 +61,6 @@ export function generateErrorCollector(options = {}) {
     function resolveSourceLocation(bundleLine) {
         if (!__sources || !__bundleLines || !bundleLine) return null;
 
-        // Find the renderJuxN function that contains this line
-        // by scanning backwards from bundleLine for "async function renderJux"
         var funcName = null;
         var funcStartLine = 0;
         for (var i = bundleLine - 1; i >= 0; i--) {
@@ -71,14 +69,13 @@ export function generateErrorCollector(options = {}) {
             var match = line.match(/async\\s+function\\s+(renderJux\\d+)/);
             if (match) {
                 funcName = match[1];
-                funcStartLine = i + 1; // 1-based
+                funcStartLine = i + 1;
                 break;
             }
         }
 
         if (!funcName) return null;
 
-        // Find the source entry that maps to this function
         var sourceEntry = null;
         for (var key in __sources) {
             if (__sources[key].functionName === funcName) {
@@ -89,26 +86,34 @@ export function generateErrorCollector(options = {}) {
 
         if (!sourceEntry) return null;
 
-        // Calculate approximate original line
-        // bundleLine is inside the function body, funcStartLine is the function declaration
-        // +1 because function body starts after the declaration line
+        // Index into the function body (0-based)
         var offsetInFunc = bundleLine - funcStartLine - 1;
+        var lineMap = sourceEntry.lineMap || [];
         var originalLines = sourceEntry.lines || [];
-        var approxLine = Math.max(0, Math.min(offsetInFunc, originalLines.length - 1));
+
+        // Use lineMap for accurate resolution
+        var originalLineNum;
+        if (lineMap.length > 0 && offsetInFunc >= 0 && offsetInFunc < lineMap.length) {
+            originalLineNum = lineMap[offsetInFunc]; // already 1-based
+        } else {
+            // Fallback: direct offset
+            originalLineNum = Math.max(1, Math.min(offsetInFunc + 1, originalLines.length));
+        }
+
+        var lineIndex = originalLineNum - 1;
+        var contextRadius = 3;
+        var contextStart = Math.max(0, lineIndex - contextRadius);
+        var contextEnd = Math.min(originalLines.length, lineIndex + contextRadius + 1);
 
         return {
             file: sourceEntry.file,
             name: sourceEntry.name,
             functionName: funcName,
-            originalLine: approxLine + 1,
-            originalCode: originalLines[approxLine] || '',
-            // Provide surrounding context (3 lines before/after)
-            context: originalLines.slice(
-                Math.max(0, approxLine - 3),
-                Math.min(originalLines.length, approxLine + 4)
-            ),
-            contextStartLine: Math.max(0, approxLine - 3) + 1,
-            highlightLine: approxLine + 1
+            originalLine: originalLineNum,
+            originalCode: originalLines[lineIndex] || '',
+            context: originalLines.slice(contextStart, contextEnd),
+            contextStartLine: contextStart + 1,
+            highlightLine: originalLineNum
         };
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "juxscript",
-  "version": "1.1.155",
+  "version": "1.1.157",
   "type": "module",
   "description": "A JavaScript UX authorship platform",
   "main": "index.js",