@vitest/coverage-v8 4.0.0-beta.8 → 4.0.0

package/dist/browser.js

@@ -1,4 +1,4 @@
-import { cdp } from '@vitest/browser/context';
+import { cdp } from 'vitest/browser';
 import { l as loadProvider } from './load-provider-CdgAx3rL.js';
 
 const session = cdp();

package/dist/index.js

@@ -2,6 +2,7 @@ import inspector from 'node:inspector/promises';
 import { fileURLToPath } from 'node:url';
 import { provider } from 'std-env';
 import { l as loadProvider } from './load-provider-CdgAx3rL.js';
+import { n as normalize } from './pathe.M-eThtNZ-BTaAGrLg.js';
 
 const session = new inspector.Session();
 let enabled = false;
@@ -29,7 +30,7 @@ const mod = {
 			if (filterResult(entry)) {
 				result.push({
 					...entry,
-					startOffset: options?.moduleExecutionInfo?.get(fileURLToPath(entry.url))?.startOffset || 0
+					startOffset: options?.moduleExecutionInfo?.get(normalize(fileURLToPath(entry.url)))?.startOffset || 0
 				});
 			}
 		}

package/dist/pathe.M-eThtNZ-BTaAGrLg.js

@@ -0,0 +1,104 @@
+const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
+function normalizeWindowsPath(input = "") {
+  if (!input) {
+    return input;
+  }
+  return input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
+}
+
+const _UNC_REGEX = /^[/\\]{2}/;
+const _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
+const _DRIVE_LETTER_RE = /^[A-Za-z]:$/;
+const normalize = function(path) {
+  if (path.length === 0) {
+    return ".";
+  }
+  path = normalizeWindowsPath(path);
+  const isUNCPath = path.match(_UNC_REGEX);
+  const isPathAbsolute = isAbsolute(path);
+  const trailingSeparator = path[path.length - 1] === "/";
+  path = normalizeString(path, !isPathAbsolute);
+  if (path.length === 0) {
+    if (isPathAbsolute) {
+      return "/";
+    }
+    return trailingSeparator ? "./" : ".";
+  }
+  if (trailingSeparator) {
+    path += "/";
+  }
+  if (_DRIVE_LETTER_RE.test(path)) {
+    path += "/";
+  }
+  if (isUNCPath) {
+    if (!isPathAbsolute) {
+      return `//./${path}`;
+    }
+    return `//${path}`;
+  }
+  return isPathAbsolute && !isAbsolute(path) ? `/${path}` : path;
+};
+function normalizeString(path, allowAboveRoot) {
+  let res = "";
+  let lastSegmentLength = 0;
+  let lastSlash = -1;
+  let dots = 0;
+  let char = null;
+  for (let index = 0; index <= path.length; ++index) {
+    if (index < path.length) {
+      char = path[index];
+    } else if (char === "/") {
+      break;
+    } else {
+      char = "/";
+    }
+    if (char === "/") {
+      if (lastSlash === index - 1 || dots === 1) ; else if (dots === 2) {
+        if (res.length < 2 || lastSegmentLength !== 2 || res[res.length - 1] !== "." || res[res.length - 2] !== ".") {
+          if (res.length > 2) {
+            const lastSlashIndex = res.lastIndexOf("/");
+            if (lastSlashIndex === -1) {
+              res = "";
+              lastSegmentLength = 0;
+            } else {
+              res = res.slice(0, lastSlashIndex);
+              lastSegmentLength = res.length - 1 - res.lastIndexOf("/");
+            }
+            lastSlash = index;
+            dots = 0;
+            continue;
+          } else if (res.length > 0) {
+            res = "";
+            lastSegmentLength = 0;
+            lastSlash = index;
+            dots = 0;
+            continue;
+          }
+        }
+        if (allowAboveRoot) {
+          res += res.length > 0 ? "/.." : "..";
+          lastSegmentLength = 2;
+        }
+      } else {
+        if (res.length > 0) {
+          res += `/${path.slice(lastSlash + 1, index)}`;
+        } else {
+          res = path.slice(lastSlash + 1, index);
+        }
+        lastSegmentLength = index - lastSlash - 1;
+      }
+      lastSlash = index;
+      dots = 0;
+    } else if (char === "." && dots !== -1) {
+      ++dots;
+    } else {
+      dots = -1;
+    }
+  }
+  return res;
+}
+const isAbsolute = function(p) {
+  return _IS_ABSOLUTE_RE.test(p);
+};
+
+export { normalize as n };

package/dist/provider.js

@@ -1,7 +1,6 @@
 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';
@@ -12,112 +11,10 @@ import { parseModule } from 'magicast';
 import { provider } from 'std-env';
 import c from 'tinyrainbow';
 import { BaseCoverageProvider } from 'vitest/coverage';
-import { parseAstAsync, isCSSRequest } from 'vitest/node';
+import { parseAstAsync } from 'vitest/node';
+import { n as normalize } from './pathe.M-eThtNZ-BTaAGrLg.js';
 
