monocart-coverage-reports 2.6.3 → 2.6.5

package/README.md

@@ -33,6 +33,7 @@
     - [Using `v8-to-istanbul`](#using-v8-to-istanbul)
     - [How Monocart Works](#how-monocart-works)
 * [Debug for Coverage and Sourcemap](#debug-for-coverage-and-sourcemap)
+* [Common issues](#common-issues)
 * [Integration](#integration)
     - [Playwright](#playwright)
     - [Jest](#jest)
@@ -282,10 +283,11 @@ Arguments:
 
 Options:
   -V, --version                output the version number
-  -c, --config <path>          custom config path
-  -o, --outputDir <dir>        output dir for reports
-  -r, --reports <name[,name]>  coverage reports to use
+  -c, --config <path>          custom config file path
+  --logging <logging>          off, error, info, debug
   -n, --name <name>            report name for title
+  -r, --reports <name[,name]>  coverage reports to use
+  -o, --outputDir <dir>        output dir for reports
   -i, --inputDir <dir>         input dir for merging raw files
   --entryFilter <pattern>      entry url filter
   --sourceFilter <pattern>     source path filter
@@ -293,24 +295,20 @@ Options:
   --inline                     inline html for v8 report
   --assetsPath <path>          assets path if not inline
   --lcov                       generate lcov.info file
-  --logging <logging>          off, error, info, debug
   -h, --help                   display help for command
 ```
 
-- Loading default configuration file
-    - `.mcrrc`
-    - `mcr.config.json`
-    - `mcr.config.mjs`
-    - `mcr.config.cjs`
+- Loading config file by priority:
+    - custom config file with `-c` or `--config`
     - `mcr.config.js`
-    - `mcr.config.ts`
-
-- Or loading custom configuration file with `-c` or `--config`
-```sh
-mcr node ./test.js -c path-to/my-custom-config.js
-```
+    - `mcr.config.cjs`
+    - `mcr.config.mjs`
+    - `mcr.config.json` - json format
+    - `.mcrrc.js`
+    - `.mcrrc` - json format
+    - `mcr.config.ts` - it requires `NODE_OPTIONS="--loader ts-node/esm"`
 
-- Work with `ts-node`, see [mcr-ts-node](https://github.com/cenfun/mcr-ts-node)
+- Working with `ts-node`, see [mcr-ts-node](https://github.com/cenfun/mcr-ts-node)
 
 ## Compare Reports
 | | Istanbul | V8 | V8 to Istanbul |
@@ -707,6 +705,28 @@ When `logging` is `debug`, the raw report data will be preserved in `[outputDir]
 
 ![](./assets/debug-sourcemap.png)
 
+## Common issues
+- `Unparsable source`
+
+It happens during the parsing of the source code into AST, if the source code is not in the standard ECMAScript. For example `ts`, `jsx` and so on. There is a option to fix it, which is to manually compile the source code for these files.
+```js
+import * as fs from "fs";
+import * as path from "path";
+import { fileURLToPath } from "url";
+import * as TsNode from 'ts-node';
+const coverageOptions = {
+    onEntry: async (entry) => {
+        const filePath = fileURLToPath(entry.url)
+        const originalSource = fs.readFileSync(filePath).toString("utf-8");
+        const fileName = path.basename(filePath);
+        const tn = TsNode.create({});
+        const source = tn.compile(originalSource, fileName);
+        entry.fake = false;
+        entry.source = source;
+    }
+}
+```
+
 ## Integration
 
 ### [Playwright](https://github.com/microsoft/playwright)

package/lib/cli.js

@@ -3,7 +3,7 @@
 const fs = require('fs');
 const path = require('path');
 const EC = require('eight-colors');
-const { fileURLToPath, pathToFileURL } = require('url');
+const { fileURLToPath } = require('url');
 
 const {
     foregroundChild,
@@ -12,86 +12,10 @@ const {
 
 const MCR = require('./index.js');
 const Util = require('./utils/util.js');
-const defaultOptions = require('./default/options.js');
 const { resolveSourceMap } = require('./converter/collect-source-maps.js');
 
 const version = require('../package.json').version;
 
-const resolveConfigPath = (customConfigPath) => {
-
-    const configList = [
-        '.mcrrc',
-        'mcr.config.json',
-        'mcr.config.mjs',
-        'mcr.config.cjs',
-        'mcr.config.js',
-        'mcr.config.ts'
-    ];
-
-    if (customConfigPath) {
-        configList.push(customConfigPath);
-    }
-
-    const existsList = configList.filter((p) => fs.existsSync(p));
-    if (!existsList.length) {
-        return;
-    }
-
-    // last one
-    const configPath = existsList.pop();
-    Util.logInfo(`Config: ${EC.cyan(configPath)}`);
-
-    return configPath;
-};
-
-const resolveConfigOptions = async (configPath) => {
-
-    // json format
-    const ext = path.extname(configPath);
-    if (ext === '.json' || configPath.slice(-2) === 'rc') {
-        return JSON.parse(Util.readFileSync(configPath));
-    }
-
-    let configOptions;
-    let err;
-    try {
-        configOptions = await import(pathToFileURL(configPath));
-    } catch (ee) {
-        err = ee;
-    }
-
-    if (err || !configOptions) {
-        Util.logError(`ERROR: failed to import "${configPath}": ${err && err.message} `);
-        return;
-    }
-
-    configOptions = configOptions.default || configOptions;
-
-    return configOptions;
-};
-
-const initOptions = async (cliOptions) => {
-
-    const configPath = resolveConfigPath(cliOptions.config);
-    if (configPath) {
-        const configOptions = await resolveConfigOptions(configPath);
-        if (configOptions) {
-            cliOptions = {
-                ... configOptions,
-                ... cliOptions
-            };
-        }
-    }
-
-    // report options
-    const options = {
-        ... defaultOptions,
-        ... cliOptions
-    };
-
-    return options;
-};
-
 const resolveEntrySource = (entry, sourceMapCache = {}) => {
     let source;
     const filePath = fileURLToPath(entry.url);
@@ -100,7 +24,7 @@ const resolveEntrySource = (entry, sourceMapCache = {}) => {
         source = fs.readFileSync(filePath).toString('utf8');
     }
 
-    // not for typescript
+    // not for typescript, but it could be jsx even it is `.js`
     if (source && !['.ts', '.tsx'].includes(extname)) {
         entry.source = source;
         return;
@@ -111,7 +35,6 @@ const resolveEntrySource = (entry, sourceMapCache = {}) => {
 
     // for fake source file (can not parse to AST)
     if (lineLengths) {
-        // get runtime code with ts-node
         let fakeSource = '';
         sourcemapData.lineLengths.forEach((length) => {
             fakeSource += `${''.padEnd(length, '*')}\n`;
@@ -188,25 +111,25 @@ const addCoverageData = async (coverageReport, nodeV8CoverageDir) => {
 
 const executeCommand = async (command, cliOptions) => {
 
-    const options = await initOptions(cliOptions);
-
     Util.logInfo(`Execute: ${EC.cyan(command)}`);
+
     // console.log(options);
+    const coverageReport = MCR(cliOptions);
+    await coverageReport.loadConfig(cliOptions.config);
+    coverageReport.cleanCache();
 
-    const nodeV8CoverageDir = path.resolve(options.outputDir, '.v8-coverage');
-    process.env.NODE_V8_COVERAGE = nodeV8CoverageDir;
+    const coverageOptions = coverageReport.options;
 
+    // dir for node v8 coverage
+    const nodeV8CoverageDir = Util.relativePath(path.resolve(coverageOptions.outputDir, '.v8-coverage'));
+    process.env.NODE_V8_COVERAGE = nodeV8CoverageDir;
     // clean v8 cache before running
     Util.rmSync(nodeV8CoverageDir);
-
-    // console.log('nodeV8CoverageDir', nodeV8CoverageDir);
-
-    const coverageReport = MCR(options);
-    coverageReport.cleanCache();
+    // Util.logInfo(`V8 coverage dir: ${EC.cyan(nodeV8CoverageDir)}`);
 
     // =========================================
     // onStart hook
-    const onStart = options.onStart;
+    const onStart = coverageOptions.onStart;
     if (typeof onStart === 'function') {
         await onStart(coverageReport);
     }
@@ -214,17 +137,19 @@ const executeCommand = async (command, cliOptions) => {
 
     const subprocess = foregroundChild(command, {
         shell: true
-    }, async () => {
+    }, async (code, signal) => {
+
+        // generate coverage even it is failed. code != 0
 
         if (!fs.existsSync(nodeV8CoverageDir)) {
-            EC.logRed(`Not found coverage data: ${Util.relativePath(nodeV8CoverageDir)}`);
+            EC.logRed(`Not found V8 coverage dir: ${Util.relativePath(nodeV8CoverageDir)}`);
             return 1;
         }
 
         // =========================================
         // onReady hook before adding coverage data.
         // Sometimes, the child process has not yet finished writing the coverage data, and it needs to wait here.
-        const onReady = options.onReady;
+        const onReady = coverageOptions.onReady;
         if (typeof onReady === 'function') {
             await onReady(coverageReport, nodeV8CoverageDir, subprocess);
         }
@@ -243,16 +168,23 @@ const executeCommand = async (command, cliOptions) => {
 
 };
 
+process.on('uncaughtException', function(err) {
+    Util.logError(`ERROR: ${err.message || err}`);
+});
+
 program
     .name('mcr')
     .description('CLI to generate coverage reports')
     .version(version)
     .argument('<command>', 'command to execute')
     .allowUnknownOption()
-    .option('-c, --config <path>', 'custom config path')
-    .option('-o, --outputDir <dir>', 'output dir for reports')
-    .option('-r, --reports <name[,name]>', 'coverage reports to use')
+    .option('-c, --config <path>', 'custom config file path')
+    .option('--logging <logging>', 'off, error, info, debug')
+
     .option('-n, --name <name>', 'report name for title')
+    .option('-r, --reports <name[,name]>', 'coverage reports to use')
+
+    .option('-o, --outputDir <dir>', 'output dir for reports')
     .option('-i, --inputDir <dir>', 'input dir for merging raw files')
 
     .option('--entryFilter <pattern>', 'entry url filter')
@@ -264,8 +196,6 @@ program
 
     .option('--lcov', 'generate lcov.info file')
 
-    .option('--logging <logging>', 'off, error, info, debug')
-
     .action((_command, cliOptions) => {
         const command = program.args.join(' ');
         executeCommand(command, cliOptions);

package/lib/converter/ast.js

@@ -188,7 +188,9 @@ const getJsAstInfo = (item, coverageList) => {
         }
 
         // runtime code should be parsed successful
-        Util.logInfo(`failed to parse source file: ${item.sourcePath} ${err.message}`);
+        Util.logInfo(`Unparsable source: ${item.sourcePath} ${err.message}`);
+
+        // it could be jsx even it is `.js`
 
         // https://github.com/acornjs/acorn/tree/master/acorn-loose
         // It is recommended to always try a parse with the regular acorn parser first,

package/lib/converter/find-original-range.js

@@ -97,6 +97,7 @@ const getBlockEndPosition = (originalLineText) => {
     // generatedPos: 17,
     // originalText: ' }}</slot>'
 
+    // end marks
     const list = ['>', '}', ')'];
     for (const s of list) {
         const endBlockIndex = originalLineText.lastIndexOf(s);
@@ -116,7 +117,11 @@ const getBlockEndPosition = (originalLineText) => {
 
 };
 
-const getComparedPosition = (gt, gp, ot, direction) => {
+const getComparedPosition = (info, direction) => {
+
+    let gt = info.generatedText;
+    const gp = info.generatedPos;
+    let ot = info.originalText;
 
     // before trim
     const oLen = ot.length;
@@ -175,45 +180,54 @@ const getComparedPosition = (gt, gp, ot, direction) => {
 
     // ============================
     // right matched
+    // only for original first line text
 
+    const olt = info.originalLineText;
     const right = gt.slice(gp);
-    if (ot.endsWith(right)) {
+    if (olt.endsWith(right)) {
         return {
-            pos: ot.length - right.length
+            pos: olt.length - right.length
         };
     }
 
 };
 
+const initOriginalLineText = (info) => {
+    const originalText = info.originalText;
+    // never cross line, using first line of original text
+    // trim end remove \r\n and \n
+    const originalLines = originalText.split(/\n/);
+    if (originalLines.length === 1) {
+        // already single line
+        info.originalLineText = originalText.trimEnd();
+        info.originalSingle = true;
+        return;
+    }
+    // multiple liens
+    info.originalLineText = originalLines[0].trimEnd();
+};
+
 const getSimilarPosition = (info, direction) => {
 
-    const {
-        generatedText, generatedPos, originalText
-    } = info;
+    initOriginalLineText(info);
 
-    const textPos = getComparedPosition(generatedText, generatedPos, originalText, direction);
+    const textPos = getComparedPosition(info, direction);
     if (textPos) {
         return textPos;
     }
 
-    // never cross line, using first line of original text
-    // trim end remove \r\n and \n
-    const originalLines = originalText.split(/\n/);
-    if (originalLines.length === 1) {
-        // already single line
-        info.originalLineText = originalText;
+    if (info.originalSingle) {
         return;
     }
 
-    const originalLineText = originalLines[0].trimEnd();
-    info.originalLineText = originalLineText;
-
+    // multiple lines
+    const { generatedPos, originalLineText } = info;
     // generatedPos not in first line
     if (generatedPos > originalLineText.length) {
         return;
     }
 
-    const linePos = getComparedPosition(generatedText, generatedPos, originalLineText, direction);
+    const linePos = getComparedPosition(info, direction);
     if (linePos) {
         return linePos;
     }
@@ -236,6 +250,7 @@ const getFixedPosition = (info, direction) => {
         return similarPos.pos;
     }
 
+
     // generatedText: never cross lines
     // originalText: could be multiple lines
     // originalLineText: single line originalText
@@ -266,7 +281,7 @@ const getOriginalEndOffset = (m, rangeInfo) => {
     return m.originalEndOffset;
 };
 
-const getOriginalText = (m1, m2, rangeInfo, direction) => {
+const getOriginalText = (m1, m2, rangeInfo) => {
     const originalLocator = rangeInfo.originalState.locator;
 
     const o1 = m1.originalOffset;
@@ -383,15 +398,17 @@ const getFixedOriginalStart = (start, mappings, state, rangeInfo) => {
     }
 
     const direction = 'start';
-    const { originalText, originalOffset } = getOriginalText(m1, m2, rangeInfo, direction);
+    const { originalText, originalOffset } = getOriginalText(m1, m2, rangeInfo);
     const { generatedText, generatedPos } = getGeneratedText(m1, m2, state, start);
 
-    const originalPos = getFixedPosition({
+    const info = {
         generatedText,
         generatedPos,
         originalText,
         originalState
-    }, direction);
+    };
+
+    const originalPos = getFixedPosition(info, direction);
 
     // if (start === 2660) {
     //     console.log('=====================================================');
@@ -437,7 +454,8 @@ const getFixedOriginalEnd = (end, mappings, state, rangeInfo) => {
         const gt = state.locator.source[end];
         const oi = m2.originalOffset - 1;
         const ot = originalState.locator.source[oi];
-        if (gt === ot) {
+        // it could be ; but it quite far away
+        if (gt === ot && [';', ','].includes(gt)) {
             return {
                 originalEnd: oi
             };
@@ -456,24 +474,28 @@ const getFixedOriginalEnd = (end, mappings, state, rangeInfo) => {
     }
 
     const direction = 'end';
-    const { originalText, originalOffset } = getOriginalText(m1, m2, rangeInfo, direction);
+    const { originalText, originalOffset } = getOriginalText(m1, m2, rangeInfo);
     const { generatedText, generatedPos } = getGeneratedText(m1, m2, state, end);
 
-    const originalPos = getFixedPosition({
+    const info = {
+        offset: end,
         generatedText,
         generatedPos,
         originalText,
         originalState
-    }, direction);
+    };
 
-    // if (end === 2858) {
+    const originalPos = getFixedPosition(info, direction);
+
+    // if (end === 1304578) {
     //     console.log('=====================================================');
     //     console.log('fixed end', originalState.sourcePath);
     //     console.log({
     //         generatedText,
     //         generatedPos,
     //         originalText,
-    //         originalPos
+    //         originalPos,
+    //         originalLineText: info.originalLineText
     //     });
     // }
 

package/lib/default/options.js

@@ -3,11 +3,8 @@ module.exports = {
     // {string} logging levels: off, error, info, debug
     logging: 'info',
 
-    // {string} output dir
-    outputDir: './coverage-reports',
-
-    // {string|string[]} input raw dir(s)
-    inputDir: null,
+    // {string} Report name. Defaults to "Coverage Report".
+    name: 'Coverage Report',
 
     // {string} v8 or html for istanbul by default
     // {array} multiple reports with options
@@ -21,17 +18,11 @@ module.exports = {
     // ],
     reports: '',
 
-    // {string} Report name. Defaults to "Coverage Report".
-    name: 'Coverage Report',
-
-    // (V8 only) {string} Output [sub dir/]filename. Defaults to "index.html"
-    outputFile: 'index.html',
-
-    // (V8 only) {boolean} Inline all scripts to the single HTML file. Defaults to false.
-    inline: false,
+    // {string} output dir
+    outputDir: './coverage-reports',
 
-    // (V8 only) {string} Assets path if not inline. Defaults to "./assets"
-    assetsPath: './assets',
+    // {string|string[]} input raw dir(s)
+    inputDir: null,
 
     // (V8 only) {function} A filter function to execute for each element in the V8 list.
     // entryFilter: (entry) => {
@@ -46,6 +37,24 @@ module.exports = {
     // sourceFilter: (sourcePath) => sourcePath.search(/src\/.+/) !== -1,
     sourceFilter: null,
 
+    // {function} Source path handler.
+    // sourcePath: (filePath) => `wwwroot/${filePath}`,
+    sourcePath: null,
+
+    // (V8 only) {string} Output [sub dir/]filename. Defaults to "index.html"
+    outputFile: 'index.html',
+
+    // (V8 only) {boolean} Inline all scripts to the single HTML file. Defaults to false.
+    inline: false,
+
+    // (V8 only) {string} Assets path if not inline. Defaults to "./assets"
+    assetsPath: './assets',
+
+    // (Istanbul only) defaultSummarizer, sourceFinder
+
+    // {boolean} Generate lcov.info file, same as lcovonly report. Defaults to false.
+    lcov: false,
+
     // options for adding empty coverage for all files
     // all: {
     //     dir: ['src'],
@@ -56,15 +65,6 @@ module.exports = {
     // (V8 only) {boolean} Enable/Disable ignoring uncovered codes with the special comments: v8 ignore next/next N/start/stop
     v8Ignore: true,
 
-    // (Istanbul only) defaultSummarizer, sourceFinder
-
-    // {boolean} Generate lcov.info file, same as lcovonly report. Defaults to false.
-    lcov: false,
-
-    // {function} Source path handler.
-    // sourcePath: (filePath) => `wwwroot/${filePath}`,
-    sourcePath: null,
-
     // {string|function} Specify the report path, especially when there are multiple reports. Defaults to outputDir/index.html.
     reportPath: null,
 
@@ -78,6 +78,10 @@ module.exports = {
     // {boolean} Indicates whether to clean previous cache in output dir before generating report. Defaults to false.
     cleanCache: false,
 
+    // {function} onEntry hook
+    // onEntry: async (entry) => {}
+    onEntry: null,
+
     // {function} onEnd hook
     // onEnd: async (reportData) => {}
     onEnd: null

package/lib/generate.js

@@ -288,12 +288,15 @@ const handleConsoleDetailsReport = (reportData, reportOptions, options) => {
     } = reportData;
 
     if (name) {
-        EC.logCyan(name);
+        Util.logInfo(EC.cyan(name));
     }
 
     const metrics = Util.getMetrics(cdOptions.metrics, type);
     const rows = getDetailsRows(files, metrics, cdOptions);
     const summaryRow = getRowData('Summary', summary, metrics);
+    if (summaryRow.nameStatus) {
+        summaryRow.name = Util.getColorStrByStatus(summaryRow.name, summaryRow.nameStatus);
+    }
     // no rows if skipped all by skipPercent
     if (rows.length) {
         rows.push({
@@ -339,7 +342,7 @@ const handleConsoleSummaryReport = (reportData, reportOptions, options) => {
     } = reportData;
 
     if (name) {
-        EC.logCyan(name);
+        Util.logInfo(EC.cyan(name));
     }
 
     const metrics = Util.getMetrics(csOptions.metrics, type);