monocart-reporter 1.7.10 → 1.7.12

package/lib/generate-data.js

@@ -4,7 +4,7 @@ const Util = require('./utils/util.js');
 const { getTickInfo } = require('./utils/system.js');
 const Visitor = require('./visitor.js');
 const { calculateSummary } = require('./common.js');
-const { generateGlobalCoverageReport } = require('./plugins/coverage/coverage.js');
+const { addGlobalCoverageReport } = require('./plugins/coverage/coverage.js');
 const version = require('../package.json').version;
 
 const getReportName = (options, config, metadata) => {
@@ -15,6 +15,19 @@ const getReportName = (options, config, metadata) => {
     return 'Test Report';
 };
 
+const generateGlobalCoverageReport = (dataList, options) => {
+    const {
+        name, outputDir, coverage
+    } = options;
+    const coverageOptions = {
+        title: `Coverage Report - ${name}`,
+        outputDir,
+        outputName: 'coverage',
+        ... coverage
+    };
+    return addGlobalCoverageReport(dataList, coverageOptions);
+};
+
 const artifactsHandler = async (visitor, options) => {
     const artifacts = [].concat(visitor.artifacts);
     // global artifacts

package/lib/index.d.ts

@@ -27,10 +27,6 @@ export function attachAuditReport(
 /**
  * coverage
  */
-export function addCoverageReport(
-    v8list: any[],
-    testInfo: TestInfo
-): Promise<any | void>;
 
 export type CoverageReportOptions = {
 
@@ -62,9 +58,22 @@ export type CoverageReportOptions = {
     },
 
     // Whether inline all scripts to the single HTML file.
-    inline?: boolean
+    inline?: boolean,
+
+    logging?: string
 };
 
+export function addCoverageReport(
+    v8list: any[],
+    testInfo: TestInfo,
+    options?: CoverageReportOptions
+): Promise<any | void>;
+
+export function addGlobalCoverageReport(
+    dataList: any[],
+    options: CoverageReportOptions
+): Promise<any>;
+
 export function attachCoverageReport(
     coverage: any[] | any,
     testInfo: TestInfo,

package/lib/index.js

@@ -7,7 +7,9 @@ const { getTrends } = require('./common.js');
 
 const merge = require('./merge-data.js');
 const { attachAuditReport } = require('./plugins/audit/audit.js');
-const { addCoverageReport, attachCoverageReport } = require('./plugins/coverage/coverage.js');
+const {
+    addCoverageReport, addGlobalCoverageReport, attachCoverageReport
+} = require('./plugins/coverage/coverage.js');
 const { attachNetworkReport } = require('./plugins/network/network.js');
 
 const { createStateServer, useState } = require('./plugins/state/state.js');
@@ -22,6 +24,7 @@ class Reporter {
     static attachAuditReport = attachAuditReport;
 
     static addCoverageReport = addCoverageReport;
+    static addGlobalCoverageReport = addGlobalCoverageReport;
     static attachCoverageReport = attachCoverageReport;
 
     static attachNetworkReport = attachNetworkReport;

package/lib/index.mjs

@@ -8,6 +8,7 @@ export const merge = MonocartReporter.merge;
 export const attachAuditReport = MonocartReporter.attachAuditReport;
 
 export const addCoverageReport = MonocartReporter.addCoverageReport;
+export const addGlobalCoverageReport = MonocartReporter.addGlobalCoverageReport;
 export const attachCoverageReport = MonocartReporter.attachCoverageReport;
 
 export const attachNetworkReport = MonocartReporter.attachNetworkReport;

package/lib/plugins/audit/audit.js

@@ -64,8 +64,8 @@ const getSummaryReport = (lhr) => {
 
 const attachAuditReport = async (runnerResult, testInfo, options = {}) => {
 
-    const reporterOptions = Util.resolveReporterOptions(testInfo);
-    Util.initLoggingLevel(reporterOptions.logging, 'audit');
+    const logging = Util.resolveLogging(testInfo, options);
+    Util.initLoggingLevel(logging, 'audit');
 
     if (!runnerResult || !runnerResult.lhr || !runnerResult.report) {
         Util.logError('invalid lighthouse runner result');
@@ -74,7 +74,7 @@ const attachAuditReport = async (runnerResult, testInfo, options = {}) => {
 
     options = {
         title: `Lighthouse Report - ${testInfo.title}`,
-        outputDir: Util.resolveOutputDir(testInfo),
+        outputDir: Util.resolveOutputDir(testInfo, options),
         outputName: `audit-${Util.resolveTestIdWithRetry(testInfo)}`,
         ... options
     };

package/lib/plugins/coverage/coverage.js

@@ -116,8 +116,8 @@ const generateV8Coverage = async (v8list, testInfo, options) => {
 
 const attachCoverageReport = (data, testInfo, options = {}) => {
 
-    const reporterOptions = Util.resolveReporterOptions(testInfo);
-    Util.initLoggingLevel(reporterOptions.logging, 'coverage-attach');
+    const logging = Util.resolveLogging(testInfo, options);
+    Util.initLoggingLevel(logging, 'coverage-attach');
 
     if (!data) {
         Util.logError(`invalid coverage data: ${testInfo.title}`);
@@ -128,7 +128,7 @@ const attachCoverageReport = (data, testInfo, options = {}) => {
         ... defaultOptions,
         // default title
         title: `Coverage Report - ${testInfo.title}`,
-        outputDir: Util.resolveOutputDir(testInfo),
+        outputDir: Util.resolveOutputDir(testInfo, options),
         outputName: `coverage-${Util.resolveTestIdWithRetry(testInfo)}`,
         ... options
     };
@@ -158,23 +158,22 @@ const attachCoverageReport = (data, testInfo, options = {}) => {
 // ========================================================================================================
 
 //  add coverage report to global, v8list only
-const addCoverageReport = async (data, testInfo) => {
+const addCoverageReport = async (data, testInfo, options = {}) => {
 
-    const reporterOptions = Util.resolveReporterOptions(testInfo);
-    Util.initLoggingLevel(reporterOptions.logging, 'coverage-add');
+    const logging = Util.resolveLogging(testInfo, options);
+    Util.initLoggingLevel(logging, 'coverage-add');
 
     if (!data) {
         Util.logError(`invalid coverage data: ${testInfo.title}`);
         return;
     }
 
-    const coverageOptions = reporterOptions.coverage || {};
+    // global outputDir
+    const outputDir = await Util.resolveGlobalOutputDir(testInfo, options);
 
-    // reporter outputFile
-    const outputFile = await Util.resolveOutputFile(reporterOptions.outputFile);
-    const outputDir = path.dirname(outputFile);
+    const coverageOptions = Util.resolveCoverageOptions(testInfo, options);
 
-    const options = {
+    options = {
         ... defaultOptions,
         // use reporter dir as output dir, NOT test output dir
         outputDir,
@@ -250,20 +249,12 @@ const getGlobalCoverageData = async (dataList, options) => {
 };
 
 // global coverage report, run different process with addCoverageReport
-const generateGlobalCoverageReport = async (dataList, reporterOptions) => {
+const addGlobalCoverageReport = async (dataList, coverageOptions) => {
 
     Util.logInfo('generating global coverage report ...');
 
-    // reporter outputFile
-    const outputFile = await Util.resolveOutputFile(reporterOptions.outputFile);
-    const outputDir = path.dirname(outputFile);
-
-    const coverageOptions = reporterOptions.coverage || {};
     const options = {
         ... defaultOptions,
-        title: `Coverage Report - ${reporterOptions.name}`,
-        outputDir,
-        outputName: 'coverage',
         ... coverageOptions
     };
 
@@ -306,6 +297,6 @@ const generateGlobalCoverageReport = async (dataList, reporterOptions) => {
 
 module.exports = {
     addCoverageReport,
-    generateGlobalCoverageReport,
+    addGlobalCoverageReport,
     attachCoverageReport
 };

package/lib/plugins/network/network.js

@@ -120,8 +120,8 @@ const saveNetworkHtmlReport = async (reportData, _options) => {
 
 const attachNetworkReport = async (har, testInfo, options = {}) => {
 
-    const reporterOptions = Util.resolveReporterOptions(testInfo);
-    Util.initLoggingLevel(reporterOptions.logging, 'network');
+    const logging = Util.resolveLogging(testInfo, options);
+    Util.initLoggingLevel(logging, 'network');
 
     const harData = getHarData(har);
     if (!harData || !harData.log) {
@@ -132,7 +132,7 @@ const attachNetworkReport = async (har, testInfo, options = {}) => {
     options = {
         // default title
         title: `Network Report - ${testInfo.title}`,
-        outputDir: Util.resolveOutputDir(testInfo),
+        outputDir: Util.resolveOutputDir(testInfo, options),
         outputName: `network-${Util.resolveTestIdWithRetry(testInfo)}`,
         inline: false,
         ... options