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

package/es/cli.mjs

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

package/es/{index-ce13e9d5.js → index-9578a6a4.js}

@@ -1,12 +1,13 @@
 #!/usr/bin/env node
-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 { 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 _ 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 || {}), 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,
   getBusinessCode() {
     return y;
   },
@@ -24,7 +25,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`,
@@ -60,7 +61,7 @@ const le = 3e4, y = Math.random(), U = {
   }
 }), T = {
   name: "@done-coding/cli-git",
-  version: "0.6.13-alpha.1",
+  version: "0.6.14-alpha.0",
   description: "git跨平台操作命令行工具",
   bin: {
     "dc-git": "es/cli.mjs"
@@ -93,10 +94,10 @@ const le = 3e4, y = Math.random(), U = {
 }) => {
   const o = H(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 }
@@ -145,13 +146,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 ? he : Ee)(f)).data.map((m) => ({
         name: m.name,
         httpUrl: m.clone_url,
         sshUrl: m.ssh_url,
@@ -160,7 +161,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,
@@ -203,7 +204,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 +214,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 +241,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,
@@ -260,9 +261,7 @@ const le = 3e4, y = Math.random(), U = {
     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) {
@@ -291,7 +290,7 @@ const le = 3e4, y = Math.random(), U = {
       throw new Error(`未知的初始化类型: ${t}`);
   }
 }, be = {
-  command: f.INIT,
+  command: l.INIT,
   describe: "初始化配置文件",
   options: Pe(),
   handler: j
@@ -318,7 +317,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(),
@@ -371,7 +370,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}
 
 --------- 建议 ---------
 可以通过
@@ -389,7 +388,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)
@@ -399,11 +398,13 @@ 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) {
-        i.skip(`${k} 只检测${b + 1}条， 超出不再检测`);
+        i.skip(
+          `${k} 只检测${b + 1}条， 超出不再检测`
+        );
         return;
       }
       const z = G({
@@ -501,7 +502,7 @@ const le = 3e4, y = Math.random(), U = {
       throw new Error(`不支持的检测类型${s}`);
   }
 }, He = {
-  command: `${f.CHECK} <type>`,
+  command: `${l.CHECK} <type>`,
   describe: "检查git操作",
   options: Ne(),
   positionals: Le(),
@@ -559,25 +560,25 @@ 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) => {
+}, Ze = 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}`);
   }
-}, { version: je, description: Ve } = T, Ze = {
+}, { version: je, description: Ve } = T, We = {
   describe: Ve,
   version: je,
   subcommands: [
@@ -593,10 +594,10 @@ export {
   C,
   E as G,
   d as I,
-  f as S,
+  l as S,
   K as a,
   Oe as b,
-  Ze as c,
+  We as c,
   j as d,
   be as e,
   Be as f,
@@ -607,6 +608,6 @@ export {
   Ke as k,
   q as l,
   He as m,
-  Ye as n,
+  Ze as n,
   u as o
 };

package/es/index-ca1229e1.js

@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+import { c as a, i as t } from "./index-9578a6a4.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.mjs

@@ -1,27 +1,28 @@
 #!/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-ce13e9d5.js";
-import { a as S } from "./index-f36fe1a6.js";
+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-9578a6a4.js";
+import { a as T } from "./index-ca1229e1.js";
 import "@done-coding/cli-utils";
+import "node:child_process";
 import "node:fs";
 import "node:path";
 import "@done-coding/request-axios";
 import "axios";
 export {
-  i as CheckReverseMergeWayEnum,
+  t as CheckReverseMergeWayEnum,
   l as CheckTypeEnum,
-  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
+  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
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-git",
-  "version": "0.6.13-alpha.1",
+  "version": "0.6.14-alpha.0",
   "description": "git跨平台操作命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -32,10 +32,7 @@
     "types"
   ],
   "scripts": {
-    "clean": "rimraf es lib types",
-    "predev": "pnpm run clean",
-    "dev": "vite build --watch",
-    "prebuild": "pnpm run clean",
+    "dev": "vite build -w -m hotBuild",
     "build": "vite build",
     "prepack": "pnpm build"
   },
@@ -52,21 +49,20 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "0.5.21-alpha.1",
+    "@done-coding/cli-inject": "0.5.22-alpha.0",
     "@types/node": "^18.0.0",
     "@types/yargs": "^17.0.28",
-    "rimraf": "^6.0.1",
     "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.2-alpha.1",
+    "@done-coding/cli-utils": "0.8.3-alpha.0",
     "@done-coding/request-axios": "^1.2.2",
     "axios": "^1.8.4"
   },
-  "gitHead": "660e39fc523e4eba1ea621e3c59122f98015a2de"
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "gitHead": "906b7683d9e4dc75fb07806b12e5507827122a16"
 }

package/es/index-f36fe1a6.js

@@ -1,19 +0,0 @@
-#!/usr/bin/env node
-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 }
-} = 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
-};