escover 1.8.1 → 1.12.0

package/ChangeLog

@@ -1,3 +1,29 @@
+2022.01.19, v1.12.0
+
+feature:
+- escover: add lcov support
+
+
+2022.01.19, v1.11.0
+
+feature:
+- escover: mark: add support of continue
+- escover: coverage-file: read -> readCoverage
+
+
+2022.01.19, v1.10.0
+
+feature:
+- escover: add .. when to many lines to display
+
+
+2022.01.19, v1.9.0
+
+feature:
+- escover: formatters: files: add ability to cut lines, when count more then 10
+- escover: formatters returning a string
+
+
 2022.01.19, v1.8.1
 
 fix:

package/bin/escover.js

@@ -1,11 +1,13 @@
 #!/usr/bin/env node
 
 import {cli} from '../lib/cli/cli.js';
-import {read} from '../lib/coverage-file.js';
+import {readCoverage} from '../lib/coverage-file/coverage-file.js';
+import {readConfig} from '../lib/config.js';
 
 cli({
     argv: process.argv,
     exit: process.exit,
-    read,
+    readCoverage,
+    readConfig,
 });
 

package/lib/cli/cli.js

@@ -8,7 +8,7 @@ import reportFiles from '../formatters/files.js';
 
 const {ESCOVER_FORMAT, NODE_OPTIONS = ''} = process.env;
 
