@coderwyd/eslint-config 2.4.2 → 2.5.0-beta.2

package/dist/index.js

@@ -1,16 +1,6 @@
 // src/index.ts
-import process4 from "node:process";
 import fs from "node:fs";
 
-// src/constants/prettier.ts
-var DEFAULT_PRETTIER_RULES = {
-  arrowParens: "avoid",
-  htmlWhitespaceSensitivity: "ignore",
-  printWidth: 80,
-  semi: false,
-  singleQuote: true
-};
-
 // src/plugins/index.ts
 import { default as default2 } from "eslint-plugin-antfu";
 import { default as default3 } from "eslint-plugin-eslint-comments";
@@ -57,7 +47,6 @@ var GLOB_MARKDOWN = "**/*.md";
 var GLOB_YAML = "**/*.y?(a)ml";
 var GLOB_TOML = "**/*.toml";
 var GLOB_GRAPHQL = "**/*.{g,graph}ql";
-var GLOB_PRETTIER_LINT = [GLOB_SRC, GLOB_VUE];
 var GLOB_MARKDOWN_CODE = `${GLOB_MARKDOWN}/${GLOB_SRC}`;
 var GLOB_TESTS = [
   `**/__tests__/**/*.${GLOB_SRC_EXT}`,
@@ -108,7 +97,8 @@ async function ignores() {
 }
 
 // src/configs/imports.ts
-async function imports() {
+async function imports(options = {}) {
+  const { stylistic: stylistic2 = true } = options;
   return [
     {
       name: "coderwyd/imports/rules",
@@ -143,10 +133,9 @@ async function imports() {
             pathGroupsExcludedImportTypes: ["type"]
           }
         ],
-        ...{
-          // format
+        ...stylistic2 ? {
           "import/newline-after-import": ["error", { count: 1 }]
-        }
+        } : {}
       }
     },
     {
@@ -202,7 +191,7 @@ async function javascript(options = {}) {
         "constructor-super": "error",
         "default-case-last": "error",
         "dot-notation": ["error", { allowKeywords: true }],
-        eqeqeq: ["error", "smart"],
+        "eqeqeq": ["error", "smart"],
         "for-direction": "error",
         "getter-return": "error",
         "new-cap": [
@@ -402,7 +391,7 @@ async function javascript(options = {}) {
         ],
         "valid-typeof": ["error", { requireStringLiterals: true }],
         "vars-on-top": "error",
-        yoda: ["error", "never"],
+        "yoda": ["error", "never"],
         ...overrides
       }
     },
@@ -425,8 +414,6 @@ async function javascript(options = {}) {
 
 // src/shared/index.ts
 import process from "node:process";
-import { readFile } from "node:fs/promises";
-import path from "node:path";
 import { getPackageInfoSync, isPackageExists } from "local-pkg";
 var parserPlain = {
   meta: {
@@ -507,19 +494,11 @@ async function ensurePackages(packages) {
       type: "confirm"
     }
   ]);
-  if (result)
+  if (result) {
     await import("@antfu/install-pkg").then(
       (i) => i.installPackage(nonExistingPackages, { dev: true })
     );
-}
-async function loadPrettierConfig(cwd) {
-  let prettierConfig = {};
-  try {
-    const prettierrc = await readFile(path.join(cwd, ".prettierrc"), "utf-8");
-    prettierConfig = JSON.parse(prettierrc);
-  } catch {
   }
-  return prettierConfig;
 }
 function resolveSubOptions(options, key) {
   return typeof options[key] === "boolean" ? {} : options[key] || {};
@@ -532,7 +511,8 @@ function getOverrides(options, key) {
 }
 
 // src/configs/jsdoc.ts
-async function jsdoc() {
+async function jsdoc(options = {}) {
+  const { stylistic: stylistic2 = true } = options;
   return [
     {
       name: "coderwyd/jsdoc/rules",
@@ -555,11 +535,10 @@ async function jsdoc() {
         "jsdoc/require-returns-check": "warn",
         "jsdoc/require-returns-description": "warn",
         "jsdoc/require-yields-check": "warn",
-        ...{
-          // format
+        ...stylistic2 ? {
           "jsdoc/check-alignment": "warn",
           "jsdoc/multiline-blocks": "warn"
-        }
+        } : {}
       }
     }
   ];
@@ -567,7 +546,14 @@ async function jsdoc() {
 
 // src/configs/jsonc.ts
 async function jsonc(options = {}) {
-  const { files = [GLOB_JSON, GLOB_JSON5, GLOB_JSONC], overrides = {} } = options || {};
+  const {
+    files = [GLOB_JSON, GLOB_JSON5, GLOB_JSONC],
+    overrides = {},
+    stylistic: stylistic2 = true
+  } = options || {};
+  const {
+    indent = 2
+  } = typeof stylistic2 === "boolean" ? {} : stylistic2;
   const [pluginJsonc, parserJsonc] = await Promise.all([
     interopDefault(import("eslint-plugin-jsonc")),
     interopDefault(import("jsonc-eslint-parser"))
@@ -612,12 +598,11 @@ async function jsonc(options = {}) {
         "jsonc/space-unary-ops": "error",
         "jsonc/valid-json-number": "error",
         "jsonc/vue-custom-block/no-parsing-error": "error",
-        ...{
-          // format
+        ...stylistic2 ? {
           "jsonc/array-bracket-spacing": ["error", "never"],
           "jsonc/comma-dangle": ["error", "never"],
           "jsonc/comma-style": ["error", "last"],
-          "jsonc/indent": ["error", 2],
+          "jsonc/indent": ["error", indent],
           "jsonc/key-spacing": [
             "error",
             { afterColon: true, beforeColon: false }
@@ -633,7 +618,7 @@ async function jsonc(options = {}) {
           ],
           "jsonc/quote-props": "error",
           "jsonc/quotes": "error"
-        },
+        } : {},
         ...overrides
       }
     }
@@ -885,34 +870,52 @@ function sortTsconfig() {
   ];
 }
 
-// src/configs/prettier.ts
-import prettierRules from "eslint-config-prettier";
-var { rules: eslintRules } = prettierRules;
-async function prettier(rules = {}) {
-  const pluginPrettier = await interopDefault(import("eslint-plugin-prettier"));
-  const pRules = {
-    ...rules
+// src/configs/stylistic.ts
+var StylisticConfigDefaults = {
+  indent: 2,
+  jsx: true,
+  quotes: "single",
+  semi: false
+};
+async function stylistic(options = {}) {
+  const {
+    indent,
+    jsx,
+    overrides = {},
+    quotes,
+    semi
+  } = {
+    ...StylisticConfigDefaults,
+    ...options
   };
-  const configs2 = [
+  const pluginStylistic = await interopDefault(
+    import("@stylistic/eslint-plugin")
+  );
+  const config = pluginStylistic.configs.customize({
+    flat: true,
+    indent,
+    jsx,
+    pluginName: "style",
+    quotes,
+    semi
+  });
+  return [
     {
-      name: "coderwyd/prettier/setup",
+      name: "coderwyd/stylistic/rules",
       plugins: {
-        prettier: pluginPrettier
-      }
-    },
-    {
-      files: GLOB_PRETTIER_LINT,
-      name: "coderwyd/prettier/rules",
+        antfu: default2,
+        style: pluginStylistic
+      },
       rules: {
-        ...eslintRules,
-        "prettier/prettier": ["warn", pRules],
-        // eslint-disable-next-line perfectionist/sort-objects
-        "arrow-body-style": "off",
-        "prefer-arrow-callback": "off"
+        ...config.rules,
+        "antfu/consistent-list-newline": "error",
+        "antfu/if-newline": "warn",
+        "antfu/top-level-function": "warn",
+        "curly": ["error", "multi-or-nest", "consistent"],
+        ...overrides
       }
     }
   ];
-  return configs2;
 }
 
 // src/configs/typescript.ts
@@ -1083,9 +1086,9 @@ async function unicorn() {
       rules: {
         // 'unicorn/better-regex': 'error',
         "unicorn/catch-error-name": "error",
+        "unicorn/consistent-empty-array-spread": "error",
         "unicorn/custom-error-definition": "error",
         "unicorn/error-message": "error",
-        "unicorn/escape-case": "error",
         // 'unicorn/explicit-length-check': 'error',
         // 'unicorn/filename-case': [
         //   'error',
@@ -1093,6 +1096,7 @@ async function unicorn() {
         //     cases: { kebabCase: true, pascalCase: true },
         //     ignore: [/^[A-Z]+\..*$/],
         //   },
+        "unicorn/escape-case": "error",
         // ],
         "unicorn/new-for-builtins": "error",
         // 'unicorn/no-array-callback-reference': 'error',
@@ -1150,11 +1154,15 @@ async function unicorn() {
 }
 
 // src/configs/vue.ts
+import { mergeProcessors } from "eslint-merge-processors";
 async function vue(options = {}) {
-  const { files = [GLOB_VUE], overrides = {} } = options;
-  const [pluginVue, parserVue] = await Promise.all([
+  const { files = [GLOB_VUE], overrides = {}, stylistic: stylistic2 = true } = options;
+  const sfcBlocks = options.sfcBlocks === true ? {} : options.sfcBlocks ?? {};
+  const { indent = 2 } = typeof stylistic2 === "boolean" ? {} : stylistic2;
+  const [pluginVue, parserVue, processorVueBlocks] = await Promise.all([
     interopDefault(import("eslint-plugin-vue")),
-    interopDefault(import("vue-eslint-parser"))
+    interopDefault(import("vue-eslint-parser")),
+    interopDefault(import("eslint-processor-vue-blocks"))
   ]);
   const isVue3 = getVueVersion() === 3;
   const configKeys = isVue3 ? ["vue3-essential", "vue3-strongly-recommended", "vue3-recommended"] : ["essential", "strongly-recommended", "recommended"];
@@ -1208,7 +1216,16 @@ async function vue(options = {}) {
         }
       },
       name: "coderwyd/vue/rules",
-      processor: pluginVue.processors[".vue"],
+      processor: sfcBlocks === false ? pluginVue.processors[".vue"] : mergeProcessors([
+        pluginVue.processors[".vue"],
+        processorVueBlocks({
+          ...sfcBlocks,
+          blocks: {
+            styles: true,
+            ...sfcBlocks.blocks
+          }
+        })
+      ]),
       rules: {
         ...pluginVue.configs.base.rules,
         ...vueRules,
@@ -1236,7 +1253,7 @@ async function vue(options = {}) {
         "vue/dot-location": ["error", "property"],
         "vue/dot-notation": ["error", { allowKeywords: true }],
         "vue/eqeqeq": ["error", "smart"],
-        "vue/html-indent": ["error", 2],
+        "vue/html-indent": ["error", indent],
         "vue/html-quotes": ["error", "double"],
         "vue/html-self-closing": [
           "error",
@@ -1286,8 +1303,7 @@ async function vue(options = {}) {
         "vue/space-infix-ops": "error",
         "vue/space-unary-ops": ["error", { nonwords: false, words: true }],
         "vue/valid-define-options": "warn",
-        ...{
-          // format
+        ...stylistic2 ? {
           "vue/array-bracket-spacing": ["error", "never"],
           "vue/arrow-spacing": ["error", { after: true, before: true }],
           "vue/block-spacing": ["error", "always"],
@@ -1298,7 +1314,11 @@ async function vue(options = {}) {
               singleline: "always"
             }
           ],
-          "vue/brace-style": ["error", "stroustrup", { allowSingleLine: true }],
+          "vue/brace-style": [
+            "error",
+            "stroustrup",
+            { allowSingleLine: true }
+          ],
           "vue/comma-dangle": ["error", "always-multiline"],
           "vue/comma-spacing": ["error", { after: true, before: false }],
           "vue/comma-style": ["error", "last"],
@@ -1325,7 +1345,7 @@ async function vue(options = {}) {
           "vue/quote-props": ["error", "consistent-as-needed"],
           "vue/space-in-parens": ["error", "never"],
           "vue/template-curly-spacing": "error"
-        },
+        } : {},
         ...overrides
       }
     }
@@ -1423,7 +1443,7 @@ async function react(options = {}) {
     {
       name: "coderwyd/react/setup",
       plugins: {
-        react: plugins["@eslint-react"],
+        "react": plugins["@eslint-react"],
         "react-dom": plugins["@eslint-react/dom"],
         "react-hooks": pluginReactHooks,
         "react-hooks-extra": plugins["@eslint-react/hooks-extra"],
@@ -1552,7 +1572,7 @@ async function unocss(options = {}) {
 }
 
 // src/configs/formatter.ts
-async function formatter(options = {}, prettierRules2 = {}) {
+async function formatter(options = {}, stylistic2 = {}) {
   const { css, graphql, html, markdown, toml, yaml } = options === true ? {
     css: true,
     graphql: true,
@@ -1561,10 +1581,27 @@ async function formatter(options = {}, prettierRules2 = {}) {
     toml: true,
     yaml: true
   } : options;
-  const pluginPrettier = await interopDefault(import("eslint-plugin-prettier"));
+  const { indent, quotes, semi } = {
+    ...StylisticConfigDefaults,
+    ...stylistic2
+  };
+  const prettierOptions = Object.assign(
+    {
+      endOfLine: "auto",
+      printWidth: 80,
+      semi,
+      singleQuote: quotes === "single",
+      tabWidth: typeof indent === "number" ? indent : 2,
+      trailingComma: "all",
+      useTabs: indent === "tab"
+    },
+    typeof options === "boolean" ? {} : options.prettierOptions || {}
+  );
+  await ensurePackages(["eslint-plugin-format"]);
+  const pluginFormat = await interopDefault(import("eslint-plugin-format"));
   function createPrettierFormatter(files, parser, plugins) {
     const rules = {
-      ...prettierRules2,
+      ...prettierOptions,
       parser
     };
     const markdownRules = {
@@ -1572,9 +1609,8 @@ async function formatter(options = {}, prettierRules2 = {}) {
       ...rules,
       embeddedLanguageFormatting: "off"
     };
-    if (plugins?.length) {
+    if (plugins?.length)
       rules.plugins = [...rules.plugins || [], ...plugins];
-    }
     const config = {
       files,
       languageOptions: {
@@ -1582,10 +1618,10 @@ async function formatter(options = {}, prettierRules2 = {}) {
       },
       name: `coderwyd/formatter/${parser}`,
       plugins: {
-        prettier: pluginPrettier
+        format: pluginFormat
       },
       rules: {
-        "prettier/prettier": [
+        "format/prettier": [
           "warn",
           parser === "markdown" ? markdownRules : rules
         ]
@@ -1597,7 +1633,7 @@ async function formatter(options = {}, prettierRules2 = {}) {
     {
       name: "coderwyd/formatter/setup",
       plugins: {
-        prettier: pluginPrettier
+        format: pluginFormat
       }
     }
   ];
@@ -1635,7 +1671,11 @@ async function formatter(options = {}, prettierRules2 = {}) {
 
 // src/configs/svelte.ts
 async function svelte(options = {}) {
-  const { files = [GLOB_SVELTE], overrides = {} } = options;
+  const { files = [GLOB_SVELTE], overrides = {}, stylistic: stylistic2 = true } = options;
+  const {
+    indent = 2,
+    quotes = "single"
+  } = typeof stylistic2 === "boolean" ? {} : stylistic2;
   await ensurePackages(["eslint-plugin-svelte"]);
   const [pluginSvelte, parserSvelte] = await Promise.all([
     interopDefault(import("eslint-plugin-svelte")),
@@ -1705,22 +1745,23 @@ async function svelte(options = {}) {
             varsIgnorePattern: "^(_|\\$\\$Props$|\\$\\$Events$|\\$\\$Slots$)"
           }
         ],
-        ...{
-          // format
+        ...stylistic2 ? {
+          "style/indent": "off",
+          // superseded by svelte/indent
           "style/no-trailing-spaces": "off",
           // superseded by svelte/no-trailing-spaces
           "svelte/derived-has-same-inputs-outputs": "error",
           "svelte/html-closing-bracket-spacing": "error",
-          "svelte/html-quotes": ["error", { prefer: "single" }],
+          "svelte/html-quotes": ["error", { prefer: quotes }],
           "svelte/indent": [
             "error",
-            { alignAttributesVertically: true, indent: 2 }
+            { alignAttributesVertically: true, indent }
           ],
           "svelte/mustache-spacing": "error",
           "svelte/no-spaces-around-equal-signs-in-attribute": "error",
           "svelte/no-trailing-spaces": "error",
           "svelte/spaced-html-comment": "error"
-        },
+        } : {},
         ...overrides
       }
     }
@@ -1812,11 +1853,16 @@ var flatConfigProps = [
   "settings"
 ];
 var defaultPluginRenaming = {
+  "@eslint-react": "react",
+  "@eslint-react/dom": "react-dom",
+  "@eslint-react/hooks-extra": "react-hooks-extra",
+  "@eslint-react/naming-convention": "react-naming-convention",
+  "@stylistic": "style",
   "@typescript-eslint": "ts",
   "import-x": "import",
-  n: "node",
-  vitest: "test",
-  yml: "yaml"
+  "n": "node",
+  "vitest": "test",
+  "yml": "yaml"
 };
 async function defineConfig(options = {}, ...userConfigs) {
   const {
@@ -1834,9 +1880,11 @@ async function defineConfig(options = {}, ...userConfigs) {
     tailwindcss: enableTailwindCSS = hasTailwindCSS,
     typescript: enableTypeScript = hasTypeScript,
     unocss: enableUnoCSS = false,
-    usePrettierrc = true,
     vue: enableVue = hasVue
   } = options;
+  const stylisticOptions = options.stylistic === false ? false : typeof options.stylistic === "object" ? options.stylistic : {};
+  if (stylisticOptions && !("jsx" in stylisticOptions))
+    stylisticOptions.jsx = options.jsx ?? true;
   const configs2 = [];
   if (enableGitignore) {
     if (typeof enableGitignore !== "boolean") {
@@ -1846,12 +1894,13 @@ async function defineConfig(options = {}, ...userConfigs) {
         ])
       );
     } else {
-      if (fs.existsSync(".gitignore"))
+      if (fs.existsSync(".gitignore")) {
         configs2.push(
           interopDefault(import("eslint-config-flat-gitignore")).then((r) => [
             r()
           ])
         );
+      }
     }
   }
   configs2.push(
@@ -1862,8 +1911,12 @@ async function defineConfig(options = {}, ...userConfigs) {
     }),
     comments(),
     node(),
-    jsdoc(),
-    imports(),
+    jsdoc({
+      stylistic: stylisticOptions
+    }),
+    imports({
+      stylistic: stylisticOptions
+    }),
     unicorn(),
     command(),
     // Optional plugins (installed but not enabled by default)
@@ -1880,6 +1933,14 @@ async function defineConfig(options = {}, ...userConfigs) {
       })
     );
   }
+  if (stylisticOptions) {
+    configs2.push(
+      stylistic({
+        ...stylisticOptions,
+        overrides: getOverrides(options, "stylistic")
+      })
+    );
+  }
   if (enableRegexp)
     configs2.push(regexp(typeof enableRegexp === "boolean" ? {} : enableRegexp));
   if (options.test ?? true) {
@@ -1895,6 +1956,7 @@ async function defineConfig(options = {}, ...userConfigs) {
       vue({
         ...resolveSubOptions(options, "vue"),
         overrides: getOverrides(options, "typescript"),
+        stylistic: stylisticOptions,
         typescript: !!enableTypeScript
       })
     );
@@ -1911,6 +1973,7 @@ async function defineConfig(options = {}, ...userConfigs) {
     configs2.push(
       svelte({
         overrides: getOverrides(options, "svelte"),
+        stylistic: stylisticOptions,
         typescript: !!enableTypeScript
       })
     );
@@ -1934,31 +1997,20 @@ async function defineConfig(options = {}, ...userConfigs) {
   if (options.jsonc ?? true) {
     configs2.push(
       jsonc({
-        overrides: getOverrides(options, "jsonc")
+        overrides: getOverrides(options, "jsonc"),
+        stylistic: stylisticOptions
       }),
       sortPackageJson(),
       sortTsconfig()
     );
   }
   if (formatterOptions) {
-    let prettierRules2 = {
-      ...DEFAULT_PRETTIER_RULES
-    };
-    if (options.prettierRules) {
-      prettierRules2 = { ...prettierRules2, ...options.prettierRules };
-    }
-    if (usePrettierrc) {
-      const prettierConfig = await loadPrettierConfig(
-        options.cwd ?? process4.cwd()
-      );
-      Object.assign(prettierRules2, prettierConfig);
-    }
     configs2.push(
-      prettier(prettierRules2),
-      formatter(formatterOptions, prettierRules2)
+      formatter(
+        formatterOptions,
+        typeof stylisticOptions === "boolean" ? {} : stylisticOptions
+      )
     );
-  } else {
-    configs2.push(prettier());
   }
   const fusedConfig = flatConfigProps.reduce((acc, key) => {
     if (key in options)
@@ -1980,7 +2032,6 @@ export {
   getOverrides,
   getVueVersion,
   interopDefault,
-  loadPrettierConfig,
   parserPlain,
   renamePluginInConfigs,
   renameRules,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderwyd/eslint-config",
   "type": "module",
-  "version": "2.4.2",
+  "version": "2.5.0-beta.2",
   "description": "Donny's ESLint config",
   "author": "Donny Wang <donny526@outlook.com> (https://github.com/coderwyd/)",
   "license": "MIT",
@@ -11,8 +11,7 @@
     "eslint-config",
     "eslint-config-vue",
     "eslint-config-react",
-    "eslint-config-svelte",
-    "prettier"
+    "eslint-config-svelte"
   ],
   "publishConfig": {
     "access": "public"
@@ -66,34 +65,35 @@
   },
   "dependencies": {
     "@antfu/install-pkg": "^0.3.3",
+    "@stylistic/eslint-plugin": "^2.1.0",
     "@toml-tools/parser": "^1.0.0",
     "@typescript-eslint/eslint-plugin": "^7.9.0",
     "@typescript-eslint/parser": "^7.9.0",
     "eslint-config-flat-gitignore": "^0.1.5",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-merge-processors": "^0.1.0",
     "eslint-plugin-antfu": "^2.2.0",
     "eslint-plugin-command": "^0.2.3",
     "eslint-plugin-eslint-comments": "^3.2.0",
+    "eslint-plugin-format": "^0.1.1",
     "eslint-plugin-import-x": "^0.5.0",
     "eslint-plugin-jsdoc": "^48.2.5",
     "eslint-plugin-jsonc": "^2.15.1",
     "eslint-plugin-n": "^17.7.0",
     "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-perfectionist": "^2.10.0",
-    "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-regexp": "^2.5.0",
     "eslint-plugin-tailwindcss": "^3.15.2",
     "eslint-plugin-unicorn": "^53.0.0",
     "eslint-plugin-unused-imports": "^3.2.0",
     "eslint-plugin-vitest": "^0.5.4",
     "eslint-plugin-vue": "^9.26.0",
+    "eslint-processor-vue-blocks": "^0.1.2",
     "eslint-typegen": "^0.2.4",
     "globals": "^15.3.0",
     "jsonc-eslint-parser": "^2.4.0",
     "local-pkg": "^0.5.0",
     "parse-gitignore": "^2.0.0",
     "picocolors": "^1.0.1",
-    "prettier": "^3.2.5",
     "prettier-plugin-toml": "^2.0.1",
     "prompts": "^2.4.2",
     "vue-eslint-parser": "^9.4.2",
@@ -103,6 +103,7 @@
     "@antfu/ni": "^0.21.12",
     "@eslint-react/eslint-plugin": "^1.5.12",
     "@eslint/config-inspector": "^0.4.8",
+    "@stylistic/eslint-plugin-migrate": "^2.1.0",
     "@types/eslint": "^8.56.10",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^20.12.12",