Merge branch 'main' into pr/hyoban/10

package.json

@@ -94,6 +94,7 @@
     "bumpp": "^9.4.1",
     "eslint": "^9.2.0",
     "eslint-define-config": "^2.1.0",
+    "eslint-vitest-rule-tester": "^0.1.1",
     "esno": "^4.7.0",
     "fast-glob": "^3.3.2",
     "lint-staged": "^15.2.2",

src/commands/_test-utils.ts

@@ -1,30 +1,22 @@
-import { RuleTester } from 'eslint'
 import * as tsParser from '@typescript-eslint/parser'
+import type { TestCase } from 'eslint-vitest-rule-tester'
+import { createRuleTester } from 'eslint-vitest-rule-tester'
 import { createRuleWithCommands } from '../rule'
 import type { Command } from '../types'
 
-export function d(str: TemplateStringsArray) {
-  const lines = str[0].split('\n')
-  const commonIndent = lines.slice(1).reduce((min, line) => {
-    if (/^\s*$/.test(line))
-      return min
-    const indent = line.match(/^\s*/)?.[0].length
-    return indent === undefined ? min : Math.min(min, indent)
-  }, Number.POSITIVE_INFINITY)
-  return lines.map(line => line.slice(commonIndent)).join('\n')
-}
-
-type Arrayable<T> = T | T[]
+export { unindent as $ } from 'eslint-vitest-rule-tester'
 
-export interface TestCase extends RuleTester.ValidTestCase {
-  output?: string | null
-  errors?: Arrayable<string | RuleTester.TestCaseError>
-}
+export function run(command: Command | Command[], ...cases: (TestCase | string)[]) {
+  const commands = Array.isArray(command) ? command : [command]
 
-export function run(command: Command, ...cases: (TestCase | string)[]) {
-  const ruleTester: RuleTester = new RuleTester({
-    languageOptions: {
-      parser: tsParser,
+  const ruleTester = createRuleTester({
+    name: commands[0].name,
+    rule: createRuleWithCommands(commands) as any,
+    configs: {
+      languageOptions: {
+        parser: tsParser,
+      },
+      files: ['**/*.ts', '**/*.js'],
     },
   })
 
@@ -34,29 +26,12 @@ export function run(command: Command, ...cases: (TestCase | string)[]) {
   for (const c of cases) {
     if (typeof c === 'string')
       validCases.push(c)
-    else if (c.errors)
-      invalidCases.push(c)
     else
-      validCases.push(c)
+      invalidCases.push(c)
   }
 
-  ruleTester.run(
-    command.name,
-    createRuleWithCommands([command]) as any,
-    {
-      valid: validCases,
-      invalid: invalidCases.map(i => ({
-        ...i,
-        code: i.code,
-        output: i.output ?? null,
-        errors: (Array.isArray(i.errors) ? i.errors : [i.errors])
-          .filter(notFalsy)
-          .map(id => typeof id === 'string' ? ({ messageId: id }) : id),
-      })),
-    },
-  )
-}
-
-function notFalsy<T>(value: T): value is Exclude<T, null | undefined | false> {
-  return !!value
+  ruleTester.run({
+    valid: validCases,
+    invalid: invalidCases,
+  })
 }

src/commands/index.ts

@@ -10,11 +10,13 @@ import { inlineArrow } from './inline-arrow'
 import { toPromiseAll } from './to-promise-all'
 import { noShorthand } from './no-shorthand'
 import { noType } from './no-type'
+import { keepUnique } from './keep-unique'
 
 // @keep-sorted
 export {
   inlineArrow,
   keepSorted,
+  keepUnique,
   noShorthand,
   noType,
   toArrow,
@@ -31,6 +33,7 @@ export {
 export const builtinCommands = [
   inlineArrow,
   keepSorted,
+  keepUnique,
   noShorthand,
   noType,
   toArrow,

src/commands/inline-arrow.test.ts

@@ -1,19 +1,19 @@
 import { inlineArrow as command } from './inline-arrow'
-import { d, run } from './_test-utils'
+import { $, run } from './_test-utils'
 
 run(
   command,
   // no arrow function
   {
-    code: d`
+    code: $`
     ///inline-arrow
     const a = 1`,
     output: null,
     errors: 'command-error',
   },
   // multi statement
   {
-    code: d`
+    code: $`
     /// inline-arrow
     export const foo = arg => {
       const a = 1
@@ -23,30 +23,30 @@ run(
     errors: 'command-error',
   },
   {
-    code: d`
+    code: $`
     /// inline-arrow
     export const foo = <T = 1>(arg: Z): Bar => {
       return arg
     }`,
-    output: d`
+    output: $`
     export const foo = <T = 1>(arg: Z): Bar => arg`,
     errors: ['command-removal', 'command-fix'],
   },
   // no return statement
   {
-    code: d`
+    code: $`
     ///inline-arrow
     const foo = () => {}`,
-    output: d`
+    output: $`
     const foo = () => undefined`,
     errors: ['command-removal', 'command-fix'],
   },
   // without return argument
   {
-    code: d`
+    code: $`
     // /ia
     export default <T = 1>(arg: Z): Bar => { return }`,
-    output: d`
+    output: $`
     export default <T = 1>(arg: Z): Bar => undefined`,
     errors: ['command-removal', 'command-fix'],
   },