monocart-reporter 2.9.3 → 2.9.4

package/lib/generate-report.js

@@ -18,31 +18,6 @@ const generateJson = (outputDir, filename, reportData, options) => {
     reportData.jsonPath = Util.relativePath(jsonPath);
 };
 
-const forEachFile = (dir, callback) => {
-    if (!fs.existsSync(dir)) {
-        return;
-    }
-    const dirs = [];
-    fs.readdirSync(dir, {
-        withFileTypes: true
-    }).forEach((it) => {
-
-        if (it.isFile()) {
-            callback(it.name, dir);
-            return;
-        }
-
-        if (it.isDirectory()) {
-            dirs.push(path.resolve(dir, it.name));
-        }
-    });
-
-    for (const subDir of dirs) {
-        forEachFile(subDir, callback);
-    }
-
-};
-
 const generateZip = (outputDir, filename, reportData, options) => {
 
     if (!options.zip) {
@@ -75,7 +50,7 @@ const generateZip = (outputDir, filename, reportData, options) => {
             resolve();
         });
 
-        forEachFile(outputDir, (name, dir) => {
+        Util.forEachFile(outputDir, (name, dir) => {
             const absPath = path.resolve(dir, name);
             const relPath = Util.relativePath(absPath, outputDir);
             reportFiles.push(relPath);

package/lib/merge-data.js

@@ -36,8 +36,22 @@ const unzipDataFile = async (item, num, options) => {
     // Do not forget to close the file once you're done
     await zip.close();
 
-    const filename = path.basename(item, '.zip');
-    return path.resolve(unzipDir, `${filename}.json`);
+    let filename = path.basename(item, '.zip');
+    let jsonPath = path.resolve(unzipDir, `${filename}.json`);
+    if (fs.existsSync(jsonPath)) {
+        return jsonPath;
+    }
+
+    Util.forEachFile(unzipDir, (name, dir) => {
+        if (name.endsWith('.html')) {
+            filename = path.basename(name, '.html');
+            return 'break';
+        }
+    }, true);
+
+    jsonPath = path.resolve(unzipDir, `${filename}.json`);
+
+    return jsonPath;
 };
 
 const getReportData = async (item, num, options) => {

package/lib/utils/util.js

@@ -277,6 +277,50 @@ const Util = {
         }
     },
 
+    // eslint-disable-next-line complexity
+    forEachFile: (dir, callback, shallow) => {
+        if (!fs.existsSync(dir)) {
+            return;
+        }
+
+        const isBreak = (res) => {
+            return res === 'break' || res === false;
+        };
+
+        const dirs = [];
+        const list = fs.readdirSync(dir, {
+            withFileTypes: true
+        });
+
+        for (const item of list) {
+
+            if (item.isFile()) {
+                const res = callback(item.name, dir);
+                if (isBreak(res)) {
+                    return res;
+                }
+                continue;
+            }
+
+            if (item.isDirectory()) {
+                dirs.push(path.resolve(dir, item.name));
+            }
+
+        }
+
+        if (shallow) {
+            return;
+        }
+
+        for (const subDir of dirs) {
+            const res = Util.forEachFile(subDir, callback, shallow);
+            if (isBreak(res)) {
+                return res;
+            }
+        }
+
+    },
+
     getTemplate: function(templatePath) {
         if (!Util.templateCache) {
             Util.templateCache = {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-reporter",
-    "version": "2.9.3",
+    "version": "2.9.4",
     "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": {