escover 3.0.0 → 3.1.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.05.05, v3.1.1
+
+fix:
+- a75bc7a escover: buffer passed to loader
+
+2023.05.04, v3.1.0
+
+feature:
+- d7f612c escover: add support of OptionalChainig
+
 2023.05.03, v3.0.0
 
 feature:

package/lib/escover.js

@@ -54,7 +54,7 @@ export async function load(url, context, defaultLoad) {
     
     const source = `
         const __c4 = global.__createC4('${url}');
-        ${instrument(url, rawSource)}
+        ${instrument(url, String(rawSource))}
     `;
     
     return {

package/lib/instrument/index.js

@@ -1,12 +1,12 @@
-import {transform} from 'putout';
-import {parse} from '@babel/parser';
-import {print} from '@putout/printer';
+import putout from 'putout';
 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);
     
-    const options = {
+    const {code} = putout(source, {
+        printer: 'putout',
         fixCount: 1,
         rules: {
             mark: ['on', {
@@ -15,13 +15,10 @@ export const instrument = (url, source) => {
         },
         plugins: [
             ['mark', mark],
+            ['convert-optional-to-logical', convertOptionalToLogical],
         ],
-    };
+    });
     
-    const ast = parse(source);
-    
-    transform(ast, source, options);
-    
-    return print(ast);
+    return code;
 };
 

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

@@ -28,7 +28,6 @@ const buildLineNode = template(LINE, {
 });
 
 function getLineNode(c4, {line, column}) {
-    debugger;
     c4.init(line, column);
     
     return buildLineNode({
@@ -39,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;
+    const {start} = findLoc(path);
     
     const {
         c4 = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "escover",
-  "version": "3.0.0",
+  "version": "3.1.1",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Coverage for EcmaScript Modules",
   "main": "lib/escover.js",
@@ -40,6 +40,8 @@
   },
   "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",