@done-coding/cli-publish 0.6.0-alpha.0 → 0.6.1-alpha.0

package/es/cli.mjs

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import { c as m } from "./index-69c14c7f.js";
+import { c as m } from "./index-12bd4947.js";
 import "@done-coding/cli-utils";
-import "semver";
 import "node:child_process";
-import "pinyin";
+import "semver";
 m();

package/es/index-12bd4947.js

@@ -0,0 +1,239 @@
+#!/usr/bin/env node
+import { getConfigFileCommonOptions as v, initHandlerCommon as L, log as l, readConfigFile as b, getGitLastCommitInfo as x, getPackageJson as y, pushGitPublishInfoToRemote as J, xPrompts as S, createSubcommand as N, createMainCommand as D } from "@done-coding/cli-utils";
+import { execSync as E } from "node:child_process";
+import { inc as f, prerelease as _ } from "semver";
+var A = /* @__PURE__ */ ((e) => (e.INIT = "init", e.EXEC = "exec", e))(A || {}), 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 || {}), p = /* @__PURE__ */ ((e) => (e.LATEST = "latest", e.NEXT = "next", e.ALPHA = "alpha", e))(p || {}), a = /* @__PURE__ */ ((e) => (e.NPM = "npm", e.WEB = "web", e))(a || {});
+const I = {
+  name: "@done-coding/cli-publish",
+  version: "0.6.1-alpha.0",
+  description: "项目发布命令行工具",
+  cliConfig: {
+    namespaceDir: ".done-coding",
+    moduleName: "publish"
+  }
+}, {
+  cliConfig: { namespaceDir: F, moduleName: j }
+} = I, G = `./${F}/${j}`, g = `${G}.json`, U = {
+  [a.WEB]: {},
+  [a.NPM]: {}
+}, B = () => v({
+  configPathDefault: g
+}), M = async (e) => L(U, e, {
+  onFileGenerated: () => {
+    l.info("文件生成成功");
+  }
+}), W = {
+  command: A.INIT,
+  describe: "初始化配置文件",
+  options: B(),
+  handler: M
+}, X = () => ({
+  ...v({
+    configPathDefault: g
+  }),
+  mode: {
+    alias: "m",
+    describe: "发布模式",
+    choices: [a.NPM, a.WEB],
+    default: a.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
+  }
+}), C = ({
+  packageJson: e,
+  type: o
+}) => {
+  let m = e.name, n = "", r;
+  const { version: i } = e;
+  if (!i)
+    throw new Error("当前版本号为空");
+  if ([
+    t.MAJOR,
+    t.MINOR,
+    t.PATCH
+  ].includes(o))
+    n = f(i, o), r = p.LATEST;
+  else if ([
+    t.PREMAJOR,
+    t.PREMINOR,
+    t.PREPATCH
+  ].includes(o)) {
+    const s = _(i);
+    s ? (l.warn("当前版本已经是预发布版本，将会在当前版本基础上进行发布"), s.length === 1 && typeof s[0] == "number" ? n = f(
+      i,
+      t.PRERELEASE
+    ) : n = i.split("-")[0] + "-0") : n = f(i, o), r = p.NEXT;
+  } else
+    r = p.ALPHA, n = f(
+      i,
+      t.PRERELEASE,
+      r
+    );
+  if (!n)
+    throw new Error("version is empty");
+  return {
+    name: m,
+    version: n,
+    tag: r
+  };
+}, k = async ({
+  type: e,
+  packageJson: o
+}) => {
+  if (e)
+    return await C({
+      packageJson: o,
+      type: e
+    });
+  {
+    const n = Object.values(t).filter(
+      (s) => s.toUpperCase() !== s
+    ).reduce(
+      (s, c) => (s[c] = C({
+        packageJson: o,
+        type: c
+      }), s),
+      {}
+    ), r = [
+      {
+        title: `主版本(${n[t.MAJOR].version})`,
+        value: t.MAJOR
+      },
+      {
+        title: `次版本(${n[t.MINOR].version})`,
+        value: t.MINOR
+      },
+      {
+        title: `修订版本(${n[t.PATCH].version})`,
+        value: t.PATCH
+      },
+      {
+        title: `预发布主版本(${n[t.PREMAJOR].version})`,
+        value: t.PREMAJOR
+      },
+      {
+        title: `预发布次版本(${n[t.PREMINOR].version})`,
+        value: t.PREMINOR
+      },
+      {
+        title: `预发布修订版本(${n[t.PREPATCH].version})`,
+        value: t.PREPATCH
+      },
+      {
+        title: `alpha版本(${n[t.PRERELEASE].version})`,
+        value: t.PRERELEASE
+      }
+    ], { type: i } = await S({
+      type: "select",
+      name: "type",
+      message: `请选择发布类型，当前版本：${o.version}`,
+      choices: r
+    });
+    return n[i];
+  }
+}, O = async (e) => {
+  const { mode: o, type: m, push: n, rootDir: r } = e, s = (await b(e, () => ({})))[o], c = await x(s), H = y({ rootDir: r }), d = await k({
+    type: m,
+    packageJson: H
+  }), { version: P } = d;
+  E(`npm version ${P}`, {
+    cwd: r,
+    stdio: "inherit"
+  });
+  const { tag: T } = d;
+  try {
+    switch (o) {
+      case a.WEB: {
+        const { build: R } = s;
+        if (R)
+          E(`${R}`, {
+            stdio: "inherit",
+            cwd: r
+          });
+        else
+          throw new Error("未配置build命令");
+        break;
+      }
+      case a.NPM: {
+        E(`npm publish --tag ${T}`, {
+          cwd: r,
+          stdio: "inherit"
+        });
+        break;
+      }
+      default:
+        throw new Error(`未知发布模式：${o}`);
+    }
+  } catch (R) {
+    l.error(`发布失败, error: ${R.message}`);
+    try {
+      l.info(`回滚本地版本到发布前的版本：${c.lastHash}`);
+      const { lastHash: u } = c;
+      E(`git reset --hard ${u}`, {
+        stdio: "inherit"
+      }), l.info(`删除本次发布时生成的tag：v${d.version}`), E(`git tag -d v${d.version}`, {
+        stdio: "inherit"
+      });
+    } catch (u) {
+      l.error(`回滚失败, error: ${u.message}`);
+    }
+    return process.exit(1);
+  }
+  n && J({
+    branchName: c.branchName,
+    version: d.version,
+    remoteInfo: c.remoteInfo
+  }), l.success(`发布成功，版本号：${P}`);
+}, q = {
+  command: "$0",
+  describe: "执行发布命令",
+  options: X(),
+  handler: O
+}, V = async (e, o) => {
+  switch (e) {
+    case A.INIT:
+      return M(o);
+    case A.EXEC:
+      return O(o);
+    default:
+      throw new Error(`不支持的命令 ${e}`);
+  }
+}, { version: z, description: K } = I, $ = {
+  describe: K,
+  version: z,
+  subcommands: [W, q].map(N),
+  demandCommandCount: 1
+}, {
+  cliConfig: { moduleName: h }
+} = I, w = (e = !1) => {
+  const o = e ? h : void 0, m = `$0${e ? ` ${h}` : ""} [options]`;
+  return { command: o, usage: m };
+}, ee = async () => D({
+  ...$,
+  ...w()
+}), te = () => N({
+  ...$,
+  ...w(!0)
+});
+export {
+  te as a,
+  ee as c,
+  V as h
+};

