@vitest/coverage-istanbul 5.0.3 → 5.0.4

package/dist/{commands-KXFl3PvR.js → commands-DzErh2po.js}

@@ -9,7 +9,39 @@ function normalizeWindowsPath(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, "/");
@@ -115,4 +147,4 @@ async function writeCoverageFile(coverageFilesDirectory, coverage) {
 	return filename;
 }
 
-export { commands as c, writeCoverageFile as w };
+export { commands as c, normalize as n, writeCoverageFile as w };

package/dist/index.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 import { B as BaseCoverageProviderModule } from './base-BO8X8tRz.js';
-import { w as writeCoverageFile } from './commands-KXFl3PvR.js';
+import { w as writeCoverageFile } from './commands-DzErh2po.js';
 import './constants-BCJfMgEg.js';
 import 'node:crypto';
 import 'node:fs';

package/dist/provider.d.ts

@@ -9,8 +9,10 @@ declare class IstanbulCoverageProvider extends BaseCoverageProvider implements C
 	version: string;
 	instrumenter: Instrumenter;
 	private transformedModuleIds;
+	private uncoveredFileCoverages;
 	initialize(ctx: Vitest): void;
 	requiresTransform(id: string): boolean;
+	clean(clean?: boolean): Promise<void>;
 	onFileTransform(sourceCode: string, id: string, pluginCtx: Vite.Rollup.TransformPluginContext): {
 		code: string;
 		map: any;

package/dist/provider.js

@@ -9,12 +9,12 @@ 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 commands, n as normalize } from './commands-DzErh2po.js';
 import { C as COVERAGE_STORE_KEY } from './constants-BCJfMgEg.js';
 import 'node:crypto';
 import 'node:fs/promises';
 
-var version = "5.0.3";
+var version = "5.0.4";
 
 const debug = createDebug("vitest:coverage");
 class IstanbulCoverageProvider extends BaseCoverageProvider {
@@ -22,6 +22,7 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
 	version = version;
 	instrumenter;
 	transformedModuleIds = new Set();
+	uncoveredFileCoverages = new Map();
 	initialize(ctx) {
 		this._initialize(ctx);
 		for (const project of ctx.projects) {
@@ -64,6 +65,10 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
 		}
 		return true;
 	}
+	async clean(clean = true) {
+		await super.clean(clean);
+		this.uncoveredFileCoverages.clear();
+	}
 	onFileTransform(sourceCode, id, pluginCtx) {
 		if (!this.requiresTransform(id)) {
 			return;
@@ -72,7 +77,10 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
 		sourceMap.sources = sourceMap.sources.map(removeQueryParameters);
 		sourceCode = sourceCode.replaceAll("_ts_decorate", "/* istanbul ignore next */_ts_decorate").replaceAll(/(if +\(import\.meta\.vitest\))/g, "/* istanbul ignore next */ $1");
 		const code = this.instrumenter.instrumentSync(sourceCode, id, sourceMap);
-		if (!id.includes("vitest-uncovered-coverage=true")) {
+		const uncoveredKey = getUncoveredKey(id);
+		if (uncoveredKey) {
+			this.uncoveredFileCoverages.set(uncoveredKey, this.instrumenter.lastFileCoverage());
+		} else {
 			const transformMap = new GenMapping(sourceMap);
 			eachMapping(new TraceMap(sourceMap), (mapping) => {
 				addMapping(transformMap, {
@@ -131,6 +139,10 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
 		}
 		coverageMap.filter((filename) => {
 			const exists = existsSync(filename);
+			// files can be instrumented before the changed files are resolved
+			if (this.changedFiles && !this.changedFiles.includes(normalize(filename))) {
+				return false;
+			}
 			if (this.options.excludeAfterRemap) {
 				return exists && this.isIncluded(filename);
 			}
@@ -172,8 +184,6 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
 		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
-		// returns the coverage of the last transformed file
 		for (const [index, filename] of uncoveredFiles.entries()) {
 			let timeout;
 			let start;
@@ -182,10 +192,12 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
 				timeout = setTimeout(() => debug(c.bgRed(`File "${filename}" is taking longer than 3s`)), 3e3);
 				debug("Uncovered file %d/%d", index, uncoveredFiles.length);
 			}
-			// Make sure file is not served from cache so that instrumenter loads up requested file coverage
-			await transform(`${filename}?cache=${cacheKey}&vitest-uncovered-coverage=true`);
-			const lastCoverage = this.instrumenter.lastFileCoverage();
-			coverageMap.addFileCoverage(lastCoverage);
+			// Unique key makes sure file is not served from cache
+			const uncoveredKey = `${cacheKey}-${index}`;
+			await transform(`${filename}?cache=${uncoveredKey}&vitest-uncovered-coverage=true`);
+			const fileCoverage = this.uncoveredFileCoverages.get(uncoveredKey) ?? this.instrumenter.lastFileCoverage();
+			this.uncoveredFileCoverages.delete(uncoveredKey);
+			coverageMap.addFileCoverage(fileCoverage);
 			if (debug.enabled) {
 				clearTimeout(timeout);
 				const diff = performance.now() - start;
@@ -232,5 +244,11 @@ async function transformCoverage(coverageMap) {
 function removeQueryParameters(filename) {
 	return filename.split("?")[0];
 }
+function getUncoveredKey(id) {
+	if (!id.includes("vitest-uncovered-coverage=true")) {
+		return;
+	}
+	return new URLSearchParams(id.split("?")[1]).get("cache") ?? undefined;
+}
 
 export { IstanbulCoverageProvider };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-istanbul",
   "type": "module",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "description": "Istanbul coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -41,22 +41,22 @@
     "dist"
   ],
   "peerDependencies": {
-    "vitest": "5.0.3"
+    "vitest": "5.0.4"
   },
   "dependencies": {
     "@jridgewell/gen-mapping": "^0.3.13",
     "@jridgewell/trace-mapping": "0.3.31",
-    "@vitest/istanbul-lib-coverage": "^1.0.0",
-    "@vitest/istanbul-lib-instrument": "^1.0.0",
-    "@vitest/istanbul-lib-report": "^1.0.0",
-    "@vitest/istanbul-lib-source-maps": "^1.0.0",
-    "magicast": "^0.5.4",
-    "obug": "^2.1.4",
-    "tinyrainbow": "^3.1.1"
+    "@vitest/istanbul-lib-coverage": "^1.0.2",
+    "@vitest/istanbul-lib-instrument": "^1.0.2",
+    "@vitest/istanbul-lib-report": "^1.0.2",
+    "@vitest/istanbul-lib-source-maps": "^1.0.2",
+    "magicast": "^0.5.5",
+    "obug": "^3.0.0",
+    "tinyrainbow": "^3.2.0"
   },
   "devDependencies": {
     "pathe": "^2.0.3",
-    "vitest": "5.0.3"
+    "vitest": "5.0.4"
   },
   "scripts": {
     "build": "premove dist && rollup -c",