@pengzhanbo/eslint-config 1.4.0 → 1.5.0

package/dist/index.cjs

@@ -63,6 +63,7 @@ __export(src_exports, {
   default: () => src_default,
   defaultPreset: () => defaultPreset,
   formatters: () => formatters,
+  getOverrides: () => getOverrides,
   html: () => html,
   ignores: () => ignores,
   imports: () => imports,
@@ -82,6 +83,7 @@ __export(src_exports, {
   pluginUnicorn: () => import_eslint_plugin_unicorn.default,
   pluginUnusedImports: () => import_eslint_plugin_unused_imports.default,
   renameRules: () => renameRules,
+  resolveSubOptions: () => resolveSubOptions,
   sortPackageJson: () => sortPackageJson,
   sortTsconfig: () => sortTsconfig,
   stylistic: () => stylistic,
@@ -265,6 +267,7 @@ async function imports(options = {}) {
       },
       rules: {
         "antfu/import-dedupe": "error",
+        "antfu/no-import-dist": "error",
         "antfu/no-import-node-modules-by-path": "error",
         "import/first": "error",
         "import/no-duplicates": "error",
@@ -277,6 +280,14 @@ async function imports(options = {}) {
           "import/newline-after-import": ["error", { considerComments: true, count: 1 }]
         } : {}
       }
+    },
+    {
+      files: ["**/bin/**/*", `**/bin.${GLOB_SRC_EXT}`],
+      name: "antfu:imports:bin",
+      rules: {
+        "antfu/no-import-dist": "off",
+        "antfu/no-import-node-modules-by-path": "off"
+      }
     }
   ];
 }
@@ -951,6 +962,7 @@ async function stylistic(options = {}) {
   const {
     indent,
     jsx,
+    overrides = {},
     quotes,
     semi
   } = {
@@ -978,7 +990,8 @@ async function stylistic(options = {}) {
         "antfu/consistent-list-newline": "error",
         "antfu/if-newline": "error",
         "antfu/top-level-function": "error",
-        "curly": ["error", "multi-or-nest", "consistent"]
+        "curly": ["error", "multi-or-nest", "consistent"],
+        ...overrides
       }
     }
   ];
@@ -996,6 +1009,7 @@ async function typescript(options = {}) {
     GLOB_SRC,
     ...componentExts.map((ext) => `**/*.${ext}`)
   ];
+  const filesTypeAware = options.filesTypeAware ?? [GLOB_TS, GLOB_TSX];
   const typeAwareRules = {
     "dot-notation": "off",
     "no-implied-eval": "off",
@@ -1085,6 +1099,13 @@ async function typescript(options = {}) {
         "ts/prefer-ts-expect-error": "error",
         "ts/triple-slash-reference": "off",
         "ts/unified-signatures": "off",
+        ...overrides
+      }
+    },
+    {
+      files: filesTypeAware,
+      name: "config:typescript:rules-type-aware",
+      rules: {
         ...tsconfigPath ? typeAwareRules : {},
         ...overrides
       }
@@ -1519,7 +1540,7 @@ async function formatters(options = {}, stylistic2 = {}) {
   const pluginFormat = await interopDefault(import("eslint-plugin-format"));
   const configs = [
     {
-      name: "antfu:formatters:setup",
+      name: "config:formatters:setup",
       plugins: {
         format: pluginFormat
       }
@@ -1532,7 +1553,7 @@ async function formatters(options = {}, stylistic2 = {}) {
         languageOptions: {
           parser: parserPlain
         },
-        name: "antfu:formatter:css",
+        name: "config:formatter:css",
         rules: {
           "format/prettier": [
             "error",
@@ -1548,7 +1569,7 @@ async function formatters(options = {}, stylistic2 = {}) {
         languageOptions: {
           parser: parserPlain
         },
-        name: "antfu:formatter:scss",
+        name: "config:formatter:scss",
         rules: {
           "format/prettier": [
             "error",
@@ -1564,7 +1585,7 @@ async function formatters(options = {}, stylistic2 = {}) {
         languageOptions: {
           parser: parserPlain
         },
-        name: "antfu:formatter:less",
+        name: "config:formatter:less",
         rules: {
           "format/prettier": [
             "error",
@@ -1583,7 +1604,7 @@ async function formatters(options = {}, stylistic2 = {}) {
       languageOptions: {
         parser: parserPlain
       },
-      name: "antfu:formatter:html",
+      name: "config:formatter:html",
       rules: {
         "format/prettier": [
           "error",
@@ -1602,11 +1623,12 @@ async function formatters(options = {}, stylistic2 = {}) {
       languageOptions: {
         parser: parserPlain
       },
-      name: "antfu:formatter:markdown",
+      name: "config:formatter:markdown",
       rules: {
         [`format/${formater}`]: [
           "error",
           formater === "prettier" ? {
+            printWidth: 120,
             ...prettierOptions,
             embeddedLanguageFormatting: "off",
             parser: "markdown"
@@ -1624,7 +1646,7 @@ async function formatters(options = {}, stylistic2 = {}) {
       languageOptions: {
         parser: parserPlain
       },
-      name: "antfu:formatter:graphql",
+      name: "config:formatter:graphql",
       rules: {
         "format/prettier": [
           "error",
@@ -1645,7 +1667,6 @@ var defaultPreset = (options) => {
     componentExts,
     gitignore: enableGitignore,
     isInEditor,
-    overrides,
     typescript: enableTypeScript,
     stylistic: stylisticOptions
   } = options;
@@ -1667,7 +1688,7 @@ var defaultPreset = (options) => {
     ignores(),
     javascript({
       isInEditor,
-      overrides: overrides.javascript
+      overrides: getOverrides(options, "javascript")
     }),
     comments(),
     node(),
@@ -1683,23 +1704,26 @@ var defaultPreset = (options) => {
   );
   if (enableTypeScript) {
     configs.push(typescript({
-      ...typeof enableTypeScript !== "boolean" ? enableTypeScript : {},
-      componentExts,
-      overrides: overrides.typescript
+      ...resolveSubOptions(options, "typescript"),
+      componentExts
+    }));
+  }
+  if (stylisticOptions) {
+    configs.push(stylistic({
+      ...typeof stylisticOptions === "boolean" ? {} : stylisticOptions,
+      overrides: getOverrides(options, "stylistic")
     }));
   }
-  if (stylisticOptions)
-    configs.push(stylistic(stylisticOptions));
   if (options.test) {
     configs.push(test({
       isInEditor,
-      overrides: overrides.test
+      overrides: getOverrides(options, "test")
     }));
   }
   if (options.jsonc) {
     configs.push(
       jsonc({
-        overrides: overrides.jsonc,
+        overrides: getOverrides(options, "jsonc"),
         stylistic: stylisticOptions
       }),
       sortPackageJson(),
@@ -1708,31 +1732,39 @@ var defaultPreset = (options) => {
   }
   if (options.yaml) {
     configs.push(yaml({
-      overrides: overrides.yaml,
+      overrides: getOverrides(options, "yaml"),
       stylistic: stylisticOptions
     }));
   }
   if (options.toml) {
     configs.push(toml({
-      overrides: overrides.toml,
+      overrides: getOverrides(options, "toml"),
       stylistic: stylisticOptions
     }));
   }
   if (options.html) {
     configs.push(html({
-      overrides: overrides.html,
+      overrides: getOverrides(options, "html"),
       stylistic: stylisticOptions
     }));
   }
-  if (options.unocss)
-    configs.push(unocss(options.unocss === true ? {} : options.unocss));
-  if (options.tailwindcss)
-    configs.push(tailwindcss(options.tailwindcss === true ? {} : options.tailwindcss));
+  if (options.unocss) {
+    configs.push(unocss({
+      ...resolveSubOptions(options, "unocss"),
+      overrides: getOverrides(options, "unocss")
+    }));
+  }
+  if (options.tailwindcss) {
+    configs.push(tailwindcss({
+      ...resolveSubOptions(options, "tailwindcss"),
+      overrides: getOverrides(options, "tailwindcss")
+    }));
+  }
   if (options.markdown) {
     configs.push(
       markdown({
         componentExts,
-        overrides: overrides.markdown
+        overrides: getOverrides(options, "markdown")
       })
     );
   }
@@ -1759,8 +1791,7 @@ function resolveOptions(options = {}) {
     componentExts = [],
     preset = [],
     gitignore = true,
-    isInEditor = !!((import_node_process2.default.env.VSCODE_PID || import_node_process2.default.env.JETBRAINS_IDE) && !import_node_process2.default.env.CI),
-    overrides = {},
+    isInEditor = !!((import_node_process2.default.env.VSCODE_PID || import_node_process2.default.env.JETBRAINS_IDE || import_node_process2.default.env.VIM) && !import_node_process2.default.env.CI),
     typescript: typescript2 = (0, import_local_pkg4.isPackageExists)("typescript"),
     jsx = true,
     test: test2 = true,
@@ -1790,7 +1821,6 @@ function resolveOptions(options = {}) {
     preset,
     gitignore,
     isInEditor,
-    overrides,
     typescript: typescript2,
     stylistic: stylistic2,
     jsx,
@@ -1845,6 +1875,16 @@ function createConfig(preset) {
     return eslintFlatConfig(options, ...userConfigs);
   };
 }
+function resolveSubOptions(options, key) {
+  return typeof options[key] === "boolean" ? {} : options[key] || {};
+}
+function getOverrides(options, key) {
+  const sub = resolveSubOptions(options, key);
+  return {
+    ...options.overrides?.[key],
+    ..."overrides" in sub ? sub.overrides || {} : {}
+  };
+}
 
 // src/index.ts
 var src_default = eslintFlatConfig;
@@ -1882,6 +1922,7 @@ var src_default = eslintFlatConfig;
   createConfig,
   defaultPreset,
   formatters,
+  getOverrides,
   html,
   ignores,
   imports,
@@ -1901,6 +1942,7 @@ var src_default = eslintFlatConfig;
   pluginUnicorn,
   pluginUnusedImports,
   renameRules,
+  resolveSubOptions,
   sortPackageJson,
   sortTsconfig,
   stylistic,

package/dist/index.d.cts

@@ -21,6 +21,11 @@ export { default as pluginPerfectionist } from 'eslint-plugin-perfectionist';
  */
 type VendoredPrettierOptions = Partial<VendoredPrettierOptionsRequired>;
 interface VendoredPrettierOptionsRequired {
+    /**
+     * Specify the line length that the printer will wrap on.
+     * @default 120
+     */
+    printWidth: number;
     /**
      * Specify the number of spaces per indentation-level.
      */
@@ -192,7 +197,13 @@ interface OptionsTypeScriptParserOptions {
      * Additional parser options for TypeScript.
      */
     parserOptions?: Partial<ParserOptions>;
+    /**
+     * Glob patterns for files that should be type aware.
+     * @default ['**\/*.{ts,tsx}']
+     */
+    filesTypeAware?: string[];
 }
+type OptionsTypescript = (OptionsTypeScriptWithTypes & OptionsOverrides) | (OptionsTypeScriptParserOptions & OptionsOverrides);
 interface OptionsTypeScriptWithTypes {
     /**
      * When this options is provided, type aware rules will be enabled.
@@ -214,7 +225,7 @@ interface OptionsOverrides {
 interface OptionsIsInEditor {
     isInEditor?: boolean;
 }
-interface OptionsUnoCSS {
+interface OptionsUnoCSS extends OptionsOverrides {
     /**
      * Enable attributify support.
      * @default true
@@ -226,7 +237,7 @@ interface OptionsUnoCSS {
      */
     strict?: boolean;
 }
-interface OptionsTailwindCSS {
+interface OptionsTailwindCSS extends OptionsOverrides {
     /**
      * Read CSS files
      */
@@ -246,9 +257,7 @@ interface OptionsTailwindCSS {
      */
     customClassNames?: boolean;
 }
-type PresetItem = (options: Required<Omit<OptionsConfig, 'preset'>> & {
-    stylistic: false | StylisticConfig;
-}) => Awaitable<FlatConfigItem[]>[];
+type PresetItem = (options: Required<Omit<OptionsConfig, 'preset'>>) => Awaitable<FlatConfigItem[]>[];
 interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
     /**
      * Enable gitignore support.
@@ -267,6 +276,10 @@ interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
      * default: [defaultPreset]
      */
     preset?: PresetItem[];
+    /**
+     * Core rules. Can't be disabled.
+     */
+    javascript?: OptionsOverrides;
     /**
      * Enable TypeScript support.
      *
@@ -274,7 +287,7 @@ interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
      *
      * @default auto-detect based on the dependencies
      */
-    typescript?: boolean | OptionsTypeScriptWithTypes | OptionsTypeScriptParserOptions;
+    typescript?: boolean | OptionsTypescript;
     /**
      * Enable JSX related rules.
      *
@@ -288,23 +301,23 @@ interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
      *
      * @default true
      */
-    test?: boolean;
+    test?: boolean | OptionsOverrides;
     /**
      * Enable JSONC support.
      *
      * @default true
      */
-    jsonc?: boolean;
+    jsonc?: boolean | OptionsOverrides;
     /**
      * Enable TOML support.
      */
-    toml?: boolean;
+    toml?: boolean | OptionsOverrides;
     /**
      * Enable YAML support.
      *
      * @default true
      */
-    yaml?: boolean;
+    yaml?: boolean | OptionsOverrides;
     /**
      * Enable Markdown support.
      *
@@ -315,7 +328,7 @@ interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
     /**
      * Enable HTML support.
      */
-    html?: boolean;
+    html?: boolean | OptionsOverrides;
     /**
      * Enable stylistic rules.
      *
@@ -356,6 +369,8 @@ interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
     isInEditor?: boolean;
     /**
      * Provide overrides for rules for each integration.
+     *
+     * @deprecated use `overrides` option in each integration key instead
      */
     overrides?: {
         html?: FlatConfigItem['rules'];
@@ -377,6 +392,9 @@ interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
 
 declare function eslintFlatConfig(options?: OptionsConfig & FlatConfigItem, ...userConfigs: Awaitable<UserConfigItem | UserConfigItem[]>[]): Promise<UserConfigItem[]>;
 declare function createConfig(preset: PresetItem | PresetItem[]): typeof eslintFlatConfig;
+type ResolvedOptions<T> = T extends boolean ? never : NonNullable<T>;
+declare function resolveSubOptions<K extends keyof OptionsConfig>(options: OptionsConfig, key: K): ResolvedOptions<OptionsConfig[K]>;
+declare function getOverrides<K extends keyof OptionsConfig>(options: OptionsConfig, key: K): any;
 
 declare const parserPlain: {
     meta: {
@@ -472,7 +490,7 @@ declare function sortPackageJson(): Promise<FlatConfigItem[]>;
 declare function sortTsconfig(): FlatConfigItem[];
 
 declare const StylisticConfigDefaults: StylisticConfig;
-declare function stylistic(options?: StylisticConfig): Promise<FlatConfigItem[]>;
+declare function stylistic(options?: StylisticConfig & OptionsOverrides): Promise<FlatConfigItem[]>;
 
 declare function typescript(options?: OptionsFiles & OptionsComponentExts & OptionsOverrides & OptionsTypeScriptWithTypes & OptionsTypeScriptParserOptions): Promise<FlatConfigItem[]>;
 
@@ -501,4 +519,4 @@ declare function formatters(options?: OptionsFormatters | true, stylistic?: Styl
 
 declare const defaultPreset: PresetItem;
 
-export { type Awaitable, type FlatConfigItem, GLOB_ALL_SRC, GLOB_ASTRO, GLOB_CSS, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_IN_MARKDOWN, GLOB_POSTCSS, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_SVELTE, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_YAML, type OptionsComponentExts, type OptionsConfig, type OptionsFiles, type OptionsFormatters, type OptionsFrameworkExtract, type OptionsHasTypeScript, type OptionsIsInEditor, type OptionsOverrides, type OptionsStylistic, type OptionsTailwindCSS, type OptionsTypeScriptParserOptions, type OptionsTypeScriptWithTypes, type OptionsUnoCSS, type PresetItem, type Rules, type StylisticConfig, StylisticConfigDefaults, type UserConfigItem, type WrapRuleConfig, combine, comments, createConfig, eslintFlatConfig as default, defaultPreset, formatters, html, ignores, imports, interopDefault, javascript, jsdoc, jsonc, markdown, node, parserPlain, perfectionist, renameRules, sortPackageJson, sortTsconfig, stylistic, tailwindcss, test, toArray, toml, typescript, unicorn, unocss, yaml };
+export { type Awaitable, type FlatConfigItem, GLOB_ALL_SRC, GLOB_ASTRO, GLOB_CSS, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_IN_MARKDOWN, GLOB_POSTCSS, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_SVELTE, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_YAML, type OptionsComponentExts, type OptionsConfig, type OptionsFiles, type OptionsFormatters, type OptionsFrameworkExtract, type OptionsHasTypeScript, type OptionsIsInEditor, type OptionsOverrides, type OptionsStylistic, type OptionsTailwindCSS, type OptionsTypeScriptParserOptions, type OptionsTypeScriptWithTypes, type OptionsTypescript, type OptionsUnoCSS, type PresetItem, type Rules, type StylisticConfig, StylisticConfigDefaults, type UserConfigItem, type WrapRuleConfig, combine, comments, createConfig, eslintFlatConfig as default, defaultPreset, formatters, getOverrides, html, ignores, imports, interopDefault, javascript, jsdoc, jsonc, markdown, node, parserPlain, perfectionist, renameRules, resolveSubOptions, sortPackageJson, sortTsconfig, stylistic, tailwindcss, test, toArray, toml, typescript, unicorn, unocss, yaml };

package/dist/index.d.ts

@@ -21,6 +21,11 @@ export { default as pluginPerfectionist } from 'eslint-plugin-perfectionist';
  */
 type VendoredPrettierOptions = Partial<VendoredPrettierOptionsRequired>;
 interface VendoredPrettierOptionsRequired {
+    /**
+     * Specify the line length that the printer will wrap on.
+     * @default 120
+     */
+    printWidth: number;
     /**
      * Specify the number of spaces per indentation-level.
      */
@@ -192,7 +197,13 @@ interface OptionsTypeScriptParserOptions {
      * Additional parser options for TypeScript.
      */
     parserOptions?: Partial<ParserOptions>;
+    /**
+     * Glob patterns for files that should be type aware.
+     * @default ['**\/*.{ts,tsx}']
+     */
+    filesTypeAware?: string[];
 }
+type OptionsTypescript = (OptionsTypeScriptWithTypes & OptionsOverrides) | (OptionsTypeScriptParserOptions & OptionsOverrides);
 interface OptionsTypeScriptWithTypes {
     /**
      * When this options is provided, type aware rules will be enabled.
@@ -214,7 +225,7 @@ interface OptionsOverrides {
 interface OptionsIsInEditor {
     isInEditor?: boolean;
 }
-interface OptionsUnoCSS {
+interface OptionsUnoCSS extends OptionsOverrides {
     /**
      * Enable attributify support.
      * @default true
@@ -226,7 +237,7 @@ interface OptionsUnoCSS {
      */
     strict?: boolean;
 }
-interface OptionsTailwindCSS {
+interface OptionsTailwindCSS extends OptionsOverrides {
     /**
      * Read CSS files
      */
@@ -246,9 +257,7 @@ interface OptionsTailwindCSS {
      */
     customClassNames?: boolean;
 }
-type PresetItem = (options: Required<Omit<OptionsConfig, 'preset'>> & {
-    stylistic: false | StylisticConfig;
-}) => Awaitable<FlatConfigItem[]>[];
+type PresetItem = (options: Required<Omit<OptionsConfig, 'preset'>>) => Awaitable<FlatConfigItem[]>[];
 interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
     /**
      * Enable gitignore support.
@@ -267,6 +276,10 @@ interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
      * default: [defaultPreset]
      */
     preset?: PresetItem[];
+    /**
+     * Core rules. Can't be disabled.
+     */
+    javascript?: OptionsOverrides;
     /**
      * Enable TypeScript support.
      *
@@ -274,7 +287,7 @@ interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
      *
      * @default auto-detect based on the dependencies
      */
-    typescript?: boolean | OptionsTypeScriptWithTypes | OptionsTypeScriptParserOptions;
+    typescript?: boolean | OptionsTypescript;
     /**
      * Enable JSX related rules.
      *
@@ -288,23 +301,23 @@ interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
      *
      * @default true
      */
-    test?: boolean;
+    test?: boolean | OptionsOverrides;
     /**
      * Enable JSONC support.
      *
      * @default true
      */
-    jsonc?: boolean;
+    jsonc?: boolean | OptionsOverrides;
     /**
      * Enable TOML support.
      */
-    toml?: boolean;
+    toml?: boolean | OptionsOverrides;
     /**
      * Enable YAML support.
      *
      * @default true
      */
-    yaml?: boolean;
+    yaml?: boolean | OptionsOverrides;
     /**
      * Enable Markdown support.
      *
@@ -315,7 +328,7 @@ interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
     /**
      * Enable HTML support.
      */
-    html?: boolean;
+    html?: boolean | OptionsOverrides;
     /**
      * Enable stylistic rules.
      *
@@ -356,6 +369,8 @@ interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
     isInEditor?: boolean;
     /**
      * Provide overrides for rules for each integration.
+     *
+     * @deprecated use `overrides` option in each integration key instead
      */
     overrides?: {
         html?: FlatConfigItem['rules'];
@@ -377,6 +392,9 @@ interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
 
 declare function eslintFlatConfig(options?: OptionsConfig & FlatConfigItem, ...userConfigs: Awaitable<UserConfigItem | UserConfigItem[]>[]): Promise<UserConfigItem[]>;
 declare function createConfig(preset: PresetItem | PresetItem[]): typeof eslintFlatConfig;
+type ResolvedOptions<T> = T extends boolean ? never : NonNullable<T>;
+declare function resolveSubOptions<K extends keyof OptionsConfig>(options: OptionsConfig, key: K): ResolvedOptions<OptionsConfig[K]>;
+declare function getOverrides<K extends keyof OptionsConfig>(options: OptionsConfig, key: K): any;
 
 declare const parserPlain: {
     meta: {
@@ -472,7 +490,7 @@ declare function sortPackageJson(): Promise<FlatConfigItem[]>;
 declare function sortTsconfig(): FlatConfigItem[];
 
 declare const StylisticConfigDefaults: StylisticConfig;
-declare function stylistic(options?: StylisticConfig): Promise<FlatConfigItem[]>;
+declare function stylistic(options?: StylisticConfig & OptionsOverrides): Promise<FlatConfigItem[]>;
 
 declare function typescript(options?: OptionsFiles & OptionsComponentExts & OptionsOverrides & OptionsTypeScriptWithTypes & OptionsTypeScriptParserOptions): Promise<FlatConfigItem[]>;
 
@@ -501,4 +519,4 @@ declare function formatters(options?: OptionsFormatters | true, stylistic?: Styl
 
 declare const defaultPreset: PresetItem;
 
-export { type Awaitable, type FlatConfigItem, GLOB_ALL_SRC, GLOB_ASTRO, GLOB_CSS, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_IN_MARKDOWN, GLOB_POSTCSS, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_SVELTE, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_YAML, type OptionsComponentExts, type OptionsConfig, type OptionsFiles, type OptionsFormatters, type OptionsFrameworkExtract, type OptionsHasTypeScript, type OptionsIsInEditor, type OptionsOverrides, type OptionsStylistic, type OptionsTailwindCSS, type OptionsTypeScriptParserOptions, type OptionsTypeScriptWithTypes, type OptionsUnoCSS, type PresetItem, type Rules, type StylisticConfig, StylisticConfigDefaults, type UserConfigItem, type WrapRuleConfig, combine, comments, createConfig, eslintFlatConfig as default, defaultPreset, formatters, html, ignores, imports, interopDefault, javascript, jsdoc, jsonc, markdown, node, parserPlain, perfectionist, renameRules, sortPackageJson, sortTsconfig, stylistic, tailwindcss, test, toArray, toml, typescript, unicorn, unocss, yaml };
+export { type Awaitable, type FlatConfigItem, GLOB_ALL_SRC, GLOB_ASTRO, GLOB_CSS, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_IN_MARKDOWN, GLOB_POSTCSS, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_SVELTE, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_YAML, type OptionsComponentExts, type OptionsConfig, type OptionsFiles, type OptionsFormatters, type OptionsFrameworkExtract, type OptionsHasTypeScript, type OptionsIsInEditor, type OptionsOverrides, type OptionsStylistic, type OptionsTailwindCSS, type OptionsTypeScriptParserOptions, type OptionsTypeScriptWithTypes, type OptionsTypescript, type OptionsUnoCSS, type PresetItem, type Rules, type StylisticConfig, StylisticConfigDefaults, type UserConfigItem, type WrapRuleConfig, combine, comments, createConfig, eslintFlatConfig as default, defaultPreset, formatters, getOverrides, html, ignores, imports, interopDefault, javascript, jsdoc, jsonc, markdown, node, parserPlain, perfectionist, renameRules, resolveSubOptions, sortPackageJson, sortTsconfig, stylistic, tailwindcss, test, toArray, toml, typescript, unicorn, unocss, yaml };

package/dist/index.js

@@ -167,6 +167,7 @@ async function imports(options = {}) {
       },
       rules: {
         "antfu/import-dedupe": "error",
+        "antfu/no-import-dist": "error",
         "antfu/no-import-node-modules-by-path": "error",
         "import/first": "error",
         "import/no-duplicates": "error",
@@ -179,6 +180,14 @@ async function imports(options = {}) {
           "import/newline-after-import": ["error", { considerComments: true, count: 1 }]
         } : {}
       }
+    },
+    {
+      files: ["**/bin/**/*", `**/bin.${GLOB_SRC_EXT}`],
+      name: "antfu:imports:bin",
+      rules: {
+        "antfu/no-import-dist": "off",
+        "antfu/no-import-node-modules-by-path": "off"
+      }
     }
   ];
 }
@@ -853,6 +862,7 @@ async function stylistic(options = {}) {
   const {
     indent,
     jsx,
+    overrides = {},
     quotes,
     semi
   } = {
@@ -880,7 +890,8 @@ async function stylistic(options = {}) {
         "antfu/consistent-list-newline": "error",
         "antfu/if-newline": "error",
         "antfu/top-level-function": "error",
-        "curly": ["error", "multi-or-nest", "consistent"]
+        "curly": ["error", "multi-or-nest", "consistent"],
+        ...overrides
       }
     }
   ];
@@ -898,6 +909,7 @@ async function typescript(options = {}) {
     GLOB_SRC,
     ...componentExts.map((ext) => `**/*.${ext}`)
   ];
+  const filesTypeAware = options.filesTypeAware ?? [GLOB_TS, GLOB_TSX];
   const typeAwareRules = {
     "dot-notation": "off",
     "no-implied-eval": "off",
@@ -987,6 +999,13 @@ async function typescript(options = {}) {
         "ts/prefer-ts-expect-error": "error",
         "ts/triple-slash-reference": "off",
         "ts/unified-signatures": "off",
+        ...overrides
+      }
+    },
+    {
+      files: filesTypeAware,
+      name: "config:typescript:rules-type-aware",
+      rules: {
         ...tsconfigPath ? typeAwareRules : {},
         ...overrides
       }
@@ -1421,7 +1440,7 @@ async function formatters(options = {}, stylistic2 = {}) {
   const pluginFormat = await interopDefault(import("eslint-plugin-format"));
   const configs = [
     {
-      name: "antfu:formatters:setup",
+      name: "config:formatters:setup",
       plugins: {
         format: pluginFormat
       }
@@ -1434,7 +1453,7 @@ async function formatters(options = {}, stylistic2 = {}) {
         languageOptions: {
           parser: parserPlain
         },
-        name: "antfu:formatter:css",
+        name: "config:formatter:css",
         rules: {
           "format/prettier": [
             "error",
@@ -1450,7 +1469,7 @@ async function formatters(options = {}, stylistic2 = {}) {
         languageOptions: {
           parser: parserPlain
         },
-        name: "antfu:formatter:scss",
+        name: "config:formatter:scss",
         rules: {
           "format/prettier": [
             "error",
@@ -1466,7 +1485,7 @@ async function formatters(options = {}, stylistic2 = {}) {
         languageOptions: {
           parser: parserPlain
         },
-        name: "antfu:formatter:less",
+        name: "config:formatter:less",
         rules: {
           "format/prettier": [
             "error",
@@ -1485,7 +1504,7 @@ async function formatters(options = {}, stylistic2 = {}) {
       languageOptions: {
         parser: parserPlain
       },
-      name: "antfu:formatter:html",
+      name: "config:formatter:html",
       rules: {
         "format/prettier": [
           "error",
@@ -1504,11 +1523,12 @@ async function formatters(options = {}, stylistic2 = {}) {
       languageOptions: {
         parser: parserPlain
       },
-      name: "antfu:formatter:markdown",
+      name: "config:formatter:markdown",
       rules: {
         [`format/${formater}`]: [
           "error",
           formater === "prettier" ? {
+            printWidth: 120,
             ...prettierOptions,
             embeddedLanguageFormatting: "off",
             parser: "markdown"
@@ -1526,7 +1546,7 @@ async function formatters(options = {}, stylistic2 = {}) {
       languageOptions: {
         parser: parserPlain
       },
-      name: "antfu:formatter:graphql",
+      name: "config:formatter:graphql",
       rules: {
         "format/prettier": [
           "error",
@@ -1547,7 +1567,6 @@ var defaultPreset = (options) => {
     componentExts,
     gitignore: enableGitignore,
     isInEditor,
-    overrides,
     typescript: enableTypeScript,
     stylistic: stylisticOptions
   } = options;
@@ -1569,7 +1588,7 @@ var defaultPreset = (options) => {
     ignores(),
     javascript({
       isInEditor,
-      overrides: overrides.javascript
+      overrides: getOverrides(options, "javascript")
     }),
     comments(),
     node(),
@@ -1585,23 +1604,26 @@ var defaultPreset = (options) => {
   );
   if (enableTypeScript) {
     configs.push(typescript({
-      ...typeof enableTypeScript !== "boolean" ? enableTypeScript : {},
-      componentExts,
-      overrides: overrides.typescript
+      ...resolveSubOptions(options, "typescript"),
+      componentExts
+    }));
+  }
+  if (stylisticOptions) {
+    configs.push(stylistic({
+      ...typeof stylisticOptions === "boolean" ? {} : stylisticOptions,
+      overrides: getOverrides(options, "stylistic")
     }));
   }
-  if (stylisticOptions)
-    configs.push(stylistic(stylisticOptions));
   if (options.test) {
     configs.push(test({
       isInEditor,
-      overrides: overrides.test
+      overrides: getOverrides(options, "test")
     }));
   }
   if (options.jsonc) {
     configs.push(
       jsonc({
-        overrides: overrides.jsonc,
+        overrides: getOverrides(options, "jsonc"),
         stylistic: stylisticOptions
       }),
       sortPackageJson(),
@@ -1610,31 +1632,39 @@ var defaultPreset = (options) => {
   }
   if (options.yaml) {
     configs.push(yaml({
-      overrides: overrides.yaml,
+      overrides: getOverrides(options, "yaml"),
       stylistic: stylisticOptions
     }));
   }
   if (options.toml) {
     configs.push(toml({
-      overrides: overrides.toml,
+      overrides: getOverrides(options, "toml"),
       stylistic: stylisticOptions
     }));
   }
   if (options.html) {
     configs.push(html({
-      overrides: overrides.html,
+      overrides: getOverrides(options, "html"),
       stylistic: stylisticOptions
     }));
   }
-  if (options.unocss)
-    configs.push(unocss(options.unocss === true ? {} : options.unocss));
-  if (options.tailwindcss)
-    configs.push(tailwindcss(options.tailwindcss === true ? {} : options.tailwindcss));
+  if (options.unocss) {
+    configs.push(unocss({
+      ...resolveSubOptions(options, "unocss"),
+      overrides: getOverrides(options, "unocss")
+    }));
+  }
+  if (options.tailwindcss) {
+    configs.push(tailwindcss({
+      ...resolveSubOptions(options, "tailwindcss"),
+      overrides: getOverrides(options, "tailwindcss")
+    }));
+  }
   if (options.markdown) {
     configs.push(
       markdown({
         componentExts,
-        overrides: overrides.markdown
+        overrides: getOverrides(options, "markdown")
       })
     );
   }
@@ -1661,8 +1691,7 @@ function resolveOptions(options = {}) {
     componentExts = [],
     preset = [],
     gitignore = true,
-    isInEditor = !!((process2.env.VSCODE_PID || process2.env.JETBRAINS_IDE) && !process2.env.CI),
-    overrides = {},
+    isInEditor = !!((process2.env.VSCODE_PID || process2.env.JETBRAINS_IDE || process2.env.VIM) && !process2.env.CI),
     typescript: typescript2 = isPackageExists4("typescript"),
     jsx = true,
     test: test2 = true,
@@ -1692,7 +1721,6 @@ function resolveOptions(options = {}) {
     preset,
     gitignore,
     isInEditor,
-    overrides,
     typescript: typescript2,
     stylistic: stylistic2,
     jsx,
@@ -1747,6 +1775,16 @@ function createConfig(preset) {
     return eslintFlatConfig(options, ...userConfigs);
   };
 }
+function resolveSubOptions(options, key) {
+  return typeof options[key] === "boolean" ? {} : options[key] || {};
+}
+function getOverrides(options, key) {
+  const sub = resolveSubOptions(options, key);
+  return {
+    ...options.overrides?.[key],
+    ..."overrides" in sub ? sub.overrides || {} : {}
+  };
+}
 
 // src/index.ts
 var src_default = eslintFlatConfig;
@@ -1784,6 +1822,7 @@ export {
   src_default as default,
   defaultPreset,
   formatters,
+  getOverrides,
   html,
   ignores,
   imports,
@@ -1803,6 +1842,7 @@ export {
   default5 as pluginUnicorn,
   default6 as pluginUnusedImports,
   renameRules,
+  resolveSubOptions,
   sortPackageJson,
   sortTsconfig,
   stylistic,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pengzhanbo/eslint-config",
   "type": "module",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "author": "pengzhanbo <q942450674@outlook.com> (https://github/pengzhanbo/)",
   "license": "MIT",
   "homepage": "https://github.com/pengzhanbo/configs#readme",
@@ -51,28 +51,28 @@
   "dependencies": {
     "@antfu/eslint-define-config": "^1.23.0-2",
     "@eslint-types/jsdoc": "46.9.0",
-    "@eslint-types/typescript-eslint": "^6.12.0",
-    "@eslint-types/unicorn": "^49.0.0",
+    "@eslint-types/typescript-eslint": "^6.16.0",
+    "@eslint-types/unicorn": "^50.0.1",
     "@html-eslint/eslint-plugin": "^0.22.0",
     "@html-eslint/parser": "^0.22.0",
     "@stylistic/eslint-plugin": "^1.5.1",
-    "@typescript-eslint/eslint-plugin": "^6.15.0",
-    "@typescript-eslint/parser": "^6.15.0",
+    "@typescript-eslint/eslint-plugin": "^6.16.0",
+    "@typescript-eslint/parser": "^6.16.0",
     "eslint-config-flat-gitignore": "^0.1.2",
     "eslint-merge-processors": "^0.1.0",
-    "eslint-plugin-antfu": "^2.0.0",
+    "eslint-plugin-antfu": "^2.1.1",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-i": "^2.29.1",
-    "eslint-plugin-jsdoc": "^46.9.1",
+    "eslint-plugin-jsdoc": "^46.10.1",
     "eslint-plugin-jsonc": "^2.11.2",
     "eslint-plugin-markdown": "^3.0.1",
-    "eslint-plugin-n": "^16.4.0",
+    "eslint-plugin-n": "^16.6.0",
     "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-perfectionist": "^2.5.0",
     "eslint-plugin-toml": "^0.8.0",
-    "eslint-plugin-unicorn": "^49.0.0",
+    "eslint-plugin-unicorn": "^50.0.1",
     "eslint-plugin-unused-imports": "^3.0.0",
-    "eslint-plugin-vitest": "^0.3.18",
+    "eslint-plugin-vitest": "^0.3.20",
     "eslint-plugin-yml": "^1.11.0",
     "globals": "^13.24.0",
     "jsonc-eslint-parser": "^2.4.0",
@@ -82,11 +82,11 @@
     "yaml-eslint-parser": "^1.2.2"
   },
   "devDependencies": {
-    "@unocss/eslint-plugin": "^0.58.0",
+    "@unocss/eslint-plugin": "^0.58.2",
     "eslint": "^8.56.0",
-    "eslint-flat-config-viewer": "^0.1.3",
+    "eslint-flat-config-viewer": "^0.1.4",
     "eslint-plugin-format": "^0.1.0",
-    "eslint-plugin-tailwindcss": "^3.13.0",
+    "eslint-plugin-tailwindcss": "^3.13.1",
     "tsup": "^8.0.1"
   },
   "scripts": {