monocart-coverage-reports 2.8.0 → 2.8.1

package/lib/cli.js

@@ -192,6 +192,7 @@ 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')
 

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');
@@ -1111,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) {

package/lib/index.d.ts

@@ -230,6 +230,9 @@ 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; 

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,

package/lib/utils/source-path.js

@@ -21,7 +21,8 @@ const filterPath = (str) => {
     return ls.join('/');
 };
 
-const getSourcePath = (url, index = '', type = '') => {
+// eslint-disable-next-line complexity
+const normalizeSourcePath = (url, baseDir, index = '', type = '') => {
 
     // no url for anonymous
     if (!url) {
@@ -32,7 +33,7 @@ const getSourcePath = (url, index = '', type = '') => {
 
     // already is file url
     if (url.startsWith('file:')) {
-        const relPath = Util.relativePath(fileURLToPath(url));
+        const relPath = Util.relativePath(fileURLToPath(url), baseDir);
         return filterPath(relPath);
     }
 
@@ -54,7 +55,7 @@ const getSourcePath = (url, index = '', type = '') => {
 
     // could be path
     const fileUrl = pathToFileURL(url).toString();
-    const relPath = Util.relativePath(fileURLToPath(fileUrl));
+    const relPath = Util.relativePath(fileURLToPath(fileUrl), baseDir);
     return filterPath(relPath);
 
 };
@@ -75,7 +76,7 @@ const getSourceType = (sourcePath) => {
 
 // ========================================================================================================
 
-const getSourcePathHandler = (options) => {
+const getSourcePathReplacer = (options) => {
     const input = options.sourcePath;
     if (typeof input === 'function') {
         return input;
@@ -96,8 +97,10 @@ const getSourcePathHandler = (options) => {
 
 // ========================================================================================================
 
-const initIstanbulSourcePath = (coverageData, fileSources, sourcePathHandler) => {
-    if (!sourcePathHandler) {
+const initIstanbulSourcePath = (coverageData, fileSources, options) => {
+
+    const sourcePathReplacer = getSourcePathReplacer(options);
+    if (!sourcePathReplacer) {
         return coverageData;
     }
 
@@ -119,7 +122,7 @@ const initIstanbulSourcePath = (coverageData, fileSources, sourcePathHandler) =>
         }
 
         // new source path, second is source url
-        const newSourcePath = sourcePathHandler(sourcePath, item);
+        const newSourcePath = sourcePathReplacer(sourcePath, item);
         if (typeof newSourcePath === 'string' && newSourcePath) {
             sourcePath = newSourcePath;
         }
@@ -180,16 +183,21 @@ const resolveSourceUrl = (sourceName, sourceRoot) => {
     return sourceUrl;
 };
 
-const initSourceMapSourcePath = (sourceMap, fileUrls, distFile, sourcePathHandler) => {
+const initSourceMapSourcesPath = (fileUrls, sourceMap, distFile, options) => {
+
+    const baseDir = options.baseDir;
+    const sourcePathReplacer = getSourcePathReplacer(options);
 
     sourceMap.sources = sourceMap.sources.map((sourceName, i) => {
 
         const sourceUrl = resolveSourceUrl(sourceName, sourceMap.sourceRoot);
 
-        let sourcePath = getSourcePath(sourceUrl, i + 1);
-        if (sourcePathHandler) {
+        let sourcePath = normalizeSourcePath(sourceUrl, baseDir, i + 1);
+        // console.log(sourceUrl, sourcePath);
+
+        if (sourcePathReplacer) {
             // sourcePath could be a filename only, may using distFile to get full path
-            const newSourcePath = sourcePathHandler(sourcePath, {
+            const newSourcePath = sourcePathReplacer(sourcePath, {
                 url: sourceUrl,
                 distFile
             });
@@ -208,9 +216,9 @@ module.exports = {
     // for unit test
     resolveSourceUrl,
 
-    getSourcePath,
+    normalizeSourcePath,
     getSourceType,
-    getSourcePathHandler,
+    getSourcePathReplacer,
     initIstanbulSourcePath,
-    initSourceMapSourcePath
+    initSourceMapSourcesPath
 };

package/lib/v8/v8.js

@@ -3,7 +3,7 @@ const EC = require('eight-colors');
 const Util = require('../utils/util.js');
 const { getV8Summary } = require('./v8-summary.js');
 const { dedupeFlatRanges } = require('../utils/dedupe.js');
-const { getSourcePath, getSourcePathHandler } = require('../utils/source-path.js');
+const { normalizeSourcePath, getSourcePathReplacer } = require('../utils/source-path.js');
 const { mergeScriptCovs, minimatch } = require('../packages/monocart-coverage-vendor.js');
 const { collectSourceMaps } = require('../converter/collect-source-maps.js');
 const version = require('../../package.json').version;
@@ -109,7 +109,9 @@ const initV8ListAndSourcemap = async (v8list, options) => {
         }
     }
 
-    const sourcePathHandler = getSourcePathHandler(options);
+    const sourcePathReplacer = getSourcePathReplacer(options);
+
+    const baseDir = options.baseDir;
 
     // init id, sourcePath
     v8list = v8list.map((entry, i) => {
@@ -149,9 +151,9 @@ const initV8ListAndSourcemap = async (v8list, options) => {
         }
 
         // resolve source path
-        let sourcePath = getSourcePath(data.url, i + 1, data.type);
-        if (sourcePathHandler) {
-            const newSourcePath = sourcePathHandler(sourcePath, data);
+        let sourcePath = normalizeSourcePath(data.url, baseDir, i + 1, data.type);
+        if (sourcePathReplacer) {
+            const newSourcePath = sourcePathReplacer(sourcePath, data);
             if (typeof newSourcePath === 'string' && newSourcePath) {
                 sourcePath = newSourcePath;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-coverage-reports",
-    "version": "2.8.0",
+    "version": "2.8.1",
     "description": "A code coverage tool to generate native V8 reports or Istanbul reports.",
     "main": "./lib/index.js",
     "bin": {