npm - monocart-reporter - Versions diffs - 1.6.25 → 1.6.27 - Mend

monocart-reporter 1.6.25 → 1.6.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

package/README.md +4 -11
package/lib/default/options.js +1 -1
package/lib/default/template.html +36 -1
package/lib/generate-report.js +26 -29
package/lib/index.js +1 -1
package/lib/merge-data.js +1 -1
package/lib/platform/share.js +0 -24
package/lib/plugins/comments.js +8 -4
package/lib/plugins/coverage/coverage-utils.js +154 -0
package/lib/plugins/coverage/coverage.js +86 -76
package/lib/plugins/coverage/istanbul/istanbul.js +143 -24
package/lib/plugins/coverage/v8/dedupe.js +64 -59
package/lib/plugins/coverage/v8/position-mapping.js +49 -35
package/lib/plugins/coverage/v8/source-map.js +218 -245
package/lib/plugins/coverage/v8/v8-summary.js +9 -18
package/lib/plugins/coverage/v8/v8.js +73 -100
package/lib/plugins/network/network.js +19 -5
package/lib/runtime/monocart-code-viewer.js +1 -1
package/lib/runtime/monocart-common.js +1 -0
package/lib/runtime/monocart-coverage.js +11 -11
package/lib/runtime/monocart-formatter.js +1 -1
package/lib/runtime/monocart-network.js +1 -1
package/lib/runtime/monocart-reporter.js +1 -1
package/lib/runtime/monocart-v8.js +1 -1
package/lib/runtime/monocart-vendor.js +6 -6
package/lib/utils/util.js +19 -7
package/package.json +9 -9

package/README.md CHANGED Viewed

