@mouse_484/eslint-config 5.5.0 → 5.5.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mouse_484/eslint-config",
   "type": "module",
-  "version": "5.5.0",
+  "version": "5.5.2",
   "author": "mouse_484",
   "license": "MIT",
   "homepage": "https://github.com/mouse484/config/tree/main/packages/eslint",
@@ -24,7 +24,7 @@
     "typegen": "node scripts/typegen.js"
   },
   "dependencies": {
-    "@antfu/eslint-config": "^6.1.0",
+    "@antfu/eslint-config": "^6.2.0",
     "eslint-plugin-better-tailwindcss": "^3.7.10",
     "package-manager-detector": "^1.5.0"
   },

package/src/index.d.ts

@@ -1,6 +1,10 @@
 import type {
   TypedFlatConfigItem as AntfuTypedFlatConfigItem,
   OptionsConfig,
+  OptionsOverrides,
+  OptionsTypescript,
+  OptionsTypeScriptErasableOnly,
+  OptionsTypeScriptWithTypes,
   Rules,
 } from '@antfu/eslint-config'
 import type { Linter } from 'eslint'
@@ -19,9 +23,11 @@ type Config = Awaitable<
 >
 export interface Options extends OptionsConfig, Omit<TypedFlatConfigItem, 'files'> {
   tailwind?: false | { entryPoint: string }
-  typescript?: OptionsConfig['typescript'] & {
-    allowJS?: boolean
-  }
+  typescript?: boolean
+    | OptionsTypescript
+    | (OptionsTypeScriptWithTypes & { allowJS?: boolean })
+    & OptionsOverrides
+    & OptionsTypeScriptErasableOnly
 }
 
 export declare function mouse(

package/src/index.js

@@ -37,27 +37,29 @@ async function mouse(options, ...userConfigs) {
     ignores: typeof options?.ignores === 'function' ? options.ignores([]) : options?.ignores,
   }
 
+  const composer = antfu(normalizedOptions, ...configs, ...userConfigs)
+
   /**
-   *
-   * @param {import("eslint").Linter.Config} config
+   * Override TypeScript configs for JS/JSX files if `allowJS` is enabled.
    */
-  const overrideTypeScriptAllowJS = (config) => {
-    if (!options?.typescript?.allowJS) {
-      return config
-    }
-    return {
-      ...config,
-      files: [...(config.files ?? []), GLOB_JS, GLOB_JSX],
+  if (
+    typeof options.typescript === 'object'
+    && 'allowJS' in options.typescript
+    && options.typescript.allowJS
+  ) {
+    /** @type {import("eslint").Linter.Config} */
+    const overrideTypeScriptAllowJS = { files: [GLOB_JS, GLOB_JSX] }
+
+    await composer.override('antfu/typescript/parser', overrideTypeScriptAllowJS)
+    await composer.override('antfu/typescript/rules', overrideTypeScriptAllowJS)
+
+    if (options.typescript.tsconfigPath !== undefined) {
+      await composer.override('antfu/typescript/type-aware-parser', overrideTypeScriptAllowJS)
+      await composer.override('antfu/typescript/rules-type-aware', overrideTypeScriptAllowJS)
     }
   }
 
-  return antfu(normalizedOptions, ...configs, ...userConfigs)
-    .overrides({
-      'antfu/typescript/parser': overrideTypeScriptAllowJS,
-      'antfu/typescript/type-aware-parser': overrideTypeScriptAllowJS,
-      'antfu/typescript/rules': overrideTypeScriptAllowJS,
-      'antfu/typescript/rules-type-aware': overrideTypeScriptAllowJS,
-    })
+  return composer
 }
 
 export default mouse