monocart-coverage-reports 2.6.1 → 2.6.2

package/README.md

@@ -258,15 +258,15 @@ const coverageOptions = {
 
 ## `mcr` CLI
 > The CLI will run the program as a [child process](https://nodejs.org/docs/latest/api/child_process.html) with `NODE_V8_COVERAGE=dir` until it exits gracefully, and generate the coverage report with the coverage data from the `dir`.
-- Global mode
+- Installing globally
 ```sh
 npm i monocart-coverage-reports -g
-mcr "node ./test/test-node-env.js" -r v8,console-summary --lcov
+mcr node ./test/test-node-env.js -r v8,console-summary --lcov
 ```
-- Current working directory mode
+- Locally in your project
 ```sh
 npm i monocart-coverage-reports
-npx mcr "node ./test/test-node-env.js" -r v8,console-summary --lcov
+npx mcr node ./test/test-node-env.js -r v8,console-summary --lcov
 ```
 - CLI Options
 ```sh
@@ -293,15 +293,15 @@ Options:
   --logging <logging>          off, error, info, debug
   -h, --help                   display help for command
 ```
-- Supports loading default configuration file
+- Loading default configuration file
     - `.mcrrc`
     - `mcr.config.json`
     - `mcr.config.mjs`
     - `mcr.config.cjs`
     - `mcr.config.js`
-- Specify custom configuration file
+- Or loading custom configuration file with `-c` or `--config`
 ```sh
-mcr "node ./test.js" -c path-to/my-custom-config.js
+mcr node ./test.js -c path-to/my-custom-config.js
 ```
 
 ## Compare Reports

package/lib/cli.js

@@ -227,6 +227,7 @@ program
     .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')
@@ -244,7 +245,8 @@ program
 
     .option('--logging <logging>', 'off, error, info, debug')
 
-    .action((command, cliOptions) => {
+    .action((_command, cliOptions) => {
+        const command = program.args.join(' ');
         executeCommand(command, cliOptions);
     });
 

package/lib/generate.js

@@ -21,21 +21,22 @@ const { getGroupedRows } = require('./utils/snapshot.js');
 // maybe v8 or to istanbul reports
 const generateV8ListReports = async (v8list, coverageData, fileSources, options) => {
 
-    let report;
-
-    const { v8, istanbul } = options.reportGroup;
-
-    // generate istanbul reports first
-    if (istanbul) {
-        report = await saveIstanbulReports(coverageData, fileSources, options);
+    let istanbulCoverageResults;
+    // v8 to istanbul reports
+    if (options.reportGroup.istanbul) {
+        istanbulCoverageResults = await saveIstanbulReports(coverageData, fileSources, options);
     }
 
-    // generate v8 report
-    if (v8) {
-        report = await saveV8Report(v8list, options);
+    // v8 reports and v8 coverage results
+    // could be no v8 or v8-json, but requires v8 coverage results
+    const v8CoverageResults = await saveV8Report(v8list, options);
+
+    // fix reportPath
+    if (!v8CoverageResults.reportPath && istanbulCoverageResults) {
+        v8CoverageResults.reportPath = istanbulCoverageResults.reportPath;
     }
 
-    return report;
+    return v8CoverageResults;
 };
 
 // ========================================================================================================

package/lib/v8/v8.js

@@ -356,7 +356,7 @@ const saveV8Report = async (v8list, options) => {
         files: v8list
     };
 
-    // v8 reports
+    // v8 only reports
     const buildInV8Reports = {
         'v8': handleV8HtmlReport,
         'v8-json': handleV8JsonReport
@@ -364,14 +364,17 @@ const saveV8Report = async (v8list, options) => {
 
     const outputs = {};
     const v8Group = options.reportGroup.v8;
-    const v8Reports = Object.keys(v8Group);
-    for (const reportName of v8Reports) {
-        const reportOptions = v8Group[reportName];
-        const buildInHandler = buildInV8Reports[reportName];
-        if (buildInHandler) {
-            outputs[reportName] = await buildInHandler(reportData, reportOptions, options);
-        } else {
-            outputs[reportName] = await Util.runCustomReporter(reportName, reportData, reportOptions, options);
+    // could be no v8 only reports, but have `both` data reports
+    if (v8Group) {
+        const v8Reports = Object.keys(v8Group);
+        for (const reportName of v8Reports) {
+            const reportOptions = v8Group[reportName];
+            const buildInHandler = buildInV8Reports[reportName];
+            if (buildInHandler) {
+                outputs[reportName] = await buildInHandler(reportData, reportOptions, options);
+            } else {
+                outputs[reportName] = await Util.runCustomReporter(reportName, reportData, reportOptions, options);
+            }
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-coverage-reports",
-    "version": "2.6.1",
+    "version": "2.6.2",
     "description": "Monocart coverage reports",
     "main": "./lib/index.js",
     "bin": {
@@ -34,11 +34,11 @@
         "test-browser": "node ./test/test-browser.js && npm run test-istanbul && npm run test-v8 && npm run test-puppeteer && npm run test-anonymous && npm run test-css",
         "test-anonymous": "node ./test/test-anonymous.js",
         "test-css": "node ./test/test-css.js",
-        "test-cli": "npx mcr \"node ./test/test-node-env.js\" -o docs/cli -c test/cli-options.js",
+        "test-cli": "npx mcr node ./test/test-node-env.js -o docs/cli -c test/cli-options.js",
         "test-merge": "node ./test/test-merge.js",
         "test-merge-istanbul": "node ./test/test-merge-istanbul.js",
         "test-all": "npm run test-browser && npm run test-node && npm run test-cli && npm run test-merge && npm run build-docs",
-        "test": "npx mcr \"npm run test-all\" -c test/mcr-options.js",
+        "test": "npx mcr npm run test-all -c test/mcr-options.js",
         "test:snap": "cross-env TEST_SNAPSHOT=true npm run test",
         "dev": "sf d v8",
         "open": "node ./scripts/open.js",