|
1 | | -import type { Linter, RuleModule } from '@typescript-eslint/utils/ts-eslint' |
| 1 | +import type { Linter } from '@typescript-eslint/utils/ts-eslint' |
| 2 | +import type { ESLint } from "eslint" |
2 | 3 | import { version } from '../package.json' |
3 | 4 | import lowerCaseTitle, { RULE_NAME as lowerCaseTitleName } from './rules/prefer-lowercase-title' |
4 | 5 | import maxNestedDescribe, { RULE_NAME as maxNestedDescribeName } from './rules/max-nested-describe' |
@@ -70,8 +71,8 @@ const createConfig = <R extends Linter.RulesRecord>(rules: R) => ( |
70 | 71 | [`vitest/${ruleName}`]: rules[ruleName] |
71 | 72 | } |
72 | 73 | }, {})) as { |
73 | | - [K in keyof R as `vitest/${Extract<K, string>}`]: R[K] |
74 | | -} |
| 74 | + [K in keyof R as `vitest/${Extract<K, string>}`]: R[K] |
| 75 | + } |
75 | 76 |
|
76 | 77 | const createConfigLegacy = (rules: Record<string, string>) => ({ |
77 | 78 | plugins: ['@vitest'], |
@@ -159,23 +160,12 @@ const recommended = { |
159 | 160 | [noImportNodeTestName]: 'error' |
160 | 161 | } as const |
161 | 162 |
|
162 | | -interface VitestPlugin extends Linter.Plugin { |
163 | | - meta: { |
164 | | - name: string |
165 | | - version: string |
166 | | - } |
167 | | - rules: Record<string, RuleModule<any, any>> |
168 | | - // TODO: use classic type for config |
169 | | - configs: Record<string, any> |
170 | | - environments?: Record<string, any> |
171 | | -} |
172 | 163 |
|
173 | | -const plugin: VitestPlugin = { |
| 164 | +const plugin = { |
174 | 165 | meta: { |
175 | 166 | name: 'vitest', |
176 | 167 | version |
177 | 168 | }, |
178 | | - configs: {}, |
179 | 169 | rules: { |
180 | 170 | [lowerCaseTitleName]: lowerCaseTitle, |
181 | 171 | [maxNestedDescribeName]: maxNestedDescribe, |
@@ -261,46 +251,49 @@ const plugin: VitestPlugin = { |
261 | 251 | onTestFinished: true |
262 | 252 | } |
263 | 253 | } |
264 | | - } |
265 | | -} |
266 | | - |
267 | | -plugin.configs = { |
268 | | - 'legacy-recommended': createConfigLegacy(recommended), |
269 | | - 'legacy-all': createConfigLegacy(allRules), |
270 | | - 'recommended': { |
271 | | - plugins: { |
272 | | - ['vitest']: plugin |
273 | | - }, |
274 | | - rules: createConfig(recommended) |
275 | 254 | }, |
276 | | - 'all': { |
277 | | - plugins: { |
278 | | - ['vitest']: plugin |
| 255 | + configs: { |
| 256 | + 'legacy-recommended': createConfigLegacy(recommended), |
| 257 | + 'legacy-all': createConfigLegacy(allRules), |
| 258 | + 'recommended': { |
| 259 | + plugins: { |
| 260 | + get vitest(): ESLint.Plugin { |
| 261 | + return plugin |
| 262 | + } |
| 263 | + }, |
| 264 | + rules: createConfig(recommended) |
279 | 265 | }, |
280 | | - rules: createConfig(allRules) |
281 | | - }, |
282 | | - 'env': { |
283 | | - languageOptions: { |
284 | | - globals: { |
285 | | - suite: 'writable', |
286 | | - test: 'writable', |
287 | | - describe: 'writable', |
288 | | - it: 'writable', |
289 | | - expectTypeOf: 'writable', |
290 | | - assertType: 'writable', |
291 | | - expect: 'writable', |
292 | | - assert: 'writable', |
293 | | - vitest: 'writable', |
294 | | - vi: 'writable', |
295 | | - beforeAll: 'writable', |
296 | | - afterAll: 'writable', |
297 | | - beforeEach: 'writable', |
298 | | - afterEach: 'writable', |
299 | | - onTestFailed: 'writable', |
300 | | - onTestFinished: 'writable' |
| 266 | + 'all': { |
| 267 | + plugins: { |
| 268 | + get vitest(): ESLint.Plugin { |
| 269 | + return plugin |
| 270 | + } |
| 271 | + }, |
| 272 | + rules: createConfig(allRules) |
| 273 | + }, |
| 274 | + 'env': { |
| 275 | + languageOptions: { |
| 276 | + globals: { |
| 277 | + suite: 'writable', |
| 278 | + test: 'writable', |
| 279 | + describe: 'writable', |
| 280 | + it: 'writable', |
| 281 | + expectTypeOf: 'writable', |
| 282 | + assertType: 'writable', |
| 283 | + expect: 'writable', |
| 284 | + assert: 'writable', |
| 285 | + vitest: 'writable', |
| 286 | + vi: 'writable', |
| 287 | + beforeAll: 'writable', |
| 288 | + afterAll: 'writable', |
| 289 | + beforeEach: 'writable', |
| 290 | + afterEach: 'writable', |
| 291 | + onTestFailed: 'writable', |
| 292 | + onTestFinished: 'writable' |
| 293 | + } |
301 | 294 | } |
302 | 295 | } |
303 | 296 | } |
304 | | -} |
| 297 | +} satisfies ESLint.Plugin |
305 | 298 |
|
306 | 299 | export default plugin |
0 commit comments