monocart-coverage-reports 2.8.1 → 2.8.3

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,24 +54,42 @@ const filterPath = (str) => {
     return ls.join('/');
 };
 
-// eslint-disable-next-line complexity
-const normalizeSourcePath = (url, baseDir, index = '', type = '') => {
+const normalizeSourcePath = (sourceUrl, baseDir) => {
+
+    // includes anonymous and everything
 
-    // 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);
+    // 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), baseDir);
+    // 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 '/'
@@ -53,11 +104,10 @@ const normalizeSourcePath = (url, baseDir, index = '', type = '') => {
         return filterPath(p);
     }
 
-    // could be path
-    const fileUrl = pathToFileURL(url).toString();
+    // relative path
+    const fileUrl = pathToFileURL(sourceUrl).toString();
     const relPath = Util.relativePath(fileURLToPath(fileUrl), baseDir);
     return filterPath(relPath);
-
 };
 
 const getSourceType = (sourcePath) => {
@@ -144,45 +194,6 @@ const initIstanbulSourcePath = (coverageData, fileSources, options) => {
 
 // ========================================================================================================
 
-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();
-    }
-
-    // console.log('sourceName', sourceName);
-
-    // as relative path
-    const sourceUrl = pathToFileURL(sourceName).toString();
-
-    // console.log('sourceUrl', sourceUrl);
-
-    return sourceUrl;
-};
-
 const initSourceMapSourcesPath = (fileUrls, sourceMap, distFile, options) => {
 
     const baseDir = options.baseDir;
@@ -190,9 +201,9 @@ const initSourceMapSourcesPath = (fileUrls, sourceMap, distFile, options) => {
 
     sourceMap.sources = sourceMap.sources.map((sourceName, i) => {
 
-        const sourceUrl = resolveSourceUrl(sourceName, sourceMap.sourceRoot);
-
-        let sourcePath = normalizeSourcePath(sourceUrl, baseDir, i + 1);
+        let sourceUrl = resolveSourceRootUrl(sourceName, sourceMap.sourceRoot);
+        sourceUrl = resolveAnonymousUrl(sourceUrl, i + 1, 'js');
+        let sourcePath = normalizeSourcePath(sourceUrl, baseDir);
         // console.log(sourceUrl, sourcePath);
 
         if (sourcePathReplacer) {
@@ -213,9 +224,7 @@ const initSourceMapSourcesPath = (fileUrls, sourceMap, distFile, options) => {
 };
 
 module.exports = {
-    // for unit test
-    resolveSourceUrl,
-
+    resolveAnonymousUrl,
     normalizeSourcePath,
     getSourceType,
     getSourcePathReplacer,

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 { normalizeSourcePath, getSourcePathReplacer } = 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;
@@ -151,7 +153,8 @@ const initV8ListAndSourcemap = async (v8list, options) => {
         }
 
         // resolve source path
-        let sourcePath = normalizeSourcePath(data.url, baseDir, i + 1, data.type);
+        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) {
@@ -159,6 +162,7 @@ const initV8ListAndSourcemap = async (v8list, options) => {
             }
         }
         data.sourcePath = sourcePath;
+        // console.log(data.url, sourcePath);
 
         // calculate source id
         data.id = Util.calculateSha1(sourcePath + data.source);
@@ -331,8 +335,8 @@ const handleV8HtmlReport = async (reportData, reportOptions, options) => {
         return Util.resolveNodeModule(id);
     });
 
-    // package v8 ui
-    jsFiles.push(Util.resolvePackage('monocart-coverage-v8.js'));
+    // package app ui
+    jsFiles.push(Util.resolvePackage('monocart-coverage-app.js'));
 
     // console.log(jsFiles);
 

package/package.json

@@ -1,101 +1,102 @@
-{
-    "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"
-    }
-}
+{
+    "name": "monocart-coverage-reports",
+    "version": "2.8.3",
+    "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.1.0",
+        "esbuild": "^0.21.4",
+        "eslint": "~9.3.0",
+        "eslint-config-plus": "^2.0.0",
+        "eslint-plugin-html": "^8.1.1",
+        "eslint-plugin-vue": "^9.26.0",
+        "find-up": "^7.0.0",
+        "minimatch": "^9.0.4",
+        "stylelint": "^16.6.0",
+        "stylelint-config-plus": "^1.1.2",
+        "supports-color": "^9.4.0",
+        "tsx": "^4.11.0",
+        "ws": "^8.17.0"
+    }
+}