@vitest/coverage-v8 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

@@ -11,6 +11,7 @@ import { parseModule } from 'magicast';
 import remapping from '@ampproject/remapping';
 import c from 'picocolors';
 import { provider } from 'std-env';
+import { stripLiteral } from 'strip-literal';
 import createDebug from 'debug';
 import { builtinModules } from 'node:module';
 import { coverageConfigDefaults, defaultExclude, defaultInclude } from 'vitest/config';
@@ -170,6 +171,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", \[[^\]]*?\]\),*/g;
 const DEFAULT_PROJECT = Symbol.for("default-project");
 const debug = createDebug("vitest:coverage");
 let uniqueId = 0;
@@ -253,7 +255,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);
@@ -280,7 +282,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], {
@@ -307,10 +309,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")
         });
       }
     }
@@ -319,17 +319,24 @@ class V8CoverageProvider extends BaseCoverageProvider {
   }
   async getUntestedFiles(testedFiles) {
     const transformResults = normalizeTransformResults(this.ctx.vitenode.fetchCache);
-    const includedFiles = await this.testExclude.glob(this.ctx.config.root);
-    const uncoveredFiles = includedFiles.map((file) => pathToFileURL(resolve(this.ctx.config.root, file))).filter((file) => !testedFiles.includes(file.pathname));
+    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.map((file) => pathToFileURL(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);
       }
       const coverages = await Promise.all(chunk.map(async (filename) => {
-        const { source } = await this.getSources(filename.href, transformResults);
+        const transformResult = await this.ctx.vitenode.transformRequest(filename.pathname).catch(() => {
+        });
+        if (transformResult && stripLiteral(transformResult.code).trim() === "")
+          return null;
+        const { originalSource } = await this.getSources(filename.href, transformResults);
         const coverage = {
           url: filename.href,
           scriptId: "0",
@@ -337,7 +344,7 @@ class V8CoverageProvider extends BaseCoverageProvider {
           functions: [{
             ranges: [{
               startOffset: 0,
-              endOffset: source.length,
+              endOffset: originalSource.length,
               count: 0
             }],
             isBlockCoverage: true,
@@ -347,7 +354,10 @@ class V8CoverageProvider extends BaseCoverageProvider {
         };
         return { result: [coverage] };
       }));
-      merged = mergeProcessCovs([merged, ...coverages]);
+      merged = mergeProcessCovs([
+        merged,
+        ...coverages.filter((cov) => cov != null)
+      ]);
     }
     return merged;
   }
@@ -360,16 +370,23 @@ class V8CoverageProvider extends BaseCoverageProvider {
       const length = findLongestFunctionLength(functions);
       return ".".repeat(length);
     });
-    if (!map)
-      return { source: code || sourcesContent };
+    if (!map) {
+      return {
+        source: code || sourcesContent,
+        originalSource: sourcesContent
+      };
+    }
+    const sources = [url];
+    if (map.sources && map.sources[0] && !url.endsWith(map.sources[0]))
+      sources[0] = new URL(map.sources[0], url).href;
     return {
       originalSource: sourcesContent,
       source: code || sourcesContent,
       sourceMap: {
-        sourcemap: removeViteHelpersFromSourceMaps(code, {
+        sourcemap: excludeGeneratedCode(code, {
           ...map,
           version: 3,
-          sources: [url],
+          sources,
           sourcesContent: [sourcesContent]
         })
       }
@@ -382,7 +399,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);
@@ -403,16 +420,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;
-  const sourceWithoutHelpers = new MagicString(source);
-  sourceWithoutHelpers.replaceAll(VITE_EXPORTS_LINE_PATTERN, "\n");
-  const mapWithoutHelpers = sourceWithoutHelpers.generateMap({
-    hires: "boundary"
-  });
+  if (!source.match(VITE_EXPORTS_LINE_PATTERN) && !source.match(DECORATOR_METADATA_PATTERN))
+    return map;
+  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;
@@ -432,36 +450,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.3.0",
+  "version": "1.4.0",
   "description": "V8 coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "vitest": "1.3.0"
+    "vitest": "1.4.0"
   },
   "dependencies": {
     "@ampproject/remapping": "^2.2.1",
@@ -45,12 +45,13 @@
     "debug": "^4.3.4",
     "istanbul-lib-coverage": "^3.2.2",
     "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",
     "magic-string": "^0.30.5",
     "magicast": "^0.3.3",
     "picocolors": "^1.0.0",
     "std-env": "^3.5.0",
+    "strip-literal": "^2.0.0",
     "test-exclude": "^6.0.0",
     "v8-to-istanbul": "^9.2.0"
   },
@@ -61,8 +62,8 @@
     "@types/istanbul-lib-source-maps": "^4.0.4",
     "@types/istanbul-reports": "^3.0.4",
     "pathe": "^1.1.1",
-    "vite-node": "1.3.0",
-    "vitest": "1.3.0"
+    "vite-node": "1.4.0",
+    "vitest": "1.4.0"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",