monocart-reporter 2.8.4 → 2.9.1

package/lib/plugins/audit/audit.js

@@ -72,7 +72,7 @@ const attachAuditReport = async (runnerResult, testInfo, options = {}) => {
         return;
     }
 
-    const outputDir = await Util.resolveOutputDir(testInfo);
+    const outputDir = Util.resolveOutputDir(testInfo);
 
     options = {
         name: `Lighthouse Report - ${testInfo.title}`,

package/lib/plugins/coverage/coverage.js

@@ -5,7 +5,7 @@ const Util = require('../../utils/util.js');
 
 const attachCoverageReport = async (data, testInfo, options = {}) => {
 
-    const outputDir = await Util.resolveOutputDir(testInfo);
+    const outputDir = Util.resolveOutputDir(testInfo);
     const folderName = `coverage-${Util.resolveTestIdWithRetry(testInfo)}`;
 
     // support multiple calls
@@ -59,9 +59,9 @@ const attachCoverageReport = async (data, testInfo, options = {}) => {
 
 // ========================================================================================================
 
-const getGlobalCoverageOptions = async (reporterOptions) => {
+const getGlobalCoverageOptions = (reporterOptions) => {
 
-    const reporterOutputFile = await Util.resolveOutputFile(reporterOptions.outputFile);
+    const reporterOutputFile = Util.resolveOutputFile(reporterOptions.outputFile);
     const outputDir = path.dirname(reporterOutputFile);
     const htmlDir = path.resolve(outputDir, 'coverage');
 
@@ -81,7 +81,7 @@ const getGlobalCoverageOptions = async (reporterOptions) => {
 const addCoverageReport = async (data, testInfo) => {
 
     const reporterOptions = Util.resolveReporterOptions(testInfo);
-    const coverageOptions = await getGlobalCoverageOptions(reporterOptions);
+    const coverageOptions = getGlobalCoverageOptions(reporterOptions);
 
     const coverageReport = MCR(coverageOptions);
     const results = await coverageReport.add(data);
@@ -91,7 +91,7 @@ const addCoverageReport = async (data, testInfo) => {
 
 const generateGlobalCoverageReport = async (reporterOptions) => {
 
-    const coverageOptions = await getGlobalCoverageOptions(reporterOptions);
+    const coverageOptions = getGlobalCoverageOptions(reporterOptions);
 
     const coverageReport = MCR(coverageOptions);
 
@@ -129,7 +129,10 @@ const generateGlobalCoverageReport = async (reporterOptions) => {
     }
 
     if (reports.raw) {
-        const rawDir = path.resolve(outputDir, reports.raw.outputDir || 'raw');
+        let rawDir = path.resolve(outputDir, reports.raw.outputDir || 'raw');
+        if (reports.raw.zip) {
+            rawDir += '.zip';
+        }
         artifact.rawDir = Util.relativePath(rawDir, reporterOptions.outputDir);
     }
 
@@ -137,7 +140,7 @@ const generateGlobalCoverageReport = async (reporterOptions) => {
 };
 
 const mergeGlobalCoverageReport = async (coverageRawList, reporterOptions) => {
-    const coverageOptions = await getGlobalCoverageOptions(reporterOptions);
+    const coverageOptions = getGlobalCoverageOptions(reporterOptions);
     coverageOptions.inputDir = coverageRawList;
 
     const coverageReport = MCR(coverageOptions);

package/lib/plugins/network/network.js

@@ -129,7 +129,7 @@ const attachNetworkReport = async (har, testInfo, options = {}) => {
         return;
     }
 
-    const outputDir = await Util.resolveOutputDir(testInfo);
+    const outputDir = Util.resolveOutputDir(testInfo);
 
     options = {
         // default title

package/lib/utils/util.js

@@ -76,18 +76,15 @@ const Util = {
         return parsed;
     },
 
-    resolveOutputDir: async (testInfo) => {
+    resolveOutputDir: (testInfo) => {
         const reporterOptions = Util.resolveReporterOptions(testInfo);
-        const outputFile = await Util.resolveOutputFile(reporterOptions.outputFile);
+        const outputFile = Util.resolveOutputFile(reporterOptions.outputFile);
         const outputDir = path.dirname(outputFile);
         return outputDir;
     },
 
-    resolveOutputFile: async (outputFile) => {
-        // function to string first
-        if (typeof outputFile === 'function') {
-            outputFile = await outputFile();
-        }
+    resolveOutputFile: (outputFile) => {
+
         // then check string
         if (!outputFile || typeof outputFile !== 'string') {
             outputFile = getDefaultOptions().outputFile;
@@ -296,6 +293,62 @@ const Util = {
         return template;
     },
 
+    getDuration: (dateRanges, durationStrategy) => {
+        dateRanges.sort((a, b) => {
+            if (a.start === b.start) {
+                return a.end - b.end;
+            }
+            return a.start - b.start;
+        });
+
+        if (durationStrategy === 'exclude-idle') {
+
+            dateRanges.reduce((prevRange, range) => {
+                // same start
+                if (range.start === prevRange.start) {
+                    range.dedupe = true;
+                    // equal prev
+                    if (range.end === prevRange.end) {
+                        return prevRange;
+                    }
+                    // great than the prev end, update the end
+                    prevRange.end = range.end;
+                    return prevRange;
+                }
+
+                // already in the range
+                if (range.end <= prevRange.end) {
+                    range.dedupe = true;
+                    return prevRange;
+                }
+
+                // collected, update the end
+                if (range.start <= prevRange.end) {
+                    range.dedupe = true;
+                    prevRange.end = range.end;
+                    return prevRange;
+                }
+
+                return range;
+
+            });
+
+            const ranges = dateRanges.filter((it) => !it.dedupe);
+            // console.log(ranges);
+            let duration = 0;
+            ranges.forEach((item) => {
+                duration += item.end - item.start;
+            });
+
+            return duration;
+        }
+        // normal
+        const dateStart = dateRanges[0].start;
+        const endDate = dateRanges[dateRanges.length - 1].end;
+        const duration = endDate - dateStart;
+        return duration;
+    },
+
     mergeOption: function(... args) {
         const option = {};
         args.forEach((item) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-reporter",
-    "version": "2.8.4",
+    "version": "2.9.1",
     "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": {
@@ -20,6 +20,7 @@
     "scripts": {
         "link": "node ./scripts/link.js",
         "test": "npm run link && npx playwright test -c tests",
+        "test-example": "npm run link && npx playwright test tests/example -c tests",
         "test-data": "npm run link && npx playwright test tests/data -c tests",
         "test-page": "npm run link && npx playwright test tests/home-page -c tests",
         "test-coverage": "npm run link && npx playwright test tests/report-coverage -c tests",
@@ -46,12 +47,12 @@
         "koa": "^2.15.3",
         "koa-static-resolver": "^1.0.6",
         "lz-utils": "^2.1.0",
-        "monocart-coverage-reports": "^2.10.9",
+        "monocart-coverage-reports": "^2.11.0",
         "monocart-locator": "^1.0.2",
         "nodemailer": "^6.9.15"
     },
     "devDependencies": {
-        "@babel/code-frame": "^7.24.7",
+        "@babel/code-frame": "^7.25.7",
         "@playwright/test": "^1.47.2",
         "ansi-to-html": "^0.7.2",
         "async-tick": "^1.0.0",
@@ -59,20 +60,21 @@
         "axios": "^1.7.7",
         "commander": "^12.1.0",
         "dotenv": "^16.4.5",
-        "eslint": "^9.11.0",
+        "eslint": "^9.11.1",
         "eslint-config-plus": "^2.0.2",
         "eslint-plugin-html": "^8.1.2",
         "eslint-plugin-vue": "^9.28.0",
         "file-saver": "^2.0.5",
         "find-up": "^7.0.0",
-        "github-markdown-css": "^5.6.1",
+        "github-markdown-css": "^5.7.0",
         "glob": "^11.0.0",
         "marked": "^14.1.2",
-        "mermaid": "^11.2.1",
+        "mermaid": "^11.3.0",
         "mitt": "^3.0.1",
         "monocart-code-viewer": "^1.1.4",
         "monocart-formatter": "^3.0.0",
         "nice-ticks": "^1.0.2",
+        "node-stream-zip": "^1.15.0",
         "open": "8.4.2",
         "sanitize-filename": "^1.6.3",
         "stack-utils": "^2.0.6",
@@ -81,6 +83,7 @@
         "supports-color": "^9.4.0",
         "turbogrid": "^3.2.0",
         "vine-ui": "^3.1.16",
-        "ws": "^8.18.0"
+        "ws": "^8.18.0",
+        "yazl": "^2.5.1"
     }
 }