@@ -123,10 +123,10 @@ Separated metadata file (Already included in the above HTML and compressed, it c
     // global coverage settings for addCoverageReport API
     coverage: null,
     // coverage: {
+    //     entryFilter: (entry) => true,
     //     unpackSourceMap: true,
     //     excludeDistFile: true,
     //     sourceFilter: (sourceName) => sourceName.search(/\/src\/.+/) !== -1,
-    //     entryFilter: (entry) => {}
     // },
     // trend data handler
@@ -642,10 +642,10 @@ Attach a code coverage report with API `attachCoverageReport(data, testInfo, opt
     - V8 only:
     - `toIstanbul` (Boolean) Whether to convert to Istanbul report
     - `watermarks` (Array) Defaults to `[50, 80]`
+    - `entryFilter` (Function) A filter function to execute for each element in the V8 list.
     - `unpackSourceMap` (Boolean) Whether to unpack all sources from the source map if a related source map file is found.
     - `excludeDistFile` (Boolean) Whether to exclude the dist file (usually minified) if the sources are successfully unpacked from the source map.
     - `sourceFilter` (Function) A filter function to execute for each element in the sources which unpacked from the source map.
-    - `entryFilter` (Function) A filter function to execute for each element in the V8 list.
     - `inline` (Boolean) Whether inline all scripts to the single HTML file.
  (see example: [report-coverage.spec.js](https://github.com/cenfun/monocart-reporter/blob/main/tests/report-coverage/report-coverage.spec.js))
@@ -758,10 +758,10 @@ module.exports = {
             outputFile: './test-results/report.html',
             // global coverage report options
             coverage: {
+                entryFilter: (entry) => true,
                 unpackSourceMap: true,
                 excludeDistFile: true,
                 sourceFilter: (sourceName) => sourceName.search(/\/src\/.+/) !== -1,
-                entryFilter: (entry) => {}
             }
         }]
     ]
@@ -992,18 +992,11 @@ Please create an [Incoming Webhooks](https://learn.microsoft.com/en-us/microsoft
 - [weixin-webhook.js](/tests/common/weixin-webhook.js)
 - [feishu-webhook.js](/tests/common/feishu-webhook.js)
-## Dependencies and Packages
+## Dependencies
  - UI Framework [Vue 3](https://github.com/vuejs/core)
  - Lightweight UI Components [vine-ui](https://github.com/cenfun/vine-ui)
  - High Performance Grid [turbogrid](https://github.com/cenfun/turbogrid)
  - String compress/decompress [lz-utils](https://github.com/cenfun/lz-utils)
- - Packages
-    - `packages/app` Monocart report UI
-    - `packages/coverage` Coverage report libs
-    - `packages/network` Network HAR report libs
-    - `packages/v8` V8 HTML report UI
-    - `packages/vendor` Third-party libs
 ## Contributing
 ```sh

package/lib/default/options.js CHANGED Viewed

@@ -14,10 +14,10 @@ module.exports = {
     // global coverage settings for addCoverageReport API
     coverage: null,
     // coverage: {
+    //     entryFilter: (entry) => true,
     //     unpackSourceMap: true,
     //     excludeDistFile: true,
     //     sourceFilter: (sourceName) => sourceName.search(/\/src\/.+/) !== -1,
-    //     entryFilter: (entry) => {}
     // },
     // trend data handler

package/lib/default/template.html CHANGED Viewed

@@ -2,11 +2,46 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="icon" href="data:,">
     <title>{title}</title>
+    <style>
+    @keyframes fs-loading-animation {
+        0% {
+            transform: rotate(0deg);
+        }
+        100% {
+            transform: rotate(360deg);
+        }
+    }
+    .fs-loading {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        z-index: 100;
+        width: 50px;
+        height: 50px;
+        margin-top: -25px;
+        margin-left: -25px;
+        animation: 0.382s fs-loading-animation linear infinite;
+    }
+    .fs-loading svg {
+        display: block;
+        width: 100%;
+        height: 100%;
+        pointer-events: none;
+    }
+    </style>
 </head>
 <body>
+<div class="fs-loading">
+    <svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 16 16">
+        <path d="M1,8 A7 7 0 1 1 8 15" stroke="#999" stroke-width="2" stroke-linecap="round" fill="none"/>
+    </svg>
+</div>
 {content}
 </body>
 </html>

package/lib/generate-report.js CHANGED Viewed

@@ -1,15 +1,14 @@
-const fs = require('fs');
 const path = require('path');
 const EC = require('eight-colors');
 const CG = require('console-grid');
-const { deflateSync } = require('lz-utils');
 const { nodemailer } = require('./runtime/monocart-vendor.js');
 const Util = require('./utils/util.js');
 const emailPlugin = require('./plugins/email.js');
 // ===========================================================================
-const generateJson = (outputDir, filename, reportData) => {
+const generateJson = (outputDir, htmlFile, reportData) => {
+    const filename = path.basename(htmlFile, '.html');
     let jsonPath = path.resolve(outputDir, `${filename}.json`);
     Util.writeJSONSync(jsonPath, reportData);
     jsonPath = Util.relativePath(jsonPath);
@@ -17,30 +16,22 @@ const generateJson = (outputDir, filename, reportData) => {
     return jsonPath;
 };
-const generateHtml = (outputDir, filename, reportData) => {
-    const reportDistPath = path.resolve(__dirname, 'runtime/monocart-reporter.js');
-    const errMsg = `Not found runtime lib: ${Util.formatPath(reportDistPath)}`;
+const generateHtml = async (outputDir, htmlFile, reportData, inline) => {
-    let reportJs = `console.error("${errMsg}");`;
-    if (fs.existsSync(reportDistPath)) {
-        reportJs = Util.readFileSync(reportDistPath);
-    } else {
-        EC.logRed(errMsg);
-    }
-    const reportDataStr = deflateSync(JSON.stringify(reportData));
-    const content = `<script>\nwindow.reportData = '${reportDataStr}';\n${reportJs}\n</script>`;
+    const options = {
+        inline,
+        reportData,
+        jsFiles: ['monocart-common.js', 'monocart-reporter.js'],
+        htmlDir: outputDir,
+        htmlFile,
-    // replace template
-    let html = Util.getTemplate(path.resolve(__dirname, 'default/template.html'));
-    html = Util.replace(html, {
-        title: reportData.name,
-        content: content
-    });
+        outputDir,
+        reportDataFile: 'report-data.js',
+        assetsName: 'assets',
+        assetsRelative: ''
+    };
-    let htmlPath = path.resolve(outputDir, `${filename}.html`);
-    Util.writeFileSync(htmlPath, html);
-    htmlPath = Util.relativePath(htmlPath);
+    const htmlPath = await Util.saveHtmlReport(options);
     console.log(`[MCR] html report: ${EC.cyan(htmlPath)}`);
     const cmd = `npx monocart show-report ${htmlPath}`;
@@ -141,7 +132,7 @@ const showTestResults = (reportData) => {
 };
-const generateReport = (reportData, onEnd) => {
+const generateReport = async (reportData, options) => {
     console.log('[MCR] generating test report ...');
     showTestResults(reportData);
@@ -161,20 +152,26 @@ const generateReport = (reportData, onEnd) => {
     }
     // console.log(reportData);
-    const filename = path.basename(outputFile, '.html');
+    const htmlFile = path.basename(outputFile);
     // generate json
-    const jsonPath = generateJson(outputDir, filename, reportData);
+    const jsonPath = await generateJson(outputDir, htmlFile, reportData);
     // generate html
-    const htmlPath = generateHtml(outputDir, filename, reportData);
+    let inline = true;
+    if (typeof options.inline === 'boolean') {
+        inline = options.inline;
+    }
+    const htmlPath = await generateHtml(outputDir, htmlFile, reportData, inline);
     // onEnd callback
+    const onEnd = options.onEnd;
     if (typeof onEnd !== 'function') {
         return;
     }
     // for onEnd after saved
     Object.assign(reportData, {
-        filename,
         htmlPath,
         jsonPath
     });

package/lib/index.js CHANGED Viewed

@@ -131,7 +131,7 @@ class Reporter {
             trends: this.trends
         });
-        return generateReport(reportData, this.options.onEnd);
+        return generateReport(reportData, this.options);
     }
 }

package/lib/merge-data.js CHANGED Viewed

@@ -178,6 +178,6 @@ module.exports = async (reportDataList, userOptions = {}) => {
     const reportData = await mergeDataList(dataList, options);
-    return generateReport(reportData, options.onEnd);
+    return generateReport(reportData, options);
 };

package/lib/platform/share.js CHANGED Viewed

@@ -158,30 +158,6 @@ const Util = {
         return info;
     },
-    getFlatRanges: (functions) => {
-        const flatRanges = [];
-        if (functions && functions.length) {
-            functions.forEach((fun) => {
-                const ranges = fun.ranges;
-                if (ranges && ranges.length) {
-                    ranges.forEach((range) => {
-                        flatRanges.push(range);
-                    });
-                }
-            });
-            flatRanges.sort((a, b) => {
-                if (a.startOffset === b.startOffset) {
-                    if (a.endOffset === b.endOffset) {
-                        return a.count - b.count;
-                    }
-                    return a.endOffset - b.endOffset;
-                }
-                return a.startOffset - b.startOffset;
-            });
-        }
-        return flatRanges;
-    },
     isTagItem: (item) => {
         if (item.type === 'case' || (item.type === 'suite' && item.suiteType === 'describe')) {
             return true;

package/lib/plugins/comments.js CHANGED Viewed

@@ -6,10 +6,14 @@ const Util = require('../utils/util.js');
 const cacheMap = new Map();
 function getEmptyLines(lines) {
-    return lines.map((line, i) => ({
-        code: line.trim(),
-        num: i + 1
-    })).filter((line) => !line.code).map((line) => line.num);
+    const emptyLines = [];
+    const reg = /\S/;
+    lines.forEach((text, i) => {
+        if (!reg.test(text)) {
+            emptyLines.push(i + 1);
+        }
+    });
+    return emptyLines;
 }
 const getFileComments = (filePath, parserOptions = {}) => {

package/lib/plugins/coverage/coverage-utils.js ADDED Viewed

@@ -0,0 +1,154 @@
+const Util = require('../../utils/util.js');
+const Concurrency = require('../../platform/concurrency.js');
+const { convertSourceMap, axios } = require('../../runtime/monocart-coverage.js');
+const sortRanges = (ranges) => {
+    ranges.sort((a, b) => {
+        if (a.start === b.start) {
+            return a.end - b.end;
+        }
+        return a.start - b.start;
+    });
+};
+const resolveUrl = (input) => {
+    let url;
+    try {
+        url = new URL(input);
+    } catch (e) {
+        // console.error('error url', input);
+        return;
+    }
+    return url;
+};
+const filterPath = (str) => {
+    str = decodeURI(str);
+    // remove / of start, end or double, ./ ../
+    const ls = str.split('/').map((it) => {
+        it = it.trim();
+        // remove illegal characters except /
+        it = it.replace(/[\\:*?"<>|]/g, '');
+        // space
+        it = it.replace(/\s+/g, '-');
+        return it;
+    }).filter((item) => {
+        if (!item || item === '.' || item === '..') {
+            return false;
+        }
+        return true;
+    });
+    return ls.join('/');
+};
+const getSourcePath = (url, index = '', type = '') => {
+    if (!url) {
+        // anonymous scripts will have __playwright_evaluation_script__ as their URL.
+        url = ['file://anonymous', index ? `-${index}` : '', type ? `.${type}` : ''].join('');
+    }
+    const u = resolveUrl(url);
+    if (u) {
+        const host = [u.hostname, u.port].filter((it) => it).join('-');
+        // always start with '/'
+        const pathname = u.pathname;
+        let p = host + pathname;
+        // webpack://monocart-v8/packages/v8/src/app.vue?5cc4
+        if (u.search) {
+            p += `/${u.search}`;
+        }
+        return filterPath(p);
+    }
+    const relPath = Util.relativePath(url);
+    return filterPath(relPath);
+};
+// ================================================================================================
+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 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) {
+        // console.log(e)
+    }
+    if (mapUrl) {
+        return mapUrl.toString();
+    }
+};
+const resolveSourceMap = (data) => {
+    if (data) {
+        const { sources, sourcesContent } = data;
+        if (!sources || !sourcesContent) {
+            return;
+        }
+        return data;
+    }
+};
+const collectSourceMaps = async (v8list) => {
+    const concurrency = new Concurrency();
+    for (const item of v8list) {
+        // useless for css
+        if (item.type === 'css') {
+            continue;
+        }
+        const source = item.source;
+        const converter = convertSourceMap.fromSource(source);
+        if (converter) {
+            item.sourceMap = resolveSourceMap(converter.sourcemap);
+            continue;
+        }
+        const sourceMapUrl = getSourceMapUrl(source, item.url);
+        if (sourceMapUrl) {
+            item.sourceMapUrl = sourceMapUrl;
+            concurrency.addItem(item);
+        }
+    }
+    await concurrency.start(async (item) => {
+        const [err, res] = await request({
+            url: item.sourceMapUrl
+        });
+        if (!err && res) {
+            item.sourceMap = resolveSourceMap(res.data);
+        }
+    });
+};
+module.exports = {
+    sortRanges,
+    getSourcePath,
+    collectSourceMaps
+};