escover 3.1.0 → 3.1.2

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.05.05, v3.1.2
+
+feature:
+- 520372c escover: improve support of OptionalChaining
+
+2023.05.05, v3.1.1
+
+fix:
+- a75bc7a escover: buffer passed to loader
+
 2023.05.04, v3.1.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,13 +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', {
@@ -18,12 +17,8 @@ export const instrument = (url, source) => {
             ['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

@@ -40,7 +40,23 @@ export const report = () => 'Mark line';
 
 const isLoc = (path) => path.node.loc;
 
-const findLoc = (path) => path.find(isLoc).node.loc;
+const findLoc = (path) => {
+    const current = path.find(isLoc);
+    const {loc} = current.node;
+    
+    if (current.__escover_loc_column) {
+        return {
+            start: {
+                ...loc.start,
+                column: ++current.__escover_loc_column,
+            },
+        };
+    }
+    
+    current.__escover_loc_column = 1;
+    
+    return loc;
+};
 
 export const fix = (path, {options}) => {
     const {node} = path;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "escover",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Coverage for EcmaScript Modules",
   "main": "lib/escover.js",