done-coding-git 0.6.5-alpha.0 → 0.6.6

package/es/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { c as m } from "./index-70ca0612.js";
-import "./index-5fdcafcd.js";
+import { c as m } from "./index-3f895167.js";
+import "./index-7315360a.js";
 import "@done-coding/cli-utils";
 import "node:child_process";
 import "node:fs";

package/es/helpers.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { g as s, G as n, a, h as m } from "./index-5fdcafcd.js";
+import { g as s, G as n, a, h as m } from "./index-7315360a.js";
 import { xPrompts as e } from "@done-coding/cli-utils";
 import "node:child_process";
 import "node:fs";

package/es/{index-70ca0612.js → index-3f895167.js}

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

package/es/{index-5fdcafcd.js → index-7315360a.js}

@@ -1,13 +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, 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, 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 _ 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,
+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,
   getBusinessCode() {
     return y;
   },
@@ -18,7 +18,7 @@ const fe = 3e4, y = Math.random(), U = {
     return e.data;
   },
   businessSuccessCodeList: [y],
-  axios: pe
+  axios: fe
 }, x = L({
   basePath: " https://gitee.com",
   ...U
@@ -46,7 +46,7 @@ const fe = 3e4, y = Math.random(), U = {
 }) => A({
   url: `/users/${e}/repos`,
   method: "GET"
-}), he = ({
+}), de = ({
   accessToken: e
 }) => A({
   url: "/user/repos",
@@ -61,7 +61,7 @@ const fe = 3e4, y = Math.random(), U = {
   }
 }), T = {
   name: "@done-coding/cli-git",
-  version: "0.6.5-alpha.0",
+  version: "0.6.6",
   description: "git跨平台操作命令行工具",
   bin: {
     "dc-git": "es/cli.mjs"
@@ -71,8 +71,8 @@ const fe = 3e4, y = Math.random(), U = {
     moduleName: "git"
   }
 }, {
-  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) => {
+  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) => {
   const { platform: t } = e, s = H(t), r = Y(s, {
     isFindFarthest: !1
   });
@@ -94,10 +94,10 @@ const fe = 3e4, y = Math.random(), U = {
 }) => {
   const o = H(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 }), p = 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, p, "utf-8"), i.success(`配置信息保存成功 ${a}`);
 }, B = [
   { title: "GitHub", value: E.GITHUB },
   { title: "Gitee", value: E.GITEE }
@@ -137,7 +137,7 @@ const fe = 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({
@@ -146,13 +146,13 @@ const fe = 3e4, y = Math.random(), U = {
   });
   let g = n == null ? void 0 : n.accessToken;
   i.stage(`正在获取${o}的${r}仓库列表...`);
-  const f = {
+  const p = {
     username: o,
     accessToken: g
   };
   switch (s.platform) {
     case E.GITHUB: {
-      c = (await (f.accessToken ? he : Ee)(f)).data.map((m) => ({
+      c = (await (p.accessToken ? de : Ee)(p)).data.map((m) => ({
         name: m.name,
         httpUrl: m.clone_url,
         sshUrl: m.ssh_url,
@@ -161,7 +161,7 @@ const fe = 3e4, y = Math.random(), U = {
       break;
     }
     case E.GITEE: {
-      c = (await (f.accessToken ? ue : le)(f)).data.map((m) => ({
+      c = (await (p.accessToken ? ue : le)(p)).data.map((m) => ({
         name: m.name,
         httpUrl: m.html_url,
         sshUrl: m.ssh_url,
@@ -177,7 +177,7 @@ const fe = 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: "选择仓库",
@@ -188,20 +188,20 @@ const fe = 3e4, y = Math.random(), U = {
   });
   return a;
 }, _e = [
-  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
+  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
 ], Ie = [
-  p.PRE_MERGE_COMMIT,
-  p.PREPARE_COMMIT_MSG,
-  p.POST_MERGE,
-  p.PRE_PUSH,
-  p.PRE_REBASE
+  f.PRE_MERGE_COMMIT,
+  f.PREPARE_COMMIT_MSG,
+  f.POST_MERGE,
+  f.PRE_PUSH,
+  f.PRE_REBASE
 ], $ = (e) => {
   const {
     [l.CHECK]: { [C.REVERSE_MERGE]: t }
@@ -214,7 +214,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((p) => p.hash === o);
       g !== -1 && (i.info(
         `${r} 设置 只检测 ${o} 之后的日志 即 下标 [0 - ${g})`
       ), n = Math.min(n, g - 1));
@@ -257,15 +257,15 @@ const fe = 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,
@@ -277,8 +277,8 @@ const fe = 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,
@@ -370,7 +370,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: p = t } = o, a = `禁止${g}被合并: ${g} => ${p}
 
 --------- 建议 ---------
 可以通过
@@ -388,7 +388,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), p = ie({
     /** 考虑reflog存在往复切换  */
     count: r + 30,
     filterItem: (a) => n.includes(a.hash)
@@ -398,7 +398,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 = p[a.hash]) == null ? void 0 : P.mergeInfo);
     O && Object.entries(s).forEach(([k]) => {
       const b = c[k];
       if (m > b) {
@@ -516,7 +516,7 @@ const fe = 3e4, y = Math.random(), U = {
 }), J = async (e) => {
   const { name: t, rootDir: s, args: r } = e;
   switch (t) {
-    case p.PRE_MERGE_COMMIT: {
+    case f.PRE_MERGE_COMMIT: {
       const o = await R(e);
       M({
         config: o,
@@ -525,7 +525,7 @@ const fe = 3e4, y = Math.random(), U = {
       });
       break;
     }
-    case p.PREPARE_COMMIT_MSG: {
+    case f.PREPARE_COMMIT_MSG: {
       const o = await R(e);
       M({
         config: o,
@@ -535,8 +535,8 @@ const fe = 3e4, y = Math.random(), U = {
       });
       break;
     }
-    case p.POST_MERGE:
-    case p.PRE_PUSH: {
+    case f.POST_MERGE:
+    case f.PRE_PUSH: {
       const o = await R(e);
       M({
         config: o,
@@ -545,7 +545,7 @@ const fe = 3e4, y = Math.random(), U = {
       });
       break;
     }
-    case p.PRE_REBASE: {
+    case f.PRE_REBASE: {
       const o = await R(e);
       M({
         config: o,
@@ -591,7 +591,7 @@ const fe = 3e4, y = Math.random(), U = {
 export {
   C,
   E as G,
-  d as I,
+  h as I,
   l as S,
   K as a,
   Oe as b,

package/es/index.mjs

@@ -1,6 +1,6 @@
 #!/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-5fdcafcd.js";
-import { a as T } from "./index-70ca0612.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-7315360a.js";
+import { a as T } from "./index-3f895167.js";
 import "@done-coding/cli-utils";
 import "node:child_process";
 import "node:fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "done-coding-git",
-  "version": "0.6.5-alpha.0",
+  "version": "0.6.6",
   "description": "git跨平台操作命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -9,7 +9,8 @@
   "bin": "es/cli.mjs",
   "exports": {
     ".": {
-      "import": "./es/index.mjs"
+      "import": "./es/index.mjs",
+      "types": "./types/index.d.ts"
     },
     "./helpers": {
       "import": "./es/helpers.mjs",
@@ -41,7 +42,7 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "^0.5.13-alpha.0",
+    "@done-coding/cli-inject": "^0.5.14",
     "@types/node": "^18.0.0",
     "@types/yargs": "^17.0.28",
     "rimraf": "^6.0.1",
@@ -53,10 +54,10 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@done-coding/cli-utils": "^0.7.4-alpha.0",
+    "@done-coding/cli-utils": "^0.7.5",
     "@done-coding/request-axios": "^1.1.1",
     "axios": "^1.8.4"
   },
-  "gitHead": "a1acffae69586b12aec17d0ad76d6f75ad1d0ca0",
+  "gitHead": "fb405d55a9fe10014863d725b1f4e3bcd45412af",
   "scripts": {}
 }