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

package/es/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { c as m } from "./index-7475a061.js";
-import "./index-9d4e7eeb.js";
+import { c as m } from "./index-1c9dde81.js";
+import "./index-d7ef8756.js";
 import "@done-coding/cli-utils";
 import "node:fs";
 import "node:path";

package/es/helpers.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { g as s, G as n, a as i, h as m } from "./index-9d4e7eeb.js";
+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";

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

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { c as a, i as t } from "./index-9d4e7eeb.js";
+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 }

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

@@ -1,12 +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, 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 { 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 pe from "axios";
-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,
+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 fe = 3e4, y = Math.random(), U = {
+  timeout: fe,
   getBusinessCode() {
     return y;
   },
@@ -24,7 +24,7 @@ const le = 3e4, y = Math.random(), U = {
 }), A = L({
   basePath: "https://api.github.com",
   ...U
-}), fe = ({
+}), le = ({
   username: e
 }) => x({
   url: `/api/v5/users/${e}/repos`,
@@ -45,7 +45,7 @@ const le = 3e4, y = Math.random(), U = {
 }) => A({
   url: `/users/${e}/repos`,
   method: "GET"
-}), he = ({
+}), de = ({
   accessToken: e
 }) => A({
   url: "/user/repos",
@@ -60,7 +60,7 @@ const le = 3e4, y = Math.random(), U = {
   }
 }), T = {
   name: "@done-coding/cli-git",
-  version: "0.6.14-alpha.2",
+  version: "0.6.14",
   description: "git跨平台操作命令行工具",
   bin: {
     "dc-git": "es/cli.mjs"
@@ -70,8 +70,8 @@ const le = 3e4, y = Math.random(), U = {
     moduleName: "git"
   }
 }, {
-  cliConfig: { namespaceDir: de, moduleName: Re }
-} = T, H = `./${de}/${Re}`, S = `${H}.json`, F = (e) => `${H}/.${e}`, D = ({ platform: e, username: t }) => `${e}/${t}`, Me = (e) => {
+  cliConfig: { namespaceDir: he, moduleName: Re }
+} = 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
   });
@@ -93,10 +93,10 @@ const le = 3e4, y = Math.random(), U = {
 }) => {
   const o = F(s), n = JSON.stringify({
     accessToken: r
-  }), g = D({ platform: s, username: t }), l = 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, l, "utf-8"), i.success(`配置信息保存成功 ${a}`);
+  }), _.writeFileSync(a, f, "utf-8"), i.success(`配置信息保存成功 ${a}`);
 }, B = [
   { title: "GitHub", value: E.GITHUB },
   { title: "Gitee", value: E.GITEE }
@@ -136,7 +136,7 @@ const le = 3e4, y = Math.random(), U = {
     platform: e,
     username: t
   };
-  e || (s.platform = (await h(v())).platform), t || (s.username = (await h(K())).username);
+  e || (s.platform = (await d(v())).platform), t || (s.username = (await d(K())).username);
   const { platform: r, username: o } = s;
   let c = [];
   const n = Me({
@@ -145,13 +145,13 @@ const le = 3e4, y = Math.random(), U = {
   });
   let g = n == null ? void 0 : n.accessToken;
   i.stage(`正在获取${o}的${r}仓库列表...`);
-  const l = {
+  const f = {
     username: o,
     accessToken: g
   };
   switch (s.platform) {
     case E.GITHUB: {
-      c = (await (l.accessToken ? he : Ee)(l)).data.map((m) => ({
+      c = (await (f.accessToken ? de : Ee)(f)).data.map((m) => ({
         name: m.name,
         httpUrl: m.clone_url,
         sshUrl: m.ssh_url,
@@ -160,7 +160,7 @@ const le = 3e4, y = Math.random(), U = {
       break;
     }
     case E.GITEE: {
-      c = (await (l.accessToken ? ue : fe)(l)).data.map((m) => ({
+      c = (await (f.accessToken ? ue : le)(f)).data.map((m) => ({
         name: m.name,
         httpUrl: m.html_url,
         sshUrl: m.ssh_url,
@@ -176,7 +176,7 @@ const le = 3e4, y = Math.random(), U = {
     return;
   } else
     i.stage(`共${c.length}个仓库`);
-  const { repoUrl: a } = await h({
+  const { repoUrl: a } = await d({
     name: "repoUrl",
     type: "select",
     message: "选择仓库",
@@ -203,7 +203,7 @@ const le = 3e4, y = Math.random(), U = {
   p.PRE_REBASE
 ], $ = (e) => {
   const {
-    [f.CHECK]: { [C.REVERSE_MERGE]: t }
+    [l.CHECK]: { [C.REVERSE_MERGE]: t }
   } = e;
   return t;
 }, Te = (e) => Math.max(
@@ -213,7 +213,7 @@ const le = 3e4, y = Math.random(), U = {
   (s, [r, { afterHash: o, logCount: c }]) => {
     let n = c - 1;
     if (o) {
-      const g = t.findIndex((l) => l.hash === o);
+      const g = t.findIndex((f) => f.hash === o);
       g !== -1 && (i.info(
         `${r} 设置 只检测 ${o} 之后的日志 即 下标 [0 - ${g})`
       ), n = Math.min(n, g - 1));
@@ -240,7 +240,7 @@ const le = 3e4, y = Math.random(), U = {
   );
   return n || i.skip(`跳过: 允许${r} => ${o}`), n;
 }, Ge = {
-  [f.CHECK]: {
+  [l.CHECK]: {
     [C.REVERSE_MERGE]: {
       [/^test$/.source]: {
         includeRebase: !0,
@@ -256,15 +256,15 @@ const le = 3e4, y = Math.random(), U = {
   type: {
     alias: "t",
     describe: "初始化类型",
-    choices: [d.DEFAULT, d.CLONE_CONFIG],
-    default: d.DEFAULT
+    choices: [h.DEFAULT, h.CLONE_CONFIG],
+    default: h.DEFAULT
   }
 }), ke = (e) => {
   N(`npm pkg set scripts.postprepare="${e} init"`);
 }, j = async (e) => {
   const { type: t } = e;
   switch (t) {
-    case d.DEFAULT: {
+    case h.DEFAULT: {
       const { rootDir: s, isSubCommand: r, _: o } = e, c = `${e.$0}${r ? ` ${o[0]}` : ""}`;
       return await ee({
         hookNames: Ie,
@@ -276,8 +276,8 @@ const le = 3e4, y = Math.random(), U = {
         }
       });
     }
-    case d.CLONE_CONFIG: {
-      const { rootDir: s } = e, { platform: r } = await h(v()), { username: o } = await h(K()), { accessToken: c } = await h($e);
+    case h.CLONE_CONFIG: {
+      const { rootDir: s } = e, { platform: r } = await d(v()), { username: o } = await d(K()), { accessToken: c } = await d($e);
       return Ce({
         rootDir: s,
         platform: r,
@@ -289,7 +289,7 @@ const le = 3e4, y = Math.random(), U = {
       throw new Error(`未知的初始化类型: ${t}`);
   }
 }, be = {
-  command: f.INIT,
+  command: l.INIT,
   describe: "初始化配置文件",
   options: Pe(),
   handler: j
@@ -316,7 +316,7 @@ const le = 3e4, y = Math.random(), U = {
     { stdio: "inherit" }
   ), i.success(`克隆${t}成功`);
 }, Be = {
-  command: `${f.CLONE} <platform> <username>`,
+  command: `${l.CLONE} <platform> <username>`,
   describe: "从选择的git平台克隆代码",
   options: we(),
   positionals: ye(),
@@ -369,7 +369,7 @@ const le = 3e4, y = Math.random(), U = {
     configMap: c,
     currentBranch: t
   })) {
-    const { fromBranch: g, toBranch: l = t } = o, a = `禁止${g}被合并: ${g} => ${l}
+    const { fromBranch: g, toBranch: f = t } = o, a = `禁止${g}被合并: ${g} => ${f}
 
 --------- 建议 ---------
 可以通过
@@ -387,7 +387,7 @@ const le = 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), l = 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)
@@ -397,7 +397,7 @@ const le = 3e4, y = Math.random(), U = {
   );
   o.forEach((a, m) => {
     var P;
-    const O = a.mergeInfo || ((P = l[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) {
@@ -501,7 +501,7 @@ const le = 3e4, y = Math.random(), U = {
       throw new Error(`不支持的检测类型${s}`);
   }
 }, Fe = {
-  command: `${f.CHECK} <type>`,
+  command: `${l.CHECK} <type>`,
   describe: "检查git操作",
   options: Ne(),
   positionals: Le(),
@@ -559,20 +559,20 @@ const le = 3e4, y = Math.random(), U = {
       i.error(`${t} 当前未支持处理`);
   }
 }, Ke = {
-  command: `${f.HOOKS} <name> [args...]`,
+  command: `${l.HOOKS} <name> [args...]`,
   describe: "git钩子回调",
   options: De(),
   positionals: ve(),
   handler: J
 }, Ye = async (e, t) => {
   switch (e) {
-    case f.INIT:
+    case l.INIT:
       return j(t);
-    case f.CLONE:
+    case l.CLONE:
       return V(t);
-    case f.HOOKS:
+    case l.HOOKS:
       return J(t);
-    case f.CHECK:
+    case l.CHECK:
       return q(t);
     default:
       throw new Error(`不支持的命令 ${e}`);
@@ -592,8 +592,8 @@ const le = 3e4, y = Math.random(), U = {
 export {
   C,
   E as G,
-  d as I,
-  f as S,
+  h as I,
+  l as S,
   K as a,
   Oe as b,
   Ze as c,

package/es/index.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-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 { 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:fs";
 import "node:path";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-git",
-  "version": "0.6.14-alpha.2",
+  "version": "0.6.14",
   "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.2",
+    "@done-coding/cli-inject": "0.5.22",
     "@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.2",
+    "@done-coding/cli-utils": "0.8.3",
     "@done-coding/request-axios": "^1.2.2",
     "axios": "^1.8.4"
   },
   "engines": {
     "node": ">=18.0.0"
   },
-  "gitHead": "57548a940adaa810d2d0c870df54d5013a86bfed"
+  "gitHead": "4893b466954ef5925151d8dfc8fc8aa558ce654c"
 }