@done-coding/cli-utils 0.8.0 → 0.8.1

package/README.md

@@ -1,7 +1,109 @@
 # @done-coding/cli-utils
 
-cli utils
+CLI 通用工具库 - 为 done-coding CLI 生态系统提供基础工具函数
 
-## 使用
+[![npm version](https://badge.fury.io/js/@done-coding%2Fcli-utils.svg)](https://www.npmjs.com/package/@done-coding/cli-utils)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
+## 安装
+
+```bash
 npm install @done-coding/cli-utils
+# 或
+pnpm add @done-coding/cli-utils
+```
+
+## 快速开始
+
+```bash
+# 作为依赖库使用，不提供独立的 CLI 命令
+```
+
+## 功能特性
+
+- ✅ **基础工具**: 提供通用的 CLI 工具函数
+- 🔧 **类型定义**: 统一的 TypeScript 类型定义
+- 📝 **配置处理**: 配置文件读取和处理工具
+- 🎨 **命令行美化**: 基于 chalk 的命令行输出美化
+- 🔄 **数据处理**: 基于 lodash 的数据操作工具
+
+## API 文档
+
+本包是一个工具库，不提供独立的 CLI 命令，主要为其他 done-coding CLI 包提供基础功能。
+
+### 主要依赖
+
+- **chalk**: 命令行输出美化
+- **json5**: JSON5 格式支持
+- **lodash**: 数据操作工具函数
+- **prompts**: 交互式命令行提示
+- **semver**: 版本号处理
+- **uuid**: UUID 生成
+- **yargs**: 命令行参数解析
+
+## 使用示例
+
+### 作为依赖使用
+
+```javascript
+import { /* 具体导出内容 */ } from '@done-coding/cli-utils';
+
+// 具体使用方法需要查看包的导出内容
+```
+
+## 编程接口
+
+本包提供了编程接口，具体的导出内容请查看包的类型定义文件。
+
+## 包依赖关系
+
+### 被其他包依赖
+
+`@done-coding/cli-utils` 是基础工具库，被以下包依赖：
+
+- `@done-coding/cli` - 主 CLI 工具
+- `@done-coding/cli-component` - 组件生成工具
+- `@done-coding/cli-config` - 工程配置工具
+- `@done-coding/cli-extract` - 信息提取工具
+- `@done-coding/cli-git` - Git 操作工具
+- `@done-coding/cli-inject` - 信息注入工具
+- `@done-coding/cli-publish` - 项目发布工具
+- `@done-coding/cli-template` - 模板处理工具
+- `create-done-coding` - 项目创建工具
+
+## 贡献指南
+
+我们欢迎贡献！请遵循以下步骤：
+
+1. Fork 本仓库
+2. 创建功能分支：`git checkout -b feature/amazing-feature`
+3. 提交更改：`git commit -m "feat: add amazing feature"`
+4. 推送分支：`git push origin feature/amazing-feature`
+5. 创建 Pull Request
+
+### 开发环境设置
+
+```bash
+# 克隆仓库
+git clone https://gitee.com/done-coding/done-coding-cli.git
+cd done-coding-cli/packages/utils
+
+# 安装依赖
+pnpm install
+
+# 开发模式
+pnpm dev
+
+# 构建
+pnpm build
+```
+
+## 许可证
+
+MIT © [JustSoSu](https://gitee.com/done-coding)
+
+## 相关链接
+
+- [主 CLI 工具](https://www.npmjs.com/package/@done-coding/cli)
+- [Gitee 仓库](https://gitee.com/done-coding/done-coding-cli)
+- [更新日志](./CHANGELOG.md)

package/es/index.mjs

@@ -1,56 +1,55 @@
 #!/usr/bin/env node
-import p from "chalk";
-import { default as Ie } from "chalk";
+import q from "chalk";
 import l from "node:path";
-import m, { existsSync as I, mkdirSync as q, writeFileSync as b, readFileSync as R } from "node:fs";
-import C from "crypto";
-import z from "prompts";
-import Q from "yargs";
-import { hideBin as Z } from "yargs/helpers";
-import { execSync as u } from "node:child_process";
+import m, { existsSync as v, mkdirSync as z, writeFileSync as P, readFileSync as _ } from "node:fs";
+import R from "crypto";
+import Q from "prompts";
+import Z from "yargs";
+import { hideBin as tt } from "yargs/helpers";
+import { execSync as g } from "node:child_process";
 import F from "json5";
 export * from "json5";
 import { default as Ae } from "json5";
-import tt from "lodash.merge";
-import et from "semver";
-import { tmpdir as rt, homedir as st } from "node:os";
+import et from "lodash.merge";
+import rt from "semver";
+import { tmpdir as st, homedir as nt } from "node:os";
 import { v4 as ot } from "uuid";
-import { v4 as be } from "uuid";
+import { v4 as we } from "uuid";
 import { default as Te } from "lodash.get";
 import { default as Ne } from "lodash.set";
-import { default as Ge } from "lodash.curry";
-import _ from "pinyin";
-const g = Object.assign(
-  (t, ...e) => console.log(...e.map((r) => p[t](r))),
-  {
+import { default as Be } from "lodash.curry";
+import y from "pinyin";
+const G = (t) => {
+  const e = (...[r, ...n]) => t(q[r](...n));
+  return Object.assign(e, {
     /** 成功 */
-    success: (...t) => g("green", ...t),
+    success: (...r) => e("green", ...r),
     /** /步骤 */
-    stage: (...t) => g("blue", ...t),
+    stage: (...r) => e("blue", ...r),
     /** 提示信息 */
-    info: (...t) => g("cyan", ...t),
+    info: (...r) => e("cyan", ...r),
     /** 警告 */
-    warn: (...t) => g("yellow", ...t),
+    warn: (...r) => e("yellow", ...r),
     /** 错误 */
-    error: (...t) => g("red", ...t),
+    error: (...r) => e("red", ...r),
     /** 跳过 */
-    skip: (...t) => g("gray", ...t)
-  }
-), Qt = (t, {
+    skip: (...r) => e("gray", ...r)
+  });
+}, a = G(console.log), Zt = G((t) => t), te = (t, {
   /** 当前目录 */
   currentDir: e = process.cwd(),
   /** 优先找最远的父目录 */
   isFindFarthest: r = !0
 } = {}) => {
-  const o = l.resolve(e).split(l.sep).map((s, n, c) => c.slice(0, n).concat(s).join(l.sep) || l.sep);
-  for (; o.length; ) {
-    const s = r ? o.shift() : o.pop(), n = l.join(s, t);
-    if (m.existsSync(n))
+  const n = l.resolve(e).split(l.sep).map((s, o, c) => c.slice(0, o).concat(s).join(l.sep) || l.sep);
+  for (; n.length; ) {
+    const s = r ? n.shift() : n.pop(), o = l.join(s, t);
+    if (m.existsSync(o))
       return s;
   }
-}, x = "aes-256-cbc", j = 16, O = "hex", w = ":";
-function k(t) {
-  return C.pbkdf2Sync(
+}, k = "aes-256-cbc", x = 16, C = "hex", w = ":";
+function j(t) {
+  return R.pbkdf2Sync(
     t,
     "done-coding-cli-salt",
     // 使用固定的盐值
@@ -61,55 +60,55 @@ function k(t) {
     "sha256"
   );
 }
-function Zt({
+function ee({
   text: t,
   secretKey: e
 }) {
   try {
-    const r = k(e), o = C.randomBytes(j), s = C.createCipheriv(x, r, o);
-    let n = s.update(t);
-    n = Buffer.concat([n, s.final()]);
-    const c = o.toString(O), i = n.toString(O);
+    const r = j(e), n = R.randomBytes(x), s = R.createCipheriv(k, r, n);
+    let o = s.update(t);
+    o = Buffer.concat([o, s.final()]);
+    const c = n.toString(C), i = o.toString(C);
     return `${c}${w}${i}`;
   } catch (r) {
-    return g.error(
+    return a.error(
       `加密失败: ${r instanceof Error ? r.message : String(r)}`
     ), "";
   }
 }
-function te({
+function re({
   encryptedText: t,
   secretKey: e
 }) {
   try {
     if (!t.includes(w))
       return "";
-    const r = k(e), [o, s] = t.split(w);
-    if (o.length !== j * 2)
+    const r = j(e), [n, s] = t.split(w);
+    if (n.length !== x * 2)
       return "";
-    const n = Buffer.from(o, O), c = Buffer.from(s, O), i = C.createDecipheriv(x, r, n);
-    let f = i.update(c);
-    return f = Buffer.concat([f, i.final()]), f.toString();
+    const o = Buffer.from(n, C), c = Buffer.from(s, C), i = R.createDecipheriv(k, r, o);
+    let u = i.update(c);
+    return u = Buffer.concat([u, i.final()]), u.toString();
   } catch (r) {
-    return g.error(
+    return a.error(
       `解密失败: ${r instanceof Error ? r.message : String(r)}`
     ), "";
   }
 }
-const H = (...t) => {
+const U = (...t) => {
   const [e, r = {}] = t;
-  return z(e, {
-    onCancel(o) {
-      return g.error(`退出${o == null ? void 0 : o.name}输入`), process.exit(1);
+  return Q(e, {
+    onCancel(n) {
+      return a.error(`退出${n == null ? void 0 : n.name}输入`), process.exit(1);
     },
     ...r
   });
-}, nt = (t, e) => {
-  t ? g.error(t) : g.error(e.message), e != null && e.stack && g.error(e.stack), process.exit(1);
-}, it = () => {
-  const t = Z(process.argv);
-  return Q(t);
-}, ee = ({
+}, it = (t, e) => {
+  t ? a.error(t) : a.error(e.message), e != null && e.stack && a.error(e.stack), process.exit(1);
+}, ct = () => {
+  const t = tt(process.argv);
+  return Z(t);
+}, se = ({
   rootScriptName: t,
   packageJson: e
 }) => {
@@ -117,51 +116,51 @@ const H = (...t) => {
     return t;
   if (!e)
     return;
-  const { bin: r, name: o } = e;
+  const { bin: r, name: n } = e;
   if (r) {
     if (typeof r == "string")
-      return o.includes("/") ? void 0 : o;
+      return n.includes("/") ? void 0 : n;
     if (typeof r == "object") {
-      const s = Object.entries(r), n = process.argv[1], c = s.filter(([, f]) => n == null ? void 0 : n.endsWith(f));
+      const s = Object.entries(r), o = process.argv[1], c = s.filter(([, u]) => o == null ? void 0 : o.endsWith(u));
       if (c.length !== 1)
         return;
       const [i] = c[0];
       return process.platform === "win32" ? i.toLowerCase() : i;
     }
   }
-}, U = (t, {
+}, H = (t, {
   usage: e,
   version: r,
-  demandCommandCount: o,
+  demandCommandCount: n,
   options: s,
-  positionals: n,
+  positionals: o,
   subcommands: c,
   rootScriptName: i
-}, f) => {
-  let a = t.strict();
-  e && (a = a.usage(`Usage: ${e}`)), o && (a = a.demandCommand(o));
-  const h = "help";
-  return a = a.help(h), r ? a = a.version(r).alias("h", h).alias("v", "version") : a = a.alias("h", h), s && (a = a.options(s)), n && (a = Object.entries(n).reduce((y, [M, d]) => y.positional(M, d), a)), c && (a = a.command(c)), f && i && (a = a.scriptName(i)), a;
-}, re = async ({ handler: t, ...e }) => {
-  const r = await U(it(), e, !0).fail(
-    nt
+}, u) => {
+  let f = t.strict();
+  e && (f = f.usage(`Usage: ${e}`)), n && (f = f.demandCommand(n));
+  const p = "help";
+  return f = f.help(p), r ? f = f.version(r).alias("h", p).alias("v", "version") : f = f.alias("h", p), s && (f = f.options(s)), o && (f = Object.entries(o).reduce((S, [$, h]) => S.positional($, h), f)), c && (f = f.command(c)), u && i && (f = f.scriptName(i)), f;
+}, ne = async ({ handler: t, ...e }) => {
+  const r = await H(ct(), e, !0).fail(
+    it
   ).argv;
   return t ? t(r) : r;
-}, se = (t) => {
-  const { command: e, describe: r, handler: o = () => {
+}, oe = (t) => {
+  const { command: e, describe: r, handler: n = () => {
   }, ...s } = t;
   return {
     command: e,
     describe: r,
-    builder(n) {
-      return U(n, s, !1);
+    builder(o) {
+      return H(o, s, !1);
     },
-    handler: o
+    handler: n
   };
 };
-var ct = /* @__PURE__ */ ((t) => (t.VSCODE = "VsCode", t.CURSOR = "Cursor", t.OTHER = "其他", t))(ct || {});
-const at = async () => {
-  const { editorType: t } = await H([
+var at = /* @__PURE__ */ ((t) => (t.VSCODE = "VsCode", t.CURSOR = "Cursor", t.OTHER = "其他", t))(at || {});
+const ft = async () => {
+  const { editorType: t } = await U([
     {
       name: "editorType",
       type: "select",
@@ -181,29 +180,29 @@ const at = async () => {
 }, lt = {
   Cursor: "cursor",
   VsCode: "code"
-}, ft = (t, e, r) => {
+}, ut = (t, e, r) => {
   try {
-    u(`${t} -v`, { stdio: "ignore" }), u(`${t} ${e}`);
+    g(`${t} -v`, { stdio: "ignore" }), g(`${t} ${e}`);
   } catch {
     r();
   }
 }, gt = (t, e) => {
-  const r = (o) => g.info(`
-      ${o}, 请用编辑器打开 ${t} 进行编辑
+  const r = (n) => a.info(`
+      ${n}, 请用编辑器打开 ${t} 进行编辑
 `);
   switch (e) {
     case "Cursor":
     case "VsCode": {
-      const o = lt[e];
-      ft(o, t, () => {
-        r(`${o}命令未安装`);
+      const n = lt[e];
+      ut(n, t, () => {
+        r(`${n}命令未安装`);
       });
       break;
     }
     default:
       r("其他编辑器");
   }
-}, ut = (t = process.cwd()) => ({
+}, mt = (t = process.cwd()) => ({
   /** 必须保留 */
   rootDir: {
     type: "string",
@@ -212,12 +211,12 @@ const at = async () => {
     /** 必须设置默认值 */
     default: t
   }
-}), oe = ({
+}), ie = ({
   configPathDefault: t,
   rootDirDefault: e
 }) => ({
   /** 必须保留 */
-  ...ut(e),
+  ...mt(e),
   /** 必须保留 */
   configPath: {
     type: "string",
@@ -226,279 +225,275 @@ const at = async () => {
     /** 必须设置默认值 */
     default: t
   }
-}), mt = async (t, e) => {
-  const { configPath: r, rootDir: o } = e, s = l.resolve(o, r), n = l.dirname(s);
-  return I(n) || q(n, {
+}), pt = async (t, e) => {
+  const { configPath: r, rootDir: n } = e, s = l.resolve(n, r), o = l.dirname(s);
+  return v(o) || z(o, {
     recursive: !0
-  }), s.endsWith(".json5") ? (g.info(`json5模式写入 ${s}`), b(s, F.stringify(t, null, 2)), s) : (g.info(`json模式写入 ${s}`), b(s, JSON.stringify(t, null, 2)), s);
-}, ne = async (t, e, {
+  }), s.endsWith(".json5") ? (a.info(`json5模式写入 ${s}`), P(s, F.stringify(t, null, 2)), s) : (a.info(`json模式写入 ${s}`), P(s, JSON.stringify(t, null, 2)), s);
+}, ce = async (t, e, {
   onFileGenerated: r,
-  edit: o = !1
+  edit: n = !1
 } = {}) => {
-  const s = await mt(t, e);
-  if (r == null || r(s), o) {
-    const n = await at();
-    gt(e.configPath, n);
+  const s = await pt(t, e);
+  if (r == null || r(s), n) {
+    const o = await ft();
+    gt(e.configPath, o);
   }
-}, ie = async (t, e) => {
-  const { configPath: r, rootDir: o } = t, s = l.resolve(o, r);
-  if (!I(s)) {
+}, ae = async (t, e) => {
+  const { configPath: r, rootDir: n } = t, s = l.resolve(n, r);
+  if (!v(s)) {
     if (e)
-      return g.info("配置文件不存在，使用onNotExists返回值"), e();
-    const n = `配置文件不存在 ${s}`;
-    throw new Error(n);
+      return a.info("配置文件不存在，使用onNotExists返回值"), e();
+    const o = `配置文件不存在 ${s}`;
+    throw new Error(o);
   }
-  return s.endsWith(".json5") ? (g.info(`json5模式解析 ${s}`), F.parse(R(s, "utf8"))) : (g.info(`json模式解析 ${s}`), JSON.parse(R(s, "utf8")));
-}, ce = async () => {
-  const { useDefaultConfig: t } = await H({
+  return s.endsWith(".json5") ? (a.info(`json5模式解析 ${s}`), F.parse(_(s, "utf8"))) : (a.info(`json模式解析 ${s}`), JSON.parse(_(s, "utf8")));
+}, fe = async () => {
+  const { useDefaultConfig: t } = await U({
     name: "useDefaultConfig",
     type: "confirm",
     message: "使用默认模板配置",
     initial: !0
   });
   return t;
-}, J = "package.json", D = ({
+}, J = "package.json", T = ({
   rootDir: t
 }) => {
   const e = l.resolve(t, J);
-  if (!I(e))
+  if (!v(e))
     throw new Error(`${t}未找到package.json文件`);
-  const r = R(e, "utf-8");
+  const r = _(e, "utf-8");
   return JSON.parse(r);
-}, pt = ({
+}, ht = ({
   rootDir: t,
   pkgJson: e,
   pkgName: r,
-  isDevPkg: o
+  isDevPkg: n
 }) => {
-  const s = e || D({ rootDir: t }), n = o ? s.devDependencies : s.dependencies;
-  let c = n == null ? void 0 : n[r];
+  const s = e || T({ rootDir: t }), o = n ? s.devDependencies : s.dependencies;
+  let c = o == null ? void 0 : o[r];
   if (!c) {
-    const i = o ? s.dependencies : s.devDependencies;
-    c = i == null ? void 0 : i[r], c && console.log(
-      p.yellow(
-        `${o ? "开发" : "生产"}依赖包${r}可能错误的安装在${o ? "dependencies" : "devDependencies"}`
-      )
+    const i = n ? s.dependencies : s.devDependencies;
+    c = i == null ? void 0 : i[r], c && a.warn(
+      `${n ? "开发" : "生产"}依赖包${r}可能错误的安装在${n ? "dependencies" : "devDependencies"}`
     );
     return;
   }
-  return c || console.log(p.cyan(`依赖包${r}未安装`)), c;
-}, ae = ({
+  return c || a.info(`依赖包${r}未安装`), c;
+}, le = ({
   patchConfig: t,
   rootDir: e
 }) => {
   if (!t)
     return;
-  const r = D({ rootDir: e }), o = tt(r, t), s = l.resolve(e, J);
-  b(s, JSON.stringify(o, null, 2), "utf-8");
-}, $ = (t) => {
-  const r = u("git rev-parse --show-toplevel", {
+  const r = T({ rootDir: e }), n = et(r, t), s = l.resolve(e, J);
+  P(s, JSON.stringify(n, null, 2), "utf-8");
+}, I = (t) => {
+  const r = g("git rev-parse --show-toplevel", {
     cwd: t
   }).toString();
   if (!r)
     throw new Error("获取git根目录失败");
   return r.trim();
-}, le = () => {
+}, ue = () => {
   var t;
   try {
-    const e = u("git symbolic-ref --short HEAD", {
+    const e = g("git symbolic-ref --short HEAD", {
       stdio: "ignore"
     });
     return (t = e == null ? void 0 : e.toString()) == null ? void 0 : t.trim();
   } catch {
     try {
-      const r = u("git rev-parse --short HEAD").toString().trim();
-      g.skip(`当前未指向具体某个分支, 当前commit hash: ${r}`);
+      const r = g("git rev-parse --short HEAD").toString().trim();
+      a.skip(`当前未指向具体某个分支, 当前commit hash: ${r}`);
     } finally {
       return;
     }
   }
-}, ht = (t) => {
+}, dt = (t) => {
   const e = t.match(/moving\s+from\s+(.*)\s+to\s+(.*)/);
   if (e) {
-    const [, r, o] = e;
+    const [, r, n] = e;
     return {
       fromBranch: r.trim(),
-      toBranch: o.trim()
+      toBranch: n.trim()
     };
   }
-}, P = 73, dt = (t) => {
+}, A = 73, St = (t) => {
   const r = m.statSync(t).mode;
-  if ((r & P) === P)
+  if ((r & A) === A)
     return;
-  console.log(p.blue(`${t} 没有执行权限 添加... `));
-  const o = r | P;
-  m.chmodSync(t, o), console.log(p.green(`${t} 添加执行权限成功`));
-}, V = (t) => m.existsSync(t), N = async (t) => {
+  a.stage(`${t} 没有执行权限 添加... `);
+  const n = r | A;
+  m.chmodSync(t, n), a.success(`${t} 添加执行权限成功`);
+}, V = (t) => m.existsSync(t), D = async (t) => {
   try {
     return await m.promises.lstat(t), !0;
   } catch (e) {
     return e.code !== "ENOENT";
   }
-}, St = (t, e = !1) => {
+}, Et = (t, e = !1) => {
   V(t) && m.rmSync(t, { recursive: !0, force: e });
-}, fe = async (t, e = !1) => {
-  await N(t) && await m.promises.rm(t, { recursive: !0, force: e });
-}, yt = (t) => m.readFileSync(t, "utf-8"), Et = (t) => m.promises.readFile(t, "utf-8"), ge = (t, e) => JSON.parse(yt(t)) || e, K = async (t, e) => JSON.parse(await Et(t)) || e;
-var S = /* @__PURE__ */ ((t) => (t.PRE_COMMIT = "pre-commit", t.PRE_MERGE_COMMIT = "pre-merge-commit", t.PREPARE_COMMIT_MSG = "prepare-commit-msg", t.COMMIT_MSG = "commit-msg", t.PRE_REBASE = "pre-rebase", t.POST_COMMIT = "post-commit", t.POST_MERGE = "post-merge", t.PRE_PUSH = "pre-push", t))(S || {});
-const _t = "husky", Rt = ".husky", Ct = ({ rootDir: t }) => {
-  const e = $(t), r = pt({
+}, ge = async (t, e = !1) => {
+  await D(t) && await m.promises.rm(t, { recursive: !0, force: e });
+}, yt = (t) => m.readFileSync(t, "utf-8"), _t = (t) => m.promises.readFile(t, "utf-8"), me = (t, e) => JSON.parse(yt(t)) || e, K = async (t, e) => JSON.parse(await _t(t)) || e;
+var d = /* @__PURE__ */ ((t) => (t.PRE_COMMIT = "pre-commit", t.PRE_MERGE_COMMIT = "pre-merge-commit", t.PREPARE_COMMIT_MSG = "prepare-commit-msg", t.COMMIT_MSG = "commit-msg", t.PRE_REBASE = "pre-rebase", t.POST_COMMIT = "post-commit", t.POST_MERGE = "post-merge", t.PRE_PUSH = "pre-push", t))(d || {});
+const Rt = "husky", Ct = ".husky", Ot = ({ rootDir: t }) => {
+  const e = I(t), r = ht({
     rootDir: e,
-    pkgJson: D({ rootDir: e }),
-    pkgName: _t,
+    pkgJson: T({ rootDir: e }),
+    pkgName: Rt,
     isDevPkg: !0
   });
   if (!r)
     throw new Error("husky版本获取失败, 可能husky未安装");
-  const o = r.replace(/^(\^|~)/, ""), s = "<9.0.0";
-  return et.satisfies(o, s) ? (console.log(p.cyan(`${o}符合${s}`)), `#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"`) : (console.log(p.cyan(`${o}不符合${s}`)), "");
-}, Ot = ({ rootDir: t }) => {
-  const e = $(t);
-  return l.resolve(e, Rt);
-}, ue = ({
+  const n = r.replace(/^(\^|~)/, ""), s = "<9.0.0";
+  return rt.satisfies(n, s) ? (a.info(`${n}符合${s}`), `#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"`) : (a.info(`${n}不符合${s}`), "");
+}, vt = ({ rootDir: t }) => {
+  const e = I(t);
+  return l.resolve(e, Ct);
+}, pe = ({
   hookNames: t,
   rootDir: e,
   getCode: r
 }) => {
-  const o = Ot({ rootDir: e });
-  m.existsSync(o) || m.mkdirSync(o, { recursive: !0 }), t.forEach((s) => {
-    const n = l.resolve(o, s), c = m.existsSync(n);
+  const n = vt({ rootDir: e });
+  m.existsSync(n) || m.mkdirSync(n, { recursive: !0 }), t.forEach((s) => {
+    const o = l.resolve(n, s), c = m.existsSync(o);
     let i = r(s);
     if (c)
-      m.readFileSync(n, "utf-8").includes(i) ? console.log(
-        p.gray(`${n} ${s}相关调用 ${i} 已存在 跳过`)
-      ) : (m.appendFileSync(
-        n,
+      m.readFileSync(o, "utf-8").includes(i) ? a.skip(`${o} ${s}相关调用 ${i} 已存在 跳过`) : (m.appendFileSync(
+        o,
         `
 ${i}
 `
-      ), console.log(p.green(`${n} 添加 ${s}相关调用成功`)));
+      ), a.success(`${o} 添加 ${s}相关调用成功`));
     else {
-      const f = Ct({
+      const u = Ot({
         rootDir: e
       });
       m.writeFileSync(
-        n,
-        `${f}
+        o,
+        `${u}
 
 ${i}
 `,
         "utf-8"
-      ), console.log(p.green(`${n} 添加 ${s}相关调用成功`));
+      ), a.success(`${o} 添加 ${s}相关调用成功`);
     }
-    dt(n);
+    St(o);
   });
-}, me = [
+}, he = [
   // HooksNameEnum.PRE_MERGE_COMMIT,
-  S.PREPARE_COMMIT_MSG,
-  S.COMMIT_MSG
-], pe = ({
+  d.PREPARE_COMMIT_MSG,
+  d.COMMIT_MSG
+], de = ({
   hookName: t,
   rootDir: e
 }) => {
-  const r = $(e), o = l.resolve(r, ".git");
+  const r = I(e), n = l.resolve(r, ".git");
   switch (t) {
-    case S.PREPARE_COMMIT_MSG:
-    case S.COMMIT_MSG: {
-      const s = l.resolve(o, "MERGE_MSG");
-      if (I(s))
-        return R(s, "utf-8");
+    case d.PREPARE_COMMIT_MSG:
+    case d.COMMIT_MSG: {
+      const s = l.resolve(n, "MERGE_MSG");
+      if (v(s))
+        return _(s, "utf-8");
     }
   }
   return "";
-}, he = ({
+}, Se = ({
   remoteAlias: t = "origin"
 } = {}) => {
   try {
-    const e = u("git rev-parse HEAD").toString().trim(), r = u('git log -1 --pretty=format:"%an"').toString().trim(), o = u('git log -1 --pretty=format:"%ae"').toString().trim(), s = u('git log -1 --pretty=format:"%s"').toString().trim(), n = u("git config user.name").toString().trim(), c = u("git config user.email").toString().trim(), i = u("git rev-parse --abbrev-ref HEAD").toString().trim();
-    let f = "";
+    const e = g("git rev-parse HEAD").toString().trim(), r = g('git log -1 --pretty=format:"%an"').toString().trim(), n = g('git log -1 --pretty=format:"%ae"').toString().trim(), s = g('git log -1 --pretty=format:"%s"').toString().trim(), o = g("git config user.name").toString().trim(), c = g("git config user.email").toString().trim(), i = g("git rev-parse --abbrev-ref HEAD").toString().trim();
+    let u = "";
     try {
-      f = u(`git config --get remote.${t}.url`).toString().trim();
+      u = g(`git config --get remote.${t}.url`).toString().trim();
     } catch {
-      g.warn("git远程仓库地址获取失败或者不存在");
+      a.warn("git远程仓库地址获取失败或者不存在");
     }
     return {
       lastHash: e,
       lastCommitter: r,
-      lastCommitterPinYin: _(r, {
-        style: _.STYLE_NORMAL,
+      lastCommitterPinYin: y(r, {
+        style: y.STYLE_NORMAL,
         heteronym: !1
       }).join(""),
-      lastCommitEmail: o,
+      lastCommitEmail: n,
       lastCommitMsg: s,
-      userName: n,
-      userNamePinYin: _(n, {
-        style: _.STYLE_NORMAL,
+      userName: o,
+      userNamePinYin: y(o, {
+        style: y.STYLE_NORMAL,
         heteronym: !1
       }).join(""),
       userEmail: c,
       branchName: i,
-      remoteInfo: f ? {
+      remoteInfo: u ? {
         alias: t,
-        url: f
+        url: u
       } : void 0
     };
   } catch (e) {
-    throw g.error("获取git最后提交信息失败"), e;
+    throw a.error("获取git最后提交信息失败"), e;
   }
 }, Y = (t = "") => {
   const e = /\s*Merge\s+branch\s+['|"](.+)['|"]\s+into\s+['|"](.+)['|"]\s*/i, r = t.match(e);
   if (r) {
-    const [, i, f] = r;
+    const [, i, u] = r;
     return {
       fromBranch: i,
-      toBranch: f
+      toBranch: u
     };
   }
-  const o = /\s*Merge\s+branch\s+['|"](.+)['|"]\s+of\s+.+\s+into\s+['|"](.+)['|"]\s*/i, s = t.match(o);
+  const n = /\s*Merge\s+branch\s+['|"](.+)['|"]\s+of\s+.+\s+into\s+['|"](.+)['|"]\s*/i, s = t.match(n);
   if (s) {
-    const [, i, f] = s;
+    const [, i, u] = s;
     return {
       fromBranch: i,
-      toBranch: f
+      toBranch: u
     };
   }
-  const n = /\s*Merge\s+branch\s+['|"](.+)['|"](\s+of)?\s*/i, c = t.match(n);
+  const o = /\s*Merge\s+branch\s+['|"](.+)['|"](\s+of)?\s*/i, c = t.match(o);
   if (c) {
     const [, i] = c;
     return {
       fromBranch: i
     };
   }
-}, vt = (t) => {
-  if (t.startsWith(T.MERGE))
+}, It = (t) => {
+  if (t.startsWith(b.MERGE))
     return {
-      fromBranch: t.replace(T.MERGE, "").trim()
+      fromBranch: t.replace(b.MERGE, "").trim()
     };
-}, de = () => {
+}, Ee = () => {
   const t = process.env.GIT_REFLOG_ACTION || "";
   if (!t)
     return;
   const e = /merge\s+([^\s]+)\s*/i, r = t.match(e);
   if (r) {
-    const [, n] = r;
+    const [, o] = r;
     return {
-      fromBranch: n
+      fromBranch: o
     };
   }
-  const o = /pull\s+([^\s]+)\s+([^\s]+)/, s = t.match(o);
+  const n = /pull\s+([^\s]+)\s+([^\s]+)/, s = t.match(n);
   if (s) {
-    const [, , n] = s;
+    const [, , o] = s;
     return {
-      fromBranch: n
+      fromBranch: o
     };
   }
 };
-var T = /* @__PURE__ */ ((t) => (t.CHECKOUT = "checkout", t.MERGE = "merge", t.COMMIT = "commit", t.COMMIT_MERGE = "commit (merge)", t.PULL = "pull", t.RESET = "reset", t.REBASE_START = "rebase (start)", t.REBASE_FINISH = "rebase (finish)", t.REBASE_ABORT = "rebase (abort)", t.REBASE_CONTINUE = "rebase (continue)", t))(T || {});
-const L = "__GIT_REPLACE_MARK__", v = {
+var b = /* @__PURE__ */ ((t) => (t.CHECKOUT = "checkout", t.MERGE = "merge", t.COMMIT = "commit", t.COMMIT_MERGE = "commit (merge)", t.PULL = "pull", t.RESET = "reset", t.REBASE_START = "rebase (start)", t.REBASE_FINISH = "rebase (finish)", t.REBASE_ABORT = "rebase (abort)", t.REBASE_CONTINUE = "rebase (continue)", t))(b || {});
+const B = "__GIT_REPLACE_MARK__", O = {
   stringify(t) {
-    return JSON.stringify(t).replace(/"/g, L);
+    return JSON.stringify(t).replace(/"/g, B);
   },
   parse(t) {
-    return JSON.parse(t.replace(new RegExp(L, "g"), '"'));
+    return JSON.parse(t.replace(new RegExp(B, "g"), '"'));
   }
-}, Se = ({
+}, ye = ({
   count: t = 100
 } = {}) => {
   if (t <= 0)
@@ -520,19 +515,19 @@ const L = "__GIT_REPLACE_MARK__", v = {
     /** 提交日期 */
     commitTime: "%ci"
   };
-  return u(
-    `git --no-pager log --oneline -n ${t} --pretty=format:"${v.stringify(
+  return g(
+    `git --no-pager log --oneline -n ${t} --pretty=format:"${O.stringify(
       e
     )}"`
   ).toString().split(`
-`).map((n) => {
-    const c = v.parse(n);
+`).map((o) => {
+    const c = O.parse(o);
     return {
       ...c,
       mergeInfo: Y(c.message)
     };
   });
-}, ye = ({
+}, _e = ({
   count: t = 100,
   filterItem: e = () => !0
 } = {}) => {
@@ -545,201 +540,197 @@ const L = "__GIT_REPLACE_MARK__", v = {
     committerEmail: "%ce",
     commitTime: "%ci"
   };
-  return u(
-    `git --no-pager reflog -n ${t} --pretty=format:"${v.stringify(
+  return g(
+    `git --no-pager reflog -n ${t} --pretty=format:"${O.stringify(
       r
     )}"`
   ).toString().split(`
-`).map((i) => v.parse(i)).filter(e).map((i) => {
-    const { fullMessage: f, ...a } = i, h = ":", [y] = f.split(h, 1), M = f.slice(`${y}${h}`.length), d = y.trim(), E = M.trim();
-    let A, B, X;
-    if (d.startsWith(
+`).map((i) => O.parse(i)).filter(e).map((i) => {
+    const { fullMessage: u, ...f } = i, p = ":", [S] = u.split(p, 1), $ = u.slice(`${S}${p}`.length), h = S.trim(), E = $.trim();
+    let M, N, X;
+    if (h.startsWith(
       "checkout"
       /* CHECKOUT */
     ))
-      B = ht(E);
-    else if (d.startsWith(
+      N = dt(E);
+    else if (h.startsWith(
       "merge"
       /* MERGE */
     ))
-      A = vt(d);
-    else if (d.startsWith(
+      M = It(h);
+    else if (h.startsWith(
       "commit (merge)"
       /* COMMIT_MERGE */
     )) {
-      const G = Y(E);
-      G || g.warn(
+      const L = Y(E);
+      L || a.warn(
         `${i.hash} 是合并提交 但是未从提交信息(${E})中检测到合并分支信息，推测手动更改了提交内容`
-      ), A = G;
+      ), M = L;
     }
     return {
-      ...a,
-      type: d,
+      ...f,
+      type: h,
       message: E,
-      mergeInfo: A,
-      checkoutInfo: B,
+      mergeInfo: M,
+      checkoutInfo: N,
       rebaseInfo: X
     };
   });
-}, Ee = (t) => {
-  const e = $(t), r = l.resolve(e, ".git"), o = l.resolve(r, "rebase-merge");
-  if (m.existsSync(o))
+}, Re = (t) => {
+  const e = I(t), r = l.resolve(e, ".git"), n = l.resolve(r, "rebase-merge");
+  if (m.existsSync(n))
     return !0;
   const s = l.resolve(r, "rebase-apply");
   if (m.existsSync(s))
     return !0;
-  const n = l.resolve(r, "REBASE_HEAD");
-  return !!m.existsSync(n);
-}, _e = ({
+  const o = l.resolve(r, "REBASE_HEAD");
+  return !!m.existsSync(o);
+}, Ce = ({
   branchName: t,
   version: e,
   remoteInfo: r
 }) => {
-  r && (u(`git push ${r.alias} v${e}`, {
+  r && (g(`git push ${r.alias} v${e}`, {
     stdio: "inherit"
-  }), u(`git push ${r.alias} ${t}`, {
+  }), g(`git push ${r.alias} ${t}`, {
     stdio: "inherit"
   }));
-}, It = (t) => /^https?:\/\//.test(t), $t = (t) => /^git@/.test(t), Re = (t) => {
+}, $t = (t) => /^https?:\/\//.test(t), Mt = (t) => /^git@/.test(t), Oe = (t) => {
   const { hostname: e, pathname: r } = new URL(t);
   return `git@${e}:${r.replace("/", "")}`;
-}, W = ".done-coding", Mt = `${W}/cli/assets-config`, At = "assets", Pt = "index.json", bt = `${W}/config.json`, wt = "https://gitee.com/justsosu/done-coding-cli-assets-config.git", Tt = ({
+}, W = ".done-coding", At = `${W}/cli/assets-config`, Pt = "assets", wt = "index.json", bt = `${W}/config.json`, Tt = "https://gitee.com/justsosu/done-coding-cli-assets-config.git", Dt = ({
   dir: t,
   fn: e,
   endClear: r = !0,
-  exitClear: o = !0
+  exitClear: n = !0
 }) => {
   if (V(t))
-    return console.log(p.red(`${t} 已存在，请手动删除该目录再试`)), process.exit(1);
+    return a.error(`${t} 已存在，请手动删除该目录再试`), process.exit(1);
   const s = () => {
-    console.log("正在清理临时目录...", t), St(t);
+    a.stage("正在清理临时目录...", t), Et(t);
   };
-  o && process.once("exit", () => {
-    console.log("发现进程退出，正在清理临时目录...", t), s();
+  n && process.once("exit", () => {
+    a.stage("发现进程退出，正在清理临时目录...", t), s();
   });
-  let n;
+  let o;
   try {
-    n = e(t);
+    o = e(t);
   } catch (c) {
     throw r && s(), c;
   }
-  return r && (n instanceof Promise ? n.finally(s) : s()), n;
+  return r && (o instanceof Promise ? o.finally(s) : s()), o;
 };
-var Dt = /* @__PURE__ */ ((t) => (t.ASSETS_CONFIG_REPO_URL = "ASSETS_CONFIG_REPO_URL", t))(Dt || {});
-const Nt = (t) => l.resolve(
-  rt(),
-  Mt,
+var Nt = /* @__PURE__ */ ((t) => (t.ASSETS_CONFIG_REPO_URL = "ASSETS_CONFIG_REPO_URL", t))(Nt || {});
+const Lt = (t) => l.resolve(
+  st(),
+  At,
   `${t}-${ot()}`
-), Bt = () => l.resolve(st(), bt), Gt = async () => {
-  const t = Bt();
-  console.log("读取全局配置：", t);
-  const e = {
-    ASSETS_CONFIG_REPO_URL: wt
+), Bt = () => l.resolve(nt(), bt), Ft = async () => {
+  const t = Bt(), e = {
+    ASSETS_CONFIG_REPO_URL: Tt
   };
   try {
-    if (await N(t)) {
+    if (await D(t)) {
       const r = await K(t, {});
-      Object.entries(r).forEach(([o, s]) => {
-        e[o] = s;
+      Object.entries(r).forEach(([n, s]) => {
+        e[n] = s;
       });
     }
   } catch {
   }
-  return console.log("done-coding-cli 全局配置：", e), e;
-}, Lt = async (t) => {
-  if (console.log("资产配置仓库临时目录：", t), await N(t))
-    return console.log(
-      p.red(`${t} 已存在，请手动删除该目录再试`)
-    ), process.exit(1);
+  return e;
+}, Gt = async (t) => {
+  if (await D(t))
+    return a.error(`${t} 已存在，请手动删除该目录再试`), process.exit(1);
   const {
     [
       "ASSETS_CONFIG_REPO_URL"
       /* ASSETS_CONFIG_REPO_URL */
     ]: e
-  } = await Gt();
-  return $t(e) || It(e) ? (console.log("远程仓库拉取配置...", e), u(`git clone ${e} ${t} --depth=1`)) : (m.mkdirSync(t, { recursive: !0 }), u(`cp -r ${e}/ ${t}/`)), {
+  } = await Ft();
+  return Mt(e) || $t(e) ? g(`git clone ${e} ${t} --depth=1`) : (m.mkdirSync(t, { recursive: !0 }), g(`cp -r ${e}/ ${t}/`)), {
     assetConfigRepoUrl: e
   };
-}, Ce = async ({
+}, ve = async ({
   moduleName: t,
   onSuccess: e
-}) => (console.log(p.blue(`拉取${t}配置，请稍等...`)), Tt({
+}) => (a.stage(`拉取${t}配置，请稍等...`), Dt({
   // 资源配置仓库临时文件夹
-  dir: Nt(t),
+  dir: Lt(t),
   fn: async (r) => {
-    const { assetConfigRepoUrl: o } = await Lt(r), s = l.join(
-      At,
+    const { assetConfigRepoUrl: n } = await Gt(r), s = l.join(
+      Pt,
       t
-    ), n = l.join(
+    ), o = l.join(
       s,
-      Pt
-    ), c = l.resolve(r, n), i = await K(c);
+      wt
+    ), c = l.resolve(r, o), i = await K(c);
     return await e({
-      repoUrl: o,
+      repoUrl: n,
       config: i,
       moduleDirFileRelativePath: s,
-      moduleEntryFileRelativePath: n,
+      moduleEntryFileRelativePath: o,
       assetsConfigRepoTempDir: r
     }), i;
   }
 }));
 export {
-  Dt as DoneCodingCliGlobalConfigKeyEnum,
-  ct as EditorTypeEnum,
-  T as GitRefLogTypeEnum,
-  S as HooksNameEnum,
-  me as SUPPORT_GET_COMMIT_BY_HOOKS_NAMES,
-  Ge as _curry,
+  Nt as DoneCodingCliGlobalConfigKeyEnum,
+  at as EditorTypeEnum,
+  b as GitRefLogTypeEnum,
+  d as HooksNameEnum,
+  he as SUPPORT_GET_COMMIT_BY_HOOKS_NAMES,
+  Be as _curry,
   Te as _get,
   Ne as _set,
-  ue as addHuskyHooks,
-  ae as addPackageConfig,
-  Tt as applyUseTempDir,
+  pe as addHuskyHooks,
+  le as addPackageConfig,
+  Dt as applyUseTempDir,
   V as assetIsExits,
-  N as assetIsExitsAsync,
-  Ie as chalk,
-  Ee as checkCurrentIsRebasing,
-  re as createMainCommand,
-  se as createSubcommand,
-  te as decryptAES,
-  Zt as encryptAES,
-  dt as fileAddX,
-  Nt as getCliModuleTempDir,
-  pe as getCommitByHookName,
-  oe as getConfigFileCommonOptions,
-  Se as getCurrentBranchLastCommitList,
-  le as getCurrentBranchName,
-  at as getEditorType,
-  he as getGitLastCommitInfo,
-  $ as getGitProjectDir,
-  ye as getLastReflogList,
-  D as getPackageJson,
-  pt as getRelyPkgVersion,
-  ut as getRootDirOptions,
-  ee as getRootScriptName,
-  ce as getUseDefaultConfig,
-  Re as http2sshGitUrl,
-  mt as initConfigFile,
-  ne as initHandlerCommon,
-  It as isHttpGitUrl,
-  $t as isSshGitUrl,
+  D as assetIsExitsAsync,
+  Re as checkCurrentIsRebasing,
+  ne as createMainCommand,
+  oe as createSubcommand,
+  re as decryptAES,
+  ee as encryptAES,
+  St as fileAddX,
+  Lt as getCliModuleTempDir,
+  de as getCommitByHookName,
+  ie as getConfigFileCommonOptions,
+  ye as getCurrentBranchLastCommitList,
+  ue as getCurrentBranchName,
+  ft as getEditorType,
+  Se as getGitLastCommitInfo,
+  I as getGitProjectDir,
+  _e as getLastReflogList,
+  Zt as getLogText,
+  T as getPackageJson,
+  ht as getRelyPkgVersion,
+  mt as getRootDirOptions,
+  se as getRootScriptName,
+  fe as getUseDefaultConfig,
+  Oe as http2sshGitUrl,
+  pt as initConfigFile,
+  ce as initHandlerCommon,
+  $t as isHttpGitUrl,
+  Mt as isSshGitUrl,
   Ae as json5,
-  g as log,
-  Qt as lookForParentTarget,
+  a as log,
+  te as lookForParentTarget,
   gt as openFileInEditor,
-  _e as pushGitPublishInfoToRemote,
-  Ce as readCliModuleAssetsConfig,
-  ie as readConfigFile,
+  Ce as pushGitPublishInfoToRemote,
+  ve as readCliModuleAssetsConfig,
+  ae as readConfigFile,
   yt as readFile,
-  Et as readFileAsync,
-  ge as readJsonFile,
+  _t as readFileAsync,
+  me as readJsonFile,
   K as readJsonFileAsync,
-  St as removeAsset,
-  fe as removeAssetAsync,
-  ht as resolveCheckoutInfoByRefInfo,
+  Et as removeAsset,
+  ge as removeAssetAsync,
+  dt as resolveCheckoutInfoByRefInfo,
   Y as resolveMergeInfoByCommitMsg,
-  de as resolveMergeInfoByGitReflogAction,
-  vt as resolveMergeInfoByRefType,
-  be as uuidv4,
-  H as xPrompts
+  Ee as resolveMergeInfoByGitReflogAction,
+  It as resolveMergeInfoByRefType,
+  we as uuidv4,
+  U as xPrompts
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-utils",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "cli utils",
   "private": false,
   "module": "es/index.mjs",
@@ -70,5 +70,5 @@
     "uuid": "^11.1.0",
     "yargs": "^17.7.2"
   },
-  "gitHead": "e68f726aa899f75c4d294b11620f343c953a74c3"
+  "gitHead": "0930f800167c04a86b56eae9741872dd51bec0c6"
 }

package/types/index.d.ts

@@ -1,5 +1,4 @@
 import type { ArgumentsCamelCase } from 'yargs';
-import chalk from 'chalk';
 import type { CommandModule } from 'yargs';
 import _curry from 'lodash.curry';
 import _get from 'lodash.get';
@@ -60,8 +59,6 @@ export declare const assetIsExits: (assetPath: string) => boolean;
  */
 export declare const assetIsExitsAsync: (path: string) => Promise<boolean>;
 
-export { chalk }
-
 /** 检测当前正在变基 */
 export declare const checkCurrentIsRebasing: (rootDir: string) => boolean;
 
@@ -214,6 +211,22 @@ export declare const getLastReflogList: ({ count, filterItem, }?: {
     filterItem?: ((item: GitReflogItemInfoRaw) => boolean) | undefined;
 }) => GitReflogItemInfo[];
 
+/** 获取输出文字 */
+export declare const getLogText: ((type: LogTypeEnum, ...messages: unknown[]) => string) & {
+    /** 成功 */
+    success: (...messages: unknown[]) => string;
+    /** /步骤 */
+    stage: (...messages: unknown[]) => string;
+    /** 提示信息 */
+    info: (...messages: unknown[]) => string;
+    /** 警告 */
+    warn: (...messages: unknown[]) => string;
+    /** 错误 */
+    error: (...messages: unknown[]) => string;
+    /** 跳过 */
+    skip: (...messages: unknown[]) => string;
+};
+
 /** 获取package.json文件内容 */
 export declare const getPackageJson: <R extends PackageJson>({ rootDir, }: {
     rootDir: string;
@@ -434,21 +447,23 @@ export declare const isSshGitUrl: (url: string) => boolean;
 export { json5 }
 
 /** 日志 */
-export declare const log: ((type: LogTypeEnum, ...messages: string[]) => void) & {
+export declare const log: ((type: LogTypeEnum, ...messages: unknown[]) => void) & {
     /** 成功 */
-    success: (...messages: string[]) => void;
+    success: (...messages: unknown[]) => void;
     /** /步骤 */
-    stage: (...messages: string[]) => void;
+    stage: (...messages: unknown[]) => void;
     /** 提示信息 */
-    info: (...messages: string[]) => void;
+    info: (...messages: unknown[]) => void;
     /** 警告 */
-    warn: (...messages: string[]) => void;
+    warn: (...messages: unknown[]) => void;
     /** 错误 */
-    error: (...messages: string[]) => void;
+    error: (...messages: unknown[]) => void;
     /** 跳过 */
-    skip: (...messages: string[]) => void;
+    skip: (...messages: unknown[]) => void;
 };
 
+export declare type LogParams = [type: LogTypeEnum, ...messages: unknown[]];
+
 /** 日志类型 */
 declare enum LogTypeEnum {
     /** 成功 */