escover 2.5.2 → 3.0.0

package/ChangeLog

@@ -1,3 +1,16 @@
+2023.05.03, v3.0.0
+
+feature:
+- 49fca58 escover: use @putout/printer
+- 1dfbea6 escover: use @putout/printer
+
+2023.05.02, v2.5.3
+
+feature:
+- c3b81da package: find-cache-dir v4.0.0
+- 0f5fa40 package: @putout/test v6.4.0
+- 0625eff package: eslint-plugin-putout v17.5.1
+
 2023.03.06, v2.5.2
 
 feature:

package/bin/escover.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-
 import {cli} from '../lib/cli/cli.js';
 import {readCoverage} from '../lib/coverage-file/coverage-file.js';
 import {readConfig} from '../lib/config.js';
@@ -10,4 +9,3 @@ cli({
     readCoverage,
     readConfig,
 });
-

package/lib/c4.js

@@ -33,4 +33,3 @@ const init = (lines) => (line, column) => {
 };
 
 export const getFileEntries = () => __fileEntries;
-

package/lib/cli/cli.js

@@ -1,12 +1,14 @@
 import {execSync} from 'child_process';
 import tryCatch from 'try-catch';
 import yargsParser from 'yargs-parser';
-
 import {version} from './version.js';
 import reportLines from '../formatters/lines.js';
 import reportFiles from '../formatters/files.js';
 