package/es/index.mjs

@@ -1,10 +1,9 @@
 #!/usr/bin/env node
-import { a as i, h as n } from "./index-69c14c7f.js";
+import { a as n, h as t } from "./index-12bd4947.js";
 import "@done-coding/cli-utils";
-import "semver";
 import "node:child_process";
-import "pinyin";
+import "semver";
 export {
-  i as crateAsSubcommand,
-  n as handler
+  n as crateAsSubcommand,
+  t as handler
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-publish",
-  "version": "0.6.0-alpha.0",
+  "version": "0.6.1-alpha.0",
   "description": "项目发布命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -40,9 +40,8 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "^0.5.6-alpha.0",
+    "@done-coding/cli-inject": "^0.5.7-alpha.0",
     "@types/node": "^18.0.0",
-    "@types/pinyin": "^2.10.0",
     "@types/semver": "^7.5.3",
     "@types/yargs": "^17.0.28",
     "rimraf": "^6.0.1",
@@ -54,9 +53,8 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@done-coding/cli-utils": "^0.4.0-alpha.0",
-    "pinyin": "^2.11.2",
+    "@done-coding/cli-utils": "^0.5.0-alpha.0",
     "semver": "^7.5.4"
   },
-  "gitHead": "360b14a641064f732b01ffd6339c2f1963945b61"
+  "gitHead": "86cdd3eaf8cc8be3e48a812b93fd7c2110fcc879"
 }

