@mouse_484/eslint-config 5.3.8 → 5.4.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mouse_484/eslint-config",
   "type": "module",
-  "version": "5.3.8",
+  "version": "5.4.0",
   "author": "mouse_484",
   "license": "MIT",
   "homepage": "https://github.com/mouse484/config/tree/main/packages/eslint",

package/src/configs/tailwind.js

@@ -6,28 +6,38 @@ export default createConfigs({
   baseWithOption: 'tailwind',
   configs: [
     (meta) => {
+      if (!meta?.entryPoint) return
+
       return {
         name: 'tailwind',
         plugins: {
           tailwind: eslintPluginBetterTailwindcss,
         },
         rules: {
-          // stylistic
-          'tailwind/multiline': ['warn', {
+          // Stylistic rules
+          'tailwind/enforce-consistent-line-wrapping': ['warn', {
             group: 'newLine',
           }],
-          'tailwind/no-unnecessary-whitespace': 'warn',
-          'tailwind/sort-classes': 'warn',
+          'tailwind/enforce-consistent-class-order': ['warn', {
+            order: 'improved',
+          }],
+          'tailwind/enforce-consistent-variable-syntax': 'warn',
+          'tailwind/enforce-consistent-important-position': 'error',
+          'tailwind/enforce-shorthand-classes': 'warn',
           'tailwind/no-duplicate-classes': 'error',
-          'tailwind/enforce-consistent-variable-syntax': 'error',
-          // correctness
-          'tailwind/no-unregistered-classes': 'off', // FIXME
+          'tailwind/no-deprecated-classes': 'error',
+          'tailwind/no-unnecessary-whitespace': 'warn',
+          // Correctness rules
+          'tailwind/no-unregistered-classes': ['error', {
+            ignore: [],
+            detectComponentClasses: true,
+          }],
           'tailwind/no-conflicting-classes': 'error',
-          'tailwind/no-restricted-classes': 'off',
+          'tailwind/no-restricted-classes': 'off', // arbitrary valuesの制限を今後検討
         },
         settings: {
-          tailwind: {
-            entryPoint: meta?.entryPoint,
+          'better-tailwindcss': {
+            entryPoint: meta.entryPoint,
           },
         },
       }

package/src/configs/typescript.js

@@ -0,0 +1,20 @@
+import { GLOB_TS } from '@antfu/eslint-config'
+import { createConfigs } from '../lib/factory.js'
+
+export default createConfigs({
+  name: 'typescript',
+  baseWithOption: 'typescript',
+  configs: [
+    (meta) => {
+      if (meta && 'tsconfigPath' in meta && meta.tsconfigPath) {
+        return {
+          name: 'type-aware',
+          files: [GLOB_TS],
+          rules: {
+            'ts/no-deprecated': 'error',
+          },
+        }
+      }
+    },
+  ],
+})

package/src/index.d.ts

@@ -1,15 +1,28 @@
-import type antfu from '@antfu/eslint-config'
+import type {
+  TypedFlatConfigItem as AntfuTypedFlatConfigItem,
+  OptionsConfig,
+  Rules,
+} from '@antfu/eslint-config'
+import type { Linter } from 'eslint'
+import type { FlatConfigComposer } from 'eslint-flat-config-utils'
+import type { RuleOptions } from './lib/rules.gen'
 
-type AntfuParameters = Parameters<typeof antfu>
-type AntfuOptions = AntfuParameters['0']
-type AntfuUserConfigs = AntfuParameters['1'][]
-
-export type Options = AntfuOptions & {
-  tailwind?: boolean | { entryPoint?: string }
+type Awaitable<T> = T | Promise<T>
+export interface TypedFlatConfigItem extends Omit<AntfuTypedFlatConfigItem, 'rules'> {
+  rules?: Rules & RuleOptions
+}
+type Config = Awaitable<
+  TypedFlatConfigItem
+  | TypedFlatConfigItem[]
+  | FlatConfigComposer<any, any>
+  | Linter.Config[]
+>
+export interface Options extends OptionsConfig, Omit<TypedFlatConfigItem, 'files'> {
+  tailwind?: false | { entryPoint: string }
 }
 
 export declare function mouse(
   options?: Options,
-  ...configs: AntfuUserConfigs
+  ...configs: Config[]
 ): ReturnType<typeof antfu>
 export default mouse

package/src/index.js

@@ -5,6 +5,7 @@ import perfectionist from './configs/perfectionist.js'
 import stylistic from './configs/stylistic.js'
 import svelte from './configs/svelte.js'
 import tailwind from './configs/tailwind.js'
+import typescript from './configs/typescript.js'
 import unicorn from './configs/unicorn.js'
 
 /** @type {import('.').mouse} */
@@ -25,6 +26,7 @@ async function mouse(options, ...userConfigs) {
     ...unicorn(options),
     ...perfectionist(options),
     // Language specific
+    ...typescript(options),
     ...astro(options),
     ...svelte(options),
     // Tools

package/src/lib/factory.d.ts

@@ -1,16 +1,16 @@
-import type { Rules, TypedFlatConfigItem } from '@antfu/eslint-config'
-import type { Options } from '..'
-import type { RuleOptions } from './rules.gen'
+import type { Options, TypedFlatConfigItem } from '..'
 
 interface ConfigItem extends TypedFlatConfigItem {
   withOptions?: (keyof Options)[]
   name: string
-  rules?: Rules & RuleOptions
 }
 
 type OnlyObject<T> = T extends object ? T : never
 export declare function createConfigs<T extends keyof Options = undefined>(parameters: {
   name: string
   baseWithOption?: T
-  configs: (ConfigItem | ((meta?: OnlyObject<Options[T]>) => ConfigItem))[]
+  configs: (
+    ConfigItem
+    | ((meta?: OnlyObject<Options[T]>) => ConfigItem)
+  )[]
 }): (options: Options) => TypedFlatConfigItem[]

package/src/lib/factory.js

@@ -30,7 +30,10 @@ export function createConfigs({ name, baseWithOption, configs }) {
         }
         const meta = options[baseWithOption]
         // @ts-ignore
-        configItem = configItem(typeof meta === 'object' ? meta : undefined)
+        configItem = configItem(typeof meta === 'object' ? meta : undefined) ?? {}
+      }
+      if (!configItem) {
+        return []
       }
       const { name: configName, withOptions = [], ...restConfig } = configItem
       return createConfig(