@vitest/coverage-istanbul 3.2.3 → 4.0.0-beta.1

package/dist/provider.d.ts

@@ -2,14 +2,12 @@ import libCoverage, { CoverageMap } from 'istanbul-lib-coverage';
 import { Instrumenter } from 'istanbul-lib-instrument';
 import { ProxifiedModule } from 'magicast';
 import { ResolvedCoverageOptions, CoverageProvider, Vitest, ReportContext } from 'vitest/node';
-import TestExclude from 'test-exclude';
 import { BaseCoverageProvider } from 'vitest/coverage';
 
 declare class IstanbulCoverageProvider extends BaseCoverageProvider<ResolvedCoverageOptions<"istanbul">> implements CoverageProvider {
 	name: "istanbul";
 	version: string;
 	instrumenter: Instrumenter;
-	testExclude: InstanceType<typeof TestExclude>;
 	initialize(ctx: Vitest): void;
 	onFileTransform(sourceCode: string, id: string, pluginCtx: any): {
 		code: string

package/dist/provider.js

@@ -7,124 +7,20 @@ import libReport from 'istanbul-lib-report';
 import libSourceMaps from 'istanbul-lib-source-maps';
 import reports from 'istanbul-reports';
 import { parseModule } from 'magicast';
-import TestExclude from 'test-exclude';
 import c from 'tinyrainbow';
 import { BaseCoverageProvider } from 'vitest/coverage';
+import { isCSSRequest } from 'vitest/node';
 import { C as COVERAGE_STORE_KEY } from './constants-BCJfMgEg.js';
 
-const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
-function normalizeWindowsPath(input = "") {
-  if (!input) {
-    return input;
-  }
-  return input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
-}
-const _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
-function cwd() {
-  if (typeof process !== "undefined" && typeof process.cwd === "function") {
-    return process.cwd().replace(/\\/g, "/");
-  }
-  return "/";
-}
-const resolve = function(...arguments_) {
-  arguments_ = arguments_.map((argument) => normalizeWindowsPath(argument));
-  let resolvedPath = "";
-  let resolvedAbsolute = false;
-  for (let index = arguments_.length - 1; index >= -1 && !resolvedAbsolute; index--) {
-    const path = index >= 0 ? arguments_[index] : cwd();
-    if (!path || path.length === 0) {
-      continue;
-    }
-    resolvedPath = `${path}/${resolvedPath}`;
-    resolvedAbsolute = isAbsolute(path);
-  }
-  resolvedPath = normalizeString(resolvedPath, !resolvedAbsolute);
-  if (resolvedAbsolute && !isAbsolute(resolvedPath)) {
-    return `/${resolvedPath}`;
-  }
-  return resolvedPath.length > 0 ? resolvedPath : ".";
-};
-function normalizeString(path, allowAboveRoot) {
-  let res = "";
-  let lastSegmentLength = 0;
-  let lastSlash = -1;
-  let dots = 0;
-  let char = null;
-  for (let index = 0; index <= path.length; ++index) {
-    if (index < path.length) {
-      char = path[index];
-    } else if (char === "/") {
-      break;
-    } else {
-      char = "/";
-    }
-    if (char === "/") {
-      if (lastSlash === index - 1 || dots === 1) ; else if (dots === 2) {
-        if (res.length < 2 || lastSegmentLength !== 2 || res[res.length - 1] !== "." || res[res.length - 2] !== ".") {
-          if (res.length > 2) {
-            const lastSlashIndex = res.lastIndexOf("/");
-            if (lastSlashIndex === -1) {
-              res = "";
-              lastSegmentLength = 0;
-            } else {
-              res = res.slice(0, lastSlashIndex);
-              lastSegmentLength = res.length - 1 - res.lastIndexOf("/");
-            }
-            lastSlash = index;
-            dots = 0;
-            continue;
-          } else if (res.length > 0) {
-            res = "";
-            lastSegmentLength = 0;
-            lastSlash = index;
-            dots = 0;
-            continue;
-          }
-        }
-        if (allowAboveRoot) {
-          res += res.length > 0 ? "/.." : "..";
-          lastSegmentLength = 2;
-        }
-      } else {
-        if (res.length > 0) {
-          res += `/${path.slice(lastSlash + 1, index)}`;
-        } else {
-          res = path.slice(lastSlash + 1, index);
-        }
-        lastSegmentLength = index - lastSlash - 1;
-      }
-      lastSlash = index;
-      dots = 0;
-    } else if (char === "." && dots !== -1) {
-      ++dots;
-    } else {
-      dots = -1;
-    }
-  }
-  return res;
-}
-const isAbsolute = function(p) {
-  return _IS_ABSOLUTE_RE.test(p);
-};
-
-var version = "3.2.3";
+var version = "4.0.0-beta.1";
 
 const debug = createDebug("vitest:coverage");
 class IstanbulCoverageProvider extends BaseCoverageProvider {
 	name = "istanbul";
 	version = version;
 	instrumenter;
-	testExclude;
 	initialize(ctx) {
 		this._initialize(ctx);
-		this.testExclude = new TestExclude({
-			cwd: ctx.config.root,
-			include: this.options.include,
-			exclude: this.options.exclude,
-			excludeNodeModules: true,
-			extension: this.options.extension,
-			relativePath: !this.options.allowExternal
-		});
 		this.instrumenter = createInstrumenter({
 			produceSourceMap: true,
 			autoWrap: false,
@@ -142,10 +38,10 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
 		// Istanbul/babel cannot instrument CSS - e.g. Vue imports end up here.
 		// File extension itself is .vue, but it contains CSS.
 		// e.g. "Example.vue?vue&type=style&index=0&scoped=f7f04e08&lang.css"
-		if (id.endsWith(".css")) {
+		if (isCSSRequest(id)) {
 			return;
 		}
-		if (!this.testExclude.shouldInstrument(removeQueryParameters(id))) {
+		if (!this.isIncluded(removeQueryParameters(id))) {
 			return;
 		}
 		const sourceMap = pluginCtx.getCombinedSourcemap();
@@ -180,13 +76,13 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
 		});
 		// Include untested files when all tests were run (not a single file re-run)
 		// or if previous results are preserved by "cleanOnRerun: false"
-		if (this.options.all && (allTestsRun || !this.options.cleanOnRerun)) {
+		if (this.options.include != null && (allTestsRun || !this.options.cleanOnRerun)) {
 			const coveredFiles = coverageMap.files();
 			const uncoveredCoverage = await this.getCoverageMapForUncoveredFiles(coveredFiles);
 			coverageMap.merge(await transformCoverage(uncoveredCoverage));
 		}
 		if (this.options.excludeAfterRemap) {
-			coverageMap.filter((filename) => this.testExclude.shouldInstrument(filename));
+			coverageMap.filter((filename) => this.isIncluded(filename));
 		}
 		if (debug.enabled) {
 			debug("Generate coverage total time %d ms", (performance.now() - start).toFixed());
@@ -218,12 +114,7 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
 		return parseModule(await promises.readFile(configFilePath, "utf8"));
 	}
 	async getCoverageMapForUncoveredFiles(coveredFiles) {
-		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)).sort();
+		const uncoveredFiles = await this.getUntestedFiles(coveredFiles);
 		const cacheKey = new Date().getTime();
 		const coverageMap = this.createCoverageMap();
 		const transform = this.createUncoveredFileTransformer(this.ctx);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-istanbul",
   "type": "module",
-  "version": "3.2.3",
+  "version": "4.0.0-beta.1",
   "description": "Istanbul coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "vitest": "3.2.3"
+    "vitest": "4.0.0-beta.1"
   },
   "dependencies": {
     "@istanbuljs/schema": "^0.1.3",
@@ -48,7 +48,6 @@
     "istanbul-lib-source-maps": "^5.0.6",
     "istanbul-reports": "^3.1.7",
     "magicast": "^0.3.5",
-    "test-exclude": "^7.0.1",
     "tinyrainbow": "^2.0.0"
   },
   "devDependencies": {
@@ -58,9 +57,8 @@
     "@types/istanbul-lib-report": "^3.0.3",
     "@types/istanbul-lib-source-maps": "^4.0.4",
     "@types/istanbul-reports": "^3.0.4",
-    "@types/test-exclude": "^6.0.2",
     "pathe": "^2.0.3",
-    "vitest": "3.2.3"
+    "vitest": "4.0.0-beta.1"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",