@lincy/eslint-config 4.3.1 → 4.4.0

package/dist/index.js

@@ -349,7 +349,7 @@ async function javascript(options = {}) {
         "unused-imports/no-unused-imports": isInEditor ? "off" : "error",
         "unused-imports/no-unused-vars": [
           "error",
-          { args: "after-used", argsIgnorePattern: "^_", vars: "all", varsIgnorePattern: "^_" }
+          { args: "after-used", argsIgnorePattern: "^_", ignoreRestSiblings: true, vars: "all", varsIgnorePattern: "^_" }
         ],
         "use-isnan": ["error", { enforceForIndexOf: true, enforceForSwitchCase: true }],
         "valid-typeof": ["error", { requireStringLiterals: true }],
@@ -379,8 +379,9 @@ function renameRules(rules, map) {
   return Object.fromEntries(
     Object.entries(rules).map(([key, value]) => {
       for (const [from, to] of Object.entries(map)) {
-        if (key.startsWith(`${from}/`))
+        if (key.startsWith(`${from}/`)) {
           return [to + key.slice(from.length), value];
+        }
       }
       return [key, value];
     })
@@ -389,13 +390,15 @@ function renameRules(rules, map) {
 function renamePluginInConfigs(configs, map) {
   return configs.map((i) => {
     const clone = { ...i };
-    if (clone.rules)
+    if (clone.rules) {
       clone.rules = renameRules(clone.rules, map);
+    }
     if (clone.plugins) {
       clone.plugins = Object.fromEntries(
         Object.entries(clone.plugins).map(([key, value]) => {
-          if (key in map)
+          if (key in map) {
             return [map[key], value];
+          }
           return [key, value];
         })
       );
@@ -411,11 +414,13 @@ async function interopDefault(m) {
   return resolved.default || resolved;
 }
 async function ensurePackages(packages) {
-  if (process.stdout.isTTY === false)
+  if (process.stdout.isTTY === false) {
     return;
+  }
   const nonExistingPackages = packages.filter((i) => !isPackageExists(i));
-  if (nonExistingPackages.length === 0)
+  if (nonExistingPackages.length === 0) {
     return;
+  }
   const { default: prompts } = await import("prompts");
   const { result } = await prompts([
     {
@@ -424,8 +429,9 @@ async function ensurePackages(packages) {
       type: "confirm"
     }
   ]);
-  if (result)
+  if (result) {
     await import("@antfu/install-pkg").then((i) => i.installPackage(nonExistingPackages, { dev: true }));
+  }
 }
 
 // src/configs/jsdoc.ts
@@ -650,6 +656,7 @@ import * as parserPlain2 from "eslint-parser-plain";
 var StylisticConfigDefaults = {
   indent: 4,
   jsx: true,
+  lessOpinionated: true,
   quotes: "single",
   semi: false
 };
@@ -661,6 +668,7 @@ async function stylistic(options = {}) {
   const {
     indent,
     jsx,
+    lessOpinionated,
     quotes,
     semi
   } = typeof stylistic2 === "boolean" ? StylisticConfigDefaults : { ...StylisticConfigDefaults, ...stylistic2 };
@@ -683,9 +691,13 @@ async function stylistic(options = {}) {
       rules: {
         ...config.rules,
         "antfu/consistent-list-newline": "off",
-        "antfu/if-newline": "error",
-        "antfu/top-level-function": "error",
-        "curly": ["error", "multi-or-nest", "consistent"],
+        ...lessOpinionated ? {
+          curly: ["error", "all"]
+        } : {
+          "antfu/if-newline": "error",
+          "antfu/top-level-function": "error",
+          "curly": ["error", "multi-or-nest", "consistent"]
+        },
         // 覆盖`stylistic`默认规则
         "style/member-delimiter-style": ["error", { multiline: { delimiter: "none" } }],
         "style/multiline-ternary": ["error", "never"],
@@ -798,7 +810,7 @@ async function formatters(options = {}, stylistic2 = {}) {
   }
   if (options.html) {
     configs.push({
-      files: ["**/*.html"],
+      files: [GLOB_HTML],
       languageOptions: {
         parser: parserPlain2
       },
@@ -1894,16 +1906,18 @@ function lincy(options = {}, ...userConfigs) {
   } = options;
   const stylisticOptions = options.stylistic === false ? false : typeof options.stylistic === "object" ? options.stylistic : {};
   if (stylisticOptions) {
-    if (!("jsx" in stylisticOptions))
+    if (!("jsx" in stylisticOptions)) {
       stylisticOptions.jsx = options.jsx ?? true;
+    }
   }
   const configs = [];
   if (enableGitignore) {
     if (typeof enableGitignore !== "boolean") {
       configs.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r(enableGitignore)]));
     } else {
-      if (fs.existsSync(".gitignore"))
+      if (fs.existsSync(".gitignore")) {
         configs.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r()]));
+      }
     }
   }
   configs.push(
@@ -1926,8 +1940,9 @@ function lincy(options = {}, ...userConfigs) {
     // Optional plugins (installed but not enabled by default)
     perfectionist()
   );
-  if (enableVue)
+  if (enableVue) {
     componentExts.push("vue");
+  }
   if (enableTypeScript) {
     configs.push(typescript({
       ...typeof enableTypeScript !== "boolean" ? enableTypeScript : {},
@@ -2007,20 +2022,23 @@ function lincy(options = {}, ...userConfigs) {
     ));
   }
   const fusedConfig = flatConfigProps.reduce((acc, key) => {
-    if (key in options)
+    if (key in options) {
       acc[key] = options[key];
+    }
     return acc;
   }, {});
-  if (Object.keys(fusedConfig).length)
+  if (Object.keys(fusedConfig).length) {
     configs.push([fusedConfig]);
-  let pipeline = new FlatConfigComposer();
-  pipeline = pipeline.append(
+  }
+  let composer = new FlatConfigComposer();
+  composer = composer.append(
     ...configs,
     ...userConfigs
   );
-  if (autoRenamePlugins)
-    pipeline = pipeline.renamePlugins(defaultPluginRenaming);
-  return pipeline;
+  if (autoRenamePlugins) {
+    composer = composer.renamePlugins(defaultPluginRenaming);
+  }
+  return composer;
 }
 
 // src/index.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lincy/eslint-config",
   "type": "module",
-  "version": "4.3.1",
+  "version": "4.4.0",
   "packageManager": "pnpm@8.7.6",
   "description": "LinCenYing's ESLint config",
   "author": "LinCenYing <lincenying@gmail.com> (https://github.com/lincenying/)",
@@ -65,26 +65,26 @@
     "@antfu/eslint-define-config": "1.23.0-2",
     "@antfu/install-pkg": "^0.3.2",
     "@stylistic/eslint-plugin": "1.7.0",
-    "@typescript-eslint/eslint-plugin": "^7.5.0",
-    "@typescript-eslint/parser": "^7.5.0",
-    "eslint-config-flat-gitignore": "^0.1.3",
-    "eslint-flat-config-utils": "^0.2.0",
+    "@typescript-eslint/eslint-plugin": "^7.6.0",
+    "@typescript-eslint/parser": "^7.6.0",
+    "eslint-config-flat-gitignore": "^0.1.5",
+    "eslint-flat-config-utils": "^0.2.3",
     "eslint-merge-processors": "^0.1.0",
     "eslint-parser-plain": "^0.1.0",
     "eslint-plugin-antfu": "^2.1.2",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import-x": "^0.5.0",
-    "eslint-plugin-jsdoc": "^48.2.2",
-    "eslint-plugin-jsonc": "^2.15.0",
+    "eslint-plugin-jsdoc": "^48.2.3",
+    "eslint-plugin-jsonc": "^2.15.1",
     "eslint-plugin-markdown": "^4.0.1",
-    "eslint-plugin-n": "^16.6.2",
+    "eslint-plugin-n": "^17.2.1",
     "eslint-plugin-no-only-tests": "^3.1.0",
-    "eslint-plugin-perfectionist": "^2.7.0",
+    "eslint-plugin-perfectionist": "^2.9.0",
     "eslint-plugin-toml": "^0.11.0",
-    "eslint-plugin-unicorn": "^51.0.1",
+    "eslint-plugin-unicorn": "^52.0.0",
     "eslint-plugin-unused-imports": "^3.1.0",
-    "eslint-plugin-vitest": "^0.4.1",
-    "eslint-plugin-vue": "^9.24.0",
+    "eslint-plugin-vitest": "^0.5.3",
+    "eslint-plugin-vue": "^9.25.0",
     "eslint-plugin-yml": "^1.14.0",
     "eslint-processor-vue-blocks": "^0.1.1",
     "globals": "^15.0.0",
@@ -97,23 +97,23 @@
   },
   "devDependencies": {
     "@antfu/ni": "^0.21.12",
-    "@eslint-types/jsdoc": "48.2.1",
-    "@eslint-types/typescript-eslint": "^7.2.0",
-    "@eslint-types/unicorn": "^51.0.1",
-    "@eslint/config-inspector": "^0.2.1",
+    "@eslint-types/jsdoc": "48.2.2",
+    "@eslint-types/typescript-eslint": "^7.5.0",
+    "@eslint-types/unicorn": "^52.0.0",
+    "@eslint/config-inspector": "^0.4.6",
     "@lincy/eslint-config": "workspace:*",
     "@stylistic/eslint-plugin-migrate": "^1.7.0",
-    "@types/eslint": "^8.56.7",
-    "@types/node": "^20.12.2",
+    "@types/eslint": "^8.56.9",
+    "@types/node": "^20.12.7",
     "@types/prompts": "^2.4.9",
-    "@unocss/eslint-plugin": "^0.58.8",
+    "@unocss/eslint-plugin": "^0.59.2",
     "bumpp": "^9.4.0",
     "eslint": "^8.57.0",
     "eslint-plugin-format": "^0.1.0",
     "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.6",
-    "eslint-typegen": "^0.2.0",
+    "eslint-typegen": "^0.2.2",
     "esno": "^4.7.0",
     "lint-staged": "^15.2.2",
     "prettier": "^3.2.5",
@@ -122,9 +122,9 @@
     "simple-open-url": "^3.0.1",
     "sucrase": "^3.35.0",
     "tsup": "^8.0.2",
-    "typescript": "^5.4.3",
+    "typescript": "^5.4.5",
     "unbuild": "^2.0.0",
-    "vitest": "^1.4.0",
+    "vitest": "^1.5.0",
     "vue": "^3.4.21"
   },
   "pnpm": {