@vitest/coverage-istanbul 1.0.0-beta.4 → 1.0.0-beta.6

package/dist/index.js

@@ -1,4 +1,4 @@
-import { C as COVERAGE_STORE_KEY } from './constants-758a8358.js';
+import { C as COVERAGE_STORE_KEY } from './constants-DBqnqzn-.js';
 
 async function getProvider() {
   const providerPath = "./provider.js";

package/dist/provider.js

@@ -1,14 +1,15 @@
-import { existsSync, promises } from 'node:fs';
+import { existsSync, promises, writeFileSync } from 'node:fs';
 import { coverageConfigDefaults, defaultExclude, defaultInclude } from 'vitest/config';
 import { BaseCoverageProvider } from 'vitest/coverage';
 import c from 'picocolors';
+import { parseModule } from 'magicast';
 import libReport from 'istanbul-lib-report';
 import reports from 'istanbul-reports';
 import libCoverage from 'istanbul-lib-coverage';
 import libSourceMaps from 'istanbul-lib-source-maps';
 import { createInstrumenter } from 'istanbul-lib-instrument';
 import _TestExclude from 'test-exclude';
-import { C as COVERAGE_STORE_KEY } from './constants-758a8358.js';
+import { C as COVERAGE_STORE_KEY } from './constants-DBqnqzn-.js';
 
 function normalizeWindowsPath(input = "") {
   if (!input || !input.includes("\\")) {
@@ -129,10 +130,13 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
       provider: "istanbul",
       reportsDirectory: resolve(ctx.config.root, config.reportsDirectory || coverageConfigDefaults.reportsDirectory),
       reporter: this.resolveReporters(config.reporter || coverageConfigDefaults.reporter),
-      lines: config["100"] ? 100 : config.lines,
-      functions: config["100"] ? 100 : config.functions,
-      branches: config["100"] ? 100 : config.branches,
-      statements: config["100"] ? 100 : config.statements
+      thresholds: config.thresholds && {
+        ...config.thresholds,
+        lines: config.thresholds["100"] ? 100 : config.thresholds.lines,
+        branches: config.thresholds["100"] ? 100 : config.thresholds.branches,
+        functions: config.thresholds["100"] ? 100 : config.thresholds.functions,
+        statements: config.thresholds["100"] ? 100 : config.thresholds.statements
+      }
     };
     this.instrumenter = createInstrumenter({
       produceSourceMap: true,
@@ -213,52 +217,40 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
         ...reporter[1]
       }).execute(context);
     }
-    if (this.options.branches || this.options.functions || this.options.lines || this.options.statements) {
-      this.checkThresholds({
+    if (this.options.thresholds) {
+      const resolvedThresholds = this.resolveThresholds({
         coverageMap,
-        thresholds: {
-          branches: this.options.branches,
-          functions: this.options.functions,
-          lines: this.options.lines,
-          statements: this.options.statements
-        },
-        perFile: this.options.perFile
+        thresholds: this.options.thresholds,
+        createCoverageMap: () => libCoverage.createCoverageMap({})
       });
-    }
-    if (this.options.thresholdAutoUpdate && allTestsRun) {
-      this.updateThresholds({
-        coverageMap,
-        thresholds: {
-          branches: this.options.branches,
-          functions: this.options.functions,
-          lines: this.options.lines,
-          statements: this.options.statements
-        },
-        perFile: this.options.perFile,
-        configurationFile: this.ctx.server.config.configFile
+      this.checkThresholds({
+        thresholds: resolvedThresholds,
+        perFile: this.options.thresholds.perFile
       });
+      if (this.options.thresholds.autoUpdate && allTestsRun) {
+        if (!this.ctx.server.config.configFile)
+          throw new Error('Missing configurationFile. The "coverage.thresholds.autoUpdate" can only be enabled when configuration file is used.');
+        const configFilePath = this.ctx.server.config.configFile;
+        const configModule = parseModule(await promises.readFile(configFilePath, "utf8"));
+        this.updateThresholds({
+          thresholds: resolvedThresholds,
+          perFile: this.options.thresholds.perFile,
+          configurationFile: {
+            write: () => writeFileSync(configFilePath, configModule.generate().code, "utf-8"),
+            read: () => configModule.exports.default.$type === "function-call" ? configModule.exports.default.$args[0] : configModule.exports.default
+          }
+        });
+      }
     }
   }
   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) => !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?.map;
-      if (sourceMap) {
-        this.instrumenter.instrumentSync(
-          transformResult.code,
-          filename,
-          sourceMap
-        );
-        const lastCoverage = this.instrumenter.lastFileCoverage();
-        if (lastCoverage)
-          coverageMap.addFileCoverage(lastCoverage);
-      }
+    for (const filename of uncoveredFiles) {
+      await this.ctx.vitenode.transformRequest(filename);
+      const lastCoverage = this.instrumenter.lastFileCoverage();
+      coverageMap.addFileCoverage(lastCoverage);
     }
     return coverageMap.data;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-istanbul",
   "type": "module",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.6",
   "description": "Istanbul coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -26,7 +26,7 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
+      "default": "./dist/index.js"
     },
     "./*": "./*"
   },
@@ -40,22 +40,23 @@
     "vitest": "^1.0.0-0"
   },
   "dependencies": {
-    "istanbul-lib-coverage": "^3.2.0",
-    "istanbul-lib-instrument": "^6.0.0",
+    "istanbul-lib-coverage": "^3.2.2",
+    "istanbul-lib-instrument": "^6.0.1",
     "istanbul-lib-report": "^3.0.1",
     "istanbul-lib-source-maps": "^4.0.1",
-    "istanbul-reports": "^3.1.5",
+    "istanbul-reports": "^3.1.6",
+    "magicast": "^0.3.2",
     "picocolors": "^1.0.0",
     "test-exclude": "^6.0.0"
   },
   "devDependencies": {
-    "@types/istanbul-lib-coverage": "^2.0.4",
-    "@types/istanbul-lib-instrument": "^1.7.4",
-    "@types/istanbul-lib-report": "^3.0.0",
-    "@types/istanbul-lib-source-maps": "^4.0.1",
-    "@types/istanbul-reports": "^3.0.1",
+    "@types/istanbul-lib-coverage": "^2.0.6",
+    "@types/istanbul-lib-instrument": "^1.7.7",
+    "@types/istanbul-lib-report": "^3.0.3",
+    "@types/istanbul-lib-source-maps": "^4.0.4",
+    "@types/istanbul-reports": "^3.0.4",
     "pathe": "^1.1.1",
-    "vitest": "1.0.0-beta.4"
+    "vitest": "1.0.0-beta.6"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",