monocart-reporter 2.9.5 → 2.9.6

package/README.md

@@ -1060,14 +1060,17 @@ see example [merge.js](https://github.com/cenfun/monocart-reporter-examples/blob
 
 ### Using `merge` CLI
 ```sh
-# NOTE: The asterisk(*) is a special character which is interpreted by some operating systems (Mac and Linux), please put it in quotes
-npx monocart merge '<glob-patterns>'
+npx monocart merge <glob-patterns>
 
 # -o --outputFile
-npx monocart merge 'path-to/shard*/index.json' -o merged-reports/index.html
+npx monocart merge path-to/shard*/index.json -o merged-reports/index.html
 
 # -c --config
-npx monocart merge 'path-to/shard*/my-report.zip' -c mr.config.js
+npx monocart merge path-to/shard*/my-report.zip -c mr.config.js
+
+# NOTE: The asterisk(*) is a special character which is interpreted by some operating systems
+# For example: Mac and Linux, please put it in quotes, but NOT for Windows
+npx monocart merge 'path-to/shard*/*.zip'
 ```
 The default config files (In order of priority)
 - mr.config.js

package/lib/cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 const fs = require('fs');
 const path = require('path');
@@ -272,6 +272,12 @@ const resolveConfigOptions = async (configPath) => {
     return configOptions;
 };
 
+const exit = (code) => {
+    if (code) {
+        process.exit(code);
+    }
+};
+
 const mergeReports = async (str, cliOptions) => {
 
     await initNodeOptions(cliOptions);
@@ -285,6 +291,7 @@ const mergeReports = async (str, cliOptions) => {
     } else {
         if (customConfig) {
             Util.logError(`ERROR: not found config file: ${customConfig}`);
+            exit(1);
             return;
         }
     }
@@ -297,15 +304,21 @@ const mergeReports = async (str, cliOptions) => {
 
     Util.initLoggingLevel(options.logging);
 
+    Util.logInfo(`glob patterns: ${EC.cyan(str)}`);
+
     const files = await glob(str);
     if (!Util.isList(files)) {
         Util.logError(`ERROR: no files found with glob: ${str}`);
+        exit(1);
         return;
     }
-    // console.log(files, options);
 
-    await merge(files, options);
+    Util.logInfo(`glob files: ${files.join(', ')}`);
 
+    const reportData = await merge(files, options);
+    if (!reportData) {
+        exit(1);
+    }
 };
 
 program

package/lib/generate-report.js

@@ -354,6 +354,7 @@ const generateReport = async (reportData, options, rawData) => {
 
     Util.logInfo(`view report: ${EC.cyan(`npx monocart show-report ${htmlPath}`)}`);
 
+    return reportData;
 };
 
 module.exports = generateReport;

package/lib/merge-data.js

@@ -84,7 +84,7 @@ const getReportData = async (item, num, options) => {
         // for finding attachments
         const jsonDir = Util.relativePath(path.dirname(item));
 
-        Util.logInfo(`report data loaded: ${item}`);
+        Util.logInfo(`report data loaded: ${Util.relativePath(item)}`);
         return {
             jsonDir,
             data

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-reporter",
-    "version": "2.9.5",
+    "version": "2.9.6",
     "description": "A playwright test reporter. Shows suites/cases/steps with tree style, markdown annotations, custom columns/formatters/data collection visitors, console logs, style tags, send email.",
     "main": "lib/index.js",
     "bin": {