@pengzhanbo/eslint-config 1.5.1 → 1.5.2

package/dist/index.cjs

@@ -1608,6 +1608,15 @@ async function formatters(options = {}, stylistic2 = {}) {
   return configs;
 }
 
+// src/resolveSubOptions.ts
+function resolveSubOptions(options, key) {
+  return typeof options[key] === "boolean" ? {} : options[key] || {};
+}
+function getOverrides(options, key) {
+  const sub = resolveSubOptions(options, key);
+  return "overrides" in sub ? sub.overrides : {};
+}
+
 // src/preset.ts
 var defaultPreset = (options) => {
   const {
@@ -1805,23 +1814,15 @@ function eslintFlatConfig(options = {}, ...userConfigs) {
   );
   return merged;
 }
+
+// src/createConfig.ts
 function createConfig(preset) {
-  return (options = {}, ...userConfigs) => {
+  return function eslintFlatConfig2(options = {}, ...userConfigs) {
     const userPreset = options.preset || [];
     const presetList = Array.isArray(preset) ? preset : [preset];
     presetList.push(...userPreset);
     options.preset = presetList;
-    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 || {} : {}
+    return eslintFlatConfig2(options, ...userConfigs);
   };
 }
 

package/dist/index.d.cts

@@ -190,8 +190,6 @@ interface OptionsComponentExts {
      */
     componentExts?: string[];
 }
-interface OptionsFrameworkExtract {
-}
 interface OptionsTypeScriptParserOptions {
     /**
      * Additional parser options for TypeScript.
@@ -258,6 +256,8 @@ interface OptionsTailwindCSS extends OptionsOverrides {
     customClassNames?: boolean;
 }
 type PresetItem = (options: Required<Omit<OptionsConfig, 'preset'>>) => Awaitable<FlatConfigItem[]>[];
+interface OptionsFrameworkExtract {
+}
 interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
     /**
      * Enable gitignore support.
@@ -363,33 +363,9 @@ interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
      * @default auto-detect based on the process.env
      */
     isInEditor?: boolean;
-    /**
-     * Provide overrides for rules for each integration.
-     *
-     * @deprecated use `overrides` option in each integration key instead
-     */
-    overrides?: {
-        javascript?: FlatConfigItem['rules'];
-        typescript?: FlatConfigItem['rules'];
-        test?: FlatConfigItem['rules'];
-        jsonc?: FlatConfigItem['rules'];
-        markdown?: FlatConfigItem['rules'];
-        yaml?: FlatConfigItem['rules'];
-        toml?: FlatConfigItem['rules'];
-        vue?: FlatConfigItem['rules'];
-        react?: FlatConfigItem['rules'];
-        nextjs?: FlatConfigItem['rules'];
-        solid?: FlatConfigItem['rules'];
-        svelte?: FlatConfigItem['rules'];
-        astro?: FlatConfigItem['rules'];
-    };
 }
 
 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: {
@@ -512,4 +488,13 @@ 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 OptionsTypescript, type OptionsUnoCSS, type PresetItem, type Rules, type StylisticConfig, StylisticConfigDefaults, type UserConfigItem, type WrapRuleConfig, combine, comments, createConfig, eslintFlatConfig as default, defaultPreset, formatters, getOverrides, ignores, imports, interopDefault, javascript, jsdoc, jsonc, markdown, node, parserPlain, perfectionist, renameRules, resolveSubOptions, sortPackageJson, sortTsconfig, stylistic, tailwindcss, test, toArray, toml, typescript, unicorn, unocss, yaml };
+interface EslintFlatConfigFunction {
+    (options: OptionsConfig & FlatConfigItem, ...userConfigs: Awaitable<UserConfigItem | UserConfigItem[]>[]): Promise<UserConfigItem[]>;
+}
+declare function createConfig(preset: PresetItem | PresetItem[]): EslintFlatConfigFunction;
+
+type ResolvedNoNullableOptions<T> = T extends boolean ? never : NonNullable<T>;
+declare function resolveSubOptions<K extends keyof OptionsConfig>(options: OptionsConfig, key: K): ResolvedNoNullableOptions<OptionsConfig[K]>;
+declare function getOverrides<K extends keyof OptionsConfig>(options: OptionsConfig, key: K): FlatConfigItem['rules'];
+
+export { type Awaitable, type EslintFlatConfigFunction, 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, 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

@@ -190,8 +190,6 @@ interface OptionsComponentExts {
      */
     componentExts?: string[];
 }
-interface OptionsFrameworkExtract {
-}
 interface OptionsTypeScriptParserOptions {
     /**
      * Additional parser options for TypeScript.
@@ -258,6 +256,8 @@ interface OptionsTailwindCSS extends OptionsOverrides {
     customClassNames?: boolean;
 }
 type PresetItem = (options: Required<Omit<OptionsConfig, 'preset'>>) => Awaitable<FlatConfigItem[]>[];
+interface OptionsFrameworkExtract {
+}
 interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
     /**
      * Enable gitignore support.
@@ -363,33 +363,9 @@ interface OptionsConfig extends OptionsComponentExts, OptionsFrameworkExtract {
      * @default auto-detect based on the process.env
      */
     isInEditor?: boolean;
-    /**
-     * Provide overrides for rules for each integration.
-     *
-     * @deprecated use `overrides` option in each integration key instead
-     */
-    overrides?: {
-        javascript?: FlatConfigItem['rules'];
-        typescript?: FlatConfigItem['rules'];
-        test?: FlatConfigItem['rules'];
-        jsonc?: FlatConfigItem['rules'];
-        markdown?: FlatConfigItem['rules'];
-        yaml?: FlatConfigItem['rules'];
-        toml?: FlatConfigItem['rules'];
-        vue?: FlatConfigItem['rules'];
-        react?: FlatConfigItem['rules'];
-        nextjs?: FlatConfigItem['rules'];
-        solid?: FlatConfigItem['rules'];
-        svelte?: FlatConfigItem['rules'];
-        astro?: FlatConfigItem['rules'];
-    };
 }
 
 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: {
@@ -512,4 +488,13 @@ 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 OptionsTypescript, type OptionsUnoCSS, type PresetItem, type Rules, type StylisticConfig, StylisticConfigDefaults, type UserConfigItem, type WrapRuleConfig, combine, comments, createConfig, eslintFlatConfig as default, defaultPreset, formatters, getOverrides, ignores, imports, interopDefault, javascript, jsdoc, jsonc, markdown, node, parserPlain, perfectionist, renameRules, resolveSubOptions, sortPackageJson, sortTsconfig, stylistic, tailwindcss, test, toArray, toml, typescript, unicorn, unocss, yaml };
+interface EslintFlatConfigFunction {
+    (options: OptionsConfig & FlatConfigItem, ...userConfigs: Awaitable<UserConfigItem | UserConfigItem[]>[]): Promise<UserConfigItem[]>;
+}
+declare function createConfig(preset: PresetItem | PresetItem[]): EslintFlatConfigFunction;
+
+type ResolvedNoNullableOptions<T> = T extends boolean ? never : NonNullable<T>;
+declare function resolveSubOptions<K extends keyof OptionsConfig>(options: OptionsConfig, key: K): ResolvedNoNullableOptions<OptionsConfig[K]>;
+declare function getOverrides<K extends keyof OptionsConfig>(options: OptionsConfig, key: K): FlatConfigItem['rules'];
+
+export { type Awaitable, type EslintFlatConfigFunction, 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, 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

@@ -1509,6 +1509,15 @@ async function formatters(options = {}, stylistic2 = {}) {
   return configs;
 }
 
+// src/resolveSubOptions.ts
+function resolveSubOptions(options, key) {
+  return typeof options[key] === "boolean" ? {} : options[key] || {};
+}
+function getOverrides(options, key) {
+  const sub = resolveSubOptions(options, key);
+  return "overrides" in sub ? sub.overrides : {};
+}
+
 // src/preset.ts
 var defaultPreset = (options) => {
   const {
@@ -1706,23 +1715,15 @@ function eslintFlatConfig(options = {}, ...userConfigs) {
   );
   return merged;
 }
+
+// src/createConfig.ts
 function createConfig(preset) {
-  return (options = {}, ...userConfigs) => {
+  return function eslintFlatConfig2(options = {}, ...userConfigs) {
     const userPreset = options.preset || [];
     const presetList = Array.isArray(preset) ? preset : [preset];
     presetList.push(...userPreset);
     options.preset = presetList;
-    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 || {} : {}
+    return eslintFlatConfig2(options, ...userConfigs);
   };
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pengzhanbo/eslint-config",
   "type": "module",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "author": "pengzhanbo <q942450674@outlook.com> (https://github/pengzhanbo/)",
   "license": "MIT",
   "homepage": "https://github.com/pengzhanbo/configs#readme",
@@ -50,21 +50,21 @@
   },
   "dependencies": {
     "@antfu/eslint-define-config": "^1.23.0-2",
-    "@eslint-types/jsdoc": "46.9.0",
-    "@eslint-types/typescript-eslint": "^6.16.0",
+    "@eslint-types/jsdoc": "47.0.2",
+    "@eslint-types/typescript-eslint": "^6.17.0",
     "@eslint-types/unicorn": "^50.0.1",
-    "@stylistic/eslint-plugin": "^1.5.1",
-    "@typescript-eslint/eslint-plugin": "^6.16.0",
-    "@typescript-eslint/parser": "^6.16.0",
+    "@stylistic/eslint-plugin": "^1.5.3",
+    "@typescript-eslint/eslint-plugin": "^6.18.0",
+    "@typescript-eslint/parser": "^6.18.0",
     "eslint-config-flat-gitignore": "^0.1.2",
     "eslint-merge-processors": "^0.1.0",
     "eslint-plugin-antfu": "^2.1.1",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-i": "^2.29.1",
-    "eslint-plugin-jsdoc": "^47.0.2",
+    "eslint-plugin-jsdoc": "^48.0.2",
     "eslint-plugin-jsonc": "^2.11.2",
     "eslint-plugin-markdown": "^3.0.1",
-    "eslint-plugin-n": "^16.6.0",
+    "eslint-plugin-n": "^16.6.1",
     "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-perfectionist": "^2.5.0",
     "eslint-plugin-toml": "^0.8.0",
@@ -80,7 +80,7 @@
     "yaml-eslint-parser": "^1.2.2"
   },
   "devDependencies": {
-    "@unocss/eslint-plugin": "^0.58.2",
+    "@unocss/eslint-plugin": "^0.58.3",
     "eslint": "^8.56.0",
     "eslint-flat-config-viewer": "^0.1.4",
     "eslint-plugin-format": "^0.1.0",