@vitest/coverage-v8 5.0.0-beta.5 → 5.0.0-beta.7

package/dist/browser.js

@@ -13,18 +13,7 @@ const mod = {
 		await triggerCommand("__vitest_startV8Coverage");
 	},
 	async takeCoverage() {
-		const coverage = await triggerCommand("__vitest_takeV8Coverage");
-		const result = [];
-		// Reduce amount of data sent over rpc by doing some early result filtering
-		for (const entry of coverage.result) {
-			if (filterResult(entry)) {
-				result.push({
-					...entry,
-					url: decodeURIComponent(entry.url.replace(window.location.origin, ""))
-				});
-			}
-		}
-		return { result };
+		return triggerCommand("__vitest_takeV8Coverage", [window.location.href]);
 	},
 	stopCoverage() {
 		// Browser mode should not stop coverage as same V8 instance is shared between tests
@@ -33,29 +22,5 @@ const mod = {
 		return loadProvider();
 	}
 };
-function filterResult(coverage) {
-	if (!coverage.url.startsWith(window.location.origin)) {
-		return false;
-	}
-	if (coverage.url.includes("/node_modules/")) {
-		return false;
-	}
-	if (coverage.url.includes("__vitest_browser__")) {
-		return false;
-	}
-	if (coverage.url.includes("__vitest__/assets")) {
-		return false;
-	}
-	if (coverage.url === window.location.href) {
-		return false;
-	}
-	if (coverage.url.includes("/@id/@vitest/")) {
-		return false;
-	}
-	if (coverage.url.includes("/@vite/client")) {
-		return false;
-	}
-	return true;
-}
 
 export { mod as default };

package/dist/commands-wCiafWY1.js

@@ -0,0 +1,196 @@
+import { randomUUID } from 'node:crypto';
+import { existsSync } from 'node:fs';
+import { writeFile } from 'node:fs/promises';
+
+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 cwd() {
+  if (typeof process !== "undefined" && typeof process.cwd === "function") {
+    return process.cwd().replace(/\\/g, "/");
+  }
+  return "/";
+}
+const resolve = function(...arguments_) {
+  arguments_ = arguments_.map((argument) => normalizeWindowsPath(argument));
+  let resolvedPath = "";
+  let resolvedAbsolute = false;
+  for (let index = arguments_.length - 1; index >= -1 && !resolvedAbsolute; index--) {
+    const path = index >= 0 ? arguments_[index] : cwd();
+    if (!path || path.length === 0) {
+      continue;
+    }
+    resolvedPath = `${path}/${resolvedPath}`;
+    resolvedAbsolute = isAbsolute(path);
+  }
+  resolvedPath = normalizeString(resolvedPath, !resolvedAbsolute);
+  if (resolvedAbsolute && !isAbsolute(resolvedPath)) {
+    return `/${resolvedPath}`;
+  }
+  return resolvedPath.length > 0 ? resolvedPath : ".";
+};
+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);
+};
+
+const commands = {
+	startV8Coverage,
+	takeV8Coverage
+};
+async function startV8Coverage(context) {
+	const session = await context.__ensureCDPHandler();
+	await session.send("Profiler.enable");
+	await session.send("Profiler.startPreciseCoverage", {
+		callCount: true,
+		detailed: true
+	});
+}
+async function takeV8Coverage(context, pageUrl) {
+	const session = await context.__ensureCDPHandler();
+	const coverage = await session.send("Profiler.takePreciseCoverage");
+	const origin = new URL(pageUrl).origin;
+	const result = [];
+	for (const entry of coverage.result) {
+		if (filterResult(entry.url, origin, pageUrl)) {
+			entry.url = decodeURIComponent(entry.url.replace(origin, ""));
+			result.push(entry);
+		}
+	}
+	const provider = context.project.vitest.coverageProvider;
+	return await writeCoverageFile(provider.coverageFilesDirectory, { result });
+}
+async function writeCoverageFile(coverageFilesDirectory, coverage) {
+	// Write results on file system directly and transfer only the filename over RPC
+	const filename = resolve(coverageFilesDirectory, `coverage-${randomUUID()}.json`);
+	try {
+		await writeFile(filename, JSON.stringify(coverage), "utf-8");
+	} catch (error) {
+		if (!existsSync(coverageFilesDirectory)) {
+			throw new Error(`Something removed the coverage directory "${coverageFilesDirectory}" Vitest created earlier. Make sure you are not running multiple Vitests with the same "coverage.reportsDirectory" at the same time.`, { cause: error });
+		}
+		throw error;
+	}
+	return filename;
+}
+function filterResult(url, origin, pageUrl) {
+	if (!url.startsWith(origin)) {
+		return false;
+	}
+	if (url.includes("/node_modules/")) {
+		return false;
+	}
+	if (url.includes("__vitest_browser__")) {
+		return false;
+	}
+	if (url.includes("__vitest__/assets")) {
+		return false;
+	}
+	if (url === pageUrl) {
+		return false;
+	}
+	if (url.includes("/@id/@vitest/")) {
+		return false;
+	}
+	if (url.includes("/@vite/client")) {
+		return false;
+	}
+	return true;
+}
+
+export { commands as c, normalize as n, writeCoverageFile as w };

