@done-coding/cli-git 0.6.14-alpha.3 → 0.6.15

package/README.md

@@ -8,6 +8,7 @@ git 跨平台操作命令行工具 - 提供 git 平台克隆、钩子管理和
 ## 安装
 
 ### 独立安装
+
 ```bash
 npm install @done-coding/cli-git
 # 或
@@ -15,6 +16,7 @@ pnpm add @done-coding/cli-git
 ```
 
 ### 作为 done-coding CLI 的一部分
+
 ```bash
 npm install -g @done-coding/cli
 # 然后使用
@@ -45,6 +47,7 @@ dc git --help     # Windows
 ### 基础命令
 
 #### `dc-git init`
+
 初始化配置文件
 
 ```bash
@@ -53,6 +56,7 @@ dc-git init
 ```
 
 #### `dc-git clone <platform> <username>`
+
 从指定的 git 平台克隆用户的代码仓库
 
 ```bash
@@ -67,10 +71,12 @@ dc-git clone bitbucket username
 ```
 
 **参数说明**:
+
 - `platform`: git 平台名称 (github, gitlab, bitbucket 等)
 - `username`: 用户名
 
 #### `dc-git hooks <name> [args...]`
+
 执行 git 钩子回调
 
 ```bash
@@ -85,10 +91,12 @@ dc-git hooks pre-push origin main
 ```
 
 **参数说明**:
+
 - `name`: 钩子名称
 - `args`: 传递给钩子的参数
 
 #### `dc-git check <type>`
+
 检查 git 操作和状态，主要为工程化配置提供支持
 
 ```bash
@@ -97,6 +105,7 @@ dc-git check reverse-merge
 ```
 
 **参数说明**:
+
 - `type`: 检查类型
   - `reverse-merge`: 检测反向合并，防止高级分支被合并到低级分支
 
@@ -154,29 +163,29 @@ DC git check reverse-merge
 ```javascript
 export default {
   // 默认平台
-  defaultPlatform: 'github',
-  
+  defaultPlatform: "github",
+
   // 克隆配置
   clone: {
     // 默认克隆协议
-    protocol: 'https', // 或 'ssh'
+    protocol: "https", // 或 'ssh'
     // 目标目录
-    targetDir: './repos'
+    targetDir: "./repos",
   },
-  
+
   // 钩子配置
   hooks: {
     // 启用的钩子
-    enabled: ['pre-commit', 'post-commit', 'pre-push'],
+    enabled: ["pre-commit", "post-commit", "pre-push"],
     // 钩子脚本路径
-    scriptsPath: './.git/hooks'
+    scriptsPath: "./.git/hooks",
   },
-  
+
   // 检查配置
   check: {
     // 默认检查项
-    defaultChecks: ['status', 'branch', 'remote']
-  }
+    defaultChecks: ["status", "branch", "remote"],
+  },
 };
 ```
 
@@ -185,29 +194,33 @@ export default {
 ### 作为模块使用
 
 ```javascript
-import { GitHelper } from '@done-coding/cli-git/helpers';
+import { GitHelper } from "@done-coding/cli-git/helpers";
 
 const git = new GitHelper();
 
 // 克隆仓库
-await git.cloneFromPlatform('github', 'username');
+await git.cloneFromPlatform("github", "username");
 
 // 执行钩子
-await git.executeHook('pre-commit', []);
+await git.executeHook("pre-commit", []);
 
 // 检查状态
-const status = await git.checkStatus('status');
+const status = await git.checkStatus("status");
 console.log(status);
 ```
 
 ### TypeScript 支持
 
 ```typescript
-import type { PlatformType, HookType, CheckType } from '@done-coding/cli-git/helpers';
-
-const platform: PlatformType = 'github';
-const hook: HookType = 'pre-commit';
-const checkType: CheckType = 'status';
+import type {
+  PlatformType,
+  HookType,
+  CheckType,
+} from "@done-coding/cli-git/helpers";
+
+const platform: PlatformType = "github";
+const hook: HookType = "pre-commit";
+const checkType: CheckType = "status";
 ```
 
 ## 故障排除
@@ -215,6 +228,7 @@ const checkType: CheckType = 'status';
 ### 常见问题
 
 **Q: 克隆失败**
+
 ```bash
 # 检查网络连接
 ping github.com
