fix(scan-dirs): add file pattern to the dir glob's basename is *

src/node/scan-dirs.ts

@@ -6,7 +6,7 @@ import { readFile } from 'node:fs/promises'
 import process from 'node:process'
 import { fileURLToPath } from 'node:url'
 import { findExports, findTypeExports, resolve as mllyResolve } from 'mlly'
-import { dirname, join, normalize, parse as parsePath, resolve } from 'pathe'
+import { basename, dirname, join, normalize, parse as parsePath, resolve } from 'pathe'
 import pm from 'picomatch'
 import { camelCase } from 'scule'
 import { glob } from 'tinyglobby'
@@ -28,6 +28,10 @@ function resolveGlobsExclude(glob: string, cwd: string) {
   return `${glob.startsWith('!') ? '!' : ''}${resolve(cwd, glob.replace(/^!/, ''))}`
 }
 
+function joinGlobFilePattern(glob: string, filePattern: string) {
+  return join(basename(glob) === '*' ? dirname(glob) : glob, filePattern)
+}
+
 export function normalizeScanDirs(dirs: (string | ScanDir)[], options?: ScanDirExportsOptions): Required<ScanDir>[] {
   const topLevelTypes = options?.types ?? true
   const cwd = options?.cwd ?? process.cwd()
@@ -37,7 +41,7 @@ export function normalizeScanDirs(dirs: (string | ScanDir)[], options?: ScanDirE
     const isString = typeof dir === 'string'
 
     return filePatterns.map((filePattern) => {
-      const glob = join(resolveGlobsExclude(isString ? dir : dir.glob, cwd), filePattern)
+      const glob = joinGlobFilePattern(resolveGlobsExclude(isString ? dir : dir.glob, cwd), filePattern)
       const types = isString ? topLevelTypes : (dir.types ?? topLevelTypes)
       return { glob, types }
     })

test/scan-dirs.test.ts

@@ -244,4 +244,19 @@ describe('scan-dirs', () => {
     expect(exports2.some(i => i.name === 'CustomType2')).toEqual(true)
     expect(exports2.some(i => i.name === 'CustomType3')).toEqual(false)
   })
+
+  it('scanDirs default file pattern', async () => {
+    const dir = join(__dirname, '../playground/composables/nested')
+    const exports = await scanDirExports([dir])
+    expect(exports.some(i => i.name === 'CustomType3')).toEqual(true)
+
+    const dirWithSingleAsterisk = join(__dirname, '../playground/composables/nested/*')
+    const singleAsteriskExports = await scanDirExports([dirWithSingleAsterisk])
+    expect(singleAsteriskExports.some(i => i.name === 'CustomType3')).toEqual(true)
+
+    const dirWithDoubleAsterisk = join(__dirname, '../playground/composables/nested/**')
+    const doubleAsteriskExports = await scanDirExports([dirWithDoubleAsterisk])
+    expect(doubleAsteriskExports.some(i => i.name === 'CustomType3')).toEqual(true)
+    expect(doubleAsteriskExports.some(i => i.name === 'CustomType2')).toEqual(true)
+  })
 })