@vitest/coverage-istanbul 5.0.0-beta.7 → 5.0.0-rc.1

package/dist/{base-BmUGq4Ml.js → base-BO8X8tRz.js}

@@ -5,6 +5,7 @@ const BaseCoverageProviderModule = {
 		// @ts-expect-error -- untyped global
 		return globalThis[COVERAGE_STORE_KEY];
 	},
+	// Reset coverage map to prevent duplicate results if this is called twice in row
 	startCoverage() {
 		// @ts-expect-error -- untyped global
 		const coverageMap = globalThis[COVERAGE_STORE_KEY];

package/dist/browser.js

@@ -1,4 +1,4 @@
-import { B as BaseCoverageProviderModule } from './base-BmUGq4Ml.js';
+import { B as BaseCoverageProviderModule } from './base-BO8X8tRz.js';
 import './constants-BCJfMgEg.js';
 
 function triggerCommand(command, args = []) {

package/dist/index.js

@@ -1,5 +1,5 @@
 import assert from 'node:assert';
-import { B as BaseCoverageProviderModule } from './base-BmUGq4Ml.js';
+import { B as BaseCoverageProviderModule } from './base-BO8X8tRz.js';
 import { w as writeCoverageFile } from './commands-KXFl3PvR.js';
 import './constants-BCJfMgEg.js';
 import 'node:crypto';

package/dist/provider.js

@@ -9,9 +9,8 @@ import require$$0$2 from 'fs';
 import require$$0$1 from 'crypto';
 import libReport from 'istanbul-lib-report';
 import require$$0$5 from 'path';
-import require$$1$2 from 'tty';
-import require$$1$3 from 'util';
-import require$$0$4 from 'os';
+import require$$0$4 from 'tty';
+import require$$1$2 from 'util';
 import reports from 'istanbul-reports';
 import { parseModule } from 'magicast';
 import { createDebug } from 'obug';
@@ -33,7 +32,7 @@ function getAugmentedNamespace(n) {
 			var isInstance = false;
 			try {
 				isInstance = this instanceof a;
-			} catch {}
+			} catch (e) {}
 			if (isInstance) {
 				return Reflect.construct(f, arguments, this.constructor);
 			}
@@ -1522,7 +1521,7 @@ var srcExports = requireSrc$1();
 
 var src = {exports: {}};
 
-var browser = {exports: {}};
+var browser$1 = {exports: {}};
 
 /**
  * Helpers.
@@ -1997,22 +1996,22 @@ function requireCommon () {
 
 /* eslint-env browser */
 
-var hasRequiredBrowser;
+var hasRequiredBrowser$1;
 
-function requireBrowser () {
-	if (hasRequiredBrowser) return browser.exports;
-	hasRequiredBrowser = 1;
-	(function (module, exports$1) {
+function requireBrowser$1 () {
+	if (hasRequiredBrowser$1) return browser$1.exports;
+	hasRequiredBrowser$1 = 1;
+	(function (module, exports) {
 		/**
 		 * This is the web browser implementation of `debug()`.
 		 */
 
-		exports$1.formatArgs = formatArgs;
-		exports$1.save = save;
-		exports$1.load = load;
-		exports$1.useColors = useColors;
-		exports$1.storage = localstorage();
-		exports$1.destroy = (() => {
+		exports.formatArgs = formatArgs;
+		exports.save = save;
+		exports.load = load;
+		exports.useColors = useColors;
+		exports.storage = localstorage();
+		exports.destroy = (() => {
 			let warned = false;
 
 			return () => {
@@ -2027,7 +2026,7 @@ function requireBrowser () {
 		 * Colors.
 		 */
 
-		exports$1.colors = [
+		exports.colors = [
 			'#0000CC',
 			'#0000FF',
 			'#0033CC',
@@ -2192,7 +2191,7 @@ function requireBrowser () {
 		 *
 		 * @api public
 		 */
-		exports$1.log = console.debug || console.log || (() => {});
+		exports.log = console.debug || console.log || (() => {});
 
 		/**
 		 * Save `namespaces`.
@@ -2203,9 +2202,9 @@ function requireBrowser () {
 		function save(namespaces) {
 			try {
 				if (namespaces) {
-					exports$1.storage.setItem('debug', namespaces);
+					exports.storage.setItem('debug', namespaces);
 				} else {
-					exports$1.storage.removeItem('debug');
+					exports.storage.removeItem('debug');
 				}
 			} catch (error) {
 				// Swallow
@@ -2222,7 +2221,7 @@ function requireBrowser () {
 		function load() {
 			let r;
 			try {
-				r = exports$1.storage.getItem('debug') || exports$1.storage.getItem('DEBUG') ;
+				r = exports.storage.getItem('debug') || exports.storage.getItem('DEBUG') ;
 			} catch (error) {
 				// Swallow
 				// XXX (@Qix-) should we be logging these?
@@ -2258,7 +2257,7 @@ function requireBrowser () {
 			}
 		}
 
-		module.exports = requireCommon()(exports$1);
+		module.exports = requireCommon()(exports);
 
 		const {formatters} = module.exports;
 
@@ -2273,169 +2272,43 @@ function requireBrowser () {
 				return '[UnexpectedJSONParseError]: ' + error.message;
 			}
 		}; 
-	} (browser, browser.exports));
-	return browser.exports;
+	} (browser$1, browser$1.exports));
+	return browser$1.exports;
 }
 
 var node = {exports: {}};
 
-var hasFlag;
-var hasRequiredHasFlag;
-
-function requireHasFlag () {
-	if (hasRequiredHasFlag) return hasFlag;
-	hasRequiredHasFlag = 1;
-
-	hasFlag = (flag, argv = process.argv) => {
-		const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
-		const position = argv.indexOf(prefix + flag);
-		const terminatorPosition = argv.indexOf('--');
-		return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
-	};
-	return hasFlag;
-}
-
-var supportsColor_1;
-var hasRequiredSupportsColor;
-
-function requireSupportsColor () {
-	if (hasRequiredSupportsColor) return supportsColor_1;
-	hasRequiredSupportsColor = 1;
-	const os = require$$0$4;
-	const tty = require$$1$2;
-	const hasFlag = requireHasFlag();
-
-	const {env} = process;
-
-	let forceColor;
-	if (hasFlag('no-color') ||
-		hasFlag('no-colors') ||
-		hasFlag('color=false') ||
-		hasFlag('color=never')) {
-		forceColor = 0;
-	} else if (hasFlag('color') ||
-		hasFlag('colors') ||
-		hasFlag('color=true') ||
-		hasFlag('color=always')) {
-		forceColor = 1;
-	}
-
-	if ('FORCE_COLOR' in env) {
-		if (env.FORCE_COLOR === 'true') {
-			forceColor = 1;
-		} else if (env.FORCE_COLOR === 'false') {
-			forceColor = 0;
-		} else {
-			forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3);
-		}
-	}
-
-	function translateLevel(level) {
-		if (level === 0) {
-			return false;
-		}
-
-		return {
-			level,
-			hasBasic: true,
-			has256: level >= 2,
-			has16m: level >= 3
-		};
-	}
-
-	function supportsColor(haveStream, streamIsTTY) {
-		if (forceColor === 0) {
-			return 0;
-		}
-
-		if (hasFlag('color=16m') ||
-			hasFlag('color=full') ||
-			hasFlag('color=truecolor')) {
-			return 3;
-		}
-
-		if (hasFlag('color=256')) {
-			return 2;
-		}
-
-		if (haveStream && !streamIsTTY && forceColor === undefined) {
-			return 0;
-		}
-
-		const min = forceColor || 0;
-
-		if (env.TERM === 'dumb') {
-			return min;
-		}
-
-		if (process.platform === 'win32') {
-			// Windows 10 build 10586 is the first Windows release that supports 256 colors.
-			// Windows 10 build 14931 is the first release that supports 16m/TrueColor.
-			const osRelease = os.release().split('.');
-			if (
-				Number(osRelease[0]) >= 10 &&
-				Number(osRelease[2]) >= 10586
-			) {
-				return Number(osRelease[2]) >= 14931 ? 3 : 2;
-			}
-
-			return 1;
-		}
-
-		if ('CI' in env) {
-			if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI', 'GITHUB_ACTIONS', 'BUILDKITE'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
-				return 1;
-			}
-
-			return min;
-		}
-
-		if ('TEAMCITY_VERSION' in env) {
-			return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
-		}
-
-		if (env.COLORTERM === 'truecolor') {
-			return 3;
-		}
-
-		if ('TERM_PROGRAM' in env) {
-			const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
+/* eslint-env browser */
 
-			switch (env.TERM_PROGRAM) {
-				case 'iTerm.app':
-					return version >= 3 ? 3 : 2;
-				case 'Apple_Terminal':
-					return 2;
-				// No default
-			}
-		}
+var browser;
+var hasRequiredBrowser;
 
-		if (/-256(color)?$/i.test(env.TERM)) {
-			return 2;
-		}
+function requireBrowser () {
+	if (hasRequiredBrowser) return browser;
+	hasRequiredBrowser = 1;
 
-		if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
-			return 1;
-		}
+	function getChromeVersion() {
+		const matches = /(Chrome|Chromium)\/(?<chromeVersion>\d+)\./.exec(navigator.userAgent);
 
-		if ('COLORTERM' in env) {
-			return 1;
+		if (!matches) {
+			return;
 		}
 
-		return min;
+		return Number.parseInt(matches.groups.chromeVersion, 10);
 	}
 
-	function getSupportLevel(stream) {
-		const level = supportsColor(stream, stream && stream.isTTY);
-		return translateLevel(level);
-	}
+	const colorSupport = getChromeVersion() >= 69 ? {
+		level: 1,
+		hasBasic: true,
+		has256: false,
+		has16m: false
+	} : false;
 
-	supportsColor_1 = {
-		supportsColor: getSupportLevel,
-		stdout: translateLevel(supportsColor(true, tty.isatty(1))),
-		stderr: translateLevel(supportsColor(true, tty.isatty(2)))
+	browser = {
+		stdout: colorSupport,
+		stderr: colorSupport
 	};
-	return supportsColor_1;
+	return browser;
 }
 
 /**
@@ -2447,21 +2320,21 @@ var hasRequiredNode;
 function requireNode () {
 	if (hasRequiredNode) return node.exports;
 	hasRequiredNode = 1;
-	(function (module, exports$1) {
-		const tty = require$$1$2;
-		const util = require$$1$3;
+	(function (module, exports) {
+		const tty = require$$0$4;
+		const util = require$$1$2;
 
 		/**
 		 * This is the Node.js implementation of `debug()`.
 		 */
 
-		exports$1.init = init;
-		exports$1.log = log;
-		exports$1.formatArgs = formatArgs;
-		exports$1.save = save;
-		exports$1.load = load;
-		exports$1.useColors = useColors;
-		exports$1.destroy = util.deprecate(
+		exports.init = init;
+		exports.log = log;
+		exports.formatArgs = formatArgs;
+		exports.save = save;
+		exports.load = load;
+		exports.useColors = useColors;
+		exports.destroy = util.deprecate(
 			() => {},
 			'Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.'
 		);
@@ -2470,15 +2343,15 @@ function requireNode () {
 		 * Colors.
 		 */
 
-		exports$1.colors = [6, 2, 3, 4, 5, 1];
+		exports.colors = [6, 2, 3, 4, 5, 1];
 
 		try {
 			// Optional dependency (as in, doesn't need to be installed, NOT like optionalDependencies in package.json)
 			// eslint-disable-next-line import/no-extraneous-dependencies
-			const supportsColor = requireSupportsColor();
+			const supportsColor = requireBrowser();
 
 			if (supportsColor && (supportsColor.stderr || supportsColor).level >= 2) {
-				exports$1.colors = [
+				exports.colors = [
 					20,
 					21,
 					26,
@@ -2567,7 +2440,7 @@ function requireNode () {
 		 *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
 		 */
 
-		exports$1.inspectOpts = Object.keys(process.env).filter(key => {
+		exports.inspectOpts = Object.keys(process.env).filter(key => {
 			return /^debug_/i.test(key);
 		}).reduce((obj, key) => {
 			// Camel-case
@@ -2599,8 +2472,8 @@ function requireNode () {
 		 */
 
 		function useColors() {
-			return 'colors' in exports$1.inspectOpts ?
-				Boolean(exports$1.inspectOpts.colors) :
+			return 'colors' in exports.inspectOpts ?
+				Boolean(exports.inspectOpts.colors) :
 				tty.isatty(process.stderr.fd);
 		}
 
@@ -2626,7 +2499,7 @@ function requireNode () {
 		}
 
 		function getDate() {
-			if (exports$1.inspectOpts.hideDate) {
+			if (exports.inspectOpts.hideDate) {
 				return '';
 			}
 			return new Date().toISOString() + ' ';
@@ -2637,7 +2510,7 @@ function requireNode () {
 		 */
 
 		function log(...args) {
-			return process.stderr.write(util.formatWithOptions(exports$1.inspectOpts, ...args) + '\n');
+			return process.stderr.write(util.formatWithOptions(exports.inspectOpts, ...args) + '\n');
 		}
 
 		/**
@@ -2677,13 +2550,13 @@ function requireNode () {
 		function init(debug) {
 			debug.inspectOpts = {};
 
-			const keys = Object.keys(exports$1.inspectOpts);
+			const keys = Object.keys(exports.inspectOpts);
 			for (let i = 0; i < keys.length; i++) {
-				debug.inspectOpts[keys[i]] = exports$1.inspectOpts[keys[i]];
+				debug.inspectOpts[keys[i]] = exports.inspectOpts[keys[i]];
 			}
 		}
 
-		module.exports = requireCommon()(exports$1);
+		module.exports = requireCommon()(exports);
 
 		const {formatters} = module.exports;
 
@@ -2722,7 +2595,7 @@ function requireSrc () {
 	if (hasRequiredSrc) return src.exports;
 	hasRequiredSrc = 1;
 	if (typeof process === 'undefined' || process.type === 'renderer' || process.browser === true || process.__nwjs) {
-		src.exports = requireBrowser();
+		src.exports = requireBrowser$1();
 	} else {
 		src.exports = requireNode();
 	}
@@ -3546,7 +3419,7 @@ function requireIstanbulLibSourceMaps () {
 var istanbulLibSourceMapsExports = requireIstanbulLibSourceMaps();
 var libSourceMaps = /*@__PURE__*/getDefaultExportFromCjs(istanbulLibSourceMapsExports);
 
-var version = "5.0.0-beta.7";
+var version = "5.0.0-rc.1";
 
 const debug = createDebug("vitest:coverage");
 class IstanbulCoverageProvider extends BaseCoverageProvider {
@@ -3581,7 +3454,10 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
 				coverageGlobalScopeFunc: false,
 				ignoreClassMethods: this.options.ignoreClassMethods,
 				parserPlugins: [...defaults.instrumenter.parserPlugins, ["importAttributes", { deprecatedAssertSyntax: true }]],
-				generatorOpts: { importAttributesKeyword: "with" },
+				generatorOpts: { 
+				// @ts-expect-error missing type
+importAttributesKeyword: "with" },
+				// Custom option from the patched istanbul-lib-instrument: https://github.com/istanbuljs/istanbuljs/pull/835
 				ignoreLines: true
 			});
 		}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-istanbul",
   "type": "module",
-  "version": "5.0.0-beta.7",
+  "version": "5.0.0-rc.1",
   "description": "Istanbul coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -41,19 +41,19 @@
     "dist"
   ],
   "peerDependencies": {
-    "vitest": "5.0.0-beta.7"
+    "vitest": "5.0.0-rc.1"
   },
   "dependencies": {
-    "@babel/core": "^7.29.0",
-    "@istanbuljs/schema": "^0.1.3",
+    "@babel/core": "^7.29.7",
+    "@istanbuljs/schema": "^0.1.6",
     "@jridgewell/gen-mapping": "^0.3.13",
     "@jridgewell/trace-mapping": "0.3.31",
     "istanbul-lib-coverage": "^3.2.2",
     "istanbul-lib-report": "^3.0.1",
     "istanbul-reports": "^3.2.0",
-    "magicast": "^0.5.2",
-    "obug": "^2.1.1",
-    "tinyrainbow": "^3.1.0"
+    "magicast": "^0.5.4",
+    "obug": "^2.1.4",
+    "tinyrainbow": "^3.1.1"
   },
   "devDependencies": {
     "@types/istanbul-lib-coverage": "^2.0.6",
@@ -64,7 +64,7 @@
     "istanbul-lib-instrument": "^6.0.3",
     "istanbul-lib-source-maps": "^5.0.6",
     "pathe": "^2.0.3",
-    "vitest": "5.0.0-beta.7"
+    "vitest": "5.0.0-rc.1"
   },
   "scripts": {
     "build": "premove dist && rollup -c",