monocart-coverage-reports 2.7.10 → 2.8.1

package/lib/cli.js

@@ -192,9 +192,13 @@ program
 
     .option('-o, --outputDir <dir>', 'output dir for reports')
     .option('-i, --inputDir <dir>', 'input dir for merging raw files')
+    .option('-b, --baseDir <dir>', 'base dir for normalizing path')
+
+    .option('-a, --all <dir>', 'include all files from dir')
 
     .option('--entryFilter <pattern>', 'entry url filter')
     .option('--sourceFilter <pattern>', 'source path filter')
+    .option('--filter <pattern>', 'the combined filter')
 
     .option('--outputFile <path>', 'output file for v8 report')
     .option('--inline', 'inline html for v8 report')

package/lib/converter/converter.js

@@ -16,9 +16,7 @@ const { getIgnoredRanges } = require('./ignore.js');
 const {
     sortRanges, dedupeCountRanges, mergeRangesWith
 } = require('../utils/dedupe.js');
-const {
-    getSourceType, getSourcePathHandler, initSourceMapSourcePath
-} = require('../utils/source-path.js');
+const { getSourceType, initSourceMapSourcesPath } = require('../utils/source-path.js');
 const { decode, minimatch } = require('../packages/monocart-coverage-vendor.js');
 
 const InfoBranch = require('./info-branch.js');
