monocart-coverage-reports 2.13.0 → 2.13.1

package/README.md

@@ -671,7 +671,7 @@ const coverageOptions = {
 ```
 
 ## Adding Empty Coverage for Untested Files
-By default the untested files will not be included in the coverage report, we can add empty coverage for untested files with option `all`, the untested files will show 0% coverage.
+By default the untested files will not be included in the coverage report. Use `all` to include them with 0% coverage. This also works when no coverage data has been collected: a V8 report is generated from the matching untested files.
 ```js
 const coverageOptions = {
     all: './src',

package/README.zh-Hans.md

@@ -674,7 +674,7 @@ const coverageOptions = {
 ```
 
 ## Adding Empty Coverage for Untested Files
-默认，未测试的文件是不会包含到覆盖率报告的，需要使用`all`选项来为这些文件添加一个空的覆盖率，也就是0%
+默认，未测试的文件不会包含在覆盖率报告中。使用 `all` 选项可将它们以 0% 覆盖率加入报告。即使没有收集到任何覆盖率数据，也会为匹配的未测试文件生成 V8 报告。
 ```js
 const coverageOptions = {
     all: './src',

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

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const EC = require('eight-colors');
+const { CommentParser } = require('monocart-locator');
 const { fileURLToPath, pathToFileURL } = require('url');
 const Concurrency = require('../platform/concurrency.js');
 const { convertSourceMap } = require('../packages/monocart-coverage-vendor.js');
@@ -8,6 +9,15 @@ const { flattenSourceMaps } = require('./flatten-source-maps.js');
 
 const Util = require('../utils/util.js');
 
+const getSourceMapComments = (source) => {
+    if (!source.includes('sourceMappingURL=')) {
+        return [];
+    }
+    return new CommentParser(source).comments
+        .map((item) => item.text)
+        .filter((comment) => (/^\/[/*][@#][ \t]+sourceMappingURL=/).test(comment));
+};
+
 const defaultSourceMapResolver = async (url = '') => {
 
     if (url.startsWith('file:')) {
@@ -48,26 +58,26 @@ const loadSourceMap = async (url, options) => {
     return defaultSourceMapResolver(url);
 };
 
-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];
-
-    const urlObj = Util.resolveUrl(filename, url);
-    if (urlObj) {
-        return urlObj.toString();
-    }
+const resolveMapUrl = (filename, url) => {
+    const urlObj = Util.resolveUrl(filename, url) || Util.resolveUrl(filename, pathToFileURL(url).toString());
+    return urlObj?.toString();
+};
 
-    const mapUrl = Util.resolveUrl(filename, pathToFileURL(url).toString());
-    if (mapUrl) {
-        return mapUrl.toString();
+const getSourceMapUrl = (comments, url) => {
+    for (let i = comments.length - 1; i >= 0; i--) {
+        const r = convertSourceMap.mapFileCommentRegex.exec(comments[i]);
+        if (!r || r.index !== 0) {
+            continue;
+        }
+        // //# captures in 1 and /* */ in 2
+        const filename = r[1] || r[2];
+        if (!filename || filename.startsWith('data:')) {
+            continue;
+        }
+        const mapUrl = resolveMapUrl(filename, url);
+        if (mapUrl) {
+            return mapUrl;
+        }
     }
 };
 
@@ -181,15 +191,19 @@ const resolveSourceMap = (data, url) => {
 
 };
 
-const getInlineSourceMap = (content) => {
-    let smc;
-    try {
-        smc = convertSourceMap.fromSource(content);
-    } catch (e) {
-        // ignore "//# sourceMappingURL=" in a string
-        // console.log(e);
+const getInlineSourceMap = (comments) => {
+    for (let i = comments.length - 1; i >= 0; i--) {
+        const comment = comments[i];
+        const match = convertSourceMap.commentRegex.exec(comment);
+        if (!match || match.index !== 0) {
+            continue;
+        }
+        try {
+            return convertSourceMap.fromComment(comment);
+        } catch (e) {
+            // Ignore invalid inline maps.
+        }
     }
-    return smc;
 };
 
 const collectSourceMaps = async (v8list, options) => {
@@ -223,15 +237,12 @@ const collectSourceMaps = async (v8list, options) => {
             sourceMap
         };
 
-        // remove comments if not debug
-        if (!Util.isDebug()) {
-            sourceData.source = convertSourceMap.removeComments(source);
-        }
-
+        // Keep the original source so V8 offsets remain valid.
         // check sourceMap only for js
         if (type === 'js' && !sourceData.sourceMap) {
+            const comments = getSourceMapComments(source);
             // from inline sync
-            const smc = getInlineSourceMap(source);
+            const smc = getInlineSourceMap(comments);
             if (smc) {
                 sourceData.sourceMap = resolveSourceMap(smc.sourcemap, url);
                 sourcemapList.push({
@@ -242,7 +253,7 @@ const collectSourceMaps = async (v8list, options) => {
                 continue;
             }
             // from url async
-            const sourceMapUrl = getSourceMapUrl(source, item.url);
+            const sourceMapUrl = getSourceMapUrl(comments, url);
             if (sourceMapUrl) {
                 concurrency.addItem({
                     sourceMapUrl,

package/lib/converter/untested.js

@@ -6,9 +6,6 @@ const { pathToFileURL, fileURLToPath } = require('url');
 
 const { normalizeSourcePath, getSourcePathReplacer } = require('../utils/source-path.js');
 
-// const EC = require('eight-colors');
-const { convertSourceMap } = require('../packages/monocart-coverage-vendor.js');
-
 // ========================================================================================================
 
 const resolveAllDirList = (input) => {
@@ -133,11 +130,6 @@ const saveUntestedFileSource = async (entryFile, options) => {
         sourceMap
     };
 
-    // remove comments if not debug
-    if (!Util.isDebug()) {
-        sourceData.source = convertSourceMap.removeComments(source);
-    }
-
     // console.log('save untested file', id, url);
 
     await Util.saveSourceCacheFile(sourceData, options);

package/lib/generate.js

@@ -321,9 +321,13 @@ const getInputData = async (mcr) => {
     }
 
     if (!dataList.length) {
-        const dirs = inputList.map((dir) => Util.relativePath(dir));
-        Util.logError(`Not found coverage data in dir(s): ${dirs.join(', ')}`);
-        return;
+        if (!mcr.options.all) {
+            const dirs = inputList.map((dir) => Util.relativePath(dir));
+            Util.logError(`Not found coverage data in dir(s): ${dirs.join(', ')}`);
+            return;
+        }
+        // No coverage input: use V8 so `all` can add untested files.
+        dataList.push({ type: 'v8', data: [] });
     }
 
     return {