my-code-style 1.4.0 → 1.6.0

package/src/commitlint/scopes.cjs

@@ -25,34 +25,88 @@ const PLURAL_MAP = {
     assets: "asset",
 }
 
+// Plurals whose singular cannot be derived by rule: uncountables, irregulars,
+// and the "-e" + "s" words that would otherwise lose their stem ("caches" →
+// "cach"). Everything else is handled by the suffix rules below.
+const EXACT_SINGULAR = {
+    news: "news",
+    series: "series",
+    movies: "movie",
+    cookies: "cookie",
+    caches: "cache",
+    chases: "chase",
+    niches: "niche",
+}
+
+// Directory names that already read as singular (or are conventional as-is)
+const NON_PLURAL = [
+    "status",
+    "canvas",
+    "bus",
+    "pass",
+    "process",
+    "css",
+    "less",
+    "scss",
+    "js",
+    "ts",
+    "types",
+]
+
+// Singulars that legitimately end in "s"/"z" and therefore take "-es":
+// bus → buses, status → statuses. Without this list "buses" would follow the
+// "-se + s" reading and become "buse".
+const SIBILANT_SINGULARS = [
+    "bus",
+    "gas",
+    "canvas",
+    "alias",
+    "atlas",
+    "bias",
+    "virus",
+    "status",
+    "process",
+    "lens",
+    "plus",
+    "focus",
+    "campus",
+    "analysis",
+    "axis",
+    "basis",
+    "crisis",
+    "thesis",
+    "quiz",
+]
+
+// Unambiguous "-es" plurals: the stem ends in a doubled sibilant or a digraph
+// (classes, boxes, churches, dishes, buzzes, batches, fixes).
+const ES_PLURAL = /(?:ss|zz|ch|sh|x)es$/i
+// "-ses"/"-zes" are ambiguous: "cases" is case + s, "buses" is bus + es.
+const S_OR_Z_ES_PLURAL = /[sz]es$/i
+
 function toSingular(name) {
     if (!name) {
         return name
     }
-    if (PLURAL_MAP[name]) {
-        return PLURAL_MAP[name]
+    const lower = name.toLowerCase()
+    if (PLURAL_MAP[lower]) {
+        return PLURAL_MAP[lower]
+    }
+    if (EXACT_SINGULAR[lower]) {
+        return EXACT_SINGULAR[lower]
     }
-    if (name.endsWith("ies") && name.length > 4) {
+    if (NON_PLURAL.includes(lower)) {
+        return name
+    }
+    if (/ies$/i.test(name) && name.length > 4) {
         return name.slice(0, -3) + "y"
     }
-    if (/(?:[sxz]|[ch|sh])es$/.test(name)) {
+    if (ES_PLURAL.test(name)) {
         return name.slice(0, -2)
     }
-    const nonPluralEndingInS = [
-        "status",
-        "canvas",
-        "bus",
-        "pass",
-        "process",
-        "css",
-        "less",
-        "scss",
-        "js",
-        "ts",
-        "types",
-    ]
-    if (nonPluralEndingInS.includes(name.toLowerCase())) {
-        return name
+    if (S_OR_Z_ES_PLURAL.test(name)) {
+        const esStem = name.slice(0, -2).toLowerCase()
+        return SIBILANT_SINGULARS.includes(esStem) ? name.slice(0, -2) : name.slice(0, -1)
     }
     if (name.endsWith("s") && !name.endsWith("ss") && name.length > 3) {
         return name.slice(0, -1)
@@ -71,11 +125,15 @@ function generateScopes(srcDirs = "src") {
 
     for (const srcDir of dirs) {
         const resolved = path.resolve(process.cwd(), srcDir)
-        if (!fs.existsSync(resolved)) {
+        let entries
+        try {
+            // A missing path, a plain file, or an unreadable directory must not
+            // break the commitlint config load — just yield no scopes.
+            entries = fs.readdirSync(resolved, { withFileTypes: true })
+        } catch {
             continue
         }
-        const scopes = fs
-            .readdirSync(resolved, { withFileTypes: true })
+        const scopes = entries
             .filter((dirent) => dirent.isDirectory())
             .map((dirent) => toSingular(dirent.name))
         allScopes.push(...scopes)
@@ -89,6 +147,8 @@ function getStagedFiles(cwd) {
         const output = execSync("git diff --cached --name-only -z", {
             cwd,
             stdio: ["pipe", "pipe", "ignore"],
+            // 大仓库/大量暂存文件可能超过默认 1MB，避免 ENOBUFS 导致 scope 猜测整体失败
+            maxBuffer: 64 * 1024 * 1024,
         }).toString()
         return output.split("\0").filter(Boolean)
     } catch {
@@ -96,6 +156,7 @@ function getStagedFiles(cwd) {
             const output = execSync("git status --porcelain -z", {
                 cwd,
                 stdio: ["pipe", "pipe", "ignore"],
+                maxBuffer: 64 * 1024 * 1024,
             }).toString()
             const parts = output.split("\0")
             const staged = []

package/src/eslint/base.cjs

@@ -1,4 +1,9 @@
 // Base ESLint config for TypeScript projects
+//
+// Prettier 选项以 src/prettier/index.cjs 为唯一来源，避免 rules 与 prettier 配置文件漂移
+const prettierConfig = require("../prettier/index.cjs")
+const { overrides: _prettierOverrides, ...prettierOptions } = prettierConfig
+
 module.exports = {
     env: {
         browser: true,
@@ -20,6 +25,17 @@ module.exports = {
             jsx: true,
         },
     },
+    // Mirrors the ignores of src/eslint/flat/base.mjs: without them `eslint .`
+    // lints build output (dist/, coverage/) and fails on generated code.
+    ignorePatterns: [
+        "**/node_modules/**",
+        "**/dist/**",
+        "**/coverage/**",
+        "**/public/**",
+        "**/assets/iconfont/**",
+        "**/*.min.js",
+        "**/*.min.css",
+    ],
     plugins: ["@typescript-eslint", "prettier", "import"],
     overrides: [
         {
@@ -29,20 +45,14 @@ module.exports = {
     ],
     rules: {
         // Prettier 集成
-        "prettier/prettier": [
-            "error",
-            {
-                singleQuote: false,
-                tabWidth: 4,
-                semi: false,
-                trailingComma: "all",
-                endOfLine: "lf",
-            },
-        ],
+        "prettier/prettier": ["error", prettierOptions],
         // 格式化与风格
         indent: "off",
         semi: ["error", "never"],
-        quotes: ["error", "double", { avoidEscape: false, allowTemplateLiterals: true }],
+        // avoidEscape must stay true: Prettier keeps the cheaper quote when a
+        // string contains double quotes ('say "hi"'), so requiring an escape
+        // here produces an error that --fix can never resolve.
+        quotes: ["error", "double", { avoidEscape: true, allowTemplateLiterals: true }],
         curly: ["error", "all"],
         "comma-dangle": ["error", "always-multiline"],
         "object-curly-spacing": ["error", "always"],

package/src/eslint/flat/_shared.mjs

@@ -1,19 +1,21 @@
 // Shared constants and rule objects for Flat Config files
+import prettierConfig from "../../prettier/index.cjs"
+
+// Prettier 选项以 src/prettier/index.cjs 为唯一来源，避免 rules 与配置文件漂移
+const { overrides: _prettierOverrides, ...prettierOptions } = prettierConfig
 
 /**
  * Prettier plugin rules — mirrors base.cjs prettier/prettier config
  */
 export const prettierRules = {
-    "prettier/prettier": [
-        "error",
-        {
-            singleQuote: false,
-            tabWidth: 4,
-            semi: false,
-            trailingComma: "all",
-            endOfLine: "lf",
-        },
-    ],
+    "prettier/prettier": ["error", prettierOptions],
+}
+
+/**
+ * .nvue 覆写：规则内联 options 会整体替换而非合并，必须携带完整选项
+ */
+export const nvuePrettierRules = {
+    "prettier/prettier": ["error", { ...prettierOptions, parser: "vue", semi: true }],
 }
 
 /**
@@ -23,7 +25,10 @@ export const commonRules = {
     // 缩进由 Prettier 统一负责，关闭 ESLint 缩进避免打架
     indent: "off",
     semi: ["error", "never"],
-    quotes: ["error", "double", { avoidEscape: false, allowTemplateLiterals: true }],
+    // avoidEscape must stay true: Prettier keeps the cheaper quote when a
+    // string contains double quotes ('say "hi"'), so requiring an escape here
+    // produces an error that --fix can never resolve.
+    quotes: ["error", "double", { avoidEscape: true, allowTemplateLiterals: true }],
     curly: ["error", "all"],
     "comma-dangle": ["error", "always-multiline"],
     "object-curly-spacing": ["error", "always"],

package/src/eslint/flat/base.mjs

@@ -1,6 +1,7 @@
 // Base ESLint Flat Config for TypeScript projects (ESLint v9+)
 // Equivalent to src/eslint/base.cjs but in flat config format
 
+import js from "@eslint/js"
 import tseslint from "typescript-eslint"
 import importX from "eslint-plugin-import-x"
 import eslintPluginPrettierRecommended from "eslint-plugin-prettier/recommended"
@@ -22,12 +23,17 @@ export default [
         ],
     },
 
+    // ESLint 官方推荐规则
+    // Replaces: extends: ["eslint:recommended"] — 缺失它会让 flat 配置弱于传统配置
+    // （no-debugger / no-cond-assign / no-constant-condition / no-empty 等不会被检查）
+    js.configs.recommended,
+
     // TypeScript recommended rules
-    // Replaces: extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"]
+    // Replaces: extends: ["plugin:@typescript-eslint/recommended"]
     ...tseslint.configs.recommended,
 
     // eslint-plugin-import-x configuration
-    // Replaces: plugin:import/recommended + eslint-config-standard (via FlatCompat)
+    // Replaces: plugin:import/recommended (ESLint 8 equivalent in src/eslint/base.cjs)
     {
         files: ["**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx,vue,nvue}"],
         plugins: {
@@ -66,7 +72,16 @@ export default [
         },
     },
 
-    // Shared rules for all JS, TS, JSX, TSX and Vue files
+    // Prettier integration (replaces: extends: ["plugin:prettier/recommended"])
+    eslintPluginPrettierRecommended,
+
+    // eslint-config-prettier disables rules that conflict with Prettier —
+    // including `curly`, which Prettier never rewrites.
+    eslintConfigPrettier,
+
+    // Shared rules for all JS, TS, JSX, TSX and Vue files.
+    // MUST come after eslint-config-prettier: in flat config a later entry wins,
+    // so explicit rules such as `curly` would otherwise be silently switched off.
     {
         files: ["**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx,vue,nvue}"],
         rules: {
@@ -83,19 +98,14 @@ export default [
         },
     },
 
-    // .nvue file handling (uni-app)
+    // .nvue file handling (uni-app) — mirrors the legacy config, which parses
+    // nvue script blocks as modules so `import` works.
     {
         files: ["**/*.nvue"],
         languageOptions: {
             parserOptions: {
-                sourceType: "script",
+                sourceType: "module",
             },
         },
     },
-
-    // Prettier integration (replaces: extends: ["plugin:prettier/recommended"])
-    eslintPluginPrettierRecommended,
-
-    // eslint-config-prettier MUST be last — disables conflicting ESLint rules
-    eslintConfigPrettier,
 ]

package/src/eslint/flat/vue3.mjs

@@ -4,6 +4,7 @@ import pluginVue from "eslint-plugin-vue"
 import tseslint from "typescript-eslint"
 import parserVue from "vue-eslint-parser"
 import baseConfig from "./base.mjs"
+import { nvuePrettierRules } from "./_shared.mjs"
 
 export default [
     // Spread all base configs first
@@ -49,8 +50,12 @@ export default [
         },
         rules: {
             "vue/comment-directive": "off",
+            // .nvue uses semicolons (see src/prettier/index.cjs), so the base
+            // `semi: ["error", "never"]` rule must be disabled here — mirrors
+            // the legacy config in src/eslint/vue3.cjs.
+            semi: "off",
             // Prettier cannot infer a parser from the custom .nvue extension.
-            "prettier/prettier": ["error", { parser: "vue", semi: true }],
+            ...nvuePrettierRules,
         },
     },
 ]

package/src/eslint/vue3.cjs

@@ -1,6 +1,10 @@
 // Vue 3 ESLint config — extends base, adds Vue-specific rules
 const base = require("./base.cjs")
 
+// .nvue 覆写必须携带完整 Prettier 选项：规则内联 options 会整体替换而非合并
+const prettierConfig = require("../prettier/index.cjs")
+const { overrides: _prettierOverrides, ...prettierOptions } = prettierConfig
+
 module.exports = {
     ...base,
     parser: "vue-eslint-parser",
@@ -25,7 +29,7 @@ module.exports = {
             rules: {
                 "vue/comment-directive": "off",
                 semi: "off",
-                "prettier/prettier": ["error", { parser: "vue", semi: true }],
+                "prettier/prettier": ["error", { ...prettierOptions, parser: "vue", semi: true }],
             },
         },
     ],

package/src/gitignore

@@ -1,5 +1,6 @@
 node_modules/
 dist/
+unpackage/
 coverage/
 *.local
 *.log

package/src/husky/commit-msg

@@ -1 +1,5 @@
-npx --no-install commitlint --edit "${1}"
+# 同 pre-commit：直接用本地 commitlint，省掉一次 npm CLI（npx）启动。
+if command -v commitlint >/dev/null 2>&1; then
+    exec commitlint --edit "$1"
+fi
+npx --no-install commitlint --edit "$1"

package/src/husky/pre-commit

@@ -1 +1,6 @@
-npx --no-install -- lint-staged
+# husky 已经把 node_modules/.bin 放进 PATH，所以优先直接执行本地 lint-staged：
+# 这样每次提交少起一个 npm CLI（npx）进程；找不到时再退回 npx（例如被提升到上层目录）。
+if command -v lint-staged >/dev/null 2>&1; then
+    exec lint-staged
+fi
+npx --no-install -- lint-staged