@vitest/coverage-istanbul 1.3.0 → 1.4.0

package/LICENSE

@@ -1,7 +1,6 @@
 MIT License
 
-Copyright (c) 2021-Present Anthony Fu <https://github.com/antfu>
-Copyright (c) 2021-Present Matias Capeletto <https://github.com/patak-dev>
+Copyright (c) 2021-Present Vitest Team
 
 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.js

@@ -168,6 +168,7 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
       return;
     const sourceMap = pluginCtx.getCombinedSourcemap();
     sourceMap.sources = sourceMap.sources.map(removeQueryParameters);
+    sourceCode = sourceCode.replaceAll("_ts_decorate", "/* istanbul ignore next */_ts_decorate");
     const code = this.instrumenter.instrumentSync(sourceCode, id, sourceMap);
     const map = this.instrumenter.lastSourceMap();
     return { code, map };
@@ -210,7 +211,7 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
     for (const coveragePerProject of this.coverageFiles.values()) {
       for (const filenames of [coveragePerProject.ssr, coveragePerProject.web]) {
         const coverageMapByTransformMode = libCoverage.createCoverageMap({});
-        for (const chunk of toSlices(filenames, this.options.processingConcurrency)) {
+        for (const chunk of this.toSlices(filenames, this.options.processingConcurrency)) {
           if (debug.enabled) {
             index += chunk.length;
             debug("Covered files %d/%d", index, total);
@@ -235,7 +236,7 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
       coverageMap,
       watermarks: this.options.watermarks
     });
-    if (hasTerminalReporter(this.options.reporter))
+    if (this.hasTerminalReporter(this.options.reporter))
       this.ctx.logger.log(c.blue(" % ") + c.dim("Coverage report from ") + c.yellow(this.name));
     for (const reporter of this.options.reporter) {
       reports.create(reporter[0], {
@@ -262,10 +263,8 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
         this.updateThresholds({
           thresholds: resolvedThresholds,
           perFile: this.options.thresholds.perFile,
-          configurationFile: {
-            write: () => writeFileSync(configFilePath, configModule.generate().code, "utf-8"),
-            read: () => resolveConfig(configModule)
-          }
+          configurationFile: configModule,
+          onUpdate: () => writeFileSync(configFilePath, configModule.generate().code, "utf-8")
         });
       }
     }
@@ -273,14 +272,16 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
     this.coverageFiles = /* @__PURE__ */ new Map();
   }
   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 allFiles = await this.testExclude.glob(this.ctx.config.root);
+    let includedFiles = allFiles.map((file) => resolve(this.ctx.config.root, file));
+    if (this.ctx.config.changed)
+      includedFiles = (this.ctx.config.related || []).filter((file) => includedFiles.includes(file));
+    const uncoveredFiles = includedFiles.filter((file) => !coveredFiles.includes(file));
+    const cacheKey = (/* @__PURE__ */ new Date()).getTime();
     const coverageMap = libCoverage.createCoverageMap({});
     for (const [index, filename] of uncoveredFiles.entries()) {
       debug("Uncovered file %s %d/%d", filename, index, uncoveredFiles.length);
-      if (this.ctx.vitenode.fetchCache.has(filename))
-        this.ctx.vitenode.fetchCache.delete(filename);
-      await this.ctx.vitenode.transformRequest(filename);
+      await this.ctx.vitenode.transformRequest(`${filename}?v=${cacheKey}`);
       const lastCoverage = this.instrumenter.lastFileCoverage();
       coverageMap.addFileCoverage(lastCoverage);
     }
@@ -316,36 +317,5 @@ function includeImplicitElseBranches(coverageMap) {
 function isEmptyCoverageRange(range) {
   return range.start === void 0 || range.start.line === void 0 || range.start.column === void 0 || range.end === void 0 || range.end.line === void 0 || range.end.column === void 0;
 }
-function hasTerminalReporter(reporters) {
-  return reporters.some(([reporter]) => reporter === "text" || reporter === "text-summary" || reporter === "text-lcov" || reporter === "teamcity");
-}
-function toSlices(array, size) {
-  return array.reduce((chunks, item) => {
-    const index = Math.max(0, chunks.length - 1);
-    const lastChunk = chunks[index] || [];
-    chunks[index] = lastChunk;
-    if (lastChunk.length >= size)
-      chunks.push([item]);
-    else
-      lastChunk.push(item);
-    return chunks;
-  }, []);
-}
-function resolveConfig(configModule) {
-  const mod = configModule.exports.default;
-  try {
-    if (mod.$type === "object")
-      return mod;
-    if (mod.$type === "function-call") {
-      if (mod.$args[0].$type === "object")
-        return mod.$args[0];
-      if (mod.$args[0].$type === "arrow-function-expression" && mod.$args[0].$body.$type === "object")
-        return mod.$args[0].$body;
-    }
-  } catch (error) {
-    throw new Error(error instanceof Error ? error.message : String(error));
-  }
-  throw new Error("Failed to update coverage thresholds. Configuration file is too complex.");
-}
 
 export { IstanbulCoverageProvider };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-istanbul",
   "type": "module",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Istanbul coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,14 +37,14 @@
     "dist"
   ],
   "peerDependencies": {
-    "vitest": "1.3.0"
+    "vitest": "1.4.0"
   },
   "dependencies": {
     "debug": "^4.3.4",
     "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-lib-source-maps": "^5.0.4",
     "istanbul-reports": "^3.1.6",
     "magicast": "^0.3.3",
     "picocolors": "^1.0.0",
@@ -58,7 +58,7 @@
     "@types/istanbul-lib-source-maps": "^4.0.4",
     "@types/istanbul-reports": "^3.0.4",
     "pathe": "^1.1.1",
-    "vitest": "1.3.0"
+    "vitest": "1.4.0"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",