@done-coding/cli-publish 0.4.5-alpha.0 → 0.5.0-alpha.0

package/es/cli.mjs

@@ -1,13 +1,9 @@
 #!/usr/bin/env node
-import { c as r } from "./index-3eb0cae4.js";
+import { c as m } from "./index-1c86019f.js";
 import "semver";
 import "node:path";
 import "node:child_process";
 import "pinyin";
 import "node:fs";
-import "chalk";
-import "prompts";
 import "@done-coding/cli-utils";
-import "yargs";
-import "yargs/helpers";
-r();
+m();

package/es/{index-3eb0cae4.js → index-1c86019f.js}

@@ -1,18 +1,14 @@
 #!/usr/bin/env node
-import { inc as A, prerelease as C } from "semver";
-import { join as v } from "node:path";
+import { inc as A, prerelease as $ } from "semver";
+import { join as O } from "node:path";
 import { execSync as n } from "node:child_process";
 import P from "pinyin";
-import { readFileSync as h, existsSync as y } from "node:fs";
-import p from "chalk";
-import I from "prompts";
-import { onPromptFormStateForSigint as H } from "@done-coding/cli-utils";
-import w from "yargs";
-import { hideBin as J } from "yargs/helpers";
+import { readFileSync as v, existsSync as C } from "node:fs";
+import { xPrompts as I, log as p, createMainCommand as H, createSubcommand as w } from "@done-coding/cli-utils";
 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", N = "/package.json", T = ({ gitOriginName: t = "origin" }) => {
