@done-coding/cli-publish 0.3.6 → 0.4.0

package/es/handler.mjs

@@ -1,107 +1,194 @@
 #!/usr/bin/env node
-import { PublishModeEnum as h } from "./utils/types.mjs";
-import { inc as p, prerelease as S } from "semver";
-import { join as u } from "node:path";
+import { PublishModeEnum as v } from "./utils/types.mjs";
+import { PublishVersionTypeEnum as e, PublishTagEnum as P } from "./utils/enums.mjs";
+import { inc as f, prerelease as N } from "semver";
+import { join as h } from "node:path";
 import { execSync as o } from "node:child_process";
-import f from "pinyin";
-import { readFileSync as y, existsSync as d } from "node:fs";
-import c from "chalk";
-const w = "/.dc/publish.json", $ = "/package.json", b = ({ gitOriginName: r = "origin" }) => {
+import u from "pinyin";
+import { readFileSync as A, existsSync as S } from "node:fs";
+import p from "chalk";
+import $ from "prompts";
+const d = "/.dc/publish.json", O = "/package.json", w = ({ gitOriginName: i = "origin" }) => {
   try {
-    const i = o("git rev-parse HEAD").toString().trim(), s = o('git log -1 --pretty=format:"%an"').toString().trim(), a = o('git log -1 --pretty=format:"%ae"').toString().trim(), t = o('git log -1 --pretty=format:"%s"').toString().trim(), n = o("git config user.name").toString().trim(), e = o("git config user.email").toString().trim(), g = o("git rev-parse --abbrev-ref HEAD").toString().trim();
-    let l = "";
+    const n = o("git rev-parse HEAD").toString().trim(), m = o('git log -1 --pretty=format:"%an"').toString().trim(), a = o('git log -1 --pretty=format:"%ae"').toString().trim(), s = o('git log -1 --pretty=format:"%s"').toString().trim(), r = o("git config user.name").toString().trim(), c = o("git config user.email").toString().trim(), g = o("git rev-parse --abbrev-ref HEAD").toString().trim();
+    let R = "";
     try {
-      l = o(`git config --get remote.${r}.url`).toString().trim();
+      R = o(`git config --get remote.${i}.url`).toString().trim();
     } catch {
-      throw new Error(`git remote ${r} 不存在`);
+      throw new Error(`git remote ${i} 不存在`);
     }
     return {
-      lastHash: i,
-      lastCommitter: s,
-      lastCommitterPinYin: f(s, {
-        style: f.STYLE_NORMAL,
+      lastHash: n,
+      lastCommitter: m,
+      lastCommitterPinYin: u(m, {
+        style: u.STYLE_NORMAL,
         heteronym: !1
       }).join(""),
       lastCommitEmail: a,
-      lastCommitMsg: t,
-      userName: n,
-      userNamePinYin: f(n, {
-        style: f.STYLE_NORMAL,
+      lastCommitMsg: s,
+      userName: r,
+      userNamePinYin: u(r, {
+        style: u.STYLE_NORMAL,
         heteronym: !1
       }).join(""),
-      userEmail: e,
+      userEmail: c,
       branchName: g,
-      remoteUrl: l
+      remoteUrl: R
     };
-  } catch (i) {
-    throw console.error("Error fetching git information:", i), i;
+  } catch (n) {
+    throw console.error("Error fetching git information:", n), n;
   }
-}, v = async (r) => {
-  const i = y(u(process.cwd(), $), "utf-8"), s = JSON.parse(i);
-  let a = s.name, t = "", n;
-  const { version: e } = s;
-  if (["major", "minor", "patch"].includes(r))
-    t = p(e, r), n = "latest";
-  else if (["premajor", "preminor", "prepatch"].includes(r)) {
-    const g = S(e);
-    g ? (console.log(
-      c.yellow("当前版本已经是预发布版本，将会在当前版本基础上进行发布")
-    ), g.length === 1 && typeof g[0] == "number" ? t = p(e, "prerelease") : t = e.split("-")[0] + "-0") : t = p(e, r), n = "next";
+}, E = (i, n = JSON.parse(A(h(process.cwd(), O), "utf-8"))) => {
+  let m = n.name, a = "", s;
+  const { version: r } = n;
+  if ([
+    e.MAJOR,
+    e.MINOR,
+    e.PATCH
+  ].includes(i))
+    a = f(r, i), s = P.LATEST;
+  else if ([
+    e.PREMAJOR,
+    e.PREMINOR,
+    e.PREPATCH
+  ].includes(i)) {
+    const c = N(r);
+    c ? (console.log(
+      p.yellow("当前版本已经是预发布版本，将会在当前版本基础上进行发布")
+    ), c.length === 1 && typeof c[0] == "number" ? a = f(
+      r,
+      e.PRERELEASE
+    ) : a = r.split("-")[0] + "-0") : a = f(r, i), s = P.NEXT;
   } else
-    n = "alpha", t = p(e, "prerelease", n);
-  if (!t)
+    s = P.ALPHA, a = f(
+      r,
+      e.PRERELEASE,
+      s
+    );
+  if (!a)
     throw new Error("version is empty");
   return {
-    name: a,
-    version: t,
-    tag: n
+    name: m,
+    version: a,
+    tag: s
   };
-}, N = () => {
-  let r;
-  const i = u(process.cwd(), w);
-  if (d(i)) {
-    const s = y(i, "utf-8");
-    r = JSON.parse(s);
+}, I = () => {
+  let i;
+  const n = h(process.cwd(), d);
+  if (S(n)) {
+    const m = A(n, "utf-8");
+    i = JSON.parse(m);
   } else
     console.log(
-      c.yellow(`未找到配置文件，将使用默认配置
+      p.yellow(`未找到配置文件，将使用默认配置
       { gitOriginName: "origin" }
     `)
     );
   return {
     gitOriginName: "origin",
-    ...r || {}
+    ...i || {}
   };
-}, C = async (r) => {
-  console.log(r);
-  const { mode: i, type: s, push: a } = r, t = N(), n = b(t);
-  console.log("type:", s), console.log("gitInfo:", n);
-  const e = await v(s), { version: g } = e;
-  console.log("npmInfo:", e), o(`npm version ${g} 1>&2`);
+}, k = async (i) => {
+  console.log(i);
+  const { mode: n, type: m, push: a } = i, s = I(), r = w(s);
+  console.log("gitInfo:", r);
+  let c = m, g;
+  if (c)
+    console.log("type:", c), g = await E(c);
+  else {
+    const t = JSON.parse(A(h(process.cwd(), O), "utf-8")), l = {
+      [e.MAJOR]: E(
+        e.MAJOR,
+        t
+      ),
+      [e.MINOR]: E(
+        e.MINOR,
+        t
+      ),
+      [e.PATCH]: E(
+        e.PATCH,
+        t
+      ),
+      [e.PREMAJOR]: E(
+        e.PREMAJOR,
+        t
+      ),
+      [e.PREMINOR]: E(
+        e.PREMINOR,
+        t
+      ),
+      [e.PREPATCH]: E(
+        e.PREPATCH,
+        t
+      ),
+      [e.PRERELEASE]: E(
+        e.PRERELEASE,
+        t
+      )
+    }, y = [
+      {
+        title: `主版本(${l[e.MAJOR].version})`,
+        value: e.MAJOR
+      },
+      {
+        title: `次版本(${l[e.MINOR].version})`,
+        value: e.MINOR
+      },
+      {
+        title: `修订版本(${l[e.PATCH].version})`,
+        value: e.PATCH
+      },
+      {
+        title: `预发布主版本(${l[e.PREMAJOR].version})`,
+        value: e.PREMAJOR
+      },
+      {
+        title: `预发布次版本(${l[e.PREMINOR].version})`,
+        value: e.PREMINOR
+      },
+      {
+        title: `预发布修订版本(${l[e.PREPATCH].version})`,
+        value: e.PREPATCH
+      },
+      {
+        title: `alpha版本(${l[e.PRERELEASE].version})`,
+        value: e.PRERELEASE
+      }
+    ];
+    c = (await $({
+      type: "select",
+      name: "type",
+      message: `请选择发布类型，当前版本：${t.version}`,
+      choices: y,
+      validate: (M) => M ? !0 : "请选择发布类型"
+    })).type, g = l[c];
+  }
+  const { version: R } = g;
+  console.log("npmInfo:", g), o(`npm version ${R} 1>&2`);
   try {
-    if (i === h.NPM) {
-      const { tag: l } = e;
-      o(`npm publish --tag ${l} 1>&2`);
-    } else if (i === h.WEB) {
-      const { webBuild: l } = t;
-      l ? o(`${l} 1>&2`) : console.log(c.yellow("webBuild为空，不执行web构建"));
+    if (n === v.NPM) {
+      const { tag: t } = g;
+      o(`npm publish --tag ${t} 1>&2`);
+    } else if (n === v.WEB) {
+      const { webBuild: t } = s;
+      t ? o(`${t} 1>&2`) : console.log(p.yellow("webBuild为空，不执行web构建"));
     } else
       throw new Error("未知命令");
-  } catch (l) {
-    console.log(c.red(`发布失败, error: ${l.message}`));
+  } catch (t) {
+    console.log(p.red(`发布失败, error: ${t.message}`));
     try {
       console.log(
-        c.blue(`回滚本地版本到发布前的版本：${n.lastHash}`)
+        p.blue(`回滚本地版本到发布前的版本：${r.lastHash}`)
       );
-      const { lastHash: m } = n;
-      o(`git reset --hard ${m} 1>&2`), console.log(c.blue(`删除本次发布时生成的tag：v${e.version}`)), o(`git tag -d v${e.version} 1>&2`);
-    } catch (m) {
-      console.log(c.red(`回滚失败, error: ${m.message}`));
+      const { lastHash: l } = r;
+      o(`git reset --hard ${l} 1>&2`), console.log(p.blue(`删除本次发布时生成的tag：v${g.version}`)), o(`git tag -d v${g.version} 1>&2`);
+    } catch (l) {
+      console.log(p.red(`回滚失败, error: ${l.message}`));
     }
     return process.exit(1);
   }
-  a && (o(`git push ${t.gitOriginName} v${e.version} 1>&2`), o(`git push ${t.gitOriginName} ${n.branchName} 1>&2`)), console.log(c.green("发布成功"));
+  a && (o(`git push ${s.gitOriginName} v${g.version} 1>&2`), o(`git push ${s.gitOriginName} ${r.branchName} 1>&2`)), console.log(p.green("发布成功"));
 };
 export {
-  C as handler
+  k as handler
 };

package/es/injectInfo.json.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 const n = {
-  version: "0.3.6",
+  version: "0.4.0",
   name: "@done-coding/cli-publish",
   description: "项目发布命令行工具",
   cliConfig: {

package/es/main.mjs

@@ -1,22 +1,30 @@
 #!/usr/bin/env node
-import m from "yargs";
-import { hideBin as l } from "yargs/helpers";
-import { PublishModeEnum as s } from "./utils/types.mjs";
+import l from "yargs";
+import { hideBin as p } from "yargs/helpers";
+import { PublishModeEnum as i } from "./utils/types.mjs";
+import { PublishVersionTypeEnum as e } from "./utils/enums.mjs";
 import { handler as t } from "./handler.mjs";
-import n from "chalk";
-import i from "./injectInfo.json.mjs";
+import r from "chalk";
+import n from "./injectInfo.json.mjs";
 const d = () => ({
   mode: {
     alias: "m",
     describe: "发布模式",
-    choices: [s.NPM, s.WEB],
-    default: s.NPM
+    choices: [i.NPM, i.WEB],
+    default: i.NPM
   },
   type: {
     alias: "t",
     describe: "发布类型",
-    choices: ["major", "minor", "patch"],
-    default: "patch"
+    choices: [
+      e.MAJOR,
+      e.MINOR,
+      e.PATCH,
+      e.PREMAJOR,
+      e.PREMINOR,
+      e.PREPATCH,
+      e.PRERELEASE
+    ]
   },
   push: {
     alias: "p",
@@ -24,21 +32,21 @@ const d = () => ({
     type: "boolean",
     default: !0
   }
-}), r = i.cliConfig.moduleName, p = (o, e) => {
-  console.log(o ? n.red(o) : n.red(e.message)), process.exit(1);
-}, u = i.description, f = `Usage: $0 ${r} [options]`, g = "Usage: $0 [options]", a = (o, e) => {
-  const c = d();
-  return o.strict().usage(e).help("help").version(i.version).alias("v", "version").alias("h", "help").options(c).fail(p).argv;
-}, h = (o) => a(o, f), M = {
-  command: r,
-  describe: u,
-  builder: h,
+}), a = n.cliConfig.moduleName, u = (o, s) => {
+  console.log(o ? r.red(o) : r.red(s.message)), process.exit(1);
+}, f = n.description, g = `Usage: $0 ${a} [options]`, h = "Usage: $0 [options]", c = (o, s) => {
+  const m = d();
+  return o.strict().usage(s).help("help").version(n.version).alias("v", "version").alias("h", "help").options(m).fail(u).argv;
+}, E = (o) => c(o, g), y = {
+  command: a,
+  describe: f,
+  builder: E,
   handler: t
-}, P = async () => {
-  const o = m(l(process.argv)), e = await a(o, g);
-  return t(e);
+}, A = async () => {
+  const o = l(p(process.argv)), s = await c(o, h);
+  return t(s);
 };
 export {
-  M as command,
-  P as createCli
+  y as command,
+  A as createCli
 };

package/es/utils/enums.mjs

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+var R = /* @__PURE__ */ ((r) => (r.MAJOR = "major", r.MINOR = "minor", r.PATCH = "patch", r.PREMAJOR = "premajor", r.PREMINOR = "preminor", r.PREPATCH = "prepatch", r.PRERELEASE = "prerelease", r))(R || {}), a = /* @__PURE__ */ ((r) => (r.LATEST = "latest", r.NEXT = "next", r.ALPHA = "alpha", r))(a || {});
+export {
+  a as PublishTagEnum,
+  R as PublishVersionTypeEnum
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-publish",
-  "version": "0.3.6",
+  "version": "0.4.0",
   "description": "项目发布命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -41,7 +41,7 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "^0.4.1",
+    "@done-coding/cli-inject": "^0.4.2",
     "@types/node": "^18.0.0",
     "@types/pinyin": "^2.10.0",
     "@types/prompts": "^2.4.6",
@@ -62,5 +62,5 @@
     "semver": "^7.5.4",
     "yargs": "^17.7.2"
   },
-  "gitHead": "1778df27cf625b5588b1de38d260cfed75e123f2"
+  "gitHead": "eb3732e50f528b2c838af6303d774d6d04cf5f37"
 }

package/types/injectInfo.json.d.ts

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

package/types/utils/enums.d.ts

@@ -0,0 +1,50 @@
+/**
+ * 发布版本类型
+ */
+export declare enum PublishVersionTypeEnum {
+    /**
+     * 主版本号
+     */
+    MAJOR = "major",
+    /**
+     * 次版本号
+     */
+    MINOR = "minor",
+    /**
+     * 修订版本号
+     */
+    PATCH = "patch",
+    /**
+     * 预发布版本号
+     */
+    PREMAJOR = "premajor",
+    /**
+     * 预发布次版本号
+     */
+    PREMINOR = "preminor",
+    /**
+     * 预发布修订版本号
+     */
+    PREPATCH = "prepatch",
+    /**
+     * 预发布版本号
+     */
+    PRERELEASE = "prerelease"
+}
+/**
+ * 发布标签类型
+ */
+export declare enum PublishTagEnum {
+    /**
+     * 最新版本
+     */
+    LATEST = "latest",
+    /**
+     * next版本
+     */
+    NEXT = "next",
+    /**
+     * alpha版本
+     */
+    ALPHA = "alpha"
+}

package/types/utils/index.d.ts

@@ -1 +1,2 @@
 export * from "./types";
+export * from "./enums";

package/types/utils/types.d.ts

@@ -1,4 +1,4 @@
-import type { ReleaseType } from "semver";
+import type { PublishTagEnum, PublishVersionTypeEnum } from "./enums";
 /**
  * git仓库信息
  */
@@ -59,7 +59,7 @@ export interface NpmInfo {
     /**
      * 标签
      */
-    tag: "latest" | "next" | "alpha";
+    tag: PublishTagEnum;
 }
 /**
  * 配置信息
@@ -87,7 +87,7 @@ export interface Options {
     /**
      * 发布类型
      */
-    type: ReleaseType;
+    type?: PublishVersionTypeEnum;
     /** (发布成功后)是否推送至远程仓库 */
     push: boolean;
 }