@done-coding/cli-git 0.2.0 → 0.2.2-alpha.0

package/es/cli.mjs

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { c as r } from "./index-20b2b104.js";
+import { c as r } from "./index-e8efef08.js";
 import "chalk";
 import "@done-coding/request-axios";
 import "axios";
 import "prompts";
-import "@done-coding/node-tools";
+import "@done-coding/cli-utils";
 import "node:fs";
 import "node:path";
 import "node:child_process";

package/es/{index-20b2b104.js → index-e8efef08.js}

@@ -1,20 +1,20 @@
 #!/usr/bin/env node
 import s from "chalk";
-import { createRequest as b } from "@done-coding/request-axios";
-import v from "axios";
+import { createRequest as C } from "@done-coding/request-axios";
+import S from "axios";
 import g from "prompts";
-import { lookForParentTarget as G, decryptAES as S } from "@done-coding/node-tools";
-import w from "node:fs";
+import { lookForParentTarget as v, decryptAES as w, onPromptFormStateForSigint as d } from "@done-coding/cli-utils";
+import B from "node:fs";
 import "node:path";
-import { execSync as B } from "node:child_process";
-import I from "yargs";
-import { hideBin as N } from "yargs/helpers";
-import _ from "lodash.curry";
+import { execSync as I } from "node:child_process";
+import N from "yargs";
+import { hideBin as x } from "yargs/helpers";
+import P from "lodash.curry";
 var m = /* @__PURE__ */ ((e) => (e.CLONE = "clone", e))(m || {}), i = /* @__PURE__ */ ((e) => (e.GITHUB = "github", e.GITEE = "gitee", e))(i || {});