@@ -943,7 +941,7 @@ const getOriginalDecodedMappings = (originalDecodedMap, sourceIndex, locator) =>
 // ========================================================================================================
 
 const getSourceFilter = (options) => {
-    const input = options.sourceFilter;
+    let input = options.sourceFilter || options.filter;
 
     // for function handler
     if (typeof input === 'function') {
@@ -952,9 +950,17 @@ const getSourceFilter = (options) => {
 
     // for single minimatch pattern
     if (input && typeof input === 'string') {
-        return (sourcePath) => {
-            return minimatch(sourcePath, input);
-        };
+        // string to multiple patterns "{...}"
+        // mcr npx mocha --sourceFilter {'**/node_modules/**':false,'**/src/*.js':true}
+        // mcr npx mocha --sourceFilter "{'**/node_modules/**': false, '**/src/*.js': true}"
+        const obj = Util.strToObj(input);
+        if (obj) {
+            input = obj;
+        } else {
+            return (sourcePath) => {
+                return minimatch(sourcePath, input);
+            };
+        }
     }
 
     // for patterns
@@ -1103,8 +1109,7 @@ const unpackSourceMap = (state, options) => {
 
     // keep original urls
     const fileUrls = {};
-    const sourcePathHandler = getSourcePathHandler(options);
-    initSourceMapSourcePath(sourceMap, fileUrls, sourcePath, sourcePathHandler);
+    initSourceMapSourcesPath(fileUrls, sourceMap, sourcePath, options);
     state.fileUrls = fileUrls;
 
     // ===============================================

package/lib/default/options.js

@@ -24,6 +24,9 @@ module.exports = {
     // {string|string[]} input raw dir(s)
     inputDir: null,
 
+    // {string} base dir for normalizing the relative source path, defaults to cwd
+    baseDir: null,
+
     // (V8 only) {function} A filter function to execute for each element in the V8 list.
     // entryFilter: (entry) => {
     //     if (entry.url.indexOf('googleapis.com') !== -1) {
@@ -37,6 +40,9 @@ module.exports = {
     // sourceFilter: (sourcePath) => sourcePath.search(/src\/.+/) !== -1,
     sourceFilter: null,
 
+    // The combined filter for entryFilter and sourceFilter
+    filter: null,
+
     // {function} Source path handler.
     // sourcePath: (filePath) => `wwwroot/${filePath}`,
     sourcePath: null,

package/lib/generate.js

@@ -501,9 +501,15 @@ const resolveAllFilter = (input) => {
 
     // for single minimatch pattern
     if (input && typeof input === 'string') {
-        return (filePath) => {
-            return minimatch(filePath, input);
-        };
+        // string to multiple patterns "{...}"
+        const obj = Util.strToObj(input);
+        if (obj) {
+            input = obj;
+        } else {
+            return (filePath) => {
+                return minimatch(filePath, input);
+            };
+        }
     }
 
     // for patterns
@@ -543,9 +549,18 @@ const resolveAllOptions = (input, dataList) => {
     let type;
     let dir;
     let filter;
-    if (typeof input === 'string' || Array.isArray(input)) {
+
+    if (typeof input === 'string') {
+        const obj = Util.strToObj(input);
+        if (obj) {
+            type = obj.type;
+            dir = obj.dir;
+            filter = obj.filter;
+        } else {
+            dir = input;
+        }
+    } else if (Array.isArray(input)) {
         dir = input;
-        filter = () => true;
     } else {
         type = input.type;
         dir = input.dir;

package/lib/index.d.ts

@@ -230,10 +230,13 @@ declare namespace MCR {
         /** {string|string[]} input raw dir(s) */
         inputDir?: string | string[];
 
+        /** {string} base dir for normalizing the relative source path, defaults to cwd */
+        baseDir?: string;
+
         /** (V8 only) 
          * 
-         * {string} `minimatch` pattern for entry url; {object} multiple patterns;
-         * 
+         * {string} `minimatch` pattern for entry url; 
+         * {object} multiple patterns;
          * {function} A filter function for each entry file in the V8 list.
          */
         entryFilter?: string | {
@@ -242,14 +245,21 @@ declare namespace MCR {
 
         /** (V8 only) 
          * 
-         * {string} `minimatch` pattern for source path; {object} multiple patterns;
-         * 
+         * {string} `minimatch` pattern for source path; 
+         * {object} multiple patterns;
          * {function} A filter function for each source path when the source is unpacked from the source map. 
          */
         sourceFilter?: string | {
             [pattern: string]: boolean;
         } | ((sourcePath: string) => boolean);
 
+        /**
+         * The combined filter for entryFilter and sourceFilter
+         */
+        filter?: string | {
+            [pattern: string]: boolean;
+        } | ((input: string | V8CoverageEntry) => boolean);
+
         /** 
          * {function} Source path handler. 
          * 
@@ -378,8 +388,6 @@ declare namespace MCR {
             'mcr.config.cjs',
             'mcr.config.mjs',
             'mcr.config.json',
-            '.mcrrc.js',
-            '.mcrrc',
             'mcr.config.ts'
          */
         loadConfig: (configFile?: string) => Promise<void>;

package/lib/index.js

@@ -238,28 +238,15 @@ class CoverageReport {
     // load config file
     async loadConfig(customConfigFile) {
 
-        // order by priority
-        const configList = customConfigFile ? [customConfigFile] : [
-            'mcr.config.js',
-            'mcr.config.cjs',
-            'mcr.config.mjs',
-            'mcr.config.json',
-            'mcr.config.ts',
-            '.mcrrc.js',
-            '.mcrrc'
-        ];
-
-        const existsList = configList.filter((p) => p && fs.existsSync(p));
-        if (!existsList.length) {
+        const configPath = Util.findUpConfig(customConfigFile);
+        if (!configPath) {
             if (customConfigFile) {
                 Util.logError(`The config file does not exist: ${customConfigFile}`);
             }
-            // no config
+            // not found config
             return;
         }
 
-        // first one, high priority
-        const configPath = existsList[0];
         const configOptions = await resolveConfigOptions(configPath);
         if (!configOptions) {
             // failed to load config options

package/lib/istanbul/istanbul.js

@@ -7,7 +7,7 @@ const istanbulLibReport = require('istanbul-lib-report');
 const Util = require('../utils/util.js');
 const IstanbulSummary = require('./istanbul-summary.js');
 
-const { getSourcePathHandler, initIstanbulSourcePath } = require('../utils/source-path.js');
+const { initIstanbulSourcePath } = require('../utils/source-path.js');
 
 const findHtmlPath = (outputDir) => {
     const defaultHtml = path.resolve(outputDir, 'index.html');
@@ -129,9 +129,7 @@ const mergeIstanbulCoverage = (dataList) => {
 const initIstanbulData = (istanbulData, options) => {
 
     const fileSources = options.fileSources || {};
-    const sourcePathHandler = getSourcePathHandler(options);
-
-    const coverageData = initIstanbulSourcePath(istanbulData, fileSources, sourcePathHandler);
+    const coverageData = initIstanbulSourcePath(istanbulData, fileSources, options);
 
     return {
         fileSources,