@@ -227,6 +241,7 @@ dc-git clone github username --verbose
 ```
 
 **Q: 钩子执行失败**
+
 ```bash
 # 检查钩子文件权限
 ls -la .git/hooks/
@@ -239,6 +254,7 @@ dc-git init
 ```
 
 **Q: 检查命令无响应**
+
 ```bash
 # 确保在 git 仓库中
 git status
@@ -277,7 +293,7 @@ DEBUG=done-coding:git dc-git clone github username
 
 ```bash
 # 克隆仓库
-git clone https://gitee.com/done-coding/done-coding-cli.git
+git clone https://github.com/done-coding/done-coding-cli.git
 cd done-coding-cli/packages/git
 
 # 安装依赖
@@ -313,6 +329,7 @@ MIT © [JustSoSu](https://gitee.com/done-coding)
 ### 检测功能详解
 
 #### `dc-git check reverse-merge`
+
 专为工程化配置提供的 git 合并规范检测：
 
 ```bash
@@ -321,12 +338,13 @@ dc-git check reverse-merge
 
 # 该命令会检测：
 # 1. 通过 git reflog 检测合并操作
-# 2. 通过提交信息检测合并记录  
+# 2. 通过提交信息检测合并记录
 # 3. 通过提交记录检测历史合并
 # 4. 检测 rebase 操作的合规性
 ```
 
 **检测场景**:
+
 - 防止 `main` 分支被合并到 `feature` 分支
 - 防止 `develop` 分支被合并到个人开发分支
 - 确保分支合并方向符合 Git Flow 规范
@@ -336,4 +354,4 @@ dc-git check reverse-merge
 - [主 CLI 工具](https://www.npmjs.com/package/@done-coding/cli)
 - [配置工具包](https://www.npmjs.com/package/@done-coding/cli-config) - 使用本包的检测功能
 - [Gitee 仓库](https://gitee.com/done-coding/done-coding-cli)
-- [更新日志](./CHANGELOG.md)
+- [更新日志](./CHANGELOG.md)

package/es/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { c as m } from "./index-6257eade.js";
-import "./index-488dfda2.js";
+import { c as m } from "./index-d0f82826.js";
+import "./index-569e0691.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-488dfda2.js";
+import { g as s, G as n, a as i, h as m } from "./index-569e0691.js";
 import { outputConsole as o, xPrompts as r } from "@done-coding/cli-utils";
 import "node:fs";
 import "node:path";

package/es/{index-488dfda2.js → index-569e0691.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.3",
+  version: "0.6.15",
   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-6257eade.js → index-d0f82826.js}

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

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-488dfda2.js";
-import { a as S } from "./index-6257eade.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-569e0691.js";
+import { a as S } from "./index-d0f82826.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.3",
+  "version": "0.6.15",
   "description": "git跨平台操作命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -38,7 +38,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://gitee.com/done-coding/done-coding-cli.git",
+    "url": "https://github.com/done-coding/done-coding-cli.git",
     "directory": "packages/git"
   },
   "publishConfig": {
@@ -49,7 +49,7 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "0.5.22-alpha.3",
+    "@done-coding/cli-inject": "0.5.23",
     "@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.3",
+    "@done-coding/cli-utils": "0.8.4",
     "@done-coding/request-axios": "^1.2.2",
     "axios": "^1.8.4"
   },
   "engines": {
     "node": ">=18.0.0"
   },
-  "gitHead": "30a4e6c8721e6bcafa72d4e05b35b5ed5fc75c0d"
+  "gitHead": "d90f437c0a716f3e62bd92a221341838710869ad"
 }