escover 1.0.2 → 1.1.0

package/ChangeLog

@@ -1,3 +1,28 @@
+2022.01.11, v1.1.0
+
+feature:
+- (escover) add bin
+
+
+2022.01.08, v1.0.5
+
+feature:
+- escover: report
+
+
+2022.01.08, v1.0.4
+
+feature:
+- escover: add support of AssignmentExpression
+
+
+2022.01.08, v1.0.3
+
+feature:
+- escover: plugin-mark: add support ot ThrowStatement
+- escover: add merger
+
+
 2022.01.08, v1.0.2
 
 fix:

package/README.md

@@ -9,7 +9,7 @@
 [CoverageURL]: https://coveralls.io/github/coderaiser/escover?branch=master
 [CoverageIMGURL]: https://coveralls.io/repos/coderaiser/escover/badge.svg?branch=master&service=github
 
-Explosive coverage tool
+Coverage for EcmaScript Modules based on 🐊[`Putout`](https://github.com/coderaiser/putout).
 
 ## Install
 
@@ -19,6 +19,12 @@ npm i escover -g
 
 Then run using:
 
+```sh
+escover npm test
+```
+
+Or as [loader](https://nodejs.org/dist/latest-v16.x/docs/api/esm.html#loaders):
+
 ```sh
 NODE_OPTIONS="'--loader escover'" escover npm test
 ```

package/bin/escover.js

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

package/lib/c4.js

@@ -5,10 +5,10 @@ export const createFileEntry = (url) => {
     files.set(url, lines);
     
     return {
-        mark: (line, column) => {
+        '🧨': (line, column) => {
             lines.set(`${line}:${column}`, true);
         },
-        init: (line, column) => {
+        'init': (line, column) => {
             lines.set(`${line}:${column}`, false);
         },
     };

package/lib/cli/cli.js

@@ -0,0 +1,54 @@
+import {promisify} from 'util';
+import yargsParser from 'yargs-parser';
+import _foreground from 'foreground-child';
+
+import {version} from './version.js';
+import {report} from '../report.js';
+
+const foreground = promisify((cmd, fn) => {
+    _foreground(cmd, () => {
+        fn();
+    });
+});
+
+process.env.ZENLOAD = 'escover,mock-import';
+
+export const cli = async ({argv, exit, read}) => {
+    const args = yargsParser(argv.slice(2), {
+        boolean: [
+            'version',
+        ],
+        alias: {
+            v: 'version',
+        },
+        configuration: {},
+    });
+    
+    if (args.version) {
+        console.log(`v${version()}`);
+        return exit();
+    }
+    
+    const cmd = hideInstrumenterArgs(args);
+    
+    if (!cmd.length)
+        return;
+    
+    await foreground(cmd);
+    const coverage = read();
+    
+    report(coverage);
+};
+
+function hideInstrumenterArgs(yargv) {
+    let argv = process.argv.slice(1);
+    
+    argv = argv.slice(argv.indexOf(yargv._[0]));
+    
+    if (argv[0][0] === '-') {
+        argv.unshift(process.execPath);
+    }
+    
+    return argv;
+}
+

package/lib/cli/version.js

@@ -0,0 +1,12 @@
+import {readFileSync} from 'fs';
+const {parse} = JSON;
+
+const packageJson = new URL('../../package.json', import.meta.url);
+
+export const version = () => {
+    const data = readFileSync(packageJson, 'utf8');
+    const {version} = parse(data);
+    
+    return version;
+};
+

package/lib/config.js

@@ -0,0 +1,40 @@
+import {
+    writeFileSync,
+    readFileSync,
+} from 'fs';
+import {getFiles} from './c4.js';
+import {transform} from './transform.js';
+import {merge} from './merge.js';
+import findCacheDir from 'find-cache-dir';
+
+const {
+    stringify,
+    parse,
+} = JSON;
+
+const NAME = 'escover';
+const buildName = (a) => `${a}/${NAME}.json`;
+
+export const write = () => {
+    const files = getFiles();
+    const parsed = transform(files);
+    const merged = merge(parsed);
+    const name = findCacheDir({
+        name: NAME,
+        create: true,
+    });
+    
+    writeFileSync(buildName(name), stringify(merged, null, 4));
+};
+
+export const read = () => {
+    const name = findCacheDir({
+        name: NAME,
+    });
+    
+    if (!name)
+        return null;
+    
+    const data = readFileSync(buildName(name), 'utf8');
+    return parse(data);
+};

package/lib/escover.js

@@ -8,6 +8,8 @@ import {createFileEntry} from './c4.js';
 
 global.__createC4 = createFileEntry;
 
+process.once('exit', exit);
+
 export async function load(url, context, defaultLoad) {
     const {format, source: rawSource} = await defaultLoad(url, context, defaultLoad);
     
@@ -33,5 +35,3 @@ export async function load(url, context, defaultLoad) {
     };
 }
 
-process.once('exit', exit);
-

package/lib/exit.js

@@ -1,9 +1,6 @@
 import once from 'once';
-
-import {save} from './save.js';
-import {report} from './report.js';
+import {write} from './config.js';
 
 export const exit = once(() => {
-    save();
-    report();
+    write();
 });

package/lib/instrument/plugin-mark/fixture/arrow-fix.js

@@ -1,6 +1,6 @@
 export const nothing = (a, b) => {
-    return __c4.mark(2, 4);
+    return __c4['🧨'](2, 4);
 };
 export const sum = (a, b) => {
-    return __c4.mark(5, 4), a + b;
+    return __c4['🧨'](5, 4), a + b;
 };

package/lib/instrument/plugin-mark/fixture/assignment-fix.js

@@ -1 +1,2 @@
-const [error, {packageJson} = (__c4.mark(1, 14), {})] = (__c4.mark(1, 36), tryCatch(readPackageUpSync));
+const [error, {packageJson} = (__c4['🧨'](1, 14), {})] = (__c4['🧨'](1, 36), tryCatch(readPackageUpSync));
+data += (__c4['🧨'](2, 0), 'fix:' + '\n');

package/lib/instrument/plugin-mark/fixture/assignment.js

@@ -1 +1,2 @@
 const [error, {packageJson} = {}] = tryCatch(readPackageUpSync);
+data += 'fix:' + '\n';

package/lib/instrument/plugin-mark/fixture/if-fix.js

@@ -0,0 +1,6 @@
+if (error) {
+    throw (__c4['🧨'](2, 4), `error reading package.json: ${error.message}`);
+}
+
+if (error)
+    throw (__c4['🧨'](6, 4), (__c4.mark(11, 8), `error reading package.json: ${error.message}`));

package/lib/instrument/plugin-mark/fixture/if.js

@@ -0,0 +1,6 @@
+if (error) {
+    throw `error reading package.json: ${error.message}`;
+}
+
+if (error)
+    throw (__c4.mark(11, 8), `error reading package.json: ${error.message}`);

package/lib/instrument/plugin-mark/fixture/logical-fix.js

@@ -1,3 +1,3 @@
-if ((__c4.mark(1, 4), a) || (__c4.mark(1, 9), b)) {
-  __c4.mark(1, 12);
+if ((__c4['🧨'](1, 4), a) || (__c4['🧨'](1, 9), b)) {
+  __c4['🧨'](1, 12);
 }

package/lib/instrument/plugin-mark/fixture/mark-line-fix.js

@@ -1,30 +1,30 @@
 const a = () => {
-    a = 5;
-    __c4.mark(3, 4), console.log(5);
+    a = (__c4['🧨'](2, 4), 5);
+    __c4['🧨'](3, 4), console.log(5);
 };
 
 
 function x() {
     
     if (a > 2) {
-        __c4.mark(9, 14), a();
+        __c4['🧨'](9, 14), a();
     } else {
-        __c4.mark(10, 9), b();
+        __c4['🧨'](10, 9), b();
     }
 }
 
 for (const x of y) {
-    __c4.mark(13, 19);
+    __c4['🧨'](13, 19);
 }
 
-const ax = ((__c4.mark(16, 12), a()), (__c4.mark(16, 17), b()));
-const bx = (c, (__c4.mark(17, 15), d()));
+const ax = ((__c4['🧨'](16, 12), a()), (__c4['🧨'](16, 17), b()));
+const bx = (c, (__c4['🧨'](17, 15), d()));
 
-if ((__c4.mark(19, 4), a) || (__c4.mark(19, 9), b)) {
-    __c4.mark(19, 12);
+if ((__c4['🧨'](19, 4), a) || (__c4['🧨'](19, 9), b)) {
+    __c4['🧨'](19, 12);
 }
 
 
-function x1(a, b = (__c4.mark(23, 15), 5)) {
-    __c4.mark(23, 22);
+function x1(a, b = (__c4['🧨'](23, 15), 5)) {
+    __c4['🧨'](23, 22);
 }

package/lib/instrument/plugin-mark/fixture/new-fix.js

@@ -1 +1 @@
-const files = (__c4.mark(1, 14), new Map());
+const files = (__c4['🧨'](1, 14), new Map());

package/lib/instrument/plugin-mark/fixture/no-loc-fix.js

@@ -1,8 +1,8 @@
-__c4.mark(1, 0), cli({
+__c4['🧨'](1, 0), cli({
     stdout,
     stderr,
     exit,
-    cwd: (__c4.mark(5, 9), process.cwd()),
-    argv: (__c4.mark(6, 10), process.argv.slice(2))
+    cwd: (__c4['🧨'](5, 9), process.cwd()),
+    argv: (__c4['🧨'](6, 10), process.argv.slice(2))
 });
 

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

@@ -5,21 +5,20 @@ import {
 } from 'putout';
 import {addMarkToReturn} from './return.js';
 import {addMarkToArrowFunction} from './arrow.js';
+import {addMarkToThrow} from './throw.js';
 
 const {
     NumericLiteral,
     SequenceExpression,
     BlockStatement,
-    ExpressionStatement,
 } = types;
 
 const {
-    replaceWithMultiple,
     replaceWith,
     compareAny,
 } = operator;
 
-const LINE = '__c4.mark(__l, __c)';
+const LINE = `__c4['🧨'](__l, __c)`;
 const buildLineNode = template(LINE, {
     placeholderPattern: /^__[a-z]$/,
 });
@@ -81,11 +80,11 @@ export const fix = (path, {options}) => {
         return;
     }
     
-    if (path.isAssignmentPattern()) {
-        replaceWithMultiple(path.get('right'), [
-            lineNode,
+    if (path.isAssignmentPattern() || path.isAssignmentExpression()) {
+        replaceWith(path.get('right'), SequenceExpression([
+            lineNode.expression,
             node.right,
-        ]);
+        ]));
         return;
     }
     
@@ -100,8 +99,12 @@ 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);
     
     replaceWith(path, BlockStatement([
         node,
@@ -113,6 +116,7 @@ const EXCLUDE = [
     `(${LINE}, __z)`,
     `return (${LINE}, __z)`,
     `return ${LINE}`,
+    `throw (${LINE}, __z)`,
 ];
 
 export const exclude = () => EXCLUDE;
@@ -121,10 +125,11 @@ export const include = () => [
     'CallExpression',
     'NewExpression',
     'ReturnStatement',
+    'ThrowStatement',
 ];
 
 export const traverse = ({push}) => ({
-    AssignmentPattern(path) {
+    'AssignmentPattern|AssignmentExpression'(path) {
         if (compareAny(path.get('right'), EXCLUDE))
             return;
         
@@ -162,7 +167,7 @@ export const traverse = ({push}) => ({
         const consequentPath = path.get('consequent');
         const alternatePath = path.get('alternate');
         
-        if (!consequentPath.isBlockStatement())
+        if (!consequentPath.isBlockStatement() && !compareAny(consequentPath, EXCLUDE))
             push(consequentPath);
         
         if (!alternatePath.node)

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

@@ -0,0 +1,17 @@
+import {
+    types,
+    operator,
+} from 'putout';
+const {SequenceExpression} = types;
+
+const {replaceWith} = operator;
+
+export const addMarkToThrow = (path, lineNode) => {
+    const argumentPath = path.get('argument');
+    
+    return replaceWith(argumentPath, SequenceExpression([
+        lineNode.expression,
+        argumentPath.node,
+    ]));
+};
+

package/lib/merge.js

@@ -0,0 +1,44 @@
+const {entries} = Object;
+
+export const merge = (files) => {
+    const deduplicator = {};
+    
+    for (const {rawName, rawLines} of files) {
+        const name = cutQuery(rawName);
+        const lines = applyCoverage({
+            name,
+            rawLines,
+            deduplicator,
+        });
+        
+        deduplicator[name] = lines;
+    }
+    
+    const list = [];
+    for (const [name, lines] of entries(deduplicator)) {
+        list.push({
+            name,
+            lines,
+        });
+    }
+    
+    return list;
+};
+
+function applyCoverage({rawLines, name, deduplicator}) {
+    if (!deduplicator[name])
+        return rawLines;
+    
+    const newLines = {};
+    
+    for (const [line, value] of entries(rawLines))
+        newLines[line] = deduplicator[name][line] || value;
+    
+    return newLines;
+}
+
+function cutQuery(name) {
+    return name
+        .replace('file://', '')
+        .replace(/\?.*/, '');
+}

package/lib/report.js

@@ -1,25 +1,21 @@
 import chalk from 'chalk';
-import {readFileSync} from 'fs';
-
-const {parse} = JSON;
-
-export const report = () => {
-    const coverageFile = parse(readFileSync('./coverage.json', 'utf8'));
+const {entries} = Object;
 
+export const report = (coverageFile) => {
     const files = [];
     const coverage = {
         files,
         coveredCount: 0,
         uncoveredCount: 0,
     };
-
-    console.log('# TAP version 13');
+    
+    console.log('# CAP version 13');
     console.log('');
-
+    
     for (const {name, lines} of coverageFile) {
         const uncoveredLines = [];
         
-        for (const [line, covered] of Object.entries(lines)) {
+        for (const [line, covered] of entries(lines)) {
             if (covered)
                 continue;
             
@@ -40,30 +36,34 @@ export const report = () => {
         
         files.push(file);
     }
-
+    
     for (const {name, covered, uncoveredLines} of files) {
         if (!covered) {
             console.log(`# ${name}`);
-            console.log('❌ should be covered');
+            console.log('🧨 should be covered');
             console.log('---');
-            console.log(`lines: ${chalk.red(uncoveredLines.join(','))}`);
+            console.log(`lines:`);
+            for (const line of uncoveredLines) {
+                console.log(`️- ${chalk.red(line)} at file://${name}:${line}`);
+            }
+            console.log('');
         }
     }
-
-    if (coverage.uncoveredCount)
-        console.log('');
-
+    
     console.log(`1..${files.length}`);
     console.log(`# files: ${files.length}`);
     console.log(`# covered: ${coverage.coveredCount}`);
-
+    
+    console.log('');
+    
     if (!coverage.uncoveredCount) {
-        console.log('');
-        console.log('# ☘️  ok');
+        console.log('#️ 🌴 ok');
     }
-
+    
     if (coverage.uncoveredCount) {
         console.log(`# 🧨 fail: ${coverage.uncoveredCount}`);
     }
-}
+    
+    console.log('');
+};
 

package/lib/transform.js

@@ -0,0 +1,20 @@
+export const transform = (files) => {
+    const result = [];
+    
+    for (const [rawName, places] of files.entries()) {
+        const rawLines = {};
+        
+        for (const [place, covered] of places.entries()) {
+            const [line] = place.split(':');
+            
+            rawLines[line] = covered;
+        }
+        
+        result.push({
+            rawName,
+            rawLines,
+        });
+    }
+    
+    return result;
+};

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "escover",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Coverage for EcmaScript Modules",
   "main": "lib/escover.js",
   "type": "module",
+  "bin": {
+    "escover": "bin/escover.js"
+  },
   "repository": {
     "type": "git",
     "url": "git://github.com/coderaiser/escover.git"
@@ -15,8 +18,11 @@
     "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",
@@ -30,9 +36,14 @@
   },
   "dependencies": {
     "chalk": "^5.0.0",
+    "find-cache-dir": "^3.3.2",
+    "find-up": "^6.2.0",
+    "foreground-child": "^2.0.0",
     "montag": "^1.2.1",
     "once": "^1.4.0",
-    "putout": "^23.5.0"
+    "putout": "^23.5.0",
+    "try-catch": "^3.0.0",
+    "yargs-parser": "^21.0.0"
   },
   "engines": {
     "node": ">=14"
@@ -41,6 +52,7 @@
   "devDependencies": {
     "@putout/test": "^4.1.0",
     "c8": "^7.8.0",
+    "escover": ".",
     "eslint": "^8.3.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-putout": "^12.2.0",

package/c4.json

@@ -1,15 +0,0 @@
-[{
-    "name": "changelog.js",
-    "lines": {
-        "1": false,
-        "7": false,
-        "9": false
-    }
-}, {
-    "name": "simple.js",
-    "lines": {
-        "1": true,
-        "7": true,
-        "9": true
-    }
-}]

package/coverage.json

@@ -1,8 +0,0 @@
-[
-    {
-        "name": "file:///Users/coderaiser/escover/example/example.js",
-        "lines": {
-            "1": true
-        }
-    }
-]

package/lib/save.js

@@ -1,26 +0,0 @@
-import {writeFileSync} from 'fs';
-import {getFiles} from './c4.js';
-
-const {stringify} = JSON;
-
-export const save = () => {
-    const files = getFiles();
-    const report = [];
-    for (const [name, places] of files.entries()) {
-        const lines = {};
-        const current = {
-            name,
-            lines,
-        };
-        for (const [place, covered] of places.entries()) {
-            const [line] = place.split(':');
-            
-            lines[line] = covered;
-        }
-        
-        report.push(current);
-    }
-    
-    writeFileSync('./coverage.json', stringify(report, null, 4));
-};
-