fix: update coverage.include and coverage.exclude

packages/vitest/src/node/coverage.ts

@@ -149,31 +149,45 @@ export class BaseCoverageProvider<Options extends ResolvedCoverageOptions<'istan
     const roots = root ? [root] : this.roots
 
     const filename = slash(_filename)
-    const cacheHit = this.globCache.get(filename)
+    const cacheKey = root ? `${root}::${filename}` : filename
+    const cacheHit = this.globCache.get(cacheKey)
 
     if (cacheHit !== undefined) {
       return cacheHit
     }
 
-    // File outside project root with default allowExternal
-    if (this.options.allowExternal === false && roots.every(root => !filename.startsWith(root))) {
-      this.globCache.set(filename, false)
+    const includeGlobs = this.options.include || '**'
+    const excludes = this.options.exclude
 
-      return false
-    }
+    for (const projectRoot of roots) {
+      const relativePath = slash(relative(projectRoot, filename))
+      const isExternal = relativePath.startsWith('..') || path.isAbsolute(relativePath)
 
-    // By default `coverage.include` matches all files, except "coverage.exclude"
-    const glob = this.options.include || '**'
+      if (this.options.allowExternal === false && isExternal) {
+        continue
+      }
 
-    const included = pm.isMatch(filename, glob, {
-      contains: true,
-      dot: true,
-      ignore: this.options.exclude,
-    })
+      const matchTarget = isExternal ? filename : relativePath
+
+      if (pm.isMatch(matchTarget, excludes, { dot: true })) {
+        continue
+      }
 
-    this.globCache.set(filename, included)
+      if (!isExternal) {
+        const absoluteExcludes = excludes.filter(pattern => path.isAbsolute(pattern))
+        if (absoluteExcludes.length > 0 && pm.isMatch(filename, absoluteExcludes, { dot: true })) {
+          continue
+        }
+      }
+
+      if (pm.isMatch(matchTarget, includeGlobs, { dot: true, contains: true })) {
+        this.globCache.set(cacheKey, true)
+        return true
+      }
+    }
 
-    return included
+    this.globCache.set(cacheKey, false)
+    return false
   }
 
   private async getUntestedFilesByRoot(

test/coverage-test/fixtures/src/nested/nested-level.ts

@@ -0,0 +1,3 @@
+export function nestedLevel(n: number) {
+  return n * 2
+}

test/coverage-test/fixtures/src/root-level.ts

@@ -0,0 +1,3 @@
+export function rootLevel(n: number) {
+  return n + 1
+}

test/coverage-test/fixtures/test/exclude-globstar.test.ts

@@ -0,0 +1,13 @@
+import { describe, expect, test } from 'vitest'
+import { rootLevel } from '../src/root-level'
+import { nestedLevel } from '../src/nested/nested-level'
+
+describe('coverage include/exclude patterns', () => {
+  test('includes files from top-level', () => {
+    expect(rootLevel(5)).toBe(6)
+  })
+
+  test('includes files from nested directories', () => {
+    expect(nestedLevel(5)).toBe(10)
+  })
+})

test/coverage-test/test/exclude-after-remap.test.ts

@@ -6,7 +6,7 @@ test('{ excludeAfterRemap: true } should exclude files that come up after remapp
   await runVitest({
     include: [normalizeURL(import.meta.url)],
     coverage: {
-      exclude: ['fixtures/src/pre-bundle/second.ts', './utils.ts'],
+      exclude: ['fixtures/src/pre-bundle/second.ts', './utils.ts', '**/test/**'],
       excludeAfterRemap: true,
       reporter: 'json',
     },
@@ -26,7 +26,7 @@ test('{ excludeAfterRemap: false } should not exclude files that come up after r
   await runVitest({
     include: [normalizeURL(import.meta.url)],
     coverage: {
-      exclude: ['fixtures/src/pre-bundle/second.ts', './utils.ts'],
+      exclude: ['fixtures/src/pre-bundle/second.ts', './utils.ts', '**/test/**'],
       reporter: 'json',
     },
   })

test/coverage-test/test/include-exclude.test.ts

@@ -96,8 +96,7 @@ test('exclude can exclude covered files #2', async () => {
       reporter: 'json',
       include: ['fixtures/src/{math,even}.ts'],
 
-      // pattern that's recognized by picomatch but not by tinyglobby
-      exclude: ['math'],
+      exclude: ['**/math.ts'],
     },
   })
 
@@ -393,3 +392,22 @@ test('includes covered and uncovered with ] in filenames', async () => {
     ]
   `)
 })
+
+test('exclude pattern without globstar excludes only top-level files', async () => {
+  await runVitest({
+    include: ['fixtures/test/exclude-globstar.test.ts'],
+    coverage: {
+      reporter: 'json',
+      include: ['fixtures/src/root-level.ts', 'fixtures/src/nested/*.ts'],
+      exclude: ['fixtures/src/*.ts'],
+    },
+  })
+
+  const coverageMap = await readCoverageMap()
+
+  expect(coverageMap.files()).toMatchInlineSnapshot(`
+    [
+      "<process-cwd>/fixtures/src/nested/nested-level.ts",
+    ]
+  `)
+})