monocart-coverage-reports 2.5.1 → 2.5.2

package/lib/converter/collect-source-maps.js

@@ -55,17 +55,12 @@ const getSourceMapUrl = (content, url) => {
     // for some odd reason //# .. captures in 1 and /* .. */ in 2
     const filename = r[1] || r[2];
 
-    if (!URL.canParse(filename, url)) {
-        url = pathToFileURL(url).toString();
+    const urlObj = Util.resolveUrl(filename, url);
+    if (urlObj) {
+        return urlObj.toString();
     }
 
-    let mapUrl;
-
-    try {
-        mapUrl = new URL(filename, url);
-    } catch (e) {
-        Util.logDebug(EC.red(`${e.message} ${filename} ${url}`));
-    }
+    const mapUrl = Util.resolveUrl(filename, pathToFileURL(url).toString());
     if (mapUrl) {
         return mapUrl.toString();
     }

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, ./ ../
@@ -40,16 +29,12 @@ const getSourcePath = (url, index = '', type = '') => {
     }
 
     // url could be a path
-    if (!URL.canParse(url)) {
-        url = pathToFileURL(url).toString();
-    }
-
     if (url.startsWith('file:')) {
         const relPath = Util.relativePath(fileURLToPath(url));
         return filterPath(relPath);
     }
 
-    const urlObj = resolveUrl(url);
+    const urlObj = Util.resolveUrl(url);
     if (urlObj) {
         const host = [urlObj.hostname, urlObj.port].filter((it) => it).join('-');
         // always start with '/'
@@ -64,7 +49,9 @@ const getSourcePath = (url, index = '', type = '') => {
         return filterPath(p);
     }
 
+    url = pathToFileURL(url).toString();
     return filterPath(url);
+
 };
 
 const getSourceType = (sourcePath) => {

package/lib/utils/util.js

@@ -70,6 +70,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.2",
     "description": "Monocart coverage reports",
     "main": "./lib/index.js",
     "bin": {