monocart-coverage-reports 2.12.6 → 2.12.7

package/lib/utils/source-path.js

@@ -45,6 +45,7 @@ const filterPath = (str) => {
         }
         return true;
     });
+
     return ls.join('/');
 };
 
@@ -58,6 +59,28 @@ const betterFileURLToPath = (url) => {
     return url;
 };
 
+const normalizePathDir = (sourcePath) => {
+
+    // decodeURI("%20") to space
+    let str = decodeURI(`${sourcePath}`);
+    str = str.replace(/\\/g, '/');
+
+    // remove / of start, end or double, ./ ../
+    return str.split('/').map((it) => {
+        it = it.trim();
+        // remove illegal characters except /
+        it = it.replace(/[\\:*?"<>|]/g, '');
+        // keep space
+        // it = it.replace(/\s+/g, '-');
+        return it;
+    }).filter((item) => {
+        if (!item || item === '.' || item === '..') {
+            return false;
+        }
+        return true;
+    }).join('/');
+};
+
 const normalizeSourcePath = (sourceUrl, baseDir) => {
 
     // includes anonymous and everything
@@ -95,16 +118,21 @@ const normalizeSourcePath = (sourceUrl, baseDir) => {
     // url http/https/webpack
     const urlObj = Util.resolveUrl(sourceUrl);
     if (urlObj) {
-        const host = urlObj.host;
+        let host = urlObj.host;
+        // remove : before port, : can not be a part of dir
+        host = host.replace(':', '-');
+
         // always start with '/'
         const pathname = urlObj.pathname;
 
         let p = host + pathname;
         // webpack://monocart-v8/packages/v8/src/app.vue?5cc4
         if (urlObj.search) {
-            p += urlObj.search;
+            p += `-${urlObj.search}`;
         }
 
+        p = normalizePathDir(p);
+
         return filterPath(p);
     }
 
@@ -151,28 +179,6 @@ const getSourcePathReplacer = (options) => {
 
 // ========================================================================================================
 
-const normalizeIstanbulFilePath = (sourcePath) => {
-
-    // decodeURI("%20") to space
-    let str = decodeURI(`${sourcePath}`);
-    str = str.replace(/\\/g, '/');
-
-    // remove / of start, end or double, ./ ../
-    return str.split('/').map((it) => {
-        it = it.trim();
-        // remove illegal characters except /
-        it = it.replace(/[\\:*?"<>|]/g, '');
-        // space
-        it = it.replace(/\s+/g, '-');
-        return it;
-    }).filter((item) => {
-        if (!item || item === '.' || item === '..') {
-            return false;
-        }
-        return true;
-    }).join('/');
-};
-
 const initIstanbulSourcePath = (coverageData, fileSources, options) => {
 
     const sourcePathReplacer = getSourcePathReplacer(options);
@@ -200,8 +206,6 @@ const initIstanbulSourcePath = (coverageData, fileSources, options) => {
             }
         }
 
-        sourcePath = normalizeIstanbulFilePath(sourcePath);
-
         //  console.log(item);
 
         // update source path

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-coverage-reports",
-    "version": "2.12.6",
+    "version": "2.12.7",
     "description": "A code coverage tool to generate native V8 reports or Istanbul reports.",
     "main": "./lib/index.js",
     "bin": {
@@ -71,63 +71,63 @@
         "url": "git+https://github.com/cenfun/monocart-coverage-reports.git"
     },
     "dependencies": {
-        "acorn": "^8.14.1",
-        "acorn-loose": "^8.5.0",
+        "acorn": "^8.15.0",
+        "acorn-loose": "^8.5.2",
         "acorn-walk": "^8.3.4",
-        "commander": "^13.1.0",
+        "commander": "^14.0.0",
         "console-grid": "^2.2.3",
         "eight-colors": "^1.3.1",
         "foreground-child": "^3.3.1",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
-        "istanbul-reports": "^3.1.7",
+        "istanbul-reports": "^3.2.0",
         "lz-utils": "^2.1.0",
         "monocart-locator": "^1.0.2"
     },
     "devDependencies": {
         "@actions/core": "^1.11.1",
         "@actions/github": "^6.0.1",
-        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/sourcemap-codec": "^1.5.5",
         "@jsdevtools/coverage-istanbul-loader": "^3.0.5",
-        "@rollup/plugin-commonjs": "^28.0.3",
-        "@rollup/plugin-typescript": "^12.1.2",
+        "@rollup/plugin-commonjs": "^28.0.6",
+        "@rollup/plugin-typescript": "^12.1.4",
         "async-tick": "^1.0.0",
         "babel-loader": "^10.0.0",
-        "babel-plugin-istanbul": "^7.0.0",
+        "babel-plugin-istanbul": "^7.0.1",
         "convert-source-map": "^2.0.0",
-        "cross-env": "^7.0.3",
+        "cross-env": "^10.0.0",
         "diff-sequences": "^29.6.3",
-        "esbuild": "^0.25.4",
-        "eslint": "~9.26.0",
-        "eslint-config-plus": "^2.0.2",
-        "eslint-plugin-html": "^8.1.2",
-        "eslint-plugin-vue": "^10.1.0",
+        "esbuild": "^0.25.9",
+        "eslint": "~9.35.0",
+        "eslint-config-plus": "^2.0.3",
+        "eslint-plugin-html": "^8.1.3",
+        "eslint-plugin-vue": "^10.4.0",
         "find-up": "^7.0.0",
         "foreground-child": "^3.3.1",
-        "koa": "^3.0.0",
+        "koa": "^3.0.1",
         "koa-static-resolver": "^1.0.6",
         "minimatch": "^9.0.5",
-        "mocha": "^11.2.2",
+        "mocha": "^11.7.2",
         "monocart-code-viewer": "^1.1.5",
         "monocart-formatter": "^3.0.1",
         "node-stream-zip": "^1.15.0",
-        "open": "^10.1.2",
-        "playwright": "^1.52.0",
-        "postcss": "^8.5.3",
-        "puppeteer": "^24.8.2",
-        "rollup": "^4.40.2",
-        "starfall-cli": "^2.0.21",
-        "stylelint": "^16.19.1",
-        "stylelint-config-plus": "^1.1.3",
-        "supports-color": "^10.0.0",
+        "open": "^10.2.0",
+        "playwright": "^1.55.0",
+        "postcss": "^8.5.6",
+        "puppeteer": "^24.19.0",
+        "rollup": "^4.50.1",
+        "starfall-cli": "^2.0.22",
+        "stylelint": "^16.24.0",
+        "stylelint-config-plus": "^1.1.4",
+        "supports-color": "^10.2.2",
         "swc-loader": "^0.2.6",
-        "ts-loader": "^9.5.2",
-        "tsx": "^4.19.4",
-        "turbogrid": "^3.2.0",
-        "typescript": "^5.8.3",
-        "vine-ui": "^3.1.16",
-        "webpack": "^5.99.8",
-        "ws": "^8.18.2",
+        "ts-loader": "^9.5.4",
+        "tsx": "^4.20.5",
+        "turbogrid": "^3.2.1",
+        "typescript": "^5.9.2",
+        "vine-ui": "^3.1.18",
+        "webpack": "^5.101.3",
+        "ws": "^8.18.3",
         "yazl": "^3.3.1"
     }
 }