-export const cli = ({argv, exit, read}) => {
+export const cli = ({argv, exit, readCoverage}) => {
     const args = yargsParser(argv.slice(2), {
         string: [
             'format',
@@ -36,12 +36,16 @@ export const cli = ({argv, exit, read}) => {
         execute('"' + cmd.join(`" "`) + '"', exit);
     }
     
-    const coverage = read();
+    const coverage = readCoverage();
+    
+    let output = '';
     
     if (args.format === 'lines')
-        return reportLines(coverage);
+        output = reportLines(coverage);
+    else
+        output = reportFiles(coverage);
     
-    reportFiles(coverage);
+    process.stdout.write(output);
 };
 
 function execute(cmd, exit) {

package/lib/{coverage-file.js → coverage-file/coverage-file.js}

@@ -1,12 +1,14 @@
-import tryCatch from 'try-catch';
 import {
     writeFileSync,
     readFileSync,
 } from 'fs';
-import {getFileEntries} from './c4.js';
-import {transform} from './transform.js';
-import {merge} from './merge.js';
-import findCacheDir from 'find-cache-dir';
+import tryCatch from 'try-catch';
+import {join} from 'path';
+import {getFileEntries} from '../c4.js';
+import {transform} from '../transform.js';
+import {merge} from '../merge.js';
+import {findCacheDir} from './find-cache-dir.js';
+import {createLcov} from './lcov.js';
 
 const {
     stringify,
@@ -16,24 +18,26 @@ const {
 const NAME = 'escover';
 const buildName = (a) => `${a}/${NAME}.json`;
 
-export const write = () => {
+export const writeCoverage = () => {
     const files = getFileEntries();
     
     if (!files.size)
         return;
     
     const parsed = transform(files);
-    
     const merged = merge(parsed);
-    const name = findCacheDir({
+    const lcov = createLcov(merged);
+    
+    const dir = findCacheDir({
         name: NAME,
         create: true,
     });
     
-    writeFileSync(buildName(name), stringify(merged, null, 4));
+    writeFileSync(join(dir, 'lcov.info'), lcov);
+    writeFileSync(buildName(dir), stringify(merged, null, 4));
 };
 
-export const read = () => {
+export const readCoverage = () => {
     const name = findCacheDir({
         name: NAME,
     });

package/lib/coverage-file/find-cache-dir.js

@@ -0,0 +1,14 @@
+import {join} from 'path';
+import {cwd} from 'process';
+import {mkdirSync} from 'fs';
+
+export function findCacheDir() {
+    const name = join(cwd(), 'coverage');
+    
+    mkdirSync(name, {
+        recursive: true,
+    });
+    
+    return name;
+}
+

package/lib/coverage-file/lcov.js

@@ -0,0 +1,17 @@
+const {entries} = Object;
+
+export const createLcov = (files) => {
+    const result = [];
+    
+    for (const {name, lines} of files) {
+        result.push(`SF:${name}`);
+        for (const [line, covered] of entries(lines)) {
+            const count = covered ? 1 : 0;
+            result.push(`DA:${line},${count}`);
+        }
+    }
+    
+    result.push('end_of_record');
+    
+    return result.join('\n');
+};

package/lib/exit.js

@@ -1,6 +1,6 @@
 import once from 'once';
-import {write} from './coverage-file.js';
+import {writeCoverage} from './coverage-file/coverage-file.js';
 
 export const exit = once(() => {
-    write();
+    writeCoverage();
 });

package/lib/formatters/files.js

@@ -19,7 +19,7 @@ export default (coverageFile) => {
     ];
     
     for (const {filename, covered, lines, percentLines} of files) {
-        const uncoveredLines = lines.join(', ');
+        const uncoveredLines = formatLines(lines);
         
         if (covered) {
             tableData.push([chalk.green(filename), chalk.green(percentLines), '']);
@@ -29,7 +29,7 @@ export default (coverageFile) => {
         tableData.push([chalk.red(filename), chalk.red(percentLines), chalk.red(uncoveredLines)]);
     }
     
-    process.stdout.write(table(tableData, {
+    return table(tableData, {
         drawHorizontalLine: (raw) => {
             return !raw || raw === 1 || raw === files.length + 1;
         },
@@ -46,9 +46,19 @@ export default (coverageFile) => {
             joinJoin: '|',
             bodyJoin: '|',
         },
-    }));
+    });
 };
 
+export function formatLines(array) {
+    const lines = array.slice(0, 10).join(', ');
+    
+    if (array.length <= 10)
+        return lines;
+    
+    const latest = array[array.length - 1];
+    return `${lines}..${latest}`;
+}
+
 function parseUncoveredLines(lines) {
     const uncoveredLines = [];
     
@@ -69,11 +79,12 @@ function parseCoverageFile(coverageFile) {
         const uncoveredLines = parseUncoveredLines(lines);
         
         const linesCount = keys(lines).length;
-        const percentLines = getPercentLines(linesCount, uncoveredLines);
+        const uncoveredLinesCount = uncoveredLines.length;
+        const percentLines = getLinesPercent(linesCount, uncoveredLinesCount);
         
         files.push({
             filename,
-            covered: !uncoveredLines.length,
+            covered: !uncoveredLinesCount,
             lines: uncoveredLines,
             percentLines,
         });
@@ -82,9 +93,9 @@ function parseCoverageFile(coverageFile) {
     return files;
 }
 
-function getPercentLines(linesCount, uncoveredLines) {
+export function getLinesPercent(linesCount, uncoveredLinesCount) {
     if (!linesCount)
         return 100;
     
-    return 100 - Math.round(100 / linesCount * uncoveredLines.length);
+    return 100 - Math.round(100 / linesCount * uncoveredLinesCount);
 }

package/lib/formatters/lines.js

@@ -1,7 +1,10 @@
 import chalk from 'chalk';
 const {entries} = Object;
 
+const createOut = (output) => (a) => output.push(a);
 export default (coverageFile) => {
+    const output = [];
+    const out = createOut(output);
     const files = [];
     const coverage = {
         files,
@@ -9,8 +12,8 @@ export default (coverageFile) => {
         uncoveredCount: 0,
     };
     
-    console.log('# CAP version 13');
-    console.log('');
+    out('# CAP version 13');
+    out('');
     
     for (const {name, lines} of coverageFile) {
         const uncoveredLines = [];
@@ -39,31 +42,33 @@ export default (coverageFile) => {
     
     for (const {name, covered, uncoveredLines} of files) {
         if (!covered) {
-            console.log(`# ${name}`);
-            console.log('🧨 should be covered');
-            console.log('---');
-            console.log(`lines:`);
+            out(`# ${name}`);
+            out('🧨 should be covered');
+            out('---');
+            out(`lines:`);
             for (const line of uncoveredLines) {
-                console.log(`️- ${chalk.red(line)} at file://${name}:${line}`);
+                out(`️- ${chalk.red(line)} at file://${name}:${line}`);
             }
-            console.log('');
+            out('');
         }
     }
     
-    console.log(`1..${files.length}`);
-    console.log(`# files: ${files.length}`);
-    console.log(`# covered: ${coverage.coveredCount}`);
+    out(`1..${files.length}`);
+    out(`# files: ${files.length}`);
+    out(`# covered: ${coverage.coveredCount}`);
     
-    console.log('');
+    out('');
     
     if (!coverage.uncoveredCount) {
-        console.log('#️ 🌴 ok');
+        out('#️ 🌴 ok');
     }
     
     if (coverage.uncoveredCount) {
-        console.log(`# 🧨 fail: ${coverage.uncoveredCount}`);
+        out(`# 🧨 fail: ${coverage.uncoveredCount}`);
     }
     
-    console.log('');
+    out('');
+    
+    return output.join('\n');
 };
 

package/lib/instrument/plugin-mark/continue.js

@@ -0,0 +1,10 @@
+import {operator} from 'putout';
+const {replaceWithMultiple} = operator;
+
+export const addMarkToContinue = (path, lineNode) => {
+    return replaceWithMultiple(path, [
+        lineNode,
+        path.node,
+    ]);
+};
+

package/lib/instrument/plugin-mark/index.js

@@ -3,9 +3,11 @@ import {
     types,
     operator,
 } from 'putout';
+
 import {addMarkToReturn} from './return.js';
 import {addMarkToArrowFunction} from './arrow.js';
 import {addMarkToThrow} from './throw.js';
+import {addMarkToContinue} from './continue.js';
 
 const {
     NumericLiteral,
@@ -16,6 +18,7 @@ const {
 const {
     replaceWith,
     compareAny,
+    compare,
 } = operator;
 
 const LINE = `__c4['🧨'](__l, __c)`;
@@ -93,13 +96,15 @@ export const fix = (path, {options}) => {
     if (path.isReturnStatement())
         return addMarkToReturn(path, lineNode);
     
-    if (path.isArrowFunctionExpression()) {
+    if (path.isArrowFunctionExpression())
         return addMarkToArrowFunction(path, lineNode);
-    }
     
     if (path.isThrowStatement())
         return addMarkToThrow(path, lineNode);
     
+    if (path.isContinueStatement())
+        return addMarkToContinue(path, lineNode);
+    
     replaceWith(path, BlockStatement([
         node,
     ]));
@@ -135,6 +140,17 @@ export const traverse = ({push}) => ({
         
         push(path);
     },
+    ContinueStatement(path) {
+        if (!path.parentPath.isBlockStatement())
+            return;
+        
+        const {body} = path.parentPath.node;
+        
+        if (compare(body[0], LINE))
+            return;
+        
+        push(path);
+    },
     LogicalExpression(path) {
         if (compareAny(path.get('left'), EXCLUDE))
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "escover",
-  "version": "1.8.1",
+  "version": "1.12.0",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Coverage for EcmaScript Modules",
   "main": "lib/escover.js",
@@ -19,11 +19,8 @@
     "loader"
   ],
   "scripts": {
-    "loader": "madrun loader",
     "test": "madrun test",
-    "test:only": "madrun test:only",
     "coverage": "madrun coverage",
-    "c4": "madrun c4",
     "lint": "madrun lint",
     "fresh:lint": "madrun fresh:lint",
     "lint:fresh": "madrun lint:fresh",
@@ -33,7 +30,7 @@
     "watch:test": "madrun watch:test",
     "watch:lint": "madrun watch:lint",
     "watch:tape": "madrun watch:tape",
-    "watch:coverage": "madrun watch:coverage"
+    "prewisdom": "madrun prewisdom"
   },
   "dependencies": {
     "chalk": "^5.0.0",
@@ -44,6 +41,7 @@
     "once": "^1.4.0",
     "picomatch": "^2.3.1",
     "putout": "^24.0.2",
+    "strip-ansi": "^7.0.1",
     "table": "^6.8.0",
     "try-catch": "^3.0.0",
     "yargs-parser": "^21.0.0",