fix(scan-dirs): retain the original dirs glob scanning (#406)

unjs · Dec 10, 2024 · e647dfa · e647dfa
1 parent 7bc76c5
commit e647dfa
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/src/node/scan-dirs.ts b/src/node/scan-dirs.ts
@@ -39,12 +39,11 @@ export function normalizeScanDirs(dirs: (string | ScanDir)[], options?: ScanDirE
 
   return dirs.map((dir) => {
     const isString = typeof dir === 'string'
+    const glob = resolveGlobsExclude(isString ? dir : dir.glob, cwd)
+    const types = isString ? topLevelTypes : (dir.types ?? topLevelTypes)
 
-    return filePatterns.map((filePattern) => {
-      const glob = joinGlobFilePattern(resolveGlobsExclude(isString ? dir : dir.glob, cwd), filePattern)
-      const types = isString ? topLevelTypes : (dir.types ?? topLevelTypes)
-      return { glob, types }
-    })
+    const withFilePatterns = filePatterns.map(filePattern => ({ glob: joinGlobFilePattern(glob, filePattern), types }))
+    return [{ glob, types }, ...withFilePatterns]
   }).flat()
 }
 

diff --git a/test/scan-dirs.test.ts b/test/scan-dirs.test.ts
@@ -259,6 +259,16 @@ describe('scan-dirs', () => {
     expect(doubleAsteriskExports.some(i => i.name === 'CustomType3')).toEqual(true)
     expect(doubleAsteriskExports.some(i => i.name === 'CustomType2')).toEqual(true)
   })
+
+  it('scanDirs original dirs glob', async () => {
+    const dir = join(__dirname, '../playground/composables/nested/index.ts')
+    const exports = await scanDirExports([dir])
+    expect(exports.some(i => i.name === 'CustomType3')).toEqual(true)
+
+    const dirWithSingleAsterisk = join(__dirname, '../playground/composables/nested/*/index.ts')
+    const singleAsteriskExports = await scanDirExports([dirWithSingleAsterisk])
+    expect(singleAsteriskExports.some(i => i.name === 'CustomType2')).toEqual(true)
+  })
 })
 
 it('normalizeScanDirs', () => {
@@ -267,6 +277,10 @@ it('normalizeScanDirs', () => {
   }))
     .toMatchInlineSnapshot(`
       [
+        {
+          "glob": "/playground/composables/nested",
+          "types": true,
+        },
         {
           "glob": "/playground/composables/nested/*.{mts,cts,ts,tsx,mjs,cjs,js,jsx}",
           "types": true,
@@ -279,6 +293,10 @@ it('normalizeScanDirs', () => {
   }))
     .toMatchInlineSnapshot(`
       [
+        {
+          "glob": "/playground/composables/nested/*",
+          "types": false,
+        },
         {
           "glob": "/playground/composables/nested/*.{mts,cts,ts,tsx,mjs,cjs,js,jsx}",
           "types": false,
@@ -290,6 +308,10 @@ it('normalizeScanDirs', () => {
   }))
     .toMatchInlineSnapshot(`
       [
+        {
+          "glob": "/playground/composables/nested/**",
+          "types": true,
+        },
         {
           "glob": "/playground/composables/nested/**/*.{mts,cts,ts,tsx,mjs,cjs,js,jsx}",
           "types": true,