@done-coding/cli-publish 0.4.2 → 0.4.4

package/es/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { c as r } from "./index-03276083.js";
+import { c as r } from "./index-482d005d.js";
 import "semver";
 import "node:path";
 import "node:child_process";
@@ -7,6 +7,7 @@ import "pinyin";
 import "node:fs";
 import "chalk";
 import "prompts";
+import "@done-coding/node-tools";
 import "yargs";
 import "yargs/helpers";
 r();

package/es/{index-03276083.js → index-482d005d.js}

@@ -1,17 +1,18 @@
 #!/usr/bin/env node
-import { inc as A, prerelease as y } from "semver";
+import { inc as A, prerelease as C } from "semver";
 import { join as v } from "node:path";
 import { execSync as n } from "node:child_process";
 import P from "pinyin";
-import { readFileSync as O, existsSync as I } from "node:fs";
+import { readFileSync as O, existsSync as y } from "node:fs";
 import p from "chalk";
-import H from "prompts";
+import I from "prompts";
+import { onPromptFormStateForSigint as H } from "@done-coding/node-tools";
 import w from "yargs";
 import { hideBin as J } from "yargs/helpers";
 var E = /* @__PURE__ */ ((t) => (t.NPM = "npm", t.WEB = "web", t))(E || {}), e = /* @__PURE__ */ ((t) => (t.MAJOR = "major", t.MINOR = "minor", t.PATCH = "patch", t.PREMAJOR = "premajor", t.PREMINOR = "preminor", t.PREPATCH = "prepatch", t.PRERELEASE = "prerelease", t))(e || {}), d = /* @__PURE__ */ ((t) => (t.LATEST = "latest", t.NEXT = "next", t.ALPHA = "alpha", t))(d || {});
