done-coding-git 0.6.12 → 0.6.14

package/es/cli.mjs

@@ -1,8 +1,7 @@
 #!/usr/bin/env node
-import { c as m } from "./index-166c6260.js";
-import "./index-8640f971.js";
+import { c as m } from "./index-1c9dde81.js";
+import "./index-d7ef8756.js";
 import "@done-coding/cli-utils";
-import "node:child_process";
 import "node:fs";
 import "node:path";
 import "@done-coding/request-axios";

package/es/helpers.mjs

@@ -1,29 +1,28 @@
 #!/usr/bin/env node
-import { g as i, G as r, a as m, h as s } from "./index-8640f971.js";
-import { log as o, xPrompts as n } from "@done-coding/cli-utils";
-import "node:child_process";
+import { g as s, G as n, a as i, h as m } from "./index-d7ef8756.js";
+import { outputConsole as o, xPrompts as r } from "@done-coding/cli-utils";
 import "node:fs";
 import "node:path";
 import "@done-coding/request-axios";
 import "axios";
-const G = async (e) => {
+const l = async (e) => {
   o.info("克隆done-coding系列项目"), o.stage("选择平台:");
-  const { platform: t } = await n(i(r.GITEE));
+  const { platform: t } = await r(s(n.GITEE));
   o.stage("选择用户名:");
-  const { username: a } = await n(
-    m(
+  const { username: a } = await r(
+    i(
       {
-        [r.GITHUB]: "done-coding",
-        [r.GITEE]: "justsosu"
+        [n.GITHUB]: "done-coding",
+        [n.GITEE]: "justsosu"
       }[t]
     )
   );
-  o.info("platform:", t), o.info("username:", a), await s({
+  o.info("platform:", t), o.info("username:", a), await m({
     platform: t,
     username: a,
     projectName: e
   });
 };
 export {
-  G as cloneDoneCodingSeries
+  l as cloneDoneCodingSeries
 };

package/es/index-1c9dde81.js

@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+import { c as a, i as t } from "./index-d7ef8756.js";
+import { createMainCommand as s, createSubcommand as r } from "@done-coding/cli-utils";
+const {
+  cliConfig: { moduleName: o }
+} = t, e = (n = !1) => {
+  const c = n ? o : void 0, m = `$0${n ? ` ${o}` : ""} <command> [options]`;
+  return { command: c, usage: m };
+}, u = async () => s({
+  ...a,
+  ...e()
+}), f = () => r({
+  ...a,
+  ...e(!0),
+  // git 子命令不显示描述信息 即不在父命令的描述信息中显示
+  describe: !1
+});
+export {
+  f as a,
+  u as c
+};

package/es/{index-8640f971.js → index-d7ef8756.js}

@@ -1,13 +1,12 @@
 #!/usr/bin/env node
-import { lookForParentTarget as Y, log as i, decryptAES as Z, encryptAES as W, xPrompts as d, HooksNameEnum as f, addHuskyHooks as ee, initHandlerCommon as te, getConfigFileCommonOptions as I, readConfigFile as R, getCurrentBranchName as se, getCommitByHookName as oe, resolveMergeInfoByGitReflogAction as re, checkCurrentIsRebasing as ne, resolveMergeInfoByCommitMsg as ce, getCurrentBranchLastCommitList as ae, getLastReflogList as ie, createSubcommand as ge, getRootScriptName as me } from "@done-coding/cli-utils";
-import { execSync as N } from "node:child_process";
+import { lookForParentTarget as Y, outputConsole as i, decryptAES as Z, encryptAES as W, xPrompts as d, HooksNameEnum as p, addHuskyHooks as ee, initHandlerCommon as te, getConfigFileCommonOptions as I, execSyncHijack as N, readConfigFile as R, getCurrentBranchName as se, getCommitByHookName as oe, resolveMergeInfoByGitReflogAction as re, checkCurrentIsRebasing as ne, resolveMergeInfoByCommitMsg as ce, getCurrentBranchLastCommitList as ae, getLastReflogList as ie, createSubcommand as ge, getRootScriptName as me } from "@done-coding/cli-utils";
 import _ from "node:fs";
 import w from "node:path";
 import { createRequest as L } from "@done-coding/request-axios";
-import fe from "axios";
+import pe from "axios";
 var l = /* @__PURE__ */ ((e) => (e.INIT = "init", e.CLONE = "clone", e.HOOKS = "hooks", e.CHECK = "check", e))(l || {}), h = /* @__PURE__ */ ((e) => (e.DEFAULT = "default", e.CLONE_CONFIG = "cloneConfig", e))(h || {}), E = /* @__PURE__ */ ((e) => (e.GITHUB = "github", e.GITEE = "gitee", e))(E || {}), C = /* @__PURE__ */ ((e) => (e.REVERSE_MERGE = "reverseMerge", e))(C || {}), u = /* @__PURE__ */ ((e) => (e.REFLOG_ACTION = "reflog-action", e.COMMIT_MSG = "commit-msg", e.COMMIT_RECORD = "commit-record", e.PRE_REBASE = "pre-rebase", e))(u || {});
-const pe = 3e4, y = Math.random(), U = {
-  timeout: pe,
+const fe = 3e4, y = Math.random(), U = {
+  timeout: fe,
   getBusinessCode() {
     return y;
   },
@@ -18,7 +17,7 @@ const pe = 3e4, y = Math.random(), U = {
     return e.data;
   },
   businessSuccessCodeList: [y],
-  axios: fe
+  axios: pe
 }, x = L({
   basePath: " https://gitee.com",
   ...U
@@ -61,7 +60,7 @@ const pe = 3e4, y = Math.random(), U = {
   }
 }), T = {
   name: "@done-coding/cli-git",
-  version: "0.6.12",
+  version: "0.6.14",
   description: "git跨平台操作命令行工具",
   bin: {
     "dc-git": "es/cli.mjs"
@@ -72,8 +71,8 @@ const pe = 3e4, y = Math.random(), U = {
   }
 }, {
   cliConfig: { namespaceDir: he, moduleName: Re }
-} = T, F = `./${he}/${Re}`, S = `${F}.json`, H = (e) => `${F}/.${e}`, D = ({ platform: e, username: t }) => `${e}/${t}`, Me = (e) => {
-  const { platform: t } = e, s = H(t), r = Y(s, {
+} = T, H = `./${he}/${Re}`, S = `${H}.json`, F = (e) => `${H}/.${e}`, D = ({ platform: e, username: t }) => `${e}/${t}`, Me = (e) => {
+  const { platform: t } = e, s = F(t), r = Y(s, {
     isFindFarthest: !1
   });
   if (!r) {
@@ -92,12 +91,12 @@ const pe = 3e4, y = Math.random(), U = {
   platform: s,
   accessToken: r
 }) => {
-  const o = H(s), n = JSON.stringify({
+  const o = F(s), n = JSON.stringify({
     accessToken: r
-  }), g = D({ platform: s, username: t }), p = W({ text: n, secretKey: g }), a = w.join(e, o);
+  }), g = D({ platform: s, username: t }), f = W({ text: n, secretKey: g }), a = w.join(e, o);
   _.mkdirSync(w.dirname(a), {
     recursive: !0
-  }), _.writeFileSync(a, p, "utf-8"), i.success(`配置信息保存成功 ${a}`);
+  }), _.writeFileSync(a, f, "utf-8"), i.success(`配置信息保存成功 ${a}`);
 }, B = [
   { title: "GitHub", value: E.GITHUB },
   { title: "Gitee", value: E.GITEE }
@@ -146,13 +145,13 @@ const pe = 3e4, y = Math.random(), U = {
   });
   let g = n == null ? void 0 : n.accessToken;
   i.stage(`正在获取${o}的${r}仓库列表...`);
-  const p = {
+  const f = {
     username: o,
     accessToken: g
   };
   switch (s.platform) {
     case E.GITHUB: {
-      c = (await (p.accessToken ? de : Ee)(p)).data.map((m) => ({
+      c = (await (f.accessToken ? de : Ee)(f)).data.map((m) => ({
         name: m.name,
         httpUrl: m.clone_url,
         sshUrl: m.ssh_url,
@@ -161,7 +160,7 @@ const pe = 3e4, y = Math.random(), U = {
       break;
     }
     case E.GITEE: {
-      c = (await (p.accessToken ? ue : le)(p)).data.map((m) => ({
+      c = (await (f.accessToken ? ue : le)(f)).data.map((m) => ({
         name: m.name,
         httpUrl: m.html_url,
         sshUrl: m.ssh_url,
@@ -188,20 +187,20 @@ const pe = 3e4, y = Math.random(), U = {
   });
   return a;
 }, _e = [
-  f.PRE_COMMIT,
-  f.PRE_MERGE_COMMIT,
-  f.PREPARE_COMMIT_MSG,
-  f.COMMIT_MSG,
-  f.PRE_REBASE,
-  f.POST_COMMIT,
-  f.POST_MERGE,
-  f.PRE_PUSH
+  p.PRE_COMMIT,
+  p.PRE_MERGE_COMMIT,
+  p.PREPARE_COMMIT_MSG,
+  p.COMMIT_MSG,
+  p.PRE_REBASE,
+  p.POST_COMMIT,
+  p.POST_MERGE,
+  p.PRE_PUSH
 ], Ie = [
-  f.PRE_MERGE_COMMIT,
-  f.PREPARE_COMMIT_MSG,
-  f.POST_MERGE,
-  f.PRE_PUSH,
-  f.PRE_REBASE
+  p.PRE_MERGE_COMMIT,
+  p.PREPARE_COMMIT_MSG,
+  p.POST_MERGE,
+  p.PRE_PUSH,
+  p.PRE_REBASE
 ], $ = (e) => {
   const {
     [l.CHECK]: { [C.REVERSE_MERGE]: t }
@@ -214,7 +213,7 @@ const pe = 3e4, y = Math.random(), U = {
   (s, [r, { afterHash: o, logCount: c }]) => {
     let n = c - 1;
     if (o) {
-      const g = t.findIndex((p) => p.hash === o);
+      const g = t.findIndex((f) => f.hash === o);
       g !== -1 && (i.info(
         `${r} 设置 只检测 ${o} 之后的日志 即 下标 [0 - ${g})`
       ), n = Math.min(n, g - 1));
@@ -370,7 +369,7 @@ const pe = 3e4, y = Math.random(), U = {
     configMap: c,
     currentBranch: t
   })) {
-    const { fromBranch: g, toBranch: p = t } = o, a = `禁止${g}被合并: ${g} => ${p}
+    const { fromBranch: g, toBranch: f = t } = o, a = `禁止${g}被合并: ${g} => ${f}
 
 --------- 建议 ---------
 可以通过
@@ -388,7 +387,7 @@ const pe = 3e4, y = Math.random(), U = {
   const s = $(e), r = Te(s);
   if (!r)
     return;
-  const o = ae({ count: r }), c = Se(s, o), n = o.map((a) => a.hash), p = ie({
+  const o = ae({ count: r }), c = Se(s, o), n = o.map((a) => a.hash), f = ie({
     /** 考虑reflog存在往复切换  */
     count: r + 30,
     filterItem: (a) => n.includes(a.hash)
@@ -398,11 +397,13 @@ const pe = 3e4, y = Math.random(), U = {
   );
   o.forEach((a, m) => {
     var P;
-    const O = a.mergeInfo || ((P = p[a.hash]) == null ? void 0 : P.mergeInfo);
+    const O = a.mergeInfo || ((P = f[a.hash]) == null ? void 0 : P.mergeInfo);
     O && Object.entries(s).forEach(([k]) => {
       const b = c[k];
       if (m > b) {
-        i.skip(`${k} 只检测${b + 1}条， 超出不再检测`);
+        i.skip(
+          `${k} 只检测${b + 1}条， 超出不再检测`
+        );
         return;
       }
       const z = G({
@@ -428,7 +429,7 @@ const pe = 3e4, y = Math.random(), U = {
       }
     });
   });
-}, Fe = ({
+}, He = ({
   config: e,
   rebaseInfo: t
 }) => {
@@ -473,7 +474,7 @@ const pe = 3e4, y = Math.random(), U = {
         /** 能进入 rebase 说明originBranch有值 或者 当前在某个分支上 */
         n = r
       ] = o;
-      Fe({
+      He({
         config: t,
         rebaseInfo: {
           targetBranch: c,
@@ -499,7 +500,7 @@ const pe = 3e4, y = Math.random(), U = {
     default:
       throw new Error(`不支持的检测类型${s}`);
   }
-}, He = {
+}, Fe = {
   command: `${l.CHECK} <type>`,
   describe: "检查git操作",
   options: Ne(),
@@ -516,7 +517,7 @@ const pe = 3e4, y = Math.random(), U = {
 }), J = async (e) => {
   const { name: t, rootDir: s, args: r } = e;
   switch (t) {
-    case f.PRE_MERGE_COMMIT: {
+    case p.PRE_MERGE_COMMIT: {
       const o = await R(e);
       M({
         config: o,
@@ -525,7 +526,7 @@ const pe = 3e4, y = Math.random(), U = {
       });
       break;
     }
-    case f.PREPARE_COMMIT_MSG: {
+    case p.PREPARE_COMMIT_MSG: {
       const o = await R(e);
       M({
         config: o,
@@ -535,8 +536,8 @@ const pe = 3e4, y = Math.random(), U = {
       });
       break;
     }
-    case f.POST_MERGE:
-    case f.PRE_PUSH: {
+    case p.POST_MERGE:
+    case p.PRE_PUSH: {
       const o = await R(e);
       M({
         config: o,
@@ -545,7 +546,7 @@ const pe = 3e4, y = Math.random(), U = {
       });
       break;
     }
-    case f.PRE_REBASE: {
+    case p.PRE_REBASE: {
       const o = await R(e);
       M({
         config: o,
@@ -563,7 +564,7 @@ const pe = 3e4, y = Math.random(), U = {
   options: De(),
   positionals: ve(),
   handler: J
-}, Ze = async (e, t) => {
+}, Ye = async (e, t) => {
   switch (e) {
     case l.INIT:
       return j(t);
@@ -576,14 +577,14 @@ const pe = 3e4, y = Math.random(), U = {
     default:
       throw new Error(`不支持的命令 ${e}`);
   }
-}, { version: je, description: Ve } = T, We = {
+}, { version: je, description: Ve } = T, Ze = {
   describe: Ve,
   version: je,
   subcommands: [
     be,
     Be,
     Ke,
-    He
+    Fe
   ].map(ge),
   demandCommandCount: 1,
   rootScriptName: me({ packageJson: T })
@@ -595,7 +596,7 @@ export {
   l as S,
   K as a,
   Oe as b,
-  We as c,
+  Ze as c,
   j as d,
   be as e,
   Be as f,
@@ -605,7 +606,7 @@ export {
   J as j,
   Ke as k,
   q as l,
-  He as m,
-  Ze as n,
+  Fe as m,
+  Ye as n,
   u as o
 };

package/es/index.mjs

@@ -1,28 +1,27 @@
 #!/usr/bin/env node
-import { o as t, C as l, G as d, I as c, S as C, m as p, l as f, f as h, h as u, c as k, b as I, n as E, k as b, j as H, e as g, d as y } from "./index-8640f971.js";
-import { a as T } from "./index-166c6260.js";
+import { o as i, C as l, G as t, I as d, S as c, m as C, l as p, f, h, c as u, b as k, n as I, k as E, j as b, e as H, d as g } from "./index-d7ef8756.js";
+import { a as S } from "./index-1c9dde81.js";
 import "@done-coding/cli-utils";
-import "node:child_process";
 import "node:fs";
 import "node:path";
 import "@done-coding/request-axios";
 import "axios";
 export {
-  t as CheckReverseMergeWayEnum,
+  i as CheckReverseMergeWayEnum,
   l as CheckTypeEnum,
-  d as GitPlatformEnum,
-  c as InitTypeEnum,
-  C as SubcommandEnum,
-  p as checkCommandCliInfo,
-  f as checkHandler,
-  h as cloneCommandCliInfo,
-  u as cloneHandler,
-  k as commandCliInfo,
-  T as crateAsSubcommand,
-  I as getTargetRepoUrl,
-  E as handler,
-  b as hooksCommandCliInfo,
-  H as hooksHandler,
-  g as initCommandCliInfo,
-  y as initHandler
+  t as GitPlatformEnum,
+  d as InitTypeEnum,
+  c as SubcommandEnum,
+  C as checkCommandCliInfo,
+  p as checkHandler,
+  f as cloneCommandCliInfo,
+  h as cloneHandler,
+  u as commandCliInfo,
+  S as crateAsSubcommand,
+  k as getTargetRepoUrl,
+  I as handler,
+  E as hooksCommandCliInfo,
+  b as hooksHandler,
+  H as initCommandCliInfo,
+  g as initHandler
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "done-coding-git",
-  "version": "0.6.12",
+  "version": "0.6.14",
   "description": "git跨平台操作命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -42,22 +42,21 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "0.5.20",
+    "@done-coding/cli-inject": "0.5.22",
     "@types/node": "^18.0.0",
     "@types/yargs": "^17.0.28",
-    "rimraf": "^6.0.1",
-    "typescript": "^5.2.2",
+    "typescript": "^5.8.3",
     "vite": "^4.4.11",
     "vite-plugin-dts": "^3.6.0"
   },
-  "engines": {
-    "node": ">=18.0.0"
-  },
   "dependencies": {
-    "@done-coding/cli-utils": "0.8.1",
+    "@done-coding/cli-utils": "0.8.3",
     "@done-coding/request-axios": "^1.2.2",
     "axios": "^1.8.4"
   },
-  "gitHead": "0930f800167c04a86b56eae9741872dd51bec0c6",
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "gitHead": "4893b466954ef5925151d8dfc8fc8aa558ce654c",
   "scripts": {}
 }

package/es/index-166c6260.js

@@ -1,19 +0,0 @@
-#!/usr/bin/env node
-import { c as a, i as t } from "./index-8640f971.js";
-import { createMainCommand as r, createSubcommand as s } from "@done-coding/cli-utils";
-const {
-  cliConfig: { moduleName: o }
-} = t, c = (n = !1) => {
-  const e = n ? o : void 0, m = `$0${n ? ` ${o}` : ""} <command> [options]`;
-  return { command: e, usage: m };
-}, u = async () => r({
-  ...a,
-  ...c()
-}), f = () => s({
-  ...a,
-  ...c(!0)
-});
-export {
-  f as a,
-  u as c
-};