monocart-reporter 2.4.8 → 2.5.0

package/lib/utils/util.js

@@ -8,7 +8,7 @@ const CG = require('console-grid');
 const Share = require('../platform/share.js');
 const { deflateSync } = require('lz-utils');
 
-const defaultOptions = require('../default/options.js');
+const getDefaultOptions = require('../default/options.js');
 
 const assetsName = 'assets';
 
@@ -58,6 +58,13 @@ const Util = {
         return hash.digest('hex');
     },
 
+    calculateId: (id) => {
+        if (id) {
+            return Util.calculateSha1(id).slice(0, 20);
+        }
+        return Util.uid();
+    },
+
     parseComments: (input) => {
         const str = `${input}`;
         // starts with @ , ends without @  encodeURIComponent("@") %40
@@ -90,7 +97,7 @@ const Util = {
         }
         // then check string
         if (!outputFile || typeof outputFile !== 'string') {
-            outputFile = defaultOptions.outputFile;
+            outputFile = getDefaultOptions().outputFile;
         }
         return path.resolve(outputFile);
     },
@@ -122,7 +129,7 @@ const Util = {
     },
 
     resolveTestIdWithRetry: (testInfo) => {
-        const id = Util.shortTestId(testInfo.testId);
+        const id = Util.calculateId(testInfo.testId);
         const retry = testInfo.retry;
         if (retry > 0) {
             return `${id}-retry${retry}`;
@@ -266,13 +273,6 @@ const Util = {
         return '\n';
     },
 
-    shortTestId: (id) => {
-        if (id) {
-            return id.split('-').pop();
-        }
-        return Util.uid();
-    },
-
     getAttachmentPathExtras: function(d) {
         return {
             name: d.name,

package/lib/visitor.js

@@ -6,7 +6,7 @@ const {
 } = require('./packages/monocart-vendor.js');
 const Util = require('./utils/util.js');
 const commentsPlugin = require('./plugins/comments.js');
-const defaultColumns = require('./default/columns.js');
+const getDefaultColumns = require('./default/columns.js');
 
 // retired, just warning for old babel parser
 let collectWarning = '"collect.comments()" has been deprecated (replaced with new option "customFieldsInComments: true/false" in version 2.2.0), please remove the code related to "collect.comments()" in custom "visitor".';
@@ -35,8 +35,9 @@ class Visitor {
 
     async start() {
 
+        const columns = getDefaultColumns();
         // default columns not detailed in report
-        defaultColumns.forEach((item) => {
+        columns.forEach((item) => {
             item.detailed = false;
         });
 
@@ -45,16 +46,16 @@ class Visitor {
 
         // user defined custom columns
         const handler = this.options.columns;
-        if (typeof handler === 'function') {
+        if (!this.columnsUpdated && typeof handler === 'function') {
             // prevent repeated execution
-            this.options.columns = null;
+            this.columnsUpdated = true;
 
             // update default columns by user
-            handler.call(this, defaultColumns);
+            handler.call(this, columns);
 
             // maybe a tree
             const customVisitors = [];
-            this.initCustomHandler(defaultColumns, customVisitors, this.formatters);
+            this.initCustomHandler(columns, customVisitors, this.formatters);
             if (customVisitors.length) {
                 this.customVisitors = customVisitors;
             }
@@ -62,7 +63,7 @@ class Visitor {
 
         // console.log(customFormatters);
 
-        this.columns = defaultColumns;
+        this.columns = columns;
         this.rows = [];
         this.jobs = [];
         this.artifacts = [];
@@ -175,7 +176,9 @@ class Visitor {
         }
 
         // suite uid for report
-        const suiteId = suite._fileId || Util.uid();
+        const suiteStr = [suite._fileId].concat(suite.titlePath()).filter((it) => it).join(' ');
+        // console.log(suiteStr);
+        const suiteId = Util.calculateId(suiteStr);
 
         const group = {
             id: suiteId,
@@ -240,7 +243,7 @@ class Visitor {
         // const testIdExpression = `[project=${project._internal.id}]${test.titlePath().join('\x1e')}${repeatEachIndexSuffix}`;
         // const testId = fileId + '-' + calculateSha1(testIdExpression).slice(0, 20);
 
-        const caseId = Util.shortTestId(testCase.id);
+        const caseId = Util.calculateId(testCase.id);
 
         const caseItem = {
             id: caseId,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-reporter",
-    "version": "2.4.8",
+    "version": "2.5.0",
     "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": {
@@ -47,23 +47,24 @@
         "koa": "^2.15.3",
         "koa-static-resolver": "^1.0.6",
         "lz-utils": "^2.0.2",
-        "monocart-coverage-reports": "^2.8.3",
+        "monocart-coverage-reports": "^2.8.4",
         "monocart-formatter": "^3.0.0",
         "monocart-locator": "^1.0.0",
-        "nodemailer": "^6.9.13",
-        "turbogrid": "^3.1.0"
+        "nodemailer": "^6.9.14",
+        "turbogrid": "^3.2.0"
     },
     "devDependencies": {
         "@playwright/test": "^1.44.1",
         "axios": "^1.7.2",
         "dotenv": "^16.4.5",
-        "eslint": "^9.4.0",
-        "eslint-config-plus": "^2.0.1",
+        "eslint": "^9.5.0",
+        "eslint-config-plus": "^2.0.2",
         "eslint-plugin-html": "^8.1.1",
         "eslint-plugin-vue": "^9.26.0",
+        "mermaid": "^10.9.1",
         "open": "8.4.2",
         "stylelint": "^16.6.1",
         "stylelint-config-plus": "^1.1.2",
-        "vine-ui": "^3.1.13"
+        "vine-ui": "^3.1.15"
     }
 }