Refactor tsconfig for Stricter Type-Safe Settings (#605)

* refactor: update tsconfig for type-safe improvements * fix: revert plugin configs * fix: Remove unused import
vitest-dev · Dec 20, 2024 · 949aaf7 · 949aaf7
1 parent 448650c
commit 949aaf7
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 27 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,4 @@
-import type { ESLint, Linter } from 'eslint'
+import type { Linter } from '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'
@@ -233,15 +233,15 @@ const plugin = {
     'legacy-all': createConfigLegacy(allRules),
     'recommended': {
       plugins: {
-        get vitest(): ESLint.Plugin {
+        get vitest() {
           return plugin
         }
       },
       rules: createConfig(recommended)
     },
     'all': {
       plugins: {
-        get vitest(): ESLint.Plugin {
+        get vitest() {
           return plugin
         }
       },
@@ -292,6 +292,6 @@ const plugin = {
       }
     }
   }
-} satisfies ESLint.Plugin
+}
 
 export default plugin
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -10,7 +10,6 @@ import {
   KnownMemberExpression,
   ParsedExpectVitestFnCall
 } from './parse-vitest-fn-call'
-import { Rule } from 'eslint'
 
 interface PluginDocs {
   recommended?: boolean
@@ -23,7 +22,7 @@ export function createEslintRule<TOptions extends readonly unknown[], TMessageId
       `https://github.com/vitest-dev/eslint-plugin-vitest/blob/main/docs/rules/${ruleName}.md`
   )
 
-  return createRule(rule) as unknown as Rule.RuleModule
+  return createRule(rule)
 }
 
 export const joinNames = (a: string | null, b: string | null): string | null =>

diff --git a/tests/expect-expect.test.ts b/tests/expect-expect.test.ts
@@ -83,7 +83,7 @@ it('example', async () => {
     },
     {
       code: 'afterEach(() => {});',
-      options: [{ additionalTestBlockFunctions: ['afterEach'] }],
+      options: [{ additionalTestBlockFunctions: ['afterEach'], assertFunctionNames: [] }],
       errors: [
         {
           messageId: 'noAssertions',
@@ -97,7 +97,7 @@ it('example', async () => {
      const output = NumberToLongString(theory.input);
     })
     `,
-      options: [{ additionalTestBlockFunctions: ['theoretically'] }],
+      options: [{ additionalTestBlockFunctions: ['theoretically'], assertFunctionNames: [] }],
       errors: [
         {
           messageId: 'noAssertions',
@@ -116,7 +116,7 @@ it('example', async () => {
     },
     {
       code: 'test("should fail", () => { foo(true).toBe(true); })',
-      options: [{ assertFunctionNames: ['expect'] }],
+      options: [{ assertFunctionNames: ['expect'], additionalTestBlockFunctions: [] }],
       errors: [
         {
           messageId: 'noAssertions',
@@ -126,7 +126,7 @@ it('example', async () => {
     },
     {
       code: 'it("should also fail",() => expectSaga(mySaga).returns());',
-      options: [{ assertFunctionNames: ['expect'] }],
+      options: [{ assertFunctionNames: ['expect'], additionalTestBlockFunctions: [] }],
       errors: [
         {
           messageId: 'noAssertions',
@@ -136,7 +136,7 @@ it('example', async () => {
     },
     {
       code: 'test(\'should fail\', () => request.get().foo().expect(456));',
-      options: [{ assertFunctionNames: ['request.*.expect'] }],
+      options: [{ assertFunctionNames: ['request.*.expect'], additionalTestBlockFunctions: [] }],
       errors: [
         {
           messageId: 'noAssertions',
@@ -146,7 +146,7 @@ it('example', async () => {
     },
     {
       code: 'test(\'should fail\', () => request.get().foo().bar().expect(456));',
-      options: [{ assertFunctionNames: ['request.foo**.expect'] }],
+      options: [{ assertFunctionNames: ['request.foo**.expect'], additionalTestBlockFunctions: [] }],
       errors: [
         {
           messageId: 'noAssertions',
@@ -156,7 +156,7 @@ it('example', async () => {
     },
     {
       code: 'test(\'should fail\', () => tester.request(123));',
-      options: [{ assertFunctionNames: ['request.*'] }],
+      options: [{ assertFunctionNames: ['request.*'], additionalTestBlockFunctions: [] }],
       errors: [
         {
           messageId: 'noAssertions',
@@ -166,7 +166,7 @@ it('example', async () => {
     },
     {
       code: 'test(\'should fail\', () => request(123));',
-      options: [{ assertFunctionNames: ['request.*'] }],
+      options: [{ assertFunctionNames: ['request.*'], additionalTestBlockFunctions: [] }],
       errors: [
         {
           messageId: 'noAssertions',
@@ -176,7 +176,7 @@ it('example', async () => {
     },
     {
       code: 'test(\'should fail\', () => request(123));',
-      options: [{ assertFunctionNames: ['request.**'] }],
+      options: [{ assertFunctionNames: ['request.**'], additionalTestBlockFunctions: [] }],
       errors: [
         {
           messageId: 'noAssertions',
@@ -244,7 +244,7 @@ it('example', async () => {
        // ...
      })
        `,
-      options: [{ additionalTestBlockFunctions: ['myExtendedTest'] }],
+      options: [{ additionalTestBlockFunctions: ['myExtendedTest'], assertFunctionNames: [] }],
       languageOptions: { parserOptions: { sourceType: 'module' } },
       errors: [
         {

diff --git a/tests/unbound-method.test.ts b/tests/unbound-method.test.ts
@@ -5,11 +5,12 @@ import unboundMethod from '../src/rules/unbound-method'
 const rootPath = path.join(__dirname, './fixtures')
 
 const ruleTester = new RuleTester({
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    tsconfigRootDir: rootPath,
-    project: './tsconfig.json',
-    sourceType: 'module'
+  languageOptions: {
+    parserOptions: {
+      tsconfigRootDir: rootPath,
+      project: './tsconfig.json',
+      sourceType: 'module'
+    }
   }
 })
 
@@ -20,16 +21,16 @@ ruleTester.run('unbound-method', unboundMethod, {
    public logArrowBound = (): void => {
     console.log(bound);
    };
-  
+
    public logManualBind(): void {
     console.log(this);
    }
   }
-  
+
   const instance = new MyClass();
   const logArrowBound = instance.logArrowBound;
   const logManualBind = instance.logManualBind.bind(instance);
-  
+
   logArrowBound();
   logManualBind();`,
       skip: true
@@ -43,9 +44,9 @@ ruleTester.run('unbound-method', unboundMethod, {
    process.stdout.write(str);
     }
   }
-  
+
   const console = new Console();
-  
+
   Promise.resolve().then(console.log);
      `,
       skip: true,

diff --git a/tsconfig.json b/tsconfig.json
@@ -12,5 +12,5 @@
     "skipLibCheck": true,
     "strictNullChecks": true
  },
-  "include": ["src/**/*.ts"],
+  "include": ["src/**/*.ts","tests/**/*.ts"],
 }