@parcel/codeframe 2.0.0-beta.3 → 2.0.0-dev.1510

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/codeframe",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-dev.1510+a9bb85adf",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
@@ -19,14 +19,20 @@
   "engines": {
     "node": ">= 12.0.0"
   },
+  "targets": {
+    "main": {
+      "includeNodeModules": {
+        "chalk": false
+      }
+    }
+  },
   "dependencies": {
-    "chalk": "^4.1.0",
+    "chalk": "^4.1.0"
+  },
+  "devDependencies": {
     "emphasize": "^4.2.0",
     "slice-ansi": "^4.0.0",
     "string-width": "^4.2.0"
   },
-  "devDependencies": {
-    "strip-ansi": "^6.0.0"
-  },
-  "gitHead": "bf03f018093f8c7ca4c3a544524e15065a637b3b"
+  "gitHead": "a9bb85adf8f3b38631e178b3aacaa30c78696e36"
 }

package/src/codeframe.js

@@ -84,6 +84,7 @@ export default function codeFrame(
   };
 
   // Make columns/lines start at 1
+  let originalHighlights = highlights;
   highlights = highlights.map(h => {
     return {
       start: {
@@ -112,18 +113,24 @@ export default function codeFrame(
   let startLine = firstHighlight.start.line - opts.padding.before;
   startLine = startLine < 0 ? 0 : startLine;
   let endLineIndex = lastHighlight.end.line + opts.padding.after;
-  endLineIndex =
-    endLineIndex - startLine > opts.maxLines
-      ? startLine + opts.maxLines - 1
-      : endLineIndex;
+  let tail;
+  if (endLineIndex - startLine > opts.maxLines) {
+    let maxLine = startLine + opts.maxLines - 1;
+    highlights = highlights.filter(h => h.start.line < maxLine);
+    lastHighlight = highlights[0];
+    endLineIndex = Math.min(
+      maxLine,
+      lastHighlight.end.line + opts.padding.after,
+    );
+    tail = originalHighlights.filter(h => h.start.line > endLineIndex);
+  }
 
   let lineNumberLength = (endLineIndex + 1).toString(10).length;
 
   // Split input into lines and highlight syntax
   let lines = code.split(NEWLINE);
-  let syntaxHighlightedLines = (opts.syntaxHighlighting
-    ? highlightSyntax(code, opts.language)
-    : code
+  let syntaxHighlightedLines = (
+    opts.syntaxHighlighting ? highlightSyntax(code, opts.language) : code
   )
     .replace(TAB_REPLACE_REGEX, TAB_REPLACEMENT)
     .split(NEWLINE);
@@ -253,6 +260,9 @@ export default function codeFrame(
             characters += startCol - lastCol;
           }
 
+          // Don't crash (and swallow the original message) if the diagnostic is malformed (end is before start).
+          characters = Math.max(1, characters);
+
           // Append the highlight indicators
           highlightLine += highlighter('^'.repeat(characters));
 
@@ -282,5 +292,11 @@ export default function codeFrame(
     }
   }
 
-  return resultLines.join('\n');
+  let result = resultLines.join('\n');
+
+  if (tail && tail.length > 0) {
+    result += '\n\n' + codeFrame(code, tail, inputOpts);
+  }
+
+  return result;
 }

package/test/codeframe.test.js

@@ -796,4 +796,27 @@ describe('codeframe', () => {
     assert.equal(lines[3], '   9 | ');
     assert.equal(lines[4], '  10 | /**');
   });
+
+  it('should still generate a codeframe when end is before start', () => {
+    let codeframeString = codeframe(
+      'hello world',
+      [
+        {
+          start: {
+            column: 5,
+            line: 1,
+          },
+          end: {
+            column: 1,
+            line: 1,
+          },
+        },
+      ],
+      {useColor: false},
+    );
+
+    let lines = codeframeString.split(LINE_END);
+    assert.equal(lines[0], '> 1 | hello world');
+    assert.equal(lines[1], '>   |     ^');
+  });
 });