@done-coding/cli-git 0.6.12 → 0.6.13-alpha.1

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-f36fe1a6.js";
+import "./index-ce13e9d5.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 i, G as a, a as m, h as s } from "./index-ce13e9d5.js";
+import { log 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 u = async (e) => {
   o.info("克隆done-coding系列项目"), o.stage("选择平台:");
-  const { platform: t } = await n(i(r.GITEE));
+  const { platform: t } = await r(i(a.GITEE));
   o.stage("选择用户名:");
-  const { username: a } = await n(
+  const { username: n } = await r(
     m(
       {
-        [r.GITHUB]: "done-coding",
-        [r.GITEE]: "justsosu"
+        [a.GITHUB]: "done-coding",
+        [a.GITEE]: "justsosu"
       }[t]
     )
   );
-  o.info("platform:", t), o.info("username:", a), await s({
+  o.info("platform:", t), o.info("username:", n), await s({
     platform: t,
-    username: a,
+    username: n,
     projectName: e
   });
 };
 export {
-  G as cloneDoneCodingSeries
+  u as cloneDoneCodingSeries
 };

package/es/{index-8640f971.js → index-ce13e9d5.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, log as i, decryptAES as Z, encryptAES as W, xPrompts as h, HooksNameEnum as p, addHuskyHooks as ee, initHandlerCommon as te, getConfigFileCommonOptions as I, execSyncWithLogDispatch 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";
-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,
+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,
   getBusinessCode() {
     return y;
   },
@@ -18,14 +17,14 @@ const pe = 3e4, y = Math.random(), U = {
     return e.data;
   },
   businessSuccessCodeList: [y],
-  axios: fe
+  axios: pe
 }, x = L({
   basePath: " https://gitee.com",
   ...U
 }), A = L({
   basePath: "https://api.github.com",
   ...U
-}), le = ({
+}), fe = ({
   username: e
 }) => x({
   url: `/api/v5/users/${e}/repos`,
@@ -46,7 +45,7 @@ const pe = 3e4, y = Math.random(), U = {
 }) => A({
   url: `/users/${e}/repos`,
   method: "GET"
-}), de = ({
+}), he = ({
   accessToken: e
 }) => A({
   url: "/user/repos",
@@ -61,7 +60,7 @@ const pe = 3e4, y = Math.random(), U = {
   }
 }), T = {
   name: "@done-coding/cli-git",
-  version: "0.6.12",
+  version: "0.6.13-alpha.1",
   description: "git跨平台操作命令行工具",
   bin: {
     "dc-git": "es/cli.mjs"
@@ -71,8 +70,8 @@ const pe = 3e4, y = Math.random(), U = {
     moduleName: "git"
   }
 }, {
-  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) => {
+  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, {
     isFindFarthest: !1
   });
@@ -94,10 +93,10 @@ const pe = 3e4, y = Math.random(), U = {
 }) => {
   const o = H(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 }), l = 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, l, "utf-8"), i.success(`配置信息保存成功 ${a}`);
 }, B = [
   { title: "GitHub", value: E.GITHUB },
   { title: "Gitee", value: E.GITEE }
@@ -137,7 +136,7 @@ const pe = 3e4, y = Math.random(), U = {
     platform: e,
     username: t
   };
-  e || (s.platform = (await d(v())).platform), t || (s.username = (await d(K())).username);
+  e || (s.platform = (await h(v())).platform), t || (s.username = (await h(K())).username);
   const { platform: r, username: o } = s;
   let c = [];
   const n = Me({
@@ -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 l = {
     username: o,
     accessToken: g
   };
   switch (s.platform) {
     case E.GITHUB: {
-      c = (await (p.accessToken ? de : Ee)(p)).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 pe = 3e4, y = Math.random(), U = {
       break;
     }
     case E.GITEE: {
-      c = (await (p.accessToken ? ue : le)(p)).data.map((m) => ({
+      c = (await (l.accessToken ? ue : fe)(l)).data.map((m) => ({
         name: m.name,
         httpUrl: m.html_url,
         sshUrl: m.ssh_url,
@@ -177,7 +176,7 @@ const pe = 3e4, y = Math.random(), U = {
     return;
   } else
     i.stage(`共${c.length}个仓库`);
-  const { repoUrl: a } = await d({
+  const { repoUrl: a } = await h({
     name: "repoUrl",
     type: "select",
     message: "选择仓库",
@@ -188,23 +187,23 @@ 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 }
+    [f.CHECK]: { [C.REVERSE_MERGE]: t }
   } = e;
   return t;
 }, Te = (e) => Math.max(
@@ -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((l) => l.hash === o);
       g !== -1 && (i.info(
         `${r} 设置 只检测 ${o} 之后的日志 即 下标 [0 - ${g})`
       ), n = Math.min(n, g - 1));
@@ -241,7 +240,7 @@ const pe = 3e4, y = Math.random(), U = {
   );
   return n || i.skip(`跳过: 允许${r} => ${o}`), n;
 }, Ge = {
-  [l.CHECK]: {
+  [f.CHECK]: {
     [C.REVERSE_MERGE]: {
       [/^test$/.source]: {
         includeRebase: !0,
@@ -257,15 +256,17 @@ const pe = 3e4, y = Math.random(), U = {
   type: {
     alias: "t",
     describe: "初始化类型",
-    choices: [h.DEFAULT, h.CLONE_CONFIG],
-    default: h.DEFAULT
+    choices: [d.DEFAULT, d.CLONE_CONFIG],
+    default: d.DEFAULT
   }
 }), ke = (e) => {
-  N(`npm pkg set scripts.postprepare="${e} init"`);
+  N(
+    `npm pkg set scripts.postprepare="${e} init"`
+  );
 }, j = async (e) => {
   const { type: t } = e;
   switch (t) {
-    case h.DEFAULT: {
+    case d.DEFAULT: {
       const { rootDir: s, isSubCommand: r, _: o } = e, c = `${e.$0}${r ? ` ${o[0]}` : ""}`;
       return await ee({
         hookNames: Ie,
@@ -277,8 +278,8 @@ const pe = 3e4, y = Math.random(), U = {
         }
       });
     }
-    case h.CLONE_CONFIG: {
-      const { rootDir: s } = e, { platform: r } = await d(v()), { username: o } = await d(K()), { accessToken: c } = await d($e);
+    case d.CLONE_CONFIG: {
+      const { rootDir: s } = e, { platform: r } = await h(v()), { username: o } = await h(K()), { accessToken: c } = await h($e);
       return Ce({
         rootDir: s,
         platform: r,
@@ -290,7 +291,7 @@ const pe = 3e4, y = Math.random(), U = {
       throw new Error(`未知的初始化类型: ${t}`);
   }
 }, be = {
-  command: l.INIT,
+  command: f.INIT,
   describe: "初始化配置文件",
   options: Pe(),
   handler: j
@@ -317,7 +318,7 @@ const pe = 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 +371,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: l = t } = o, a = `禁止${g}被合并: ${g} => ${l}
 
 --------- 建议 ---------
 可以通过
@@ -388,7 +389,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), l = ie({
     /** 考虑reflog存在往复切换  */
     count: r + 30,
     filterItem: (a) => n.includes(a.hash)
@@ -398,7 +399,7 @@ 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 = l[a.hash]) == null ? void 0 : P.mergeInfo);
     O && Object.entries(s).forEach(([k]) => {
       const b = c[k];
       if (m > b) {
@@ -500,7 +501,7 @@ const pe = 3e4, y = Math.random(), U = {
       throw new Error(`不支持的检测类型${s}`);
   }
 }, He = {
-  command: `${l.CHECK} <type>`,
+  command: `${f.CHECK} <type>`,
   describe: "检查git操作",
   options: Ne(),
   positionals: Le(),
@@ -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,
@@ -558,25 +559,25 @@ const pe = 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: [
@@ -591,11 +592,11 @@ const pe = 3e4, y = Math.random(), U = {
 export {
   C,
   E as G,
-  h as I,
-  l as S,
+  d as I,
+  f as S,
   K as a,
   Oe as b,
-  We as c,
+  Ze as c,
   j as d,
   be as e,
   Be as f,
@@ -606,6 +607,6 @@ export {
   Ke as k,
   q as l,
   He as m,
-  Ze as n,
+  Ye as n,
   u as o
 };

package/es/{index-166c6260.js → index-f36fe1a6.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { c as a, i as t } from "./index-8640f971.js";
+import { c as a, i as t } from "./index-ce13e9d5.js";
 import { createMainCommand as r, createSubcommand as s } from "@done-coding/cli-utils";
 const {
   cliConfig: { moduleName: 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-ce13e9d5.js";
+import { a as S } from "./index-f36fe1a6.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.12",
+  "version": "0.6.13-alpha.1",
   "description": "git跨平台操作命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -52,11 +52,11 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "0.5.20",
+    "@done-coding/cli-inject": "0.5.21-alpha.1",
     "@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"
   },
@@ -64,9 +64,9 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@done-coding/cli-utils": "0.8.1",
+    "@done-coding/cli-utils": "0.8.2-alpha.1",
     "@done-coding/request-axios": "^1.2.2",
     "axios": "^1.8.4"
   },
-  "gitHead": "0930f800167c04a86b56eae9741872dd51bec0c6"
+  "gitHead": "660e39fc523e4eba1ea621e3c59122f98015a2de"
 }