monocart-coverage-reports 2.10.2 → 2.10.4

package/README.md

@@ -45,6 +45,7 @@
     - [VSCode](#vscode)
     - [Jest](#jest)
     - [Vitest](#vitest)
+    - [Node Test Runner](#node-test-runner)
     - [Puppeteer](#puppeteer)
     - [Cypress](#cypress)
     - [WebdriverIO](#webdriverio)
@@ -294,6 +295,7 @@ const [jsCoverage, cssCoverage] = await Promise.all([
 const coverageData = [... jsCoverage, ... cssCoverage];
 
 ```
+Collect coverage with `@playwright/test` [`Automatic fixtures`](https://playwright.dev/docs/test-fixtures#automatic-fixtures), see example: [fixtures.ts](https://github.com/cenfun/playwright-coverage/blob/main/fixtures.ts)
 For more examples, see [./test/test-v8.js](./test/test-v8.js), and [anonymous](./test/test-anonymous.js), [css](./test/test-css.js)
 
 
@@ -987,6 +989,9 @@ c8 --experimental-monocart --reporter=v8 --reporter=console-details node foo.js
 - [vitest-monocart-coverage](https://github.com/cenfun/vitest-monocart-coverage) - Vitest custom provider module for coverage reports
 - [merge-code-coverage-vitest](https://github.com/cenfun/merge-code-coverage-vitest) - Example for merging code coverage (Vitest unit + Playwright e2e sharding)
 
+### [Node Test Runner](https://nodejs.org/docs/latest/api/test.html)
+- [node-monocart-coverage](https://github.com/cenfun/node-monocart-coverage) - Custom reporter for Node test runner for coverage
+
 ### [Puppeteer](https://github.com/puppeteer/puppeteer/)
 - [jest-puppeteer-coverage](https://github.com/cenfun/jest-puppeteer-coverage) - Example for Jest puppeteer coverage
 - [maplibre-gl-js](https://github.com/maplibre/maplibre-gl-js) - Example for Jest (unit) + Puppeteer (e2e) + Codecov

package/README.zh-Hans.md

@@ -45,6 +45,7 @@
     - [VSCode](#vscode)
     - [Jest](#jest)
     - [Vitest](#vitest)
+    - [Node Test Runner](#node-test-runner)
     - [Puppeteer](#puppeteer)
     - [Cypress](#cypress)
     - [WebdriverIO](#webdriverio)
@@ -117,10 +118,11 @@ mcr node my-app.js -r v8,console-details
 ![](./assets/v8.gif)
 
 - `v8-json`
-    - 保存 `CoverageResults` 到一个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)
 
+![](./assets/mcv.gif)
+
 > 内置Istanbul报告 (V8和Istanbul格式数据都支持):
 
 - `clover`
@@ -295,6 +297,7 @@ const [jsCoverage, cssCoverage] = await Promise.all([
 const coverageData = [... jsCoverage, ... cssCoverage];
 
 ```
+使用 `@playwright/test` 的 [`Automatic fixtures`](https://playwright.dev/docs/test-fixtures#automatic-fixtures)收集覆盖率数据, 见例子: [fixtures.ts](https://github.com/cenfun/playwright-coverage/blob/main/fixtures.ts)
 参见例子 [./test/test-v8.js](./test/test-v8.js), and [anonymous](./test/test-anonymous.js), [css](./test/test-css.js)
 
 
@@ -990,6 +993,9 @@ c8 --experimental-monocart --reporter=v8 --reporter=console-details node foo.js
 - [vitest-monocart-coverage](https://github.com/cenfun/vitest-monocart-coverage) - Vitest custom provider module for coverage reports
 - [merge-code-coverage-vitest](https://github.com/cenfun/merge-code-coverage-vitest) - Example for merging code coverage (Vitest unit + Playwright e2e sharding)
 
+### [Node Test Runner](https://nodejs.org/docs/latest/api/test.html)
+- [node-monocart-coverage](https://github.com/cenfun/node-monocart-coverage) - Custom reporter for Node test runner for coverage
+
 ### [Puppeteer](https://github.com/puppeteer/puppeteer/)
 - [jest-puppeteer-coverage](https://github.com/cenfun/jest-puppeteer-coverage) - Example for Jest puppeteer coverage
 - [maplibre-gl-js](https://github.com/maplibre/maplibre-gl-js) - Example for Jest (unit) + Puppeteer (e2e) + Codecov
@@ -1044,7 +1050,7 @@ const coverageOptions = {
     ]
 };
 ```
-- Github actions example:
+- Github actions:
 ```yml
 - name: Codecov
     uses: codecov/codecov-action@v4
@@ -1080,7 +1086,7 @@ const coverageOptions = {
     lcov: true
 };
 ```
-- Github actions example:
+- Github actions:
 ```yml
 - name: Coveralls
     uses: coverallsapp/github-action@v2

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;
+        }
     });
 };
 

package/lib/converter/converter.js

@@ -868,8 +868,8 @@ const decodeSourceMappings = (state, originalDecodedMap) => {
 
     const allDecodedMappings = [];
     decodedList.forEach((segments, generatedLine) => {
-        let info = null;
-        segments.forEach((segment) => {
+        const lastIndex = segments.length - 1;
+        segments.forEach((segment, i) => {
 
             // const COLUMN = 0;
             // const SOURCES_INDEX = 1;
@@ -889,7 +889,7 @@ const decodeSourceMappings = (state, originalDecodedMap) => {
                 column: generatedColumn
             });
 
-            info = {
+            const info = {
                 generatedOffset,
                 generatedLine,
                 generatedColumn,
@@ -900,12 +900,21 @@ const decodeSourceMappings = (state, originalDecodedMap) => {
                 nameIndex
             };
 
+            // first and last column
+            if (i === 0) {
+                info.first = true;
+            }
+            if (i === lastIndex) {
+                info.last = true;
+            }
+
             allDecodedMappings.push(info);
 
             originalDecodedMap.get(sourceIndex).push(info);
 
         });
 
+
     });
 
     // defaults to sort by generated offset, not need sort

package/lib/converter/find-original-range.js

@@ -407,16 +407,16 @@ const getFixedPosition = (info, direction) => {
 
 // ========================================================================================================
 
-const getOriginalEndOffset = (m, cache) => {
+const getOriginalEndOffset = (m, originalState) => {
     if (!m.originalEndOffset) {
-        const line = cache.originalState.locator.getLine(m.originalLine + 1);
+        const line = originalState.locator.getLine(m.originalLine + 1);
         m.originalEndOffset = line ? line.end : m.originalOffset;
     }
     return m.originalEndOffset;
 };
 
-const getOriginalText = (m1, m2, cache) => {
-    const originalLocator = cache.originalState.locator;
+const getOriginalText = (m1, m2, originalState, startNextLine) => {
+    const originalLocator = originalState.locator;
 
     const o1 = m1.originalOffset;
     const o2 = m2.originalOffset;
@@ -442,10 +442,22 @@ const getOriginalText = (m1, m2, cache) => {
             };
         }
 
+        // start from next line
+        if (startNextLine) {
+            const nextLine = originalState.locator.getLine(m1.originalLine + 2);
+            if (nextLine) {
+                // console.log(nextLine);
+                return {
+                    originalOffset: nextLine.start + nextLine.indent,
+                    originalText: nextLine.text.slice(nextLine.indent)
+                };
+            }
+        }
+
         // could be multiple lines for original text
         return {
             originalOffset: o1,
-            originalText: originalLocator.getSlice(o1, getOriginalEndOffset(m1, cache))
+            originalText: originalLocator.getSlice(o1, getOriginalEndOffset(m1, originalState))
         };
     }
 
@@ -454,7 +466,7 @@ const getOriginalText = (m1, m2, cache) => {
     if (o1 === o2) {
         return {
             originalOffset: o1,
-            originalText: originalLocator.getSlice(o1, getOriginalEndOffset(m1, cache))
+            originalText: originalLocator.getSlice(o1, getOriginalEndOffset(m1, originalState))
         };
     }
 
@@ -477,7 +489,7 @@ const getOriginalText = (m1, m2, cache) => {
     // should be wrong, ignore m2
     return {
         originalOffset: o1,
-        originalText: originalLocator.getSlice(o1, getOriginalEndOffset(m1, cache))
+        originalText: originalLocator.getSlice(o1, getOriginalEndOffset(m1, originalState))
     };
 
 };
@@ -553,8 +565,19 @@ const getFixedOriginalStart = (start, mappings, state, cache, options) => {
         };
     }
 
+    // skip last mapping
+    let startNextLine = false;
+    if (m1.last) {
+        const locStart = state.locator.offsetToLocation(start);
+        // 1-base
+        const lineIndex = locStart.line - 1;
+        if (lineIndex > m1.generatedLine) {
+            startNextLine = true;
+            // console.log(originalState.sourcePath, start, m1, m2);
+        }
+    }
 
-    const { originalText, originalOffset } = getOriginalText(m1, m2, cache);
+    const { originalText, originalOffset } = getOriginalText(m1, m2, originalState, startNextLine);
     const { generatedText, generatedPos } = getGeneratedText(m1, m2, state, start);
     const direction = 'start';
 
@@ -592,7 +615,7 @@ const getFixedOriginalEnd = (end, mappings, state, cache) => {
 
     // cross file until e1 line end (not file end)
     if (crossEnd) {
-        const originalEndOffset = getOriginalEndOffset(m1, cache);
+        const originalEndOffset = getOriginalEndOffset(m1, originalState);
         return {
             originalEnd: originalEndOffset
         };
@@ -608,7 +631,7 @@ const getFixedOriginalEnd = (end, mappings, state, cache) => {
     }
 
 
-    const { originalText, originalOffset } = getOriginalText(m1, m2, cache);
+    const { originalText, originalOffset } = getOriginalText(m1, m2, originalState);
     const { generatedText, generatedPos } = getGeneratedText(m1, m2, state, end);
     const direction = 'end';