+const y = "/.dc/publish.json", N = "/package.json", J = ({ gitOriginName: t = "origin" }) => {
   try {
-    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();
+    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(), s = n('git log -1 --pretty=format:"%s"').toString().trim(), i = 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();
@@ -27,9 +23,9 @@ const L = "/.dc/publish.json", N = "/package.json", T = ({ gitOriginName: t = "o
         heteronym: !1
       }).join(""),
       lastCommitEmail: c,
-      lastCommitMsg: i,
-      userName: s,
-      userNamePinYin: P(s, {
+      lastCommitMsg: s,
+      userName: i,
+      userNamePinYin: P(i, {
         style: P.STYLE_NORMAL,
         heteronym: !1
       }).join(""),
@@ -40,65 +36,61 @@ const L = "/.dc/publish.json", N = "/package.json", T = ({ gitOriginName: t = "o
   } catch (o) {
     throw console.error("Error fetching git information:", o), o;
   }
-}, R = (t, o = JSON.parse(h(v(process.cwd(), N), "utf-8"))) => {
-  let m = o.name, c = "", i;
-  const { version: s } = o;
+}, R = (t, o = JSON.parse(v(O(process.cwd(), N), "utf-8"))) => {
+  let m = o.name, c = "", s;
+  const { version: i } = o;
   if ([
     e.MAJOR,
     e.MINOR,
     e.PATCH
   ].includes(t))
-    c = A(s, t), i = d.LATEST;
+    c = A(i, t), s = d.LATEST;
   else if ([
     e.PREMAJOR,
     e.PREMINOR,
     e.PREPATCH
   ].includes(t)) {
-    const l = C(s);
-    l ? (console.log(
-      p.yellow("当前版本已经是预发布版本，将会在当前版本基础上进行发布")
-    ), l.length === 1 && typeof l[0] == "number" ? c = A(
-      s,
+    const l = $(i);
+    l ? (p.warn("当前版本已经是预发布版本，将会在当前版本基础上进行发布"), l.length === 1 && typeof l[0] == "number" ? c = A(
+      i,
       e.PRERELEASE
-    ) : c = s.split("-")[0] + "-0") : c = A(s, t), i = d.NEXT;
+    ) : c = i.split("-")[0] + "-0") : c = A(i, t), s = d.NEXT;
   } else
-    i = d.ALPHA, c = A(
-      s,
+    s = d.ALPHA, c = A(
+      i,
       e.PRERELEASE,
-      i
+      s
     );
   if (!c)
     throw new Error("version is empty");
   return {
     name: m,
     version: c,
-    tag: i
+    tag: s
   };
-}, b = () => {
+}, L = () => {
   let t;
-  const o = v(process.cwd(), L);
-  if (y(o)) {
-    const m = h(o, "utf-8");
+  const o = O(process.cwd(), y);
+  if (C(o)) {
+    const m = v(o, "utf-8");
     t = JSON.parse(m);
   } else
-    console.log(
-      p.yellow(`未找到配置文件，将使用默认配置
+    p.warn(`未找到配置文件，将使用默认配置
       { gitOriginName: "origin" }
-    `)
-    );
+    `);
   return {
     gitOriginName: "origin",
     ...t || {}
   };
-}, M = async (t) => {
+}, T = async (t) => {
   console.log(t);
-  const { mode: o, type: m, push: c } = t, i = b(), s = T(i);
-  console.log("gitInfo:", s);
+  const { mode: o, type: m, push: c } = t, s = L(), i = J(s);
+  console.log("gitInfo:", i);
   let l = m, g;
   if (l)
     console.log("type:", l), g = await R(l);
   else {
-    const r = JSON.parse(h(v(process.cwd(), N), "utf-8")), a = {
+    const r = JSON.parse(v(O(process.cwd(), N), "utf-8")), a = {
       [e.MAJOR]: R(
         e.MAJOR,
         r
@@ -127,7 +119,7 @@ const L = "/.dc/publish.json", N = "/package.json", T = ({ gitOriginName: t = "o
         e.PRERELEASE,
         r
       )
-    }, $ = [
+    }, S = [
       {
         title: `主版本(${a[e.MAJOR].version})`,
         value: e.MAJOR
@@ -161,8 +153,7 @@ const L = "/.dc/publish.json", N = "/package.json", T = ({ gitOriginName: t = "o
       type: "select",
       name: "type",
       message: `请选择发布类型，当前版本：${r.version}`,
-      choices: $,
-      onState: H
+      choices: S
     })).type, g = a[l];
   }
   const { version: f } = g;
@@ -172,33 +163,35 @@ const L = "/.dc/publish.json", N = "/package.json", T = ({ gitOriginName: t = "o
       const { tag: r } = g;
       n(`npm publish --tag ${r} 1>&2`);
     } else if (o === E.WEB) {
-      const { webBuild: r } = i;
-      r ? n(`${r} 1>&2`) : console.log(p.yellow("webBuild为空，不执行web构建"));
+      const { webBuild: r } = s;
+      r ? n(`${r} 1>&2`) : p.warn("webBuild为空，不执行web构建");
     } else
       throw new Error("未知命令");
   } catch (r) {
-    console.log(p.red(`发布失败, error: ${r.message}`));
+    p.error(`发布失败, error: ${r.message}`);
     try {
-      console.log(
-        p.blue(`回滚本地版本到发布前的版本：${s.lastHash}`)
-      );
-      const { lastHash: a } = s;
-      n(`git reset --hard ${a} 1>&2`), console.log(p.blue(`删除本次发布时生成的tag：v${g.version}`)), n(`git tag -d v${g.version} 1>&2`);
+      p.info(`回滚本地版本到发布前的版本：${i.lastHash}`);
+      const { lastHash: a } = i;
+      n(`git reset --hard ${a} 1>&2`), p.info(`删除本次发布时生成的tag：v${g.version}`), n(`git tag -d v${g.version} 1>&2`);
     } catch (a) {
-      console.log(p.red(`回滚失败, error: ${a.message}`));
+      p.error(`回滚失败, error: ${a.message}`);
     }
     return process.exit(1);
   }
-  c && (n(`git push ${i.gitOriginName} v${g.version} 1>&2`), n(`git push ${i.gitOriginName} ${s.branchName} 1>&2`)), console.log(p.green("发布成功"));
-}, O = {
-  version: "0.4.5-alpha.0",
+  c && (n(`git push ${s.gitOriginName} v${g.version} 1>&2`), n(`git push ${s.gitOriginName} ${i.branchName} 1>&2`)), p.success(`发布成功，版本号：${f}`);
+}, b = {
+  version: "0.5.0-alpha.0",
   name: "@done-coding/cli-publish",
   description: "项目发布命令行工具",
   cliConfig: {
     namespaceDir: ".done-coding",
     moduleName: "publish"
   }
-}, j = () => ({
+}, {
+  version: j,
+  description: x,
+  cliConfig: { moduleName: M }
+} = b, B = () => ({
   mode: {
     alias: "m",
     describe: "发布模式",
@@ -224,23 +217,24 @@ const L = "/.dc/publish.json", N = "/package.json", T = ({ gitOriginName: t = "o
     type: "boolean",
     default: !0
   }
-}), u = O.cliConfig.moduleName, x = (t, o) => {
-  console.log(t ? p.red(t) : p.red(o.message)), process.exit(1);
-}, B = O.description, U = `Usage: $0 ${u} [options]`, D = "Usage: $0 [options]", S = (t, o) => {
-  const m = j();
-  return t.strict().usage(o).help("help").version(O.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: M
-}, V = async () => {
-  const t = w(J(process.argv)), o = await S(t, D);
-  return M(o);
-};
+}), u = {
+  describe: x,
+  version: j,
+  options: B(),
+  handler: T
+}, h = (t = !1) => {
+  const o = t ? M : void 0, m = `$0${t ? ` ${M}` : ""} [options]`;
+  return { command: o, usage: m };
+}, _ = async () => H({
+  ...u,
+  ...h()
+}), F = () => w({
+  ...u,
+  ...h(!0)
+});
 export {
   E as P,
-  Z as a,
-  V as c,
-  M as h
+  F as a,
+  _ as c,
+  T as h
 };

package/es/index.mjs

@@ -1,17 +1,13 @@
 #!/usr/bin/env node
-import { P as u, a as b, h as l } from "./index-3eb0cae4.js";
+import { P as n, a as s, h as d } from "./index-1c86019f.js";
 import "semver";
 import "node:path";
 import "node:child_process";
 import "pinyin";
 import "node:fs";
-import "chalk";
-import "prompts";
 import "@done-coding/cli-utils";
-import "yargs";
-import "yargs/helpers";
 export {
-  u as PublishModeEnum,
-  b as command,
-  l as handler
+  n as PublishModeEnum,
+  s as crateAsSubcommand,
+  d as handler
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-publish",
-  "version": "0.4.5-alpha.0",
+  "version": "0.5.0-alpha.0",
   "description": "项目发布命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -41,10 +41,9 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "^0.4.6-alpha.0",
+    "@done-coding/cli-inject": "^0.5.0-alpha.0",
     "@types/node": "^18.0.0",
     "@types/pinyin": "^2.10.0",
-    "@types/prompts": "^2.4.6",
     "@types/semver": "^7.5.3",
     "@types/yargs": "^17.0.28",
     "rimraf": "^6.0.1",
@@ -56,12 +55,9 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@done-coding/cli-utils": "^0.2.1-alpha.0",
-    "chalk": "^5.3.0",
+    "@done-coding/cli-utils": "^0.3.0-alpha.0",
     "pinyin": "^2.11.2",
-    "prompts": "^2.4.2",
-    "semver": "^7.5.4",
-    "yargs": "^17.7.2"
+    "semver": "^7.5.4"
   },
-  "gitHead": "21eb698f64179882cfec979bd8f19920b047dacb"
+  "gitHead": "c5a54bdf08759425701a2024442a923883065189"
 }

package/types/handler.d.ts

@@ -1,4 +1,4 @@
-import type { ArgumentsCamelCase } from "yargs";
 import { type Options } from './utils';
+import type { CliHandlerArgv } from "@done-coding/cli-utils";
 export type ChildCmd = "npm" | "web";
-export declare const handler: (argv: ArgumentsCamelCase<Options> | Options) => Promise<undefined>;
+export declare const handler: (argv: CliHandlerArgv<Options>) => Promise<undefined>;

package/types/index.d.ts

@@ -1,3 +1,3 @@
 export { handler } from "./handler";
-export { command } from "./main";
+export { crateAsSubcommand } from "./main";
 export * from './utils/types';

package/types/injectInfo.json.d.ts

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

package/types/main.d.ts

@@ -1,4 +1,9 @@
-import type { CommandModule } from "yargs";
-import { type Options } from './utils';
-export declare const command: CommandModule<Options, Options>;
-export declare const createCli: () => Promise<undefined>;
+/// <reference types="yargs" />
+/** 作为主命令创建 */
+export declare const createCommand: () => Promise<void | {
+    [x: string]: unknown;
+    _: (string | number)[];
+    $0: string;
+}>;
+/** 作为子命令创建 */
+export declare const crateAsSubcommand: () => import("yargs").CommandModule<{}, {}>;