-const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
-function normalizeWindowsPath(input = "") {
-  if (!input) {
-    return input;
-  }
-  return input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
-}
-
-const _UNC_REGEX = /^[/\\]{2}/;
-const _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
-const _DRIVE_LETTER_RE = /^[A-Za-z]:$/;
-const normalize = function(path) {
-  if (path.length === 0) {
-    return ".";
-  }
-  path = normalizeWindowsPath(path);
-  const isUNCPath = path.match(_UNC_REGEX);
-  const isPathAbsolute = isAbsolute(path);
-  const trailingSeparator = path[path.length - 1] === "/";
-  path = normalizeString(path, !isPathAbsolute);
-  if (path.length === 0) {
-    if (isPathAbsolute) {
-      return "/";
-    }
-    return trailingSeparator ? "./" : ".";
-  }
-  if (trailingSeparator) {
-    path += "/";
-  }
-  if (_DRIVE_LETTER_RE.test(path)) {
-    path += "/";
-  }
-  if (isUNCPath) {
-    if (!isPathAbsolute) {
-      return `//./${path}`;
-    }
-    return `//${path}`;
-  }
-  return isPathAbsolute && !isAbsolute(path) ? `/${path}` : path;
-};
-function normalizeString(path, allowAboveRoot) {
-  let res = "";
-  let lastSegmentLength = 0;
-  let lastSlash = -1;
-  let dots = 0;
-  let char = null;
-  for (let index = 0; index <= path.length; ++index) {
-    if (index < path.length) {
-      char = path[index];
-    } else if (char === "/") {
-      break;
-    } else {
-      char = "/";
-    }
-    if (char === "/") {
-      if (lastSlash === index - 1 || dots === 1) ; else if (dots === 2) {
-        if (res.length < 2 || lastSegmentLength !== 2 || res[res.length - 1] !== "." || res[res.length - 2] !== ".") {
-          if (res.length > 2) {
-            const lastSlashIndex = res.lastIndexOf("/");
-            if (lastSlashIndex === -1) {
-              res = "";
-              lastSegmentLength = 0;
-            } else {
-              res = res.slice(0, lastSlashIndex);
-              lastSegmentLength = res.length - 1 - res.lastIndexOf("/");
-            }
-            lastSlash = index;
-            dots = 0;
-            continue;
-          } else if (res.length > 0) {
-            res = "";
-            lastSegmentLength = 0;
-            lastSlash = index;
-            dots = 0;
-            continue;
-          }
-        }
-        if (allowAboveRoot) {
-          res += res.length > 0 ? "/.." : "..";
-          lastSegmentLength = 2;
-        }
-      } else {
-        if (res.length > 0) {
-          res += `/${path.slice(lastSlash + 1, index)}`;
-        } else {
-          res = path.slice(lastSlash + 1, index);
-        }
-        lastSegmentLength = index - lastSlash - 1;
-      }
-      lastSlash = index;
-      dots = 0;
-    } else if (char === "." && dots !== -1) {
-      ++dots;
-    } else {
-      dots = -1;
-    }
-  }
-  return res;
-}
-const isAbsolute = function(p) {
-  return _IS_ABSOLUTE_RE.test(p);
-};
-
-var version = "4.0.0-beta.8";
+var version = "4.0.0";
 
 const FILE_PROTOCOL = "file://";
 const debug = createDebug("vitest:coverage");
