@mouse_484/eslint-config 5.4.5 → 5.5.1

package/bin/cli.js

@@ -22,8 +22,12 @@ function logger(message) {
 /**
  * @type {(...args: Parameters<typeof import("package-manager-detector/commands").resolveCommand>) => Promise<void>}
  */
-function runAgentCommand(agent, command_, args_) {
-  const { command, args } = resolveCommand(agent, command_, args_)
+async function runAgentCommand(agent, command_, args_) {
+  const result = resolveCommand(agent, command_, args_)
+  if (!result) {
+    throw new Error(`Unsupported package manager or command: ${agent} ${command_}`)
+  }
+  const { command, args } = result
   console.info(`Running command: ${command} ${args.join(' ')}`)
   return new Promise((resolve, reject) => {
     const child = spawn(
@@ -82,10 +86,14 @@ async function main() {
 
   logger('Updating package.json scripts')
   const packageJsonPath = path.join(cwd, 'package.json')
+
+  const packageJsonRaw = await readFile(packageJsonPath, 'utf8')
   /**
-   * @type {{ scripts: Record<string, string>, type?: "module" }}
+   * @type {{ scripts?: Record<string, string>, type?: "module" }}
    */
-  const packageJson = JSON.parse(await readFile(packageJsonPath, 'utf8'))
+  // eslint-disable-next-line ts/no-unsafe-assignment
+  const packageJson = JSON.parse(packageJsonRaw) ?? {}
+
   packageJson.scripts = {
     ...packageJson.scripts,
     'lint': 'eslint .',
@@ -113,10 +121,11 @@ async function main() {
     'run',
     ['lint:fix'],
   ).catch((error) => {
-    logger(`Linting failed: ${error.message}`)
+    if (error instanceof Error) {
+      logger(`Linting failed: ${error.message}`)
+    }
   })
 }
 
-console.info('---------------- Setting up @mouse_484/eslint-config ----------------')
 await main()
 console.info('---------------- Setup Complete ----------------')

package/jsconfig.json

@@ -1,10 +1,6 @@
 {
+  "extends": "../../jsconfig.json",
   "compilerOptions": {
-    "target": "ES2020",
-    "moduleResolution": "node",
-    "checkJs": true,
-    "strict": true,
-    "noEmit": true
-  },
-  "include": ["src"]
+    "module": "es2022"
+  }
 }

package/package.json

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

package/scripts/typegen.js

@@ -1,4 +1,4 @@
-import fs from 'node:fs/promises'
+import { writeFile } from 'node:fs/promises'
 import eslintPluginBetterTailwindcss from 'eslint-plugin-better-tailwindcss'
 import { pluginsToRulesDTS } from 'eslint-typegen/core'
 
@@ -6,4 +6,4 @@ const dts = await pluginsToRulesDTS({
   tailwind: eslintPluginBetterTailwindcss,
 })
 
-await fs.writeFile('./src/lib/rules.gen.d.ts', dts)
+await writeFile('./src/lib/rules.gen.d.ts', dts)

package/src/configs/tailwind.js

@@ -6,7 +6,7 @@ export default createConfigs({
   baseWithOption: 'tailwind',
   configs: [
     (meta) => {
-      if (!meta?.entryPoint) return
+      if (meta?.entryPoint === undefined) return
 
       return {
         name: 'tailwind',

package/src/configs/typescript.js

@@ -6,7 +6,7 @@ export default createConfigs({
   baseWithOption: 'typescript',
   configs: [
     (meta) => {
-      if (meta && 'tsconfigPath' in meta && meta.tsconfigPath) {
+      if (meta && 'tsconfigPath' in meta && meta.tsconfigPath !== undefined) {
         return {
           name: 'type-aware',
           files: [GLOB_TS],

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,6 +23,11 @@ type Config = Awaitable<
 >
 export interface Options extends OptionsConfig, Omit<TypedFlatConfigItem, 'files'> {
   tailwind?: false | { entryPoint: string }
+  typescript?: boolean
+    | OptionsTypescript
+    | (OptionsTypeScriptWithTypes & { allowJS?: boolean })
+    & OptionsOverrides
+    & OptionsTypeScriptErasableOnly
 }
 
 export declare function mouse(

package/src/index.js

@@ -1,4 +1,4 @@
-import antfu from '@antfu/eslint-config'
+import antfu, { GLOB_JS, GLOB_JSX } from '@antfu/eslint-config'
 import astro from './configs/astro.js'
 import base from './configs/base.js'
 import perfectionist from './configs/perfectionist.js'
@@ -37,7 +37,29 @@ async function mouse(options, ...userConfigs) {
     ignores: typeof options?.ignores === 'function' ? options.ignores([]) : options?.ignores,
   }
 
-  return antfu(normalizedOptions, ...configs, ...userConfigs)
+  const composer = antfu(normalizedOptions, ...configs, ...userConfigs)
+
+  /**
+   * Override TypeScript configs for JS/JSX files if `allowJS` is enabled.
+   */
+  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 composer
 }
 
 export default mouse

package/src/lib/factory.js

@@ -1,7 +1,7 @@
 /**
  *
  * @param {string} name
- * @param {(keyof import('..').Options)[]} withOptions
+ * @param {(keyof import('..').Options)[]?} withOptions
  * @param {Omit<import('@antfu/eslint-config').TypedFlatConfigItem,'name'>} config
  * @returns {(options: import('..').Options) => import('@antfu/eslint-config').TypedFlatConfigItem|[]} _
  */
@@ -29,10 +29,10 @@ export function createConfigs({ name, baseWithOption, configs }) {
           throw new Error('baseWithOption is required when configItem is a function')
         }
         const meta = options[baseWithOption]
-        // @ts-ignore
-        configItem = configItem(typeof meta === 'object' ? meta : undefined) ?? {}
+        // @ts-expect-error: may be undefined
+        configItem = configItem(typeof meta === 'object' ? meta : undefined)
       }
-      if (!configItem) {
+      if (configItem === undefined) {
         return []
       }
       const { name: configName, withOptions = [], ...restConfig } = configItem