-const {ESCOVER_FORMAT, NODE_OPTIONS = ''} = process.env;
+const {
+    ESCOVER_FORMAT,
+    NODE_OPTIONS = '',
+} = process.env;
 
 export const cli = ({argv, exit, readCoverage}) => {
     const args = yargsParser(argv.slice(2), {
@@ -33,7 +35,7 @@ export const cli = ({argv, exit, readCoverage}) => {
     const cmd = argv.slice(2);
     
     if (cmd.length) {
-        execute('"' + cmd.join(`" "`) + '"', exit);
+        execute(`"${cmd.join('" "')}"`, exit);
     }
     
     const coverage = readCoverage();

package/lib/cli/version.js

@@ -1,4 +1,5 @@
 import {readFileSync} from 'fs';
+
 const {parse} = JSON;
 
 const packageJson = new URL('../../package.json', import.meta.url);

package/lib/config.js

@@ -42,3 +42,4 @@ export const readConfig = () => {
         ...parse(data),
     };
 };
+

package/lib/coverage-file/lcov.js

@@ -5,6 +5,7 @@ export const generateLcov = (files) => {
     
     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}`);
@@ -34,6 +35,7 @@ export const parseLcov = (lcov) => {
         
         if (cmd === 'DA') {
             const [line, covered] = arg.split(',');
+            
             lines[line] = Boolean(Number(covered));
             continue;
         }

package/lib/escover.js

@@ -1,5 +1,4 @@
 import process from 'process';
-
 import {instrument} from './instrument/index.js';
 import {exit} from './exit.js';
 import {createFileEntry} from './c4.js';
@@ -25,7 +24,10 @@ const EXCLUDE = [
 ];
 
 export async function load(url, context, defaultLoad) {
-    const {format, source: rawSource} = await defaultLoad(url, context, defaultLoad);
+    const {
+        format,
+        source: rawSource,
+    } = await defaultLoad(url, context, defaultLoad);
     
     if (/commonjs|builtin/.test(format))
         return {
@@ -60,3 +62,4 @@ export async function load(url, context, defaultLoad) {
         source,
     };
 }
+

package/lib/exclude.js

@@ -6,3 +6,4 @@ export const exclude = (url, names) => {
     
     return false;
 };
+

package/lib/exit.js

@@ -4,3 +4,4 @@ import {writeCoverage} from './coverage-file/coverage-file.js';
 export const exit = once(() => {
     writeCoverage();
 });
+

package/lib/formatters/files.js

@@ -2,10 +2,10 @@ import {
     table,
     getBorderCharacters,
 } from 'table';
-
 import chalk from 'chalk';
 
 const CWD = process.cwd();
+
 const {
     entries,
     keys,
@@ -22,11 +22,19 @@ export default (coverageFile) => {
         const uncoveredLines = formatLines(lines);
         
         if (covered) {
-            tableData.push([chalk.green(filename), chalk.green(percentLines), '']);
+            tableData.push([
+                chalk.green(filename),
+                chalk.green(percentLines),
+                '',
+            ]);
             continue;
         }
         
-        tableData.push([chalk.red(filename), chalk.red(percentLines), chalk.red(uncoveredLines)]);
+        tableData.push([
+            chalk.red(filename),
+            chalk.red(percentLines),
+            chalk.red(uncoveredLines),
+        ]);
     }
     
     return table(tableData, {
@@ -52,7 +60,9 @@ export default (coverageFile) => {
 };
 
 export function formatLines(array) {
-    const lines = array.slice(0, 10).join(', ');
+    const lines = array
+        .slice(0, 10)
+        .join(', ');
     
     if (array.length <= 10)
         return lines;
@@ -103,3 +113,4 @@ export function getLinesPercent(linesCount, uncoveredLinesCount) {
     
     return 100 - Math.round(100 / linesCount * uncoveredLinesCount);
 }
+

package/lib/formatters/lines.js

@@ -7,6 +7,7 @@ export default (coverageFile) => {
     const output = [];
     const out = createOut(output);
     const files = [];
+    
     const coverage = {
         files,
         coveredCount: 0,
@@ -47,6 +48,7 @@ export default (coverageFile) => {
             out('🧨 should be covered');
             out('---');
             out(`lines:`);
+            
             for (const line of uncoveredLines) {
                 out(`️- ${chalk.red(line)} at file://${name}:${line}`);
             }

package/lib/instrument/index.js

@@ -1,12 +1,11 @@
-import {
-    parse,
-    generate,
-    transform,
-} from 'putout';
+import {transform} from 'putout';
+import {parse} from '@babel/parser';
+import {print} from '@putout/printer';
 import * as mark from './plugin-mark/index.js';
 
 export const instrument = (url, source) => {
     const c4 = global.__createC4(url);
+    
     const options = {
         fixCount: 1,
         rules: {
@@ -22,8 +21,7 @@ export const instrument = (url, source) => {
     const ast = parse(source);
     
     transform(ast, source, options);
-    const {code} = generate(ast);
     
-    return code;
+    return print(ast);
 };
 

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

@@ -1,4 +1,5 @@
 import {types} from 'putout';
+
 const {SequenceExpression} = types;
 
 export const addMarkToArgument = (path, lineNode) => {
@@ -15,3 +16,4 @@ export const addMarkToArgument = (path, lineNode) => {
         node.argument,
     ]);
 };
+

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

@@ -3,7 +3,6 @@ import {
     types,
     operator,
 } from 'putout';
-
 import {addMarkToArgument} from './argument.js';
 import {addMarkToArrowFunction} from './arrow.js';
 
@@ -23,11 +22,13 @@ const {
 } = operator;
 
 const LINE = `__c4['🧨'](__l, __c)`;
+
 const buildLineNode = template(LINE, {
     placeholderPattern: /^__[a-z]$/,
 });
 
 function getLineNode(c4, {line, column}) {
+    debugger;
     c4.init(line, column);
     
     return buildLineNode({
@@ -40,7 +41,7 @@ export const report = () => 'Mark line';
 
 export const fix = (path, {options}) => {
     const {node} = path;
-    const {start} = path.node.loc || path.parentPath.node.loc;
+    const {start} = path.node.loc;
     
     const {
         c4 = {
@@ -104,9 +105,7 @@ export const fix = (path, {options}) => {
         return;
     }
     
-    replaceWith(path, BlockStatement([
-        node,
-    ]));
+    replaceWith(path, BlockStatement([node]));
 };
 
 const EXCLUDE = [
@@ -117,11 +116,13 @@ const EXCLUDE = [
 ];
 
 const SEQUENCE = `(${LINE}, __z)`;
+
 const isExclude = (node) => {
     const templates = [
         ...EXCLUDE,
         SEQUENCE,
     ];
+    
     return compareAny(node, templates, {
         findUp: false,
     });

package/lib/transform.js

@@ -1,4 +1,10 @@
-const sort = (a) => new Map(Array.from(a.entries()).sort());
+const sort = (a) => {
+    const sorted = Array
+        .from(a.entries())
+        .sort();
+    
+    return new Map(sorted);
+};
 
 const isBool = (a) => typeof a === 'boolean';
 
@@ -34,4 +40,3 @@ function mergeLines(places) {
     
     return result;
 }
-

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "escover",
-  "version": "2.5.2",
+  "version": "3.0.0",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Coverage for EcmaScript Modules",
   "main": "lib/escover.js",
   "type": "module",
-  "commitType": "colon",
   "bin": {
     "escover": "bin/escover.js"
   },
@@ -40,8 +39,10 @@
     "prewisdom": "madrun prewisdom"
   },
   "dependencies": {
+    "@babel/parser": "^7.21.8",
+    "@putout/printer": "^1.80.3",
     "chalk": "^5.0.0",
-    "find-cache-dir": "^3.3.2",
+    "find-cache-dir": "^4.0.0",
     "find-up": "^6.2.0",
     "mock-import": "^3.0.1",
     "montag": "^1.2.1",
@@ -59,12 +60,12 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@putout/test": "^5.0.0",
+    "@putout/test": "^6.4.0",
     "c8": "^7.8.0",
     "escover": "^2.0.1",
     "eslint": "^8.3.0",
     "eslint-plugin-n": "^15.2.4",
-    "eslint-plugin-putout": "^16.0.0",
+    "eslint-plugin-putout": "^17.5.1",
     "madrun": "^9.0.0",
     "supertape": "^8.0.1"
   }