@vitest/coverage-v8 0.33.0 → 0.34.0

package/dist/provider.js

@@ -10,6 +10,7 @@ import MagicString from 'magic-string';
 import remapping from '@ampproject/remapping';
 import c from 'picocolors';
 import { provider } from 'std-env';
+import { builtinModules } from 'module';
 import { coverageConfigDefaults, defaultExclude, defaultInclude } from 'vitest/config';
 import { BaseCoverageProvider } from 'vitest/coverage';
 import _TestExclude from 'test-exclude';
@@ -140,6 +141,31 @@ const isAbsolute = function(p) {
   return _IS_ABSOLUTE_RE.test(p);
 };
 
+const isWindows = process.platform === "win32";
+const drive = isWindows ? process.cwd()[0] : null;
+drive ? drive === drive.toUpperCase() ? drive.toLowerCase() : drive.toUpperCase() : null;
+const queryRE = /\?.*$/s;
+const hashRE = /#.*$/s;
+function cleanUrl(url) {
+  return url.replace(hashRE, "").replace(queryRE, "");
+}
+/* @__PURE__ */ new Set([
+  ...builtinModules,
+  "assert/strict",
+  "diagnostics_channel",
+  "dns/promises",
+  "fs/promises",
+  "path/posix",
+  "path/win32",
+  "readline/promises",
+  "stream/consumers",
+  "stream/promises",
+  "stream/web",
+  "timers/promises",
+  "util/types",
+  "wasi"
+]);
+
 const WRAPPER_LENGTH = 185;
 const VITE_EXPORTS_LINE_PATTERN = /Object\.defineProperty\(__vite_ssr_exports__.*\n/g;
 class V8CoverageProvider extends BaseCoverageProvider {
@@ -186,15 +212,16 @@ class V8CoverageProvider extends BaseCoverageProvider {
   async reportCoverage({ allTestsRun } = {}) {
     if (provider === "stackblitz")
       this.ctx.logger.log(c.blue(" % ") + c.yellow("@vitest/coverage-v8 does not work on Stackblitz. Report will be empty."));
+    const transformResults = normalizeTransformResults(this.ctx.projects.map((project) => project.vitenode.fetchCache));
     const merged = mergeProcessCovs(this.coverages);
     const scriptCoverages = merged.result.filter((result) => this.testExclude.shouldInstrument(fileURLToPath(result.url)));
     if (this.options.all && allTestsRun) {
       const coveredFiles = Array.from(scriptCoverages.map((r) => r.url));
-      const untestedFiles = await this.getUntestedFiles(coveredFiles);
+      const untestedFiles = await this.getUntestedFiles(coveredFiles, transformResults);
       scriptCoverages.push(...untestedFiles);
     }
     const converted = await Promise.all(scriptCoverages.map(async ({ url, functions }) => {
-      const sources = await this.getSources(url, functions);
+      const sources = await this.getSources(url, transformResults, functions);
       const wrapperLength = sources.sourceMap ? WRAPPER_LENGTH : 0;
       const converter = v8ToIstanbul(url, wrapperLength, sources);
       await converter.load();
@@ -247,11 +274,11 @@ class V8CoverageProvider extends BaseCoverageProvider {
       });
     }
   }
-  async getUntestedFiles(testedFiles) {
+  async getUntestedFiles(testedFiles, transformResults) {
     const includedFiles = await this.testExclude.glob(this.ctx.config.root);
     const uncoveredFiles = includedFiles.map((file) => pathToFileURL(resolve(this.ctx.config.root, file))).filter((file) => !testedFiles.includes(file.href));
     return await Promise.all(uncoveredFiles.map(async (uncoveredFile) => {
-      const { source } = await this.getSources(uncoveredFile.href);
+      const { source } = await this.getSources(uncoveredFile.href, transformResults);
       return {
         url: uncoveredFile.href,
         scriptId: "0",
@@ -269,13 +296,10 @@ class V8CoverageProvider extends BaseCoverageProvider {
       };
     }));
   }
-  async getSources(url, functions = []) {
+  async getSources(url, transformResults, functions = []) {
     var _a;
     const filePath = normalize(fileURLToPath(url));
-    const transformResult = this.ctx.projects.map((project) => {
-      var _a2;
-      return (_a2 = project.vitenode.fetchCache.get(filePath)) == null ? void 0 : _a2.result;
-    }).filter(Boolean).shift();
+    const transformResult = transformResults.get(filePath);
     const map = transformResult == null ? void 0 : transformResult.map;
     const code = transformResult == null ? void 0 : transformResult.code;
     const sourcesContent = ((_a = map == null ? void 0 : map.sourcesContent) == null ? void 0 : _a[0]) || await promises.readFile(filePath, "utf-8").catch(() => {
@@ -318,5 +342,16 @@ function findLongestFunctionLength(functions) {
     return Math.max(previous, maxEndOffset);
   }, 0);
 }
+function normalizeTransformResults(fetchCaches) {
+  const normalized = /* @__PURE__ */ new Map();
+  for (const fetchCache of fetchCaches) {
+    for (const [key, value] of fetchCache.entries()) {
+      const cleanEntry = cleanUrl(key);
+      if (!normalized.has(cleanEntry))
+        normalized.set(cleanEntry, value.result);
+    }
+  }
+  return normalized;
+}
 
 export { V8CoverageProvider };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-v8",
   "type": "module",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "V8 coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -43,7 +43,7 @@
     "@ampproject/remapping": "^2.2.1",
     "@bcoe/v8-coverage": "^0.2.3",
     "istanbul-lib-coverage": "^3.2.0",
-    "istanbul-lib-report": "^3.0.0",
+    "istanbul-lib-report": "^3.0.1",
     "istanbul-lib-source-maps": "^4.0.1",
     "istanbul-reports": "^3.1.5",
     "magic-string": "^0.30.1",
@@ -58,8 +58,8 @@
     "@types/istanbul-lib-source-maps": "^4.0.1",
     "@types/istanbul-reports": "^3.0.1",
     "pathe": "^1.1.1",
-    "vitest": "0.33.0",
-    "vite-node": "0.33.0"
+    "vite-node": "0.34.0",
+    "vitest": "0.34.0"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",