fixed filter for encoded url

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 - 2.11.4
   - fixed encoded source url issue
+  - fixed filter for encoded url
 
 - 2.11.3
   - fixed cli to support `merge` command

lib/converter/untested.js

@@ -7,7 +7,7 @@ const { pathToFileURL, fileURLToPath } = require('url');
 const { normalizeSourcePath, getSourcePathReplacer } = require('../utils/source-path.js');
 
 // const EC = require('eight-colors');
-const { minimatch, convertSourceMap } = require('../packages/monocart-coverage-vendor.js');
+const { convertSourceMap } = require('../packages/monocart-coverage-vendor.js');
 
 // ========================================================================================================
 
@@ -37,7 +37,7 @@ const resolveAllFilter = (input) => {
             input = obj;
         } else {
             return (filePath) => {
-                return minimatch(filePath, input);
+                return Util.betterMinimatch(filePath, input);
             };
         }
     }
@@ -47,7 +47,7 @@ const resolveAllFilter = (input) => {
         const patterns = Object.keys(input);
         return (filePath) => {
             for (const pattern of patterns) {
-                if (minimatch(filePath, pattern)) {
+                if (Util.betterMinimatch(filePath, pattern)) {
                     return input[pattern];
                 }
             }

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];
                 }
             }

lib/utils/util.js

@@ -171,6 +171,34 @@ const Util = {
         };
     },
 
+    betterMinimatch: (str, pattern) => {
+        str = `${str}`;
+        pattern = `${pattern}`;
+
+        // mini match
+        if (minimatch(str, pattern)) {
+            return true;
+        }
+
+        // includes
+        if (str.includes(pattern)) {
+            return true;
+        }
+
+        // try decode url
+        str = decodeURIComponent(str);
+
+        if (minimatch(str, pattern)) {
+            return true;
+        }
+
+        if (str.includes(pattern)) {
+            return true;
+        }
+
+        return false;
+    },
+
     // eslint-disable-next-line complexity
     getEntryFilter: (options) => {
         // for entry.url
@@ -197,7 +225,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 +238,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 +280,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 +292,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];
                     }
                 }