@@ -198,7 +95,6 @@ class V8CoverageProvider extends BaseCoverageProvider {
 		return parseModule(await promises.readFile(configFilePath, "utf8"));
 	}
 	async getCoverageMapForUncoveredFiles(testedFiles) {
-		const transformResults = normalizeTransformResults(this.ctx.vite.environments);
 		const transform = this.createUncoveredFileTransformer(this.ctx);
 		const uncoveredFiles = await this.getUntestedFiles(testedFiles);
 		let index = 0;
@@ -216,8 +112,8 @@ class V8CoverageProvider extends BaseCoverageProvider {
 					timeout = setTimeout(() => debug(c.bgRed(`File "${filename}" is taking longer than 3s`)), 3e3);
 				}
 				// Do not use pathToFileURL to avoid encoding filename parts
-				const url = `file://${filename.startsWith("/") ? "" : "/"}${filename}`;
-				const sources = await this.getSources(url, transformResults, transform);
+				const url = `file://${filename[0] === "/" ? "" : "/"}${filename}`;
+				const sources = await this.getSources(url, transform);
 				coverageMap.merge(await this.remapCoverage(url, 0, sources, []));
 				if (debug.enabled) {
 					clearTimeout(timeout);
@@ -260,6 +156,11 @@ class V8CoverageProvider extends BaseCoverageProvider {
 				if (type === "statement" && node.type === "VariableDeclarator" && node.id.type === "Identifier" && node.id.name === "__vite_ssr_export_default__") {
 					return true;
 				}
+				// CJS imports as ternaries - e.g.
+				// const React = __vite__cjsImport0_react.__esModule ? __vite__cjsImport0_react.default : __vite__cjsImport0_react;
+				if (type === "branch" && node.type === "ConditionalExpression" && node.test.type === "MemberExpression" && node.test.object.type === "Identifier" && node.test.object.name.startsWith("__vite__cjsImport") && node.test.property.type === "Identifier" && node.test.property.name === "__esModule") {
+					return true;
+				}
 				// in-source test with "if (import.meta.vitest)"
 				if ((type === "branch" || type === "statement") && node.type === "IfStatement" && node.test.type === "MemberExpression" && node.test.property.type === "Identifier" && node.test.property.name === "vitest") {
 					// SSR
@@ -286,15 +187,12 @@ class V8CoverageProvider extends BaseCoverageProvider {
 			}
 		});
 	}
-	async getSources(url, transformResults, onTransform, functions = []) {
-		const filePath = normalize(fileURLToPath(url));
-		let transformResult = transformResults.get(filePath);
-		if (!transformResult) {
-			transformResult = await onTransform(removeStartsWith(url, FILE_PROTOCOL)).catch(() => undefined);
-		}
+	async getSources(url, onTransform, functions = []) {
+		const transformResult = await onTransform(removeStartsWith(url, FILE_PROTOCOL)).catch(() => undefined);
 		const map = transformResult?.map;
 		const code = transformResult?.code;
 		if (code == null) {
+			const filePath = normalize(fileURLToPath(url));
 			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.
@@ -320,11 +218,6 @@ class V8CoverageProvider extends BaseCoverageProvider {
 		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({ [environment]: { moduleGraph } });
 		async function onTransform(filepath) {
 			if (environment === "__browser__" && project.browser) {
 				const result = await project.browser.vite.transformRequest(removeStartsWith(filepath, project.config.root));
@@ -348,11 +241,11 @@ class V8CoverageProvider extends BaseCoverageProvider {
 					result.url = `${FILE_PROTOCOL}${project.config.root}${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);
+			if (this.isIncluded(fileURLToPath(result.url))) {
+				scriptCoverages.push({
+					...result,
+					url: decodeURIComponent(result.url)
+				});
 			}
 		}
 		const coverageMap = this.createCoverageMap();
@@ -369,7 +262,7 @@ class V8CoverageProvider extends BaseCoverageProvider {
 					start = performance.now();
 					timeout = setTimeout(() => debug(c.bgRed(`File "${fileURLToPath(url)}" is taking longer than 3s`)), 3e3);
 				}
-				const sources = await this.getSources(url, transformResults, onTransform, functions);
+				const sources = await this.getSources(url, onTransform, functions);
 				coverageMap.merge(await this.remapCoverage(url, startOffset, sources, functions));
 				if (debug.enabled) {
 					clearTimeout(timeout);
@@ -395,19 +288,6 @@ function findLongestFunctionLength(functions) {
 		return Math.max(previous, maxEndOffset);
 	}, 0);
 }
-function normalizeTransformResults(environments) {
-	const normalized = new Map();
-	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;
-}
 function removeStartsWith(filepath, start) {
 	if (filepath.startsWith(start)) {
 		return filepath.slice(start.length);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-v8",
   "type": "module",
-  "version": "4.0.0-beta.8",
+  "version": "4.0.0",
   "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.8",
-    "vitest": "4.0.0-beta.8"
+    "@vitest/browser": "4.0.0",
+    "vitest": "4.0.0"
   },
   "peerDependenciesMeta": {
     "@vitest/browser": {
@@ -51,16 +51,16 @@
   },
   "dependencies": {
     "@bcoe/v8-coverage": "^1.0.2",
-    "ast-v8-to-istanbul": "^0.3.3",
-    "debug": "^4.4.1",
+    "ast-v8-to-istanbul": "^0.3.5",
+    "debug": "^4.4.3",
     "istanbul-lib-coverage": "^3.2.2",
     "istanbul-lib-report": "^3.0.1",
     "istanbul-lib-source-maps": "^5.0.6",
-    "istanbul-reports": "^3.1.7",
+    "istanbul-reports": "^3.2.0",
     "magicast": "^0.3.5",
     "std-env": "^3.9.0",
-    "tinyrainbow": "^2.0.0",
-    "@vitest/utils": "4.0.0-beta.8"
+    "tinyrainbow": "^3.0.3",
+    "@vitest/utils": "4.0.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
@@ -69,11 +69,11 @@
     "@types/istanbul-lib-source-maps": "^4.0.4",
     "@types/istanbul-reports": "^3.0.4",
     "pathe": "^2.0.3",
-    "@vitest/browser": "4.0.0-beta.8",
-    "vitest": "4.0.0-beta.8"
+    "@vitest/browser": "4.0.0",
+    "vitest": "4.0.0"
   },
   "scripts": {
-    "build": "rimraf dist && rollup -c",
+    "build": "premove dist && rollup -c",
     "dev": "rollup -c --watch --watch.include 'src/**'"
   }
 }