escover 3.3.2 → 3.5.0

package/ChangeLog

@@ -1,3 +1,20 @@
+2023.07.31, v3.5.0
+
+fix:
+- 2411d57 escover
+- 830082d escover: exit
+
+feature:
+- b6b1301 package: @putout/test v7.0.1
+- e9502cc package: c8 v8.0.1
+- 882431a package: eslint-plugin-putout v18.2.0
+- eb15154 package: putout v30.7.0
+
+2023.06.08, v3.4.0
+
+feature:
+- 2a602d2 escover: expression
+
 2023.06.08, v3.3.2
 
 fix:

package/lib/cli/cli.js

@@ -11,12 +11,8 @@ export const ESCOVER_NODE_OPTIONS = '--no-warnings --loader zenload';
 
 export const cli = ({argv, exit, readCoverage}) => {
     const args = yargsParser(argv.slice(2), {
-        string: [
-            'format',
-        ],
-        boolean: [
-            'version',
-        ],
+        string: ['format'],
+        boolean: ['version'],
         alias: {
             v: 'version',
             f: 'format',

package/lib/cli/version.js

@@ -9,4 +9,3 @@ export const version = () => {
     
     return version;
 };
-

package/lib/config.js

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

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

@@ -38,4 +38,3 @@ export const readCoverage = () => {
     
     return parseLcov(data);
 };
-

package/lib/coverage-file/lcov.js

@@ -51,4 +51,3 @@ export const parseLcov = (lcov) => {
     
     return files;
 };
-

package/lib/escover.js

@@ -8,12 +8,12 @@ import {
     isExclude,
 } from './config.js';
 
-!global.__createC4 && process.once('exit', exit);
+process.once('exit', exit);
 
 global.__createC4 = createFileEntry;
 
+const port = {};
 const CWD = process.cwd();
-
 const {exclude} = readConfig();
 
 const EXCLUDE = [
@@ -38,6 +38,9 @@ export function globalPreload({port}) {
         if (loader !== 'escover')
             return;
         
+        if (type === 'exit')
+            return exit();
+        
         const c4 = createFileEntry(url);
         
         if (type === 'set')
@@ -53,6 +56,13 @@ export function globalPreload({port}) {
 function escover() {
     const loader = 'escover';
     
+    process.on('exit', () => {
+        port.postMessage({
+            type: 'exit',
+            loader: 'escover',
+        });
+    });
+    
     global.__createC4 = (url) => ({
         '🧨': (line, column) => {
             port.postMessage({
@@ -76,10 +86,7 @@ function escover() {
 }
 
 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 {

package/lib/exclude.js

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

package/lib/exit.js

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

package/lib/formatters/files.js

@@ -6,10 +6,7 @@ import chalk from 'chalk';
 
 const CWD = process.cwd();
 
-const {
-    entries,
-    keys,
-} = Object;
+const {entries, keys} = Object;
 
 export default (coverageFile) => {
     const files = parseCoverageFile(coverageFile);

package/lib/instrument/index.js

@@ -25,4 +25,3 @@ export const instrument = (url, source) => {
     
     return code;
 };
-

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

@@ -4,16 +4,14 @@ const {SequenceExpression} = types;
 
 export const addMarkToArgument = (path, lineNode) => {
     const {node} = path;
-    const {expression} = lineNode;
     
     if (!node.argument) {
-        node.argument = expression;
+        node.argument = lineNode;
         return;
     }
     
     node.argument = SequenceExpression([
-        expression,
+        lineNode,
         node.argument,
     ]);
 };
-

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

@@ -4,11 +4,9 @@ const {SequenceExpression} = types;
 
 export const addMarkToArrowFunction = (path, lineNode) => {
     const {node} = path;
-    const {expression} = lineNode;
     
     node.body = SequenceExpression([
-        expression,
+        lineNode,
         node.body,
     ]);
 };
-

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

@@ -78,23 +78,20 @@ export const fix = (path, {options}) => {
     if (path.isCallExpression() || path.isNewExpression()) {
         const {node} = path;
         
-        replaceWith(path, SequenceExpression([
-            lineNode.expression,
-            node,
-        ]));
+        replaceWith(path, SequenceExpression([lineNode, node]));
         
         return;
     }
     
     if (path.parentPath.isLogicalExpression())
         return replaceWith(path, SequenceExpression([
-            lineNode.expression,
+            lineNode,
             path.node,
         ]));
     
     if (path.isAssignmentPattern() || path.isAssignmentExpression()) {
         replaceWith(path.get('right'), SequenceExpression([
-            lineNode.expression,
+            lineNode,
             node.right,
         ]));
         return;
@@ -116,10 +113,7 @@ export const fix = (path, {options}) => {
     if (path.isExpression()) {
         const {node} = path;
         
-        replaceWith(path, SequenceExpression([
-            lineNode.expression,
-            node,
-        ]));
+        replaceWith(path, SequenceExpression([lineNode, node]));
         
         return;
     }
@@ -237,4 +231,3 @@ export const traverse = ({push}) => ({
         }
     },
 });
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "escover",
-  "version": "3.3.2",
+  "version": "3.5.0",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Coverage for EcmaScript Modules",
   "main": "lib/escover.js",
@@ -40,7 +40,6 @@
   },
   "dependencies": {
     "@putout/plugin-convert-optional-to-logical": "^1.0.0",
-    "@putout/printer": "^1.80.3",
     "chalk": "^5.0.0",
     "find-cache-dir": "^4.0.0",
     "find-up": "^6.2.0",
@@ -48,7 +47,7 @@
     "montag": "^1.2.1",
     "once": "^1.4.0",
     "picomatch": "^2.3.1",
-    "putout": "^29.0.0",
+    "putout": "^30.7.0",
     "strip-ansi": "^7.0.1",
     "table": "^6.8.0",
     "try-catch": "^3.0.0",
@@ -60,12 +59,12 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@putout/test": "^6.4.0",
-    "c8": "^7.8.0",
+    "@putout/test": "^7.0.1",
+    "c8": "^8.0.1",
     "escover": "^3.2.0",
     "eslint": "^8.3.0",
     "eslint-plugin-n": "^16.0.0",
-    "eslint-plugin-putout": "^17.5.1",
+    "eslint-plugin-putout": "^18.2.0",
     "madrun": "^9.0.0",
     "supertape": "^8.0.1"
   }