package/dist/index.js

@@ -1,3 +1,4 @@
+import assert from 'node:assert';
 import { randomUUID } from 'node:crypto';
 import { existsSync } from 'node:fs';
 import { readdir, readFile, rm } from 'node:fs/promises';
@@ -5,8 +6,8 @@ import inspector from 'node:inspector/promises';
 import { resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { provider } from 'std-env';
+import { n as normalize, w as writeCoverageFile } from './commands-wCiafWY1.js';
 import { l as loadProvider } from './load-provider-CdgAx3rL.js';
-import { n as normalize } from './pathe.M-eThtNZ-BTaAGrLg.js';
 
 let enabled = false;
 const mod = {
@@ -32,7 +33,7 @@ const mod = {
 	},
 	async takeCoverage(options) {
 		if (provider === "stackblitz") {
-			return { result: [] };
+			return;
 		}
 		const session = this.session;
 		if (!session) {
@@ -66,7 +67,9 @@ const mod = {
 				}
 			}
 		}
-		return { result };
+		const coverageFilesDirectory = options?.coverageFilesDirectory;
+		assert(coverageFilesDirectory, "coverageFilesDirectory is required");
+		return await writeCoverageFile(coverageFilesDirectory, { result });
 	},
 	async stopCoverage({ isolate }) {
 		if (isolate === false) {

package/dist/provider.js

@@ -1,6 +1,6 @@
 import { existsSync, promises } from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import { mergeProcessCovs } from '@bcoe/v8-coverage';
+import { mergeScriptCovs } from '@bcoe/v8-coverage';
 import astV8ToIstanbul from 'ast-v8-to-istanbul';
 import libCoverage from 'istanbul-lib-coverage';
 import libReport from 'istanbul-lib-report';
@@ -10,9 +10,11 @@ import { createDebug } from 'obug';
 import { provider } from 'std-env';
 import c from 'tinyrainbow';
 import { BaseCoverageProvider, parseAstAsync } from 'vitest/node';
-import { n as normalize } from './pathe.M-eThtNZ-BTaAGrLg.js';
+import { c as commands, n as normalize } from './commands-wCiafWY1.js';
+import 'node:crypto';
+import 'node:fs/promises';
 
-var version = "5.0.0-beta.5";
+var version = "5.0.0-beta.7";
 
 const FILE_PROTOCOL = "file://";
 const debug = createDebug("vitest:coverage");
@@ -21,6 +23,13 @@ class V8CoverageProvider extends BaseCoverageProvider {
 	version = version;
 	initialize(ctx) {
 		this._initialize(ctx);
+		for (const project of ctx.projects) {
+			if (project.isBrowserEnabled() && project.browser) {
+				for (const [name, command] of Object.entries(commands)) {
+					project.browser.registerCommand(`__vitest_${name}`, command);
+				}
+			}
+		}
 		if (this.options.autoAttachSubprocess) {
 			const isAnyThreadsPools = ctx.projects.some((p) => p.config.pool === "threads" || p.config.pool === "vmThreads");
 			if (isAnyThreadsPools) {
@@ -38,31 +47,28 @@ class V8CoverageProvider extends BaseCoverageProvider {
 	async generateCoverage({ allTestsRun }) {
 		const start = debug.enabled ? performance.now() : 0;
 		const coverageMap = this.createCoverageMap();
-		let merged = { result: [] };
+		const mergedScripts = new Map();
 		const autoAttachSubprocess = this.options.autoAttachSubprocess;
 		await this.readCoverageFiles({
 			onFileRead(coverage) {
-				merged = mergeProcessCovs([merged, coverage]);
-				// mergeProcessCovs sometimes loses autoAttachSubprocess
-				const fromExtendedContext = autoAttachSubprocess ? coverage.result.filter((r) => r.isExtendedContext) : [];
-				// mergeProcessCovs sometimes loses startOffset, e.g. in vue
-				merged.result.forEach((result) => {
-					if (!result.startOffset) {
-						const original = coverage.result.find((r) => r.url === result.url);
-						result.startOffset = original?.startOffset || 0;
-					}
-					if (autoAttachSubprocess && !result.isExtendedContext) {
-						const actual = fromExtendedContext.find((r) => r.url === result.url);
-						result.isExtendedContext = actual?.isExtendedContext;
+				for (const script of coverage.result) {
+					const previous = mergedScripts.get(script.url);
+					const merged = mergeScriptCovs(previous ? [previous, script] : [script]);
+					const startOffset = previous?.startOffset || script.startOffset || 0;
+					const isExtendedContext = previous?.isExtendedContext || script.isExtendedContext;
+					merged.startOffset ||= startOffset;
+					if (autoAttachSubprocess && isExtendedContext) {
+						merged.isExtendedContext = true;
 					}
-				});
+					mergedScripts.set(merged.url, merged);
+				}
 			},
 			onFinished: async (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 converted = await this.convertCoverage(merged, project, environment);
+				const converted = await this.convertCoverage({ result: Array.from(mergedScripts.values()) }, project, environment);
 				coverageMap.merge(converted);
-				merged = { result: [] };
+				mergedScripts.clear();
 			},
 			onDebug: debug
 		});
@@ -208,7 +214,7 @@ class V8CoverageProvider extends BaseCoverageProvider {
 	}
 	async getSources(url, onTransform, functions = [], isExtendedContext = false) {
 		// TODO: need to standardize file urls before this call somehow, this is messy
-		const filepath = url.match(/^file:\/\/\/\w:\//) ? url.slice(8) : removeStartsWith(url, FILE_PROTOCOL);
+		const filepath = /^file:\/\/\/\w:\//.test(url) ? url.slice(8) : removeStartsWith(url, FILE_PROTOCOL);
 		// TODO: do we still need to "catch" here? why would it fail?
 		const transformResult = await onTransform(filepath, isExtendedContext).catch(() => null);
 		const map = transformResult?.map;
@@ -237,12 +243,9 @@ class V8CoverageProvider extends BaseCoverageProvider {
 		};
 	}
 	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 onTransform = async (filepath, isExtendedContext = false) => {
 			const result = await this.transformFile(filepath, project, environment, !isExtendedContext);
-			if (result && environment === "__browser__" && project.browser) {
+			if (result && project.isBrowserEnabled()) {
 				return {
 					...result,
 					code: `${result.code}// <inline-source-map>`
@@ -252,7 +255,7 @@ class V8CoverageProvider extends BaseCoverageProvider {
 		};
 		const scriptCoverages = [];
 		for (const result of coverage.result) {
-			if (environment === "__browser__") {
+			if (environment === "client" && project.isBrowserEnabled()) {
 				if (result.url.startsWith("/@fs")) {
 					result.url = `${FILE_PROTOCOL}${removeStartsWith(result.url, "/@fs")}`;
 				} else if (result.url.startsWith(project.config.root)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-v8",
   "type": "module",
-  "version": "5.0.0-beta.5",
+  "version": "5.0.0-beta.7",
   "description": "V8 coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -41,8 +41,8 @@
     "dist"
   ],
   "peerDependencies": {
-    "@vitest/browser": "5.0.0-beta.5",
-    "vitest": "5.0.0-beta.5"
+    "@vitest/browser": "5.0.0-beta.7",
+    "vitest": "5.0.0-beta.7"
   },
   "peerDependenciesMeta": {
     "@vitest/browser": {
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "@bcoe/v8-coverage": "^1.0.2",
-    "ast-v8-to-istanbul": "^1.0.0",
+    "ast-v8-to-istanbul": "^1.0.5",
     "istanbul-lib-coverage": "^3.2.2",
     "istanbul-lib-report": "^3.0.1",
     "istanbul-reports": "^3.2.0",
@@ -59,16 +59,16 @@
     "obug": "^2.1.1",
     "std-env": "^4.0.0-rc.1",
     "tinyrainbow": "^3.1.0",
-    "@vitest/utils": "5.0.0-beta.5"
+    "@vitest/utils": "5.0.0-beta.7"
   },
   "devDependencies": {
     "@types/istanbul-lib-coverage": "^2.0.6",
     "@types/istanbul-lib-report": "^3.0.3",
     "@types/istanbul-reports": "^3.0.4",
     "pathe": "^2.0.3",
-    "vitest": "5.0.0-beta.5",
-    "@vitest/browser-playwright": "5.0.0-beta.5",
-    "@vitest/browser": "5.0.0-beta.5"
+    "@vitest/browser-playwright": "5.0.0-beta.7",
+    "@vitest/browser": "5.0.0-beta.7",
+    "vitest": "5.0.0-beta.7"
   },
   "scripts": {
     "build": "premove dist && rollup -c",

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

@@ -1,104 +0,0 @@
-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 };