-const x = 1e4, f = Math.random(), $ = {
-  timeout: x,
+const _ = 1e4, h = Math.random(), $ = {
+  timeout: _,
   getBusinessCode() {
-    return f;
+    return h;
   },
   getBusinessMsg(e) {
     return e.statusText;
@@ -22,22 +22,22 @@ const x = 1e4, f = Math.random(), $ = {
   getBusinessData(e) {
     return e.data;
   },
-  businessSuccessCodeList: [f],
-  axios: v
-}, C = b({
+  businessSuccessCodeList: [h],
+  axios: S
+}, U = C({
   basePath: " https://gitee.com",
   ...$
-}), O = b({
+}), O = C({
   basePath: "https://api.github.com",
   ...$
 }), k = ({
   username: e
-}) => C({
+}) => U({
   url: `/api/v5/users/${e}/repos`,
   method: "GET"
 }), D = ({
   accessToken: e
-}) => C({
+}) => U({
   url: "/api/v5/user/repos",
   method: "GET",
   params: {
@@ -46,35 +46,35 @@ const x = 1e4, f = Math.random(), $ = {
     page: 1,
     sort: "updated"
   }
-}), P = ({
+}), R = ({
   username: e
 }) => O({
   url: `/users/${e}/repos`,
   method: "GET"
-}), u = {
-  version: "0.2.0",
+}), p = {
+  version: "0.2.2-alpha.0",
   name: "@done-coding/cli-git",
   description: "git跨平台操作命令行工具",
   cliConfig: {
     namespaceDir: ".done-coding",
     moduleName: "git"
   }
-}, { namespaceDir: R, moduleName: H } = u.cliConfig, L = `${R}/${H}`, F = (e) => `${L}/.${e}`, q = ({
+}, { namespaceDir: H, moduleName: F } = p.cliConfig, L = `${H}/${F}`, q = (e) => `${L}/.${e}`, M = ({
   secretKey: e,
   platform: o
 }) => {
-  const n = F(o), r = G(n);
+  const n = q(o), r = v(n);
   if (!r) {
     console.log(s.yellow("配置文件不存在"));
     return;
   }
-  const a = `${r}/${n}`, c = w.readFileSync(a, "utf-8"), l = S({ encryptedText: c, secretKey: e });
+  const a = `${r}/${n}`, c = B.readFileSync(a, "utf-8"), l = w({ encryptedText: c, secretKey: e });
   if (!l) {
     console.log(s.yellow("配置文件解密失败"));
     return;
   }
   return JSON.parse(l);
-}, M = async ({
+}, A = async ({
   platform: e,
   username: o
 } = {}) => {
@@ -82,42 +82,42 @@ const x = 1e4, f = Math.random(), $ = {
     platform: e,
     username: o
   };
-  e || (n.platform = (await g({
-    type: "select",
-    name: "platform",
-    message: "选择git平台",
-    choices: [
-      {
-        title: "Github",
-        value: i.GITHUB
-      },
-      {
-        title: "Gitee",
-        value: i.GITEE
-      }
-    ],
-    validate: (t) => t === void 0 ? "请选择git平台" : !0
-  })).platform), o || (n.username = (await g({
+  if (!e) {
+    const t = [
+      { title: "GitHub", value: i.GITHUB },
+      { title: "Gitee", value: i.GITEE }
+    ];
+    n.platform = (await g({
+      type: "select",
+      name: "platform",
+      message: "选择git平台",
+      choices: t,
+      onState: d
+    })).platform;
+  }
+  o || (n.username = (await g({
     type: "text",
     name: "username",
     message: "请输入用户名",
-    validate: (t) => t.trim() === "" ? "用户名不能为空" : !0
+    format: (t) => t.trim(),
+    validate: (t) => t.length > 0 || "用户名不能为空",
+    onState: d
   })).username);
   const { platform: r, username: a } = n;
   let c = [];
-  const l = q({
+  const l = M({
     secretKey: a,
     platform: r
   });
-  let d = l == null ? void 0 : l.accessToken;
+  let f = l == null ? void 0 : l.accessToken;
   console.log(s.blue(`正在获取${a}的${r}仓库列表...`));
-  const p = {
+  const u = {
     username: a,
-    accessToken: d
+    accessToken: f
   };
   switch (n.platform) {
     case i.GITHUB: {
-      c = (await P(p)).data.map((t) => ({
+      c = (await R(u)).data.map((t) => ({
         name: t.name,
         httpUrl: t.clone_url,
         sshUrl: t.ssh_url,
@@ -126,7 +126,7 @@ const x = 1e4, f = Math.random(), $ = {
       break;
     }
     case i.GITEE: {
-      c = (await (p.accessToken ? D : k)(p)).data.map((t) => ({
+      c = (await (u.accessToken ? D : k)(u)).data.map((t) => ({
         name: t.name,
         httpUrl: t.html_url,
         sshUrl: t.ssh_url,
@@ -142,23 +142,24 @@ const x = 1e4, f = Math.random(), $ = {
     return;
   } else
     console.log(s.blue(`共${c.length}个仓库`));
-  const { repoUrl: E } = await g({
+  const { repoUrl: G } = await g({
     name: "repoUrl",
     type: "select",
     message: "选择仓库",
     choices: c.map((t) => ({
       title: `${t.name} ${t.description}`,
       value: t.sshUrl
-    }))
+    })),
+    onState: d
   });
-  return E;
-}, A = async (e) => {
-  const o = await M(e);
-  B(`git clone ${o} 1>&2`), console.log(s.green(`克隆${o}成功`));
-}, j = async (e, o) => (console.log("com", o), e === m.CLONE ? A(o) : (console.log(s.red(`无效的命令: ${e}`)), process.exit(1))), U = async (e) => {
-}, y = u.cliConfig.moduleName, J = (e, o) => {
+  return G;
+}, j = async (e) => {
+  const o = await A(e);
+  I(`git clone ${o} 1>&2`), console.log(s.green(`克隆${o}成功`));
+}, J = async (e, o) => e === m.CLONE ? j(o) : (console.log(s.red(`无效的命令: ${e}`)), process.exit(1)), y = async (e) => {
+}, T = p.cliConfig.moduleName, K = (e, o) => {
   console.log(e ? s.red(e) : s.red(o.message)), process.exit(1);
-}, K = u.description, z = `Usage: $0 ${y} <command> [options]`, Q = "Usage: $0 <command> [options]", V = {
+}, z = p.description, Q = `Usage: $0 ${T} <command> [options]`, V = "Usage: $0 <command> [options]", W = {
   command: `${m.CLONE} <platform> <username>`,
   describe: "从选择的git平台克隆代码",
   builder: (e) => e.positional("platform", {
@@ -170,23 +171,27 @@ const x = 1e4, f = Math.random(), $ = {
     type: "string"
   }),
   /** @ts-ignore */
-  handler: _(j)(m.CLONE)
-}, h = (e) => e.command(V).demandCommand(1), T = (e, o = !1) => o ? h(e.strict().usage(z)) : h(
-  e.strict().usage(Q).help("help").version(u.version).alias("v", "version").alias("h", "help")
-).fail(J).argv, W = (e) => T(e, !0), ie = {
-  command: y,
-  describe: K,
-  builder: W,
-  handler: U
-}, le = async () => {
-  const e = I(N(process.argv));
-  return await T(e), U();
+  async handler(e) {
+    return await P(J)(m.CLONE)(
+      e
+    ), process.exit(0);
+  }
+}, b = (e) => e.command(W).demandCommand(1), E = (e, o = !1) => o ? b(e.strict().usage(Q)) : b(
+  e.strict().usage(V).help("help").version(p.version).alias("v", "version").alias("h", "help")
+).fail(K).argv, X = (e) => E(e, !0), le = {
+  command: T,
+  describe: z,
+  builder: X,
+  handler: y
+}, me = async () => {
+  const e = N(x(process.argv));
+  return await E(e), y();
 };
 export {
-  ie as a,
-  M as b,
-  le as c,
-  A as d,
-  V as g,
-  U as h
+  le as a,
+  A as b,
+  me as c,
+  j as d,
+  W as g,
+  y as h
 };

package/es/index.mjs

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { a as C, b, d as h, g as c, h as f } from "./index-20b2b104.js";
+import { a as C, b, d as h, g as c, h as f } from "./index-e8efef08.js";
 import "chalk";
 import "@done-coding/request-axios";
 import "axios";
 import "prompts";
-import "@done-coding/node-tools";
+import "@done-coding/cli-utils";
 import "node:fs";
 import "node:path";
 import "node:child_process";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-git",
-  "version": "0.2.0",
+  "version": "0.2.2-alpha.0",
   "description": "git跨平台操作命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -41,7 +41,7 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "^0.4.5",
+    "@done-coding/cli-inject": "^0.4.6-alpha.0",
     "@types/lodash.curry": "^4.1.8",
     "@types/node": "^16.0.0",
     "@types/prompts": "^2.4.6",
@@ -55,7 +55,7 @@
     "node": ">=16.0.0"
   },
   "dependencies": {
-    "@done-coding/node-tools": "^0.1.0",
+    "@done-coding/cli-utils": "^0.2.1-alpha.0",
     "@done-coding/request-axios": "^1.1.1",
     "axios": "^1.8.4",
     "chalk": "^5.3.0",
@@ -63,5 +63,5 @@
     "prompts": "^2.4.2",
     "yargs": "^17.7.2"
   },
-  "gitHead": "690833f1f52879f45270df9436742695c0dd3c25"
+  "gitHead": "21eb698f64179882cfec979bd8f19920b047dacb"
 }

package/types/injectInfo.json.d.ts

@@ -1,5 +1,5 @@
 declare const _default: {
-  "version": "0.2.0",
+  "version": "0.2.2-alpha.0",
   "name": "@done-coding/cli-git",
   "description": "git跨平台操作命令行工具",
   "cliConfig": {