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

package/es/index.mjs

@@ -1,50 +1,50 @@
 #!/usr/bin/env node
-import { homedir as Y, tmpdir as V } from "node:os";
+import { homedir as K, tmpdir as W } from "node:os";
 import f from "node:path";
-import { createOutputLogFile as ft, createOutputConsole as gt, OutputConsoleTypeEnum as pt } from "@done-coding/output-node";
-import g, { existsSync as M, mkdirSync as mt, writeFileSync as D, readFileSync as N } from "node:fs";
-import _t from "dayjs";
-import { default as _r } from "dayjs";
-import A, { randomUUID as Et } from "node:crypto";
-import dt from "prompts";
-import ht from "yargs";
-import { hideBin as St } from "yargs/helpers";
-import { execSync as p, spawn as Ct } from "node:child_process";
-import K from "json5";
+import { createOutputLogFile as mt, createOutputConsole as _t, OutputConsoleTypeEnum as x } from "@done-coding/output-node";
+import g, { existsSync as L, mkdirSync as Et, writeFileSync as G, readFileSync as N } from "node:fs";
+import dt from "dayjs";
+import { default as dr } from "dayjs";
+import A, { randomUUID as ht } from "node:crypto";
+import St from "prompts";
+import Ct from "yargs";
+import { hideBin as Ot } from "yargs/helpers";
+import { spawn as yt, execSync as $ } from "node:child_process";
+import X from "json5";
 export * from "json5";
-import { default as hr } from "json5";
-import Ot from "lodash.merge";
-import Rt from "semver";
-import { default as Cr } from "lodash.get";
-import { default as Rr } from "lodash.set";
-import { default as Ir } from "lodash.curry";
+import { default as Cr } from "json5";
+import Rt from "lodash.merge";
+import It from "semver";
+import { default as yr } from "lodash.get";
+import { default as Ir } from "lodash.set";
+import { default as Nr } from "lodash.curry";
 import P from "pinyin";
