fix: enhance TypedFlatConfigItem type and improve timeout handling in tests (#738)

ccpu · web-flow · commit 3d486ce74b30 · 2025-07-24T15:40:33.000+09:00
diff --git a/src/types.ts b/src/types.ts
@@ -12,14 +12,19 @@ export interface Rules extends RuleOptions {}
 
 export type { ConfigNames }
 
-export type TypedFlatConfigItem = Omit<Linter.Config<Linter.RulesRecord & Rules>, 'plugins'> & {
+export type TypedFlatConfigItem = Omit<Linter.Config<Linter.RulesRecord & Rules>, 'plugins' | 'rules'> & {
   // Relax plugins type limitation, as most of the plugins did not have correct type info yet.
   /**
    * An object containing a name-value mapping of plugin names to plugin objects. When `files` is specified, these plugins are only available to the matching files.
    *
    * @see [Using plugins in your configuration](https://eslint.org/docs/latest/user-guide/configuring/configuration-files-new#using-plugins-in-your-configuration)
    */
   plugins?: Record<string, any>
+
+  /**
+   * Rules configuration. More flexible to allow plugin rules that may not be perfectly typed.
+   */
+  rules?: Record<string, Linter.RuleEntry<any> | undefined>
 }
 
 export interface OptionsFiles {
diff --git a/test/fixtures.test.ts b/test/fixtures.test.ts
@@ -7,6 +7,9 @@ import { glob } from 'tinyglobby'
 
 import { afterAll, beforeAll, it } from 'vitest'
 
+const isWindows = process.platform === 'win32'
+const timeout = isWindows ? 300_000 : 30_000
+
 beforeAll(async () => {
   await fs.rm('_fixtures', { recursive: true, force: true })
 })
@@ -157,5 +160,5 @@ export default antfu(
       }
       await expect.soft(content).toMatchFileSnapshot(join(output, file))
     }))
-  }, 30_000)
+  }, timeout)
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@ import { glob } from 'tinyglobby'`
`7`	`7`
`8`	`8`	`import { afterAll, beforeAll, it } from 'vitest'`
`9`	`9`
	`10`	`+const isWindows = process.platform === 'win32'`
	`11`	`+const timeout = isWindows ? 300_000 : 30_000`
	`12`	`+`
`10`	`13`	`beforeAll(async () => {`
`11`	`14`	`await fs.rm('_fixtures', { recursive: true, force: true })`
`12`	`15`	`})`
`@@ -157,5 +160,5 @@ export default antfu(`
`157`	`160`	`}`
`158`	`161`	`await expect.soft(content).toMatchFileSnapshot(join(output, file))`
`159`	`162`	`}))`
`160`		`- }, 30_000)`
	`163`	`+ }, timeout)`
`161`	`164`	`}`