@vitest/coverage-istanbul 2.0.0-beta.11 → 2.0.0-beta.13

package/dist/index.js

@@ -2,7 +2,10 @@ import { C as COVERAGE_STORE_KEY } from './constants-BCJfMgEg.js';
 
 async function getProvider() {
   const providerPath = "./provider.js";
-  const { IstanbulCoverageProvider } = await import(providerPath);
+  const { IstanbulCoverageProvider } = await import(
+    /* @vite-ignore */
+    providerPath
+  );
   return new IstanbulCoverageProvider();
 }
 function takeCoverage() {

package/dist/provider.js

@@ -1,5 +1,5 @@
 import { promises, existsSync, readdirSync, writeFileSync } from 'node:fs';
-import { coverageConfigDefaults, defaultExclude, defaultInclude } from 'vitest/config';
+import { coverageConfigDefaults } from 'vitest/config';
 import { BaseCoverageProvider } from 'vitest/coverage';
 import c from 'picocolors';
 import { parseModule } from 'magicast';
@@ -9,6 +9,7 @@ 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 { defaults } from '@istanbuljs/schema';
 import _TestExclude from 'test-exclude';
 import { C as COVERAGE_STORE_KEY } from './constants-BCJfMgEg.js';
 
@@ -152,12 +153,19 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
       // @ts-expect-error missing type
       coverageGlobalScope: "globalThis",
       coverageGlobalScopeFunc: false,
-      ignoreClassMethods: this.options.ignoreClassMethods
+      ignoreClassMethods: this.options.ignoreClassMethods,
+      parserPlugins: [
+        ...defaults.instrumenter.parserPlugins,
+        ["importAttributes", { deprecatedAssertSyntax: true }]
+      ],
+      generatorOpts: {
+        importAttributesKeyword: "with"
+      }
     });
     this.testExclude = new _TestExclude({
       cwd: ctx.config.root,
-      include: typeof this.options.include === "undefined" ? void 0 : [...this.options.include],
-      exclude: [...defaultExclude, ...defaultInclude, ...this.options.exclude],
+      include: this.options.include,
+      exclude: this.options.exclude,
       excludeNodeModules: true,
       extension: this.options.extension,
       relativePath: !this.options.allowExternal
@@ -318,7 +326,8 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
       });
       this.checkThresholds({
         thresholds: resolvedThresholds,
-        perFile: this.options.thresholds.perFile
+        perFile: this.options.thresholds.perFile,
+        onError: (error) => this.ctx.logger.error(error)
       });
       if (this.options.thresholds.autoUpdate && allTestsRun) {
         if (!this.ctx.server.config.configFile) {
@@ -373,33 +382,11 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
   }
 }
 async function transformCoverage(coverageMap) {
-  includeImplicitElseBranches(coverageMap);
   const sourceMapStore = libSourceMaps.createSourceMapStore();
   return await sourceMapStore.transformCoverage(coverageMap);
 }
 function removeQueryParameters(filename) {
   return filename.split("?")[0];
 }
-function includeImplicitElseBranches(coverageMap) {
-  for (const file of coverageMap.files()) {
-    const fileCoverage = coverageMap.fileCoverageFor(file);
-    for (const branchMap of Object.values(fileCoverage.branchMap)) {
-      if (branchMap.type === "if") {
-        const lastIndex = branchMap.locations.length - 1;
-        if (lastIndex > 0) {
-          const elseLocation = branchMap.locations[lastIndex];
-          if (elseLocation && isEmptyCoverageRange(elseLocation)) {
-            const ifLocation = branchMap.locations[0];
-            elseLocation.start = { ...ifLocation.start };
-            elseLocation.end = { ...ifLocation.end };
-          }
-        }
-      }
-    }
-  }
-}
-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;
-}
 
 export { IstanbulCoverageProvider };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-istanbul",
   "type": "module",
-  "version": "2.0.0-beta.11",
+  "version": "2.0.0-beta.13",
   "description": "Istanbul coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,14 +37,15 @@
     "dist"
   ],
   "peerDependencies": {
-    "vitest": "2.0.0-beta.11"
+    "vitest": "2.0.0-beta.13"
   },
   "dependencies": {
+    "@istanbuljs/schema": "^0.1.3",
     "debug": "^4.3.5",
     "istanbul-lib-coverage": "^3.2.2",
-    "istanbul-lib-instrument": "^6.0.2",
+    "istanbul-lib-instrument": "^6.0.3",
     "istanbul-lib-report": "^3.0.1",
-    "istanbul-lib-source-maps": "^5.0.4",
+    "istanbul-lib-source-maps": "^5.0.6",
     "istanbul-reports": "^3.1.7",
     "magicast": "^0.3.4",
     "picocolors": "^1.0.1",
@@ -58,7 +59,7 @@
     "@types/istanbul-lib-source-maps": "^4.0.4",
     "@types/istanbul-reports": "^3.0.4",
     "pathe": "^1.1.2",
-    "vitest": "2.0.0-beta.11"
+    "vitest": "2.0.0-beta.13"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",