-const L = "/.dc/publish.json", u = "/package.json", T = ({ gitOriginName: t = "origin" }) => {
+const L = "/.dc/publish.json", N = "/package.json", T = ({ gitOriginName: t = "origin" }) => {
   try {
-    const o = n("git rev-parse HEAD").toString().trim(), g = n('git log -1 --pretty=format:"%an"').toString().trim(), c = n('git log -1 --pretty=format:"%ae"').toString().trim(), i = n('git log -1 --pretty=format:"%s"').toString().trim(), s = n("git config user.name").toString().trim(), l = n("git config user.email").toString().trim(), m = n("git rev-parse --abbrev-ref HEAD").toString().trim();
+    const o = n("git rev-parse HEAD").toString().trim(), m = n('git log -1 --pretty=format:"%an"').toString().trim(), c = n('git log -1 --pretty=format:"%ae"').toString().trim(), i = n('git log -1 --pretty=format:"%s"').toString().trim(), s = n("git config user.name").toString().trim(), l = n("git config user.email").toString().trim(), g = n("git rev-parse --abbrev-ref HEAD").toString().trim();
     let f = "";
     try {
       f = n(`git config --get remote.${t}.url`).toString().trim();
@@ -20,8 +21,8 @@ const L = "/.dc/publish.json", u = "/package.json", T = ({ gitOriginName: t = "o
     }
     return {
       lastHash: o,
-      lastCommitter: g,
-      lastCommitterPinYin: P(g, {
+      lastCommitter: m,
+      lastCommitterPinYin: P(m, {
         style: P.STYLE_NORMAL,
         heteronym: !1
       }).join(""),
@@ -33,14 +34,14 @@ const L = "/.dc/publish.json", u = "/package.json", T = ({ gitOriginName: t = "o
         heteronym: !1
       }).join(""),
       userEmail: l,
-      branchName: m,
+      branchName: g,
       remoteUrl: f
     };
   } catch (o) {
     throw console.error("Error fetching git information:", o), o;
   }
-}, R = (t, o = JSON.parse(O(v(process.cwd(), u), "utf-8"))) => {
-  let g = o.name, c = "", i;
+}, R = (t, o = JSON.parse(O(v(process.cwd(), N), "utf-8"))) => {
+  let m = o.name, c = "", i;
   const { version: s } = o;
   if ([
     e.MAJOR,
@@ -53,7 +54,7 @@ const L = "/.dc/publish.json", u = "/package.json", T = ({ gitOriginName: t = "o
     e.PREMINOR,
     e.PREPATCH
   ].includes(t)) {
-    const l = y(s);
+    const l = C(s);
     l ? (console.log(
       p.yellow("当前版本已经是预发布版本，将会在当前版本基础上进行发布")
     ), l.length === 1 && typeof l[0] == "number" ? c = A(
@@ -69,16 +70,16 @@ const L = "/.dc/publish.json", u = "/package.json", T = ({ gitOriginName: t = "o
   if (!c)
     throw new Error("version is empty");
   return {
-    name: g,
+    name: m,
     version: c,
     tag: i
   };
 }, b = () => {
   let t;
   const o = v(process.cwd(), L);
-  if (I(o)) {
-    const g = O(o, "utf-8");
-    t = JSON.parse(g);
+  if (y(o)) {
+    const m = O(o, "utf-8");
+    t = JSON.parse(m);
   } else
     console.log(
       p.yellow(`未找到配置文件，将使用默认配置
@@ -89,15 +90,15 @@ const L = "/.dc/publish.json", u = "/package.json", T = ({ gitOriginName: t = "o
     gitOriginName: "origin",
     ...t || {}
   };
-}, N = async (t) => {
+}, M = async (t) => {
   console.log(t);
-  const { mode: o, type: g, push: c } = t, i = b(), s = T(i);
+  const { mode: o, type: m, push: c } = t, i = b(), s = T(i);
   console.log("gitInfo:", s);
-  let l = g, m;
+  let l = m, g;
   if (l)
-    console.log("type:", l), m = await R(l);
+    console.log("type:", l), g = await R(l);
   else {
-    const r = JSON.parse(O(v(process.cwd(), u), "utf-8")), a = {
+    const r = JSON.parse(O(v(process.cwd(), N), "utf-8")), a = {
       [e.MAJOR]: R(
         e.MAJOR,
         r
@@ -156,19 +157,19 @@ const L = "/.dc/publish.json", u = "/package.json", T = ({ gitOriginName: t = "o
         value: e.PRERELEASE
       }
     ];
-    l = (await H({
+    l = (await I({
       type: "select",
       name: "type",
       message: `请选择发布类型，当前版本：${r.version}`,
       choices: $,
-      validate: (C) => C ? !0 : "请选择发布类型"
-    })).type, m = a[l];
+      onState: H
+    })).type, g = a[l];
   }
-  const { version: f } = m;
-  console.log("npmInfo:", m), n(`npm version ${f} 1>&2`);
+  const { version: f } = g;
+  console.log("npmInfo:", g), n(`npm version ${f} 1>&2`);
   try {
     if (o === E.NPM) {
-      const { tag: r } = m;
+      const { tag: r } = g;
       n(`npm publish --tag ${r} 1>&2`);
     } else if (o === E.WEB) {
       const { webBuild: r } = i;
@@ -182,15 +183,15 @@ const L = "/.dc/publish.json", u = "/package.json", T = ({ gitOriginName: t = "o
         p.blue(`回滚本地版本到发布前的版本：${s.lastHash}`)
       );
       const { lastHash: a } = s;
-      n(`git reset --hard ${a} 1>&2`), console.log(p.blue(`删除本次发布时生成的tag：v${m.version}`)), n(`git tag -d v${m.version} 1>&2`);
+      n(`git reset --hard ${a} 1>&2`), console.log(p.blue(`删除本次发布时生成的tag：v${g.version}`)), n(`git tag -d v${g.version} 1>&2`);
     } catch (a) {
       console.log(p.red(`回滚失败, error: ${a.message}`));
     }
     return process.exit(1);
   }
-  c && (n(`git push ${i.gitOriginName} v${m.version} 1>&2`), n(`git push ${i.gitOriginName} ${s.branchName} 1>&2`)), console.log(p.green("发布成功"));
+  c && (n(`git push ${i.gitOriginName} v${g.version} 1>&2`), n(`git push ${i.gitOriginName} ${s.branchName} 1>&2`)), console.log(p.green("发布成功"));
 }, h = {
-  version: "0.4.2",
+  version: "0.4.4",
   name: "@done-coding/cli-publish",
   description: "项目发布命令行工具",
   cliConfig: {
@@ -223,23 +224,23 @@ const L = "/.dc/publish.json", u = "/package.json", T = ({ gitOriginName: t = "o
     type: "boolean",
     default: !0
   }
-}), M = h.cliConfig.moduleName, x = (t, o) => {
+}), u = h.cliConfig.moduleName, x = (t, o) => {
   console.log(t ? p.red(t) : p.red(o.message)), process.exit(1);
-}, B = h.description, U = `Usage: $0 ${M} [options]`, D = "Usage: $0 [options]", S = (t, o) => {
-  const g = j();
-  return t.strict().usage(o).help("help").version(h.version).alias("v", "version").alias("h", "help").options(g).fail(x).argv;
-}, Y = (t) => S(t, U), Q = {
-  command: M,
+}, B = h.description, U = `Usage: $0 ${u} [options]`, D = "Usage: $0 [options]", S = (t, o) => {
+  const m = j();
+  return t.strict().usage(o).help("help").version(h.version).alias("v", "version").alias("h", "help").options(m).fail(x).argv;
+}, Y = (t) => S(t, U), Z = {
+  command: u,
   describe: B,
   builder: Y,
-  handler: N
-}, Z = async () => {
+  handler: M
+}, V = async () => {
   const t = w(J(process.argv)), o = await S(t, D);
-  return N(o);
+  return M(o);
 };
 export {
   E as P,
-  Q as a,
-  Z as c,
-  N as h
+  Z as a,
+  V as c,
+  M as h
 };

package/es/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { P as h, a as u, h as b } from "./index-03276083.js";
+import { P as u, a as b, h as l } from "./index-482d005d.js";
 import "semver";
 import "node:path";
 import "node:child_process";
@@ -7,10 +7,11 @@ import "pinyin";
 import "node:fs";
 import "chalk";
 import "prompts";
+import "@done-coding/node-tools";
 import "yargs";
 import "yargs/helpers";
 export {
-  h as PublishModeEnum,
-  u as command,
-  b as handler
+  u as PublishModeEnum,
+  b as command,
+  l as handler
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-publish",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "项目发布命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -41,7 +41,7 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "^0.4.4",
+    "@done-coding/cli-inject": "^0.4.5",
     "@types/node": "^18.0.0",
     "@types/pinyin": "^2.10.0",
     "@types/prompts": "^2.4.6",
@@ -56,11 +56,12 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
+    "@done-coding/node-tools": "^0.2.0",
     "chalk": "^5.3.0",
     "pinyin": "^2.11.2",
     "prompts": "^2.4.2",
     "semver": "^7.5.4",
     "yargs": "^17.7.2"
   },
-  "gitHead": "383ec04131808af21ca8fdf3652daa48d86cab1c"
+  "gitHead": "0dde53af70143475f5149714152d714802f846f8"
 }

package/types/injectInfo.json.d.ts

@@ -1,5 +1,5 @@
 declare const _default: {
-  "version": "0.4.2",
+  "version": "0.4.4",
   "name": "@done-coding/cli-publish",
   "description": "项目发布命令行工具",
   "cliConfig": {