escover 6.2.3 → 6.2.5

package/ChangeLog

@@ -1,3 +1,13 @@
+2026.05.08, v6.2.5
+
+feature:
+- 4c12ec6 responsive: line numbers
+
+2026.05.08, v6.2.4
+
+feature:
+- 39420cf formatters: responsive: simplify
+
 2026.05.08, v6.2.3
 
 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;
 
@@ -18,26 +19,38 @@ export default (coverageFile, {skipFull = false} = {}) => {
         return '💪 coverage 100% Good Job!\n';
     
     const totalWidth = process.stdout.columns || 80;
+    const showPercent = totalWidth >= 70;
     
-    let showPercent = false;
+    const percentColWidth = showPercent ? 6 : 0;
+    const linesColWidth = 20;
+    const borderPadding = 6;
+    const fileColWidth = Math.max(10, totalWidth - percentColWidth - linesColWidth - borderPadding);
     
-    if (totalWidth >= 70)
-        showPercent = true;
+    const tableData = buildGroupedTable(files, showPercent, linesColWidth);
     
-    let percentColWidth = 0;
-    
-    if (showPercent)
-        percentColWidth = 8;
+    const options = createTableOptions({
+        showPercent,
+        tableData,
+        fileColWidth,
+        percentColWidth,
+        linesColWidth,
+    });
     
-    const fileColWidth = Math.floor(totalWidth * 0.45);
-    const linesColWidth = totalWidth - fileColWidth - percentColWidth - 6;
+    return table(tableData, options);
+};
+
+export function createTableOptions({showPercent, tableData, fileColWidth, percentColWidth, linesColWidth, totalWidth}) {
+    const width = totalWidth || process.stdout.columns || 80;
     
-    const tableData = buildGroupedTable(files, showPercent);
+    // если fileColWidth/percentColWidth не переданы — считаем
+    const fileWidth = fileColWidth || Math.max(10, width - (showPercent ? 6 : 0) - 20 - 6);
+    const percentWidth = percentColWidth || (showPercent ? 8 : 0);
+    const linesWidth = linesColWidth || 20;
     
     const columns = [{
         paddingLeft: 1,
         paddingRight: 1,
-        width: fileColWidth,
+        width: fileWidth,
         wrapWord: false,
     }];
     
@@ -46,28 +59,19 @@ export default (coverageFile, {skipFull = false} = {}) => {
             alignment: 'center',
             paddingLeft: 1,
             paddingRight: 0,
-            width: percentColWidth,
+            width: percentWidth,
         });
     
     columns.push({
         paddingLeft: 1,
         paddingRight: 0,
-        width: linesColWidth,
+        width: linesWidth,
+        wrapWord: false,
     });
     
-    const options = {
-        drawHorizontalLine: (raw) => {
-            if (!raw)
-                return true;
-            
-            if (raw === 1)
-                return true;
-            
-            return raw === tableData.length;
-        },
-        
+    return {
+        drawHorizontalLine: (i) => !i || i === 1 || i === tableData.length,
         columns,
-        
         border: {
             ...getBorderCharacters('void'),
             topBody: '-',
@@ -79,23 +83,16 @@ export default (coverageFile, {skipFull = false} = {}) => {
             bodyJoin: '|',
         },
     };
-    
-    return table(tableData, options);
-};
+}
 
-function groupByFolder(files) {
+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);
@@ -116,7 +113,33 @@ function groupByFolder(files) {
     return groups;
 }
 
-function buildGroupedTable(files, showPercent) {
+export function parseCoverageFile(coverageFile, skipFull) {
+    const files = [];
+    
+    for (const {name, lines} of coverageFile) {
+        const uncovered = parseUncoveredLines(lines);
+        const linesCount = keys(lines).length;
+        const uncoveredLinesCount = uncovered.length;
+        const percentLines = getLinesPercent(linesCount, uncoveredLinesCount);
+        const covered = uncoveredLinesCount === 0;
+        
+        if (skipFull && covered)
+            continue;
+        
+        files.push({
+            filename: name.replace(`${CWD}/`, ''),
+            covered,
+            lines: uncovered,
+            percentLines,
+        });
+    }
+    
+    return files;
+}
+
+export const getColor = (value) => value === 100 ? makeGreen : makeRed;
+
+export function buildGroupedTable(files, showPercent, linesColWidth) {
     const tableData = [];
     
     if (showPercent)
@@ -134,74 +157,37 @@ function buildGroupedTable(files, showPercent) {
     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;
+            const row = [];
+            row.push(getColor(coverage)(folder));
             
-            if (!folderLabel)
-                folderLabel = '.';
+            if (showPercent)
+                row.push(getColor(coverage)(`${coverage}%`));
             
-            // убрали завершающий slash
-            const trimmedFolder = trim(folderLabel, 25);
-            
-            let folderColor = makeRed;
-            
-            if (coverage === 100)
-                folderColor = makeGreen;
-            
-            const folderName = folderColor(trimmedFolder);
-            
-            const headerRow = [folderName];
-            
-            if (showPercent) {
-                let color = makeRed;
-                
-                if (coverage === 100)
-                    color = makeGreen;
-                
-                headerRow.push(color(`${coverage}%`));
-            }
-            
-            headerRow.push('');
-            tableData.push(headerRow);
+            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}%`));
-            }
+            const row = [];
+            row.push(f.covered ? makeGreen(' ' + f.shortName) : makeRed(' ' + f.shortName));
             
-            let uncovered = '';
-            
-            if (!f.covered)
-                uncovered = makeRed(formatLines(f.lines));
-            
-            row.push(uncovered);
+            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);
         }
     }
@@ -209,69 +195,42 @@ function buildGroupedTable(files, showPercent) {
     return tableData;
 }
 
-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;
-        
-        if (skipFull && covered)
-            continue;
-        
-        files.push({
-            filename: name.replace(`${CWD}/`, ''),
-            covered,
-            lines: uncovered,
-            percentLines,
-        });
+export function formatLines(array, maxLen = 20) {
+    const nums = array;
+    const ranges = [];
+    let [start] = nums;
+    let [prev] = nums;
+    
+    for (let i = 1; i < nums.length; i++) {
+        const n = nums[i];
+        
+        if (isNumber(prev) && typeof n === 'number' && n === prev + 1 || prev === n - 0) {
+            prev = n;
+        } else {
+            ranges.push(String(start));
+            start = n;
+            prev = n;
+        }
     }
     
-    return files;
-}
-
-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)
-            return joined;
-    }
+    ranges.push(start === prev ? String(start) : `${start}..${prev}`);
     
-    const [first] = array;
-    const last = array.at(-1);
+    const joined = ranges.join(', ');
     
-    const base = first + '..' + last;
+    if (joined.length <= maxLen)
+        return joined;
     
-    if (base.length <= 30)
-        return base;
+    const [first] = ranges;
     
-    return last;
+    return first;
 }
 
-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);
-    }
     
     return out;
 }

package/package.json

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