monocart-coverage-reports 2.10.1 → 2.10.3

package/README.md

@@ -42,6 +42,7 @@
     - [Playwright](#playwright)
     - [c8](#c8)
     - [CodeceptJS](#codeceptjs)
+    - [VSCode](#vscode)
     - [Jest](#jest)
     - [Vitest](#vitest)
     - [Puppeteer](#puppeteer)
@@ -117,7 +118,7 @@ For more information, see [Command Line](#command-line)
 
 - `v8-json`
     - Save `CoverageResults` to a json file (defaults to [`coverage-report.json`](https://cenfun.github.io/monocart-coverage-reports/v8-and-istanbul/coverage-report.json)).
-    - Shows native V8 code coverage with VSCode extension [monocart-coverage-vscode](https://github.com/cenfun/monocart-coverage-vscode)
+    - Shows native V8 code coverage with VSCode extension: [Monocart Coverage for VSCode](https://github.com/cenfun/monocart-coverage-vscode)
 
 ![](./assets/mcv.gif)
 
@@ -975,6 +976,9 @@ c8 --experimental-monocart --reporter=v8 --reporter=console-details node foo.js
 ### [CodeceptJS](https://github.com/codeceptjs/CodeceptJS)
 - CodeceptJS is a [BDD](https://codecept.io/bdd/) + [AI](https://codecept.io/ai/) testing framework for e2e testing, it has integrated `MCR` since [v3.5.15](https://github.com/codeceptjs/CodeceptJS/releases/tag/3.5.15), see [plugins/coverage](https://codecept.io/plugins/#coverage)
 
+### [VSCode](https://github.com/microsoft/vscode)
+- [Monocart Coverage for VSCode](https://github.com/cenfun/monocart-coverage-vscode) - Shows native V8 code coverage in VSCode
+
 ### [Jest](https://github.com/jestjs/jest/)
 - [jest-monocart-coverage](https://github.com/cenfun/jest-monocart-coverage) - Jest custom reporter for coverage reports
 - [merge-code-coverage](https://github.com/cenfun/merge-code-coverage) - Example for merging code coverage (Jest unit + Playwright e2e sharding)
@@ -1121,9 +1125,6 @@ git commit -m "Saving files before refreshing line endings"
 npm run eol
 ```
 
-### VSCode Extension
-- [Coverage Gutters](https://github.com/ryanluker/vscode-coverage-gutters) - Display test coverage generated by lcov or xml in VSCode editor.
-
 ## Thanks
 - [@bcoe](https://github.com/bcoe)
 - [@edumserrano](https://github.com/edumserrano)

package/README.zh-Hans.md

@@ -42,6 +42,7 @@
     - [Playwright](#playwright)
     - [c8](#c8)
     - [CodeceptJS](#codeceptjs)
+    - [VSCode](#vscode)
     - [Jest](#jest)
     - [Vitest](#vitest)
     - [Puppeteer](#puppeteer)
@@ -117,7 +118,8 @@ mcr node my-app.js -r v8,console-details
 
 - `v8-json`
     - 保存 `CoverageResults` 到一个json文件
-    - 预览 [coverage-report.json](https://cenfun.github.io/monocart-coverage-reports/v8-and-istanbul/coverage-report.json)
+    - 保存 `CoverageResults` 到一个json文件 (默认是 [`coverage-report.json`](https://cenfun.github.io/monocart-coverage-reports/v8-and-istanbul/coverage-report.json))
+    - 用于VSCode扩展来显示原生V8代码覆盖率: [Monocart Coverage for VSCode](https://github.com/cenfun/monocart-coverage-vscode)
 
 > 内置Istanbul报告 (V8和Istanbul格式数据都支持):
 
@@ -977,6 +979,9 @@ c8 --experimental-monocart --reporter=v8 --reporter=console-details node foo.js
 ### [CodeceptJS](https://github.com/codeceptjs/CodeceptJS)
 - CodeceptJS is a [BDD](https://codecept.io/bdd/) + [AI](https://codecept.io/ai/) testing framework for e2e testing, it has integrated `MCR` since [v3.5.15](https://github.com/codeceptjs/CodeceptJS/releases/tag/3.5.15), see [plugins/coverage](https://codecept.io/plugins/#coverage)
 
+### [VSCode](https://github.com/microsoft/vscode)
+- [Monocart Coverage for VSCode](https://github.com/cenfun/monocart-coverage-vscode) - Shows native V8 code coverage in VSCode
+
 ### [Jest](https://github.com/jestjs/jest/)
 - [jest-monocart-coverage](https://github.com/cenfun/jest-monocart-coverage) - Jest custom reporter for coverage reports
 - [merge-code-coverage](https://github.com/cenfun/merge-code-coverage) - Example for merging code coverage (Jest unit + Playwright e2e sharding)
@@ -1123,9 +1128,6 @@ git commit -m "Saving files before refreshing line endings"
 npm run eol
 ```
 
-### VSCode Extension
-- [Coverage Gutters](https://github.com/ryanluker/vscode-coverage-gutters) - Display test coverage generated by lcov or xml in VSCode editor.
-
 ## Thanks
 - [@bcoe](https://github.com/bcoe)
 - [@edumserrano](https://github.com/edumserrano)

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;
+        }
     });
 };
 
@@ -632,6 +675,7 @@ const getRootFunctionState = (ast, coverageInfo) => {
     return rootState;
 };
 
+// eslint-disable-next-line complexity
 const findFunctionRange = (item, coverageInfo) => {
 
     const { node, reverseParents } = item;
@@ -645,13 +689,49 @@ const findFunctionRange = (item, coverageInfo) => {
         return functionRange;
     }
 
+    // `static async` case:
+    // [1]static [2]async [3]covered(active) {
+    // v8 start: 2
+    // ast start: 1,3
+
+    // fixed by async or static
+
+    // handle for static async
+    if (node.async) {
+        // 'async '.length
+        const asyncLen = 6;
+        const asyncStart = start - asyncLen;
+        // console.log(asyncStart, 'asyncStart ===============================================');
+        const asyncRange = getFunctionRange(asyncStart, end, type, coverageInfo);
+        if (asyncRange) {
+            return asyncRange;
+        }
+    }
+
     // try if class MethodDefinition
     // 0 is function self
     const parent = reverseParents[1];
     if (parent && parent.type === 'MethodDefinition') {
-        return getFunctionRange(parent.start, parent.end, parent.type, coverageInfo);
+
+        const parentRange = getFunctionRange(parent.start, parent.end, parent.type, coverageInfo);
+        if (parentRange) {
+            return parentRange;
+        }
+
+        if (parent.static) {
+            // 'static '.length
+            const staticLen = 7;
+            const staticStart = parent.start + staticLen;
+            // console.log(staticStart, ' staticStart ============================================');
+            const staticRange = getFunctionRange(staticStart, parent.end, parent.type, coverageInfo);
+            if (staticRange) {
+                return staticRange;
+            }
+        }
+
     }
 
+
 };
 
 const collectAstInfo = (ast, coverageInfo) => {
@@ -669,6 +749,7 @@ const collectAstInfo = (ast, coverageInfo) => {
         const {
             start, end, id
         } = node;
+
         const bodyStart = node.body.start;
         const bodyEnd = node.body.end;
         const functionName = id && id.name;

package/lib/converter/ast.js

@@ -58,7 +58,9 @@ const getCoverageInfo = (coverageList) => {
 
         functionMap.set(functionRange.startOffset, functionRange);
         if (functionName) {
-            functionNameMap.set(functionRange.startOffset + functionName.length, functionRange);
+            // can not handle `async functionName`
+            const possibleNameOffset = functionRange.startOffset + functionName.length;
+            functionNameMap.set(possibleNameOffset, functionRange);
         }
 
         if (functionName === '<static_initializer>') {