monocart-coverage-reports 2.8.0 → 2.8.2

package/README.md

@@ -21,7 +21,7 @@
     - [Collecting V8 Coverage Data from Node.js](#collecting-v8-coverage-data-from-nodejs)
     - [Collecting V8 Coverage Data with `CDPClient` API](#collecting-v8-coverage-data-with-cdpclient-api)
     - [V8 Coverage Data API](#v8-coverage-data-api)
-* [Using `entryFilter` and `sourceFilter` to filter the results for V8 report](#using-entryfilter-and-sourcefilter-to-filter-the-results-for-v8-report)
+* [Filtering Results](#filtering-results)
 * [Resolve `sourcePath` for the Source Files](#resolve-sourcepath-for-the-source-files)
 * [Adding Empty Coverage for Untested Files](#adding-empty-coverage-for-untested-files)
 * [onEnd Hook](#onend-hook)
@@ -53,6 +53,7 @@
     - [ts-node](#ts-node)
     - [AVA](#ava)
     - [Codecov](#codecov)
+    - [Codacy](#codacy)
     - [Coveralls](#coveralls)
     - [Sonar Cloud](#sonar-cloud)
 * [Contributing](#contributing)
@@ -467,7 +468,8 @@ export interface ScriptCoverage {
 export type V8CoverageData = ScriptCoverage[];
 ```
 
-## Using `entryFilter` and `sourceFilter` to filter the results for V8 report
+## Filtering Results
+### Using `entryFilter` and `sourceFilter` to filter the results for V8 report
 When V8 coverage data collected, it actually contains the data of all entry files, for example:
 
 - *dist/main.js*
@@ -517,19 +519,33 @@ const coverageOptions = {
     }
 };
 ```
-In fact, the `minimatch` patterns will be transformed to a function like:
+As CLI args (JSON-like string. Added in: v2.8):
+```sh
+mcr --sourceFilter "{'**/node_modules/**':false,'**/**':true}"
+```
+Note, those patterns will be transformed to a function, and the order of the patterns will impact the results:
 ```js
 const coverageOptions = {
-    // '**/node_modules/**': false,
-    // '**/vendor.js': false,
-    // '**/src/**': true
     entryFilter: (entry) => {
         if (minimatch(entry.url, '**/node_modules/**')) { return false; }
         if (minimatch(entry.url, '**/vendor.js')) { return false; }
         if (minimatch(entry.url, '**/src/**')) { return true; }
         return false; // else unmatched
     }
-    // Note, the order of the patterns will impact the results
+};
+```
+
+### Using `filter` instead of `entryFilter` and `sourceFilter`
+If you don't want to define both `entryFilter` and `sourceFilter`, you can use `filter` instead. (Added in: v2.8)
+```js
+const coverageOptions = {
+    // combined patterns
+    filter: {
+        '**/node_modules/**': false,
+        '**/vendor.js': false,
+        '**/src/**': true
+        '**/**': true
+    }
 };
 ```
 
@@ -826,6 +842,7 @@ await new CoverageReport(coverageOptions).generate();
     }
 }
 ```
+see example: [merge-code-coverage](https://github.com/cenfun/merge-code-coverage)
 
 ## Common issues
 ### Unexpected coverage
@@ -897,6 +914,7 @@ When `logging` is `debug`, the raw report data will be preserved in `[outputDir]
 - [playwright-coverage](https://github.com/cenfun/playwright-coverage) - Example for Playwright coverage reports
 - [playwright-bdd-coverage](https://github.com/cenfun/playwright-bdd-coverage) - Example for Playwright BDD coverage reports
 - [monocart-reporter](https://github.com/cenfun/monocart-reporter) - Playwright custom reporter, supports generating [Code coverage report](https://github.com/cenfun/monocart-reporter?#code-coverage-report)
+- [merge-code-coverage](https://github.com/cenfun/merge-code-coverage) - Example for merging code coverage (unit + e2e shard)
 - Coverage for component testing with `monocart-reporter`:
     - [playwright-ct-vue](https://github.com/cenfun/playwright-ct-vue)
     - [playwright-ct-react](https://github.com/cenfun/playwright-ct-react)
@@ -969,13 +987,32 @@ const coverageOptions = {
     ]
 };
 ```
-- Github actions example:
+- Github actions:
 ```yml
 - name: Codecov
     uses: codecov/codecov-action@v3
     with:
         files: ./coverage-reports/codecov.json
 ```
+
+### [Codacy](https://www.codacy.com/)
+[![Codacy](https://app.codacy.com/project/badge/Coverage/715016ea8e90479db875b777db8bad55)](https://app.codacy.com/gh/cenfun/monocart-coverage-reports/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage)
+- Using `lcov` report:
+```js
+const coverageOptions = {
+    outputDir: "./coverage-reports",
+    lcov: true
+};
+```
+- Github actions:
+```yml
+- name: Codacy Coverage Reporter
+    uses: codacy/codacy-coverage-reporter-action@v1
+    with:
+        project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+        coverage-reports: ./docs/mcr/lcov.info
+```
+
 ### [Coveralls](https://coveralls.io/)
 [![Coverage Status](https://coveralls.io/repos/github/cenfun/monocart-coverage-reports/badge.svg?branch=main)](https://coveralls.io/github/cenfun/monocart-coverage-reports?branch=main)
 - Using `lcov` report:
@@ -985,13 +1022,14 @@ const coverageOptions = {
     lcov: true
 };
 ```
-- Github actions example:
+- Github actions:
 ```yml
 - name: Coveralls
     uses: coverallsapp/github-action@v2
     with:
         files: ./coverage-reports/lcov.info
 ```
+
 ### [Sonar Cloud](https://sonarcloud.io/)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=monocart-coverage-reports&metric=coverage)](https://sonarcloud.io/summary/new_code?id=monocart-coverage-reports)
 - Using `lcov` report. Github actions example:
@@ -1013,8 +1051,9 @@ const coverageOptions = {
 ```
 
 ## Contributing
+- Node.js 20+
+- VSCode (extensions: eslint/stylelint/vue)
 ```sh
-# Node.js 20+
 npm install starfall-cli -g
 npm install
 

package/README.zh-Hans.md

@@ -21,7 +21,7 @@
     - [从Node.js](#collecting-v8-coverage-data-from-nodejs)
     - [使用`CDPClient`API](#collecting-v8-coverage-data-with-cdpclient-api)
     - [参考V8覆盖率的API](#v8-coverage-data-api)
-* [使用 `entryFilter` 和 `sourceFilter` 来过滤V8覆盖率数据](#using-entryfilter-and-sourcefilter-to-filter-the-results-for-v8-report)
+* [过滤V8覆盖率数据](#filtering-results)
 * [使用 `sourcePath` 修改源文件路径](#resolve-sourcepath-for-the-source-files)
 * [为未测试的文件添加空的覆盖率报告](#adding-empty-coverage-for-untested-files)
 * [onEnd回调函数](#onend-hook)
@@ -53,6 +53,7 @@
     - [ts-node](#ts-node)
     - [AVA](#ava)
     - [Codecov](#codecov)
+    - [Codacy](#codacy)
     - [Coveralls](#coveralls)
     - [Sonar Cloud](#sonar-cloud)
 * [Contributing](#contributing)
@@ -471,6 +472,7 @@ export interface ScriptCoverage {
 export type V8CoverageData = ScriptCoverage[];
 ```
 
+## Filtering Results
 ## Using `entryFilter` and `sourceFilter` to filter the results for V8 report
 当收集到V8的覆盖数据时，它实际上包含了所有的入口文件的覆盖率数据, 比如有以下3个文件:
 
@@ -521,19 +523,33 @@ const coverageOptions = {
     }
 };
 ```
-这些`minimatch`匹配的运行逻辑，大概相当于:
+作为CLI参数（JSON字符串，Added in: v2.8）:
+```sh
+mcr --sourceFilter "{'**/node_modules/**':false,'**/**':true}"
+```
+注意，这些匹配实际上会转换成一个过滤函数（如下），所以如果一个匹配成功则会直接返回，后面的将不再继续匹配。请注意先后顺序，如果存在包含关系的，可以调整上下顺序，最后如果都未匹配，则默认返回false
 ```js
 const coverageOptions = {
-    // '**/node_modules/**': false,
-    // '**/vendor.js': false,
-    // '**/src/**': true
     entryFilter: (entry) => {
         if (minimatch(entry.url, '**/node_modules/**')) { return false; }
         if (minimatch(entry.url, '**/vendor.js')) { return false; }
         if (minimatch(entry.url, '**/src/**')) { return true; }
         return false; // else unmatched
     }
-    // 注意，前面的如果已经匹配到会直接返回，后面的不会继续匹配，所以如果存在包含关系的，需要注意每个匹配的上下顺序，最后如果都未匹配，则默认返回false
+};
+```
+
+### Using `filter` instead of `entryFilter` and `sourceFilter`
+如果你不想定义两个过滤器，可以使用 `filter` 选项代替，可以将多个匹配合并在一起. (Added in: v2.8)
+```js
+const coverageOptions = {
+    // combined patterns
+    filter: {
+        '**/node_modules/**': false,
+        '**/vendor.js': false,
+        '**/src/**': true
+        '**/**': true
+    }
 };
 ```
 
@@ -828,6 +844,7 @@ await new CoverageReport(coverageOptions).generate();
     }
 }
 ```
+参见例子： [merge-code-coverage](https://github.com/cenfun/merge-code-coverage)
 
 ## Common issues
 > 常见问题
@@ -901,6 +918,7 @@ const coverageOptions = {
 - [playwright-coverage](https://github.com/cenfun/playwright-coverage) - Example for Playwright coverage reports
 - [playwright-bdd-coverage](https://github.com/cenfun/playwright-bdd-coverage) - Example for Playwright BDD coverage reports
 - [monocart-reporter](https://github.com/cenfun/monocart-reporter) - Playwright custom reporter, supports generating [Code coverage report](https://github.com/cenfun/monocart-reporter?#code-coverage-report)
+- [merge-code-coverage](https://github.com/cenfun/merge-code-coverage) - Example for merging code coverage (unit + e2e shard)
 - Coverage for component testing with `monocart-reporter`:
     - [playwright-ct-vue](https://github.com/cenfun/playwright-ct-vue)
     - [playwright-ct-react](https://github.com/cenfun/playwright-ct-react)
@@ -980,6 +998,25 @@ const coverageOptions = {
     with:
         files: ./coverage-reports/codecov.json
 ```
+
+### [Codacy](https://www.codacy.com/)
+[![Codacy](https://app.codacy.com/project/badge/Coverage/715016ea8e90479db875b777db8bad55)](https://app.codacy.com/gh/cenfun/monocart-coverage-reports/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage)
+- Using `lcov` report:
+```js
+const coverageOptions = {
+    outputDir: "./coverage-reports",
+    lcov: true
+};
+```
+- Github actions:
+```yml
+- name: Codacy Coverage Reporter
+    uses: codacy/codacy-coverage-reporter-action@v1
+    with:
+        project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+        coverage-reports: ./docs/mcr/lcov.info
+```
+
 ### [Coveralls](https://coveralls.io/)
 [![Coverage Status](https://coveralls.io/repos/github/cenfun/monocart-coverage-reports/badge.svg?branch=main)](https://coveralls.io/github/cenfun/monocart-coverage-reports?branch=main)
 - Using `lcov` report:
@@ -996,6 +1033,7 @@ const coverageOptions = {
     with:
         files: ./coverage-reports/lcov.info
 ```
+
 ### [Sonar Cloud](https://sonarcloud.io/)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=monocart-coverage-reports&metric=coverage)](https://sonarcloud.io/summary/new_code?id=monocart-coverage-reports)
 - Using `lcov` report. Github actions example:
@@ -1017,8 +1055,9 @@ const coverageOptions = {
 ```
 
 ## Contributing
+- Node.js 20+
+- VSCode (extensions: eslint/stylelint/vue)
 ```sh
-# Node.js 20+
 npm install starfall-cli -g
 npm install
 

package/lib/cli.js

@@ -192,6 +192,7 @@ program
 
     .option('-o, --outputDir <dir>', 'output dir for reports')
     .option('-i, --inputDir <dir>', 'input dir for merging raw files')
+    .option('-b, --baseDir <dir>', 'base dir for normalizing path')
 
     .option('-a, --all <dir>', 'include all files from dir')
 

package/lib/converter/converter.js

@@ -16,9 +16,7 @@ const { getIgnoredRanges } = require('./ignore.js');
 const {
     sortRanges, dedupeCountRanges, mergeRangesWith
 } = require('../utils/dedupe.js');
-const {
-    getSourceType, getSourcePathHandler, initSourceMapSourcePath
-} = require('../utils/source-path.js');
+const { getSourceType, initSourceMapSourcesPath } = require('../utils/source-path.js');
 const { decode, minimatch } = require('../packages/monocart-coverage-vendor.js');
 
 const InfoBranch = require('./info-branch.js');
@@ -1111,8 +1109,7 @@ const unpackSourceMap = (state, options) => {
 
     // keep original urls
     const fileUrls = {};
-    const sourcePathHandler = getSourcePathHandler(options);
-    initSourceMapSourcePath(sourceMap, fileUrls, sourcePath, sourcePathHandler);
+    initSourceMapSourcesPath(fileUrls, sourceMap, sourcePath, options);
     state.fileUrls = fileUrls;
 
     // ===============================================

package/lib/default/options.js

@@ -24,6 +24,9 @@ module.exports = {
     // {string|string[]} input raw dir(s)
     inputDir: null,
 
+    // {string} base dir for normalizing the relative source path, defaults to cwd
+    baseDir: null,
+
     // (V8 only) {function} A filter function to execute for each element in the V8 list.
     // entryFilter: (entry) => {
     //     if (entry.url.indexOf('googleapis.com') !== -1) {

package/lib/index.d.ts

@@ -230,6 +230,9 @@ declare namespace MCR {
         /** {string|string[]} input raw dir(s) */
         inputDir?: string | string[];
 
+        /** {string} base dir for normalizing the relative source path, defaults to cwd */
+        baseDir?: string;
+
         /** (V8 only) 
          * 
          * {string} `minimatch` pattern for entry url; 

package/lib/istanbul/istanbul.js

@@ -7,7 +7,7 @@ const istanbulLibReport = require('istanbul-lib-report');
 const Util = require('../utils/util.js');
 const IstanbulSummary = require('./istanbul-summary.js');
 
-const { getSourcePathHandler, initIstanbulSourcePath } = require('../utils/source-path.js');
+const { initIstanbulSourcePath } = require('../utils/source-path.js');
 
 const findHtmlPath = (outputDir) => {
     const defaultHtml = path.resolve(outputDir, 'index.html');
@@ -129,9 +129,7 @@ const mergeIstanbulCoverage = (dataList) => {
 const initIstanbulData = (istanbulData, options) => {
 
     const fileSources = options.fileSources || {};
-    const sourcePathHandler = getSourcePathHandler(options);
-
-    const coverageData = initIstanbulSourcePath(istanbulData, fileSources, sourcePathHandler);
+    const coverageData = initIstanbulSourcePath(istanbulData, fileSources, options);
 
     return {
         fileSources,

package/lib/utils/source-path.js

@@ -2,7 +2,40 @@ const path = require('path');
 const { fileURLToPath, pathToFileURL } = require('url');
 const Util = require('./util.js');
 
+const resolveSourceRootUrl = (sourceName, sourceRoot) => {
+    // prepend sourceRoot
+    if (sourceRoot && !sourceName.startsWith(sourceRoot)) {
+        if (!sourceRoot.endsWith('/')) {
+            sourceRoot += '/';
+        }
+        return sourceRoot + sourceName;
+    }
+    return sourceName;
+};
+
+const resolveAnonymousUrl = (url, index, type) => {
+    if (url) {
+        return url;
+    }
+    // anonymous scripts will have __playwright_evaluation_script__ as their URL.
+    const list = ['anonymous'];
+    if (index) {
+        list.push(`-${index}`);
+    }
+    if (type) {
+        list.push(`.${type}`);
+    }
+    return list.join('');
+};
+
 const filterPath = (str) => {
+    // double \\ to /
+
+    // src/images/icons/ sync \.svg$
+    // src/images/icons/sync-.svg$
+
+    str = str.replace(/\\\\/g, '/');
+    // decodeURI("%20") to space
     str = decodeURI(str);
     // remove / of start, end or double, ./ ../
     const ls = str.split('/').map((it) => {
@@ -21,23 +54,42 @@ const filterPath = (str) => {
     return ls.join('/');
 };
 
-const getSourcePath = (url, index = '', type = '') => {
+const normalizeSourcePath = (sourceUrl, baseDir) => {
 
-    // no url for anonymous
-    if (!url) {
-        // anonymous scripts will have __playwright_evaluation_script__ as their URL.
-        url = ['anonymous', index ? `-${index}` : '', type ? `.${type}` : ''].join('');
-        return filterPath(url);
+    // includes anonymous and everything
+
+    // file url
+    if (sourceUrl.startsWith('file:')) {
+        const relPath = Util.relativePath(fileURLToPath(sourceUrl), baseDir);
+        return filterPath(relPath);
     }
 
-    // already is file url
-    if (url.startsWith('file:')) {
-        const relPath = Util.relativePath(fileURLToPath(url));
+    // absolute path
+    // c:\\workspace\test\\selenium.spec.js true
+    // c://a.js true
+    // c:\\a.js true
+    // C:/a.js true
+    // /a.js true
+
+    // a.js false
+    // ws://a.js false
+    // file://a.js false
+    // http://a.com/a.js false
+    // webpack://src/a.js false
+
+    if (path.isAbsolute(sourceUrl)) {
+        const relPath = Util.relativePath(sourceUrl, baseDir);
         return filterPath(relPath);
     }
 
-    // http/https url, other url
-    const urlObj = Util.resolveUrl(url);
+    // ws://a.js
+    // http://127.0.0:8080/a.js
+    // https://127.0.0:8080/a.js?v=1
+    // webpack://coverage-v8/./test/mock/src/branch/branch.js
+    // webpack://monocart-v8/../starfall-cli/node_modules/css-loader/dist/runtime/api.js
+
+    // url http/https/webpack
+    const urlObj = Util.resolveUrl(sourceUrl);
     if (urlObj) {
         const host = [urlObj.hostname, urlObj.port].filter((it) => it).join('-');
         // always start with '/'
@@ -52,11 +104,10 @@ const getSourcePath = (url, index = '', type = '') => {
         return filterPath(p);
     }
 
-    // could be path
-    const fileUrl = pathToFileURL(url).toString();
-    const relPath = Util.relativePath(fileURLToPath(fileUrl));
+    // relative path
+    const fileUrl = pathToFileURL(sourceUrl).toString();
+    const relPath = Util.relativePath(fileURLToPath(fileUrl), baseDir);
     return filterPath(relPath);
-
 };
 
 const getSourceType = (sourcePath) => {
@@ -75,7 +126,7 @@ const getSourceType = (sourcePath) => {
 
 // ========================================================================================================
 
-const getSourcePathHandler = (options) => {
+const getSourcePathReplacer = (options) => {
     const input = options.sourcePath;
     if (typeof input === 'function') {
         return input;
@@ -96,8 +147,10 @@ const getSourcePathHandler = (options) => {
 
 // ========================================================================================================
 
-const initIstanbulSourcePath = (coverageData, fileSources, sourcePathHandler) => {
-    if (!sourcePathHandler) {
+const initIstanbulSourcePath = (coverageData, fileSources, options) => {
+
+    const sourcePathReplacer = getSourcePathReplacer(options);
+    if (!sourcePathReplacer) {
         return coverageData;
     }
 
@@ -119,7 +172,7 @@ const initIstanbulSourcePath = (coverageData, fileSources, sourcePathHandler) =>
         }
 
         // new source path, second is source url
-        const newSourcePath = sourcePathHandler(sourcePath, item);
+        const newSourcePath = sourcePathReplacer(sourcePath, item);
         if (typeof newSourcePath === 'string' && newSourcePath) {
             sourcePath = newSourcePath;
         }
@@ -141,55 +194,21 @@ const initIstanbulSourcePath = (coverageData, fileSources, sourcePathHandler) =>
 
 // ========================================================================================================
 
-const resolveSourceUrl = (sourceName, sourceRoot) => {
-
-    // prepend sourceRoot
-    if (sourceRoot && !sourceName.startsWith(sourceRoot)) {
-        if (!sourceRoot.endsWith('/')) {
-            sourceRoot += '/';
-        }
-        sourceName = sourceRoot + sourceName;
-    }
-
-    // could be absolute path
-    // c:\\workspace\test\\selenium.spec.js
-    // a.js false
-    // c://a.js true
-    // ws://a.js false
-
-    if (path.isAbsolute(sourceName)) {
-        return pathToFileURL(sourceName).toString();
-    }
-
-    // webpack://coverage-v8/./test/mock/src/branch/branch.js
-    // webpack://monocart-v8/../starfall-cli/node_modules/css-loader/dist/runtime/api.js
-
-    // as url
-    const urlObj = Util.resolveUrl(sourceName);
-    if (urlObj) {
-        return urlObj.toString();
-    }
+const initSourceMapSourcesPath = (fileUrls, sourceMap, distFile, options) => {
 
-    // console.log('sourceName', sourceName);
-
-    // as relative path
-    const sourceUrl = pathToFileURL(sourceName).toString();
-
-    // console.log('sourceUrl', sourceUrl);
-
-    return sourceUrl;
-};
-
-const initSourceMapSourcePath = (sourceMap, fileUrls, distFile, sourcePathHandler) => {
+    const baseDir = options.baseDir;
+    const sourcePathReplacer = getSourcePathReplacer(options);
 
     sourceMap.sources = sourceMap.sources.map((sourceName, i) => {
 
-        const sourceUrl = resolveSourceUrl(sourceName, sourceMap.sourceRoot);
+        let sourceUrl = resolveSourceRootUrl(sourceName, sourceMap.sourceRoot);
+        sourceUrl = resolveAnonymousUrl(sourceUrl, i + 1, 'js');
+        let sourcePath = normalizeSourcePath(sourceUrl, baseDir);
+        // console.log(sourceUrl, sourcePath);
 
-        let sourcePath = getSourcePath(sourceUrl, i + 1);
-        if (sourcePathHandler) {
+        if (sourcePathReplacer) {
             // sourcePath could be a filename only, may using distFile to get full path
-            const newSourcePath = sourcePathHandler(sourcePath, {
+            const newSourcePath = sourcePathReplacer(sourcePath, {
                 url: sourceUrl,
                 distFile
             });
@@ -205,12 +224,10 @@ const initSourceMapSourcePath = (sourceMap, fileUrls, distFile, sourcePathHandle
 };
 
 module.exports = {
-    // for unit test
-    resolveSourceUrl,
-
-    getSourcePath,
+    resolveAnonymousUrl,
+    normalizeSourcePath,
     getSourceType,
-    getSourcePathHandler,
+    getSourcePathReplacer,
     initIstanbulSourcePath,
-    initSourceMapSourcePath
+    initSourceMapSourcesPath
 };

package/lib/v8/v8.js

@@ -3,7 +3,9 @@ const EC = require('eight-colors');
 const Util = require('../utils/util.js');
 const { getV8Summary } = require('./v8-summary.js');
 const { dedupeFlatRanges } = require('../utils/dedupe.js');
-const { getSourcePath, getSourcePathHandler } = require('../utils/source-path.js');
+const {
+    resolveAnonymousUrl, normalizeSourcePath, getSourcePathReplacer
+} = require('../utils/source-path.js');
 const { mergeScriptCovs, minimatch } = require('../packages/monocart-coverage-vendor.js');
 const { collectSourceMaps } = require('../converter/collect-source-maps.js');
 const version = require('../../package.json').version;
@@ -109,7 +111,9 @@ const initV8ListAndSourcemap = async (v8list, options) => {
         }
     }
 
-    const sourcePathHandler = getSourcePathHandler(options);
+    const sourcePathReplacer = getSourcePathReplacer(options);
+
+    const baseDir = options.baseDir;
 
     // init id, sourcePath
     v8list = v8list.map((entry, i) => {
@@ -149,14 +153,16 @@ const initV8ListAndSourcemap = async (v8list, options) => {
         }
 
         // resolve source path
-        let sourcePath = getSourcePath(data.url, i + 1, data.type);
-        if (sourcePathHandler) {
-            const newSourcePath = sourcePathHandler(sourcePath, data);
+        const sourceUrl = resolveAnonymousUrl(data.url, i + 1, data.type);
+        let sourcePath = normalizeSourcePath(sourceUrl, baseDir);
+        if (sourcePathReplacer) {
+            const newSourcePath = sourcePathReplacer(sourcePath, data);
             if (typeof newSourcePath === 'string' && newSourcePath) {
                 sourcePath = newSourcePath;
             }
         }
         data.sourcePath = sourcePath;
+        // console.log(data.url, sourcePath);
 
         // calculate source id
         data.id = Util.calculateSha1(sourcePath + data.source);

package/package.json

@@ -1,101 +1,101 @@
-{
-    "name": "monocart-coverage-reports",
-    "version": "2.8.0",
-    "description": "A code coverage tool to generate native V8 reports or Istanbul reports.",
-    "main": "./lib/index.js",
-    "bin": {
-        "mcr": "./lib/cli.js"
-    },
-    "exports": {
-        ".": {
-            "types": "./lib/index.d.ts",
-            "import": "./lib/index.mjs",
-            "require": "./lib/index.js",
-            "default": "./lib/index.js"
-        },
-        "./register": {
-            "import": "./lib/register/register.mjs",
-            "require": "./lib/register/register.js",
-            "default": "./lib/register/register.js"
-        },
-        "./converter": "./lib/converter/converter.js",
-        "./util": "./lib/utils/util.js",
-        "./package.json": "./package.json"
-    },
-    "types": "./lib/index.d.ts",
-    "scripts": {
-        "build-test": "node ./test/build/build-test.js",
-        "build": "sf lint && sf b -p && npm run build-test",
-        "test-unit": "mocha --parallel test/unit/*.test.js",
-        "test-node-env": "cross-env NODE_V8_COVERAGE=.temp/v8-coverage-env node ./test/test-node-env.js && node ./test/generate-report.js",
-        "test-node-api": "cross-env NODE_V8_COVERAGE=.temp/v8-coverage-api node ./test/test-node-api.js",
-        "test-node-ins": "node ./test/test-node-ins.js",
-        "test-node-cdp": "node --inspect=9229 ./test/test-node-cdp.js",
-        "test-node-vm": "node ./test/test-node-vm.js",
-        "test-node-koa": "node ./test/test-node-koa.js",
-        "test-node-fgc": "node ./test/test-node-fgc.js",
-        "test-node": "node ./test/test.js --node",
-        "test-istanbul": "node ./test/test-istanbul.js",
-        "test-v8": "node ./test/test-v8.js",
-        "test-puppeteer": "node ./test/test-puppeteer.js",
-        "test-anonymous": "node ./test/test-anonymous.js",
-        "test-css": "node ./test/test-css.js",
-        "test-minify": "node ./test/test-minify.js",
-        "test-esbuild": "node ./test/test-esbuild.js",
-        "test-rollup": "node ./test/test-rollup.js",
-        "test-swc": "node ./test/test-swc.js",
-        "test-v8-and-istanbul": "node ./test/test-v8-and-istanbul.js",
-        "test-browser": "node ./test/test.js --browser",
-        "test-cli": "npx mcr node ./test/specs/node.test.js -c test/mcr.config.cli.js",
-        "test-tsx": "npx mcr tsx ./test/specs/tsx.test.ts -c test/mcr.config.tsx.js",
-        "test-demo": "node ./test/test-demo.js",
-        "test-merge": "node ./test/test-merge.js",
-        "test-merge-istanbul": "node ./test/test-merge-istanbul.js",
-        "test-client": "node ./test/test-client.js",
-        "test-all": "node ./test/test.js && node ./scripts/docs.js",
-        "test": "npm run test-unit && npx mcr npm run test-all -c test/mcr.config.mcr.js",
-        "test:snap": "cross-env TEST_SNAPSHOT=true npm run test",
-        "dev": "sf d v8",
-        "open": "node ./scripts/open.js",
-        "patch": "npm run build && npm run test && sf publish patch -r"
-    },
-    "workspaces": [
-        "packages/*",
-        "test"
-    ],
-    "files": [
-        "lib",
-        "README.zh-Hans.md"
-    ],
-    "license": "MIT",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/cenfun/monocart-coverage-reports.git"
-    },
-    "dependencies": {
-        "console-grid": "^2.2.2",
-        "eight-colors": "^1.3.0",
-        "istanbul-lib-coverage": "^3.2.2",
-        "istanbul-lib-report": "^3.0.1",
-        "istanbul-reports": "^3.1.7",
-        "lz-utils": "^2.0.2",
-        "monocart-code-viewer": "^1.1.3",
-        "monocart-formatter": "^3.0.0",
-        "monocart-locator": "^1.0.0",
-        "turbogrid": "^3.0.13"
-    },
-    "devDependencies": {
-        "commander": "^12.0.0",
-        "esbuild": "^0.21.1",
-        "eslint": "~9.2.0",
-        "eslint-config-plus": "^2.0.0",
-        "eslint-plugin-html": "^8.1.1",
-        "eslint-plugin-vue": "^9.26.0",
-        "minimatch": "^9.0.4",
-        "stylelint": "^16.5.0",
-        "stylelint-config-plus": "^1.1.2",
-        "supports-color": "^9.4.0",
-        "tsx": "^4.9.3",
-        "ws": "^8.17.0"
-    }
-}
+{
+    "name": "monocart-coverage-reports",
+    "version": "2.8.2",
+    "description": "A code coverage tool to generate native V8 reports or Istanbul reports.",
+    "main": "./lib/index.js",
+    "bin": {
+        "mcr": "./lib/cli.js"
+    },
+    "exports": {
+        ".": {
+            "types": "./lib/index.d.ts",
+            "import": "./lib/index.mjs",
+            "require": "./lib/index.js",
+            "default": "./lib/index.js"
+        },
+        "./register": {
+            "import": "./lib/register/register.mjs",
+            "require": "./lib/register/register.js",
+            "default": "./lib/register/register.js"
+        },
+        "./converter": "./lib/converter/converter.js",
+        "./util": "./lib/utils/util.js",
+        "./package.json": "./package.json"
+    },
+    "types": "./lib/index.d.ts",
+    "scripts": {
+        "build-test": "node ./test/build/build-test.js",
+        "build": "sf lint && sf b -p && npm run build-test",
+        "test-unit": "mocha --parallel test/unit/*.test.js",
+        "test-node-env": "cross-env NODE_V8_COVERAGE=.temp/v8-coverage-env node ./test/test-node-env.js && node ./test/generate-report.js",
+        "test-node-api": "cross-env NODE_V8_COVERAGE=.temp/v8-coverage-api node ./test/test-node-api.js",
+        "test-node-ins": "node ./test/test-node-ins.js",
+        "test-node-cdp": "node --inspect=9229 ./test/test-node-cdp.js",
+        "test-node-vm": "node ./test/test-node-vm.js",
+        "test-node-koa": "node ./test/test-node-koa.js",
+        "test-node-fgc": "node ./test/test-node-fgc.js",
+        "test-node": "node ./test/test.js --node",
+        "test-istanbul": "node ./test/test-istanbul.js",
+        "test-v8": "node ./test/test-v8.js",
+        "test-puppeteer": "node ./test/test-puppeteer.js",
+        "test-anonymous": "node ./test/test-anonymous.js",
+        "test-css": "node ./test/test-css.js",
+        "test-minify": "node ./test/test-minify.js",
+        "test-esbuild": "node ./test/test-esbuild.js",
+        "test-rollup": "node ./test/test-rollup.js",
+        "test-swc": "node ./test/test-swc.js",
+        "test-v8-and-istanbul": "node ./test/test-v8-and-istanbul.js",
+        "test-browser": "node ./test/test.js --browser",
+        "test-cli": "npx mcr node ./test/specs/node.test.js -c test/mcr.config.cli.js",
+        "test-tsx": "npx mcr tsx ./test/specs/tsx.test.ts -c test/mcr.config.tsx.js",
+        "test-demo": "node ./test/test-demo.js",
+        "test-merge": "node ./test/test-merge.js",
+        "test-merge-istanbul": "node ./test/test-merge-istanbul.js",
+        "test-client": "node ./test/test-client.js",
+        "test-all": "node ./test/test.js && node ./scripts/docs.js",
+        "test": "npm run test-unit && npx mcr npm run test-all -c test/mcr.config.mcr.js",
+        "test:snap": "cross-env TEST_SNAPSHOT=true npm run test",
+        "dev": "sf d v8",
+        "open": "node ./scripts/open.js",
+        "patch": "npm run build && npm run test && sf publish patch -r"
+    },
+    "workspaces": [
+        "packages/*",
+        "test"
+    ],
+    "files": [
+        "lib",
+        "README.zh-Hans.md"
+    ],
+    "license": "MIT",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/cenfun/monocart-coverage-reports.git"
+    },
+    "dependencies": {
+        "console-grid": "^2.2.2",
+        "eight-colors": "^1.3.0",
+        "istanbul-lib-coverage": "^3.2.2",
+        "istanbul-lib-report": "^3.0.1",
+        "istanbul-reports": "^3.1.7",
+        "lz-utils": "^2.0.2",
+        "monocart-code-viewer": "^1.1.3",
+        "monocart-formatter": "^3.0.0",
+        "monocart-locator": "^1.0.0",
+        "turbogrid": "^3.0.13"
+    },
+    "devDependencies": {
+        "commander": "^12.0.0",
+        "esbuild": "^0.21.3",
+        "eslint": "~9.2.0",
+        "eslint-config-plus": "^2.0.0",
+        "eslint-plugin-html": "^8.1.1",
+        "eslint-plugin-vue": "^9.26.0",
+        "minimatch": "^9.0.4",
+        "stylelint": "^16.5.0",
+        "stylelint-config-plus": "^1.1.2",
+        "supports-color": "^9.4.0",
+        "tsx": "^4.10.3",
+        "ws": "^8.17.0"
+    }
+}