@vitest/coverage-v8 4.0.0-beta.3 → 4.0.0-beta.5

package/dist/index.js

@@ -25,10 +25,12 @@ const mod = {
 					return reject(error);
 				}
 				try {
-					const result = coverage.result.filter(filterResult).map((res) => ({
-						...res,
-						startOffset: options?.moduleExecutionInfo?.get(fileURLToPath(res.url))?.startOffset || 0
-					}));
+					const result = coverage.result.filter(filterResult).map((res) => {
+						return {
+							...res,
+							startOffset: options?.moduleExecutionInfo?.get(fileURLToPath(res.url))?.startOffset || 0
+						};
+					});
 					resolve({ result });
 				} catch (e) {
 					reject(e);

package/dist/provider.js

@@ -1,6 +1,7 @@
 import { promises } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { mergeProcessCovs } from '@bcoe/v8-coverage';
+import { cleanUrl } from '@vitest/utils';
 import astV8ToIstanbul from 'ast-v8-to-istanbul';
 import createDebug from 'debug';
 import libCoverage from 'istanbul-lib-coverage';
@@ -10,9 +11,8 @@ import reports from 'istanbul-reports';
 import { parseModule } from 'magicast';
 import { provider } from 'std-env';
 import c from 'tinyrainbow';
-import { builtinModules } from 'node:module';
 import { BaseCoverageProvider } from 'vitest/coverage';
-import { parseAstAsync } from 'vitest/node';
+import { parseAstAsync, isCSSRequest } from 'vitest/node';
 
 const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
@@ -117,31 +117,7 @@ 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 postfixRE = /[?#].*$/;
-function cleanUrl(url) {
-	return url.replace(postfixRE, "");
-}
-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"
-]);
-
-var version = "4.0.0-beta.3";
+var version = "4.0.0-beta.5";
 
 const FILE_PROTOCOL = "file://";
 const debug = createDebug("vitest:coverage");
@@ -169,8 +145,8 @@ class V8CoverageProvider extends BaseCoverageProvider {
 					}
 				});
 			},
