feat(entry): support multiple patterns with same base

closes #675

Author: sxzz

src/features/entry.test.ts

@@ -134,9 +134,10 @@ describe('toObjectEntry', () => {
     expect(Object.keys(result)).not.toContain('hooks/index')
   })
 
-  test('object entry with multiple negation patterns', async (context) => {
+  test('object entry with multiple patterns', async (context) => {
     const { testDir } = await writeFixtures(context, {
       'src/utils/index.ts': '',
+      'src/utils/tsx.tsx': '',
       'src/utils/internal.ts': '',
       'src/utils/helper.ts': '',
       'src/utils/format.ts': '',
@@ -145,19 +146,21 @@ describe('toObjectEntry', () => {
       {
         'utils/*': [
           'src/utils/*.ts',
+          'src/utils/*.tsx',
           '!src/utils/index.ts',
           '!src/utils/internal.ts',
         ],
       },
       testDir,
     )
     expect(result).toEqual({
+      'utils/tsx': path.join(testDir, 'src/utils/tsx.tsx'),
       'utils/helper': path.join(testDir, 'src/utils/helper.ts'),
       'utils/format': path.join(testDir, 'src/utils/format.ts'),
     })
   })
 
-  test('object entry with multiple positive patterns should throw', async (context) => {
+  test('object entry with different patterns base should throw', async (context) => {
     const { testDir } = await writeFixtures(context, {
       'src/hooks/useAuth.ts': '',
       'src/utils/helper.ts': '',
@@ -169,7 +172,9 @@ describe('toObjectEntry', () => {
         },
         testDir,
       ),
-    ).rejects.toThrow(/multiple positive patterns/)
+    ).rejects.toThrow(
+      'all value glob patterns must have the same base directory',
+    )
   })
 
   test('object entry with no positive pattern should throw', async (context) => {
@@ -183,6 +188,6 @@ describe('toObjectEntry', () => {
         },
         testDir,
       ),
-    ).rejects.toThrow(/no positive pattern/)
+    ).rejects.toThrow('Cannot find files')
   })
 })

src/features/entry.ts

@@ -62,32 +62,41 @@ export async function toObjectEntry(
             }
 
             const patterns = toArray(value)
-
-            const positivePatterns = patterns.filter((p) => !p.startsWith('!'))
-            if (positivePatterns.length === 0) {
-              throw new TypeError(
-                `Object entry "${key}" has no positive pattern. At least one positive pattern is required.`,
+            const files = await glob(patterns, {
+              cwd,
+              expandDirectories: false,
+            })
+            if (!files.length) {
+              throw new Error(
+                `Cannot find files for entry key "${key}" with patterns: ${JSON.stringify(
+                  patterns,
+                )}`,
               )
             }
 
-            if (positivePatterns.length > 1) {
-              throw new TypeError(
-                `Object entry "${key}" has multiple positive patterns: ${positivePatterns.join(', ')}. ` +
-                  `Only one positive pattern is allowed. Use negation patterns (prefixed with "!") to exclude files.`,
+            let valueGlobBase: string | undefined
+            for (const pattern of patterns) {
+              if (pattern.startsWith('!')) continue
+              const base = picomatch.scan(pattern).base
+              if (valueGlobBase === undefined) {
+                valueGlobBase = base
+              } else if (valueGlobBase !== base) {
+                throw new Error(
+                  `When using object entry with glob pattern key "${key}", all value glob patterns must have the same base directory.`,
+                )
+              }
+            }
+            if (valueGlobBase === undefined) {
+              throw new Error(
+                `Cannot determine base directory for value glob patterns of key "${key}".`,
               )
             }
 
-            const valueGlob = picomatch.scan(positivePatterns[0])
-            const files = await glob(patterns, {
-              cwd,
-              expandDirectories: false,
-            })
-
             return files.map((file) => [
               slash(
                 key.replaceAll(
                   '*',
-                  stripExtname(path.relative(valueGlob.base, file)),
+                  stripExtname(path.relative(valueGlobBase, file)),
                 ),
               ),
               path.resolve(cwd, file),