dc-publish 0.7.5 → 0.7.8

package/es/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { c as m } from "./index-1345b1c1.js";
+import { c as m } from "./index-eb03530f.js";
 import "@done-coding/cli-utils";
 import "node:os";
 import "node:child_process";

package/es/index-eb03530f.js

@@ -0,0 +1,316 @@
+#!/usr/bin/env node
+import { getConfigFileCommonOptions as O, initHandlerCommon as F, log as d, readConfigFile as _, getPackageJson as w, getGitLastCommitInfo as G, pushGitPublishInfoToRemote as W, xPrompts as $, createSubcommand as D, getRootScriptName as X, createMainCommand as V } from "@done-coding/cli-utils";
+import { tmpdir as q } from "node:os";
+import { execSync as l } from "node:child_process";
+import { inc as L } from "semver";
+import { v4 as z } from "uuid";
+import T from "node:path";
+import b, { rmSync as K } from "node:fs";
+var g = /* @__PURE__ */ ((e) => (e.INIT = "init", e.EXEC = "exec", e.ALIAS = "alias", e))(g || {}), r = /* @__PURE__ */ ((e) => (e.MAJOR = "major", e.MINOR = "minor", e.PATCH = "patch", e.PREMAJOR = "premajor", e.PREMINOR = "preminor", e.PREPATCH = "prepatch", e.PRERELEASE = "prerelease", e.CUSTOM_VERSION = "custom version", e))(r || {}), f = /* @__PURE__ */ ((e) => (e.LATEST = "latest", e.NEXT = "next", e.ALPHA = "alpha", e.BETA = "beta", e.RC = "rc", e))(f || {}), c = /* @__PURE__ */ ((e) => (e.NPM = "npm", e.WEB = "web", e))(c || {});
+const P = {
+  name: "@done-coding/cli-publish",
+  version: "0.7.8",
+  description: "项目发布命令行工具",
+  bin: {
+    "dc-publish": "es/cli.mjs"
+  },
+  cliConfig: {
+    namespaceDir: ".done-coding",
+    moduleName: "publish"
+  }
+}, Q = `${q()}/.DONE_CODING_CLI/PUBLISH_ALIAS_TEMP_DIR`, {
+  cliConfig: { namespaceDir: Y, moduleName: Z }
+} = P, ee = `./${Y}/${Z}`, v = `${ee}.json`, te = {
+  [c.WEB]: {},
+  [c.NPM]: {
+    aliasInfo: [
+      {
+        packageJson: {
+          name: "",
+          bin: "",
+          scripts: {}
+        }
+      }
+    ]
+  }
+}, ne = () => O({
+  configPathDefault: v
+}), k = async (e) => F(te, e, {
+  onFileGenerated: () => {
+    d.info("文件生成成功");
+  }
+}), oe = {
+  command: g.INIT,
+  describe: "初始化配置文件",
+  options: ne(),
+  handler: k
+}, se = () => O({
+  configPathDefault: v
+}), y = (e) => {
+  var o;
+  const t = ((o = e[c.NPM]) == null ? void 0 : o.aliasInfo) || [];
+  if (t.length)
+    return t;
+}, S = async (e) => {
+  var u;
+  const t = await _(e, () => ({})), o = y(t);
+  if (!o) {
+    d.warn("没有配置别名发布信息");
+    return;
+  }
+  const { rootDir: m } = e, s = w({ rootDir: m }), { name: a, version: i } = s, n = T.resolve(Q, z());
+  b.mkdirSync(n, { recursive: !0 }), l(`pnpm add ${a}@${i}`, {
+    stdio: "inherit",
+    cwd: n
+  });
+  const h = (u = l(`npm dist-tag ${a}`).toString().trim().split(`
+`).map((C) => C.split(":").map((R) => R.trim())).find(
+    ([, C]) => C === i
+  )) == null ? void 0 : u[0];
+  if (!h)
+    return d.warn(`没有找到 ${a}@${i} 对应的dist-tag`);
+  const E = T.resolve(n, "node_modules", a), I = w({
+    rootDir: E
+  });
+  for (let C of o) {
+    const { packageJson: R } = C, j = {
+      ...I,
+      ...R
+    }, U = `${E}/package.json`;
+    b.writeFileSync(
+      U,
+      JSON.stringify(j, null, 2)
+    ), l(`pnpm publish --tag ${h}`, {
+      stdio: "inherit",
+      cwd: E
+    });
+  }
+  K(n, { recursive: !0, force: !0 });
+}, re = {
+  command: g.ALIAS,
+  describe: "别名发布",
+  options: se(),
+  handler: S
+}, ie = () => ({
+  ...O({
+    configPathDefault: v
+  }),
+  mode: {
+    alias: "m",
+    describe: "发布模式",
+    choices: [c.NPM, c.WEB],
+    default: c.NPM
+  },
+  type: {
+    alias: "t",
+    describe: "发布类型",
+    choices: Object.values(r)
+  },
+  push: {
+    alias: "p",
+    describe: "是否推送至远程仓库",
+    type: "boolean",
+    default: !0
+  },
+  distTag: {
+    alias: "d",
+    describe: "发布标签",
+    choices: Object.values(f)
+  }
+}), N = async ({
+  packageJson: e,
+  type: t,
+  distTag: o
+}) => {
+  let m = e.name, s = "", a;
+  const { version: i } = e;
+  if (!i)
+    throw new Error("当前版本号为空");
+  switch (t) {
+    case r.PATCH:
+    case r.MINOR:
+    case r.MAJOR: {
+      s = L(i, t), a = o || f.LATEST;
+      break;
+    }
+    case r.PREPATCH:
+    case r.PREMINOR:
+    case r.PREMAJOR: {
+      s = L(i, t, f.ALPHA), a = o || f.ALPHA;
+      break;
+    }
+    case r.PRERELEASE: {
+      const n = (await $({
+        type: "text",
+        name: "identifier",
+        message: "请输入修饰符",
+        initial: f.ALPHA
+      })).identifier;
+      s = L(i, t, n), a = o || n;
+      break;
+    }
+    default:
+      s = (await $({
+        type: "text",
+        name: "customVersion",
+        message: "请输入自定义版本号"
+      })).customVersion, a = o || f.LATEST;
+  }
+  if (!s)
+    throw new Error("version is empty");
+  return {
+    name: m,
+    version: s,
+    tag: a
+  };
+}, ae = async ({
+  type: e,
+  packageJson: t,
+  distTag: o
+}) => {
+  if (e)
+    return await N({
+      packageJson: t,
+      type: e,
+      distTag: o
+    });
+  {
+    const m = {}, s = [
+      r.PATCH,
+      r.MINOR,
+      r.MAJOR,
+      r.PREPATCH,
+      r.PREMINOR,
+      r.PREMAJOR
+    ];
+    for (let n of s)
+      m[n] = await N({
+        packageJson: t,
+        type: n,
+        distTag: o
+      });
+    const a = [
+      ...s.map((n) => ({
+        title: `${n} (${m[n].version})`,
+        value: n
+      })),
+      ...[
+        r.PRERELEASE,
+        r.CUSTOM_VERSION
+      ].map((n) => ({
+        title: n,
+        value: n
+      }))
+    ], i = (await $({
+      type: "select",
+      name: "selectType",
+      message: `请选择发布类型，当前版本：${t.version}`,
+      choices: a
+    })).selectType;
+    return s.includes(i) ? m[i] : N({
+      packageJson: t,
+      type: i,
+      distTag: o
+    });
+  }
+}, J = async (e) => {
+  const { mode: t, type: o, push: m, rootDir: s, distTag: a } = e, i = await _(e, () => ({})), n = i[t], A = await G(n), M = w({ rootDir: s }), p = await ae({
+    type: o,
+    packageJson: M,
+    distTag: a
+  }), { version: h } = p;
+  l(`npm version ${h}`, {
+    cwd: s,
+    stdio: "inherit"
+  });
+  const { tag: E } = p;
+  try {
+    switch (t) {
+      case c.WEB: {
+        const { build: I } = n;
+        if (I)
+          l(`${I}`, {
+            stdio: "inherit",
+            cwd: s
+          });
+        else
+          throw new Error("未配置build命令");
+        break;
+      }
+      case c.NPM: {
+        l(`npm publish --tag ${E}`, {
+          cwd: s,
+          stdio: "inherit"
+        });
+        break;
+      }
+      default:
+        throw new Error(`未知发布模式：${t}`);
+    }
+  } catch (I) {
+    d.error(`发布失败, error: ${I.message}`);
+    try {
+      d.info(`回滚本地版本到发布前的版本：${A.lastHash}`);
+      const { lastHash: u } = A;
+      l(`git reset --hard ${u}`, {
+        stdio: "inherit"
+      }), d.info(`删除本次发布时生成的tag：v${p.version}`), l(`git tag -d v${p.version}`, {
+        stdio: "inherit"
+      });
+    } catch (u) {
+      d.error(`回滚失败, error: ${u.message}`);
+    }
+    return process.exit(1);
+  }
+  m && W({
+    branchName: A.branchName,
+    version: p.version,
+    remoteInfo: A.remoteInfo
+  }), d.success(`发布成功，版本号：${h}`), t === c.NPM && y(i) && S(e);
+}, ce = {
+  command: "$0",
+  describe: "执行发布命令",
+  options: ie(),
+  handler: J
+}, he = async (e, t) => {
+  switch (e) {
+    case g.INIT:
+      return k(t);
+    case g.EXEC:
+      return J(t);
+    case g.ALIAS:
+      return S(t);
+    default:
+      throw new Error(`不支持的命令 ${e}`);
+  }
+}, { version: me, description: de } = P, x = {
+  describe: de,
+  version: me,
+  subcommands: [
+    oe,
+    ce,
+    re
+  ].map(D),
+  demandCommandCount: 1,
+  rootScriptName: X({ packageJson: P })
+}, {
+  cliConfig: { moduleName: H }
+} = P, B = (e = !1) => {
+  const t = e ? H : void 0, o = `$0${e ? ` ${H}` : ""} [options]`;
+  return { command: t, usage: o };
+}, Ee = async () => V({
+  ...x,
+  ...B()
+}), Ce = () => D({
+  ...x,
+  ...B(!0)
+});
+export {
+  r as P,
+  g as S,
+  Ce as a,
+  f as b,
+  Ee as c,
+  c as d,
+  he as h
+};

