escover 1.5.0 → 1.7.0

package/ChangeLog

@@ -1,3 +1,27 @@
+2022.01.17, v1.7.0
+
+feature:
+- escover: add ability to read config
+
+
+2022.01.17, v1.6.0
+
+feature:
+- escover: add sorting
+
+
+2022.01.17, v1.5.2
+
+fix:
+- escover: add ability to override ZENLOAD && NODE_OPTIONS
+
+
+2022.01.17, v1.5.1
+
+feature:
+- escover: add lines %
+
+
 2022.01.17, v1.5.0
 
 feature:

package/README.md

@@ -45,6 +45,10 @@ Run to collect and show coverage:
 escover npm test
 ```
 
+## Config
+
+`exclude` section of configuration file `.nyrc.json` supported. 
+
 ## How it looks like?
 
 When everything is covered:

package/lib/cli/cli.js

@@ -6,6 +6,8 @@ import {version} from './version.js';
 import reportLines from '../formatters/lines.js';
 import reportFiles from '../formatters/files.js';
 
+const {ESCOVER_FORMAT, NODE_OPTIONS = ''} = process.env;
+
 export const cli = ({argv, exit, read}) => {
     const args = yargsParser(argv.slice(2), {
         string: [
@@ -19,7 +21,7 @@ export const cli = ({argv, exit, read}) => {
             f: 'format',
         },
         default: {
-            format: 'files',
+            format: ESCOVER_FORMAT || 'files',
         },
     });
     
@@ -46,9 +48,9 @@ function execute(cmd, exit) {
     const [error] = tryCatch(execSync, cmd, {
         stdio: [0, 1, 2],
         env: {
-            ...process.env,
-            NODE_OPTIONS: '--no-warnings --loader zenload',
             ZENLOAD: 'escover,mock-import',
+            ...process.env,
+            NODE_OPTIONS: `--no-warnings --loader zenload ${NODE_OPTIONS} `,
         },
     });
     

package/lib/config.js

@@ -0,0 +1,31 @@
+import {readFileSync} from 'fs';
+import once from 'once';
+import picomatch from 'picomatch';
+import {findUpSync} from 'find-up';
+
+const {parse} = JSON;
+
+export const isExclude = (name, patterns) => {
+    const isMatch = picomatch(patterns, {
+        dot: true,
+    });
+    
+    return isMatch(name);
+};
+
+const defaults = {
+    exclude: [],
+};
+
+export const readConfig = once(() => {
+    const name = findUpSync('.nycrc.json');
+    
+    if (!name)
+        return defaults;
+    
+    const data = readFileSync(name, 'utf8');
+    return {
+        ...defaults,
+        ...parse(data),
+    };
+});

package/lib/escover.js

@@ -2,21 +2,27 @@ import montag from 'montag';
 import process from 'process';
 
 import {instrument} from './instrument/index.js';
-import {exclude} from './exclude.js';
 import {exit} from './exit.js';
 import {createFileEntry} from './c4.js';
+import {
+    readConfig,
+    isExclude,
+} from './config.js';
 
 global.__createC4 = createFileEntry;
 
 process.once('exit', exit);
 const CWD = process.cwd();
 
+const {exclude} = readConfig();
+
 const EXCLUDE = [
-    '.spec.',
-    'node_modules',
-    '/fixture/',
-    '.madrun.',
-    '/test/',
+    '**/*.spec.*',
+    '**/node_modules/**',
+    '**/fixture/**',
+    '**/.madrun.*',
+    '**/test/**',
+    ...exclude,
 ];
 
 export async function load(url, context, defaultLoad) {
@@ -33,7 +39,7 @@ export async function load(url, context, defaultLoad) {
             source: rawSource,
         };
     
-    if (exclude(url, EXCLUDE))
+    if (isExclude(url, EXCLUDE))
         return {
             format,
             source: rawSource,

package/lib/formatters/files.js

@@ -6,26 +6,30 @@ import {
 import chalk from 'chalk';
 
 const CWD = process.cwd();
-const {entries} = Object;
+const {
+    entries,
+    keys,
+} = Object;
 
 export default (coverageFile) => {
     const files = parseCoverageFile(coverageFile);
+    
     const tableData = [
-        ['File', 'Uncovered Lines'],
+        ['File', '% Lines', 'Uncovered Lines #s'],
     ];
     
-    for (const {filename, covered, lines} of files) {
+    for (const {filename, covered, lines, percentLines} of files) {
         const uncoveredLines = lines.join(', ');
         
         if (covered) {
-            tableData.push([chalk.green(filename), '']);
+            tableData.push([chalk.green(filename), chalk.green(percentLines), '']);
             continue;
         }
         
-        tableData.push([chalk.red(filename), chalk.red(uncoveredLines)]);
+        tableData.push([chalk.red(filename), chalk.red(percentLines), chalk.red(uncoveredLines)]);
     }
     
-    console.log(table(tableData, {
+    process.stdout.write(table(tableData, {
         drawHorizontalLine: (raw) => {
             return !raw || raw === 1 || raw === files.length + 1;
         },
@@ -64,13 +68,23 @@ function parseCoverageFile(coverageFile) {
         const filename = name.replace(CWD + '/', '');
         const uncoveredLines = parseUncoveredLines(lines);
         
+        const linesCount = keys(lines).length;
+        const percentLines = getPercentLines(linesCount, uncoveredLines);
+        
         files.push({
             filename,
             covered: !uncoveredLines.length,
-            lines: parseUncoveredLines(lines),
+            lines: uncoveredLines,
+            percentLines,
         });
     }
     
     return files;
 }
 
+function getPercentLines(linesCount, uncoveredLines) {
+    if (!linesCount)
+        return 100;
+    
+    return 100 - Math.round(100 / linesCount * uncoveredLines.length);
+}

package/lib/transform.js

@@ -1,7 +1,10 @@
+const sort = (a) => new Map(Array.from(a.entries()).sort());
+
 export const transform = (files) => {
     const result = [];
+    const sorted = sort(files);
     
-    for (const [rawName, places] of files.entries()) {
+    for (const [rawName, places] of sorted.entries()) {
         const rawLines = {};
         
         for (const [place, covered] of places.entries()) {
@@ -18,3 +21,4 @@ export const transform = (files) => {
     
     return result;
 };
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "escover",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Coverage for EcmaScript Modules",
   "main": "lib/escover.js",
@@ -42,6 +42,7 @@
     "mock-import": "^2.11.1",
     "montag": "^1.2.1",
     "once": "^1.4.0",
+    "picomatch": "^2.3.1",
     "putout": "^24.0.2",
     "table": "^6.8.0",
     "try-catch": "^3.0.0",