package/types/config/index.d.ts

@@ -1,2 +1,3 @@
-declare const _default: {};
-export default _default;
+import { type ConfigInfo } from '../types';
+declare const config: ConfigInfo;
+export default config;

package/types/handlers/exec.d.ts

@@ -1,6 +1,5 @@
-import { type ExecOptions } from '../types';
+import type { ExecOptions } from '../types';
 import type { CliHandlerArgv, CliInfo, SubCliInfo } from "@done-coding/cli-utils";
 export declare const getExecOptions: () => CliInfo["options"];
-export type ChildCmd = "npm" | "web";
 export declare const execHandler: (argv: CliHandlerArgv<ExecOptions>) => Promise<undefined>;
 export declare const execCommandCliInfo: SubCliInfo;

package/types/injectInfo.json.d.ts

@@ -1,6 +1,6 @@
 declare const _default: {
   "name": "@done-coding/cli-publish",
-  "version": "0.6.0-alpha.0",
+  "version": "0.6.1-alpha.0",
   "description": "项目发布命令行工具",
   "cliConfig": {
     "namespaceDir": ".done-coding",

package/types/types/index.d.ts

@@ -1,4 +1,4 @@
-import type { InitConfigFileOptions, ReadConfigFileOptions } from "@done-coding/cli-utils";
+import type { GetGitLastCommitParams, InitConfigFileOptions, ReadConfigFileOptions } from "@done-coding/cli-utils";
 /** 子命令枚举 */
 export declare enum SubcommandEnum {
     /** 初始化发布配置文件 */
@@ -57,51 +57,6 @@ export declare enum PublishTagEnum {
      */
     ALPHA = "alpha"
 }
-/**
- * git仓库信息
- */
-export interface GitInfo {
-    /**
-     * 最后一次提交hash值
-     */
-    lastHash: string;
-    /**
-     * 最后一次提交者
-     */
-    lastCommitter: string;
-    /**
-     * 最后一次提交者拼音
-     */
-    lastCommitterPinYin: string;
-    /**
-     * 最后一次提交者邮箱
-     */
-    lastCommitEmail: string;
-    /**
-     * 最后一次提交信息
-     */
-    lastCommitMsg: string;
-    /**
-     * 用户名
-     */
-    userName: string;
-    /**
-     * 用户名拼音
-     */
-    userNamePinYin: string;
-    /**
-     * 邮箱
-     */
-    userEmail: string;
-    /**
-     * 分知名
-     */
-    branchName: string;
-    /**
-     * 仓库地址
-     */
-    remoteUrl: string;
-}
 /**
  * npm信息
  */
@@ -119,19 +74,6 @@ export interface NpmInfo {
      */
     tag: PublishTagEnum;
 }
-/**
- * 配置信息
- */
-export interface ConfigInfo {
-    /**
-     * web构建命令
-     */
-    webBuild?: string;
-    /**
-     * git远程仓库名
-     */
-    gitOriginName: string;
-}
 /** 发布模式 */
 export declare enum PublishModeEnum {
     /** npm发布模式 */
@@ -139,6 +81,25 @@ export declare enum PublishModeEnum {
     /** web发布模式 */
     WEB = "web"
 }
+/** 发布配置- web模式 */
+export interface ConfigInfoWeb extends GetGitLastCommitParams {
+    /**
+     * web构建命令
+     */
+    build?: string;
+}
+/** 发布配置- npm模式 */
+export interface ConfigInfoNpm extends GetGitLastCommitParams {
+}
+/**
+ * 配置信息
+ */
+export interface ConfigInfo {
+    /** web发布配置 */
+    [PublishModeEnum.WEB]?: ConfigInfoWeb;
+    /** NPM发布配置 */
+    [PublishModeEnum.NPM]?: ConfigInfoNpm;
+}
 export interface ExecOptions extends ReadConfigFileOptions {
     /** 发布模式 */
     mode: PublishModeEnum;

package/es/index-69c14c7f.js

@@ -1,252 +0,0 @@
-#!/usr/bin/env node
-import { getConfigFileCommonOptions as I, initHandlerCommon as b, log as g, readConfigFile as D, getPackageJson as J, xPrompts as x, createSubcommand as M, createMainCommand as _ } from "@done-coding/cli-utils";
-import { inc as A, prerelease as j } from "semver";
-import { execSync as o } from "node:child_process";
-import u from "pinyin";
-var v = /* @__PURE__ */ ((e) => (e.INIT = "init", e.EXEC = "exec", e))(v || {}), 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 || {}), h = /* @__PURE__ */ ((e) => (e.LATEST = "latest", e.NEXT = "next", e.ALPHA = "alpha", e))(h || {}), f = /* @__PURE__ */ ((e) => (e.NPM = "npm", e.WEB = "web", e))(f || {});
-const C = {
-  name: "@done-coding/cli-publish",
-  version: "0.6.0-alpha.0",
-  description: "项目发布命令行工具",
-  cliConfig: {
-    namespaceDir: ".done-coding",
-    moduleName: "publish"
-  }
-}, {
-  cliConfig: { namespaceDir: F, moduleName: U }
-} = C, B = `./${F}/${U}`, H = `${B}.json`, G = {}, X = () => I({
-  configPathDefault: H
-}), w = async (e) => b(G, e, {
-  onFileGenerated: () => {
-    g.info("文件生成成功");
-  }
-}), Y = {
-  command: v.INIT,
-  describe: "初始化配置文件",
-  options: X(),
-  handler: w
-}, k = () => ({
-  ...I({
-    configPathDefault: H
-  }),
-  mode: {
-    alias: "m",
-    describe: "发布模式",
-    choices: [f.NPM, f.WEB],
-    default: f.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
-  }
-}), W = ({ gitOriginName: e }) => {
-  try {
-    const r = o("git rev-parse HEAD").toString().trim(), l = o('git log -1 --pretty=format:"%an"').toString().trim(), s = o('git log -1 --pretty=format:"%ae"').toString().trim(), a = o('git log -1 --pretty=format:"%s"').toString().trim(), n = o("git config user.name").toString().trim(), c = o("git config user.email").toString().trim(), p = o("git rev-parse --abbrev-ref HEAD").toString().trim();
-    let E = "";
-    try {
-      E = o(`git config --get remote.${e}.url`).toString().trim();
-    } catch {
-      throw new Error(`git remote ${e} 不存在`);
-    }
-    return {
-      lastHash: r,
-      lastCommitter: l,
-      lastCommitterPinYin: u(l, {
-        style: u.STYLE_NORMAL,
-        heteronym: !1
-      }).join(""),
-      lastCommitEmail: s,
-      lastCommitMsg: a,
-      userName: n,
-      userNamePinYin: u(n, {
-        style: u.STYLE_NORMAL,
-        heteronym: !1
-      }).join(""),
-      userEmail: c,
-      branchName: p,
-      remoteUrl: E
-    };
-  } catch (r) {
-    throw console.error("Error fetching git information:", r), r;
-  }
-}, $ = ({
-  packageJson: e,
-  type: r
-}) => {
-  let l = e.name, s = "", a;
-  const { version: n } = e;
-  if (!n)
-    throw new Error("当前版本号为空");
-  if ([
-    t.MAJOR,
-    t.MINOR,
-    t.PATCH
-  ].includes(r))
-    s = A(n, r), a = h.LATEST;
-  else if ([
-    t.PREMAJOR,
-    t.PREMINOR,
-    t.PREPATCH
-  ].includes(r)) {
-    const c = j(n);
-    c ? (g.warn("当前版本已经是预发布版本，将会在当前版本基础上进行发布"), c.length === 1 && typeof c[0] == "number" ? s = A(
-      n,
-      t.PRERELEASE
-    ) : s = n.split("-")[0] + "-0") : s = A(n, r), a = h.NEXT;
-  } else
-    a = h.ALPHA, s = A(
-      n,
-      t.PRERELEASE,
-      a
-    );
-  if (!s)
-    throw new Error("version is empty");
-  return {
-    name: l,
-    version: s,
-    tag: a
-  };
-}, y = async (e) => {
-  const { mode: r, type: l, push: s, rootDir: a } = e, n = await D(e, () => ({
-    gitOriginName: "origin"
-  })), c = W(n), p = J({ rootDir: a });
-  let E = l, m;
-  if (E)
-    m = await $({
-      packageJson: p,
-      type: E
-    });
-  else {
-    const i = Object.values(t).filter(
-      (R) => R.toUpperCase() !== R
-    ).reduce(
-      (R, N) => (R[N] = $({
-        packageJson: p,
-        type: N
-      }), R),
-      {}
-    ), T = [
-      {
-        title: `主版本(${i[t.MAJOR].version})`,
-        value: t.MAJOR
-      },
-      {
-        title: `次版本(${i[t.MINOR].version})`,
-        value: t.MINOR
-      },
-      {
-        title: `修订版本(${i[t.PATCH].version})`,
-        value: t.PATCH
-      },
-      {
-        title: `预发布主版本(${i[t.PREMAJOR].version})`,
-        value: t.PREMAJOR
-      },
-      {
-        title: `预发布次版本(${i[t.PREMINOR].version})`,
-        value: t.PREMINOR
-      },
-      {
-        title: `预发布修订版本(${i[t.PREPATCH].version})`,
-        value: t.PREPATCH
-      },
-      {
-        title: `alpha版本(${i[t.PRERELEASE].version})`,
-        value: t.PRERELEASE
-      }
-    ];
-    E = (await x({
-      type: "select",
-      name: "type",
-      message: `请选择发布类型，当前版本：${p.version}`,
-      choices: T
-    })).type, m = i[E];
-  }
-  const { version: P } = m;
-  o(`npm version ${P}`, {
-    stdio: "inherit"
-  });
-  try {
-    if (r === f.NPM) {
-      const { tag: d } = m;
-      o(`npm publish --tag ${d}`, {
-        stdio: "inherit"
-      });
-    } else if (r === f.WEB) {
-      const { webBuild: d } = n;
-      d ? o(`${d}`, {
-        stdio: "inherit"
-      }) : g.warn("webBuild为空，不执行web构建");
-    } else
-      throw new Error("未知命令");
-  } catch (d) {
-    g.error(`发布失败, error: ${d.message}`);
-    try {
-      g.info(`回滚本地版本到发布前的版本：${c.lastHash}`);
-      const { lastHash: i } = c;
-      o(`git reset --hard ${i}`, {
-        stdio: "inherit"
-      }), g.info(`删除本次发布时生成的tag：v${m.version}`), o(`git tag -d v${m.version}`, {
-        stdio: "inherit"
-      });
-    } catch (i) {
-      g.error(`回滚失败, error: ${i.message}`);
-    }
-    return process.exit(1);
-  }
-  s && (o(`git push ${n.gitOriginName} v${m.version}`, {
-    stdio: "inherit"
-  }), o(`git push ${n.gitOriginName} ${c.branchName}`, {
-    stdio: "inherit"
-  })), g.success(`发布成功，版本号：${P}`);
-}, q = {
-  command: "$0",
-  describe: "执行发布命令",
-  options: k(),
-  handler: y
-}, te = async (e, r) => {
-  switch (e) {
-    case v.INIT:
-      return w(r);
-    case v.EXEC:
-      return y(r);
-    default:
-      throw new Error(`不支持的命令 ${e}`);
-  }
-}, { version: z, description: K } = C, L = {
-  describe: K,
-  version: z,
-  subcommands: [Y, q].map(M),
-  demandCommandCount: 1
-}, {
-  cliConfig: { moduleName: O }
-} = C, S = (e = !1) => {
-  const r = e ? O : void 0, l = `$0${e ? ` ${O}` : ""} [options]`;
-  return { command: r, usage: l };
-}, re = async () => _({
-  ...L,
-  ...S()
-}), ne = () => M({
-  ...L,
-  ...S(!0)
-});
-export {
-  ne as a,
-  re as c,
-  te as h
-};