package/es/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { d as t, b as e, P as b, S as d, a as h, h as l } from "./index-1345b1c1.js";
+import { d as t, b as e, P as b, S as d, a as h, h as l } from "./index-eb03530f.js";
 import "@done-coding/cli-utils";
 import "node:os";
 import "node:child_process";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dc-publish",
-  "version": "0.7.5",
+  "version": "0.7.8",
   "description": "项目发布命令行工具",
   "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"
     }
   },
   "files": [
@@ -30,7 +31,7 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "^0.5.13",
+    "@done-coding/cli-inject": "^0.5.15",
     "@types/node": "^18.0.0",
     "@types/semver": "^7.5.3",
     "@types/uuid": "^10.0.0",
@@ -44,10 +45,10 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@done-coding/cli-utils": "^0.7.4",
+    "@done-coding/cli-utils": "^0.7.6",
     "semver": "^7.5.4",
     "uuid": "^11.1.0"
   },
-  "gitHead": "9b52d0d18f2b0f7e0498a8ef4dbd4a4c5fcd1ddf",
+  "gitHead": "ad9548c74a5e7a108874ab2c91a20b4c41ee079c",
   "scripts": {}
 }

package/types/index.d.ts

@@ -51,6 +51,8 @@ export declare interface ExecOptions extends ReadConfigFileOptions {
     type?: PublishVersionTypeEnum;
     /** (发布成功后)是否推送至远程仓库 */
     push: boolean;
+    /** 发布标签 */
+    distTag: PublishTagEnum;
 }
 
 export declare const handler: (command: SubcommandEnum, argv: CliHandlerArgv<any>) => Promise<void>;
