escover 6.2.4 → 6.2.6

package/ChangeLog

@@ -1,3 +1,13 @@
+2026.05.08, v6.2.6
+
+feature:
+- d3747a2 formatters: responsive: Lines
+
+2026.05.08, v6.2.5
+
+feature:
+- 4c12ec6 responsive: line numbers
+
 2026.05.08, v6.2.4
 
 feature:

package/lib/formatters/responsive.js

@@ -5,6 +5,7 @@ import {
 } from 'table';
 import chalk from 'chalk';
 
+const isNumber = (a) => !Number.isNaN(a) && typeof a === 'number';
 const CWD = process.cwd();
 const {entries, keys} = Object;
 
@@ -13,71 +14,58 @@ const makeRed = chalk.hex('#f44336');
 
 export default (coverageFile, {skipFull = false} = {}) => {
     const files = parseCoverageFile(coverageFile, skipFull);
-
+    
     if (skipFull && !files.length)
         return '💪 coverage 100% Good Job!\n';
-
+    
     const totalWidth = process.stdout.columns || 80;
-
-    let showPercent = false;
-
-    if (totalWidth >= 70)
-        showPercent = true;
-
-    const tableData = buildGroupedTable(files, showPercent);
-
+    const showPercent = totalWidth >= 70;
+    
+    const linesColWidth = 20;
+    const percentColWidth = showPercent ? 7 : 0;
+    
+    // резерв на бордеры и padding + дополнительный запас
+    const fileColWidth = Math.max(10, totalWidth - linesColWidth - percentColWidth - 6 - 4);
+    
+    const tableData = buildGroupedTable(files, showPercent, linesColWidth);
+    
     const options = createTableOptions({
-        totalWidth,
         showPercent,
         tableData,
+        fileColWidth,
+        percentColWidth,
+        linesColWidth,
     });
-
+    
     return table(tableData, options);
 };
 
