monocart-coverage-reports 2.0.2 → 2.0.4

package/README.md

@@ -8,9 +8,9 @@
 
 ## Preview Reports
 - [V8](https://cenfun.github.io/monocart-coverage-reports/v8)
-- [V8 Esbuild](https://cenfun.github.io/monocart-coverage-reports/v8-esbuild)
 - [V8 Rollup](https://cenfun.github.io/monocart-coverage-reports/v8-rollup)
-- [V8 lcov.info](https://cenfun.github.io/monocart-coverage-reports/v8/lcov.info)
+- [V8 Esbuild](https://cenfun.github.io/monocart-coverage-reports/v8-esbuild)
+- [V8 Node v8 API](https://cenfun.github.io/monocart-coverage-reports/v8-node-api)
 - [V8 Node env](https://cenfun.github.io/monocart-coverage-reports/v8-node-env)
 - [V8 Node Inspector](https://cenfun.github.io/monocart-coverage-reports/v8-node-ins)
 - [V8 Minify](https://cenfun.github.io/monocart-coverage-reports/v8-minify)

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/lib/converter/find-original-range.js

@@ -227,11 +227,15 @@ const getOriginalStartPosition = (originalText, generatedText, generatedPos) =>
     }
 
     // ============================
-    // no case for right
-    // const generatedRight = generatedText.slice(generatedPos);
-    // if (originalText.endsWith(generatedRight)) {
-    //     return originalText.length - generatedRight.length;
-    // }
+    // right matched
+
+    // originalText: "'true' : ",
+    // generatedText: '"true" : '
+
+    const generatedRight = generatedText.slice(generatedPos);
+    if (originalText.endsWith(generatedRight)) {
+        return originalText.length - generatedRight.length;
+    }
 
     // ============================
     // starts with original text (few case possible useless)
@@ -350,7 +354,7 @@ const fixStartColumn = (startMapping, range, state, originalState) => {
 
     const originalPos = getOriginalStartPosition(originalText, generatedText, generatedPos);
 
-    // if (originalState.sourcePath.endsWith('src/components/report.vue')) {
+    // if (originalState.sourcePath.endsWith('conditional.js') && range.startOffset === 2153) {
     //     console.log('====================================================================');
     //     console.log('fix startMapping', originalState.sourcePath);
     //     console.log(startMapping);
@@ -481,12 +485,6 @@ const findStartMapping = (range, state, originalMap) => {
             };
         }
 
-        // if (startMapping.sourceIndex === 1) {
-        //     console.log('=========================================================');
-        //     console.log('find next start');
-        //     console.log(startMapping, nextMapping, range);
-        // }
-
         // exact and column
         Object.assign(startMapping, nextMapping, {
             exact: true,
@@ -559,13 +557,10 @@ const findOriginalRange = (range, state, originalMap) => {
     const { startMapping, originalState } = startResult;
 
     // ==================================================================================
-    // if (originalState.sourcePath.endsWith('app/app.module.ts')) {
-    //     originalState.showLog = true;
-    //     console.log('============================================================');
-    //     console.log(originalState.sourcePath);
+    // if (originalState.sourcePath.endsWith('conditional.js') && range.startOffset === 2153) {
+    //     console.log('============================================================', originalState.sourcePath);
     //     console.log(range);
-    // } else {
-    //     originalState.showLog = false;
+    //     console.log(startMapping);
     // }
     // ==================================================================================