monocart-coverage-reports 2.5.1 → 2.5.3

package/lib/utils/source-path.js

@@ -2,17 +2,6 @@ const path = require('path');
 const { fileURLToPath, pathToFileURL } = require('url');
 const Util = require('./util.js');
 
-const resolveUrl = (input) => {
-    let url;
-    try {
-        url = new URL(input);
-    } catch (e) {
-        // console.error('error url', input);
-        return;
-    }
-    return url;
-};
-
 const filterPath = (str) => {
     str = decodeURI(str);
     // remove / of start, end or double, ./ ../
@@ -34,22 +23,21 @@ const filterPath = (str) => {
 
 const getSourcePath = (url, index = '', type = '') => {
 
+    // no url for anonymous
     if (!url) {
         // anonymous scripts will have __playwright_evaluation_script__ as their URL.
-        url = pathToFileURL(['anonymous', index ? `-${index}` : '', type ? `.${type}` : ''].join('')).toString();
-    }
-
-    // url could be a path
-    if (!URL.canParse(url)) {
-        url = pathToFileURL(url).toString();
+        url = ['anonymous', index ? `-${index}` : '', type ? `.${type}` : ''].join('');
+        return filterPath(url);
     }
 
+    // already is file url
     if (url.startsWith('file:')) {
         const relPath = Util.relativePath(fileURLToPath(url));
         return filterPath(relPath);
     }
 
-    const urlObj = resolveUrl(url);
+    // http/https url, other url
+    const urlObj = Util.resolveUrl(url);
     if (urlObj) {
         const host = [urlObj.hostname, urlObj.port].filter((it) => it).join('-');
         // always start with '/'
@@ -64,7 +52,11 @@ const getSourcePath = (url, index = '', type = '') => {
         return filterPath(p);
     }
 
-    return filterPath(url);
+    // could be path
+    const fileUrl = pathToFileURL(url).toString();
+    const relPath = Util.relativePath(fileURLToPath(fileUrl));
+    return filterPath(relPath);
+
 };
 
 const getSourceType = (sourcePath) => {

package/lib/utils/util.js

@@ -9,7 +9,13 @@ const CG = require('console-grid');
 const Share = require('../platform/share.js');
 const { deflateSync } = require('lz-utils');
 
-const { acornWalk } = require('../packages/monocart-coverage-vendor.js');
+const { acornWalk, supportsColor } = require('../packages/monocart-coverage-vendor.js');
+
+// https://github.com/chalk/supports-color
+// disabled color if Terminal stdout does not support color
+if (!supportsColor.stdout) {
+    EC.disabled = true;
+}
 
 const Util = {
     ... Share,
@@ -70,6 +76,17 @@ const Util = {
         return false;
     },
 
+    resolveUrl: (input, base) => {
+        let url;
+        try {
+            url = new URL(input, base);
+        } catch (e) {
+            // console.error('error url', input);
+            return;
+        }
+        return url;
+    },
+
     resolveCacheSourcePath: (cacheDir, id) => {
         const filename = `source-${id}.json`;
         const sourcePath = path.resolve(cacheDir, filename);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-coverage-reports",
-    "version": "2.5.1",
+    "version": "2.5.3",
     "description": "Monocart coverage reports",
     "main": "./lib/index.js",
     "bin": {
@@ -55,10 +55,10 @@
     },
     "dependencies": {
         "console-grid": "~2.2.1",
-        "eight-colors": "~1.2.1",
+        "eight-colors": "~1.3.0",
         "istanbul-lib-coverage": "~3.2.2",
         "istanbul-lib-report": "~3.0.1",
-        "istanbul-reports": "~3.1.6",
+        "istanbul-reports": "~3.1.7",
         "lz-utils": "~2.0.2",
         "monocart-code-viewer": "~1.1.0",
         "monocart-formatter": "~2.3.1",
@@ -71,6 +71,7 @@
         "eslint-plugin-html": "^8.0.0",
         "eslint-plugin-vue": "^9.21.1",
         "stylelint": "^15.11.0",
-        "stylelint-config-plus": "^1.0.4"
+        "stylelint-config-plus": "^1.0.4",
+        "supports-color": "^9.4.0"
     }
 }