escover 1.14.0 → 1.15.0

package/ChangeLog

@@ -1,3 +1,9 @@
+2022.01.26, v1.15.0
+
+fix:
+- escover: logical: find up
+
+
 2022.01.21, v1.14.0
 
 feature:

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

@@ -63,6 +63,12 @@ export const fix = (path, {options}) => {
         return;
     }
     
+    if (path.parentPath.isLogicalExpression())
+        return replaceWith(path, SequenceExpression([
+            lineNode.expression,
+            path.node,
+        ]));
+    /*
     if (path.isLogicalExpression()) {
         replaceWith(path.get('left'), SequenceExpression([
             lineNode.expression,
@@ -74,6 +80,7 @@ export const fix = (path, {options}) => {
         ]));
         return;
     }
+     */
     
     if (path.isAssignmentPattern() || path.isAssignmentExpression()) {
         replaceWith(path.get('right'), SequenceExpression([
@@ -110,10 +117,13 @@ const EXCLUDE = [
 
 const SEQUENCE = `(${LINE}, __z)`;
 const isExclude = (node) => {
-    return compareAny(node, [
+    const templates = [
         ...EXCLUDE,
         SEQUENCE,
-    ]);
+    ];
+    return compareAny(node, templates, {
+        findUp: false,
+    });
 };
 
 export const exclude = () => EXCLUDE;
@@ -153,10 +163,14 @@ export const traverse = ({push}) => ({
         push(path);
     },
     LogicalExpression(path) {
-        if (isExclude(path.get('left')))
-            return;
+        const leftPath = path.get('left');
+        const rightPath = path.get('right');
         
-        push(path);
+        if (!isExclude(leftPath))
+            push(leftPath);
+        
+        if (!isExclude(rightPath))
+            push(rightPath);
     },
     BlockStatement(path) {
         if (path.node.body.length)

package/package.json

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