@vitest/coverage-istanbul 4.0.0-beta.1 → 4.0.0-beta.11

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-Present Vitest Team
+Copyright (c) 2021-Present VoidZero Inc. and Vitest contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/provider.d.ts

@@ -8,16 +8,19 @@ declare class IstanbulCoverageProvider extends BaseCoverageProvider<ResolvedCove
 	name: "istanbul";
 	version: string;
 	instrumenter: Instrumenter;
+	private transformedModuleIds;
 	initialize(ctx: Vitest): void;
 	onFileTransform(sourceCode: string, id: string, pluginCtx: any): {
-		code: string
-		map: any
+		code: string;
+		map: any;
 	} | undefined;
 	createCoverageMap(): libCoverage.CoverageMap;
 	generateCoverage({ allTestsRun }: ReportContext): Promise<CoverageMap>;
 	generateReports(coverageMap: CoverageMap, allTestsRun: boolean | undefined): Promise<void>;
 	parseConfigModule(configFilePath: string): Promise<ProxifiedModule<any>>;
 	private getCoverageMapForUncoveredFiles;
+	onEnabled(): void;
+	private invalidateTree;
 }
 
 export { IstanbulCoverageProvider };

package/dist/provider.js

@@ -12,13 +12,14 @@ import { BaseCoverageProvider } from 'vitest/coverage';
 import { isCSSRequest } from 'vitest/node';
 import { C as COVERAGE_STORE_KEY } from './constants-BCJfMgEg.js';
 
-var version = "4.0.0-beta.1";
+var version = "4.0.0-beta.11";
 
 const debug = createDebug("vitest:coverage");
 class IstanbulCoverageProvider extends BaseCoverageProvider {
 	name = "istanbul";
 	version = version;
 	instrumenter;
+	transformedModuleIds = new Set();
 	initialize(ctx) {
 		this._initialize(ctx);
 		this.instrumenter = createInstrumenter({
@@ -49,6 +50,7 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
 		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);
 		const map = this.instrumenter.lastSourceMap();
+		this.transformedModuleIds.add(id);
 		return {
 			code,
 			map
@@ -60,17 +62,17 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
 	async generateCoverage({ allTestsRun }) {
 		const start = debug.enabled ? performance.now() : 0;
 		const coverageMap = this.createCoverageMap();
-		let coverageMapByTransformMode = this.createCoverageMap();
+		let coverageMapByEnvironment = this.createCoverageMap();
 		await this.readCoverageFiles({
 			onFileRead(coverage) {
-				coverageMapByTransformMode.merge(coverage);
+				coverageMapByEnvironment.merge(coverage);
 			},
 			onFinished: async () => {
 				// 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(coverageMapByTransformMode);
+				const transformedCoverage = await transformCoverage(coverageMapByEnvironment);
 				coverageMap.merge(transformedCoverage);
-				coverageMapByTransformMode = this.createCoverageMap();
+				coverageMapByEnvironment = this.createCoverageMap();
 			},
 			onDebug: debug
 		});
@@ -141,6 +143,29 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
 		}
 		return coverageMap;
 	}
+	// the coverage can be enabled after the tests are run
+	// this means the coverage will not be injected because the modules are cached,
+	// so we are invalidating all modules that don't have the istanbul coverage injected
+	onEnabled() {
+		const environments = this.ctx.projects.flatMap((project) => [...Object.values(project.vite.environments), ...Object.values(project.browser?.vite.environments || {})]);
+		const seen = new Set();
+		environments.forEach((environment) => {
+			environment.moduleGraph.idToModuleMap.forEach((node) => {
+				this.invalidateTree(node, environment.moduleGraph, seen);
+			});
+		});
+	}
+	invalidateTree(node, moduleGraph, seen) {
+		if (seen.has(node)) {
+			return;
+		}
+		if (node.id && !this.transformedModuleIds.has(node.id)) {
+			moduleGraph.invalidateModule(node, seen);
+		}
+		node.importedModules.forEach((mod) => {
+			this.invalidateTree(mod, moduleGraph, seen);
+		});
+	}
 }
 async function transformCoverage(coverageMap) {
 	const sourceMapStore = libSourceMaps.createSourceMapStore();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-istanbul",
   "type": "module",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.11",
   "description": "Istanbul coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "vitest": "4.0.0-beta.1"
+    "vitest": "4.0.0-beta.11"
   },
   "dependencies": {
     "@istanbuljs/schema": "^0.1.3",
@@ -46,19 +46,19 @@
     "istanbul-lib-instrument": "^6.0.3",
     "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",
-    "tinyrainbow": "^2.0.0"
+    "tinyrainbow": "^3.0.3"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
     "@types/istanbul-lib-coverage": "^2.0.6",
-    "@types/istanbul-lib-instrument": "^1.7.7",
+    "@types/istanbul-lib-instrument": "^1.7.8",
     "@types/istanbul-lib-report": "^3.0.3",
     "@types/istanbul-lib-source-maps": "^4.0.4",
     "@types/istanbul-reports": "^3.0.4",
     "pathe": "^2.0.3",
-    "vitest": "4.0.0-beta.1"
+    "vitest": "4.0.0-beta.11"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",