monocart-coverage-reports 2.11.2 → 2.11.4

package/lib/reports/console-details.js

@@ -1,6 +1,5 @@
 const CG = require('console-grid');
 const EC = require('eight-colors');
-const { minimatch } = require('../packages/monocart-coverage-vendor.js');
 const { getGroupedRows } = require('../utils/snapshot.js');
 const Util = require('../utils/util.js');
 
@@ -78,7 +77,7 @@ const getFileFilter = (input) => {
             input = obj;
         } else {
             return (file) => {
-                return minimatch(file.sourcePath, input);
+                return Util.betterMinimatch(file.sourcePath, input);
             };
         }
     }
@@ -89,7 +88,7 @@ const getFileFilter = (input) => {
         return (file) => {
             const sourcePath = file.sourcePath;
             for (const pattern of patterns) {
-                if (minimatch(sourcePath, pattern)) {
+                if (Util.betterMinimatch(sourcePath, pattern)) {
                     return input[pattern];
                 }
             }

package/lib/utils/source-path.js

@@ -56,13 +56,23 @@ const filterPath = (str) => {
     return ls.join('/');
 };
 
+const betterFileURLToPath = (url) => {
+    try {
+        url = fileURLToPath(url);
+    } catch (e) {
+        url = decodeURIComponent(url);
+        url = fileURLToPath(url);
+    }
+    return url;
+};
+
 const normalizeSourcePath = (sourceUrl, baseDir) => {
 
     // includes anonymous and everything
 
     // file url
     if (sourceUrl.startsWith('file:')) {
-        const relPath = Util.relativePath(fileURLToPath(sourceUrl), baseDir);
+        const relPath = Util.relativePath(betterFileURLToPath(sourceUrl), baseDir);
         return filterPath(relPath);
     }
 
@@ -108,7 +118,7 @@ const normalizeSourcePath = (sourceUrl, baseDir) => {
 
     // relative path
     const fileUrl = pathToFileURL(sourceUrl).toString();
-    const relPath = Util.relativePath(fileURLToPath(fileUrl), baseDir);
+    const relPath = Util.relativePath(betterFileURLToPath(fileUrl), baseDir);
     return filterPath(relPath);
 };
 

package/lib/utils/util.js

@@ -171,6 +171,38 @@ const Util = {
         };
     },
 
+    betterMinimatch: (str, pattern) => {
+        str = `${str}`;
+        pattern = `${pattern}`;
+
+        if (pattern === '*') {
+            return true;
+        }
+
+        // includes first
+        if (str.includes(pattern)) {
+            return true;
+        }
+
+        // with minimatch
+        if (minimatch(str, pattern)) {
+            return true;
+        }
+
+        // after decode url
+        str = decodeURIComponent(str);
+
+        if (str.includes(pattern)) {
+            return true;
+        }
+
+        if (minimatch(str, pattern)) {
+            return true;
+        }
+
+        return false;
+    },
+
     // eslint-disable-next-line complexity
     getEntryFilter: (options) => {
         // for entry.url
@@ -197,7 +229,7 @@ const Util = {
                 input = obj;
             } else {
                 const handler = (entry) => {
-                    return minimatch(entry.url, input);
+                    return Util.betterMinimatch(entry.url, input);
                 };
                 options.entryFilterHandler = handler;
                 return handler;
@@ -210,7 +242,7 @@ const Util = {
             const handler = (entry) => {
                 const url = entry.url;
                 for (const pattern of patterns) {
-                    if (minimatch(url, pattern)) {
+                    if (Util.betterMinimatch(url, pattern)) {
                         return input[pattern];
                     }
                 }
@@ -252,7 +284,7 @@ const Util = {
                 input = obj;
             } else {
                 const handler = (sourcePath) => {
-                    return minimatch(sourcePath, input);
+                    return Util.betterMinimatch(sourcePath, input);
                 };
                 options.sourceFilterHandler = handler;
                 return handler;
@@ -264,7 +296,7 @@ const Util = {
             const patterns = Object.keys(input);
             const handler = (sourcePath) => {
                 for (const pattern of patterns) {
-                    if (minimatch(sourcePath, pattern)) {
+                    if (Util.betterMinimatch(sourcePath, pattern)) {
                         return input[pattern];
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-coverage-reports",
-    "version": "2.11.2",
+    "version": "2.11.4",
     "description": "A code coverage tool to generate native V8 reports or Istanbul reports.",
     "main": "./lib/index.js",
     "bin": {
@@ -51,6 +51,7 @@
         "test-merge": "node ./test/test-merge.js",
         "test-merge-istanbul": "node ./test/test-merge-istanbul.js",
         "test-merge-v8": "node ./test/test-merge-v8.js",
+        "test-merge-cli": "npx mcr merge -r console-details,v8 --inputDir .temp/code-coverage/raw --outputDir .temp/merge-cli",
         "test-client": "node ./test/test-client.js",
         "test-all": "node ./test/test.js",
         "test-pr": "node --inspect=9230 ./test/test-pr.js",
@@ -95,24 +96,25 @@
         "convert-source-map": "^2.0.0",
         "diff-sequences": "^29.6.3",
         "esbuild": "^0.24.0",
-        "eslint": "~9.14.0",
+        "eslint": "~9.16.0",
         "eslint-config-plus": "^2.0.2",
         "eslint-plugin-html": "^8.1.2",
-        "eslint-plugin-vue": "^9.30.0",
+        "eslint-plugin-vue": "^9.32.0",
         "find-up": "^7.0.0",
         "minimatch": "^9.0.5",
+        "mocha": "^11.0.1",
         "monocart-code-viewer": "^1.1.4",
         "monocart-formatter": "^3.0.0",
         "node-stream-zip": "^1.15.0",
-        "postcss": "^8.4.47",
+        "postcss": "^8.4.49",
         "starfall-cli": "^2.0.20",
-        "stylelint": "^16.10.0",
+        "stylelint": "^16.11.0",
         "stylelint-config-plus": "^1.1.3",
         "supports-color": "^9.4.0",
         "tsx": "^4.19.2",
         "turbogrid": "^3.2.0",
         "vine-ui": "^3.1.16",
         "ws": "^8.18.0",
-        "yazl": "^3.2.1"
+        "yazl": "^3.3.1"
     }
 }