@@ -98,7 +100,15 @@ export declare enum PublishTagEnum {
     /**
      * alpha版本
      */
-    ALPHA = "alpha"
+    ALPHA = "alpha",
+    /**
+     * beta版本
+     */
+    BETA = "beta",
+    /**
+     * rc版本
+     */
+    RC = "rc"
 }
 
 /**
@@ -129,10 +139,10 @@ export declare enum PublishVersionTypeEnum {
      * 预发布修订版本号
      */
     PREPATCH = "prepatch",
-    /**
-     * 预发布版本号
-     */
-    PRERELEASE = "prerelease"
+    /** 自定义预发布修饰符 */
+    PRERELEASE = "prerelease",
+    /** 自定义版本号 */
+    CUSTOM_VERSION = "custom version"
 }
 
 /** 子命令枚举 */

package/es/index-1345b1c1.js

@@ -1,314 +0,0 @@
-#!/usr/bin/env node
-import { getConfigFileCommonOptions as N, initHandlerCommon as F, log as m, readConfigFile as b, getPackageJson as v, getGitLastCommitInfo as U, pushGitPublishInfoToRemote as G, xPrompts as W, createSubcommand as J, getRootScriptName as X, createMainCommand as q } from "@done-coding/cli-utils";
-import { tmpdir as z } from "node:os";
-import { execSync as f } from "node:child_process";
-import { inc as g, prerelease as K } from "semver";
-import { v4 as Q } from "uuid";
-import w from "node:path";
-import T, { rmSync as Y } from "node:fs";
-var E = /* @__PURE__ */ ((e) => (e.INIT = "init", e.EXEC = "exec", e.ALIAS = "alias", e))(E || {}), t = /* @__PURE__ */ ((e) => (e.MAJOR = "major", e.MINOR = "minor", e.PATCH = "patch", e.PREMAJOR = "premajor", e.PREMINOR = "preminor", e.PREPATCH = "prepatch", e.PRERELEASE = "prerelease", e))(t || {}), A = /* @__PURE__ */ ((e) => (e.LATEST = "latest", e.NEXT = "next", e.ALPHA = "alpha", e))(A || {}), l = /* @__PURE__ */ ((e) => (e.NPM = "npm", e.WEB = "web", e))(l || {});
-const P = {
-  name: "@done-coding/cli-publish",
-  version: "0.7.5",
-  description: "项目发布命令行工具",
-  bin: {
-    "dc-publish": "es/cli.mjs"
-  },
-  cliConfig: {
-    namespaceDir: ".done-coding",
-    moduleName: "publish"
-  }
-}, Z = `${z()}/.DONE_CODING_CLI/PUBLISH_ALIAS_TEMP_DIR`, {
-  cliConfig: { namespaceDir: V, moduleName: ee }
-} = P, te = `./${V}/${ee}`, $ = `${te}.json`, ne = {
-  [l.WEB]: {},
-  [l.NPM]: {
-    aliasInfo: [
-      {
-        packageJson: {
-          name: "",
-          bin: "",
-          scripts: {}
-        }
-      }
-    ]
-  }
-}, oe = () => N({
-  configPathDefault: $
-}), D = async (e) => F(ne, e, {
-  onFileGenerated: () => {
-    m.info("文件生成成功");
-  }
-}), se = {
-  command: E.INIT,
-  describe: "初始化配置文件",
-  options: oe(),
-  handler: D
-}, re = () => N({
-  configPathDefault: $
-}), _ = (e) => {
-  var a;
-  const n = ((a = e[l.NPM]) == null ? void 0 : a.aliasInfo) || [];
-  if (n.length)
-    return n;
-}, L = async (e) => {
-  var O;
-  const n = await b(e, () => ({})), a = _(n);
-  if (!a) {
-    m.warn("没有配置别名发布信息");
-    return;
-  }
-  const { rootDir: o } = e, i = v({ rootDir: o }), { name: s, version: r } = i, c = w.resolve(Z, Q());
-  T.mkdirSync(c, { recursive: !0 }), f(`pnpm add ${s}@${r}`, {
-    stdio: "inherit",
-    cwd: c
-  });
-  const R = (O = f(`npm dist-tag ${s}`).toString().trim().split(`
-`).map((I) => I.split(":").map((C) => C.trim())).find(
-    ([, I]) => I === r
-  )) == null ? void 0 : O[0];
-  if (!R)
-    return m.warn(`没有找到 ${s}@${r} 对应的dist-tag`);
-  const d = w.resolve(c, "node_modules", s), u = v({
-    rootDir: d
-  });
-  for (let I of a) {
-    const { packageJson: C } = I, B = {
-      ...u,
-      ...C
-    }, j = `${d}/package.json`;
-    T.writeFileSync(
-      j,
-      JSON.stringify(B, null, 2)
-    ), f(`pnpm publish --tag ${R}`, {
-      stdio: "inherit",
-      cwd: d
-    });
-  }
-  Y(c, { recursive: !0, force: !0 });
-}, ie = {
-  command: E.ALIAS,
-  describe: "别名发布",
-  options: re(),
-  handler: L
-}, ae = () => ({
-  ...N({
-    configPathDefault: $
-  }),
-  mode: {
-    alias: "m",
-    describe: "发布模式",
-    choices: [l.NPM, l.WEB],
-    default: l.NPM
-  },
-  type: {
-    alias: "t",
-    describe: "发布类型",
-    choices: [
-      t.MAJOR,
-      t.MINOR,
-      t.PATCH,
-      t.PREMAJOR,
-      t.PREMINOR,
-      t.PREPATCH,
-      t.PRERELEASE
-    ]
-  },
-  push: {
-    alias: "p",
-    describe: "是否推送至远程仓库",
-    type: "boolean",
-    default: !0
-  }
-}), S = ({
-  packageJson: e,
-  type: n
-}) => {
-  let a = e.name, o = "", i;
-  const { version: s } = e;
-  if (!s)
-    throw new Error("当前版本号为空");
-  if ([
-    t.MAJOR,
-    t.MINOR,
-    t.PATCH
-  ].includes(n))
-    o = g(s, n), i = A.LATEST;
-  else if ([
-    t.PREMAJOR,
-    t.PREMINOR,
-    t.PREPATCH
-  ].includes(n)) {
-    const r = K(s);
-    r ? (m.warn("当前版本已经是预发布版本，将会在当前版本基础上进行发布"), r.length === 1 && typeof r[0] == "number" ? o = g(
-      s,
-      t.PRERELEASE
-    ) : o = s.split("-")[0] + "-0") : o = g(s, n), i = A.NEXT;
-  } else
-    i = A.ALPHA, o = g(
-      s,
-      t.PRERELEASE,
-      i
-    );
-  if (!o)
-    throw new Error("version is empty");
-  return {
-    name: a,
-    version: o,
-    tag: i
-  };
-}, ce = async ({
-  type: e,
-  packageJson: n
-}) => {
-  if (e)
-    return await S({
-      packageJson: n,
-      type: e
-    });
-  {
-    const o = Object.values(t).filter(
-      (r) => r.toUpperCase() !== r
-    ).reduce(
-      (r, c) => (r[c] = S({
-        packageJson: n,
-        type: c
-      }), r),
-      {}
-    ), i = [
-      {
-        title: `主版本(${o[t.MAJOR].version})`,
-        value: t.MAJOR
-      },
-      {
-        title: `次版本(${o[t.MINOR].version})`,
-        value: t.MINOR
-      },
-      {
-        title: `修订版本(${o[t.PATCH].version})`,
-        value: t.PATCH
-      },
-      {
-        title: `预发布主版本(${o[t.PREMAJOR].version})`,
-        value: t.PREMAJOR
-      },
-      {
-        title: `预发布次版本(${o[t.PREMINOR].version})`,
-        value: t.PREMINOR
-      },
-      {
-        title: `预发布修订版本(${o[t.PREPATCH].version})`,
-        value: t.PREPATCH
-      },
-      {
-        title: `alpha版本(${o[t.PRERELEASE].version})`,
-        value: t.PRERELEASE
-      }
-    ], { type: s } = await W({
-      type: "select",
-      name: "type",
-      message: `请选择发布类型，当前版本：${n.version}`,
-      choices: i
-    });
-    return o[s];
-  }
-}, k = async (e) => {
-  const { mode: n, type: a, push: o, rootDir: i } = e, s = await b(e, () => ({})), r = s[n], c = await U(r), M = v({ rootDir: i }), p = await ce({
-    type: a,
-    packageJson: M
-  }), { version: h } = p;
-  f(`npm version ${h}`, {
-    cwd: i,
-    stdio: "inherit"
-  });
-  const { tag: R } = p;
-  try {
-    switch (n) {
-      case l.WEB: {
-        const { build: d } = r;
-        if (d)
-          f(`${d}`, {
-            stdio: "inherit",
-            cwd: i
-          });
-        else
-          throw new Error("未配置build命令");
-        break;
-      }
-      case l.NPM: {
-        f(`npm publish --tag ${R}`, {
-          cwd: i,
-          stdio: "inherit"
-        });
-        break;
-      }
-      default:
-        throw new Error(`未知发布模式：${n}`);
-    }
-  } catch (d) {
-    m.error(`发布失败, error: ${d.message}`);
-    try {
-      m.info(`回滚本地版本到发布前的版本：${c.lastHash}`);
-      const { lastHash: u } = c;
-      f(`git reset --hard ${u}`, {
-        stdio: "inherit"
-      }), m.info(`删除本次发布时生成的tag：v${p.version}`), f(`git tag -d v${p.version}`, {
-        stdio: "inherit"
-      });
-    } catch (u) {
-      m.error(`回滚失败, error: ${u.message}`);
-    }
-    return process.exit(1);
-  }
-  o && G({
-    branchName: c.branchName,
-    version: p.version,
-    remoteInfo: c.remoteInfo
-  }), m.success(`发布成功，版本号：${h}`), n === l.NPM && _(s) && L(e);
-}, le = {
-  command: "$0",
-  describe: "执行发布命令",
-  options: ae(),
-  handler: k
-}, Ae = async (e, n) => {
-  switch (e) {
-    case E.INIT:
-      return D(n);
-    case E.EXEC:
-      return k(n);
-    case E.ALIAS:
-      return L(n);
-    default:
-      throw new Error(`不支持的命令 ${e}`);
-  }
-}, { version: me, description: de } = P, y = {
-  describe: de,
-  version: me,
-  subcommands: [
-    se,
-    le,
-    ie
-  ].map(J),
-  demandCommandCount: 1,
-  rootScriptName: X({ packageJson: P })
-}, {
-  cliConfig: { moduleName: H }
-} = P, x = (e = !1) => {
-  const n = e ? H : void 0, a = `$0${e ? ` ${H}` : ""} [options]`;
-  return { command: n, usage: a };
-}, Pe = async () => q({
-  ...y,
-  ...x()
-}), he = () => J({
-  ...y,
-  ...x(!0)
-});
-export {
-  t as P,
-  E as S,
-  he as a,
-  A as b,
-  Pe as c,
-  l as d,
-  Ae as h
-};