escover 1.12.0 → 1.13.0

package/ChangeLog

@@ -1,3 +1,11 @@
+2022.01.20, v1.13.0
+
+feature:
+- escover: add ability to read lcov
+- coverage-file: add ability to parse lcov
+- escover: mark: add support of break
+
+
 2022.01.19, v1.12.0
 
 feature:

package/README.md

@@ -31,7 +31,11 @@ which are needed to load module again, and apply mocks.
 
 ### 🤷‍  How to get coverage when mocks are used?
 
-☝️ Use 🎩 `ESCover`! It supports loaders, `ESM` and collects coverage as a loader!
+☝️ Use 🎩`ESCover`! It supports loaders, `ESM` and collects coverage as a loader!
+
+### 🤷‍  What with [`coveralls`](https://coveralls.io/)? Does [`lcov`](https://github.com/StevenLooman/mocha-lcov-reporter) supported?
+
+☝️ Sure! `coverage/lcov.info` is main coverage file for 🎩`ESCover`.
 
 ## Install
 
@@ -55,6 +59,15 @@ When everything is covered:
 
 ![image](https://user-images.githubusercontent.com/1573141/149822261-ff9bc3b4-6ee4-452c-9ada-3cc922b630ec.png)
 
+## What formatters exists?
+
+There is two types of formatters:
+
+- `lines` adds links to each line;
+- `files` shows information in table;
+
+You can choose formatter with `ESCOVER_FORMAT` env variable.
+
 ## What if I want to use 🎩`ESCover` with `mock-import`?
 
 Experimental `loaders` supports only one, for now. So [zenload](https://github.com/coderaiser/zenload) should be used.

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

@@ -8,15 +8,13 @@ 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,
-    parse,
-} = JSON;
+import {
+    generateLcov,
+    parseLcov,
+} from './lcov.js';
 
 const NAME = 'escover';
-const buildName = (a) => `${a}/${NAME}.json`;
+const LCOV = 'lcov.info';
 
 export const writeCoverage = () => {
     const files = getFileEntries();
@@ -26,27 +24,26 @@ export const writeCoverage = () => {
     
     const parsed = transform(files);
     const merged = merge(parsed);
-    const lcov = createLcov(merged);
+    const lcov = generateLcov(merged);
     
     const dir = findCacheDir({
         name: NAME,
         create: true,
     });
     
-    writeFileSync(join(dir, 'lcov.info'), lcov);
-    writeFileSync(buildName(dir), stringify(merged, null, 4));
+    writeFileSync(join(dir, LCOV), lcov);
 };
 
 export const readCoverage = () => {
-    const name = findCacheDir({
+    const dir = findCacheDir({
         name: NAME,
     });
     
-    const [error, data] = tryCatch(readFileSync, buildName(name), 'utf8');
+    const [error, data] = tryCatch(readFileSync, join(dir, LCOV), 'utf8');
     
     if (error)
         return [];
     
-    return parse(data);
+    return parseLcov(data);
 };
 

package/lib/coverage-file/lcov.js

@@ -1,6 +1,6 @@
 const {entries} = Object;
 
-export const createLcov = (files) => {
+export const generateLcov = (files) => {
     const result = [];
     
     for (const {name, lines} of files) {
@@ -9,9 +9,44 @@ export const createLcov = (files) => {
             const count = covered ? 1 : 0;
             result.push(`DA:${line},${count}`);
         }
+        
+        result.push('end_of_record');
     }
     
-    result.push('end_of_record');
-    
     return result.join('\n');
 };
+
+const isEnd = (a) => a === 'end_of_record';
+
+export const parseLcov = (lcov) => {
+    const files = [];
+    let name = '';
+    let lines = {};
+    
+    for (const current of lcov.split('\n')) {
+        const [cmd, arg] = current.split(':');
+        
+        if (cmd === 'SF') {
+            name = arg;
+            lines = {};
+            continue;
+        }
+        
+        if (cmd === 'DA') {
+            const [line, covered] = arg.split(',');
+            lines[line] = Boolean(Number(covered));
+            continue;
+        }
+        
+        if (isEnd(cmd)) {
+            files.push({
+                name,
+                lines,
+            });
+            continue;
+        }
+    }
+    
+    return files;
+};
+

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

@@ -7,7 +7,6 @@ import {
 import {addMarkToReturn} from './return.js';
 import {addMarkToArrowFunction} from './arrow.js';
 import {addMarkToThrow} from './throw.js';
-import {addMarkToContinue} from './continue.js';
 
 const {
     NumericLiteral,
@@ -19,6 +18,7 @@ const {
     replaceWith,
     compareAny,
     compare,
+    replaceWithMultiple,
 } = operator;
 
 const LINE = `__c4['🧨'](__l, __c)`;
@@ -102,8 +102,11 @@ export const fix = (path, {options}) => {
     if (path.isThrowStatement())
         return addMarkToThrow(path, lineNode);
     
-    if (path.isContinueStatement())
-        return addMarkToContinue(path, lineNode);
+    if (path.isContinueStatement() || path.isBreakStatement())
+        return replaceWithMultiple(path, [
+            lineNode,
+            path.node,
+        ]);
     
     replaceWith(path, BlockStatement([
         node,
@@ -140,7 +143,7 @@ export const traverse = ({push}) => ({
         
         push(path);
     },
-    ContinueStatement(path) {
+    'ContinueStatement|BreakStatement'(path) {
         if (!path.parentPath.isBlockStatement())
             return;
         

package/package.json

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

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

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