@huaiyou/hooks-git 2.1.2 → 2.2.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @huaiyou/hooks-git
 
+## 2.2.1
+
+### Patch Changes
+
+- Fix build issue with function naming conflicts
+
+## 2.2.0
+
+### Minor Changes
+
+- Add Chinese error message wrappers for commitlint and lint-staged
+  - Detect complex tsconfig and use .cjs config files (no ts-node needed)
+  - Add wrapper CLI to translate error messages to Chinese
+
 ## 2.1.2
 
 ### Patch Changes

package/dist/cli.cjs

@@ -14,7 +14,7 @@ const cac__default = /*#__PURE__*/_interopDefaultCompat(cac);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const picocolors__default = /*#__PURE__*/_interopDefaultCompat(picocolors);
 
-const version = "2.1.2";
+const version = "2.2.1";
 
 const logger = {
   /**
@@ -75,6 +75,15 @@ const updatePackageJson = async (callback) => {
   await fs__default.writeJson(pkgPath, newPkg, { spaces: 2 });
 };
 
+function checkComplexTsConfig() {
+  try {
+    const tsconfigPath = node_path.resolve(process.cwd(), "tsconfig.json");
+    const tsconfig = fs__default.readJsonSync(tsconfigPath);
+    return tsconfig.files === "" || Array.isArray(tsconfig.files) && tsconfig.files.length === 0 && tsconfig.references;
+  } catch {
+    return false;
+  }
+}
 const init = async () => {
   logger.box("Initializing @huaiyou/hooks-git");
   const gitDirPath = node_path.resolve(process.cwd(), ".git");
@@ -105,28 +114,46 @@ const init = async () => {
   }
   try {
     await runCommand(pm === "yarn" ? "npx" : pm, ["husky", "install"]);
-  } catch (e) {
+  } catch {
     logger.error("Failed to initialize husky.");
   }
   logger.info("Adding hooks...");
   const huskyDir = node_path.resolve(process.cwd(), ".husky");
   const commitMsgPath = node_path.resolve(huskyDir, "commit-msg");
-  const commitMsgContent = `npx --no -- commitlint --edit \${1}
+  const commitMsgContent = `npx --no -- @huaiyou/hooks-git/wrappers commitlint --edit \${1}
 `;
   await fs__default.outputFile(commitMsgPath, commitMsgContent, { mode: 493 });
   const preCommitPath = node_path.resolve(huskyDir, "pre-commit");
-  const preCommitContent = `npx lint-staged
+  const preCommitContent = `npx --no -- @huaiyou/hooks-git/wrappers lint-staged
 `;
   await fs__default.outputFile(preCommitPath, preCommitContent, { mode: 493 });
   logger.info("Creating configuration files...");
   const isModule = pkg.type === "module";
   const isTsProject = fs__default.existsSync(node_path.resolve(process.cwd(), "tsconfig.json"));
-  const commitlintFile = isTsProject ? "commitlint.config.ts" : isModule ? "commitlint.config.cjs" : "commitlint.config.js";
+  const hasComplexTsConfig = isTsProject && checkComplexTsConfig();
+  let commitlintFile;
+  let lintStagedFile;
+  if (hasComplexTsConfig) {
+    commitlintFile = "commitlint.config.cjs";
+    lintStagedFile = "lint-staged.config.cjs";
+  } else if (isTsProject) {
+    commitlintFile = "commitlint.config.ts";
+    lintStagedFile = "lint-staged.config.ts";
+  } else if (isModule) {
+    commitlintFile = "commitlint.config.cjs";
+    lintStagedFile = "lint-staged.config.cjs";
+  } else {
+    commitlintFile = "commitlint.config.js";
+    lintStagedFile = "lint-staged.config.js";
+  }
   if (!fs__default.existsSync(node_path.resolve(process.cwd(), commitlintFile))) {
     let content = "";
-    if (isTsProject) {
+    if (commitlintFile.endsWith(".ts")) {
       content = `import { commitlintConfig } from '@huaiyou/hooks-git';
 export default commitlintConfig;
+`;
+    } else if (commitlintFile.endsWith(".cjs")) {
+      content = `module.exports = require('@huaiyou/hooks-git/commitlint');
 `;
     } else {
       content = `module.exports = require('@huaiyou/hooks-git/commitlint');
@@ -137,12 +164,15 @@ export default commitlintConfig;
   } else {
     logger.warn("commitlint config already exists. Skipping...");
   }
-  const lintStagedFile = isTsProject ? "lint-staged.config.ts" : isModule ? "lint-staged.config.cjs" : "lint-staged.config.js";
   if (!fs__default.existsSync(node_path.resolve(process.cwd(), lintStagedFile))) {
     let content = "";
-    if (isTsProject) {
+    if (lintStagedFile.endsWith(".ts")) {
       content = `import { createLintStagedConfig } from '@huaiyou/hooks-git';
 export default createLintStagedConfig();
+`;
+    } else if (lintStagedFile.endsWith(".cjs")) {
+      content = `const { createLintStagedConfig } = require('@huaiyou/hooks-git/lint-staged');
+module.exports = createLintStagedConfig();
 `;
     } else {
       content = `const { createLintStagedConfig } = require('@huaiyou/hooks-git/lint-staged');
@@ -154,13 +184,6 @@ module.exports = createLintStagedConfig();
   } else {
     logger.warn("lint-staged config already exists. Skipping...");
   }
-  if (isTsProject) {
-    const hasTsNode = pkg.devDependencies && pkg.devDependencies["ts-node"] || pkg.dependencies && pkg.dependencies["ts-node"];
-    if (!hasTsNode) {
-      logger.info("Detected TypeScript project. Installing ts-node...");
-      await runCommand("pnpm", ["add", "-D", "ts-node"]);
-    }
-  }
   logger.info("Updating package.json scripts...");
   await updatePackageJson((pkg2) => {
     pkg2.scripts = pkg2.scripts || {};

package/dist/cli.mjs

@@ -6,7 +6,7 @@ import { consola } from 'consola';
 import { execa } from 'execa';
 import picocolors from 'picocolors';
 
-const version = "2.1.2";
+const version = "2.2.1";
 
 const logger = {
   /**
@@ -67,6 +67,15 @@ const updatePackageJson = async (callback) => {
   await fs.writeJson(pkgPath, newPkg, { spaces: 2 });
 };
 
+function checkComplexTsConfig() {
+  try {
+    const tsconfigPath = resolve(process.cwd(), "tsconfig.json");
+    const tsconfig = fs.readJsonSync(tsconfigPath);
+    return tsconfig.files === "" || Array.isArray(tsconfig.files) && tsconfig.files.length === 0 && tsconfig.references;
+  } catch {
+    return false;
+  }
+}
 const init = async () => {
   logger.box("Initializing @huaiyou/hooks-git");
   const gitDirPath = resolve(process.cwd(), ".git");
@@ -97,28 +106,46 @@ const init = async () => {
   }
   try {
     await runCommand(pm === "yarn" ? "npx" : pm, ["husky", "install"]);
-  } catch (e) {
+  } catch {
     logger.error("Failed to initialize husky.");
   }
   logger.info("Adding hooks...");
   const huskyDir = resolve(process.cwd(), ".husky");
   const commitMsgPath = resolve(huskyDir, "commit-msg");
-  const commitMsgContent = `npx --no -- commitlint --edit \${1}
+  const commitMsgContent = `npx --no -- @huaiyou/hooks-git/wrappers commitlint --edit \${1}
 `;
   await fs.outputFile(commitMsgPath, commitMsgContent, { mode: 493 });
   const preCommitPath = resolve(huskyDir, "pre-commit");
-  const preCommitContent = `npx lint-staged
+  const preCommitContent = `npx --no -- @huaiyou/hooks-git/wrappers lint-staged
 `;
   await fs.outputFile(preCommitPath, preCommitContent, { mode: 493 });
   logger.info("Creating configuration files...");
   const isModule = pkg.type === "module";
   const isTsProject = fs.existsSync(resolve(process.cwd(), "tsconfig.json"));
-  const commitlintFile = isTsProject ? "commitlint.config.ts" : isModule ? "commitlint.config.cjs" : "commitlint.config.js";
+  const hasComplexTsConfig = isTsProject && checkComplexTsConfig();
+  let commitlintFile;
+  let lintStagedFile;
+  if (hasComplexTsConfig) {
+    commitlintFile = "commitlint.config.cjs";
+    lintStagedFile = "lint-staged.config.cjs";
+  } else if (isTsProject) {
+    commitlintFile = "commitlint.config.ts";
+    lintStagedFile = "lint-staged.config.ts";
+  } else if (isModule) {
+    commitlintFile = "commitlint.config.cjs";
+    lintStagedFile = "lint-staged.config.cjs";
+  } else {
+    commitlintFile = "commitlint.config.js";
+    lintStagedFile = "lint-staged.config.js";
+  }
   if (!fs.existsSync(resolve(process.cwd(), commitlintFile))) {
     let content = "";
-    if (isTsProject) {
+    if (commitlintFile.endsWith(".ts")) {
       content = `import { commitlintConfig } from '@huaiyou/hooks-git';
 export default commitlintConfig;
+`;
+    } else if (commitlintFile.endsWith(".cjs")) {
+      content = `module.exports = require('@huaiyou/hooks-git/commitlint');
 `;
     } else {
       content = `module.exports = require('@huaiyou/hooks-git/commitlint');
@@ -129,12 +156,15 @@ export default commitlintConfig;
   } else {
     logger.warn("commitlint config already exists. Skipping...");
   }
-  const lintStagedFile = isTsProject ? "lint-staged.config.ts" : isModule ? "lint-staged.config.cjs" : "lint-staged.config.js";
   if (!fs.existsSync(resolve(process.cwd(), lintStagedFile))) {
     let content = "";
-    if (isTsProject) {
+    if (lintStagedFile.endsWith(".ts")) {
       content = `import { createLintStagedConfig } from '@huaiyou/hooks-git';
 export default createLintStagedConfig();
+`;
+    } else if (lintStagedFile.endsWith(".cjs")) {
+      content = `const { createLintStagedConfig } = require('@huaiyou/hooks-git/lint-staged');
+module.exports = createLintStagedConfig();
 `;
     } else {
       content = `const { createLintStagedConfig } = require('@huaiyou/hooks-git/lint-staged');
@@ -146,13 +176,6 @@ module.exports = createLintStagedConfig();
   } else {
     logger.warn("lint-staged config already exists. Skipping...");
   }
-  if (isTsProject) {
-    const hasTsNode = pkg.devDependencies && pkg.devDependencies["ts-node"] || pkg.dependencies && pkg.dependencies["ts-node"];
-    if (!hasTsNode) {
-      logger.info("Detected TypeScript project. Installing ts-node...");
-      await runCommand("pnpm", ["add", "-D", "ts-node"]);
-    }
-  }
   logger.info("Updating package.json scripts...");
   await updatePackageJson((pkg2) => {
     pkg2.scripts = pkg2.scripts || {};

package/dist/wrappers/cli.cjs

@@ -0,0 +1,137 @@
+#!/usr/bin/env node
+'use strict';
+
+const cac = require('cac');
+const execa = require('execa');
+
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
+
+const cac__default = /*#__PURE__*/_interopDefaultCompat(cac);
+
+const errorMessages$1 = {
+  // 类型相关
+  "type must be one of": "\u63D0\u4EA4\u7C7B\u578B\u5FC5\u987B\u662F\u4EE5\u4E0B\u4E4B\u4E00",
+  "type must not be empty": "\u63D0\u4EA4\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A",
+  "type must be lower case": "\u63D0\u4EA4\u7C7B\u578B\u5FC5\u987B\u662F\u5C0F\u5199",
+  // 主题相关
+  "subject must not be empty": "\u63D0\u4EA4\u4E3B\u9898\u4E0D\u80FD\u4E3A\u7A7A",
+  "subject must not end with full stop": "\u63D0\u4EA4\u4E3B\u9898\u4E0D\u80FD\u4EE5\u53E5\u53F7\u7ED3\u5C3E",
+  "subject must be lower case": "\u63D0\u4EA4\u4E3B\u9898\u5FC5\u987B\u662F\u5C0F\u5199",
+  // 长度相关
+  "header must not be longer than": "\u63D0\u4EA4\u5934\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
+  "body lines must not be longer than": "\u63D0\u4EA4\u6B63\u6587\u6BCF\u884C\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
+  "footer lines must not be longer than": "\u63D0\u4EA4\u811A\u6CE8\u6BCF\u884C\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
+  // 通用
+  "must match the format": "\u5FC5\u987B\u5339\u914D\u683C\u5F0F",
+  "must be": "\u5FC5\u987B\u662F"
+};
+function translateError$1(message) {
+  for (const [en, zh] of Object.entries(errorMessages$1)) {
+    if (message.includes(en)) {
+      return message.replace(en, zh);
+    }
+  }
+  return message;
+}
+async function runCommitlint(args) {
+  try {
+    await execa.execa("commitlint", args, {
+      stdio: "inherit",
+      reject: false
+    });
+  } catch (error) {
+    const err = error;
+    if (err.stdout) {
+      const translated = translateError$1(err.stdout);
+      process.stderr.write(translated + "\n");
+    }
+    if (err.stderr) {
+      const translated = translateError$1(err.stderr);
+      process.stderr.write(translated + "\n");
+    }
+    if (err.message) {
+      const translated = translateError$1(err.message);
+      process.stderr.write(translated + "\n");
+    }
+    process.exit(1);
+  }
+}
+
+const errorMessages = {
+  // 配置相关
+  "Failed to read config from file": "\u65E0\u6CD5\u8BFB\u53D6\u914D\u7F6E\u6587\u4EF6",
+  "could not find any valid configuration": "\u627E\u4E0D\u5230\u6709\u6548\u7684\u914D\u7F6E",
+  "No valid configurations found": "\u627E\u4E0D\u5230\u6709\u6548\u7684\u914D\u7F6E",
+  // 文件相关
+  "Running tasks on": "\u6B63\u5728\u68C0\u67E5\u6587\u4EF6",
+  "Applying modifications from tasks": "\u5E94\u7528\u4EFB\u52A1\u4FEE\u6539",
+  "Restoring unstaged changes": "\u6062\u590D\u672A\u6682\u5B58\u7684\u66F4\u6539",
+  // 任务相关
+  "Running tasks for staged files": "\u5BF9\u6682\u5B58\u6587\u4EF6\u8FD0\u884C\u4EFB\u52A1",
+  "No staged files found": "\u6CA1\u6709\u627E\u5230\u6682\u5B58\u7684\u6587\u4EF6",
+  "All files match patterns": "\u6240\u6709\u6587\u4EF6\u90FD\u5339\u914D\u5230\u6A21\u5F0F",
+  // 错误相关
+  "Something went wrong": "\u51FA\u9519\u4E86",
+  "Command failed": "\u547D\u4EE4\u6267\u884C\u5931\u8D25",
+  Task: "\u4EFB\u52A1",
+  failed: "\u5931\u8D25",
+  passed: "\u901A\u8FC7",
+  skipped: "\u8DF3\u8FC7"
+};
+function translateError(message) {
+  let translated = message;
+  for (const [en, zh] of Object.entries(errorMessages)) {
+    translated = translated.replace(new RegExp(en, "g"), zh);
+  }
+  return translated;
+}
+function translateLine(line) {
+  if (!line.trim() || /^[\s─│┌┐└┘]+$/g.test(line)) {
+    return line;
+  }
+  return translateError(line);
+}
+async function runLintStaged() {
+  try {
+    const { stdout, stderr } = await execa.execa("lint-staged", [], {
+      stdio: "pipe"
+    });
+    if (stdout) {
+      const lines = stdout.split("\n");
+      lines.forEach((line) => {
+        process.stdout.write(translateLine(line) + "\n");
+      });
+    }
+    if (stderr) {
+      const lines = stderr.split("\n");
+      lines.forEach((line) => {
+        process.stderr.write(translateLine(line) + "\n");
+      });
+    }
+  } catch (error) {
+    const err = error;
+    if (err.stdout) {
+      const lines = err.stdout.split("\n");
+      lines.forEach((line) => {
+        process.stdout.write(translateLine(line) + "\n");
+      });
+    }
+    if (err.stderr) {
+      const lines = err.stderr.split("\n");
+      lines.forEach((line) => {
+        process.stderr.write(translateLine(line) + "\n");
+      });
+    }
+    process.exit(1);
+  }
+}
+
+const cli = cac__default("hy-hooks-git-wrapper");
+cli.command("commitlint [...args]", "Run commitlint with Chinese error messages").action(async (args) => {
+  await runCommitlint(args);
+});
+cli.command("lint-staged", "Run lint-staged with Chinese error messages").action(async () => {
+  await runLintStaged();
+});
+cli.help();
+cli.parse();

package/dist/wrappers/cli.d.cts

@@ -0,0 +1 @@
+

package/dist/wrappers/cli.d.mts

@@ -0,0 +1 @@
+

package/dist/wrappers/cli.d.ts

@@ -0,0 +1 @@
+

package/dist/wrappers/cli.mjs

@@ -0,0 +1,131 @@
+#!/usr/bin/env node
+import cac from 'cac';
+import { execa } from 'execa';
+
+const errorMessages$1 = {
+  // 类型相关
+  "type must be one of": "\u63D0\u4EA4\u7C7B\u578B\u5FC5\u987B\u662F\u4EE5\u4E0B\u4E4B\u4E00",
+  "type must not be empty": "\u63D0\u4EA4\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A",
+  "type must be lower case": "\u63D0\u4EA4\u7C7B\u578B\u5FC5\u987B\u662F\u5C0F\u5199",
+  // 主题相关
+  "subject must not be empty": "\u63D0\u4EA4\u4E3B\u9898\u4E0D\u80FD\u4E3A\u7A7A",
+  "subject must not end with full stop": "\u63D0\u4EA4\u4E3B\u9898\u4E0D\u80FD\u4EE5\u53E5\u53F7\u7ED3\u5C3E",
+  "subject must be lower case": "\u63D0\u4EA4\u4E3B\u9898\u5FC5\u987B\u662F\u5C0F\u5199",
+  // 长度相关
+  "header must not be longer than": "\u63D0\u4EA4\u5934\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
+  "body lines must not be longer than": "\u63D0\u4EA4\u6B63\u6587\u6BCF\u884C\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
+  "footer lines must not be longer than": "\u63D0\u4EA4\u811A\u6CE8\u6BCF\u884C\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
+  // 通用
+  "must match the format": "\u5FC5\u987B\u5339\u914D\u683C\u5F0F",
+  "must be": "\u5FC5\u987B\u662F"
+};
+function translateError$1(message) {
+  for (const [en, zh] of Object.entries(errorMessages$1)) {
+    if (message.includes(en)) {
+      return message.replace(en, zh);
+    }
+  }
+  return message;
+}
+async function runCommitlint(args) {
+  try {
+    await execa("commitlint", args, {
+      stdio: "inherit",
+      reject: false
+    });
+  } catch (error) {
+    const err = error;
+    if (err.stdout) {
+      const translated = translateError$1(err.stdout);
+      process.stderr.write(translated + "\n");
+    }
+    if (err.stderr) {
+      const translated = translateError$1(err.stderr);
+      process.stderr.write(translated + "\n");
+    }
+    if (err.message) {
+      const translated = translateError$1(err.message);
+      process.stderr.write(translated + "\n");
+    }
+    process.exit(1);
+  }
+}
+
+const errorMessages = {
+  // 配置相关
+  "Failed to read config from file": "\u65E0\u6CD5\u8BFB\u53D6\u914D\u7F6E\u6587\u4EF6",
+  "could not find any valid configuration": "\u627E\u4E0D\u5230\u6709\u6548\u7684\u914D\u7F6E",
+  "No valid configurations found": "\u627E\u4E0D\u5230\u6709\u6548\u7684\u914D\u7F6E",
+  // 文件相关
+  "Running tasks on": "\u6B63\u5728\u68C0\u67E5\u6587\u4EF6",
+  "Applying modifications from tasks": "\u5E94\u7528\u4EFB\u52A1\u4FEE\u6539",
+  "Restoring unstaged changes": "\u6062\u590D\u672A\u6682\u5B58\u7684\u66F4\u6539",
+  // 任务相关
+  "Running tasks for staged files": "\u5BF9\u6682\u5B58\u6587\u4EF6\u8FD0\u884C\u4EFB\u52A1",
+  "No staged files found": "\u6CA1\u6709\u627E\u5230\u6682\u5B58\u7684\u6587\u4EF6",
+  "All files match patterns": "\u6240\u6709\u6587\u4EF6\u90FD\u5339\u914D\u5230\u6A21\u5F0F",
+  // 错误相关
+  "Something went wrong": "\u51FA\u9519\u4E86",
+  "Command failed": "\u547D\u4EE4\u6267\u884C\u5931\u8D25",
+  Task: "\u4EFB\u52A1",
+  failed: "\u5931\u8D25",
+  passed: "\u901A\u8FC7",
+  skipped: "\u8DF3\u8FC7"
+};
+function translateError(message) {
+  let translated = message;
+  for (const [en, zh] of Object.entries(errorMessages)) {
+    translated = translated.replace(new RegExp(en, "g"), zh);
+  }
+  return translated;
+}
+function translateLine(line) {
+  if (!line.trim() || /^[\s─│┌┐└┘]+$/g.test(line)) {
+    return line;
+  }
+  return translateError(line);
+}
+async function runLintStaged() {
+  try {
+    const { stdout, stderr } = await execa("lint-staged", [], {
+      stdio: "pipe"
+    });
+    if (stdout) {
+      const lines = stdout.split("\n");
+      lines.forEach((line) => {
+        process.stdout.write(translateLine(line) + "\n");
+      });
+    }
+    if (stderr) {
+      const lines = stderr.split("\n");
+      lines.forEach((line) => {
+        process.stderr.write(translateLine(line) + "\n");
+      });
+    }
+  } catch (error) {
+    const err = error;
+    if (err.stdout) {
+      const lines = err.stdout.split("\n");
+      lines.forEach((line) => {
+        process.stdout.write(translateLine(line) + "\n");
+      });
+    }
+    if (err.stderr) {
+      const lines = err.stderr.split("\n");
+      lines.forEach((line) => {
+        process.stderr.write(translateLine(line) + "\n");
+      });
+    }
+    process.exit(1);
+  }
+}
+
+const cli = cac("hy-hooks-git-wrapper");
+cli.command("commitlint [...args]", "Run commitlint with Chinese error messages").action(async (args) => {
+  await runCommitlint(args);
+});
+cli.command("lint-staged", "Run lint-staged with Chinese error messages").action(async () => {
+  await runLintStaged();
+});
+cli.help();
+cli.parse();

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@huaiyou/hooks-git",
-  "version": "2.1.2",
+  "version": "2.2.1",
   "description": "Git hooks configuration with Husky, Commitlint and Lint-staged",
   "bin": {
-    "hy-hooks-git": "./dist/cli.mjs"
+    "hy-hooks-git": "./dist/cli.mjs",
+    "hy-hooks-commitlint": "./dist/wrappers/cli.mjs",
+    "hy-hooks-lint-staged": "./dist/wrappers/cli.mjs"
   },
   "files": [
     "dist",
@@ -29,6 +31,10 @@
       "require": "./dist/lint-staged.cjs",
       "import": "./dist/lint-staged.mjs",
       "types": "./dist/lint-staged.d.ts"
+    },
+    "./wrappers": {
+      "require": "./dist/wrappers/cli.cjs",
+      "import": "./dist/wrappers/cli.mjs"
     }
   },
   "scripts": {