monocart-reporter 1.7.13 → 2.0.1

package/lib/visitor.js

@@ -3,7 +3,7 @@ const path = require('path');
 const EC = require('eight-colors');
 const {
     StackUtils, codeFrameColumns, sanitize
-} = require('./runtime/monocart-vendor.js');
+} = require('./packages/monocart-vendor.js');
 const Util = require('./utils/util.js');
 const commentsPlugin = require('./plugins/comments.js');
 const defaultColumns = require('./default/columns.js');
@@ -53,7 +53,6 @@ class Visitor {
         this.rows = [];
         this.jobs = [];
         this.artifacts = [];
-        this.artifactDataMap = {};
 
         await this.visit(this.root, this.rows);
 
@@ -500,8 +499,6 @@ class Visitor {
 
         const list = [];
 
-        const artifact = Util.attachments.artifact;
-
         attachments.forEach((item, i) => {
 
             if (item.body) {
@@ -516,11 +513,6 @@ class Visitor {
                 return;
             }
 
-            if (item.name === artifact.name && item.contentType === artifact.contentType) {
-                this.artifactHandler(item.path);
-                return;
-            }
-
             // before path change
             this.reportHandler(item, 'audit', title);
             this.reportHandler(item, 'coverage', title);
@@ -564,6 +556,8 @@ class Visitor {
             return;
         }
 
+        // itemName = item.name = definition.name
+
         const jsonPath = path.resolve(path.dirname(item.path), definition.reportFile);
         if (!fs.existsSync(jsonPath)) {
             return;
@@ -575,9 +569,9 @@ class Visitor {
         }
 
         this.artifacts.push({
-            name: item.name,
-            path: Util.relativePath(item.path),
-            title: report.title || title
+            type: itemName,
+            name: report.name || title,
+            path: Util.relativePath(item.path)
         });
 
         item.report = report;
@@ -653,20 +647,6 @@ class Visitor {
 
     // ==============================================================================================
 
-    artifactHandler(p) {
-        const json = Util.readJSONSync(p);
-        if (json) {
-            const artifactList = this.artifactDataMap[json.type];
-            if (artifactList) {
-                artifactList.push(json.data);
-            } else {
-                this.artifactDataMap[json.type] = [json.data];
-            }
-        }
-    }
-
-    // ==============================================================================================
-
     caseErrorsHandler(caseItem) {
 
         const errors = caseItem.errors;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-reporter",
-    "version": "1.7.13",
+    "version": "2.0.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": {
@@ -48,18 +48,20 @@
         "koa": "^2.14.2",
         "koa-static-resolver": "^1.0.4",
         "lz-utils": "^2.0.1",
-        "nodemailer": "^6.9.5",
-        "open": "^9.1.0"
+        "monocart-coverage-reports": "^1.0.7",
+        "nodemailer": "^6.9.7",
+        "open": "^9.1.0",
+        "turbogrid": "^3.0.10"
     },
     "devDependencies": {
-        "@playwright/test": "^1.38.1",
-        "axios": "^1.5.0",
+        "@playwright/test": "^1.40.1",
+        "axios": "^1.6.2",
         "dotenv": "^16.3.1",
-        "eslint": "^8.50.0",
+        "eslint": "^8.55.0",
         "eslint-config-plus": "^1.0.6",
         "eslint-plugin-html": "^7.1.0",
-        "eslint-plugin-vue": "^9.17.0",
-        "stylelint": "^15.10.3",
+        "eslint-plugin-vue": "^9.19.2",
+        "stylelint": "^15.11.0",
         "stylelint-config-plus": "^1.0.4",
         "vine-ui": "^3.1.12"
     }

package/lib/plugins/coverage/converter/collect-source-maps.js

@@ -1,194 +0,0 @@
-const fs = require('fs');
-const EC = require('eight-colors');
-const { fileURLToPath } = require('url');
-const Concurrency = require('../../../platform/concurrency.js');
-const { convertSourceMap, axios } = require('../../../runtime/monocart-coverage.js');
-
-const Util = require('../../../utils/util.js');
-
-const request = async (options) => {
-    if (typeof options === 'string') {
-        options = {
-            url: options
-        };
-    }
-    let err;
-    const res = await axios(options).catch((e) => {
-        err = e;
-    });
-    return [err, res];
-};
-
-const loadSourceMap = async (url = '') => {
-
-    if (url.startsWith('file://')) {
-        const p = fileURLToPath(url);
-        const json = Util.readJSONSync(p);
-        if (!json) {
-            Util.logDebug(EC.red(`failed to load sourcemap ${p}`));
-            return;
-        }
-        return json;
-    }
-
-    const [err, res] = await request({
-        url
-    });
-
-    if (err) {
-        Util.logDebug(EC.red(`${err.message} ${url}`));
-        return;
-    }
-
-    return res.data;
-};
-
-const getSourceMapUrl = (content, url) => {
-
-    const m = content.match(convertSourceMap.mapFileCommentRegex);
-    if (!m) {
-        return;
-    }
-
-    const comment = m.pop();
-    const r = convertSourceMap.mapFileCommentRegex.exec(comment);
-    // for some odd reason //# .. captures in 1 and /* .. */ in 2
-    const filename = r[1] || r[2];
-
-    let mapUrl;
-
-    try {
-        mapUrl = new URL(filename, url);
-    } catch (e) {
-        Util.logDebug(EC.red(`${e.message} ${filename} ${url}`));
-    }
-    if (mapUrl) {
-        return mapUrl.toString();
-    }
-};
-
-const resolveSourceMap = (data) => {
-    if (data) {
-        const {
-            sources, sourcesContent, mappings
-        } = data;
-        if (!sources || !sourcesContent || !mappings) {
-            return;
-        }
-        return data;
-    }
-};
-
-const collectInlineSourceMaps = async (v8list) => {
-    let count = 0;
-    const concurrency = new Concurrency();
-    for (const item of v8list) {
-
-        const { type, source } = item;
-
-        // only for js
-        if (type === 'js') {
-            const converter = convertSourceMap.fromSource(source);
-            if (converter) {
-                item.sourceMap = resolveSourceMap(converter.sourcemap);
-                count += 1;
-                // source map comments is inline source map, remove it because it is big
-                item.source = convertSourceMap.removeComments(source);
-
-                continue;
-            }
-            const sourceMapUrl = getSourceMapUrl(source, item.url);
-            if (sourceMapUrl) {
-                // console.log('========================', sourceMapUrl);
-                item.sourceMapUrl = sourceMapUrl;
-                concurrency.addItem(item);
-            }
-        }
-    }
-    await concurrency.start(async (item) => {
-        const data = await loadSourceMap(item.sourceMapUrl);
-        if (data) {
-            item.sourceMap = resolveSourceMap(data);
-            count += 1;
-            // source map comments is a link, no need remove
-        }
-    });
-
-    return count;
-};
-
-const collectFileSourceMaps = async (v8list, options) => {
-    let count = 0;
-    const concurrency = new Concurrency();
-    for (const item of v8list) {
-
-        const {
-            type, url, source, id
-        } = item;
-
-        // remove source just keep functions to reduce artifacts size
-        delete item.source;
-
-        const sourcePath = Util.resolveArtifactSourcePath(options.artifactsDir, id);
-        if (fs.existsSync(sourcePath)) {
-            continue;
-        }
-
-        const sourceData = {
-            url,
-            id,
-            source: convertSourceMap.removeComments(source)
-        };
-
-        // only for js
-        if (type === 'js') {
-            const converter = convertSourceMap.fromSource(source);
-            if (converter) {
-                sourceData.sourceMap = resolveSourceMap(converter.sourcemap);
-                count += 1;
-                await saveSourceFile(sourcePath, sourceData);
-                continue;
-            }
-            const sourceMapUrl = getSourceMapUrl(source, item.url);
-            if (sourceMapUrl) {
-                concurrency.addItem({
-                    sourceMapUrl,
-                    sourcePath,
-                    sourceData
-                });
-                continue;
-            }
-        }
-
-        await saveSourceFile(sourcePath, sourceData);
-
-    }
-
-    await concurrency.start(async (item) => {
-        const sourceData = item.sourceData;
-        const data = await loadSourceMap(item.sourceMapUrl);
-        if (data) {
-            sourceData.sourceMap = resolveSourceMap(data);
-            count += 1;
-        }
-        await saveSourceFile(item.sourcePath, sourceData);
-    });
-
-    return count;
-};
-
-const saveSourceFile = async (filePath, data) => {
-    await Util.writeFile(filePath, JSON.stringify(data));
-};
-
-const collectSourceMaps = (v8list, options, inlineSourceMap) => {
-
-    if (inlineSourceMap) {
-        return collectInlineSourceMaps(v8list);
-    }
-
-    return collectFileSourceMaps(v8list, options);
-
-};
-
-module.exports = collectSourceMaps;