my-code-style 1.0.0 → 1.2.0

package/bin/{init.cjs → init}

@@ -54,7 +54,11 @@ function readTemplate(relativePath) {
 function getProjectPkg() {
     const pkgPath = path.resolve(PROJECT_ROOT, "package.json")
     if (!fs.existsSync(pkgPath)) return null
-    return JSON.parse(fs.readFileSync(pkgPath, "utf8"))
+    try {
+        return JSON.parse(fs.readFileSync(pkgPath, "utf8"))
+    } catch {
+        return null
+    }
 }
 
 function getDependencyVersion(pkg, depName) {
@@ -98,8 +102,11 @@ function detectCssPreprocessor() {
     // Fallback: check for existing stylelint config
     if (fileExists(".stylelintrc.cjs") || fileExists(".stylelintrc.js")) {
         try {
+            const stylelintFile = fileExists(".stylelintrc.cjs")
+                ? ".stylelintrc.cjs"
+                : ".stylelintrc.js"
             const content = fs.readFileSync(
-                path.resolve(PROJECT_ROOT, ".stylelintrc.cjs"),
+                path.resolve(PROJECT_ROOT, stylelintFile),
                 "utf8"
             )
             if (content.includes("postcss-less")) return "less"
@@ -141,12 +148,15 @@ function eslintFlatConfigContent(isUniApp) {
     const importPath = isUniApp
         ? "my-code-style/eslint/flat/uniapp"
         : "my-code-style/eslint/flat/vue3"
+    const varName = isUniApp ? "uniappConfig" : "vue3Config"
 
     return `// ESLint Flat Config — powered by my-code-style
 // https://www.npmjs.com/package/my-code-style
-import uniappConfig from "${importPath}"
+import ${varName} from "${importPath}"
 
-export default uniappConfig
+export default [
+    ...${varName},
+]
 `
 }
 
@@ -242,6 +252,13 @@ function getLintStagedConfig(cssPreprocessor) {
 // --- Main ---
 
 function main() {
+    // Handle --version / -v
+    if (process.argv.includes("--version") || process.argv.includes("-v")) {
+        const pkg = require("../package.json")
+        console.log(pkg.version)
+        return
+    }
+
     const dryRun = process.argv.includes("--dry-run")
     const label = dryRun ? "[DRY RUN] " : ""
 
@@ -273,8 +290,8 @@ function main() {
 
     if (useFlatConfig) {
         files.push({
-            path: "eslint.config.ts",
-            exists: fileExists("eslint.config.ts") || fileExists("eslint.config.js") || fileExists("eslint.config.mjs"),
+            path: "eslint.config.mjs",
+            exists: fileExists("eslint.config.mjs") || fileExists("eslint.config.js") || fileExists("eslint.config.ts"),
             content: eslintFlatConfigContent(uniApp),
         })
     } else {
@@ -385,7 +402,7 @@ function main() {
     // package.json scripts + lint-staged
     modifyPackageJson({
         scripts: {
-            prepare: "husky install",
+            prepare: "husky",
             release: "standard-version",
             cz: "czg",
         },
@@ -405,10 +422,14 @@ function main() {
     if (useFlatConfig) {
         console.log("  2. Flat Config 需要的额外依赖：")
         console.log("     pnpm add -D typescript-eslint globals eslint-plugin-import-x @eslint/js")
+        console.log("  3. 初始化 husky：")
+        console.log("     pnpm prepare")
+        console.log("  4. 使用 czg 提交 commit：")
+    } else {
+        console.log("  2. 初始化 husky：")
+        console.log("     pnpm prepare")
+        console.log("  3. 使用 czg 提交 commit：")
     }
-    console.log("  3. 初始化 husky：")
-    console.log("     pnpm prepare")
-    console.log("  4. 使用 czg 提交 commit：")
     console.log("     pnpm cz")
     console.log("")
 }
@@ -437,6 +458,7 @@ function checkPeerDeps({ useFlatConfig = false, cssPreprocessor = "scss" } = {})
     const baseDeps = [
         "eslint",
         "prettier",
+        "eslint-plugin-vue",
         "@commitlint/cli",
         "husky",
         "lint-staged",
@@ -445,17 +467,21 @@ function checkPeerDeps({ useFlatConfig = false, cssPreprocessor = "scss" } = {})
     ]
 
     const flatDeps = useFlatConfig
-        ? ["typescript-eslint", "globals", "eslint-plugin-import-x", "@eslint/js"]
-        : []
+        ? ["typescript-eslint", "vue-eslint-parser", "globals", "eslint-plugin-import-x", "@eslint/js", "eslint-plugin-prettier", "eslint-config-prettier"]
+        : ["@typescript-eslint/parser", "@typescript-eslint/eslint-plugin", "eslint-plugin-prettier", "eslint-config-prettier"]
 
     const cssDeps = cssPreprocessor === "scss"
-        ? ["stylelint", "postcss-scss"]
+        ? ["stylelint", "postcss-scss", "postcss-html"]
         : cssPreprocessor === "less"
-            ? ["stylelint", "postcss-less"]
+            ? ["stylelint", "postcss-less", "postcss-html"]
             : []
 
     const allPeerDeps = [...baseDeps, ...flatDeps, ...cssDeps]
 
+    // Read peer dependency versions from my-code-style package.json
+    const packagePkg = JSON.parse(fs.readFileSync(path.resolve(PACKAGE_DIR, "package.json"), "utf8"))
+    const peerDeps = packagePkg.peerDependencies || {}
+
     const pkgPath = path.resolve(PROJECT_ROOT, "package.json")
     if (!fileExists("package.json")) return
 
@@ -468,8 +494,16 @@ function checkPeerDeps({ useFlatConfig = false, cssPreprocessor = "scss" } = {})
     const missing = allPeerDeps.filter((dep) => !allDeps[dep])
     if (missing.length > 0) {
         console.log("")
-        warn("以下 peerDependencies 未安装，建议安装：")
-        warn(`pnpm add -D ${missing.join(" ")}`)
+        warn(`以下依赖未安装：${missing.join(", ")}`)
+        console.log("")
+        warn("一键安装命令：")
+        console.log(`  pnpm add -D my-code-style \\`)
+        missing.forEach((dep, i) => {
+            const version = peerDeps[dep] || ""
+            const depWithVersion = version ? `${dep}@${version}` : dep
+            const suffix = i < missing.length - 1 ? " \\" : ""
+            console.log(`  ${depWithVersion}${suffix}`)
+        })
     }
 }
 

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "my-code-style",
-    "version": "1.0.0",
+    "version": "1.2.0",
     "description": "Lint/Format/Git 配置工程化 npm 包（ESLint + Prettier + Stylelint + Commitlint + Husky + standard-version）",
     "type": "commonjs",
     "main": "src/eslint/uniapp.cjs",
     "bin": {
-        "my-code-style-init": "./bin/init.cjs"
+        "my-code-style-init": "./bin/init"
     },
     "exports": {
         ".": "./src/eslint/uniapp.cjs",
@@ -29,43 +29,46 @@
         "README.md"
     ],
     "scripts": {
+        "link": "pnpm link --global",
+        "unlink": "pnpm unlink --global",
+        "pack": "npm pack",
         "release": "standard-version"
     },
     "engines": {
         "node": ">=18"
     },
     "peerDependencies": {
-        "@commitlint/cli": ">=18.0.0",
-        "@commitlint/config-conventional": ">=18.0.0",
-        "@eslint/eslintrc": ">=3.0.0",
-        "@eslint/js": ">=9.0.0",
-        "@typescript-eslint/eslint-plugin": ">=6.0.0",
-        "@typescript-eslint/parser": ">=6.0.0",
-        "czg": ">=1.0.0",
-        "eslint": ">=8.0.0",
-        "eslint-config-prettier": ">=9.0.0",
-        "eslint-config-standard": ">=17.0.0",
-        "eslint-import-resolver-typescript": ">=3.0.0",
-        "eslint-plugin-import": ">=2.0.0",
-        "eslint-plugin-import-x": ">=3.0.0",
-        "eslint-plugin-prettier": ">=5.0.0",
-        "eslint-plugin-vue": ">=9.0.0",
-        "globals": ">=15.0.0",
-        "husky": ">=8.0.0",
-        "lint-staged": ">=15.0.0",
-        "postcss-html": ">=1.0.0",
-        "postcss-less": ">=6.0.0",
-        "postcss-scss": ">=4.0.0",
-        "prettier": ">=3.0.0",
-        "standard-version": ">=9.0.0",
-        "stylelint": ">=16.0.0",
-        "stylelint-config-html": ">=1.0.0",
-        "stylelint-config-recess-order": ">=4.0.0",
-        "stylelint-config-recommended": ">=14.0.0",
-        "stylelint-config-recommended-scss": ">=14.0.0",
-        "stylelint-config-recommended-vue": ">=1.0.0",
-        "stylelint-prettier": ">=5.0.0",
-        "typescript-eslint": ">=8.0.0"
+        "@commitlint/cli": "^19.0.0",
+        "@commitlint/config-conventional": "^19.0.0",
+        "@eslint/eslintrc": "^3.0.0",
+        "@eslint/js": "^9.0.0",
+        "@typescript-eslint/eslint-plugin": "^8.0.0",
+        "@typescript-eslint/parser": "^8.0.0",
+        "czg": "^1.0.0",
+        "eslint": "^9.0.0",
+        "eslint-config-prettier": "^10.1.8",
+        "eslint-import-resolver-typescript": "^3.0.0",
+        "eslint-plugin-import": "^2.0.0",
+        "eslint-plugin-import-x": "^4.0.0",
+        "eslint-plugin-prettier": "^5.2.0",
+        "eslint-plugin-vue": "^10.0.0",
+        "globals": "^16.0.0",
+        "husky": "^9.0.0",
+        "lint-staged": "^16.0.0",
+        "postcss-html": "^1.0.0",
+        "postcss-less": "^6.0.0",
+        "postcss-scss": "^4.0.0",
+        "prettier": "^3.0.0",
+        "standard-version": "^9.0.0",
+        "stylelint": "^16.0.0",
+        "stylelint-config-html": "^1.0.0",
+        "stylelint-config-recess-order": "^5.0.0",
+        "stylelint-config-recommended": "^17.0.0",
+        "stylelint-config-recommended-scss": "^16.0.0",
+        "stylelint-config-recommended-vue": "^2.0.0",
+        "stylelint-prettier": "^5.0.0",
+        "typescript-eslint": "^8.0.0",
+        "vue-eslint-parser": "^9.0.0"
     },
     "peerDependenciesMeta": {
         "@eslint/eslintrc": {
@@ -103,6 +106,9 @@
         },
         "typescript-eslint": {
             "optional": true
+        },
+        "vue-eslint-parser": {
+            "optional": true
         }
     },
     "devDependencies": {
@@ -118,4 +124,4 @@
         "typescript"
     ],
     "license": "MIT"
-}
+}

package/src/commitlint/scopes.cjs

@@ -3,6 +3,63 @@ const fs = require("fs")
 const path = require("path")
 const { execSync } = require("child_process")
 
+const PLURAL_MAP = {
+    components: "component",
+    views: "view",
+    pages: "page",
+    layouts: "layout",
+    hooks: "hook",
+    utils: "util",
+    stores: "store",
+    apis: "api",
+    services: "service",
+    plugins: "plugin",
+    directives: "directive",
+    filters: "filter",
+    constants: "constant",
+    helpers: "helper",
+    scripts: "script",
+    styles: "style",
+    types: "types",
+    settings: "setting",
+    assets: "asset",
+}
+
+function toSingular(name) {
+    if (!name) {
+        return name
+    }
+    if (PLURAL_MAP[name]) {
+        return PLURAL_MAP[name]
+    }
+    if (name.endsWith("ies") && name.length > 4) {
+        return name.slice(0, -3) + "y"
+    }
+    if (/(?:[sxz]|[ch|sh])es$/.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 (name.endsWith("s") && !name.endsWith("ss") && name.length > 3) {
+        return name.slice(0, -1)
+    }
+    return name
+}
+
 /**
  * Generate scopes by reading directory names
  * @param {string|string[]} srcDirs - Source directory name(s) relative to cwd
@@ -14,11 +71,13 @@ function generateScopes(srcDirs = "src") {
 
     for (const srcDir of dirs) {
         const resolved = path.resolve(process.cwd(), srcDir)
-        if (!fs.existsSync(resolved)) continue
+        if (!fs.existsSync(resolved)) {
+            continue
+        }
         const scopes = fs
             .readdirSync(resolved, { withFileTypes: true })
             .filter((dirent) => dirent.isDirectory())
-            .map((dirent) => dirent.name.replace(/s$/, ""))
+            .map((dirent) => toSingular(dirent.name))
         allScopes.push(...scopes)
     }
 
@@ -33,11 +92,11 @@ function guessCurrentScope() {
     try {
         const output = execSync("git status --porcelain || true").toString().trim()
         const line = output.split("\n").find((r) => r.includes("M  src"))
-        if (!line) return undefined
-        return line
-            .replace(/\//g, "%%")
-            .match(/src%%((\w|-)*)/)?.[1]
-            ?.replace(/s$/, "")
+        if (!line) {
+            return undefined
+        }
+        const rawName = line.replace(/\//g, "%%").match(/src%%((\w|-)*)/)?.[1]
+        return toSingular(rawName)
     } catch {
         return undefined
     }

package/src/eslint/base.cjs

@@ -5,23 +5,40 @@ module.exports = {
         es2021: true,
         node: true,
     },
+    parser: "@typescript-eslint/parser",
     extends: [
         "eslint:recommended",
         "plugin:@typescript-eslint/recommended",
         "plugin:import/recommended",
-        "standard",
         "prettier",
         "plugin:prettier/recommended",
     ],
     parserOptions: {
         ecmaVersion: "latest",
-        parser: "@typescript-eslint/parser",
         sourceType: "module",
     },
     plugins: ["@typescript-eslint", "prettier", "import"],
     rules: {
         // Prettier 集成
-        "prettier/prettier": ["error", { singleQuote: false, tabWidth: 4 }],
+        "prettier/prettier": [
+            "error",
+            {
+                singleQuote: false,
+                tabWidth: 4,
+                semi: false,
+                trailingComma: "all",
+                endOfLine: "lf",
+            },
+        ],
+        // 格式化与风格
+        indent: ["error", 4],
+        semi: ["error", "never"],
+        quotes: ["error", "double", { avoidEscape: false, allowTemplateLiterals: true }],
+        curly: ["error", "all"],
+        "comma-dangle": ["error", "always-multiline"],
+        "object-curly-spacing": ["error", "always"],
+        "array-bracket-spacing": ["error", "never"],
+
         // Import 相关
         "import/no-unresolved": "off",
         "import/extensions": [
@@ -29,12 +46,16 @@ module.exports = {
             "ignorePackages",
             { js: "never", jsx: "never", ts: "never", tsx: "never" },
         ],
-        "import/prefer-default-export": ["off"],
+        "import/prefer-default-export": "off",
         "import/no-extraneous-dependencies": "off",
+
         // TypeScript
         "@typescript-eslint/no-redeclare": "error",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-unused-vars": "off",
+
         // 常用关闭
-        "no-console": ["off"],
+        "no-console": "off",
         "no-plusplus": "off",
         "no-shadow": "off",
         "no-underscore-dangle": "off",
@@ -42,14 +63,16 @@ module.exports = {
         "no-undef": "off",
         "no-unused-vars": "off",
         "no-param-reassign": "off",
-        "@typescript-eslint/no-unused-vars": "off",
         "no-redeclare": "off",
         "prefer-promise-reject-errors": "off",
-        // 引号规则
-        quotes: ["error", "double", { avoidEscape: false, allowTemplateLiterals: true }],
+
+        // Standard JS 风格规则已通过手动配置实现，不再依赖 eslint-config-standard
+        "style/quotes": "off",
+        "style/semi": "off",
     },
     settings: {
         "import/parsers": { "@typescript-eslint/parser": [".ts", ".tsx"] },
         "import/resolver": { typescript: {} },
     },
 }
+

package/src/eslint/flat/_shared.mjs

@@ -4,13 +4,31 @@
  * Prettier plugin rules — mirrors base.cjs prettier/prettier config
  */
 export const prettierRules = {
-    "prettier/prettier": ["error", { singleQuote: false, tabWidth: 4 }],
+    "prettier/prettier": [
+        "error",
+        {
+            singleQuote: false,
+            tabWidth: 4,
+            semi: false,
+            trailingComma: "all",
+            endOfLine: "lf",
+        },
+    ],
 }
 
 /**
  * Common rules shared across all flat config levels — mirrors base.cjs rules
  */
 export const commonRules = {
+    // 缩进与换行
+    indent: ["error", 4],
+    semi: ["error", "never"],
+    quotes: ["error", "double", { avoidEscape: false, allowTemplateLiterals: true }],
+    curly: ["error", "all"],
+    "comma-dangle": ["error", "always-multiline"],
+    "object-curly-spacing": ["error", "always"],
+    "array-bracket-spacing": ["error", "never"],
+
     // Import rules (using import-x for flat config compatibility)
     "import-x/no-unresolved": "off",
     "import-x/extensions": [
@@ -20,8 +38,12 @@ export const commonRules = {
     ],
     "import-x/prefer-default-export": "off",
     "import-x/no-extraneous-dependencies": "off",
+
     // TypeScript
     "@typescript-eslint/no-redeclare": "error",
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-unused-vars": "off",
+
     // Commonly disabled
     "no-console": "off",
     "no-plusplus": "off",
@@ -31,11 +53,12 @@ export const commonRules = {
     "no-undef": "off",
     "no-unused-vars": "off",
     "no-param-reassign": "off",
-    "@typescript-eslint/no-unused-vars": "off",
     "no-redeclare": "off",
     "prefer-promise-reject-errors": "off",
-    // Quotes
-    quotes: ["error", "double", { avoidEscape: false, allowTemplateLiterals: true }],
+
+    // Standard JS uses @stylistic style/quotes — disable to avoid conflict
+    "style/quotes": "off",
+    "style/semi": "off",
 }
 
 /**
@@ -53,3 +76,4 @@ export const uniappGlobals = {
     App: true,
     NodeJS: true,
 }
+

package/src/eslint/flat/base.mjs

@@ -43,7 +43,7 @@ export default [
     // eslint-config-prettier MUST be last — disables conflicting ESLint rules
     eslintConfigPrettier,
 
-    // Global language options + shared rules
+    // Global language options for JS/TS
     {
         files: ["**/*.{js,mjs,cjs,ts,mts,cts}"],
         languageOptions: {
@@ -60,6 +60,11 @@ export default [
                 sourceType: "module",
             },
         },
+    },
+
+    // Shared rules for all JS, TS and Vue files
+    {
+        files: ["**/*.{js,mjs,cjs,ts,mts,cts,vue}"],
         rules: {
             ...prettierRules,
             ...commonRules,

package/src/eslint/flat/vue3.mjs

@@ -1,6 +1,8 @@
 // Vue 3 ESLint Flat Config — extends base, adds Vue-specific rules
 
 import pluginVue from "eslint-plugin-vue"
+import tseslint from "typescript-eslint"
+import parserVue from "vue-eslint-parser"
 import baseConfig from "./base.mjs"
 
 export default [
@@ -8,8 +10,6 @@ export default [
     ...baseConfig,
 
     // Vue 3 essential rules
-    // Replaces: extends: ["plugin:vue/vue3-essential"]
-    // Must scope to .vue files only
     ...pluginVue.configs["flat/essential"].map((config) => ({
         ...config,
         files: ["**/*.vue"],
@@ -19,15 +19,23 @@ export default [
     {
         files: ["**/*.vue"],
         languageOptions: {
+            parser: parserVue,
             parserOptions: {
-                parser: "@typescript-eslint/parser",
+                parser: tseslint.parser,
                 sourceType: "module",
+                ecmaVersion: "latest",
+                extraFileExtensions: [".vue"],
             },
         },
         rules: {
             "vue/multi-word-component-names": "off",
             "@typescript-eslint/no-explicit-any": "off",
             "vue/no-mutating-props": ["error", { shallowOnly: true }],
+            "vue/html-indent": ["error", 4],
+            "vue/script-indent": "off",
+            "vue/html-self-closing": "off",
+            "vue/max-attributes-per-line": "off",
+            "vue/singleline-html-element-content-newline": "off",
         },
     },
 
@@ -44,3 +52,4 @@ export default [
         },
     },
 ]
+

package/src/eslint/vue3.cjs

@@ -3,7 +3,13 @@ const base = require("./base.cjs")
 
 module.exports = {
     ...base,
+    parser: "vue-eslint-parser",
     extends: [...base.extends, "plugin:vue/vue3-essential"],
+    parserOptions: {
+        ...base.parserOptions,
+        parser: "@typescript-eslint/parser",
+        extraFileExtensions: [".vue"],
+    },
     plugins: [...base.plugins, "vue"],
     overrides: [
         {
@@ -19,5 +25,11 @@ module.exports = {
         "vue/multi-word-component-names": "off",
         "@typescript-eslint/no-explicit-any": "off",
         "vue/no-mutating-props": ["error", { shallowOnly: true }],
+        "vue/html-indent": ["error", 4],
+        "vue/script-indent": "off",
+        "vue/html-self-closing": "off",
+        "vue/max-attributes-per-line": "off",
+        "vue/singleline-html-element-content-newline": "off",
     },
 }
+

package/src/gitattributes

@@ -1,4 +1,10 @@
-* text eol=lf
+# Automatically normalize line endings (to LF) for all text-based files.
+* text=auto eol=lf
+
+# Windows scripts — must use CRLF
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf
+*.{ps1,[pP][sS]1} text eol=crlf
 
 # Binary files — do not apply EOL conversion
 *.aar binary
@@ -16,4 +22,4 @@
 *.woff binary
 *.woff2 binary
 *.apk binary
-*.plist binary
+*.plist binary

package/src/prettier/index.cjs

@@ -10,8 +10,17 @@ module.exports = {
     htmlWhitespaceSensitivity: "ignore",
     overrides: [
         {
-            files: "*.json",
-            options: { trailingComma: "none" },
+            files: ["*.json", "*.json5"],
+            options: {
+                tabWidth: 2,
+                trailingComma: "none",
+            },
+        },
+        {
+            files: ["*.yml", "*.yaml"],
+            options: {
+                tabWidth: 2,
+            },
         },
         {
             files: "*.nvue",
@@ -19,3 +28,4 @@ module.exports = {
         },
     ],
 }
+