@vitest/coverage-istanbul 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/provider.d.ts

@@ -1,9 +1,11 @@
 import { CoverageProvider, Vitest, AfterSuiteRunMeta, ReportContext, ResolvedCoverageOptions } from 'vitest';
 import { BaseCoverageProvider } from 'vitest/coverage';
-import { CoverageMap } from 'istanbul-lib-coverage';
+import { CoverageMapData } from 'istanbul-lib-coverage';
 import { Instrumenter } from 'istanbul-lib-instrument';
 
 type Options = ResolvedCoverageOptions<'istanbul'>;
+type CoverageByTransformMode = Record<AfterSuiteRunMeta['transformMode'], CoverageMapData[]>;
+type ProjectName = NonNullable<AfterSuiteRunMeta['projectName']> | typeof DEFAULT_PROJECT;
 interface TestExclude {
     new (opts: {
         cwd?: string | string[];
@@ -17,6 +19,7 @@ interface TestExclude {
         glob(cwd: string): Promise<string[]>;
     };
 }
+declare const DEFAULT_PROJECT: unique symbol;
 declare class IstanbulCoverageProvider extends BaseCoverageProvider implements CoverageProvider {
     name: string;
     ctx: Vitest;
@@ -29,17 +32,17 @@ declare class IstanbulCoverageProvider extends BaseCoverageProvider implements C
      * If storing in memory causes issues, we can simply write these into fs in `onAfterSuiteRun`
      * and read them back when merging coverage objects in `onAfterAllFilesRun`.
      */
-    coverages: any[];
+    coverages: Map<ProjectName, CoverageByTransformMode>;
     initialize(ctx: Vitest): void;
     resolveOptions(): Options;
     onFileTransform(sourceCode: string, id: string, pluginCtx: any): {
         code: string;
         map: any;
     } | undefined;
-    onAfterSuiteRun({ coverage }: AfterSuiteRunMeta): void;
+    onAfterSuiteRun({ coverage, transformMode, projectName }: AfterSuiteRunMeta): void;
     clean(clean?: boolean): Promise<void>;
     reportCoverage({ allTestsRun }?: ReportContext): Promise<void>;
-    includeUntestedFiles(coverageMap: CoverageMap): Promise<void>;
+    getCoverageMapForUncoveredFiles(coveredFiles: string[]): Promise<CoverageMapData>;
 }
 
 export { IstanbulCoverageProvider };

package/dist/provider.js

@@ -1,4 +1,4 @@
-import { existsSync, promises } from 'fs';
+import { existsSync, promises } from 'node:fs';
 import { coverageConfigDefaults, defaultExclude, defaultInclude } from 'vitest/config';
 import { BaseCoverageProvider } from 'vitest/coverage';
 import c from 'picocolors';
@@ -104,6 +104,7 @@ const isAbsolute = function(p) {
   return _IS_ABSOLUTE_RE.test(p);
 };
 
+const DEFAULT_PROJECT = Symbol.for("default-project");
 class IstanbulCoverageProvider extends BaseCoverageProvider {
   name = "istanbul";
   ctx;
@@ -116,7 +117,7 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
    * If storing in memory causes issues, we can simply write these into fs in `onAfterSuiteRun`
    * and read them back when merging coverage objects in `onAfterAllFilesRun`.
    */
-  coverages = [];
+  coverages = /* @__PURE__ */ new Map();
   initialize(ctx) {
     const config = ctx.config.coverage;
     this.ctx = ctx;
@@ -165,29 +166,42 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
     const map = this.instrumenter.lastSourceMap();
     return { code, map };
   }
-  onAfterSuiteRun({ coverage }) {
-    this.coverages.push(coverage);
+  /*
+   * Coverage and meta information passed from Vitest runners.
+   * Note that adding new entries here and requiring on those without
+   * backwards compatibility is a breaking change.
+   */
+  onAfterSuiteRun({ coverage, transformMode, projectName }) {
+    if (transformMode !== "web" && transformMode !== "ssr")
+      throw new Error(`Invalid transform mode: ${transformMode}`);
+    let entry = this.coverages.get(projectName || DEFAULT_PROJECT);
+    if (!entry) {
+      entry = { web: [], ssr: [] };
+      this.coverages.set(projectName || DEFAULT_PROJECT, entry);
+    }
+    entry[transformMode].push(coverage);
   }
   async clean(clean = true) {
     if (clean && existsSync(this.options.reportsDirectory))
       await promises.rm(this.options.reportsDirectory, { recursive: true, force: true, maxRetries: 10 });
-    this.coverages = [];
+    this.coverages = /* @__PURE__ */ new Map();
   }
   async reportCoverage({ allTestsRun } = {}) {
-    const mergedCoverage = this.coverages.reduce((coverage, previousCoverageMap) => {
-      const map = libCoverage.createCoverageMap(coverage);
-      map.merge(previousCoverageMap);
-      return map;
-    }, libCoverage.createCoverageMap({}));
-    if (this.options.all && allTestsRun)
-      await this.includeUntestedFiles(mergedCoverage);
-    includeImplicitElseBranches(mergedCoverage);
-    const sourceMapStore = libSourceMaps.createSourceMapStore();
-    const coverageMap = await sourceMapStore.transformCoverage(mergedCoverage);
+    const coverageMaps = await Promise.all(
+      Array.from(this.coverages.values()).map((coverages) => [
+        mergeAndTransformCoverage(coverages.ssr),
+        mergeAndTransformCoverage(coverages.web)
+      ]).flat()
+    );
+    if (this.options.all && allTestsRun) {
+      const coveredFiles = coverageMaps.map((map) => map.files()).flat();
+      const uncoveredCoverage = await this.getCoverageMapForUncoveredFiles(coveredFiles);
+      coverageMaps.push(await mergeAndTransformCoverage([uncoveredCoverage]));
+    }
+    const coverageMap = mergeCoverageMaps(...coverageMaps);
     const context = libReport.createContext({
       dir: this.options.reportsDirectory,
       coverageMap,
-      sourceFinder: sourceMapStore.sourceFinder,
       watermarks: this.options.watermarks
     });
     if (hasTerminalReporter(this.options.reporter))
@@ -225,15 +239,16 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
       });
     }
   }
-  async includeUntestedFiles(coverageMap) {
+  async getCoverageMapForUncoveredFiles(coveredFiles) {
     const includedFiles = await this.testExclude.glob(this.ctx.config.root);
-    const uncoveredFiles = includedFiles.map((file) => resolve(this.ctx.config.root, file)).filter((file) => !coverageMap.data[file]);
+    const uncoveredFiles = includedFiles.map((file) => resolve(this.ctx.config.root, file)).filter((file) => !coveredFiles.includes(file));
     const transformResults = await Promise.all(uncoveredFiles.map(async (filename) => {
       const transformResult = await this.ctx.vitenode.transformRequest(filename);
       return { transformResult, filename };
     }));
+    const coverageMap = libCoverage.createCoverageMap({});
     for (const { transformResult, filename } of transformResults) {
-      const sourceMap = transformResult == null ? void 0 : transformResult.map;
+      const sourceMap = transformResult?.map;
       if (sourceMap) {
         this.instrumenter.instrumentSync(
           transformResult.code,
@@ -245,8 +260,22 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
           coverageMap.addFileCoverage(lastCoverage);
       }
     }
+    return coverageMap.data;
   }
 }
+async function mergeAndTransformCoverage(coverages) {
+  const mergedCoverage = mergeCoverageMaps(...coverages);
+  includeImplicitElseBranches(mergedCoverage);
+  const sourceMapStore = libSourceMaps.createSourceMapStore();
+  return await sourceMapStore.transformCoverage(mergedCoverage);
+}
+function mergeCoverageMaps(...coverageMaps) {
+  return coverageMaps.reduce((coverage, previousCoverageMap) => {
+    const map = libCoverage.createCoverageMap(coverage);
+    map.merge(previousCoverageMap);
+    return map;
+  }, libCoverage.createCoverageMap({}));
+}
 function removeQueryParameters(filename) {
   return filename.split("?")[0];
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-istanbul",
   "type": "module",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "description": "Istanbul coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "vitest": ">=0.32.0 <1"
+    "vitest": "^1.0.0-0"
   },
   "dependencies": {
     "istanbul-lib-coverage": "^3.2.0",
@@ -55,7 +55,7 @@
     "@types/istanbul-lib-source-maps": "^4.0.1",
     "@types/istanbul-reports": "^3.0.1",
     "pathe": "^1.1.1",
-    "vitest": "1.0.0-beta.2"
+    "vitest": "1.0.0-beta.3"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",