escover 2.5.3 → 3.1.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.05.04, v3.1.0
+
+feature:
+- d7f612c escover: add support of OptionalChainig
+
+2023.05.03, v3.0.0
+
+feature:
+- 49fca58 escover: use @putout/printer
+- 1dfbea6 escover: use @putout/printer
+
 2023.05.02, v2.5.3
 
 feature:

package/lib/cli/cli.js

@@ -35,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/instrument/index.js

@@ -1,9 +1,8 @@
-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';
+import convertOptionalToLogical from '@putout/plugin-convert-optional-to-logical';
 
 export const instrument = (url, source) => {
     const c4 = global.__createC4(url);
@@ -17,14 +16,14 @@ export const instrument = (url, source) => {
         },
         plugins: [
             ['mark', mark],
+            ['convert-optional-to-logical', convertOptionalToLogical],
         ],
     };
     
     const ast = parse(source);
     
     transform(ast, source, options);
-    const {code} = generate(ast);
     
-    return code;
+    return print(ast);
 };
 

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

@@ -38,9 +38,13 @@ function getLineNode(c4, {line, column}) {
 
 export const report = () => 'Mark line';
 
+const isLoc = (path) => path.node.loc;
+
+const findLoc = (path) => path.find(isLoc).node.loc;
+
 export const fix = (path, {options}) => {
     const {node} = path;
-    const {start} = path.node.loc || path.parentPath.node.loc;
+    const {start} = findLoc(path);
     
     const {
         c4 = {

package/lib/transform.js

@@ -2,6 +2,7 @@ const sort = (a) => {
     const sorted = Array
         .from(a.entries())
         .sort();
+    
     return new Map(sorted);
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "escover",
-  "version": "2.5.3",
+  "version": "3.1.0",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Coverage for EcmaScript Modules",
   "main": "lib/escover.js",
@@ -39,6 +39,10 @@
     "prewisdom": "madrun prewisdom"
   },
   "dependencies": {
+    "@babel/parser": "^7.21.8",
+    "@babel/plugin-proposal-optional-chaining": "^7.21.0",
+    "@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",