monocart-coverage-reports 2.7.10 → 2.8.1

package/lib/platform/share.js

@@ -1,9 +1,5 @@
 const Util = {
 
-    // definition
-    tagPattern: /(\s*)@([^@\s]+)(\s*)/g,
-    lineBreakPattern: /\r\n|[\r\n\u2028\u2029]/gu,
-
     hasOwn: function(obj, key) {
         return Object.prototype.hasOwnProperty.call(obj, key);
     },

package/lib/utils/source-path.js

@@ -21,7 +21,8 @@ const filterPath = (str) => {
     return ls.join('/');
 };
 
-const getSourcePath = (url, index = '', type = '') => {
+// eslint-disable-next-line complexity
+const normalizeSourcePath = (url, baseDir, index = '', type = '') => {
 
     // no url for anonymous
     if (!url) {
@@ -32,7 +33,7 @@ const getSourcePath = (url, index = '', type = '') => {
 
     // already is file url
     if (url.startsWith('file:')) {
-        const relPath = Util.relativePath(fileURLToPath(url));
+        const relPath = Util.relativePath(fileURLToPath(url), baseDir);
         return filterPath(relPath);
     }
 
@@ -54,7 +55,7 @@ const getSourcePath = (url, index = '', type = '') => {
 
     // could be path
     const fileUrl = pathToFileURL(url).toString();
-    const relPath = Util.relativePath(fileURLToPath(fileUrl));
+    const relPath = Util.relativePath(fileURLToPath(fileUrl), baseDir);
     return filterPath(relPath);
 
 };
@@ -75,7 +76,7 @@ const getSourceType = (sourcePath) => {
 
 // ========================================================================================================
 
-const getSourcePathHandler = (options) => {
+const getSourcePathReplacer = (options) => {
     const input = options.sourcePath;
     if (typeof input === 'function') {
         return input;
@@ -96,8 +97,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 +122,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;
         }
@@ -180,16 +183,21 @@ const resolveSourceUrl = (sourceName, sourceRoot) => {
     return sourceUrl;
 };
 
-const initSourceMapSourcePath = (sourceMap, fileUrls, distFile, sourcePathHandler) => {
+const initSourceMapSourcesPath = (fileUrls, sourceMap, distFile, options) => {
+
+    const baseDir = options.baseDir;
+    const sourcePathReplacer = getSourcePathReplacer(options);
 
     sourceMap.sources = sourceMap.sources.map((sourceName, i) => {
 
         const sourceUrl = resolveSourceUrl(sourceName, sourceMap.sourceRoot);
 
-        let sourcePath = getSourcePath(sourceUrl, i + 1);
-        if (sourcePathHandler) {
+        let sourcePath = normalizeSourcePath(sourceUrl, baseDir, i + 1);
+        // console.log(sourceUrl, sourcePath);
+
+        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
             });
@@ -208,9 +216,9 @@ module.exports = {
     // for unit test
     resolveSourceUrl,
 
-    getSourcePath,
+    normalizeSourcePath,
     getSourceType,
-    getSourcePathHandler,
+    getSourcePathReplacer,
     initIstanbulSourcePath,
-    initSourceMapSourcePath
+    initSourceMapSourcesPath
 };

package/lib/utils/util.js

@@ -10,7 +10,9 @@ const Share = require('../platform/share.js');
 const request = require('./request.js');
 const { deflateSync } = require('lz-utils');
 
-const { acornWalk, supportsColor } = require('../packages/monocart-coverage-vendor.js');
+const {
+    acornWalk, findUpSync, supportsColor
+} = require('../packages/monocart-coverage-vendor.js');
 
 // https://github.com/chalk/supports-color
 // disabled color if Terminal stdout does not support color
@@ -60,6 +62,27 @@ const Util = {
         return str;
     },
 
+    strToObj: (str) => {
+        if (typeof str === 'string') {
+            str = str.trim();
+            if (str.startsWith('{') && str.endsWith('}')) {
+                let fun;
+                let err;
+                try {
+                    fun = new Function(`return ${str}`);
+                } catch (e) {
+                    err = e;
+                }
+                if (!err) {
+                    const obj = fun();
+                    if (obj && typeof obj === 'object') {
+                        return obj;
+                    }
+                }
+            }
+        }
+    },
+
     calculateSha1: (buffer) => {
         const hash = crypto.createHash('sha1');
         hash.update(buffer);
@@ -81,9 +104,13 @@ const Util = {
 
     resolveUrl: (input, base) => {
         let url;
+        let err;
         try {
             url = new URL(input, base);
         } catch (e) {
+            err = e;
+        }
+        if (err) {
             // console.error('error url', input);
             return;
         }
@@ -164,6 +191,31 @@ const Util = {
         return path.resolve(__dirname, '../packages', p);
     },
 
+    findUpConfig: (customConfigFile) => {
+        if (customConfigFile) {
+            if (fs.existsSync(customConfigFile)) {
+                return customConfigFile;
+            }
+            // custom config not found
+            return;
+        }
+
+        const defaultConfigList = [
+            'mcr.config.js',
+            'mcr.config.cjs',
+            'mcr.config.mjs',
+            'mcr.config.json',
+            'mcr.config.ts'
+        ];
+
+        const configPath = findUpSync(defaultConfigList);
+        if (configPath) {
+            return configPath;
+        }
+
+        // default config not found
+    },
+
     saveHtmlReport: async (options) => {
 
         const {
@@ -472,6 +524,7 @@ const Util = {
         info: 20,
         debug: 30
     },
+    loggingLevel: 20,
 
     isDebug: () => {
         return Util.loggingType === 'debug';

package/lib/v8/v8.js

@@ -3,7 +3,7 @@ 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 { 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;
@@ -23,7 +23,7 @@ const getWrapperSource = (offset, source) => {
 };
 
 const getEntryFilter = (options) => {
-    const input = options.entryFilter;
+    let input = options.entryFilter || options.filter;
 
     // for function handler
     if (typeof input === 'function') {
@@ -32,9 +32,17 @@ const getEntryFilter = (options) => {
 
     // for single minimatch pattern
     if (input && typeof input === 'string') {
-        return (entry) => {
-            return minimatch(entry.url, input);
-        };
+        // string to multiple patterns "{...}"
+        // mcr npx mocha --entryFilter {'**/node_modules/**':false,'**/src/*.js':true}
+        // mcr npx mocha --entryFilter "{'**/node_modules/**': false, '**/src/*.js': true}"
+        const obj = Util.strToObj(input);
+        if (obj) {
+            input = obj;
+        } else {
+            return (entry) => {
+                return minimatch(entry.url, input);
+            };
+        }
     }
 
     // for patterns
@@ -101,7 +109,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) => {
@@ -141,9 +151,9 @@ const initV8ListAndSourcemap = async (v8list, options) => {
         }
 
         // resolve source path
-        let sourcePath = getSourcePath(data.url, i + 1, data.type);
-        if (sourcePathHandler) {
-            const newSourcePath = sourcePathHandler(sourcePath, data);
+        let sourcePath = normalizeSourcePath(data.url, baseDir, i + 1, data.type);
+        if (sourcePathReplacer) {
+            const newSourcePath = sourcePathReplacer(sourcePath, data);
             if (typeof newSourcePath === 'string' && newSourcePath) {
                 sourcePath = newSourcePath;
             }

package/package.json

@@ -1,100 +1,101 @@
-{
-    "name": "monocart-coverage-reports",
-    "version": "2.7.10",
-    "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"
-    ],
-    "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.20.2",
-        "eslint": "~9.1.1",
-        "eslint-config-plus": "^2.0.0",
-        "eslint-plugin-html": "^8.1.1",
-        "eslint-plugin-vue": "^9.25.0",
-        "minimatch": "^9.0.4",
-        "stylelint": "^16.4.0",
-        "stylelint-config-plus": "^1.1.0",
-        "supports-color": "^9.4.0",
-        "tsx": "^4.8.2",
-        "ws": "^8.17.0"
-    }
-}
+{
+    "name": "monocart-coverage-reports",
+    "version": "2.8.1",
+    "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"
+    }
+}