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

package/es/cli.mjs

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

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

@@ -1,24 +1,22 @@
 #!/usr/bin/env node
-import { inc as A, prerelease as C } from "semver";
-import { join as d } from "node:path";
-import { execSync as i } from "node:child_process";
+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 O, existsSync as I } from "node:fs";
-import { xPrompts as H, log as p } from "@done-coding/cli-utils";
-import w from "yargs";
-import { hideBin as y } 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 || {}), v = /* @__PURE__ */ ((t) => (t.LATEST = "latest", t.NEXT = "next", t.ALPHA = "alpha", t))(v || {});
-const J = "/.dc/publish.json", N = "/package.json", L = ({ gitOriginName: t = "origin" }) => {
+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 y = "/.dc/publish.json", N = "/package.json", J = ({ gitOriginName: t = "origin" }) => {
   try {
-    const r = i("git rev-parse HEAD").toString().trim(), m = i('git log -1 --pretty=format:"%an"').toString().trim(), c = i('git log -1 --pretty=format:"%ae"').toString().trim(), s = i('git log -1 --pretty=format:"%s"').toString().trim(), n = i("git config user.name").toString().trim(), l = i("git config user.email").toString().trim(), g = i("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 = i(`git config --get remote.${t}.url`).toString().trim();
+      f = n(`git config --get remote.${t}.url`).toString().trim();
     } catch {
       throw new Error(`git remote ${t} 不存在`);
     }
     return {
-      lastHash: r,
+      lastHash: o,
       lastCommitter: m,
       lastCommitterPinYin: P(m, {
         style: P.STYLE_NORMAL,
@@ -26,8 +24,8 @@ const J = "/.dc/publish.json", N = "/package.json", L = ({ gitOriginName: t = "o
       }).join(""),
       lastCommitEmail: c,
       lastCommitMsg: s,
-      userName: n,
-      userNamePinYin: P(n, {
+      userName: i,
+      userNamePinYin: P(i, {
         style: P.STYLE_NORMAL,
         heteronym: !1
       }).join(""),
@@ -35,31 +33,31 @@ const J = "/.dc/publish.json", N = "/package.json", L = ({ gitOriginName: t = "o
       branchName: g,
       remoteUrl: f
     };
-  } catch (r) {
-    throw console.error("Error fetching git information:", r), r;
+  } catch (o) {
+    throw console.error("Error fetching git information:", o), o;
   }
-}, R = (t, r = JSON.parse(O(d(process.cwd(), N), "utf-8"))) => {
-  let m = r.name, c = "", s;
-  const { version: n } = r;
+}, 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(n, t), s = v.LATEST;
+    c = A(i, t), s = d.LATEST;
   else if ([
     e.PREMAJOR,
     e.PREMINOR,
     e.PREPATCH
   ].includes(t)) {
-    const l = C(n);
+    const l = $(i);
     l ? (p.warn("当前版本已经是预发布版本，将会在当前版本基础上进行发布"), l.length === 1 && typeof l[0] == "number" ? c = A(
-      n,
+      i,
       e.PRERELEASE
-    ) : c = n.split("-")[0] + "-0") : c = A(n, t), s = v.NEXT;
+    ) : c = i.split("-")[0] + "-0") : c = A(i, t), s = d.NEXT;
   } else
-    s = v.ALPHA, c = A(
-      n,
+    s = d.ALPHA, c = A(
+      i,
       e.PRERELEASE,
       s
     );
@@ -70,11 +68,11 @@ const J = "/.dc/publish.json", N = "/package.json", L = ({ gitOriginName: t = "o
     version: c,
     tag: s
   };
-}, T = () => {
+}, L = () => {
   let t;
-  const r = d(process.cwd(), J);
-  if (I(r)) {
-    const m = O(r, "utf-8");
+  const o = O(process.cwd(), y);
+  if (C(o)) {
+    const m = v(o, "utf-8");
     t = JSON.parse(m);
   } else
     p.warn(`未找到配置文件，将使用默认配置
@@ -84,44 +82,44 @@ const J = "/.dc/publish.json", N = "/package.json", L = ({ gitOriginName: t = "o
     gitOriginName: "origin",
     ...t || {}
   };
-}, M = async (t) => {
+}, T = async (t) => {
   console.log(t);
-  const { mode: r, type: m, push: c } = t, s = T(), n = L(s);
-  console.log("gitInfo:", n);
+  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 o = JSON.parse(O(d(process.cwd(), N), "utf-8")), a = {
+    const r = JSON.parse(v(O(process.cwd(), N), "utf-8")), a = {
       [e.MAJOR]: R(
         e.MAJOR,
-        o
+        r
       ),
       [e.MINOR]: R(
         e.MINOR,
-        o
+        r
       ),
       [e.PATCH]: R(
         e.PATCH,
-        o
+        r
       ),
       [e.PREMAJOR]: R(
         e.PREMAJOR,
-        o
+        r
       ),
       [e.PREMINOR]: R(
         e.PREMINOR,
-        o
+        r
       ),
       [e.PREPATCH]: R(
         e.PREPATCH,
-        o
+        r
       ),
       [e.PRERELEASE]: R(
         e.PRERELEASE,
-        o
+        r
       )
-    }, $ = [
+    }, S = [
       {
         title: `主版本(${a[e.MAJOR].version})`,
         value: e.MAJOR
@@ -151,45 +149,49 @@ const J = "/.dc/publish.json", N = "/package.json", L = ({ gitOriginName: t = "o
         value: e.PRERELEASE
       }
     ];
-    l = (await H({
+    l = (await I({
       type: "select",
       name: "type",
-      message: `请选择发布类型，当前版本：${o.version}`,
-      choices: $
+      message: `请选择发布类型，当前版本：${r.version}`,
+      choices: S
     })).type, g = a[l];
   }
   const { version: f } = g;
-  console.log("npmInfo:", g), i(`npm version ${f} 1>&2`);
+  console.log("npmInfo:", g), n(`npm version ${f} 1>&2`);
   try {
-    if (r === E.NPM) {
-      const { tag: o } = g;
-      i(`npm publish --tag ${o} 1>&2`);
-    } else if (r === E.WEB) {
-      const { webBuild: o } = s;
-      o ? i(`${o} 1>&2`) : p.warn("webBuild为空，不执行web构建");
+    if (o === E.NPM) {
+      const { tag: r } = g;
+      n(`npm publish --tag ${r} 1>&2`);
+    } else if (o === E.WEB) {
+      const { webBuild: r } = s;
+      r ? n(`${r} 1>&2`) : p.warn("webBuild为空，不执行web构建");
     } else
       throw new Error("未知命令");
-  } catch (o) {
-    p.error(`发布失败, error: ${o.message}`);
+  } catch (r) {
+    p.error(`发布失败, error: ${r.message}`);
     try {
-      p.info(`回滚本地版本到发布前的版本：${n.lastHash}`);
-      const { lastHash: a } = n;
-      i(`git reset --hard ${a} 1>&2`), p.info(`删除本次发布时生成的tag：v${g.version}`), i(`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) {
       p.error(`回滚失败, error: ${a.message}`);
     }
     return process.exit(1);
   }
-  c && (i(`git push ${s.gitOriginName} v${g.version} 1>&2`), i(`git push ${s.gitOriginName} ${n.branchName} 1>&2`)), p.success(`发布成功，版本号：${f}`);
-}, h = {
-  version: "0.4.6-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"
   }
-}, b = () => ({
+}, {
+  version: j,
+  description: x,
+  cliConfig: { moduleName: M }
+} = b, B = () => ({
   mode: {
     alias: "m",
     describe: "发布模式",
@@ -215,23 +217,24 @@ const J = "/.dc/publish.json", N = "/package.json", L = ({ gitOriginName: t = "o
     type: "boolean",
     default: !0
   }
-}), u = h.cliConfig.moduleName, j = (t, r) => {
-  t ? p.error(t) : p.error(r.message), process.exit(1);
-}, x = h.description, B = `Usage: $0 ${u} [options]`, U = "Usage: $0 [options]", S = (t, r) => {
-  const m = b();
-  return t.strict().usage(r).help("help").version(h.version).alias("v", "version").alias("h", "help").options(m).fail(j).argv;
-}, D = (t) => S(t, B), z = {
-  command: u,
+}), u = {
   describe: x,
-  builder: D,
-  handler: M
-}, K = async () => {
-  const t = w(y(process.argv)), r = await S(t, U);
-  return M(r);
-};
+  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,
-  K as c,
-  M as h
+  F as a,
+  _ as c,
+  T as h
 };

package/es/index.mjs

@@ -1,15 +1,13 @@
 #!/usr/bin/env node
-import { P as d, a as h, h as u } from "./index-f4b0258f.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 "@done-coding/cli-utils";
-import "yargs";
-import "yargs/helpers";
 export {
-  d as PublishModeEnum,
-  h as command,
-  u 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.6-alpha.0",
+  "version": "0.5.0-alpha.0",
   "description": "项目发布命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -41,7 +41,7 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "^0.4.7-alpha.0",
+    "@done-coding/cli-inject": "^0.5.0-alpha.0",
     "@types/node": "^18.0.0",
     "@types/pinyin": "^2.10.0",
     "@types/semver": "^7.5.3",
@@ -55,10 +55,9 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@done-coding/cli-utils": "^0.2.2-alpha.0",
+    "@done-coding/cli-utils": "^0.3.0-alpha.0",
     "pinyin": "^2.11.2",
-    "semver": "^7.5.4",
-    "yargs": "^17.7.2"
+    "semver": "^7.5.4"
   },
-  "gitHead": "2e59e86ee192e023138e7475f4abbb5e7c42b29e"
+  "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.6-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<{}, {}>;