monocart-coverage-reports 2.9.3 → 2.10.1

package/lib/utils/markdown.js

@@ -1,132 +1,132 @@
-const os = require('os');
-
-const renderLine = (ls, padding) => {
-    const spacing = ''.padEnd(padding, ' ');
-    const line = ls.join(`${spacing}|${spacing}`);
-    return `|${spacing}${line}${spacing}|`;
-};
-
-const renderCell = (cellValue, column) => {
-
-    // To include a pipe | as content within your cell, use a \ before the pipe:
-    cellValue = cellValue.split(/\\?\|/g).join('\\|');
-    const valueWidth = cellValue.length;
-    const width = column.width;
-
-    if (width <= valueWidth) {
-        return cellValue;
-    }
-
-    const spacingWidth = width - valueWidth;
-    const spacing = ''.padEnd(spacingWidth, ' ');
-
-    const align = column.align;
-
-    if (align === 'right') {
-        return spacing + cellValue;
-    }
-
-    if (align === 'center') {
-        const l = Math.round(spacingWidth * 0.5);
-        const r = spacingWidth - l;
-        const spacingL = ''.padEnd(l, ' ');
-        const spacingR = ''.padEnd(r, ' ');
-        return spacingL + cellValue + spacingR;
-
-    }
-
-    return cellValue + spacing;
-};
-
-const renderHyphen = (column) => {
-    const width = column.width;
-    const align = column.align;
-    if (align === 'right') {
-        return ':'.padStart(width, '-');
-    }
-    if (align === 'center') {
-        const hyphen = ''.padEnd(width - 2, '-');
-        return `:${hyphen}:`;
-    }
-    // default to left
-    return ':'.padEnd(width, '-');
-};
-
-const generateMarkdownGrid = (data) => {
-
-    const options = {
-        name: '',
-        padding: 1,
-        nullPlaceholder: '',
-        ... data.options
-    };
-
-    const padding = options.padding;
-
-    // console.log(data, options);
-
-    const lines = [];
-
-    if (options.name) {
-        lines.push(`## ${options.name}`);
-    }
-
-    // init columns
-    const columns = data.columns.map((item) => {
-        if (typeof item === 'string') {
-            item = {
-                name: item
-            };
-        }
-        const column = {
-            ... item
-        };
-        column.name = `${column.name}`;
-        if (typeof column.width !== 'number') {
-            column.width = column.name.length;
-        }
-        column.width = Math.max(column.width, 3);
-        return column;
-    });
-
-    // header
-    const headers = [];
-    columns.forEach((column) => {
-        headers.push(renderCell(column.name, column));
-    });
-    lines.push(renderLine(headers, padding));
-
-    const hyphens = [];
-    columns.forEach((column) => {
-        hyphens.push(renderHyphen(column));
-    });
-    lines.push(renderLine(hyphens, padding));
-
-    // rows
-    data.rows.forEach((row) => {
-        const cells = [];
-        columns.forEach((column, i) => {
-            let cellValue = '';
-            if (Array.isArray(row)) {
-                cellValue += row[i];
-            } else {
-                let v = row[column.id];
-                if (typeof v === 'undefined' || v === null) {
-                    v = options.nullPlaceholder;
-                }
-                if (column.formatter) {
-                    v = column.formatter(v, row, column);
-                }
-                cellValue += v;
-            }
-            cells.push(renderCell(cellValue, column));
-        });
-        lines.push(renderLine(cells, padding));
-    });
-
-    return lines.join(os.EOL) + os.EOL;
-
-};
-
-
-module.exports = generateMarkdownGrid;
+const os = require('os');
+
+const renderLine = (ls, padding) => {
+    const spacing = ''.padEnd(padding, ' ');
+    const line = ls.join(`${spacing}|${spacing}`);
+    return `|${spacing}${line}${spacing}|`;
+};
+
+const renderCell = (cellValue, column) => {
+
+    // To include a pipe | as content within your cell, use a \ before the pipe:
+    cellValue = cellValue.split(/\\?\|/g).join('\\|');
+    const valueWidth = cellValue.length;
+    const width = column.width;
+
+    if (width <= valueWidth) {
+        return cellValue;
+    }
+
+    const spacingWidth = width - valueWidth;
+    const spacing = ''.padEnd(spacingWidth, ' ');
+
+    const align = column.align;
+
+    if (align === 'right') {
+        return spacing + cellValue;
+    }
+
+    if (align === 'center') {
+        const l = Math.round(spacingWidth * 0.5);
+        const r = spacingWidth - l;
+        const spacingL = ''.padEnd(l, ' ');
+        const spacingR = ''.padEnd(r, ' ');
+        return spacingL + cellValue + spacingR;
+
+    }
+
+    return cellValue + spacing;
+};
+
+const renderHyphen = (column) => {
+    const width = column.width;
+    const align = column.align;
+    if (align === 'right') {
+        return ':'.padStart(width, '-');
+    }
+    if (align === 'center') {
+        const hyphen = ''.padEnd(width - 2, '-');
+        return `:${hyphen}:`;
+    }
+    // default to left
+    return ':'.padEnd(width, '-');
+};
+
+const markdownGrid = (data) => {
+
+    const options = {
+        name: '',
+        padding: 1,
+        nullPlaceholder: '',
+        ... data.options
+    };
+
+    const padding = options.padding;
+
+    // console.log(data, options);
+
+    const lines = [];
+
+    if (options.name) {
+        lines.push(`## ${options.name}`);
+    }
+
+    // init columns
+    const columns = data.columns.map((item) => {
+        if (typeof item === 'string') {
+            item = {
+                name: item
+            };
+        }
+        const column = {
+            ... item
+        };
+        column.name = `${column.name}`;
+        if (typeof column.width !== 'number') {
+            column.width = column.name.length;
+        }
+        column.width = Math.max(column.width, 3);
+        return column;
+    });
+
+    // header
+    const headers = [];
+    columns.forEach((column) => {
+        headers.push(renderCell(column.name, column));
+    });
+    lines.push(renderLine(headers, padding));
+
+    const hyphens = [];
+    columns.forEach((column) => {
+        hyphens.push(renderHyphen(column));
+    });
+    lines.push(renderLine(hyphens, padding));
+
+    // rows
+    data.rows.forEach((row) => {
+        const cells = [];
+        columns.forEach((column, i) => {
+            let cellValue = '';
+            if (Array.isArray(row)) {
+                cellValue += row[i];
+            } else {
+                let v = row[column.id];
+                if (typeof v === 'undefined' || v === null) {
+                    v = options.nullPlaceholder;
+                }
+                if (column.formatter) {
+                    v = column.formatter(v, row, column);
+                }
+                cellValue += v;
+            }
+            cells.push(renderCell(cellValue, column));
+        });
+        lines.push(renderLine(cells, padding));
+    });
+
+    return lines.join(os.EOL) + os.EOL;
+
+};
+
+
+module.exports = markdownGrid;

