monocart-reporter 1.6.26 → 1.6.27

package/README.md

@@ -992,18 +992,11 @@ Please create an [Incoming Webhooks](https://learn.microsoft.com/en-us/microsoft
 - [weixin-webhook.js](/tests/common/weixin-webhook.js)
 - [feishu-webhook.js](/tests/common/feishu-webhook.js)
 
-## Dependencies and Packages
+## Dependencies
  - UI Framework [Vue 3](https://github.com/vuejs/core)
  - Lightweight UI Components [vine-ui](https://github.com/cenfun/vine-ui)
  - High Performance Grid [turbogrid](https://github.com/cenfun/turbogrid)
  - String compress/decompress [lz-utils](https://github.com/cenfun/lz-utils)
- - Packages
-    - `packages/app` Monocart report UI
-    - `packages/coverage` Coverage report libs
-    - `packages/network` Network HAR report libs
-    - `packages/v8` V8 HTML report UI
-    - `packages/vendor` Third-party libs
-
 
 ## Contributing
 ```sh

package/lib/generate-report.js

@@ -1,15 +1,14 @@
-const fs = require('fs');
 const path = require('path');
 const EC = require('eight-colors');
 const CG = require('console-grid');
-const { deflateSync } = require('lz-utils');
 const { nodemailer } = require('./runtime/monocart-vendor.js');
 const Util = require('./utils/util.js');
 const emailPlugin = require('./plugins/email.js');
 
 // ===========================================================================
 
-const generateJson = (outputDir, filename, reportData) => {
+const generateJson = (outputDir, htmlFile, reportData) => {
+    const filename = path.basename(htmlFile, '.html');
     let jsonPath = path.resolve(outputDir, `${filename}.json`);
     Util.writeJSONSync(jsonPath, reportData);
     jsonPath = Util.relativePath(jsonPath);
@@ -17,30 +16,22 @@ const generateJson = (outputDir, filename, reportData) => {
     return jsonPath;
 };
 
-const generateHtml = (outputDir, filename, reportData) => {
-    const reportDistPath = path.resolve(__dirname, 'runtime/monocart-reporter.js');
-    const errMsg = `Not found runtime lib: ${Util.formatPath(reportDistPath)}`;
+const generateHtml = async (outputDir, htmlFile, reportData, inline) => {
 
-    let reportJs = `console.error("${errMsg}");`;
-    if (fs.existsSync(reportDistPath)) {
-        reportJs = Util.readFileSync(reportDistPath);
-    } else {
-        EC.logRed(errMsg);
-    }
-
-    const reportDataStr = deflateSync(JSON.stringify(reportData));
-    const content = `<script>\nwindow.reportData = '${reportDataStr}';\n${reportJs}\n</script>`;
+    const options = {
+        inline,
+        reportData,
+        jsFiles: ['monocart-common.js', 'monocart-reporter.js'],
+        htmlDir: outputDir,
+        htmlFile,
 
-    // replace template
-    let html = Util.getTemplate(path.resolve(__dirname, 'default/template.html'));
-    html = Util.replace(html, {
-        title: reportData.name,
-        content: content
-    });
+        outputDir,
+        reportDataFile: 'report-data.js',
+        assetsName: 'assets',
+        assetsRelative: ''
+    };
 
-    let htmlPath = path.resolve(outputDir, `${filename}.html`);
-    Util.writeFileSync(htmlPath, html);
-    htmlPath = Util.relativePath(htmlPath);
+    const htmlPath = await Util.saveHtmlReport(options);
     console.log(`[MCR] html report: ${EC.cyan(htmlPath)}`);
 
     const cmd = `npx monocart show-report ${htmlPath}`;
@@ -141,7 +132,7 @@ const showTestResults = (reportData) => {
 };
 
 
-const generateReport = (reportData, onEnd) => {
+const generateReport = async (reportData, options) => {
 
     console.log('[MCR] generating test report ...');
     showTestResults(reportData);
@@ -161,20 +152,26 @@ const generateReport = (reportData, onEnd) => {
     }
 
     // console.log(reportData);
-    const filename = path.basename(outputFile, '.html');
+    const htmlFile = path.basename(outputFile);
+
     // generate json
-    const jsonPath = generateJson(outputDir, filename, reportData);
+    const jsonPath = await generateJson(outputDir, htmlFile, reportData);
+
     // generate html
-    const htmlPath = generateHtml(outputDir, filename, reportData);
+    let inline = true;
+    if (typeof options.inline === 'boolean') {
+        inline = options.inline;
+    }
+    const htmlPath = await generateHtml(outputDir, htmlFile, reportData, inline);
 
     // onEnd callback
+    const onEnd = options.onEnd;
     if (typeof onEnd !== 'function') {
         return;
     }
 
     // for onEnd after saved
     Object.assign(reportData, {
-        filename,
         htmlPath,
         jsonPath
     });

package/lib/index.js

@@ -131,7 +131,7 @@ class Reporter {
             trends: this.trends
         });
 
-        return generateReport(reportData, this.options.onEnd);
+        return generateReport(reportData, this.options);
     }
 
 }

package/lib/merge-data.js

@@ -178,6 +178,6 @@ module.exports = async (reportDataList, userOptions = {}) => {
 
     const reportData = await mergeDataList(dataList, options);
 
-    return generateReport(reportData, options.onEnd);
+    return generateReport(reportData, options);
 
 };

package/lib/plugins/coverage/v8/v8.js

@@ -132,12 +132,26 @@ const mergeV8List = async (v8list, options) => {
 
 // ============================================================
 
-const saveV8HtmlReport = async (reportData, options) => {
-
-    const reportDataFile = 'coverage-data.js';
-    const jsFiles = ['monocart-code-viewer.js', 'monocart-formatter.js', 'monocart-v8.js'];
+const saveV8HtmlReport = async (reportData, _options) => {
+
+    const {
+        htmlDir, outputDir, inline
+    } = _options;
+
+    const options = {
+        inline,
+        reportData,
+        jsFiles: ['monocart-code-viewer.js', 'monocart-formatter.js', 'monocart-common.js', 'monocart-v8.js'],
+        htmlDir,
+        htmlFile: 'index.html',
+
+        outputDir,
+        reportDataFile: 'coverage-data.js',
+        assetsName: 'assets',
+        assetsRelative: '../'
+    };
 
-    const htmlPath = await Util.saveAttachmentHtmlReport(reportData, options, reportDataFile, jsFiles);
+    const htmlPath = await Util.saveHtmlReport(options);
 
     return htmlPath;
 };

package/lib/plugins/network/network.js

@@ -95,12 +95,26 @@ const getNetworkSummary = (log) => {
     return summary;
 };
 
-const saveNetworkHtmlReport = async (reportData, options) => {
-
-    const reportDataFile = 'network-data.js';
-    const jsFiles = ['monocart-code-viewer.js', 'monocart-formatter.js', 'monocart-network.js'];
+const saveNetworkHtmlReport = async (reportData, _options) => {
+
+    const {
+        htmlDir, outputDir, inline
+    } = _options;
+
+    const options = {
+        inline,
+        reportData,
+        jsFiles: ['monocart-code-viewer.js', 'monocart-formatter.js', 'monocart-common.js', 'monocart-network.js'],
+        htmlDir,
+        htmlFile: 'index.html',
+
+        outputDir,
+        reportDataFile: 'network-data.js',
+        assetsName: 'assets',
+        assetsRelative: '../'
+    };
 
-    const htmlPath = await Util.saveAttachmentHtmlReport(reportData, options, reportDataFile, jsFiles);
+    const htmlPath = await Util.saveHtmlReport(options);
 
     return htmlPath;
 };