escover 1.0.5 → 1.1.0

package/ChangeLog

@@ -1,3 +1,9 @@
+2022.01.11, v1.1.0
+
+feature:
+- (escover) add bin
+
+
 2022.01.08, v1.0.5
 
 feature:

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/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/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/index.js

@@ -99,8 +99,9 @@ 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);

package/lib/report.js

@@ -1,12 +1,7 @@
 import chalk from 'chalk';
-import {readFileSync} from 'fs';
-
-const {parse} = JSON;
 const {entries} = Object;
 
-export const report = () => {
-    const coverageFile = parse(readFileSync('./coverage.json', 'utf8'));
-    
+export const report = (coverageFile) => {
     const files = [];
     const coverage = {
         files,
@@ -62,7 +57,7 @@ export const report = () => {
     console.log('');
     
     if (!coverage.uncoveredCount) {
-        console.log('# ☘️  ok');
+        console.log('#️ 🌴 ok');
     }
     
     if (coverage.uncoveredCount) {

package/lib/{parse.js → transform.js}

@@ -1,4 +1,4 @@
-export const parse = (files) => {
+export const transform = (files) => {
     const result = [];
     
     for (const [rawName, places] of files.entries()) {

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "escover",
-  "version": "1.0.5",
+  "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"
@@ -19,6 +22,7 @@
     "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",
@@ -32,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"
@@ -43,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/lib/save.js

@@ -1,14 +0,0 @@
-import {writeFileSync} from 'fs';
-import {getFiles} from './c4.js';
-import {parse} from './parse.js';
-import {merge} from './merge.js';
-
-const {stringify} = JSON;
-
-export const save = () => {
-    const files = getFiles();
-    const parsed = parse(files);
-    const merged = merge(parsed);
-    
-    writeFileSync('./coverage.json', stringify(merged, null, 4));
-};