escover 4.0.0 → 4.1.0

package/ChangeLog

@@ -1,3 +1,18 @@
+2024.01.29, v4.1.0
+
+feature:
+- 51103b4 escover: find-up v7.0.0
+- 427406f escover: c8 v9.1.0
+- 0d53d2f escover: @putout/test v8.4.0
+- e6fde48 escover: eslint-plugin-putout v22.3.1
+- 4e58f46 escover: putout v35.0.1
+- f57fb20 escover: supertape v10.0.0
+
+2023.12.10, v4.0.1
+
+feature:
+- 98fd927 escover: mock-import v4.0.0
+
 2023.12.10, v4.0.0
 
 feature:

package/README.md

@@ -90,7 +90,7 @@ 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.
+[`mock-import`](https://github.com/coderaiser/mock-import) is used by default in 🎩`ESCover`.
 
 Install it with:
 

package/lib/c4.js

@@ -7,12 +7,11 @@ export const createFileEntry = (url) => {
     url = url.replace(/\?.*$/, '');
     let lines = __fileEntries.get(url);
     
-    if (lines) {
+    if (lines)
         return {
             '🧨': set(lines),
             'init': noop,
         };
-    }
     
     lines = new Map();
     

package/lib/cli/cli.js

@@ -32,9 +32,8 @@ export const cli = ({argv, exit, readCoverage}) => {
     
     const cmd = argv.slice(2);
     
-    if (cmd.length) {
+    if (cmd.length)
         execute(`"${cmd.join('" "')}"`, noop);
-    }
     
     const coverage = readCoverage();
     
@@ -50,25 +49,17 @@ export const cli = ({argv, exit, readCoverage}) => {
 
 export const isSuccess = (error) => !error || error?.status === Number(process.env.ESCOVER_SUCCESS_EXIT_CODE);
 
-export function createZenload() {
-    return {
-        ZENLOAD: 'escover,mock-import',
-    }
-}
-
 function execute(cmd, exit) {
     const [error] = tryCatch(execSync, cmd, {
         stdio: [0, 1, 2],
         env: {
-            ...createZenload,
             ...process.env,
             NODE_OPTIONS: ESCOVER_NODE_OPTIONS,
         },
     });
     
-    if (isSuccess(error)) {
+    if (isSuccess(error))
         return exit(0);
-    }
     
     if (error) {
         console.error(error.message);

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

@@ -2,8 +2,10 @@ import {
     writeFileSync,
     readFileSync,
 } from 'node:fs';
-import tryCatch from 'try-catch';
 import {join} from 'node:path';
+
+import tryCatch from 'try-catch';
+
 import {getFileEntries} from '../c4.js';
 import {transform} from '../transform.js';
 import {merge} from '../merge.js';

package/lib/coverage-file/find-cache-dir.js

@@ -11,4 +11,3 @@ export function findCacheDir() {
     
     return name;
 }
-

package/lib/escover.js

@@ -10,7 +10,6 @@ import {writeCoverage} from './coverage-file/coverage-file.js';
 
 global.__createC4 = createFileEntry;
 
-const port = {};
 const CWD = process.cwd();
 const {exclude} = readConfig();
 
@@ -85,4 +84,3 @@ export async function load(url, context, defaultLoad) {
         shortCircuit: true,
     };
 }
-

package/lib/formatters/files.js

@@ -111,4 +111,3 @@ export function getLinesPercent(linesCount, uncoveredLinesCount) {
     
     return 100 - Math.round(100 / linesCount * uncoveredLinesCount);
 }
-

package/lib/fresh.js

@@ -10,6 +10,7 @@ import {MessageChannel} from 'node:worker_threads';
 // between the main (application) thread and the hooks running on the hooks
 // thread, by sending `port2` to the `initialize` hook.
 const __filename = fileURLToPath(import.meta.url);
+
 // This example showcases how a message channel can be used to communicate
 // between the main (application) thread and the hooks running on the hooks
 // thread, by sending `port2` to the `initialize` hook.
@@ -27,4 +28,3 @@ register('./escover.js', {
     },
     transferList: [port2],
 });
-

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

@@ -44,14 +44,13 @@ const findLoc = (path) => {
     const current = path.find(isLoc);
     const {loc} = current.node;
     
-    if (current.__escover_loc_column) {
+    if (current.__escover_loc_column)
         return {
             start: {
                 ...loc.start,
                 column: ++current.__escover_loc_column,
             },
         };
-    }
     
     current.__escover_loc_column = 1;
     
@@ -103,12 +102,11 @@ export const fix = (path, {options}) => {
     if (path.isReturnStatement() || path.isThrowStatement())
         return addMarkToArgument(path, lineNode);
     
-    if (path.isContinueStatement() || path.isBreakStatement()) {
+    if (path.isContinueStatement() || path.isBreakStatement())
         return replaceWithMultiple(path, [
             lineNode,
             path.node,
         ]);
-    }
     
     if (path.isExpression()) {
         const {node} = path;
@@ -193,9 +191,8 @@ export const traverse = ({push}) => ({
         push(path);
     },
     SequenceExpression(path) {
-        if (compare(path, `(${LINE}, __z)`)) {
+        if (compare(path, `(${LINE}, __z)`))
             return;
-        }
         
         const expressions = path.get('expressions');
         
@@ -207,9 +204,8 @@ export const traverse = ({push}) => ({
         }
     },
     UpdateExpression(path) {
-        if (compare(path, `(${LINE}, __z)`)) {
+        if (compare(path, `(${LINE}, __z)`))
             return;
-        }
         
         push(path);
     },
@@ -226,8 +222,7 @@ export const traverse = ({push}) => ({
         if (alternatePath.isIfStatement())
             return;
         
-        if (!alternatePath.isBlockStatement() && !isExclude(alternatePath)) {
+        if (!alternatePath.isBlockStatement() && !isExclude(alternatePath))
             push(alternatePath);
-        }
     },
 });

package/lib/register.js

@@ -1,16 +1,17 @@
-import {pathToFileURL} from 'node:url';
-import { register } from 'node:module';
-import { MessageChannel } from 'node:worker_threads';
+import {register} from 'node:module';
+import {MessageChannel} from 'node:worker_threads';
 
-const { port1, port2 } = new MessageChannel();
+const {port1, port2} = new MessageChannel();
 
 initialize({
-    port: port1
+    port: port1,
 });
 
 register('./escover.js', import.meta.url, {
-     parentURL: import.meta.url,
-    data: { port: port2 },
+    parentURL: import.meta.url,
+    data: {
+        port: port2,
+    },
     transferList: [port2],
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "escover",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Coverage for EcmaScript Modules",
   "main": "lib/escover.js",
@@ -44,30 +44,29 @@
     "@putout/plugin-convert-optional-to-logical": "^3.1.0",
     "chalk": "^5.0.0",
     "find-cache-dir": "^5.0.0",
-    "find-up": "^6.2.0",
-    "mock-import": "^3.0.1",
+    "find-up": "^7.0.0",
+    "mock-import": "^4.0.0",
     "montag": "^1.2.1",
     "once": "^1.4.0",
     "picomatch": "^2.3.1",
-    "putout": "^34.0.0",
+    "putout": "^35.0.1",
     "strip-ansi": "^7.0.1",
     "table": "^6.8.0",
     "try-catch": "^3.0.0",
-    "yargs-parser": "^21.0.0",
-    "zenload": "^2.0.0"
+    "yargs-parser": "^21.0.0"
   },
   "engines": {
     "node": ">=18"
   },
   "license": "MIT",
   "devDependencies": {
-    "@putout/test": "^7.0.1",
-    "c8": "^8.0.1",
-    "escover": "^3.2.0",
+    "@putout/test": "^8.4.0",
+    "c8": "^9.1.0",
+    "escover": "file:.",
     "eslint": "^8.3.0",
     "eslint-plugin-n": "^16.0.0",
-    "eslint-plugin-putout": "^21.0.2",
+    "eslint-plugin-putout": "^22.3.1",
     "madrun": "^10.0.0",
-    "supertape": "^8.0.1"
+    "supertape": "^10.0.0"
   }
 }