@done-coding/cli-git 0.6.14-alpha.1 → 0.6.14-alpha.2

package/es/cli.mjs

@@ -1,8 +1,7 @@
 #!/usr/bin/env node
-import { c as m } from "./index-d828de0e.js";
-import "./index-a9558422.js";
+import { c as m } from "./index-7475a061.js";
+import "./index-9d4e7eeb.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 n, a as m, h as s } from "./index-a9558422.js";
-import { outputConsole as o, xPrompts as a } from "@done-coding/cli-utils";
-import "node:child_process";
+import { g as s, G as n, a as i, h as m } from "./index-9d4e7eeb.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 a(i(n.GITEE));
+  const { platform: t } = await r(s(n.GITEE));
   o.stage("选择用户名:");
-  const { username: r } = await a(
-    m(
+  const { username: a } = await r(
+    i(
       {
         [n.GITHUB]: "done-coding",
         [n.GITEE]: "justsosu"
       }[t]
     )
   );
-  o.info("platform:", t), o.info("username:", r), await s({
+  o.info("platform:", t), o.info("username:", a), await m({
     platform: t,
-    username: r,
+    username: a,
     projectName: e
   });
 };
 export {
-  G as cloneDoneCodingSeries
+  l as cloneDoneCodingSeries
 };

package/es/{index-d828de0e.js → index-7475a061.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { c as a, i as t } from "./index-a9558422.js";
+import { c as a, i as t } from "./index-9d4e7eeb.js";
 import { createMainCommand as s, createSubcommand as r } from "@done-coding/cli-utils";
 const {
   cliConfig: { moduleName: o }

package/es/{index-a9558422.js → index-9d4e7eeb.js}

@@ -1,13 +1,12 @@
 #!/usr/bin/env node
-import { lookForParentTarget as Y, outputConsole as i, decryptAES as Z, encryptAES as W, xPrompts as h, HooksNameEnum as p, 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 h, 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 pe from "axios";
-var l = /* @__PURE__ */ ((e) => (e.INIT = "init", e.CLONE = "clone", e.HOOKS = "hooks", e.CHECK = "check", e))(l || {}), d = /* @__PURE__ */ ((e) => (e.DEFAULT = "default", e.CLONE_CONFIG = "cloneConfig", e))(d || {}), 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 fe = 3e4, y = Math.random(), U = {
-  timeout: fe,
+var f = /* @__PURE__ */ ((e) => (e.INIT = "init", e.CLONE = "clone", e.HOOKS = "hooks", e.CHECK = "check", e))(f || {}), d = /* @__PURE__ */ ((e) => (e.DEFAULT = "default", e.CLONE_CONFIG = "cloneConfig", e))(d || {}), 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 le = 3e4, y = Math.random(), U = {
+  timeout: le,
   getBusinessCode() {
     return y;
   },
@@ -25,7 +24,7 @@ const fe = 3e4, y = Math.random(), U = {
 }), A = L({
   basePath: "https://api.github.com",
   ...U
-}), le = ({
+}), fe = ({
   username: e
 }) => x({
   url: `/api/v5/users/${e}/repos`,
@@ -61,7 +60,7 @@ const fe = 3e4, y = Math.random(), U = {
   }
 }), T = {
   name: "@done-coding/cli-git",
-  version: "0.6.14-alpha.1",
+  version: "0.6.14-alpha.2",
   description: "git跨平台操作命令行工具",
   bin: {
     "dc-git": "es/cli.mjs"
@@ -72,8 +71,8 @@ const fe = 3e4, y = Math.random(), U = {
   }
 }, {
   cliConfig: { namespaceDir: de, moduleName: Re }
-} = T, F = `./${de}/${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 = `./${de}/${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 fe = 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 }), f = W({ text: n, secretKey: g }), a = w.join(e, o);
+  }), g = D({ platform: s, username: t }), l = W({ text: n, secretKey: g }), a = w.join(e, o);
   _.mkdirSync(w.dirname(a), {
     recursive: !0
-  }), _.writeFileSync(a, f, "utf-8"), i.success(`配置信息保存成功 ${a}`);
+  }), _.writeFileSync(a, l, "utf-8"), i.success(`配置信息保存成功 ${a}`);
 }, B = [
   { title: "GitHub", value: E.GITHUB },
   { title: "Gitee", value: E.GITEE }
@@ -146,13 +145,13 @@ const fe = 3e4, y = Math.random(), U = {
   });
   let g = n == null ? void 0 : n.accessToken;
   i.stage(`正在获取${o}的${r}仓库列表...`);
-  const f = {
+  const l = {
     username: o,
     accessToken: g
   };
   switch (s.platform) {
     case E.GITHUB: {
-      c = (await (f.accessToken ? he : Ee)(f)).data.map((m) => ({
+      c = (await (l.accessToken ? he : Ee)(l)).data.map((m) => ({
         name: m.name,
         httpUrl: m.clone_url,
         sshUrl: m.ssh_url,
@@ -161,7 +160,7 @@ const fe = 3e4, y = Math.random(), U = {
       break;
     }
     case E.GITEE: {
-      c = (await (f.accessToken ? ue : le)(f)).data.map((m) => ({
+      c = (await (l.accessToken ? ue : fe)(l)).data.map((m) => ({
         name: m.name,
         httpUrl: m.html_url,
         sshUrl: m.ssh_url,
@@ -204,7 +203,7 @@ const fe = 3e4, y = Math.random(), U = {
   p.PRE_REBASE
 ], $ = (e) => {
   const {
-    [l.CHECK]: { [C.REVERSE_MERGE]: t }
+    [f.CHECK]: { [C.REVERSE_MERGE]: t }
   } = e;
   return t;
 }, Te = (e) => Math.max(
@@ -214,7 +213,7 @@ const fe = 3e4, y = Math.random(), U = {
   (s, [r, { afterHash: o, logCount: c }]) => {
     let n = c - 1;
     if (o) {
-      const g = t.findIndex((f) => f.hash === o);
+      const g = t.findIndex((l) => l.hash === o);
       g !== -1 && (i.info(
         `${r} 设置 只检测 ${o} 之后的日志 即 下标 [0 - ${g})`
       ), n = Math.min(n, g - 1));
@@ -241,7 +240,7 @@ const fe = 3e4, y = Math.random(), U = {
   );
   return n || i.skip(`跳过: 允许${r} => ${o}`), n;
 }, Ge = {
-  [l.CHECK]: {
+  [f.CHECK]: {
     [C.REVERSE_MERGE]: {
       [/^test$/.source]: {
         includeRebase: !0,
@@ -290,7 +289,7 @@ const fe = 3e4, y = Math.random(), U = {
       throw new Error(`未知的初始化类型: ${t}`);
   }
 }, be = {
-  command: l.INIT,
+  command: f.INIT,
   describe: "初始化配置文件",
   options: Pe(),
   handler: j
@@ -317,7 +316,7 @@ const fe = 3e4, y = Math.random(), U = {
     { stdio: "inherit" }
   ), i.success(`克隆${t}成功`);
 }, Be = {
-  command: `${l.CLONE} <platform> <username>`,
+  command: `${f.CLONE} <platform> <username>`,
   describe: "从选择的git平台克隆代码",
   options: we(),
   positionals: ye(),
@@ -370,7 +369,7 @@ const fe = 3e4, y = Math.random(), U = {
     configMap: c,
     currentBranch: t
   })) {
-    const { fromBranch: g, toBranch: f = t } = o, a = `禁止${g}被合并: ${g} => ${f}
+    const { fromBranch: g, toBranch: l = t } = o, a = `禁止${g}被合并: ${g} => ${l}
 
 --------- 建议 ---------
 可以通过
@@ -388,7 +387,7 @@ const fe = 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), f = ie({
+  const o = ae({ count: r }), c = Se(s, o), n = o.map((a) => a.hash), l = ie({
     /** 考虑reflog存在往复切换  */
     count: r + 30,
     filterItem: (a) => n.includes(a.hash)
@@ -398,7 +397,7 @@ const fe = 3e4, y = Math.random(), U = {
   );
   o.forEach((a, m) => {
     var P;
-    const O = a.mergeInfo || ((P = f[a.hash]) == null ? void 0 : P.mergeInfo);
+    const O = a.mergeInfo || ((P = l[a.hash]) == null ? void 0 : P.mergeInfo);
     O && Object.entries(s).forEach(([k]) => {
       const b = c[k];
       if (m > b) {
@@ -430,7 +429,7 @@ const fe = 3e4, y = Math.random(), U = {
       }
     });
   });
-}, Fe = ({
+}, He = ({
   config: e,
   rebaseInfo: t
 }) => {
@@ -475,7 +474,7 @@ const fe = 3e4, y = Math.random(), U = {
         /** 能进入 rebase 说明originBranch有值 或者 当前在某个分支上 */
         n = r
       ] = o;
-      Fe({
+      He({
         config: t,
         rebaseInfo: {
           targetBranch: c,
@@ -501,8 +500,8 @@ const fe = 3e4, y = Math.random(), U = {
     default:
       throw new Error(`不支持的检测类型${s}`);
   }
-}, He = {
-  command: `${l.CHECK} <type>`,
+}, Fe = {
+  command: `${f.CHECK} <type>`,
   describe: "检查git操作",
   options: Ne(),
   positionals: Le(),
@@ -560,32 +559,32 @@ const fe = 3e4, y = Math.random(), U = {
       i.error(`${t} 当前未支持处理`);
   }
 }, Ke = {
-  command: `${l.HOOKS} <name> [args...]`,
+  command: `${f.HOOKS} <name> [args...]`,
   describe: "git钩子回调",
   options: De(),
   positionals: ve(),
   handler: J
-}, Ze = async (e, t) => {
+}, Ye = async (e, t) => {
   switch (e) {
-    case l.INIT:
+    case f.INIT:
       return j(t);
-    case l.CLONE:
+    case f.CLONE:
       return V(t);
-    case l.HOOKS:
+    case f.HOOKS:
       return J(t);
-    case l.CHECK:
+    case f.CHECK:
       return q(t);
     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 })
@@ -594,10 +593,10 @@ export {
   C,
   E as G,
   d as I,
-  l as S,
+  f as S,
   K as a,
   Oe as b,
-  We as c,
+  Ze as c,
   j as d,
   be as e,
   Be as f,
@@ -607,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-a9558422.js";
-import { a as T } from "./index-d828de0e.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-9d4e7eeb.js";
+import { a as S } from "./index-7475a061.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/cli-git",
-  "version": "0.6.14-alpha.1",
+  "version": "0.6.14-alpha.2",
   "description": "git跨平台操作命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -49,7 +49,7 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "0.5.22-alpha.1",
+    "@done-coding/cli-inject": "0.5.22-alpha.2",
     "@types/node": "^18.0.0",
     "@types/yargs": "^17.0.28",
     "typescript": "^5.8.3",
@@ -57,12 +57,12 @@
     "vite-plugin-dts": "^3.6.0"
   },
   "dependencies": {
-    "@done-coding/cli-utils": "0.8.3-alpha.1",
+    "@done-coding/cli-utils": "0.8.3-alpha.2",
     "@done-coding/request-axios": "^1.2.2",
     "axios": "^1.8.4"
   },
   "engines": {
     "node": ">=18.0.0"
   },
-  "gitHead": "c316dae3339308b554618b88b3e826502c5fc9f1"
+  "gitHead": "57548a940adaa810d2d0c870df54d5013a86bfed"
 }