@done-coding/cli-utils 0.3.5 → 0.5.0-alpha.0

package/es/index.mjs

@@ -1,51 +1,52 @@
 #!/usr/bin/env node
-import P from "chalk";
-import { default as ae } from "chalk";
-import f from "node:path";
-import b, { existsSync as h, mkdirSync as k, writeFileSync as g, readFileSync as m } from "node:fs";
-import l from "crypto";
-import H from "prompts";
-import E from "yargs";
-import { hideBin as R } from "yargs/helpers";
-import { execSync as y } from "node:child_process";
+import O from "chalk";
+import { default as pt } from "chalk";
+import g from "node:path";
+import b, { existsSync as y, mkdirSync as H, writeFileSync as C, readFileSync as d } from "node:fs";
+import m from "crypto";
+import D from "prompts";
+import N from "yargs";
+import { hideBin as A } from "yargs/helpers";
+import { execSync as a } from "node:child_process";
 import v from "json5";
 export * from "json5";
-import { default as le } from "json5";
-import { default as de } from "lodash.get";
-import { default as me } from "lodash.set";
-import { default as he } from "lodash.curry";
+import { default as yt } from "json5";
+import u from "pinyin";
+import { default as Ct } from "lodash.get";
+import { default as $t } from "lodash.set";
+import { default as wt } from "lodash.curry";
 const c = Object.assign(
-  (e, ...r) => console.log(...r.map((t) => P[e](t))),
+  (t, ...r) => console.log(...r.map((e) => O[t](e))),
   {
     /** 成功 */
-    success: (...e) => c("green", ...e),
+    success: (...t) => c("green", ...t),
     /** /步骤 */
-    stage: (...e) => c("blue", ...e),
+    stage: (...t) => c("blue", ...t),
     /** 提示信息 */
-    info: (...e) => c("cyan", ...e),
+    info: (...t) => c("cyan", ...t),
     /** 警告 */
-    warn: (...e) => c("yellow", ...e),
+    warn: (...t) => c("yellow", ...t),
     /** 错误 */
-    error: (...e) => c("red", ...e),
+    error: (...t) => c("red", ...t),
     /** 跳过 */
-    skip: (...e) => c("gray", ...e)
+    skip: (...t) => c("gray", ...t)
   }
-), Q = (e, {
+), tt = (t, {
   /** 当前目录 */
   currentDir: r = process.cwd(),
   /** 优先找最远的父目录 */
-  isFindFarthest: t = !0
+  isFindFarthest: e = !0
 } = {}) => {
-  const o = f.resolve(r).split(f.sep).map((n, i, a) => i ? f.join(a.slice(0, i).join(f.sep), n) : n);
-  for (; o.length; ) {
-    const n = t ? o.shift() : o.pop(), i = f.join(n, e);
+  const n = g.resolve(r).split(g.sep).map((o, i, l) => i ? g.join(l.slice(0, i).join(g.sep), o) : o);
+  for (; n.length; ) {
+    const o = e ? n.shift() : n.pop(), i = g.join(o, t);
     if (b.existsSync(i))
-      return n;
+      return o;
   }
-}, C = "aes-256-cbc", S = 16, p = "hex", d = ":";
-function $(e) {
-  return l.pbkdf2Sync(
-    e,
+}, $ = "aes-256-cbc", P = 16, p = "hex", h = ":";
+function w(t) {
+  return m.pbkdf2Sync(
+    t,
     "done-coding-cli-salt",
     // 使用固定的盐值
     1e4,
@@ -55,84 +56,84 @@ function $(e) {
     "sha256"
   );
 }
-function X({
-  text: e,
+function rt({
+  text: t,
   secretKey: r
 }) {
   try {
-    const t = $(r), o = l.randomBytes(S), n = l.createCipheriv(C, t, o);
-    let i = n.update(e);
-    i = Buffer.concat([i, n.final()]);
-    const a = o.toString(p), s = i.toString(p);
-    return `${a}${d}${s}`;
-  } catch (t) {
+    const e = w(r), n = m.randomBytes(P), o = m.createCipheriv($, e, n);
+    let i = o.update(t);
+    i = Buffer.concat([i, o.final()]);
+    const l = n.toString(p), s = i.toString(p);
+    return `${l}${h}${s}`;
+  } catch (e) {
     return c.error(
-      `加密失败: ${t instanceof Error ? t.message : String(t)}`
+      `加密失败: ${e instanceof Error ? e.message : String(e)}`
     ), "";
   }
 }
-function Z({
-  encryptedText: e,
+function et({
+  encryptedText: t,
   secretKey: r
 }) {
   try {
-    if (!e.includes(d))
+    if (!t.includes(h))
       return "";
-    const t = $(r), [o, n] = e.split(d);
-    if (o.length !== S * 2)
+    const e = w(r), [n, o] = t.split(h);
+    if (n.length !== P * 2)
       return "";
-    const i = Buffer.from(o, p), a = Buffer.from(n, p), s = l.createDecipheriv(C, t, i);
-    let u = s.update(a);
-    return u = Buffer.concat([u, s.final()]), u.toString();
-  } catch (t) {
+    const i = Buffer.from(n, p), l = Buffer.from(o, p), s = m.createDecipheriv($, e, i);
+    let f = s.update(l);
+    return f = Buffer.concat([f, s.final()]), f.toString();
+  } catch (e) {
     return c.error(
-      `解密失败: ${t instanceof Error ? t.message : String(t)}`
+      `解密失败: ${e instanceof Error ? e.message : String(e)}`
     ), "";
   }
 }
-const x = (...e) => {
-  const [r, t = {}] = e;
-  return H(r, {
-    onCancel(o) {
-      return c.error(`退出${o == null ? void 0 : o.name}输入`), process.exit(1);
+const E = (...t) => {
+  const [r, e = {}] = t;
+  return D(r, {
+    onCancel(n) {
+      return c.error(`退出${n == null ? void 0 : n.name}输入`), process.exit(1);
     },
-    ...t
+    ...e
   });
-}, F = (e, r) => {
-  e ? c.error(e) : c.error(r.message), r != null && r.stack && c.error(r.stack), process.exit(1);
+}, R = (t, r) => {
+  t ? c.error(t) : c.error(r.message), r != null && r.stack && c.error(r.stack), process.exit(1);
 }, T = () => {
-  const e = R(process.argv);
-  return E(e);
-}, j = (e, {
+  const t = A(process.argv);
+  return N(t);
+}, j = (t, {
   usage: r,
-  version: t,
-  demandCommandCount: o,
-  options: n,
+  version: e,
+  demandCommandCount: n,
+  options: o,
   positionals: i,
-  subcommands: a
+  subcommands: l
 }) => {
-  let s = e.strict();
-  r && (s = s.usage(`Usage: ${r}`)), o && (s = s.demandCommand(o));
-  const u = "help";
-  return s = s.help(u), t ? s = s.version(t).alias("h", u).alias("v", "version") : s = s.alias("h", u), n && (s = s.options(n)), i && (s = Object.entries(i).reduce((w, [D, O]) => w.positional(D, O), s)), a && (s = s.command(a)), s;
-}, ee = async ({ handler: e, ...r }) => {
-  const t = await j(T(), r).fail(F).argv;
-  return e ? e(t) : t;
-}, re = (e) => {
-  const { command: r, describe: t, handler: o = () => {
-  }, ...n } = e;
+  let s = t.strict();
+  r && (s = s.usage(`Usage: ${r}`)), n && (s = s.demandCommand(n));
+  const f = "help";
+  return s = s.help(f), e ? s = s.version(e).alias("h", f).alias("v", "version") : s = s.alias("h", f), o && (s = s.options(o)), i && (s = Object.entries(i).reduce((S, [k, x]) => S.positional(k, x), s)), l && (s = s.command(l)), s;
+}, ot = async ({ handler: t, ...r }) => {
+  const e = await j(T(), r).fail(R).argv;
+  return t ? t(e) : e;
+}, nt = (t) => {
+  const { command: r, describe: e, handler: n = () => {
+  }, ...o } = t;
   return {
     command: r,
-    describe: t,
+    describe: e,
     builder(i) {
-      return j(i, n);
+      return j(i, o);
     },
-    handler: o
+    handler: n
   };
 };
-var _ = /* @__PURE__ */ ((e) => (e.VSCODE = "VsCode", e.CURSOR = "Cursor", e.OTHER = "其他", e))(_ || {});
-const A = async () => {
-  const { editorType: e } = await x([
+var _ = /* @__PURE__ */ ((t) => (t.VSCODE = "VsCode", t.CURSOR = "Cursor", t.OTHER = "其他", t))(_ || {});
+const L = async () => {
+  const { editorType: t } = await E([
     {
       name: "editorType",
       type: "select",
@@ -148,105 +149,163 @@ const A = async () => {
       }))
     }
   ]);
-  return e;
-}, B = {
+  return t;
+}, F = {
   Cursor: "cursor",
   VsCode: "code"
-}, N = (e, r, t) => {
+}, M = (t, r, e) => {
   try {
-    y(`${e} -v`, { stdio: "ignore" }), y(`${e} ${r}`);
+    a(`${t} -v`, { stdio: "ignore" }), a(`${t} ${r}`);
   } catch {
-    t();
+    e();
   }
-}, V = (e, r) => {
-  const t = (o) => c.info(`
-      ${o}, 请用编辑器打开 ${e} 进行编辑
+}, B = (t, r) => {
+  const e = (n) => c.info(`
+      ${n}, 请用编辑器打开 ${t} 进行编辑
 `);
   switch (r) {
     case "Cursor":
     case "VsCode": {
-      const o = B[r];
-      N(o, e, () => {
-        t(`${o}命令未安装`);
+      const n = F[r];
+      M(n, t, () => {
+        e(`${n}命令未安装`);
       });
       break;
     }
     default:
-      t("其他编辑器");
+      e("其他编辑器");
   }
-}, L = (e = process.cwd()) => ({
+}, J = (t = process.cwd()) => ({
   /** 必须保留 */
   rootDir: {
     type: "string",
     alias: "R",
     describe: "运行目录",
     /** 必须设置默认值 */
-    default: e
+    default: t
   }
-}), te = ({
-  configPathDefault: e,
+}), it = ({
+  configPathDefault: t,
   rootDirDefault: r
 }) => ({
   /** 必须保留 */
-  ...L(r),
+  ...J(r),
   /** 必须保留 */
   configPath: {
     type: "string",
     alias: "C",
     describe: "配置文件相对路径",
     /** 必须设置默认值 */
-    default: e
+    default: t
   }
-}), I = async (e, r) => {
-  const { configPath: t, rootDir: o } = r, n = f.resolve(o, t), i = f.dirname(n);
-  return h(i) || k(i, {
+}), V = async (t, r) => {
+  const { configPath: e, rootDir: n } = r, o = g.resolve(n, e), i = g.dirname(o);
+  return y(i) || H(i, {
     recursive: !0
-  }), n.endsWith(".json5") ? (c.info(`json5模式写入 ${n}`), g(n, v.stringify(e, null, 2)), n) : (c.info(`json模式写入 ${n}`), g(n, JSON.stringify(e, null, 2)), n);
-}, oe = async (e, r, {
-  onFileGenerated: t,
-  edit: o = !1
+  }), o.endsWith(".json5") ? (c.info(`json5模式写入 ${o}`), C(o, v.stringify(t, null, 2)), o) : (c.info(`json模式写入 ${o}`), C(o, JSON.stringify(t, null, 2)), o);
+}, st = async (t, r, {
+  onFileGenerated: e,
+  edit: n = !1
 } = {}) => {
-  const n = await I(e, r);
-  if (t == null || t(n), o) {
-    const i = await A();
-    V(r.configPath, i);
+  const o = await V(t, r);
+  if (e == null || e(o), n) {
+    const i = await L();
+    B(r.configPath, i);
   }
-}, ne = async (e) => {
-  const { configPath: r, rootDir: t } = e, o = f.resolve(t, r);
-  if (!h(o)) {
-    c.warn(`配置文件不存在 ${o}`);
-    return;
+}, ct = async (t, r) => {
+  const { configPath: e, rootDir: n } = t, o = g.resolve(n, e);
+  if (!y(o)) {
+    if (r)
+      return c.info("配置文件不存在，使用onNotExists返回值"), r();
+    const i = `配置文件不存在 ${o}`;
+    throw new Error(i);
   }
-  return o.endsWith(".json5") ? (c.info(`json5模式解析 ${o}`), v.parse(m(o, "utf8"))) : (c.info(`json模式解析 ${o}`), JSON.parse(m(o, "utf8")));
-}, se = async () => {
-  const { useDefaultConfig: e } = await x({
+  return o.endsWith(".json5") ? (c.info(`json5模式解析 ${o}`), v.parse(d(o, "utf8"))) : (c.info(`json模式解析 ${o}`), JSON.parse(d(o, "utf8")));
+}, at = async () => {
+  const { useDefaultConfig: t } = await E({
     name: "useDefaultConfig",
     type: "confirm",
     message: "使用默认模板配置",
     initial: !0
   });
-  return e;
+  return t;
+}, Y = "./package.json", ft = ({
+  rootDir: t
+}) => {
+  const r = g.resolve(t, Y);
+  if (!y(r))
+    throw new Error(`${t}未找到package.json文件`);
+  const e = d(r, "utf-8");
+  return JSON.parse(e);
+}, lt = ({
+  remoteAlias: t
+} = {}) => {
+  try {
+    const r = a("git rev-parse HEAD").toString().trim(), e = a('git log -1 --pretty=format:"%an"').toString().trim(), n = a('git log -1 --pretty=format:"%ae"').toString().trim(), o = a('git log -1 --pretty=format:"%s"').toString().trim(), i = a("git config user.name").toString().trim(), l = a("git config user.email").toString().trim(), s = a("git rev-parse --abbrev-ref HEAD").toString().trim();
+    let f = "";
+    try {
+      f = a(`git config --get remote.${t}.url`).toString().trim();
+    } catch {
+      c.warn("git远程仓库地址获取失败或者不存在");
+    }
+    return {
+      lastHash: r,
+      lastCommitter: e,
+      lastCommitterPinYin: u(e, {
+        style: u.STYLE_NORMAL,
+        heteronym: !1
+      }).join(""),
+      lastCommitEmail: n,
+      lastCommitMsg: o,
+      userName: i,
+      userNamePinYin: u(i, {
+        style: u.STYLE_NORMAL,
+        heteronym: !1
+      }).join(""),
+      userEmail: l,
+      branchName: s,
+      remoteInfo: f ? {
+        alias: t,
+        url: f
+      } : void 0
+    };
+  } catch (r) {
+    throw c.error("获取git最后提交信息失败"), r;
+  }
+}, gt = ({
+  branchName: t,
+  version: r,
+  remoteInfo: e
+}) => {
+  e && (a(`git push ${e.alias} v${r}`, {
+    stdio: "inherit"
+  }), a(`git push ${e.alias} ${t}`, {
+    stdio: "inherit"
+  }));
 };
 export {
   _ as EditorTypeEnum,
-  he as _curry,
-  de as _get,
-  me as _set,
-  ae as chalk,
-  ee as createMainCommand,
-  re as createSubcommand,
-  Z as decryptAES,
-  X as encryptAES,
-  te as getConfigFileCommonOptions,
-  A as getEditorType,
-  L as getRootDirOptions,
-  se as getUseDefaultConfig,
-  I as initConfigFile,
-  oe as initHandlerCommon,
-  le as json5,
+  wt as _curry,
+  Ct as _get,
+  $t as _set,
+  pt as chalk,
+  ot as createMainCommand,
+  nt as createSubcommand,
+  et as decryptAES,
+  rt as encryptAES,
+  it as getConfigFileCommonOptions,
+  L as getEditorType,
+  lt as getGitLastCommitInfo,
+  ft as getPackageJson,
+  J as getRootDirOptions,
+  at as getUseDefaultConfig,
+  V as initConfigFile,
+  st as initHandlerCommon,
+  yt as json5,
   c as log,
-  Q as lookForParentTarget,
-  V as openFileInEditor,
-  ne as readConfigFile,
-  x as xPrompts
+  tt as lookForParentTarget,
+  B as openFileInEditor,
+  gt as pushGitPublishInfoToRemote,
+  ct as readConfigFile,
+  E as xPrompts
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-utils",
-  "version": "0.3.5",
+  "version": "0.5.0-alpha.0",
   "description": "cli utils",
   "private": false,
   "module": "es/index.mjs",
@@ -42,6 +42,7 @@
     "@types/lodash.get": "^4.4.9",
     "@types/lodash.set": "^4.3.9",
     "@types/node": "^18.0.0",
+    "@types/pinyin": "^2.10.0",
     "@types/prompts": "^2.4.6",
     "@types/yargs": "^17.0.28",
     "rimraf": "^6.0.1",
@@ -58,8 +59,9 @@
     "lodash.curry": "^4.1.1",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
+    "pinyin": "^2.11.2",
     "prompts": "^2.4.2",
     "yargs": "^17.7.2"
   },
-  "gitHead": "eccf973ebc52fc3b06d26391d371e8d2d1629a61"
+  "gitHead": "86cdd3eaf8cc8be3e48a812b93fd7c2110fcc879"
 }

package/types/config-file.d.ts

@@ -32,6 +32,6 @@ export declare const initHandlerCommon: <T>(content: T, argv: CliHandlerArgv<Ini
     edit?: boolean | undefined;
 }) => Promise<void>;
 /** 读取配置文件 */
-export declare const readConfigFile: <T>(argv: CliHandlerArgv<ReadConfigFileOptions>) => Promise<T | undefined>;
+export declare const readConfigFile: <T>(options: ReadConfigFileOptions, onNotExists?: (() => T) | undefined) => Promise<T>;
 /** 获取是否使用默认配置 */
 export declare const getUseDefaultConfig: () => Promise<any>;

package/types/git.d.ts

@@ -0,0 +1,71 @@
+/** 获取git最好提交信息参数 */
+export interface GetGitLastCommitParams {
+    /**
+     * 远程仓库别名
+     */
+    remoteAlias?: string;
+}
+/** 远程仓库信息 */
+export interface GitRemoteInfo {
+    /**
+     * 远程仓库别名
+     */
+    alias?: GetGitLastCommitParams["remoteAlias"];
+    /**
+     * 仓库地址
+     */
+    url?: string;
+}
+/**
+ * git最后提交信息
+ */
+export interface GitLastCommitInfo {
+    /**
+     * 最后一次提交hash值
+     */
+    lastHash: string;
+    /**
+     * 最后一次提交者
+     */
+    lastCommitter: string;
+    /**
+     * 最后一次提交者拼音
+     */
+    lastCommitterPinYin: string;
+    /**
+     * 最后一次提交者邮箱
+     */
+    lastCommitEmail: string;
+    /**
+     * 最后一次提交信息
+     */
+    lastCommitMsg: string;
+    /**
+     * 用户名
+     */
+    userName: string;
+    /**
+     * 用户名拼音
+     */
+    userNamePinYin: string;
+    /**
+     * 邮箱
+     */
+    userEmail: string;
+    /**
+     * 分知名
+     */
+    branchName: string;
+    /** 远程仓库信息 */
+    remoteInfo?: GitRemoteInfo;
+}
+/**
+ * 获取git 最后提交信息
+ */
+export declare const getGitLastCommitInfo: ({ remoteAlias, }?: GetGitLastCommitParams) => GitLastCommitInfo;
+/** 推送git发布信息到远程仓库 */
+export declare const pushGitPublishInfoToRemote: ({ branchName, version, remoteInfo, }: {
+    branchName: string;
+    version: string;
+    remoteInfo?: GitRemoteInfo | undefined;
+}) => void;

package/types/index.d.ts

@@ -7,3 +7,5 @@ export * from "./editor";
 export * from "./config-file";
 export * from "./json5";
 export * from "./lodash";
+export * from "./package-json";
+export * from "./git";

package/types/package-json.d.ts

@@ -0,0 +1,7 @@
+export interface PackageJson {
+    name: string;
+    version?: string;
+}
+export declare const getPackageJson: <R extends PackageJson>({ rootDir, }: {
+    rootDir: string;
+}) => R;