Merge branch 'main' into chore/ci

Author: veritem

package.json

@@ -50,7 +50,7 @@
 		"@typescript-eslint/parser": "8.18.2",
 		"@typescript-eslint/rule-tester": "8.18.1",
 		"@vitest/eslint-plugin": "^1.1.20",
-		"bumpp": "^9.9.1",
+		"bumpp": "^9.9.2",
 		"concurrently": "^8.2.2",
 		"eslint": "^9.17.0",
 		"eslint-doc-generator": "^2.0.2",

pnpm-lock.yaml

@@ -1,4 +1,4 @@
-import type { Linter } from 'eslint'
+import type { Linter, RuleModule } from '@typescript-eslint/utils/ts-eslint'
 import { version } from '../package.json'
 import lowerCaseTitle, { RULE_NAME as lowerCaseTitleName } from './rules/prefer-lowercase-title'
 import maxNestedDescribe, { RULE_NAME as maxNestedDescribeName } from './rules/max-nested-describe'
@@ -70,8 +70,8 @@ const createConfig = <R extends Linter.RulesRecord>(rules: R) => (
       [`vitest/${ruleName}`]: rules[ruleName]
     }
   }, {})) as {
-  [K in keyof R as `vitest/${Extract<K, string>}`]: R[K]
-}
+    [K in keyof R as `vitest/${Extract<K, string>}`]: R[K]
+  }
 
 const createConfigLegacy = (rules: Record<string, string>) => ({
   plugins: ['@vitest'],
@@ -159,7 +159,18 @@ const recommended = {
   [noImportNodeTestName]: 'error'
 } as const
 
-const plugin = {
+interface VitestPLugin extends Linter.Plugin {
+  meta: {
+    name: string
+    version: string
+  }
+  rules: Record<string, RuleModule<any, any>>
+  //TODO: use classic type for config
+  configs?: Record<string, any>
+  environments?: Record<string, any>
+}
+
+const plugin: VitestPLugin = {
   meta: {
     name: 'vitest',
     version
@@ -228,48 +239,6 @@ const plugin = {
     [paddingAroundTestBlocksName]: paddingAroundTestBlocks,
     [validExpectInPromiseName]: validExpectInPromise
   },
-  configs: {
-    'legacy-recommended': createConfigLegacy(recommended),
-    'legacy-all': createConfigLegacy(allRules),
-    'recommended': {
-      plugins: {
-        get vitest() {
-          return plugin
-        }
-      },
-      rules: createConfig(recommended)
-    },
-    'all': {
-      plugins: {
-        get vitest() {
-          return plugin
-        }
-      },
-      rules: createConfig(allRules)
-    },
-    'env': {
-      languageOptions: {
-        globals: {
-          suite: 'writable',
-          test: 'writable',
-          describe: 'writable',
-          it: 'writable',
-          expectTypeOf: 'writable',
-          assertType: 'writable',
-          expect: 'writable',
-          assert: 'writable',
-          vitest: 'writable',
-          vi: 'writable',
-          beforeAll: 'writable',
-          afterAll: 'writable',
-          beforeEach: 'writable',
-          afterEach: 'writable',
-          onTestFailed: 'writable',
-          onTestFinished: 'writable'
-        }
-      }
-    }
-  },
   environments: {
     env: {
       globals: {
@@ -294,4 +263,44 @@ const plugin = {
   }
 }
 
+plugin.configs = {
+  'legacy-recommended': createConfigLegacy(recommended),
+  'legacy-all': createConfigLegacy(allRules),
+  'recommended': {
+    plugins: {
+      ["vitest"]: plugin
+    },
+    rules: createConfig(recommended)
+  },
+  'all': {
+    plugins: {
+      ["vitest"]: plugin
+    },
+    rules: createConfig(allRules)
+  },
+  'env': {
+    languageOptions: {
+      globals: {
+        suite: 'writable',
+        test: 'writable',
+        describe: 'writable',
+        it: 'writable',
+        expectTypeOf: 'writable',
+        assertType: 'writable',
+        expect: 'writable',
+        assert: 'writable',
+        vitest: 'writable',
+        vi: 'writable',
+        beforeAll: 'writable',
+        afterAll: 'writable',
+        beforeEach: 'writable',
+        afterEach: 'writable',
+        onTestFailed: 'writable',
+        onTestFinished: 'writable'
+      }
+    }
+  }
+}
+
+
 export default plugin

src/index.ts

@@ -211,4 +211,4 @@ export const isParsedInstanceOfMatcherCall = (
     && expectFnCall.args.length === 1
     && isSupportedAccessor(expectFnCall.args[0], classArg)
   )
-}
+}