-export function createTableOptions({totalWidth, showPercent, tableData}) {
-    let percentColWidth = 0;
-
-    if (showPercent)
-        percentColWidth = 8;
-
-    const fileColWidth = Math.floor(totalWidth * 0.45);
-    const linesColWidth = totalWidth - fileColWidth - percentColWidth - 6;
-
+export function createTableOptions({showPercent, tableData, fileColWidth, percentColWidth, linesColWidth}) {
     const columns = [{
         paddingLeft: 1,
         paddingRight: 1,
         width: fileColWidth,
         wrapWord: false,
     }];
-
+    
     if (showPercent)
         columns.push({
             alignment: 'center',
             paddingLeft: 1,
-            paddingRight: 0,
+            paddingRight: 1,
             width: percentColWidth,
         });
-
+    
     columns.push({
         paddingLeft: 1,
-        paddingRight: 0,
+        paddingRight: 1,
         width: linesColWidth,
+        wrapWord: false,
     });
-
+    
     return {
-        drawHorizontalLine: (raw) => {
-            if (!raw)
-                return true;
-
-            if (raw === 1)
-                return true;
-
-            return raw === tableData.length;
-        },
-
+        drawHorizontalLine: (i) => !i || i === 1 || i === tableData.length,
         columns,
-
         border: {
             ...getBorderCharacters('void'),
             topBody: '-',
@@ -89,58 +77,50 @@ export function createTableOptions({totalWidth, showPercent, tableData}) {
             bodyJoin: '|',
         },
     };
-};
+}
 
 export function groupByFolder(files) {
     const groups = new Map();
-
+    
     for (const f of files) {
         const parts = f.filename.split('/');
-
-        let folder = '';
-
-        if (parts.length > 1)
-            folder = parts.slice(0, -1).join('/');
-
+        const folder = parts.length > 1 ? parts
+            .slice(0, -1)
+            .join('/') : '';
+        
         const fileName = parts.at(-1);
-
+        
         let group = groups.get(folder);
-
+        
         if (!group) {
             group = {
                 files: [],
             };
             groups.set(folder, group);
         }
-
+        
         group.files.push({
             ...f,
             shortName: fileName,
         });
     }
-
+    
     return groups;
 }
 
 export function parseCoverageFile(coverageFile, skipFull) {
     const files = [];
-
+    
     for (const {name, lines} of coverageFile) {
         const uncovered = parseUncoveredLines(lines);
-
         const linesCount = keys(lines).length;
-        const uncoveredCount = uncovered.length;
-
-        const percentLines = getLinesPercent(linesCount, uncoveredCount);
-
-        let covered = true;
-
-        if (uncoveredCount > 0)
-            covered = false;
-
+        const uncoveredLinesCount = uncovered.length;
+        const percentLines = getLinesPercent(linesCount, uncoveredLinesCount);
+        const covered = uncoveredLinesCount === 0;
+        
         if (skipFull && covered)
             continue;
-
+        
         files.push({
             filename: name.replace(`${CWD}/`, ''),
             covered,
@@ -148,13 +128,15 @@ export function parseCoverageFile(coverageFile, skipFull) {
             percentLines,
         });
     }
-
+    
     return files;
 }
 
-export function buildGroupedTable(files, showPercent) {
-    const tableData = [];
+export const getColor = (value) => value === 100 ? makeGreen : makeRed;
 
+export function buildGroupedTable(files, showPercent, linesColWidth) {
+    const tableData = [];
+    
     if (showPercent)
         tableData.push([
             'File',
@@ -166,123 +148,102 @@ export function buildGroupedTable(files, showPercent) {
             'File',
             'Uncovered Lines #s',
         ]);
-
+    
     const groups = groupByFolder(files);
     const hideFolders = groups.size === 1;
-
+    
     for (const [folder, group] of groups) {
         let sum = 0;
-
+        
         for (const f of group.files)
             sum += f.percentLines;
-
-        let coverage = 100;
-
-        if (group.files.length > 0)
-            coverage = Math.round(sum / group.files.length);
-
+        
+        const coverage = Math.round(sum / group.files.length);
+        
         if (!hideFolders) {
-            let folderLabel = folder;
-
-            if (!folderLabel)
-                folderLabel = '.';
-
-            const trimmedFolder = trim(folderLabel, 25);
-
-            let folderColor = makeRed;
-
-            if (coverage === 100)
-                folderColor = makeGreen;
-
-            const headerRow = [folderColor(trimmedFolder)];
-
-            if (showPercent) {
-                let color = makeRed;
-
-                if (coverage === 100)
-                    color = makeGreen;
-
-                headerRow.push(color(`${coverage}%`));
-            }
-
-            headerRow.push('');
-            tableData.push(headerRow);
+            const row = [];
+            row.push(getColor(coverage)(folder));
+            
+            if (showPercent)
+                row.push(getColor(coverage)(`${coverage}%`));
+            
+            row.push('');
+            tableData.push(row);
         }
-
+        
         for (const f of group.files) {
-            const fileCell = ' ' + trim(f.shortName, 30);
-
-            let fileColor = makeRed;
-
-            if (f.covered)
-                fileColor = makeGreen;
-
-            const row = [fileColor(fileCell)];
-
-            if (showPercent) {
-                let percentColor = makeRed;
-
-                if (f.percentLines === 100)
-                    percentColor = makeGreen;
-
-                row.push(percentColor(`${f.percentLines}%`));
-            }
-
-            let uncovered = '';
-
-            if (!f.covered)
-                uncovered = makeRed(formatLines(f.lines));
-
-            row.push(uncovered);
+            const row = [];
+            row.push(f.covered ? makeGreen(' ' + f.shortName) : makeRed(' ' + f.shortName));
+            
+            if (showPercent)
+                row.push(f.percentLines === 100 ? makeGreen(`${f.percentLines}%`) : makeRed(`${f.percentLines}%`));
+            
+            row.push(f.covered ? '' : makeRed(formatLines(
+                f.lines,
+                linesColWidth,
+            )));
             tableData.push(row);
         }
     }
-
+    
     return tableData;
 }
 
-function trim(str, max) {
-    if (str.length <= max)
-        return str;
-
-    return '...' + str.slice(-(max - 3));
-}
-
-export function formatLines(array) {
-    if (array.length <= 10) {
-        const joined = array.join(', ');
-
-        if (joined.length <= 30)
+export function formatLines(array, maxLen = 20) {
+    if (array.every(isNumber)) {
+        const nums = array
+            .slice()
+            .sort((a, b) => a - b);
+        const ranges = [];
+        let [start] = nums;
+        let [prev] = nums;
+        
+        for (let i = 1; i < nums.length; i++) {
+            const n = nums[i];
+            
+            if (n === prev + 1) {
+                prev = n;
+            } else {
+                ranges.push(start === prev ? String(start) : `${start}..${prev}`);
+                start = n;
+                prev = n;
+            }
+        }
+        
+        ranges.push(start === prev ? String(start) : `${start}..${prev}`);
+        
+        const joined = ranges.join(', ');
+        
+        if (joined.length <= maxLen)
             return joined;
+        
+        return ranges[0];
     }
-
-    const [first] = array;
-    const last = array.at(-1);
-
-    const base = first + '..' + last;
-
-    if (base.length <= 30)
-        return base;
-
-    return last;
+    
+    // если элементы строки — просто объединяем через ', ' и усечем
+    const joined = array.join(', ');
+    
+    if (joined.length <= maxLen)
+        return joined;
+    
+    return array[0];
 }
 
-function parseUncoveredLines(lines) {
+export function parseUncoveredLines(lines) {
     const out = [];
-
-    for (const [line, covered] of entries(lines)) {
+    
+    for (const [line, covered] of entries(lines))
         if (!covered)
-            out.push(line);
-    }
-
+            out.push(Number(line));
+    
     return out;
 }
 
 export function getLinesPercent(linesCount, uncoveredLinesCount) {
     if (!linesCount)
         return 100;
-
-    const ratio = (100 / linesCount) * uncoveredLinesCount;
-
+    
+    const ratio = 100 / linesCount * uncoveredLinesCount;
+    
     return 100 - Math.round(ratio);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "escover",
-  "version": "6.2.4",
+  "version": "6.2.6",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Coverage for EcmaScript Modules",
   "main": "lib/escover.js",