escover 1.14.0 → 1.17.1

package/ChangeLog

@@ -1,3 +1,27 @@
+2022.01.27, v1.17.1
+
+fix:
+- escover: transform: mergeLines: & -> &&
+
+
+2022.01.27, v1.17.0
+
+feature:
+- escover: improve ternary support: Identifier
+
+
+2022.01.27, v1.16.0
+
+feature:
+- escover: add support of ternary
+
+
+2022.01.26, v1.15.0
+
+fix:
+- escover: logical: find up
+
+
 2022.01.21, v1.14.0
 
 feature:

package/lib/formatters/lines.js

@@ -1,7 +1,8 @@
 import chalk from 'chalk';
-const {entries} = Object;
 
+const {entries} = Object;
 const createOut = (output) => (a) => output.push(a);
+
 export default (coverageFile) => {
     const output = [];
     const out = createOut(output);

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

@@ -53,7 +53,7 @@ export const fix = (path, {options}) => {
         return;
     }
     
-    if (path.isCallExpression() || path.isNewExpression()) {
+    if (path.isIdentifier()) {
         const {node} = path;
         
         replaceWith(path, SequenceExpression([
@@ -63,18 +63,22 @@ export const fix = (path, {options}) => {
         return;
     }
     
-    if (path.isLogicalExpression()) {
-        replaceWith(path.get('left'), SequenceExpression([
+    if (path.isCallExpression() || path.isNewExpression()) {
+        const {node} = path;
+        
+        replaceWith(path, SequenceExpression([
             lineNode.expression,
-            path.node.left,
-        ]));
-        replaceWith(path.get('right'), SequenceExpression([
-            getLineNode(c4, path.node.right.loc.start).expression,
-            path.node.right,
+            node,
         ]));
         return;
     }
     
+    if (path.parentPath.isLogicalExpression())
+        return replaceWith(path, SequenceExpression([
+            lineNode.expression,
+            path.node,
+        ]));
+    
     if (path.isAssignmentPattern() || path.isAssignmentExpression()) {
         replaceWith(path.get('right'), SequenceExpression([
             lineNode.expression,
@@ -110,10 +114,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 +160,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)
@@ -165,8 +176,9 @@ export const traverse = ({push}) => ({
         push(path);
     },
     SequenceExpression(path) {
-        if (compare(path, `(${LINE}, __z)`))
+        if (compare(path, `(${LINE}, __z)`)) {
             return;
+        }
         
         const expressions = path.get('expressions');
         
@@ -177,7 +189,7 @@ export const traverse = ({push}) => ({
             push(expPath);
         }
     },
-    IfStatement(path) {
+    'IfStatement|ConditionalExpression'(path) {
         const consequentPath = path.get('consequent');
         const alternatePath = path.get('alternate');
         
@@ -187,7 +199,7 @@ export const traverse = ({push}) => ({
         if (!alternatePath.node)
             return;
         
-        if (!alternatePath.isBlockStatement())
+        if (!alternatePath.isBlockStatement() && !isExclude(alternatePath))
             push(alternatePath);
     },
 });

package/lib/transform.js

@@ -25,7 +25,7 @@ function mergeLines(places) {
         const [line] = place.split(':');
         
         if (isBool(result[line])) {
-            result[line] &= covered;
+            result[line] = result[line] && covered;
             continue;
         }
         

package/package.json

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