@done-coding/cli-utils 0.8.2-alpha.1 → 0.8.2-alpha.2

package/es/index.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import { randomUUID as Ct } from "node:crypto";
 import { homedir as W, tmpdir as z } from "node:os";
-import l from "node:path";
-import g, { existsSync as A, mkdirSync as yt, writeFileSync as G, readFileSync as v } from "node:fs";
+import f from "node:path";
+import g, { existsSync as I, mkdirSync as yt, writeFileSync as T, readFileSync as v } from "node:fs";
 import M from "crypto";
 import X from "chalk";
 import Ot from "prompts";
@@ -11,16 +11,16 @@ import { hideBin as vt } from "yargs/helpers";
 import { execSync as Y } from "node:child_process";
 import Z from "json5";
 export * from "json5";
-import { default as Cr } from "json5";
+import { default as yr } from "json5";
 import Mt from "lodash.merge";
-import It from "semver";
-import { default as Or } from "lodash.get";
-import { default as vr } from "lodash.set";
-import { default as Ir } from "lodash.curry";
+import At from "semver";
+import { default as Rr } from "lodash.get";
+import { default as Mr } from "lodash.set";
+import { default as $r } from "lodash.curry";
 import R from "pinyin";
 const q = "__DONE_CODING_ENV_CONFIG__", Q = Symbol.for(
   q
-), F = ".done-coding", $t = `${F}/cli/assets-config`, At = "assets", Pt = "index.json", Nt = `${F}/config.json`, Lt = "output/log", Dt = "default", Tt = "https://gitee.com/justsosu/done-coding-cli-assets-config.git", Gt = /[^a-zA-Z0-9._\-]/, wt = /[^a-zA-Z0-9._\-]/g, xe = (t) => t ? !Gt.test(t) : !1, bt = (t) => (t || "_").replace(wt, "_"), tt = () => {
+), b = ".done-coding", $t = `${b}/cli/assets-config`, It = "assets", Pt = "index.json", Nt = `${b}/config.json`, Lt = "output/log", Dt = "default", Tt = "https://gitee.com/justsosu/done-coding-cli-assets-config.git", Gt = /[^a-zA-Z0-9._\-]/, wt = /[^a-zA-Z0-9._\-]/g, ke = (t) => t ? !Gt.test(t) : !1, bt = (t) => (t || "_").replace(wt, "_"), tt = () => {
   const t = /* @__PURE__ */ new Date();
   return `${t.getFullYear()}-${String(t.getMonth() + 1).padStart(2, "0")}-${String(t.getDate()).padStart(2, "0")} ${String(t.getHours()).padStart(2, "0")}:${String(t.getMinutes()).padStart(2, "0")}:${String(t.getSeconds()).padStart(2, "0")}`;
 }, et = () => Ct();