-import { default as Nr } from "chalk";
-const W = "__DONE_CODING_ENV_CONFIG__", X = Symbol.for(
-  W
-), k = Symbol.for(
+import { default as vr } from "chalk";
+const z = "__DONE_CODING_ENV_CONFIG__", Z = Symbol.for(
+  z
+), J = Symbol.for(
   "DONE_CODING_CURRENT_LOG_FILE_NAME"
-), z = "DONE_CODING_PROCESS_CREATE_BY_HIJACK_PRESET_JSON", b = ".done-coding", yt = `${b}/cli/assets-config`, It = "assets", Pt = "index.json", Nt = `${b}/config.json`, At = "output/log", Z = "default", vt = "https://gitee.com/justsosu/done-coding-cli-assets-config.git", $ = 73, Tt = (t) => {
+), q = "DONE_CODING_PROCESS_CREATE_BY_HIJACK_PRESET_JSON", w = ".done-coding", Pt = `${w}/cli/assets-config`, Nt = "assets", At = "index.json", vt = `${w}/config.json`, Tt = "output/log", Q = "default", Lt = "https://gitee.com/justsosu/done-coding-cli-assets-config.git", D = 73, Mt = (t) => {
   const r = g.statSync(t).mode;
-  if ((r & $) === $)
+  if ((r & D) === D)
     return;
   a.stage(`${t} 没有执行权限 添加... `);
-  const s = r | $;
+  const s = r | D;
   g.chmodSync(t, s), a.success(`${t} 添加执行权限成功`);
-}, w = (t) => g.existsSync(t), B = async (t) => {
+}, B = (t) => g.existsSync(t), U = async (t) => {
   try {
     return await g.promises.lstat(t), !0;
   } catch (e) {
     return e.code !== "ENOENT";
   }
-}, Mt = (t, e = !1) => {
-  w(t) && g.rmSync(t, { recursive: !0, force: e });
-}, Lt = async (t, e = !1) => {
-  await B(t) && await g.promises.rm(t, { recursive: !0, force: e });
-}, $t = (t) => g.readFileSync(t, "utf-8"), Dt = (t) => g.promises.readFile(t, "utf-8"), be = (t, e) => JSON.parse($t(t)) || e, q = async (t, e) => JSON.parse(await Dt(t)) || e;
-var Gt = /* @__PURE__ */ ((t) => (t.GLOBAL_CONFIG_IMAGE = "GLOBAL_CONFIG_IMAGE", t))(Gt || {});
-const Q = (t) => `${W}_${t}`, tt = (t, e) => {
-  const r = process.env[Q(t)];
+}, $t = (t, e = !1) => {
+  B(t) && g.rmSync(t, { recursive: !0, force: e });
+}, Dt = async (t, e = !1) => {
+  await U(t) && await g.promises.rm(t, { recursive: !0, force: e });
+}, Gt = (t) => g.readFileSync(t, "utf-8"), Ft = (t) => g.promises.readFile(t, "utf-8"), Be = (t, e) => JSON.parse(Gt(t)) || e, tt = async (t, e) => JSON.parse(await Ft(t)) || e;
+var bt = /* @__PURE__ */ ((t) => (t.GLOBAL_CONFIG_IMAGE = "GLOBAL_CONFIG_IMAGE", t))(bt || {});
+const et = (t) => `${z}_${t}`, rt = (t, e) => {
+  const r = process.env[et(t)];
   if (r !== void 0)
     try {
       return JSON.parse(r).value;
@@ -53,38 +53,38 @@ const Q = (t) => `${W}_${t}`, tt = (t, e) => {
     }
   else
     return e;
-}, Ft = (t, e) => {
-  tt(t);
-  const r = Q(t), s = { value: e };
+}, wt = (t, e) => {
+  rt(t);
+  const r = et(t), s = { value: e };
   process.env[r] = JSON.stringify(s);
-}, et = () => globalThis[X], rt = () => {
-  const t = globalThis[k];
+}, st = () => globalThis[Z], nt = () => {
+  const t = globalThis[J];
   if (t)
     return t;
   {
-    const e = `${_t().format("YYYY-MM-DD_HH-mm-ss")}_${process.pid}.log`;
-    return globalThis[k] = e, e;
+    const e = `${dt().format("YYYY-MM-DD_HH-mm-ss")}_${process.pid}.log`;
+    return globalThis[J] = e, e;
   }
-}, bt = (t) => {
+}, Bt = (t) => {
   const r = {
-    ...et() || {},
+    ...st() || {},
     ...t
   };
-  return Ft("GLOBAL_CONFIG_IMAGE", r), globalThis[X] = r, r;
-}, wt = () => tt(
+  return wt("GLOBAL_CONFIG_IMAGE", r), globalThis[Z] = r, r;
+}, Ut = () => rt(
   "GLOBAL_CONFIG_IMAGE"
   /* GLOBAL_CONFIG_IMAGE */
-), st = (t) => `${b}/${t}/${At}`, Bt = () => {
-  const t = wt();
+), ot = (t) => `${w}/${t}/${Tt}`, Ht = () => {
+  const t = Ut();
   let e;
   if (t)
     e = t;
   else {
-    const m = Z;
+    const m = Q;
     e = {
       series: m,
       consoleLog: !0,
-      logOutputDir: st(m),
+      logOutputDir: ot(m),
       processLogFileNameList: []
     };
   }
@@ -93,7 +93,7 @@ const Q = (t) => `${W}_${t}`, tt = (t, e) => {
     consoleLog: s,
     logOutputDir: n,
     processLogFileNameList: o
-  } = e, c = rt(), i = (o[0] === c ? o : [c, ...o]).slice(0, 10), u = process.env[z];
+  } = e, c = nt(), i = (o[0] === c ? o : [c, ...o]).slice(0, 10), u = process.env[q];
   let l;
   if (u)
     try {
@@ -112,47 +112,52 @@ const Q = (t) => `${W}_${t}`, tt = (t, e) => {
     /** 自身或祖先进程被劫持进程创建 行为预设信息 */
     processCreateByHijackPresetInfo: l
   };
-}, C = () => et() || Bt(), we = ({
-  series: t = Z,
+}, h = () => st() || Ht(), Ue = ({
+  series: t = Q,
   consoleLog: e = !0
 }) => {
-  const r = st(t), s = {
-    ...C(),
+  const r = ot(t), s = {
+    ...h(),
     series: t,
     consoleLog: e,
     logOutputDir: r
   };
-  return bt(s);
-}, Ut = () => C().processCreateByHijack, Ht = () => C().processCreateByHijackPresetInfo, jt = (t = !1) => {
+  return Bt(s);
+}, it = () => h().processCreateByHijack, jt = () => h().processCreateByHijackPresetInfo, kt = (t = !1) => {
   const e = f.resolve(
-    t ? Y() : V(),
-    C().logOutputDir
+    t ? K() : W(),
+    h().logOutputDir
   );
-  return w(e) || g.mkdirSync(e, { recursive: !0 }), e;
-}, kt = () => C().processLogFileNameList[1], xt = (() => {
-  const t = ft({
+  return B(e) || g.mkdirSync(e, { recursive: !0 }), e;
+}, xt = () => h().processLogFileNameList[1], Jt = (() => {
+  const t = mt({
     logFilePath: f.resolve(
-      jt(),
-      rt()
+      kt(),
+      nt()
     )
   });
   let e = !1;
   if (!e) {
-    const r = kt();
+    const r = xt();
     r && (t.info(`父进程日志文件: ${r}`), e = !0);
   }
   return t;
-})(), Jt = (t) => {
-  const e = C();
+})(), Yt = () => {
+  const t = h();
+  return typeof t.consoleLog == "boolean" ? t.consoleLog : !!t.consoleLog.length;
+}, Vt = (t) => {
+  if (it())
+    return !0;
+  const e = h();
   return typeof e.consoleLog == "boolean" ? e.consoleLog : e.consoleLog.includes(t);
-}, a = gt({
-  isSwitchLogFile: (t) => !Jt(t),
+}, a = _t({
+  isSwitchLogFile: (t) => [x.DEBUG].includes(t) ? !0 : !Vt(t),
   enableColor: !0,
-  outputFileFn: (t, ...e) => xt.info({
-    consoleType: pt[t],
+  outputFileFn: (t, ...e) => Jt.info({
+    consoleType: x[t],
     consoleMessages: e
   })
-}), Be = (t, {
+}), He = (t, {
   /** 当前目录 */
   currentDir: e = process.cwd(),
   /** 优先找最远的父目录 */
@@ -164,8 +169,8 @@ const Q = (t) => `${W}_${t}`, tt = (t, e) => {
     if (g.existsSync(o))
       return n;
   }
-}, nt = "aes-256-cbc", ot = 16, v = "hex", G = ":";
-function it(t) {
+}, ct = "aes-256-cbc", at = 16, v = "hex", F = ":";
+function lt(t) {
   return A.pbkdf2Sync(
     t,
     "done-coding-cli-salt",
@@ -177,38 +182,38 @@ function it(t) {
     "sha256"
   );
 }
-function Ue({
+function je({
   text: t,
   secretKey: e
 }) {
   try {
-    const r = it(e), s = A.randomBytes(ot), n = A.createCipheriv(
-      nt,
+    const r = lt(e), s = A.randomBytes(at), n = A.createCipheriv(
+      ct,
       r,
       s
     );
     let o = n.update(t);
     o = Buffer.concat([o, n.final()]);
     const c = s.toString(v), i = o.toString(v);
-    return `${c}${G}${i}`;
+    return `${c}${F}${i}`;
   } catch (r) {
     return a.error(
       `加密失败: ${r instanceof Error ? r.message : String(r)}`
     ), "";
   }
 }
-function He({
+function ke({
   encryptedText: t,
   secretKey: e
 }) {
   try {
-    if (!t.includes(G))
+    if (!t.includes(F))
       return "";
-    const r = it(e), [s, n] = t.split(G);
-    if (s.length !== ot * 2)
+    const r = lt(e), [s, n] = t.split(F);
+    if (s.length !== at * 2)
       return "";
     const o = Buffer.from(s, v), c = Buffer.from(n, v), i = A.createDecipheriv(
-      nt,
+      ct,
       r,
       o
     );
@@ -222,27 +227,27 @@ function He({
     ), "";
   }
 }
-const ct = {
+const ut = {
   /** prompts 开始等待用户输入 */
   PROMPTS_START_WAIT_USER_INPUT: "PROMPTS_START_WAIT_USER_INPUT",
   /** prompts 结束等待用户输入 */
   PROMPTS_END_WAIT_USER_INPUT: "PROMPTS_END_WAIT_USER_INPUT"
-}, Yt = (t) => ({
-  type: ct.PROMPTS_START_WAIT_USER_INPUT,
+}, Kt = (t) => ({
+  type: ut.PROMPTS_START_WAIT_USER_INPUT,
   data: t
-}), Vt = () => ({
-  type: ct.PROMPTS_END_WAIT_USER_INPUT
-}), x = (t) => (a.debug("发送进程自定义事件", t), new Promise((e, r) => {
+}), Wt = () => ({
+  type: ut.PROMPTS_END_WAIT_USER_INPUT
+}), Y = (t) => (a.debug("发送进程自定义事件", t), new Promise((e, r) => {
   process.send ? process.send(t, (s) => {
     s ? (a.error("发送进程自定义事件失败", s), r(s)) : (a.debug("发送进程自定义事件成功", t), e());
   }) : (a.error(
     "进程自定义事件发送失败，process.send is not defined"
   ), r(new Error("process.send is not defined")));
-})), U = async (...t) => {
-  const [e, r = {}] = t, s = Ut();
+})), H = async (...t) => {
+  const [e, r = {}] = t, s = it();
   if (s) {
-    await x(Yt(t));
-    const o = Ht();
+    await Y(Kt(t));
+    const o = jt();
     if (o != null && o.beforeInputExit) {
       a.info(
         "劫持进程设置在等待用户输入前退出",
@@ -256,7 +261,7 @@ const ct = {
       ), process.exit(1);
     }
   }
-  const n = dt(e, {
+  const n = St(e, {
     onCancel(o) {
       return a.error(
         `您取消了 “${(o == null ? void 0 : o.message) || (o == null ? void 0 : o.name)}” 相关表单输入`
@@ -265,26 +270,26 @@ const ct = {
     ...r
   });
   return s && n.finally(() => {
-    x(Vt());
+    Y(Wt());
   }), n;
-}, Kt = async ({
+}, Xt = async ({
   key: t,
   presetAnswer: e,
   defaultValue: r,
   questionConfig: s
-}) => (e == null ? void 0 : e[t]) ?? r ?? (s !== void 0 ? (await U(s))[t] : void 0), je = ({
+}) => (e == null ? void 0 : e[t]) ?? r ?? (s !== void 0 ? (await H(s))[t] : void 0), xe = ({
   presetAnswer: t
-}) => async (e, r, s) => Kt({
+}) => async (e, r, s) => Xt({
   key: e,
   questionConfig: r,
   defaultValue: s,
   presetAnswer: t
-}), Wt = (t, e) => {
+}), zt = (t, e) => {
   t ? a.error(t) : a.error(e.message), e != null && e.stack && a.error(e.stack), process.exit(1);
-}, Xt = () => {
-  const t = St(process.argv);
-  return ht(t);
-}, ke = ({
+}, Zt = () => {
+  const t = Ot(process.argv);
+  return Ct(t);
+}, Je = ({
   rootScriptName: t,
   packageJson: e
 }) => {
@@ -304,7 +309,7 @@ const ct = {
       return process.platform === "win32" ? i.toLowerCase() : i;
     }
   }
-}, at = (t, {
+}, ft = (t, {
   usage: e,
   version: r,
   demandCommandCount: s,
@@ -316,27 +321,87 @@ const ct = {
   let l = t.strict();
   e && (l = l.usage(`Usage: ${e}`)), s && (l = l.demandCommand(s));
   const m = "help";
-  return l = l.help(m), r ? l = l.version(r).alias("h", m).alias("v", "version") : l = l.alias("h", m), n && (l = l.options(n)), o && (l = Object.entries(o).reduce((h, [O, E]) => h.positional(O, E), l)), c && (l = l.command(c)), u && i && (l = l.scriptName(i)), l;
-}, xe = async ({ handler: t, ...e }) => {
-  const r = await at(Xt(), e, !0).fail(
-    Wt
+  return l = l.help(m), r ? l = l.version(r).alias("h", m).alias("v", "version") : l = l.alias("h", m), n && (l = l.options(n)), o && (l = Object.entries(o).reduce((S, [O, E]) => S.positional(O, E), l)), c && (l = l.command(c)), u && i && (l = l.scriptName(i)), l;
+}, Ye = async ({ handler: t, ...e }) => {
+  const r = await ft(Zt(), e, !0).fail(
+    zt
   ).argv;
   return t ? t(r) : r;
-}, Je = (t) => {
+}, Ve = (t) => {
   const { command: e, describe: r, handler: s = () => {
   }, ...n } = t;
   return {
     command: e,
     describe: r,
     builder(o) {
-      return at(o, n, !1);
+      return ft(o, n, !1);
     },
     handler: s
   };
+}, Ke = ({
+  command: t,
+  args: e,
+  env: r,
+  cwd: s,
+  beforeInputExit: n
+}) => new Promise((o, c) => {
+  var C, y;
+  let i = !1;
+  const u = {
+    beforeInputExit: n
+  }, l = yt(t, e, {
+    cwd: s,
+    stdio: ["pipe", "pipe", "pipe", "ipc"],
+    env: {
+      ...r,
+      [q]: JSON.stringify(
+        u
+      )
+    }
+  }), m = () => {
+    i = !0, l.removeAllListeners();
+  }, S = (_) => {
+    i || (m(), c(_));
+  }, O = (_) => {
+    if (a.debug("劫持子进程消息:", _, i), !i)
+      switch (_.type) {
+      }
+  };
+  l.once("error", S), l.on("message", O);
+  let E = "", d = "";
+  (C = l.stdout) == null || C.on("data", (_) => {
+    E += _;
+  }), (y = l.stderr) == null || y.on("data", (_) => {
+    d += _;
+  }), l.once("exit", (_, I) => {
+    if (i)
+      return;
+    m();
+    const k = _ === 0;
+    k ? o({
+      success: k,
+      code: _ ?? null,
+      signal: I ?? null,
+      stdout: E,
+      stderr: d
+    }) : c(new Error(`进程退出，退出码: ${_}`));
+  });
+}), p = (t, e = {}) => {
+  if (Yt())
+    return $(t, e);
+  {
+    const { stdio: r = "pipe" } = e;
+    return r === "inherit" ? (a.error(
+      "execSyncHijack: execSync 选项中 stdio 设置的值为 inherit，请在设置选项时根据 isAllowOutputConsole 判断是否允许输出到控制台"
+    ), $(t, {
+      ...e,
+      stdio: "ignore"
+    })) : $(t, e);
+  }
 };
-var zt = /* @__PURE__ */ ((t) => (t.VSCODE = "VsCode", t.CURSOR = "Cursor", t.OTHER = "其他", t))(zt || {});
-const Zt = async () => {
-  const { editorType: t } = await U([
+var qt = /* @__PURE__ */ ((t) => (t.VSCODE = "VsCode", t.CURSOR = "Cursor", t.OTHER = "其他", t))(qt || {});
+const Qt = async () => {
+  const { editorType: t } = await H([
     {
       name: "editorType",
       type: "select",
@@ -353,24 +418,24 @@ const Zt = async () => {
     }
   ]);
   return t;
-}, qt = {
+}, te = {
   Cursor: "cursor",
   VsCode: "code"
-}, Qt = (t, e, r) => {
+}, ee = (t, e, r) => {
   try {
     p(`${t} -v`, { stdio: "ignore" }), p(`${t} ${e}`);
   } catch {
     r();
   }
-}, te = (t, e) => {
+}, re = (t, e) => {
   const r = (s) => a.info(`
       ${s}, 请用编辑器打开 ${t} 进行编辑
 `);
   switch (e) {
     case "Cursor":
     case "VsCode": {
-      const s = qt[e];
-      Qt(s, t, () => {
+      const s = te[e];
+      ee(s, t, () => {
         r(`${s}命令未安装`);
       });
       break;
@@ -378,7 +443,7 @@ const Zt = async () => {
     default:
       r("其他编辑器");
   }
-}, ee = (t = process.cwd()) => ({
+}, se = (t = process.cwd()) => ({
   /** 必须保留 */
   rootDir: {
     type: "string",
@@ -387,12 +452,12 @@ const Zt = async () => {
     /** 必须设置默认值 */
     default: t
   }
-}), Ye = ({
+}), We = ({
   configPathDefault: t,
   rootDirDefault: e
 }) => ({
   /** 必须保留 */
-  ...ee(e),
+  ...se(e),
   /** 必须保留 */
   configPath: {
     type: "string",
@@ -401,52 +466,52 @@ const Zt = async () => {
     /** 必须设置默认值 */
     default: t
   }
-}), re = async (t, e) => {
+}), ne = async (t, e) => {
   const { configPath: r, rootDir: s } = e, n = f.resolve(s, r), o = f.dirname(n);
-  return M(o) || mt(o, {
+  return L(o) || Et(o, {
     recursive: !0
-  }), n.endsWith(".json5") ? (a.info(`json5模式写入 ${n}`), D(n, K.stringify(t, null, 2)), n) : (a.info(`json模式写入 ${n}`), D(n, JSON.stringify(t, null, 2)), n);
-}, Ve = async (t, e, {
+  }), n.endsWith(".json5") ? (a.info(`json5模式写入 ${n}`), G(n, X.stringify(t, null, 2)), n) : (a.info(`json模式写入 ${n}`), G(n, JSON.stringify(t, null, 2)), n);
+}, Xe = async (t, e, {
   onFileGenerated: r,
   edit: s = !1
 } = {}) => {
-  const n = await re(t, e);
+  const n = await ne(t, e);
   if (r == null || r(n), s) {
-    const o = await Zt();
-    te(e.configPath, o);
+    const o = await Qt();
+    re(e.configPath, o);
   }
-}, Ke = async (t, e) => {
+}, ze = async (t, e) => {
   const { configPath: r, rootDir: s } = t, n = f.resolve(s, r);
-  if (!M(n)) {
+  if (!L(n)) {
     if (e)
       return a.info("配置文件不存在，使用onNotExists返回值"), e();
     const o = `配置文件不存在 ${n}`;
     throw new Error(o);
   }
-  return n.endsWith(".json5") ? (a.info(`json5模式解析 ${n}`), K.parse(N(n, "utf8"))) : (a.info(`json模式解析 ${n}`), JSON.parse(N(n, "utf8")));
-}, We = async () => {
-  const { useDefaultConfig: t } = await U({
+  return n.endsWith(".json5") ? (a.info(`json5模式解析 ${n}`), X.parse(N(n, "utf8"))) : (a.info(`json模式解析 ${n}`), JSON.parse(N(n, "utf8")));
+}, Ze = async () => {
+  const { useDefaultConfig: t } = await H({
     name: "useDefaultConfig",
     type: "confirm",
     message: "使用默认模板配置",
     initial: !0
   });
   return t;
-}, lt = "package.json", H = ({
+}, gt = "package.json", j = ({
   rootDir: t
 }) => {
-  const e = f.resolve(t, lt);
-  if (!M(e))
+  const e = f.resolve(t, gt);
+  if (!L(e))
     throw new Error(`${t}未找到package.json文件`);
   const r = N(e, "utf-8");
   return JSON.parse(r);
-}, se = ({
+}, oe = ({
   rootDir: t,
   pkgJson: e,
   pkgName: r,
   isDevPkg: s
 }) => {
-  const n = e || H({ rootDir: t }), o = s ? n.devDependencies : n.dependencies;
+  const n = e || j({ rootDir: t }), o = s ? n.devDependencies : n.dependencies;
   let c = o == null ? void 0 : o[r];
   if (!c) {
     const i = s ? n.dependencies : n.devDependencies;
@@ -456,22 +521,22 @@ const Zt = async () => {
     return;
   }
   return c || a.info(`依赖包${r}未安装`), c;
-}, Xe = ({
+}, qe = ({
   patchConfig: t,
   rootDir: e
 }) => {
   if (!t)
     return;
-  const r = H({ rootDir: e }), s = Ot(r, t), n = f.resolve(e, lt);
-  D(n, JSON.stringify(s, null, 2), "utf-8");
-}, L = (t) => {
+  const r = j({ rootDir: e }), s = Rt(r, t), n = f.resolve(e, gt);
+  G(n, JSON.stringify(s, null, 2), "utf-8");
+}, M = (t) => {
   const r = p("git rev-parse --show-toplevel", {
     cwd: t
   }).toString();
   if (!r)
     throw new Error("获取git根目录失败");
   return r.trim();
-}, ze = () => {
+}, Qe = () => {
   var t;
   try {
     const e = p("git symbolic-ref --short HEAD", {
@@ -488,7 +553,7 @@ const Zt = async () => {
       return;
     }
   }
-}, ne = (t) => {
+}, ie = (t) => {
   const e = t.match(/moving\s+from\s+(.*)\s+to\s+(.*)/);
   if (e) {
     const [, r, s] = e;
@@ -498,28 +563,28 @@ const Zt = async () => {
     };
   }
 };
-var y = /* @__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))(y || {});
-const oe = "husky", ie = ".husky", ce = ({ rootDir: t }) => {
-  const e = L(t), r = se({
+var R = /* @__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))(R || {});
+const ce = "husky", ae = ".husky", le = ({ rootDir: t }) => {
+  const e = M(t), r = oe({
     rootDir: e,
-    pkgJson: H({ rootDir: e }),
-    pkgName: oe,
+    pkgJson: j({ rootDir: e }),
+    pkgName: ce,
     isDevPkg: !0
   });
   if (!r)
     throw new Error("husky版本获取失败, 可能husky未安装");
   const s = r.replace(/^(\^|~)/, ""), n = "<9.0.0";
-  return Rt.satisfies(s, n) ? (a.info(`${s}符合${n}`), `#!/usr/bin/env sh
+  return It.satisfies(s, n) ? (a.info(`${s}符合${n}`), `#!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"`) : (a.info(`${s}不符合${n}`), "");
-}, ae = ({ rootDir: t }) => {
-  const e = L(t);
-  return f.resolve(e, ie);
-}, Ze = ({
+}, ue = ({ rootDir: t }) => {
+  const e = M(t);
+  return f.resolve(e, ae);
+}, tr = ({
   hookNames: t,
   rootDir: e,
   getCode: r
 }) => {
-  const s = ae({ rootDir: e });
+  const s = ue({ rootDir: e });
   g.existsSync(s) || g.mkdirSync(s, { recursive: !0 }), t.forEach((n) => {
     const o = f.resolve(s, n), c = g.existsSync(o);
     let i = r(n);
@@ -533,7 +598,7 @@ ${i}
 `
       ), a.success(`${o} 添加 ${n}相关调用成功`));
     else {
-      const u = ce({
+      const u = le({
         rootDir: e
       });
       g.writeFileSync(
@@ -545,27 +610,27 @@ ${i}
         "utf-8"
       ), a.success(`${o} 添加 ${n}相关调用成功`);
     }
-    Tt(o);
+    Mt(o);
   });
-}, qe = [
+}, er = [
   // HooksNameEnum.PRE_MERGE_COMMIT,
-  y.PREPARE_COMMIT_MSG,
-  y.COMMIT_MSG
-], Qe = ({
+  R.PREPARE_COMMIT_MSG,
+  R.COMMIT_MSG
+], rr = ({
   hookName: t,
   rootDir: e
 }) => {
-  const r = L(e), s = f.resolve(r, ".git");
+  const r = M(e), s = f.resolve(r, ".git");
   switch (t) {
-    case y.PREPARE_COMMIT_MSG:
-    case y.COMMIT_MSG: {
+    case R.PREPARE_COMMIT_MSG:
+    case R.COMMIT_MSG: {
       const n = f.resolve(s, "MERGE_MSG");
-      if (M(n))
+      if (L(n))
         return N(n, "utf-8");
     }
   }
   return "";
-}, tr = ({
+}, sr = ({
   remoteAlias: t = "origin"
 } = {}) => {
   try {
@@ -600,7 +665,7 @@ ${i}
   } catch (e) {
     throw a.error("获取git最后提交信息失败"), e;
   }
-}, ut = (t = "") => {
+}, pt = (t = "") => {
   const e = /\s*Merge\s+branch\s+['|"](.+)['|"]\s+into\s+['|"](.+)['|"]\s*/i, r = t.match(e);
   if (r) {
     const [, i, u] = r;
@@ -624,12 +689,12 @@ ${i}
       fromBranch: i
     };
   }
-}, le = (t) => {
-  if (t.startsWith(F.MERGE))
+}, fe = (t) => {
+  if (t.startsWith(b.MERGE))
     return {
-      fromBranch: t.replace(F.MERGE, "").trim()
+      fromBranch: t.replace(b.MERGE, "").trim()
     };
-}, er = () => {
+}, nr = () => {
   const t = process.env.GIT_REFLOG_ACTION || "";
   if (!t)
     return;
@@ -648,15 +713,15 @@ ${i}
     };
   }
 };
-var F = /* @__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))(F || {});
-const J = "__GIT_REPLACE_MARK__", T = {
+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 V = "__GIT_REPLACE_MARK__", T = {
   stringify(t) {
-    return JSON.stringify(t).replace(/"/g, J);
+    return JSON.stringify(t).replace(/"/g, V);
   },
   parse(t) {
-    return JSON.parse(t.replace(new RegExp(J, "g"), '"'));
+    return JSON.parse(t.replace(new RegExp(V, "g"), '"'));
   }
-}, rr = ({
+}, or = ({
   count: t = 100
 } = {}) => {
   if (t <= 0)
@@ -687,10 +752,10 @@ const J = "__GIT_REPLACE_MARK__", T = {
     const c = T.parse(o);
     return {
       ...c,
-      mergeInfo: ut(c.message)
+      mergeInfo: pt(c.message)
     };
   });
-}, sr = ({
+}, ir = ({
   count: t = 100,
   filterItem: e = () => !0
 } = {}) => {
@@ -709,38 +774,38 @@ const J = "__GIT_REPLACE_MARK__", T = {
     )}"`
   ).toString().split(`
 `).map((i) => T.parse(i)).filter(e).map((i) => {
-    const { fullMessage: u, ...l } = i, m = ":", [h] = u.split(m, 1), O = u.slice(`${h}${m}`.length), E = h.trim(), d = O.trim();
-    let S, R, _;
+    const { fullMessage: u, ...l } = i, m = ":", [S] = u.split(m, 1), O = u.slice(`${S}${m}`.length), E = S.trim(), d = O.trim();
+    let C, y, _;
     if (E.startsWith(
       "checkout"
       /* CHECKOUT */
     ))
-      R = ne(d);
+      y = ie(d);
     else if (E.startsWith(
       "merge"
       /* MERGE */
     ))
-      S = le(E);
+      C = fe(E);
     else if (E.startsWith(
       "commit (merge)"
       /* COMMIT_MERGE */
     )) {
-      const I = ut(d);
+      const I = pt(d);
       I || a.warn(
         `${i.hash} 是合并提交 但是未从提交信息(${d})中检测到合并分支信息，推测手动更改了提交内容`
-      ), S = I;
+      ), C = I;
     }
     return {
       ...l,
       type: E,
       message: d,
-      mergeInfo: S,
-      checkoutInfo: R,
+      mergeInfo: C,
+      checkoutInfo: y,
       rebaseInfo: _
     };
   });
-}, nr = (t) => {
-  const e = L(t), r = f.resolve(e, ".git"), s = f.resolve(r, "rebase-merge");
+}, cr = (t) => {
+  const e = M(t), r = f.resolve(e, ".git"), s = f.resolve(r, "rebase-merge");
   if (g.existsSync(s))
     return !0;
   const n = f.resolve(r, "rebase-apply");
@@ -748,7 +813,7 @@ const J = "__GIT_REPLACE_MARK__", T = {
     return !0;
   const o = f.resolve(r, "REBASE_HEAD");
   return !!g.existsSync(o);
-}, or = ({
+}, ar = ({
   branchName: t,
   version: e,
   remoteInfo: r
@@ -758,19 +823,19 @@ const J = "__GIT_REPLACE_MARK__", T = {
   }), p(`git push ${r.alias} ${t}`, {
     stdio: "inherit"
   }));
-}, ue = (t) => /^https?:\/\//.test(t), fe = (t) => /^git@/.test(t), ir = (t) => {
+}, ge = (t) => /^https?:\/\//.test(t), pe = (t) => /^git@/.test(t), lr = (t) => {
   const { hostname: e, pathname: r } = new URL(t);
   return `git@${e}:${r.replace("/", "")}`;
-}, ge = (t) => f.resolve(t, ".git"), cr = (t) => Lt(ge(t)), pe = ({
+}, me = (t) => f.resolve(t, ".git"), ur = (t) => Dt(me(t)), _e = ({
   dir: t,
   fn: e,
   endClear: r = !0,
   exitClear: s = !0
 }) => {
-  if (w(t))
+  if (B(t))
     return a.error(`${t} 已存在，请手动删除该目录再试`), process.exit(1);
   const n = () => {
-    Mt(t);
+    $t(t);
   };
   s && process.once("exit", () => {
     n();
@@ -782,19 +847,19 @@ const J = "__GIT_REPLACE_MARK__", T = {
     throw r && n(), c;
   }
   return r && (o instanceof Promise ? o.finally(n) : n()), o;
-}, me = () => Et();
-var _e = /* @__PURE__ */ ((t) => (t.ASSETS_CONFIG_REPO_URL = "ASSETS_CONFIG_REPO_URL", t))(_e || {});
-const Ee = (t) => f.resolve(
-  V(),
-  yt,
-  `${t}-${me()}`
-), de = () => f.resolve(Y(), Nt), he = async () => {
-  const t = de(), e = {
-    ASSETS_CONFIG_REPO_URL: vt
+}, Ee = () => ht();
+var de = /* @__PURE__ */ ((t) => (t.ASSETS_CONFIG_REPO_URL = "ASSETS_CONFIG_REPO_URL", t))(de || {});
+const he = (t) => f.resolve(
+  W(),
+  Pt,
+  `${t}-${Ee()}`
+), Se = () => f.resolve(K(), vt), Ce = async () => {
+  const t = Se(), e = {
+    ASSETS_CONFIG_REPO_URL: Lt
   };
   try {
-    if (await B(t)) {
-      const r = await q(t, {});
+    if (await U(t)) {
+      const r = await tt(t, {});
       Object.entries(r).forEach(([s, n]) => {
         e[s] = n;
       });
@@ -802,32 +867,39 @@ const Ee = (t) => f.resolve(
   } catch {
   }
   return e;
-}, Se = async (t) => {
-  if (await B(t))
+}, Oe = async (t) => {
+  if (a.debug(
+    `创建本地资产配置临时仓库，临时目录: ${t}`
+  ), await U(t))
     return a.error(`${t} 已存在，请手动删除该目录再试`), process.exit(1);
   const {
     [
       "ASSETS_CONFIG_REPO_URL"
       /* ASSETS_CONFIG_REPO_URL */
     ]: e
-  } = await he();
-  return fe(e) || ue(e) ? p(`git clone ${e} ${t} --depth=1`) : (g.mkdirSync(t, { recursive: !0 }), p(`cp -r ${e}/ ${t}/`)), {
+  } = await Ce();
+  return pe(e) || ge(e) ? p(
+    `git clone ${e} ${t} --depth=1`,
+    {
+      stdio: "ignore"
+    }
+  ) : (g.mkdirSync(t, { recursive: !0 }), p(`cp -r ${e}/ ${t}/`)), {
     assetConfigRepoUrl: e
   };
-}, ar = async ({
+}, fr = async ({
   moduleName: t,
   onSuccess: e
-}) => (a.stage(`拉取${t}配置，请稍等...`), pe({
+}) => (a.stage(`拉取${t}配置，请稍等...`), _e({
   // 资源配置仓库临时文件夹
-  dir: Ee(t),
+  dir: he(t),
   fn: async (r) => {
-    const { assetConfigRepoUrl: s } = await Se(r), n = f.join(
-      It,
+    const { assetConfigRepoUrl: s } = await Oe(r), n = f.join(
+      Nt,
       t
     ), o = f.join(
       n,
-      Pt
-    ), c = f.resolve(r, o), i = await q(c);
+      At
+    ), c = f.resolve(r, o), i = await tt(c);
     return await e({
       repoUrl: s,
       config: i,
@@ -836,130 +908,84 @@ const Ee = (t) => f.resolve(
       assetsConfigRepoTempDir: r
     }), i;
   }
-})), Ce = /[^a-zA-Z0-9._\-]/, Oe = /[^a-zA-Z0-9._\-]/g, lr = (t) => t ? !Ce.test(t) : !1, ur = (t) => (t || "_").replace(Oe, "_"), fr = (t) => Object.entries(t).map(([e, r]) => `--${e}=${r}`), gr = ({
-  command: t,
-  args: e,
-  env: r,
-  cwd: s,
-  beforeInputExit: n
-}) => new Promise((o, c) => {
-  var S, R;
-  let i = !1;
-  const u = {
-    beforeInputExit: n
-  }, l = Ct(t, e, {
-    cwd: s,
-    stdio: ["pipe", "pipe", "pipe", "ipc"],
-    env: {
-      ...r,
-      [z]: JSON.stringify(
-        u
-      )
-    }
-  }), m = () => {
-    i = !0, l.removeAllListeners();
-  }, h = (_) => {
-    i || (m(), c(_));
-  }, O = (_) => {
-    if (a.debug("劫持子进程消息:", _, i), !i)
-      switch (_.type) {
-      }
-  };
-  l.once("error", h), l.on("message", O);
-  let E = "", d = "";
-  (S = l.stdout) == null || S.on("data", (_) => {
-    E += _;
-  }), (R = l.stderr) == null || R.on("data", (_) => {
-    d += _;
-  }), l.once("exit", (_, I) => {
-    if (i)
-      return;
-    m();
-    const j = _ === 0;
-    j ? o({
-      success: j,
-      code: _ ?? null,
-      signal: I ?? null,
-      stdout: E,
-      stderr: d
-    }) : c(new Error(`进程退出，退出码: ${_}`));
-  });
-});
+})), ye = /[^a-zA-Z0-9._\-]/, Re = /[^a-zA-Z0-9._\-]/g, gr = (t) => t ? !ye.test(t) : !1, pr = (t) => (t || "_").replace(Re, "_"), mr = (t) => Object.entries(t).map(([e, r]) => `--${e}=${r}`);
 export {
-  _e as DoneCodingCliGlobalConfigKeyEnum,
-  zt as EditorTypeEnum,
-  Gt as EnvConfigProcessKeyEnum,
-  F as GitRefLogTypeEnum,
-  y as HooksNameEnum,
-  qe as SUPPORT_GET_COMMIT_BY_HOOKS_NAMES,
-  Ir as _curry,
-  Cr as _get,
-  Rr as _set,
-  Ze as addHuskyHooks,
-  Xe as addPackageConfig,
-  pe as applyUseTempDir,
-  w as assetIsExits,
-  B as assetIsExitsAsync,
-  Nr as chalk,
-  nr as checkCurrentIsRebasing,
-  xe as createMainCommand,
-  Je as createSubcommand,
-  _r as dayjs,
-  He as decryptAES,
-  Ue as encryptAES,
-  Tt as fileAddX,
-  je as generateGetAnswerSwiftFn,
-  Kt as getAnswer,
-  Ee as getCliModuleTempDir,
-  Qe as getCommitByHookName,
-  Ye as getConfigFileCommonOptions,
-  rr as getCurrentBranchLastCommitList,
-  ze as getCurrentBranchName,
-  rt as getCurrentProcessLogFileName,
-  Zt as getEditorType,
-  tr as getGitLastCommitInfo,
-  ge as getGitPath,
-  L as getGitProjectDir,
-  sr as getLastReflogList,
-  jt as getLogOutputDir,
-  H as getPackageJson,
-  kt as getParentProcessLogFileName,
-  Ht as getProcessCreateByHijackPresetInfo,
-  tt as getProcessEnv,
-  se as getRelyPkgVersion,
-  ee as getRootDirOptions,
-  ke as getRootScriptName,
-  ur as getSafePath,
-  We as getUseDefaultConfig,
-  gr as hijackChildProcess,
-  ir as http2sshGitUrl,
-  re as initConfigFile,
-  Ve as initHandlerCommon,
-  ue as isHttpGitUrl,
-  fe as isSshGitUrl,
-  hr as json5,
-  xt as logger,
-  Be as lookForParentTarget,
-  te as openFileInEditor,
+  de as DoneCodingCliGlobalConfigKeyEnum,
+  qt as EditorTypeEnum,
+  bt as EnvConfigProcessKeyEnum,
+  b as GitRefLogTypeEnum,
+  R as HooksNameEnum,
+  er as SUPPORT_GET_COMMIT_BY_HOOKS_NAMES,
+  Nr as _curry,
+  yr as _get,
+  Ir as _set,
+  tr as addHuskyHooks,
+  qe as addPackageConfig,
+  _e as applyUseTempDir,
+  B as assetIsExits,
+  U as assetIsExitsAsync,
+  vr as chalk,
+  cr as checkCurrentIsRebasing,
+  Ye as createMainCommand,
+  Ve as createSubcommand,
+  dr as dayjs,
+  ke as decryptAES,
+  je as encryptAES,
+  p as execSyncHijack,
+  Mt as fileAddX,
+  xe as generateGetAnswerSwiftFn,
+  Xt as getAnswer,
+  he as getCliModuleTempDir,
+  rr as getCommitByHookName,
+  We as getConfigFileCommonOptions,
+  or as getCurrentBranchLastCommitList,
+  Qe as getCurrentBranchName,
+  nt as getCurrentProcessLogFileName,
+  Qt as getEditorType,
+  sr as getGitLastCommitInfo,
+  me as getGitPath,
+  M as getGitProjectDir,
+  ir as getLastReflogList,
+  kt as getLogOutputDir,
+  j as getPackageJson,
+  xt as getParentProcessLogFileName,
+  jt as getProcessCreateByHijackPresetInfo,
+  rt as getProcessEnv,
+  oe as getRelyPkgVersion,
+  se as getRootDirOptions,
+  Je as getRootScriptName,
+  pr as getSafePath,
+  Ze as getUseDefaultConfig,
+  Ke as hijackChildProcess,
+  lr as http2sshGitUrl,
+  ne as initConfigFile,
+  Xe as initHandlerCommon,
+  Yt as isAllowOutputConsole,
+  ge as isHttpGitUrl,
+  pe as isSshGitUrl,
+  Cr as json5,
+  Jt as logger,
+  He as lookForParentTarget,
+  re as openFileInEditor,
   a as outputConsole,
-  fr as params2cliParams,
-  lr as pathIsSafe,
-  Ut as processIsHijacked,
-  or as pushGitPublishInfoToRemote,
-  ar as readCliModuleAssetsConfig,
-  Ke as readConfigFile,
-  $t as readFile,
-  Dt as readFileAsync,
-  be as readJsonFile,
-  q as readJsonFileAsync,
-  Mt as removeAsset,
-  Lt as removeAssetAsync,
-  ne as resolveCheckoutInfoByRefInfo,
-  ut as resolveMergeInfoByCommitMsg,
-  er as resolveMergeInfoByGitReflogAction,
-  le as resolveMergeInfoByRefType,
-  cr as rmGitCtrlAsync,
-  we as updateEnvConfig,
-  me as uuidv4,
-  U as xPrompts
+  mr as params2cliParams,
+  gr as pathIsSafe,
+  it as processIsHijacked,
+  ar as pushGitPublishInfoToRemote,
+  fr as readCliModuleAssetsConfig,
+  ze as readConfigFile,
+  Gt as readFile,
+  Ft as readFileAsync,
+  Be as readJsonFile,
+  tt as readJsonFileAsync,
+  $t as removeAsset,
+  Dt as removeAssetAsync,
+  ie as resolveCheckoutInfoByRefInfo,
+  pt as resolveMergeInfoByCommitMsg,
+  nr as resolveMergeInfoByGitReflogAction,
+  fe as resolveMergeInfoByRefType,
+  ur as rmGitCtrlAsync,
+  Ue as updateEnvConfig,
+  Ee as uuidv4,
+  H as xPrompts
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-utils",
-  "version": "0.8.3-alpha.1",
+  "version": "0.8.3-alpha.2",
   "description": "cli utils",
   "private": false,
   "module": "es/index.mjs",
@@ -69,5 +69,5 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "gitHead": "c316dae3339308b554618b88b3e826502c5fc9f1"
+  "gitHead": "57548a940adaa810d2d0c870df54d5013a86bfed"
 }

package/types/index.d.ts

@@ -3,6 +3,7 @@ import chalk from 'chalk';
 import type { CommandModule } from 'yargs';
 import _curry from 'lodash.curry';
 import dayjs from 'dayjs';
+import type { ExecSyncOptions } from 'node:child_process';
 import _get from 'lodash.get';
 import json5 from 'json5';
 import { OutputConsole } from '@done-coding/output-node';
@@ -220,6 +221,9 @@ export declare enum EnvConfigProcessKeyEnum {
     GLOBAL_CONFIG_IMAGE = "GLOBAL_CONFIG_IMAGE"
 }
 
+/** 劫持 execSync */
+export declare const execSyncHijack: (command: string, options?: ExecSyncOptions) => string | Buffer;
+
 /** 文件添加执行权限 */
 export declare const fileAddX: (filePath: string) => void;
 
@@ -578,6 +582,9 @@ export declare const initHandlerCommon: <T>(content: T, argv: CliHandlerArgv<Ini
     edit?: boolean;
 }) => Promise<void>;
 
+/** 是否允许控制台输出 */
+export declare const isAllowOutputConsole: () => boolean;
+
 /** 是http git地址 */
 export declare const isHttpGitUrl: (url: string) => boolean;