@vitest/coverage-v8 1.2.2 → 1.3.1

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.d.ts

@@ -11,8 +11,8 @@ interface TestExclude {
         excludeNodeModules?: boolean;
         relativePath?: boolean;
     }): {
-        shouldInstrument(filePath: string): boolean;
-        glob(cwd: string): Promise<string[]>;
+        shouldInstrument: (filePath: string) => boolean;
+        glob: (cwd: string) => Promise<string[]>;
     };
 }
 type Options = ResolvedCoverageOptions<'v8'>;

package/dist/provider.js

@@ -170,6 +170,7 @@ function cleanUrl(url) {
 
 const WRAPPER_LENGTH = 185;
 const VITE_EXPORTS_LINE_PATTERN = /Object\.defineProperty\(__vite_ssr_exports__.*\n/g;
+const DECORATOR_METADATA_PATTERN = /_ts_metadata\("design:paramtypes"(\s|.)+?]\),/g;
 const DEFAULT_PROJECT = Symbol.for("default-project");
 const debug = createDebug("vitest:coverage");
 let uniqueId = 0;
@@ -208,7 +209,9 @@ class V8CoverageProvider extends BaseCoverageProvider {
       extension: this.options.extension,
       relativePath: !this.options.allowExternal
     });
-    this.coverageFilesDirectory = resolve(this.options.reportsDirectory, ".tmp");
+    const shard = this.ctx.config.shard;
+    const tempDirectory = `.tmp${shard ? `-${shard.index}-${shard.count}` : ""}`;
+    this.coverageFilesDirectory = resolve(this.options.reportsDirectory, tempDirectory);
   }
   resolveOptions() {
     return this.options;
@@ -251,7 +254,7 @@ class V8CoverageProvider extends BaseCoverageProvider {
     for (const [projectName, coveragePerProject] of this.coverageFiles.entries()) {
       for (const [transformMode, filenames] of Object.entries(coveragePerProject)) {
         let merged = { result: [] };
-        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);
@@ -278,7 +281,7 @@ class V8CoverageProvider 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], {
@@ -305,10 +308,8 @@ class V8CoverageProvider 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")
         });
       }
     }
@@ -321,7 +322,7 @@ class V8CoverageProvider extends BaseCoverageProvider {
     const uncoveredFiles = includedFiles.map((file) => pathToFileURL(resolve(this.ctx.config.root, file))).filter((file) => !testedFiles.includes(file.pathname));
     let merged = { result: [] };
     let index = 0;
-    for (const chunk of toSlices(uncoveredFiles, this.options.processingConcurrency)) {
+    for (const chunk of this.toSlices(uncoveredFiles, this.options.processingConcurrency)) {
       if (debug.enabled) {
         index += chunk.length;
         debug("Uncovered files %d/%d", index, uncoveredFiles.length);
@@ -364,7 +365,7 @@ class V8CoverageProvider extends BaseCoverageProvider {
       originalSource: sourcesContent,
       source: code || sourcesContent,
       sourceMap: {
-        sourcemap: removeViteHelpersFromSourceMaps(code, {
+        sourcemap: excludeGeneratedCode(code, {
           ...map,
           version: 3,
           sources: [url],
@@ -380,7 +381,7 @@ class V8CoverageProvider extends BaseCoverageProvider {
     const scriptCoverages = coverage.result.filter((result) => this.testExclude.shouldInstrument(fileURLToPath(result.url)));
     const coverageMap = libCoverage.createCoverageMap({});
     let index = 0;
-    for (const chunk of toSlices(scriptCoverages, this.options.processingConcurrency)) {
+    for (const chunk of this.toSlices(scriptCoverages, this.options.processingConcurrency)) {
       if (debug.enabled) {
         index += chunk.length;
         debug("Converting %d/%d", index, scriptCoverages.length);
@@ -401,16 +402,17 @@ async function transformCoverage(coverageMap) {
   const sourceMapStore = libSourceMaps.createSourceMapStore();
   return await sourceMapStore.transformCoverage(coverageMap);
 }
-function removeViteHelpersFromSourceMaps(source, map) {
-  if (!source || !source.match(VITE_EXPORTS_LINE_PATTERN))
+function excludeGeneratedCode(source, map) {
+  if (!source)
+    return map;
+  if (!source.match(VITE_EXPORTS_LINE_PATTERN) && !source.match(DECORATOR_METADATA_PATTERN))
     return map;
-  const sourceWithoutHelpers = new MagicString(source);
-  sourceWithoutHelpers.replaceAll(VITE_EXPORTS_LINE_PATTERN, "\n");
-  const mapWithoutHelpers = sourceWithoutHelpers.generateMap({
-    hires: "boundary"
-  });
+  const trimmed = new MagicString(source);
+  trimmed.replaceAll(VITE_EXPORTS_LINE_PATTERN, "\n");
+  trimmed.replaceAll(DECORATOR_METADATA_PATTERN, (match) => "\n".repeat(match.split("\n").length - 1));
+  const trimmedMap = trimmed.generateMap({ hires: "boundary" });
   const combinedMap = remapping(
-    [{ ...mapWithoutHelpers, version: 3 }, map],
+    [{ ...trimmedMap, version: 3 }, map],
     () => null
   );
   return combinedMap;
@@ -430,36 +432,5 @@ function normalizeTransformResults(fetchCache) {
   }
   return normalized;
 }
-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 { V8CoverageProvider };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-v8",
   "type": "module",
-  "version": "1.2.2",
+  "version": "1.3.1",
   "description": "V8 coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "vitest": "^1.0.0"
+    "vitest": "1.3.1"
   },
   "dependencies": {
     "@ampproject/remapping": "^2.2.1",
@@ -61,8 +61,8 @@
     "@types/istanbul-lib-source-maps": "^4.0.4",
     "@types/istanbul-reports": "^3.0.4",
     "pathe": "^1.1.1",
-    "vite-node": "1.2.2",
-    "vitest": "1.2.2"
+    "vite-node": "1.3.1",
+    "vitest": "1.3.1"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",