@vitest/coverage-v8 2.0.0-beta.2 → 2.0.0-beta.5

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { V8CoverageProvider } from './provider.js';
+import 'istanbul-lib-coverage';
 import 'vitest/coverage';
 import 'vitest';
 import 'vitest/node';

package/dist/provider.d.ts

@@ -1,3 +1,4 @@
+import { CoverageMap } from 'istanbul-lib-coverage';
 import { BaseCoverageProvider } from 'vitest/coverage';
 import { CoverageProvider, AfterSuiteRunMeta, ReportContext, ResolvedCoverageOptions } from 'vitest';
 import { Vitest } from 'vitest/node';
@@ -32,7 +33,10 @@ declare class V8CoverageProvider extends BaseCoverageProvider implements Coverag
     resolveOptions(): Options;
     clean(clean?: boolean): Promise<void>;
     onAfterSuiteRun({ coverage, transformMode, projectName }: AfterSuiteRunMeta): void;
-    reportCoverage({ allTestsRun }?: ReportContext): Promise<void>;
+    generateCoverage({ allTestsRun }: ReportContext): Promise<CoverageMap>;
+    reportCoverage(coverageMap: unknown, { allTestsRun }: ReportContext): Promise<void>;
+    generateReports(coverageMap: CoverageMap, allTestsRun?: boolean): Promise<void>;
+    mergeReports(coverageMaps: unknown[]): Promise<void>;
     private getUntestedFiles;
     private getSources;
     private convertCoverage;

package/dist/provider.js

@@ -1,4 +1,4 @@
-import { existsSync, promises as promises$1, writeFileSync } from 'node:fs';
+import { existsSync, promises as promises$1, readdirSync, writeFileSync } from 'node:fs';
 import { pathToFileURL, fileURLToPath as fileURLToPath$1 } from 'node:url';
 import require$$0 from 'assert';
 import require$$2 from 'util';
@@ -2186,10 +2186,9 @@ const isAbsolute = function(p) {
 const isWindows = process.platform === "win32";
 const drive = isWindows ? process.cwd()[0] : null;
 drive ? drive === drive.toUpperCase() ? drive.toLowerCase() : drive.toUpperCase() : null;
-const queryRE = /\?.*$/s;
-const hashRE = /#.*$/s;
+const postfixRE = /[?#].*$/;
 function cleanUrl(url) {
-  return url.replace(hashRE, "").replace(queryRE, "");
+  return url.replace(postfixRE, "");
 }
 /* @__PURE__ */ new Set([
   ...builtinModules,
@@ -2210,7 +2209,7 @@ function cleanUrl(url) {
 
 const WRAPPER_LENGTH = 185;
 const VITE_EXPORTS_LINE_PATTERN = /Object\.defineProperty\(__vite_ssr_exports__.*\n/g;
-const DECORATOR_METADATA_PATTERN = /_ts_metadata\("design:paramtypes", \[[^\]]*?\]\),*/g;
+const DECORATOR_METADATA_PATTERN = /_ts_metadata\("design:paramtypes", \[[^\]]*\]\),*/g;
 const DEFAULT_PROJECT = Symbol.for("default-project");
 const debug = createDebug("vitest:coverage");
 let uniqueId = 0;
@@ -2283,9 +2282,7 @@ class V8CoverageProvider extends BaseCoverageProvider {
     const promise = promises$1.writeFile(filename, JSON.stringify(coverage), "utf-8");
     this.pendingPromises.push(promise);
   }
-  async reportCoverage({ allTestsRun } = {}) {
-    if (provider === "stackblitz")
-      this.ctx.logger.log(c.blue(" % ") + c.yellow("@vitest/coverage-v8 does not work on Stackblitz. Report will be empty."));
+  async generateCoverage({ allTestsRun }) {
     const coverageMap = libCoverage.createCoverageMap({});
     let index = 0;
     const total = this.pendingPromises.length;
@@ -2316,6 +2313,24 @@ class V8CoverageProvider extends BaseCoverageProvider {
       const converted = await this.convertCoverage(untestedCoverage);
       coverageMap.merge(await transformCoverage(converted));
     }
+    return coverageMap;
+  }
+  async reportCoverage(coverageMap, { allTestsRun }) {
+    if (provider === "stackblitz")
+      this.ctx.logger.log(c.blue(" % ") + c.yellow("@vitest/coverage-v8 does not work on Stackblitz. Report will be empty."));
+    await this.generateReports(
+      coverageMap || libCoverage.createCoverageMap({}),
+      allTestsRun
+    );
+    const keepResults = !this.options.cleanOnRerun && this.ctx.config.watch;
+    if (!keepResults) {
+      this.coverageFiles = /* @__PURE__ */ new Map();
+      await promises$1.rm(this.coverageFilesDirectory, { recursive: true });
+      if (readdirSync(this.options.reportsDirectory).length === 0)
+        await promises$1.rm(this.options.reportsDirectory, { recursive: true });
+    }
+  }
+  async generateReports(coverageMap, allTestsRun) {
     const context = libReport.createContext({
       dir: this.options.reportsDirectory,
       coverageMap,
@@ -2354,11 +2369,12 @@ class V8CoverageProvider extends BaseCoverageProvider {
         });
       }
     }
-    const keepResults = !this.options.cleanOnRerun && this.ctx.config.watch;
-    if (!keepResults) {
-      this.coverageFiles = /* @__PURE__ */ new Map();
-      await promises$1.rm(this.coverageFilesDirectory, { recursive: true });
-    }
+  }
+  async mergeReports(coverageMaps) {
+    const coverageMap = libCoverage.createCoverageMap({});
+    for (const coverage of coverageMaps)
+      coverageMap.merge(coverage);
+    await this.generateReports(coverageMap, true);
   }
   async getUntestedFiles(testedFiles) {
     const transformResults = normalizeTransformResults(this.ctx.vitenode.fetchCache);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-v8",
   "type": "module",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.5",
   "description": "V8 coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "vitest": "2.0.0-beta.2"
+    "vitest": "2.0.0-beta.5"
   },
   "dependencies": {
     "@ampproject/remapping": "^2.3.0",
@@ -62,8 +62,8 @@
     "@types/istanbul-reports": "^3.0.4",
     "pathe": "^1.1.2",
     "v8-to-istanbul": "^9.2.0",
-    "vite-node": "2.0.0-beta.2",
-    "vitest": "2.0.0-beta.2"
+    "vitest": "2.0.0-beta.5",
+    "vite-node": "2.0.0-beta.5"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",