monocart-coverage-reports 2.10.2 → 2.10.3

package/lib/converter/ast-visitor.js

@@ -146,7 +146,9 @@ const createBranchGroup = (type, node, parents, branchMap) => {
 };
 
 const addBranch = (group, node, locationMap) => {
-    const { start, end } = node;
+    const {
+        start, end, type
+    } = node;
 
     const branchKey = `${group.start}_${group.end}`;
 
@@ -159,6 +161,24 @@ const addBranch = (group, node, locationMap) => {
         count: 0
     };
 
+    if (type === 'SwitchCase') {
+
+        // console.log(node);
+
+        // check break
+        if (node.consequent) {
+            const breakItem = node.consequent.find((it) => it.type === 'BreakStatement');
+            if (breakItem) {
+                branchInfo.hasBreak = true;
+            }
+        }
+
+        // check default
+        if (!node.test) {
+            branchInfo.isDefault = true;
+        }
+    }
+
     group.locations.push(branchInfo);
 
     // update group end
@@ -183,12 +203,14 @@ const addNoneBranch = (group) => {
 const updateBlockLocations = (locations) => {
     const noBlockList = [];
     let blockCount = 0;
-    locations.forEach((item) => {
+    locations.forEach((item, i) => {
         if (item.block) {
             item.count = item.block.count;
             blockCount += item.count;
             return;
         }
+        // for calculate mo break branches
+        item.index = i;
         noBlockList.push(item);
     });
 
@@ -240,13 +262,34 @@ const LogicalExpression = (group, parentCount) => {
 };
 
 const SwitchStatement = (group, parentCount) => {
-    const { noBlockList, blockCount } = updateBlockLocations(group.locations);
+
+    const locations = group.locations;
+
+    const { noBlockList, blockCount } = updateBlockLocations(locations);
     if (!noBlockList.length) {
         return;
     }
-    const count = parentCount - blockCount;
+
+    // calculate switch/case count
+    const countLeft = parentCount - blockCount;
     noBlockList.forEach((item) => {
-        item.count = count;
+
+        let hasCount = false;
+
+        // check no break branches
+        for (let i = item.index - 1; i >= 0; i--) {
+            const b = locations[i];
+            if (b && !b.hasBreak && b.count > 0) {
+                item.count += b.count;
+                hasCount = true;
+                continue;
+            }
+            break;
+        }
+
+        if (!hasCount) {
+            item.count = countLeft;
+        }
     });
 };