@@ -40,8 +40,8 @@ const rt = (t) => `${q}_${t}`, st = (t, e) => {
     return !1;
   const s = rt(t), n = { value: e };
   return process.env[s] = JSON.stringify(n), !0;
-}, B = () => globalThis[Q], U = (t) => {
-  const e = B();
+}, F = () => globalThis[Q], B = (t) => {
+  const e = F();
   if (e)
     return e;
   const r = Object.freeze({
@@ -62,20 +62,20 @@ const rt = (t) => `${q}_${t}`, st = (t, e) => {
     callMode: "DEFAULT",
     series: e,
     consoleLog: !0,
-    logOutputDir: `${F}/${e}/${Lt}`,
+    logOutputDir: `${b}/${e}/${Lt}`,
     processLogFileNameList: []
   };
-}, j = `${tt()}-${et()}`, it = (t) => {
+}, U = `${tt()}-${et()}`, it = (t) => {
   const e = {
     ...t,
     processLogFileNameList: [
-      j,
+      U,
       ...t.processLogFileNameList
     ].slice(0, 10)
   };
-  return U(e);
+  return B(e);
 }, C = () => {
-  const t = B();
+  const t = F();
   if (t)
     return t;
   const e = nt();
@@ -84,17 +84,17 @@ const rt = (t) => `${q}_${t}`, st = (t, e) => {
   {
     const s = {
       ...ot(),
-      processLogFileNameList: [j]
+      processLogFileNameList: [U]
     };
-    return U(s);
+    return B(s);
   }
-}, ke = ({
+}, He = ({
   series: t,
   ...e
 }) => {
   if (jt)
     throw new Error("非顶级进程不允许调用该方法");
-  if (B())
+  if (F())
     throw new Error(`内存全局配置存在，说明是以下某个原因:
 1. 顶级进程重复调用initEnvConfig
 2. 顶级进程在调用该方法之前调用了getApplyConfig, 即获取配置应用的同时会冻结配置 不会后续变化
@@ -110,12 +110,12 @@ const rt = (t) => `${q}_${t}`, st = (t, e) => {
       const o = {
         ...ot(t),
         ...e,
-        processLogFileNameList: [j]
+        processLogFileNameList: [U]
       };
-      return U(o);
+      return B(o);
     }
   }
-}, ct = () => C().callMode, xt = () => ct() === "MCP", at = () => xt() ? !1 : C().consoleLog, kt = (t = !1) => l.resolve(
+}, ct = () => C().callMode, xt = () => ct() === "MCP", at = () => xt() ? !1 : C().consoleLog, kt = (t = !1) => f.resolve(
   t ? W() : z(),
   C().logOutputDir
 ), Ht = () => C().processLogFileNameList[0], Jt = () => C().processLogFileNameList[1];
@@ -124,7 +124,7 @@ const Yt = Object.entries(m).reduce(
   (t, [e, r]) => (t[r] = e, t),
   {}
 ), Vt = (t) => Yt[t] ?? t, E = /* @__PURE__ */ new Map(), Kt = (t) => {
-  const e = l.resolve(t), r = l.dirname(e), s = E.get(e);
+  const e = f.resolve(t), r = f.dirname(e), s = E.get(e);
   if (s) {
     if (!s.destroyed && s.writable)
       return s;
@@ -155,7 +155,7 @@ process.once("exit", () => {
     } catch {
     }
 });
-const d = ({
+const h = ({
   stream: t,
   type: e,
   content: r
@@ -164,17 +164,17 @@ const d = ({
 `
 );
 let V = !1;
-const ft = () => {
-  const t = kt(), e = l.resolve(t, Ht()), r = Kt(e);
+const lt = () => {
+  const t = kt(), e = f.resolve(t, Ht()), r = Kt(e);
   if (!V) {
     const s = Jt();
-    s && d({
+    s && h({
       stream: r,
       type: m.SYSTEM,
       content: `父进程日志文件: ${s}`
     });
     const n = ct();
-    d({
+    h({
       stream: r,
       type: m.SYSTEM,
       content: `当前调用模式: ${n}`
@@ -182,13 +182,13 @@ const ft = () => {
   }
   return r;
 }, Wt = (t, e) => {
-  const r = ft(), s = t.map((n) => n instanceof Error ? n.stack || n.message : typeof n == "object" && n !== null ? JSON.stringify(n) : String(n)).join(" ");
-  d({
+  const r = lt(), s = t.map((n) => n instanceof Error ? n.stack || n.message : typeof n == "object" && n !== null ? JSON.stringify(n) : String(n)).join(" ");
+  h({
     stream: r,
     type: e,
     content: s
   });
-}, zt = (...[t, ...e]) => at() ? t === m.TABLE ? console.table(...e) : console.log(X[t](...e)) : Wt(e, t), lt = (t) => Object.assign(t, {
+}, zt = (...[t, ...e]) => at() ? t === m.TABLE ? console.table(...e) : console.log(X[t](...e)) : Wt(e, t), ft = (t) => Object.assign(t, {
   /** 系统 */
   system: (...e) => t(m.SYSTEM, ...e),
   /** 成功 */
@@ -205,21 +205,21 @@ const ft = () => {
   skip: (...e) => t(m.SKIP, ...e),
   /** 表格 */
   table: (...e) => t(m.TABLE, ...e)
-}), a = lt(zt), He = lt(
+}), a = ft(zt), Je = ft(
   (t, ...e) => t === m.TABLE ? JSON.stringify(e) : X[t](...e)
-), Je = (t, {
+), Ye = (t, {
   /** 当前目录 */
   currentDir: e = process.cwd(),
   /** 优先找最远的父目录 */
   isFindFarthest: r = !0
 } = {}) => {
-  const s = l.resolve(e).split(l.sep).map((n, o, c) => c.slice(0, o).concat(n).join(l.sep) || l.sep);
+  const s = f.resolve(e).split(f.sep).map((n, o, c) => c.slice(0, o).concat(n).join(f.sep) || f.sep);
   for (; s.length; ) {
-    const n = r ? s.shift() : s.pop(), o = l.join(n, t);
+    const n = r ? s.shift() : s.pop(), o = f.join(n, t);
     if (g.existsSync(o))
       return n;
   }
-}, ut = "aes-256-cbc", gt = 16, I = "hex", w = ":";
+}, ut = "aes-256-cbc", gt = 16, A = "hex", G = ":";
 function pt(t) {
   return M.pbkdf2Sync(
     t,
@@ -232,7 +232,7 @@ function pt(t) {
     "sha256"
   );
 }
-function Ye({
+function Ve({
   text: t,
   secretKey: e
 }) {
@@ -240,34 +240,34 @@ function Ye({
     const r = pt(e), s = M.randomBytes(gt), n = M.createCipheriv(ut, r, s);
     let o = n.update(t);
     o = Buffer.concat([o, n.final()]);
-    const c = s.toString(I), i = o.toString(I);
-    return `${c}${w}${i}`;
+    const c = s.toString(A), i = o.toString(A);
+    return `${c}${G}${i}`;
   } catch (r) {
     return a.error(
       `加密失败: ${r instanceof Error ? r.message : String(r)}`
     ), "";
   }
 }
-function Ve({
+function Ke({
   encryptedText: t,
   secretKey: e
 }) {
   try {
-    if (!t.includes(w))
+    if (!t.includes(G))
       return "";
-    const r = pt(e), [s, n] = t.split(w);
+    const r = pt(e), [s, n] = t.split(G);
     if (s.length !== gt * 2)
       return "";
-    const o = Buffer.from(s, I), c = Buffer.from(n, I), i = M.createDecipheriv(ut, r, o);
-    let f = i.update(c);
-    return f = Buffer.concat([f, i.final()]), f.toString();
+    const o = Buffer.from(s, A), c = Buffer.from(n, A), i = M.createDecipheriv(ut, r, o);
+    let l = i.update(c);
+    return l = Buffer.concat([l, i.final()]), l.toString();
   } catch (r) {
     return a.error(
       `解密失败: ${r instanceof Error ? r.message : String(r)}`
     ), "";
   }
 }
-const P = (...t) => {
+const j = (...t) => {
   const [e, r = {}] = t;
   return Ot(e, {
     onCancel(s) {
@@ -275,21 +275,27 @@ const P = (...t) => {
     },
     ...r
   });
-}, Ke = async ({
+}, Xt = async ({
   isMCP: t,
   key: e,
   presetAnswer: r,
   defaultValue: s,
   questionConfig: n
 }) => {
-  if (t) {
-    const o = r == null ? void 0 : r[e];
-    return o === void 0 ? (a.error("MCP场景的约束值不能为空"), process.exit(1)) : o;
-  } else
-    return (r == null ? void 0 : r[e]) ?? s ?? (await P(n))[e];
-}, We = async (t, e) => (await P(e))[t], Xt = (t, e) => {
+  const o = r == null ? void 0 : r[e];
+  return o !== void 0 ? o : t ? (a.error("MCP场景的预设值不能为空"), process.exit(1)) : s ?? (n !== void 0 ? (await j(n))[e] : void 0);
+}, We = ({
+  isMCP: t,
+  presetAnswer: e
+}) => async (r, s, n) => Xt({
+  key: r,
+  questionConfig: s,
+  defaultValue: n,
+  isMCP: t,
+  presetAnswer: e
+}), Zt = (t, e) => {
   t ? a.error(t) : a.error(e.message), e != null && e.stack && a.error(e.stack), process.exit(1);
-}, Zt = () => {
+}, qt = () => {
   const t = vt(process.argv);
   return Rt(t);
 }, ze = ({
@@ -305,7 +311,7 @@ const P = (...t) => {
     if (typeof r == "string")
       return s.includes("/") ? void 0 : s;
     if (typeof r == "object") {
-      const n = Object.entries(r), o = process.argv[1], c = n.filter(([, f]) => o == null ? void 0 : o.endsWith(f));
+      const n = Object.entries(r), o = process.argv[1], c = n.filter(([, l]) => o == null ? void 0 : o.endsWith(l));
       if (c.length !== 1)
         return;
       const [i] = c[0];
@@ -320,14 +326,14 @@ const P = (...t) => {
   positionals: o,
   subcommands: c,
   rootScriptName: i
-}, f) => {
+}, l) => {
   let u = t.strict();
   e && (u = u.usage(`Usage: ${e}`)), s && (u = u.demandCommand(s));
   const S = "help";
-  return u = u.help(S), r ? u = u.version(r).alias("h", S).alias("v", "version") : u = u.alias("h", S), n && (u = u.options(n)), o && (u = Object.entries(o).reduce((y, [L, h]) => y.positional(L, h), u)), c && (u = u.command(c)), f && i && (u = u.scriptName(i)), u;
+  return u = u.help(S), r ? u = u.version(r).alias("h", S).alias("v", "version") : u = u.alias("h", S), n && (u = u.options(n)), o && (u = Object.entries(o).reduce((y, [N, d]) => y.positional(N, d), u)), c && (u = u.command(c)), l && i && (u = u.scriptName(i)), u;
 }, Xe = async ({ handler: t, ...e }) => {
-  const r = await mt(Zt(), e, !0).fail(
-    Xt
+  const r = await mt(qt(), e, !0).fail(
+    Zt
   ).argv;
   return t ? t(r) : r;
 }, Ze = (t) => {
@@ -341,7 +347,7 @@ const P = (...t) => {
     },
     handler: s
   };
-}, qt = (t) => {
+}, Qt = (t) => {
   if (!t)
     return ["pipe", "pipe", "pipe"];
   if (typeof t == "string")
@@ -365,9 +371,9 @@ const P = (...t) => {
 }, p = (t, e) => {
   if (at() || (e == null ? void 0 : e.stdio) === "ignore")
     return Y(t, e);
-  const s = ft(), n = s.fd, o = qt(e == null ? void 0 : e.stdio), c = o.map((i, f) => f === 0 ? "ignore" : (f === 1 || f === 2) && (i === "inherit" || i === "overlapped") ? n : i);
+  const s = lt(), n = s.fd, o = Qt(e == null ? void 0 : e.stdio), c = o.map((i, l) => l === 0 ? "ignore" : (l === 1 || l === 2) && (i === "inherit" || i === "overlapped") ? n : i);
   try {
-    d({
+    h({
       stream: s,
       type: m.SYSTEM,
       content: `[子进程任务开始执行] ${t}`
@@ -379,30 +385,30 @@ const P = (...t) => {
       stdio: c,
       encoding: (e == null ? void 0 : e.encoding) || "utf-8"
     });
-    return i && o[1] === "pipe" ? d({
+    return i && o[1] === "pipe" ? h({
       stream: s,
       type: m.SYSTEM,
       content: `[任务执行成功返回]: ${i.toString().trim()}`
-    }) : d({
+    }) : h({
       stream: s,
       type: m.SYSTEM,
       content: "[任务执行成功]"
     }), i;
   } catch (i) {
-    const f = i.stderr ? `
+    const l = i.stderr ? `
 STDERR: ${i.stderr}` : "";
-    throw d({
+    throw h({
       stream: s,
       type: m.ERROR,
       content: `[任务执行失败]: ${t}
 STATUS: ${i.status}
-MSG: ${i.message}${f}`
+MSG: ${i.message}${l}`
     }), i;
   }
 };
-var Qt = /* @__PURE__ */ ((t) => (t.VSCODE = "VsCode", t.CURSOR = "Cursor", t.OTHER = "其他", t))(Qt || {});
-const te = async () => {
-  const { editorType: t } = await P([
+var te = /* @__PURE__ */ ((t) => (t.VSCODE = "VsCode", t.CURSOR = "Cursor", t.OTHER = "其他", t))(te || {});
+const ee = async () => {
+  const { editorType: t } = await j([
     {
       name: "editorType",
       type: "select",
@@ -419,24 +425,24 @@ const te = async () => {
     }
   ]);
   return t;
-}, ee = {
+}, re = {
   Cursor: "cursor",
   VsCode: "code"
-}, re = (t, e, r) => {
+}, se = (t, e, r) => {
   try {
     p(`${t} -v`, { stdio: "ignore" }), p(`${t} ${e}`);
   } catch {
     r();
   }
-}, se = (t, e) => {
+}, ne = (t, e) => {
   const r = (s) => a.info(`
       ${s}, 请用编辑器打开 ${t} 进行编辑
 `);
   switch (e) {
     case "Cursor":
     case "VsCode": {
-      const s = ee[e];
-      re(s, t, () => {
+      const s = re[e];
+      se(s, t, () => {
         r(`${s}命令未安装`);
       });
       break;
@@ -444,7 +450,7 @@ const te = async () => {
     default:
       r("其他编辑器");
   }
-}, ne = (t = process.cwd()) => ({
+}, oe = (t = process.cwd()) => ({
   /** 必须保留 */
   rootDir: {
     type: "string",
@@ -458,7 +464,7 @@ const te = async () => {
   rootDirDefault: e
 }) => ({
   /** 必须保留 */
-  ...ne(e),
+  ...oe(e),
   /** 必须保留 */
   configPath: {
     type: "string",
@@ -467,23 +473,23 @@ const te = async () => {
     /** 必须设置默认值 */
     default: t
   }
-}), oe = async (t, e) => {
-  const { configPath: r, rootDir: s } = e, n = l.resolve(s, r), o = l.dirname(n);
-  return A(o) || yt(o, {
+}), ie = async (t, e) => {
+  const { configPath: r, rootDir: s } = e, n = f.resolve(s, r), o = f.dirname(n);
+  return I(o) || yt(o, {
     recursive: !0
-  }), n.endsWith(".json5") ? (a.info(`json5模式写入 ${n}`), G(n, Z.stringify(t, null, 2)), n) : (a.info(`json模式写入 ${n}`), G(n, JSON.stringify(t, null, 2)), n);
+  }), n.endsWith(".json5") ? (a.info(`json5模式写入 ${n}`), T(n, Z.stringify(t, null, 2)), n) : (a.info(`json模式写入 ${n}`), T(n, JSON.stringify(t, null, 2)), n);
 }, Qe = async (t, e, {
   onFileGenerated: r,
   edit: s = !1
 } = {}) => {
-  const n = await oe(t, e);
+  const n = await ie(t, e);
   if (r == null || r(n), s) {
-    const o = await te();
-    se(e.configPath, o);
+    const o = await ee();
+    ne(e.configPath, o);
   }
 }, tr = async (t, e) => {
-  const { configPath: r, rootDir: s } = t, n = l.resolve(s, r);
-  if (!A(n)) {
+  const { configPath: r, rootDir: s } = t, n = f.resolve(s, r);
+  if (!I(n)) {
     if (e)
       return a.info("配置文件不存在，使用onNotExists返回值"), e();
     const o = `配置文件不存在 ${n}`;
@@ -491,7 +497,7 @@ const te = async () => {
   }
   return n.endsWith(".json5") ? (a.info(`json5模式解析 ${n}`), Z.parse(v(n, "utf8"))) : (a.info(`json模式解析 ${n}`), JSON.parse(v(n, "utf8")));
 }, er = async () => {
-  const { useDefaultConfig: t } = await P({
+  const { useDefaultConfig: t } = await j({
     name: "useDefaultConfig",
     type: "confirm",
     message: "使用默认模板配置",
@@ -501,12 +507,12 @@ const te = async () => {
 }, St = "package.json", x = ({
   rootDir: t
 }) => {
-  const e = l.resolve(t, St);
-  if (!A(e))
+  const e = f.resolve(t, St);
+  if (!I(e))
     throw new Error(`${t}未找到package.json文件`);
   const r = v(e, "utf-8");
   return JSON.parse(r);
-}, ie = ({
+}, ce = ({
   rootDir: t,
   pkgJson: e,
   pkgName: r,
@@ -528,9 +534,9 @@ const te = async () => {
 }) => {
   if (!t)
     return;
-  const r = x({ rootDir: e }), s = Mt(r, t), n = l.resolve(e, St);
-  G(n, JSON.stringify(s, null, 2), "utf-8");
-}, N = (t) => {
+  const r = x({ rootDir: e }), s = Mt(r, t), n = f.resolve(e, St);
+  T(n, JSON.stringify(s, null, 2), "utf-8");
+}, P = (t) => {
   const r = p("git rev-parse --show-toplevel", {
     cwd: t
   }).toString();
@@ -552,7 +558,7 @@ const te = async () => {
       return;
     }
   }
-}, ce = (t) => {
+}, ae = (t) => {
   const e = t.match(/moving\s+from\s+(.*)\s+to\s+(.*)/);
   if (e) {
     const [, r, s] = e;
@@ -561,40 +567,40 @@ const te = async () => {
       toBranch: s.trim()
     };
   }
-}, T = 73, ae = (t) => {
+}, D = 73, le = (t) => {
   const r = g.statSync(t).mode;
-  if ((r & T) === T)
+  if ((r & D) === D)
     return;
   a.stage(`${t} 没有执行权限 添加... `);
-  const s = r | T;
+  const s = r | D;
   g.chmodSync(t, s), a.success(`${t} 添加执行权限成功`);
-}, ht = (t) => g.existsSync(t), k = async (t) => {
+}, dt = (t) => g.existsSync(t), k = async (t) => {
   try {
     return await g.promises.lstat(t), !0;
   } catch (e) {
     return e.code !== "ENOENT";
   }
 }, fe = (t, e = !1) => {
-  ht(t) && g.rmSync(t, { recursive: !0, force: e });
-}, le = async (t, e = !1) => {
+  dt(t) && g.rmSync(t, { recursive: !0, force: e });
+}, ue = async (t, e = !1) => {
   await k(t) && await g.promises.rm(t, { recursive: !0, force: e });
-}, ue = (t) => g.readFileSync(t, "utf-8"), ge = (t) => g.promises.readFile(t, "utf-8"), nr = (t, e) => JSON.parse(ue(t)) || e, dt = async (t, e) => JSON.parse(await ge(t)) || e;
+}, ge = (t) => g.readFileSync(t, "utf-8"), pe = (t) => g.promises.readFile(t, "utf-8"), nr = (t, e) => JSON.parse(ge(t)) || e, ht = async (t, e) => JSON.parse(await pe(t)) || e;
 var _ = /* @__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))(_ || {});
-const pe = "husky", me = ".husky", Se = ({ rootDir: t }) => {
-  const e = N(t), r = ie({
+const me = "husky", Se = ".husky", de = ({ rootDir: t }) => {
+  const e = P(t), r = ce({
     rootDir: e,
     pkgJson: x({ rootDir: e }),
-    pkgName: pe,
+    pkgName: me,
     isDevPkg: !0
   });
   if (!r)
     throw new Error("husky版本获取失败, 可能husky未安装");
   const s = r.replace(/^(\^|~)/, ""), n = "<9.0.0";
-  return It.satisfies(s, n) ? (a.info(`${s}符合${n}`), `#!/usr/bin/env sh
+  return At.satisfies(s, n) ? (a.info(`${s}符合${n}`), `#!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"`) : (a.info(`${s}不符合${n}`), "");
 }, he = ({ rootDir: t }) => {
-  const e = N(t);
-  return l.resolve(e, me);
+  const e = P(t);
+  return f.resolve(e, Se);
 }, or = ({
   hookNames: t,
   rootDir: e,
@@ -602,7 +608,7 @@ const pe = "husky", me = ".husky", Se = ({ rootDir: t }) => {
 }) => {
   const s = he({ rootDir: e });
   g.existsSync(s) || g.mkdirSync(s, { recursive: !0 }), t.forEach((n) => {
-    const o = l.resolve(s, n), c = g.existsSync(o);
+    const o = f.resolve(s, n), c = g.existsSync(o);
     let i = r(n);
     if (c)
       g.readFileSync(o, "utf-8").includes(i) ? a.skip(`${o} ${n}相关调用 ${i} 已存在 跳过`) : (g.appendFileSync(
@@ -612,19 +618,19 @@ ${i}
 `
       ), a.success(`${o} 添加 ${n}相关调用成功`));
     else {
-      const f = Se({
+      const l = de({
         rootDir: e
       });
       g.writeFileSync(
         o,
-        `${f}
+        `${l}
 
 ${i}
 `,
         "utf-8"
       ), a.success(`${o} 添加 ${n}相关调用成功`);
     }
-    ae(o);
+    le(o);
   });
 }, ir = [
   // HooksNameEnum.PRE_MERGE_COMMIT,
@@ -634,12 +640,12 @@ ${i}
   hookName: t,
   rootDir: e
 }) => {
-  const r = N(e), s = l.resolve(r, ".git");
+  const r = P(e), s = f.resolve(r, ".git");
   switch (t) {
     case _.PREPARE_COMMIT_MSG:
     case _.COMMIT_MSG: {
-      const n = l.resolve(s, "MERGE_MSG");
-      if (A(n))
+      const n = f.resolve(s, "MERGE_MSG");
+      if (I(n))
         return v(n, "utf-8");
     }
   }
@@ -657,9 +663,9 @@ ${i}
     ).toString().trim(), o = p("git config user.name").toString().trim(), c = p("git config user.email").toString().trim(), i = p(
       "git rev-parse --abbrev-ref HEAD"
     ).toString().trim();
-    let f = "";
+    let l = "";
     try {
-      f = p(
+      l = p(
         `git config --get remote.${t}.url`
       ).toString().trim();
     } catch {
@@ -681,9 +687,9 @@ ${i}
       }).join(""),
       userEmail: c,
       branchName: i,
-      remoteInfo: f ? {
+      remoteInfo: l ? {
         alias: t,
-        url: f
+        url: l
       } : void 0
     };
   } catch (e) {
@@ -692,18 +698,18 @@ ${i}
 }, Et = (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, l] = r;
     return {
       fromBranch: i,
-      toBranch: f
+      toBranch: l
     };
   }
   const s = /\s*Merge\s+branch\s+['|"](.+)['|"]\s+of\s+.+\s+into\s+['|"](.+)['|"]\s*/i, n = t.match(s);
   if (n) {
-    const [, i, f] = n;
+    const [, i, l] = n;
     return {
       fromBranch: i,
-      toBranch: f
+      toBranch: l
     };
   }
   const o = /\s*Merge\s+branch\s+['|"](.+)['|"](\s+of)?\s*/i, c = t.match(o);
@@ -713,12 +719,12 @@ ${i}
       fromBranch: i
     };
   }
-}, de = (t) => {
-  if (t.startsWith(b.MERGE))
+}, Ee = (t) => {
+  if (t.startsWith(w.MERGE))
     return {
-      fromBranch: t.replace(b.MERGE, "").trim()
+      fromBranch: t.replace(w.MERGE, "").trim()
     };
-}, fr = () => {
+}, lr = () => {
   const t = process.env.GIT_REFLOG_ACTION || "";
   if (!t)
     return;
@@ -737,7 +743,7 @@ ${i}
     };
   }
 };
-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 || {});
+var w = /* @__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))(w || {});
 const K = "__GIT_REPLACE_MARK__", $ = {
   stringify(t) {
     return JSON.stringify(t).replace(/"/g, K);
@@ -745,7 +751,7 @@ const K = "__GIT_REPLACE_MARK__", $ = {
   parse(t) {
     return JSON.parse(t.replace(new RegExp(K, "g"), '"'));
   }
-}, lr = ({
+}, fr = ({
   count: t = 100
 } = {}) => {
   if (t <= 0)
@@ -798,44 +804,44 @@ const K = "__GIT_REPLACE_MARK__", $ = {
     )}"`
   ).toString().split(`
 `).map((i) => $.parse(i)).filter(e).map((i) => {
-    const { fullMessage: f, ...u } = i, S = ":", [y] = f.split(S, 1), L = f.slice(`${y}${S}`.length), h = y.trim(), O = L.trim();
-    let D, H, _t;
-    if (h.startsWith(
+    const { fullMessage: l, ...u } = i, S = ":", [y] = l.split(S, 1), N = l.slice(`${y}${S}`.length), d = y.trim(), O = N.trim();
+    let L, H, _t;
+    if (d.startsWith(
       "checkout"
       /* CHECKOUT */
     ))
-      H = ce(O);
-    else if (h.startsWith(
+      H = ae(O);
+    else if (d.startsWith(
       "merge"
       /* MERGE */
     ))
-      D = de(h);
-    else if (h.startsWith(
+      L = Ee(d);
+    else if (d.startsWith(
       "commit (merge)"
       /* COMMIT_MERGE */
     )) {
       const J = Et(O);
       J || a.warn(
         `${i.hash} 是合并提交 但是未从提交信息(${O})中检测到合并分支信息，推测手动更改了提交内容`
-      ), D = J;
+      ), L = J;
     }
     return {
       ...u,
-      type: h,
+      type: d,
       message: O,
-      mergeInfo: D,
+      mergeInfo: L,
       checkoutInfo: H,
       rebaseInfo: _t
     };
   });
 }, gr = (t) => {
-  const e = N(t), r = l.resolve(e, ".git"), s = l.resolve(r, "rebase-merge");
+  const e = P(t), r = f.resolve(e, ".git"), s = f.resolve(r, "rebase-merge");
   if (g.existsSync(s))
     return !0;
-  const n = l.resolve(r, "rebase-apply");
+  const n = f.resolve(r, "rebase-apply");
   if (g.existsSync(n))
     return !0;
-  const o = l.resolve(r, "REBASE_HEAD");
+  const o = f.resolve(r, "REBASE_HEAD");
   return !!g.existsSync(o);
 }, pr = ({
   branchName: t,
@@ -847,22 +853,22 @@ const K = "__GIT_REPLACE_MARK__", $ = {
   }), p(`git push ${r.alias} ${t}`, {
     stdio: "inherit"
   }));
-}, Ee = (t) => /^https?:\/\//.test(t), _e = (t) => /^git@/.test(t), mr = (t) => {
+}, _e = (t) => /^https?:\/\//.test(t), Ce = (t) => /^git@/.test(t), mr = (t) => {
   const { hostname: e, pathname: r } = new URL(t);
   return `git@${e}:${r.replace("/", "")}`;
-}, Ce = (t) => l.resolve(t, ".git"), Sr = (t) => le(Ce(t)), ye = ({
+}, ye = (t) => f.resolve(t, ".git"), Sr = (t) => ue(ye(t)), Oe = ({
   dir: t,
   fn: e,
   endClear: r = !0,
   exitClear: s = !0
 }) => {
-  if (ht(t))
+  if (dt(t))
     return a.error(`${t} 已存在，请手动删除该目录再试`), process.exit(1);
   const n = () => {
-    a.stage("正在清理临时目录...", t), fe(t);
+    fe(t);
   };
   s && process.once("exit", () => {
-    a.stage("发现进程退出，正在清理临时目录...", t), n();
+    n();
   });
   let o;
   try {
@@ -872,18 +878,18 @@ const K = "__GIT_REPLACE_MARK__", $ = {
   }
   return r && (o instanceof Promise ? o.finally(n) : n()), o;
 };
-var Oe = /* @__PURE__ */ ((t) => (t.ASSETS_CONFIG_REPO_URL = "ASSETS_CONFIG_REPO_URL", t))(Oe || {});
-const Re = (t) => l.resolve(
+var Re = /* @__PURE__ */ ((t) => (t.ASSETS_CONFIG_REPO_URL = "ASSETS_CONFIG_REPO_URL", t))(Re || {});
+const ve = (t) => f.resolve(
   z(),
   $t,
   `${t}-${et()}`
-), ve = () => l.resolve(W(), Nt), Me = async () => {
-  const t = ve(), e = {
+), Me = () => f.resolve(W(), Nt), Ae = async () => {
+  const t = Me(), e = {
     ASSETS_CONFIG_REPO_URL: Tt
   };
   try {
     if (await k(t)) {
-      const r = await dt(t, {});
+      const r = await ht(t, {});
       Object.entries(r).forEach(([s, n]) => {
         e[s] = n;
       });
@@ -891,7 +897,7 @@ const Re = (t) => l.resolve(
   } catch {
   }
   return e;
-}, Ie = async (t) => {
+}, $e = async (t) => {
   if (await k(t))
     return a.error(`${t} 已存在，请手动删除该目录再试`), process.exit(1);
   const {
@@ -899,28 +905,28 @@ const Re = (t) => l.resolve(
       "ASSETS_CONFIG_REPO_URL"
       /* ASSETS_CONFIG_REPO_URL */
     ]: e
-  } = await Me();
-  return _e(e) || Ee(e) ? p(
+  } = await Ae();
+  return Ce(e) || _e(e) ? p(
     `git clone ${e} ${t} --depth=1`
   ) : (g.mkdirSync(t, { recursive: !0 }), p(
     `cp -r ${e}/ ${t}/`
   )), {
     assetConfigRepoUrl: e
   };
-}, hr = async ({
+}, dr = async ({
   moduleName: t,
   onSuccess: e
-}) => (a.stage(`拉取${t}配置，请稍等...`), ye({
+}) => (a.stage(`拉取${t}配置，请稍等...`), Oe({
   // 资源配置仓库临时文件夹
-  dir: Re(t),
+  dir: ve(t),
   fn: async (r) => {
-    const { assetConfigRepoUrl: s } = await Ie(r), n = l.join(
-      At,
+    const { assetConfigRepoUrl: s } = await $e(r), n = f.join(
+      It,
       t
-    ), o = l.join(
+    ), o = f.join(
       n,
       Pt
-    ), c = l.resolve(r, o), i = await dt(c);
+    ), c = f.resolve(r, o), i = await ht(c);
     return await e({
       repoUrl: s,
       config: i,
@@ -929,86 +935,87 @@ const Re = (t) => l.resolve(
       assetsConfigRepoTempDir: r
     }), i;
   }
-}));
+})), hr = (t) => Object.entries(t).map(([e, r]) => `--${e}=${r}`).join(" ");
 export {
-  Oe as DoneCodingCliGlobalConfigKeyEnum,
-  Qt as EditorTypeEnum,
+  Re as DoneCodingCliGlobalConfigKeyEnum,
+  te as EditorTypeEnum,
   Ft as EnvConfigCallModeEnum,
   Bt as EnvConfigProcessKeyEnum,
-  b as GitRefLogTypeEnum,
+  w as GitRefLogTypeEnum,
   _ as HooksNameEnum,
   m as LogTypeEnum,
   ir as SUPPORT_GET_COMMIT_BY_HOOKS_NAMES,
-  Ir as _curry,
-  Or as _get,
-  vr as _set,
+  $r as _curry,
+  Rr as _get,
+  Mr as _set,
   or as addHuskyHooks,
   rr as addPackageConfig,
   at as allowConsoleLog,
-  ye as applyUseTempDir,
-  ht as assetIsExits,
+  Oe as applyUseTempDir,
+  dt as assetIsExits,
   k as assetIsExitsAsync,
   gr as checkCurrentIsRebasing,
   Xe as createMainCommand,
   Ze as createSubcommand,
-  Ve as decryptAES,
-  Ye as encryptAES,
+  Ke as decryptAES,
+  Ve as encryptAES,
   p as execSyncWithLogDispatch,
-  ae as fileAddX,
-  d as formatLogSteamWrite,
-  We as getAnswerSwift,
-  Ke as getAnswerWithMCP,
+  le as fileAddX,
+  h as formatLogSteamWrite,
+  We as generateGetAnswerSwiftFn,
+  Xt as getAnswer,
   ct as getCallMode,
-  Re as getCliModuleTempDir,
+  ve as getCliModuleTempDir,
   cr as getCommitByHookName,
   qe as getConfigFileCommonOptions,
-  lr as getCurrentBranchLastCommitList,
+  fr as getCurrentBranchLastCommitList,
   sr as getCurrentBranchName,
   Ht as getCurrentProcessLogFileName,
-  te as getEditorType,
+  ee as getEditorType,
   ar as getGitLastCommitInfo,
-  Ce as getGitPath,
-  N as getGitProjectDir,
+  ye as getGitPath,
+  P as getGitProjectDir,
   ur as getLastReflogList,
   kt as getLogOutputDir,
-  He as getLogText,
+  Je as getLogText,
   tt as getLogTime,
   Vt as getLogTypeByValue,
   x as getPackageJson,
   Jt as getParentProcessLogFileName,
   st as getProcessEnv,
-  ft as getProcessLogStream,
-  ie as getRelyPkgVersion,
-  ne as getRootDirOptions,
+  lt as getProcessLogStream,
+  ce as getRelyPkgVersion,
+  oe as getRootDirOptions,
   ze as getRootScriptName,
   bt as getSafePath,
   er as getUseDefaultConfig,
   mr as http2sshGitUrl,
-  oe as initConfigFile,
-  ke as initEnvConfig,
+  ie as initConfigFile,
+  He as initEnvConfig,
   Qe as initHandlerCommon,
-  Ee as isHttpGitUrl,
+  _e as isHttpGitUrl,
   xt as isMcpMode,
-  _e as isSshGitUrl,
-  Cr as json5,
+  Ce as isSshGitUrl,
+  yr as json5,
   a as log,
-  Je as lookForParentTarget,
-  se as openFileInEditor,
-  xe as pathIsSafe,
+  Ye as lookForParentTarget,
+  ne as openFileInEditor,
+  hr as params2cliParams,
+  ke as pathIsSafe,
   pr as pushGitPublishInfoToRemote,
-  hr as readCliModuleAssetsConfig,
+  dr as readCliModuleAssetsConfig,
   tr as readConfigFile,
-  ue as readFile,
-  ge as readFileAsync,
+  ge as readFile,
+  pe as readFileAsync,
   nr as readJsonFile,
-  dt as readJsonFileAsync,
+  ht as readJsonFileAsync,
   fe as removeAsset,
-  le as removeAssetAsync,
-  ce as resolveCheckoutInfoByRefInfo,
+  ue as removeAssetAsync,
+  ae as resolveCheckoutInfoByRefInfo,
   Et as resolveMergeInfoByCommitMsg,
-  fr as resolveMergeInfoByGitReflogAction,
-  de as resolveMergeInfoByRefType,
+  lr as resolveMergeInfoByGitReflogAction,
+  Ee as resolveMergeInfoByRefType,
   Sr as rmGitCtrlAsync,
   et as uuidv4,
-  P as xPrompts
+  j as xPrompts
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-utils",
-  "version": "0.8.2-alpha.1",
+  "version": "0.8.2-alpha.2",
   "description": "cli utils",
   "private": false,
   "module": "es/index.mjs",
@@ -68,5 +68,5 @@
     "semver": "^7.5.4",
     "yargs": "^17.7.2"
   },
-  "gitHead": "660e39fc523e4eba1ea621e3c59122f98015a2de"
+  "gitHead": "7683cce31678dfecc6b35014f9658ad8b59f0c97"
 }

package/types/index.d.ts

@@ -225,12 +225,14 @@ export declare const formatLogSteamWrite: ({ stream, type, content, }: {
     content: string;
 }) => boolean;
 
-export { _get }
-
-/** 快捷获取答案 */
-export declare const getAnswerSwift: <V = unknown, T extends string = string>(key: T, 
+/** 生成 获取答案的快捷函数 */
+export declare const generateGetAnswerSwiftFn: ({ isMCP, presetAnswer, }: Pick<GetAnswerOptions<unknown, string>, "isMCP" | "presetAnswer">) => <V = unknown, T extends string = string>(key: T, 
 /** 表单问询配置 */
-questionConfig: Parameters<typeof prompts<T>>[0]) => Promise<V>;
+questionConfig?: Parameters<typeof prompts<T>>[0], 
+/** 默认值 */
+defaultValue?: V) => Promise<V | undefined>;
+
+export { _get }
 
 /**
  * 获取答案 考虑mcp情况
@@ -238,18 +240,26 @@ questionConfig: Parameters<typeof prompts<T>>[0]) => Promise<V>;
  * mcp 只拿预设值，非mcp优先拿默认值
  * 有预设值的场景: MCP
  */
-export declare const getAnswerWithMCP: <V = unknown, T extends string = string>({ isMCP, key, presetAnswer, defaultValue, questionConfig, }: {
+export declare const getAnswer: <V = unknown, T extends string = string>({ isMCP, key, presetAnswer, defaultValue, questionConfig, }: GetAnswerOptions<V, T>) => GetAnswerResult<V, T, typeof questionConfig>;
+
+/** 获取答案 考虑mcp情况 的选项 */
+export declare interface GetAnswerOptions<V, T extends string> {
     /** 是否mcp场景 */
-    isMCP: boolean;
+    isMCP?: boolean;
     /** 表单key */
     key: T;
     /** 预设答案所在的对象 */
-    presetAnswer?: object & { [K in T]: any; };
+    presetAnswer?: object & {
+        [K in T]?: any;
+    };
     /** 默认值 */
     defaultValue?: V;
     /** 表单问询配置 */
-    questionConfig: Parameters<typeof prompts<T>>[0];
-}) => Promise<V>;
+    questionConfig?: Parameters<typeof prompts<T>>[0];
+}
+
+/** 获取答案结果类型 */
+export declare type GetAnswerResult<V, T extends string, Q extends GetAnswerOptions<V, T>["questionConfig"]> = Promise<Q extends undefined ? V | undefined : V>;
 
 /** 获取调用模式 */
 export declare const getCallMode: () => EnvConfigCallModeEnum;
@@ -665,6 +675,14 @@ export declare interface PackageJson {
     peerDependencies?: Record<string, string>;
 }
 
+/**
+ * 参数转cli参数
+ * -----
+ * yargs 参数格式：
+ * --key=value
+ */
+export declare const params2cliParams: (params: Record<string, any>) => string;
+
 /** 路径是否安全 */
 export declare const pathIsSafe: (path?: string) => boolean;