monocart-coverage-reports 2.0.2 → 2.0.3

package/lib/converter/branches.js

@@ -108,33 +108,58 @@ const addBranch = (group, node, locationMap, functionInfo) => {
     return branchInfo;
 };
 
+const addNoneBranch = (group) => {
+    group.locations.push({
+        none: true,
+        count: 0
+    });
+};
+
 // =======================================================================================
 
+const hasFunctionBlock = (functionInfo) => {
+    const { range } = functionInfo;
+    if (range) {
+        const { blockMap } = range;
+        if (blockMap) {
+            return true;
+        }
+    }
+    return false;
+};
+
 const addNodeCount = (node, parents, functionInfo) => {
 
     const { start, end } = node;
-    const { count, range } = functionInfo;
 
-    if (range) {
+    if (hasFunctionBlock(functionInfo)) {
+        const { range } = functionInfo;
         const { blockMap, blockRanges } = range;
-        if (blockMap) {
-            const block = blockMap.get(start);
-            if (block) {
-                node._state = {
-                    count: block.count
-                };
-                return;
-            }
-
-            const blockItem = findInRanges(start, end, blockRanges);
-            if (blockItem) {
-                node._state = {
-                    count: blockItem.count
-                };
-                return;
-            }
+        const block = blockMap.get(start);
+        if (block) {
+            node._state = {
+                count: block.count
+            };
+            return;
+        }
 
+        const blockItem = findInRanges(start, end, blockRanges);
+        if (blockItem) {
+            node._state = {
+                count: blockItem.count
+            };
+            return;
         }
+
+        // continue find in reverseParents
+
+    } else {
+
+        // default to 1 if no function block
+        node._state = {
+            count: 1
+        };
+        return;
     }
 
     const reverseParents = [].concat(parents).reverse();
@@ -149,7 +174,7 @@ const addNodeCount = (node, parents, functionInfo) => {
 
     // function count
     node._state = {
-        count: count
+        count: functionInfo.count
     };
 
 };
@@ -198,10 +223,7 @@ const createBranches = (ast, functionInfo, branchMap) => {
                 addBranch(group, alternate, locationMap, functionInfo);
             } else {
                 // add none branch
-                group.locations.push({
-                    none: true,
-                    count: 0
-                });
+                addNoneBranch(group);
                 // no need update group end, there is no end
             }
         },
@@ -306,7 +328,7 @@ const LogicalExpression = (group, parentCount, noBlockList, blockCount) => {
 
     // const start = group.loc.start;
     // if (start > 7874 && start < 7922) {
-    //     console.log(group.type, parentCount, 'locations', group.locations, group.functionInfo.range);
+    //     console.log(group.type, parentCount, 'locations', group.locations);
     // }
 
 };
@@ -351,6 +373,14 @@ const updateBranchCount = (group) => {
     const parentCount = getBranchParentCount(reverseParents, functionCount);
     // console.log(functionInfo.start, 'function count', functionCount, 'parent count', parentCount);
 
+    if (!hasFunctionBlock(functionInfo)) {
+        // default to parent if no function range
+        locations.forEach((item) => {
+            item.count = parentCount;
+        });
+        return;
+    }
+
     // calculate branches count
     // > 1
 
@@ -360,9 +390,9 @@ const updateBranchCount = (group) => {
         if (item.block) {
             item.count = item.block.count;
             blockCount += item.count;
-        } else {
-            noBlockList.push(item);
+            return;
         }
+        noBlockList.push(item);
     });
 
     const handlers = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-coverage-reports",
-    "version": "2.0.2",
+    "version": "2.0.3",
     "description": "Monocart coverage reports",
     "main": "lib/index.js",
     "exports": {