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

package/dist/base-BmUGq4Ml.js

@@ -0,0 +1,39 @@
+import { C as COVERAGE_STORE_KEY } from './constants-BCJfMgEg.js';
+
+const BaseCoverageProviderModule = {
+	takeCoverage() {
+		// @ts-expect-error -- untyped global
+		return globalThis[COVERAGE_STORE_KEY];
+	},
+	startCoverage() {
+		// @ts-expect-error -- untyped global
+		const coverageMap = globalThis[COVERAGE_STORE_KEY];
+		// When isolated, there are no previous results
+		if (!coverageMap) {
+			return;
+		}
+		for (const filename in coverageMap) {
+			const branches = coverageMap[filename].b;
+			for (const key in branches) {
+				branches[key] = branches[key].map(() => 0);
+			}
+			for (const metric of ["f", "s"]) {
+				const entry = coverageMap[filename][metric];
+				for (const key in entry) {
+					entry[key] = 0;
+				}
+			}
+		}
+	},
+	async getProvider() {
+		// to not bundle the provider
+		const providerPath = "./provider.js";
+		const { IstanbulCoverageProvider } = await import(
+			/* @vite-ignore */
+			providerPath
+);
+		return new IstanbulCoverageProvider();
+	}
+};
+
+export { BaseCoverageProviderModule as B };

package/dist/browser.d.ts

@@ -0,0 +1,5 @@
+import { CoverageProviderModule } from 'vitest/node';
+
+declare const mod: CoverageProviderModule;
+
+export { mod as default };

package/dist/browser.js

@@ -0,0 +1,23 @@
+import { B as BaseCoverageProviderModule } from './base-BmUGq4Ml.js';
+import './constants-BCJfMgEg.js';
+
+function triggerCommand(command, args = []) {
+	return globalThis.__vitest_browser_runner__?.commands?.triggerCommand?.(command, args);
+}
+const mod = {
+	takeCoverage() {
+		const coverage = BaseCoverageProviderModule.takeCoverage();
+		if (!coverage) {
+			return;
+		}
+		return triggerCommand("__vitest_writeCoverageFile", [coverage]);
+	},
+	startCoverage() {
+		BaseCoverageProviderModule.startCoverage();
+	},
+	getProvider() {
+		return BaseCoverageProviderModule.getProvider();
+	}
+};
+
+export { mod as default };

package/dist/commands-KXFl3PvR.js

@@ -0,0 +1,118 @@
+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 _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
+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 = { writeCoverageFile(context, coverage) {
+	const provider = context.project.vitest.coverageProvider;
+	return writeCoverageFile(provider.coverageFilesDirectory, coverage);
+} };
+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;
+}
+
+export { commands as c, writeCoverageFile as w };

package/dist/index.js

@@ -1,38 +1,26 @@
-import { C as COVERAGE_STORE_KEY } from './constants-BCJfMgEg.js';
+import assert from 'node:assert';
+import { B as BaseCoverageProviderModule } from './base-BmUGq4Ml.js';
+import { w as writeCoverageFile } from './commands-KXFl3PvR.js';
+import './constants-BCJfMgEg.js';
+import 'node:crypto';
+import 'node:fs';
+import 'node:fs/promises';
 
 const mod = {
-	takeCoverage() {
-		// @ts-expect-error -- untyped global
-		return globalThis[COVERAGE_STORE_KEY];
-	},
-	startCoverage() {
-		// @ts-expect-error -- untyped global
-		const coverageMap = globalThis[COVERAGE_STORE_KEY];
-		// When isolated, there are no previous results
-		if (!coverageMap) {
+	takeCoverage(options) {
+		const coverage = BaseCoverageProviderModule.takeCoverage();
+		if (!coverage) {
 			return;
 		}
-		for (const filename in coverageMap) {
-			const branches = coverageMap[filename].b;
-			for (const key in branches) {
-				branches[key] = branches[key].map(() => 0);
-			}
-			for (const metric of ["f", "s"]) {
-				const entry = coverageMap[filename][metric];
-				for (const key in entry) {
-					entry[key] = 0;
-				}
-			}
-		}
+		const coverageFilesDirectory = options?.coverageFilesDirectory;
+		assert(coverageFilesDirectory, "coverageFilesDirectory is required");
+		return writeCoverageFile(coverageFilesDirectory, coverage);
+	},
+	startCoverage() {
+		BaseCoverageProviderModule.startCoverage();
 	},
-	async getProvider() {
-		// to not bundle the provider
-		const providerPath = "./provider.js";
-		const { IstanbulCoverageProvider } = await import(
-			/* @vite-ignore */
-			providerPath
-);
-		return new IstanbulCoverageProvider();
+	getProvider() {
+		return BaseCoverageProviderModule.getProvider();
 	}
 };
 

package/dist/provider.js

@@ -17,7 +17,10 @@ import { parseModule } from 'magicast';
 import { createDebug } from 'obug';
 import c from 'tinyrainbow';
 import { BaseCoverageProvider, isCSSRequest } from 'vitest/node';
+import { c as commands } from './commands-KXFl3PvR.js';
 import { C as COVERAGE_STORE_KEY } from './constants-BCJfMgEg.js';
+import 'node:crypto';
+import 'node:fs/promises';
 
 function getDefaultExportFromCjs(x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
@@ -3543,7 +3546,7 @@ function requireIstanbulLibSourceMaps () {
 var istanbulLibSourceMapsExports = requireIstanbulLibSourceMaps();
 var libSourceMaps = /*@__PURE__*/getDefaultExportFromCjs(istanbulLibSourceMapsExports);
 
-var version = "5.0.0-beta.5";
+var version = "5.0.0-beta.7";
 
 const debug = createDebug("vitest:coverage");
 class IstanbulCoverageProvider extends BaseCoverageProvider {
@@ -3553,6 +3556,13 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
 	transformedModuleIds = new Set();
 	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.instrumenter) {
 			this.instrumenter = this.options.instrumenter({
 				coverageVariable: COVERAGE_STORE_KEY,
@@ -3692,7 +3702,7 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
 	}
 	async getCoverageMapForUncoveredFiles(coveredFiles) {
 		const uncoveredFiles = await this.getUntestedFiles(coveredFiles);
-		const cacheKey = new Date().getTime();
+		const cacheKey = Date.now();
 		const coverageMap = this.createCoverageMap();
 		const transform = this.createUncoveredFileTransformer(this.ctx);
 		// Note that these cannot be run parallel as synchronous instrumenter.lastFileCoverage

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-istanbul",
   "type": "module",
-  "version": "5.0.0-beta.5",
+  "version": "5.0.0-beta.7",
   "description": "Istanbul coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -28,6 +28,10 @@
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
+    "./browser": {
+      "types": "./dist/browser.d.ts",
+      "default": "./dist/browser.js"
+    },
     "./*": "./*"
   },
   "main": "./dist/index.js",
@@ -37,7 +41,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "vitest": "5.0.0-beta.5"
+    "vitest": "5.0.0-beta.7"
   },
   "dependencies": {
     "@babel/core": "^7.29.0",
@@ -60,7 +64,7 @@
     "istanbul-lib-instrument": "^6.0.3",
     "istanbul-lib-source-maps": "^5.0.6",
     "pathe": "^2.0.3",
-    "vitest": "5.0.0-beta.5"
+    "vitest": "5.0.0-beta.7"
   },
   "scripts": {
     "build": "premove dist && rollup -c",