-			onFinished: async (project, transformMode) => {
-				const converted = await this.convertCoverage(merged, project, transformMode);
+			onFinished: async (project, environment) => {
+				const converted = await this.convertCoverage(merged, project, environment);
 				// Source maps can change based on projectName and transform mode.
 				// Coverage transform re-uses source maps so we need to separate transforms from each other.
 				const transformedCoverage = await transformCoverage(converted);
@@ -222,7 +198,7 @@ class V8CoverageProvider extends BaseCoverageProvider {
 		return parseModule(await promises.readFile(configFilePath, "utf8"));
 	}
 	async getCoverageMapForUncoveredFiles(testedFiles) {
-		const transformResults = normalizeTransformResults(this.ctx.vitenode.fetchCache);
+		const transformResults = normalizeTransformResults(this.ctx.vite.environments);
 		const transform = this.createUncoveredFileTransformer(this.ctx);
 		const uncoveredFiles = await this.getUntestedFiles(testedFiles);
 		let index = 0;
@@ -299,6 +275,10 @@ class V8CoverageProvider extends BaseCoverageProvider {
 				if (type === "statement" && node.type === "ExpressionStatement" && node.expression.type === "AssignmentExpression" && node.expression.left.type === "MemberExpression" && node.expression.left.object.type === "MetaProperty" && node.expression.left.object.meta.name === "import" && node.expression.left.object.property.name === "meta" && node.expression.left.property.type === "Identifier" && node.expression.left.property.name === "env") {
 					return true;
 				}
+				// SSR mode's "import.meta.env ="
+				if (type === "statement" && node.type === "ExpressionStatement" && node.expression.type === "AssignmentExpression" && node.expression.left.type === "MemberExpression" && node.expression.left.object.type === "Identifier" && node.expression.left.object.name === "__vite_ssr_import_meta__") {
+					return true;
+				}
 				// SWC's decorators
 				if (type === "statement" && node.type === "ExpressionStatement" && node.expression.type === "CallExpression" && node.expression.callee.type === "Identifier" && node.expression.callee.name === "_ts_decorate") {
 					return "ignore-this-and-nested-nodes";
@@ -314,7 +294,7 @@ class V8CoverageProvider extends BaseCoverageProvider {
 		}
 		const map = transformResult?.map;
 		const code = transformResult?.code;
-		if (!code) {
+		if (code == null) {
 			const original = await promises.readFile(filePath, "utf-8").catch(() => {
 				// If file does not exist construct a dummy source for it.
 				// These can be files that were generated dynamically during the test run and were removed after it.
@@ -336,14 +316,17 @@ class V8CoverageProvider extends BaseCoverageProvider {
 			map
 		};
 	}
-	async convertCoverage(coverage, project = this.ctx.getRootProject(), transformMode) {
-		let fetchCache = project.vitenode.fetchCache;
-		if (transformMode) {
-			fetchCache = transformMode === "browser" ? new Map() : project.vitenode.fetchCaches[transformMode];
+	async convertCoverage(coverage, project = this.ctx.getRootProject(), environment) {
+		if (environment === "__browser__" && !project.browser) {
+			throw new Error(`Cannot access browser module graph because it was torn down.`);
+		}
+		const moduleGraph = environment === "__browser__" ? project.browser.vite.environments.client.moduleGraph : project.vite.environments[environment]?.moduleGraph;
+		if (!moduleGraph) {
+			throw new Error(`Module graph for environment ${environment} was not defined.`);
 		}
-		const transformResults = normalizeTransformResults(fetchCache);
+		const transformResults = normalizeTransformResults({ [environment]: { moduleGraph } });
 		async function onTransform(filepath) {
-			if (transformMode === "browser" && project.browser) {
+			if (environment === "__browser__" && project.browser) {
 				const result = await project.browser.vite.transformRequest(removeStartsWith(filepath, project.config.root));
 				if (result) {
 					return {
@@ -352,11 +335,11 @@ class V8CoverageProvider extends BaseCoverageProvider {
 					};
 				}
 			}
-			return project.vitenode.transformRequest(filepath);
+			return project.vite.environments[environment].transformRequest(filepath);
 		}
 		const scriptCoverages = [];
 		for (const result of coverage.result) {
-			if (transformMode === "browser") {
+			if (environment === "__browser__") {
 				if (result.url.startsWith("/@fs")) {
 					result.url = `${FILE_PROTOCOL}${removeStartsWith(result.url, "/@fs")}`;
 				} else if (result.url.startsWith(project.config.root)) {
@@ -365,7 +348,10 @@ class V8CoverageProvider extends BaseCoverageProvider {
 					result.url = `${FILE_PROTOCOL}${project.config.root}${result.url}`;
 				}
 			}
-			if (this.isIncluded(fileURLToPath(result.url))) {
+			// Ignore all CSS requests, so we don't override the actual code coverage
+			// In cases where CSS and JS are in the same file (.vue, .svelte)
+			// The file has a `.vue` extension, but the URL has `lang.css` query
+			if (!isCSSRequest(result.url) && this.isIncluded(fileURLToPath(result.url))) {
 				scriptCoverages.push(result);
 			}
 		}
@@ -409,12 +395,15 @@ function findLongestFunctionLength(functions) {
 		return Math.max(previous, maxEndOffset);
 	}, 0);
 }
-function normalizeTransformResults(fetchCache) {
+function normalizeTransformResults(environments) {
 	const normalized = new Map();
-	for (const [key, value] of fetchCache.entries()) {
-		const cleanEntry = cleanUrl(key);
-		if (!normalized.has(cleanEntry)) {
-			normalized.set(cleanEntry, value.result);
+	for (const environmentName in environments) {
+		const moduleGraph = environments[environmentName].moduleGraph;
+		for (const [key, value] of moduleGraph.idToModuleMap) {
+			const cleanEntry = cleanUrl(key);
+			if (value.transformResult && !normalized.has(cleanEntry)) {
+				normalized.set(cleanEntry, value.transformResult);
+			}
 		}
 	}
 	return normalized;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-v8",
   "type": "module",
-  "version": "4.0.0-beta.3",
+  "version": "4.0.0-beta.5",
   "description": "V8 coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -41,8 +41,8 @@
     "dist"
   ],
   "peerDependencies": {
-    "@vitest/browser": "4.0.0-beta.3",
-    "vitest": "4.0.0-beta.3"
+    "@vitest/browser": "4.0.0-beta.5",
+    "vitest": "4.0.0-beta.5"
   },
   "peerDependenciesMeta": {
     "@vitest/browser": {
@@ -59,7 +59,8 @@
     "istanbul-reports": "^3.1.7",
     "magicast": "^0.3.5",
     "std-env": "^3.9.0",
-    "tinyrainbow": "^2.0.0"
+    "tinyrainbow": "^2.0.0",
+    "@vitest/utils": "4.0.0-beta.5"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
@@ -68,9 +69,8 @@
     "@types/istanbul-lib-source-maps": "^4.0.4",
     "@types/istanbul-reports": "^3.0.4",
     "pathe": "^2.0.3",
-    "vitest": "4.0.0-beta.3",
-    "vite-node": "4.0.0-beta.3",
-    "@vitest/browser": "4.0.0-beta.3"
+    "@vitest/browser": "4.0.0-beta.5",
+    "vitest": "4.0.0-beta.5"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",