escover 1.10.0 → 1.11.0

package/ChangeLog

@@ -1,3 +1,10 @@
+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:

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/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,7 +36,7 @@ export const cli = ({argv, exit, read}) => {
         execute('"' + cmd.join(`" "`) + '"', exit);
     }
     
-    const coverage = read();
+    const coverage = readCoverage();
     
     let output = '';
     

package/lib/coverage-file/coverage-file.js

@@ -16,7 +16,7 @@ const {
 const NAME = 'escover';
 const buildName = (a) => `${a}/${NAME}.json`;
 
-export const write = () => {
+export const writeCoverage = () => {
     const files = getFileEntries();
     
     if (!files.size)
@@ -33,7 +33,7 @@ export const write = () => {
     writeFileSync(buildName(name), stringify(merged, null, 4));
 };
 
-export const read = () => {
+export const readCoverage = () => {
     const name = findCacheDir({
         name: 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/coverage-file.js';
+import {writeCoverage} from './coverage-file/coverage-file.js';
 
 export const exit = once(() => {
-    write();
+    writeCoverage();
 });

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.10.0",
+  "version": "1.11.0",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Coverage for EcmaScript Modules",
   "main": "lib/escover.js",
@@ -27,6 +27,7 @@
     "fix:lint": "madrun fix:lint",
     "report": "madrun report",
     "watcher": "madrun watcher",
+    "watch:test": "madrun watch:test",
     "watch:lint": "madrun watch:lint",
     "watch:tape": "madrun watch:tape",
     "prewisdom": "madrun prewisdom"
@@ -40,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",