@vitest/coverage-istanbul 2.1.1 → 2.1.2

package/dist/provider.d.ts

@@ -4,9 +4,25 @@ import { CoverageMap } from 'istanbul-lib-coverage';
 import { Instrumenter } from 'istanbul-lib-instrument';
 
 type Options = ResolvedCoverageOptions<'istanbul'>;
-type Filename = string;
-type CoverageFilesByTransformMode = Record<AfterSuiteRunMeta['transformMode'], Filename[]>;
-type ProjectName = NonNullable<AfterSuiteRunMeta['projectName']> | typeof DEFAULT_PROJECT;
+/**
+ * Holds info about raw coverage results that are stored on file system:
+ *
+ * ```json
+ * "project-a": {
+ *   "web": {
+ *     "tests/math.test.ts": "coverage-1.json",
+ *     "tests/utils.test.ts": "coverage-2.json",
+ * //                          ^^^^^^^^^^^^^^^ Raw coverage on file system
+ *   },
+ *   "ssr": { ... },
+ *   "browser": { ... },
+ * },
+ * "project-b": ...
+ * ```
+ */
+type CoverageFiles = Map<NonNullable<AfterSuiteRunMeta['projectName']> | typeof DEFAULT_PROJECT, Record<AfterSuiteRunMeta['transformMode'], {
+    [TestFilenames: string]: string;
+}>>;
 interface TestExclude {
     new (opts: {
         cwd?: string | string[];
@@ -27,7 +43,7 @@ declare class IstanbulCoverageProvider extends BaseCoverageProvider implements C
     options: Options;
     instrumenter: Instrumenter;
     testExclude: InstanceType<TestExclude>;
-    coverageFiles: Map<ProjectName, CoverageFilesByTransformMode>;
+    coverageFiles: CoverageFiles;
     coverageFilesDirectory: string;
     pendingPromises: Promise<void>[];
     initialize(ctx: Vitest): void;
@@ -36,10 +52,12 @@ declare class IstanbulCoverageProvider extends BaseCoverageProvider implements C
         code: string;
         map: any;
     } | undefined;
-    onAfterSuiteRun({ coverage, transformMode, projectName }: AfterSuiteRunMeta): void;
+    onAfterSuiteRun({ coverage, transformMode, projectName, testFiles }: AfterSuiteRunMeta): void;
     clean(clean?: boolean): Promise<void>;
     generateCoverage({ allTestsRun }: ReportContext): Promise<CoverageMap>;
     reportCoverage(coverageMap: unknown, { allTestsRun }: ReportContext): Promise<void>;
+    private cleanAfterRun;
+    onTestFailure(): Promise<void>;
     generateReports(coverageMap: CoverageMap, allTestsRun: boolean | undefined): Promise<void>;
     mergeReports(coverageMaps: unknown[]): Promise<void>;
     private getCoverageMapForUncoveredFiles;

package/dist/provider.js

@@ -108,7 +108,7 @@ const isAbsolute = function(p) {
   return _IS_ABSOLUTE_RE.test(p);
 };
 
-var version = "2.1.1";
+var version = "2.1.2";
 
 const DEFAULT_PROJECT = Symbol.for("default-project");
 const debug = createDebug("vitest:coverage");
@@ -214,7 +214,7 @@ Update your dependencies and make sure the versions match.`
    * Note that adding new entries here and requiring on those without
    * backwards compatibility is a breaking change.
    */
-  onAfterSuiteRun({ coverage, transformMode, projectName }) {
+  onAfterSuiteRun({ coverage, transformMode, projectName, testFiles }) {
     if (!coverage) {
       return;
     }
@@ -223,14 +223,15 @@ Update your dependencies and make sure the versions match.`
     }
     let entry = this.coverageFiles.get(projectName || DEFAULT_PROJECT);
     if (!entry) {
-      entry = { web: [], ssr: [], browser: [] };
+      entry = { web: {}, ssr: {}, browser: {} };
       this.coverageFiles.set(projectName || DEFAULT_PROJECT, entry);
     }
+    const testFilenames = testFiles.join();
     const filename = resolve(
       this.coverageFilesDirectory,
       `coverage-${uniqueId++}.json`
     );
-    entry[transformMode].push(filename);
+    entry[transformMode][testFilenames] = filename;
     const promise = promises.writeFile(filename, JSON.stringify(coverage), "utf-8");
     this.pendingPromises.push(promise);
   }
@@ -260,12 +261,13 @@ Update your dependencies and make sure the versions match.`
     await Promise.all(this.pendingPromises);
     this.pendingPromises = [];
     for (const coveragePerProject of this.coverageFiles.values()) {
-      for (const filenames of [
+      for (const coverageByTestfiles of [
         coveragePerProject.ssr,
         coveragePerProject.web,
         coveragePerProject.browser
       ]) {
         const coverageMapByTransformMode = libCoverage.createCoverageMap({});
+        const filenames = Object.values(coverageByTestfiles);
         for (const chunk of this.toSlices(
           filenames,
           this.options.processingConcurrency
@@ -288,7 +290,7 @@ Update your dependencies and make sure the versions match.`
         coverageMap.merge(transformedCoverage);
       }
     }
-    if (this.options.all && allTestsRun) {
+    if (this.options.all && (allTestsRun || !this.options.cleanOnRerun)) {
       const coveredFiles = coverageMap.files();
       const uncoveredCoverage = await this.getCoverageMapForUncoveredFiles(
         coveredFiles
@@ -307,11 +309,19 @@ Update your dependencies and make sure the versions match.`
     );
     const keepResults = !this.options.cleanOnRerun && this.ctx.config.watch;
     if (!keepResults) {
-      this.coverageFiles = /* @__PURE__ */ new Map();
-      await promises.rm(this.coverageFilesDirectory, { recursive: true });
-      if (readdirSync(this.options.reportsDirectory).length === 0) {
-        await promises.rm(this.options.reportsDirectory, { recursive: true });
-      }
+      await this.cleanAfterRun();
+    }
+  }
+  async cleanAfterRun() {
+    this.coverageFiles = /* @__PURE__ */ new Map();
+    await promises.rm(this.coverageFilesDirectory, { recursive: true });
+    if (readdirSync(this.options.reportsDirectory).length === 0) {
+      await promises.rm(this.options.reportsDirectory, { recursive: true });
+    }
+  }
+  async onTestFailure() {
+    if (!this.options.reportOnFailure) {
+      await this.cleanAfterRun();
     }
   }
   async generateReports(coverageMap, allTestsRun) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-istanbul",
   "type": "module",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Istanbul coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "vitest": "2.1.1"
+    "vitest": "2.1.2"
   },
   "dependencies": {
     "@istanbuljs/schema": "^0.1.3",
@@ -59,7 +59,7 @@
     "@types/istanbul-lib-source-maps": "^4.0.4",
     "@types/istanbul-reports": "^3.0.4",
     "pathe": "^1.1.2",
-    "vitest": "2.1.1"
+    "vitest": "2.1.2"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",