Skip to content

Commit 9fadd70

Browse files
committed
fix: override type-aware rules properly
1 parent 315dc29 commit 9fadd70

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/configs/typescript.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export async function typescript(
1818
OptionsTypeScriptWithTypes &
1919
OptionsTypeScriptParserOptions = {},
2020
): Promise<TypedFlatConfigItem[]> {
21-
const { componentExts = [], overrides = {}, parserOptions = {} } = options
21+
const { componentExts = [], overrides = {}, overridesTypeAware = {}, parserOptions = {} } = options
2222

2323
const files = options.files ?? [
2424
GLOB_TS,
@@ -105,8 +105,8 @@ export async function typescript(
105105
// assign type-aware parser for type-aware files and type-unaware parser for the rest
106106
...(isTypeAware
107107
? [
108+
makeParser(false, files),
108109
makeParser(true, filesTypeAware, ignoresTypeAware),
109-
makeParser(false, files, filesTypeAware),
110110
]
111111
: [makeParser(false, files)]),
112112
{
@@ -170,8 +170,8 @@ export async function typescript(
170170
ignores: ignoresTypeAware,
171171
name: 'coderwyd/typescript/rules-type-aware',
172172
rules: {
173-
...(tsconfigPath ? typeAwareRules : {}),
174-
...overrides,
173+
...typeAwareRules,
174+
...overridesTypeAware,
175175
},
176176
},
177177
]

src/types/index.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,11 @@ export interface OptionsTypeScriptWithTypes {
9797
* @see https://typescript-eslint.io/linting/typed-linting/
9898
*/
9999
tsconfigPath?: string
100+
101+
/**
102+
* Override type aware rules.
103+
*/
104+
overridesTypeAware?: TypedFlatConfigItem['rules']
100105
}
101106

102107
export interface OptionsHasTypeScript {

0 commit comments

Comments
 (0)