package/lib/utils/util.js

@@ -1,16 +1,16 @@
 const fs = require('fs');
 const { writeFile, readFile } = require('fs/promises');
 const path = require('path');
-const { pathToFileURL } = require('url');
 const os = require('os');
 const crypto = require('crypto');
 const EC = require('eight-colors');
 const CG = require('console-grid');
+const acornWalk = require('acorn-walk');
+
 const Share = require('../platform/share.js');
 const request = require('./request.js');
-const { deflateSync } = require('lz-utils');
-
-const acornWalk = require('acorn-walk');
+const version = require('../../package.json').version;
+const markdownGrid = require('./markdown.js');
 
 const { findUpSync, supportsColor } = require('../packages/monocart-coverage-vendor.js');
 
@@ -21,6 +21,8 @@ if (!supportsColor.stdout) {
 }
 
 const Util = {
+    version,
+
     ... Share,
 
     EC,
@@ -29,6 +31,7 @@ const Util = {
     root: process.cwd(),
 
     request,
+    markdownGrid,
 
     relativePath: function(p, root) {
         p = `${p}`;
@@ -149,42 +152,6 @@ const Util = {
         return htmlPathHandler();
     },
 
-    resolveNodeModule: (id) => {
-
-        // for deno npm module
-        const mp = require.resolve(id);
-        if (fs.existsSync(mp)) {
-            return mp;
-        }
-
-        const p = `${it}/dist/${it}.js`;
-        // root
-        const cwd = path.resolve('node_modules', p);
-        if (fs.existsSync(cwd)) {
-            return cwd;
-        }
-
-        // sub node modules
-        const sub = path.resolve(__dirname, '../../node_modules', p);
-        if (fs.existsSync(sub)) {
-            return sub;
-        }
-
-        // same level dep
-        const dep = path.resolve(__dirname, '../../../', p);
-        if (fs.existsSync(dep)) {
-            return dep;
-        }
-
-        Util.logError(`Not found module: ${p}`);
-
-        return cwd;
-    },
-
-    resolvePackage: (p) => {
-        return path.resolve(__dirname, '../packages', p);
-    },
-
     getCacheFileInfo: (type, id, cacheDir) => {
         const cacheName = `${type}-${id}.json`;
         const cachePath = path.resolve(cacheDir, cacheName);
@@ -219,104 +186,6 @@ const Util = {
         // default config not found
     },
 
-    saveHtmlReport: async (options) => {
-
-        const {
-            inline,
-            reportData,
-            jsFiles,
-            assetsPath,
-            outputDir,
-            htmlFile,
-
-            reportDataFile
-        } = options;
-
-        //  report data
-        const reportDataCompressed = deflateSync(JSON.stringify(reportData));
-        const reportDataStr = `window.reportData = '${reportDataCompressed}';`;
-
-        // js libs
-        const jsList = [];
-        for (const jsFile of jsFiles) {
-            const jsStr = await Util.readFile(jsFile);
-            jsList.push({
-                filename: path.basename(jsFile),
-                str: jsStr
-            });
-        }
-
-        // html content
-        let htmlStr = '';
-        const EOL = Util.getEOL();
-        if (inline) {
-            htmlStr = [
-                '<script>',
-                reportDataStr,
-                ... jsList.map((it) => it.str),
-                '</script>'
-            ].join(EOL);
-        } else {
-
-            await Util.writeFile(path.resolve(outputDir, reportDataFile), reportDataStr);
-
-            const assetsDir = path.resolve(outputDir, assetsPath);
-            const relAssetsDir = Util.relativePath(assetsDir, outputDir);
-
-            for (const item of jsList) {
-                const filePath = path.resolve(assetsDir, item.filename);
-                if (!fs.existsSync(filePath)) {
-                    await Util.writeFile(filePath, item.str);
-                }
-            }
-
-            htmlStr = [
-                `<script src="${reportDataFile}"></script>`,
-                ... jsList.map((it) => `<script src="${relAssetsDir}/${it.filename}"></script>`)
-            ].join(EOL);
-        }
-
-        // html
-        const htmlPath = path.resolve(outputDir, htmlFile);
-        const template = Util.getTemplate(path.resolve(__dirname, '../default/template.html'));
-        const html = Util.replace(template, {
-            title: reportData.title,
-            content: htmlStr
-        });
-
-        await Util.writeFile(htmlPath, html);
-
-        return Util.relativePath(htmlPath);
-    },
-
-    runCustomReporter: async (reportName, reportData, reportOptions, globalOptions) => {
-        let CustomReporter;
-        let err;
-        try {
-            CustomReporter = await import(reportName);
-        } catch (e) {
-            err = e;
-            try {
-                CustomReporter = await import(pathToFileURL(reportName));
-            } catch (ee) {
-                err = ee;
-            }
-        }
-
-        if (!CustomReporter) {
-            Util.logError(err.message);
-            return;
-        }
-
-        CustomReporter = CustomReporter.default || CustomReporter;
-
-        const reporter = new CustomReporter(reportOptions, globalOptions);
-
-        const results = await reporter.generate(reportData);
-
-        return results;
-    },
-
     getEOL: function(content) {
         if (!content) {
             return os.EOL;
@@ -485,26 +354,16 @@ const Util = {
         }
     },
 
-    getTemplate: function(templatePath) {
-        if (!Util.templateCache) {
-            Util.templateCache = {};
-        }
-        let template = Util.templateCache[templatePath];
-        if (!template) {
-            template = Util.readFileSync(templatePath);
-            if (template) {
-                Util.templateCache[templatePath] = template;
-            } else {
-                Util.logError(`not found template: ${templatePath}`);
-            }
-        }
-        return template;
-    },
-
     normalizeColorType: (color) => {
         return `${color}`.trim().toLowerCase();
     },
 
+    normalizeMaxCols: (maxCols, min = 1) => {
+        if (Util.isNum(maxCols)) {
+            return Math.max(maxCols, min);
+        }
+    },
+
     getColorStrByStatus: (str, status, color = '') => {
 
         const colorHandlers = {
@@ -545,7 +404,7 @@ const Util = {
                 return str;
             },
             'tex': () => {
-                const texStr = str.replace('%', '\\\\%');
+                const texStr = str.replace(/%/g, '\\\\%');
                 if (status === 'low') {
                     return `$\\color{red}{\\textsf{${texStr}}}$`;
                 }
@@ -673,6 +532,87 @@ const Util = {
         return lines.join(',');
     },
 
+    // skip \s and comments
+    fixSourceRange: (locator, start, end) => {
+
+        let fixedStart = start;
+        let fixedEnd = end;
+
+        const rangeText = locator.getSlice(start, end);
+
+        let text = rangeText;
+
+        // =======================================
+        // handle end first
+        const oldLen = text.length;
+        text = text.trimEnd();
+        const newLen = text.length;
+        if (newLen < oldLen) {
+            fixedEnd -= oldLen - newLen;
+        }
+
+        // =======================================
+        // handle start
+
+        const comments = locator.lineParser.commentParser.comments;
+
+        let startOffset = 0;
+
+        // never start in a comment, skip to comment end
+        const inComment = comments.find((it) => start > it.start && start < it.end);
+        if (inComment) {
+            startOffset = inComment.end - start;
+            // next text
+            text = text.slice(startOffset);
+        }
+
+        while (startOffset < newLen) {
+
+            const beforeLen = text.length;
+            text = text.trimStart();
+            const afterLen = text.length;
+            if (afterLen === beforeLen) {
+                // no indent
+                break;
+            }
+
+            const indentLen = beforeLen - afterLen;
+
+            startOffset += indentLen;
+
+            // no comments
+            if (!comments.length) {
+                break;
+            }
+
+            const nextPos = start + startOffset;
+            const comment = comments.find((it) => it.start === nextPos);
+            if (!comment) {
+                break;
+            }
+
+            const commentLen = comment.end - comment.start;
+
+            startOffset += commentLen;
+
+            // next text
+            text = text.slice(commentLen);
+
+        }
+
+        // It should never be possible to start with }
+        if (rangeText[startOffset] === '}') {
+            startOffset += 1;
+        }
+
+        fixedStart = start + startOffset;
+
+        return {
+            fixedStart,
+            fixedEnd
+        };
+    },
+
     cmpVersion: (v1, v2) => {
         const [strMajor1, strMinor1, strPatch1] = `${v1}`.split('.');
         const [strMajor2, strMinor2, strPatch2] = `${v2}`.split('.');