mine-auto-cli 2.4.1-beta.1 → 2.4.2

package/README.md

@@ -193,6 +193,7 @@ auto comment
 - `commander`: 命令
 - `log-symbols`: 图标
 - `ora`: 动画效果
+- `semver-utils`: 解析包版本
 - `pacote`: 包信息请求器
 - `strip-json-comments`: 移除 json 注释
 - `update-notifier`: 检查更新
@@ -201,6 +202,7 @@ auto comment
 
 - `@types/node`: `node` 类型
 - `@types/pacote`: `pacote` 类型
+- `@types/semver-utils`: `semver-utils` 类型
 - `@types/update-notifier`: `update-notifier` 类型
 - `prettier`: 格式化工具
 - `typescript`: 编程语言

package/dist/index.js

@@ -1,43 +1,44 @@
 import { program as g } from "commander";
 import a from "chalk";
 import { readFileSync as h, writeFileSync as v, existsSync as b, readdirSync as ee } from "fs";
-import { join as w, resolve as j } from "path";
-import R from "log-symbols";
+import { join as k, resolve as j } from "path";
+import q from "log-symbols";
 import te from "ora";
 import { execSync as ne } from "child_process";
 import oe from "js-yaml";
 import se from "strip-json-comments";
 import re from "pacote";
+import { parseRange as ie } from "semver-utils";
 import ce from "update-notifier";
-const G = "mine-auto-cli", _ = "2.4.1-beta.1", ie = "./dist/index.js", ae = "./dist/index.js", le = "module", pe = {
+const G = "mine-auto-cli", _ = "2.4.2", ae = "./dist/index.js", le = "./dist/index.js", pe = "module", me = {
   auto: "bin/mine-auto-cli.js"
-}, me = {
+}, ge = {
   name: "biaov",
   email: "biaov@qq.com",
   url: "https://biaov.cn"
-}, ge = "一个将多个命令简化成一个命令的工具 😆", ue = {
+}, ue = "一个将多个命令简化成一个命令的工具 😆", de = {
   start: "npm run dev",
   dev: "npm run build -- --watch",
   build: "vite build",
   prettier: "prettier --write '**/*.{js,ts,md,json}'",
   tag: "node scripts/tag"
-}, de = {
+}, fe = {
   registry: "https://registry.npmjs.org/",
   "engine-strict": !0,
   provenance: !0
-}, fe = {
+}, he = {
   node: ">=20.12"
-}, he = [
+}, ye = [
   "auto",
   "cli",
   "vite",
   "typescript"
-], ye = {
+], $e = {
   type: "git",
   url: "git+https://github.com/biaov/mine-auto-cli.git"
-}, $e = "https://github.com/biaov/mine-auto-cli.git", ve = {
+}, ve = "https://github.com/biaov/mine-auto-cli.git", be = {
   url: "https://github.com/biaov/mine-auto-cli/issues"
-}, be = "ISC", je = [
+}, je = "ISC", we = [
   {
     name: "biaov",
     email: "biaov@qq.com"
@@ -49,12 +50,14 @@ const G = "mine-auto-cli", _ = "2.4.1-beta.1", ie = "./dist/index.js", ae = "./d
   "log-symbols": "^6.0.0",
   ora: "^8.0.1",
   pacote: "^18.0.6",
+  "semver-utils": "^1.1.4",
   "strip-json-comments": "^5.0.1",
   "update-notifier": "^7.0.0"
-}, we = {
+}, Se = {
   "@types/js-yaml": "^4.0.9",
   "@types/node": "^20.12.12",
   "@types/pacote": "^11.1.8",
+  "@types/semver-utils": "^1.1.3",
   "@types/update-notifier": "^6.0.8",
   prettier: "^3.2.5",
   typescript: "^5.4.5",
@@ -63,27 +66,27 @@ const G = "mine-auto-cli", _ = "2.4.1-beta.1", ie = "./dist/index.js", ae = "./d
   name: G,
   private: !1,
   version: _,
-  exports: ie,
-  main: ae,
-  type: le,
-  bin: pe,
-  author: me,
-  description: ge,
-  scripts: ue,
-  publishConfig: de,
-  engines: fe,
-  keywords: he,
-  repository: ye,
-  homepage: $e,
-  bugs: ve,
-  license: be,
-  contributors: je,
+  exports: ae,
+  main: le,
+  type: pe,
+  bin: me,
+  author: ge,
+  description: ue,
+  scripts: de,
+  publishConfig: fe,
+  engines: he,
+  keywords: ye,
+  repository: $e,
+  homepage: ve,
+  bugs: be,
+  license: je,
+  contributors: we,
   dependencies: ke,
-  devDependencies: we
+  devDependencies: Se
 }, d = (e) => {
-  console.log(`${R.success} ${a.green("SUCCESS")} ${e}`);
+  console.log(`${q.success} ${a.green("SUCCESS")} ${e}`);
 }, J = (e) => {
-  console.log(`${G} ${R.error} ${a.red("ERROR")} ${e}`);
+  console.log(`${G} ${q.error} ${a.red("ERROR")} ${e}`);
 }, l = (e) => {
   console.log(e ?? "");
 }, B = (e) => {
@@ -92,49 +95,49 @@ const G = "mine-auto-cli", _ = "2.4.1-beta.1", ie = "./dist/index.js", ae = "./d
   t.start();
   const o = ne(e, { cwd: process.cwd() });
   l(o.toString()), t.succeed(`${a.green(e)} 命令执行成功`), l();
-}, Se = (e) => ["git add -A", `git commit -m ${e}`, "git push"], Ce = (e, t) => [`npm run ${e}`, "git add -A", `git commit -m ${t}`, "git push"], xe = async (e, t = "打包") => {
-  l(), l(`${a.yellow(">>")} 开始依次执行命令...`), l(), Ce(e, t).map(B), d("全部命令执行完成"), l();
+}, Ce = (e) => ["git add -A", `git commit -m ${e}`, "git push"], xe = (e, t) => [`npm run ${e}`, "git add -A", `git commit -m ${t}`, "git push"], Oe = async (e, t = "打包") => {
+  l(), l(`${a.yellow(">>")} 开始依次执行命令...`), l(), xe(e, t).map(B), d("全部命令执行完成"), l();
 }, V = (e) => {
   l(), J(`\`${e}\` 命令错误，请检查你的命令`), l(), g.help();
 }, L = (e) => {
   const t = ["package.json", "README.md"].map((r) => {
-    const c = w(process.cwd(), r), i = h(c).toString();
-    return { path: c, content: i };
+    const i = k(process.cwd(), r), c = h(i).toString();
+    return { path: i, content: c };
   }), [o, n] = t, s = JSON.parse(o.content);
   if (e)
     s.version = e;
   else {
-    const r = s.version.split(".").reduce((c, i, p, m) => c + (p === m.length - 1 ? +i + 1 : `${i}.`), "");
+    const r = s.version.split(".").reduce((i, c, p, m) => i + (p === m.length - 1 ? +c + 1 : `${c}.`), "");
     s.version = r;
   }
   v(o.path, JSON.stringify(s, null, 2)), n.content = n.content.replace(/version\-v.+\-blue/, () => `version-v${s.version}-blue`), v(n.path, n.content);
-}, Oe = async (e) => {
+}, Je = async (e) => {
   const t = e.split("version")[1];
   if (!t)
     return V(e);
-  const o = JSON.parse(h(w(process.cwd(), "package.json")).toString());
+  const o = JSON.parse(h(k(process.cwd(), "package.json")).toString());
   if (t === "++") {
-    const s = o.version.split(".").reduce((r, c, i, p) => r + (i === p.length - 1 ? +c + 1 : `${c}.`), "");
+    const s = o.version.split(".").reduce((r, i, c, p) => r + (c === p.length - 1 ? +i + 1 : `${i}.`), "");
     L(s), l(), d("命令执行完成");
     return;
   }
   const n = t.split("@")[1];
   n ? (L(n), l(), d("命令执行完成")) : V(e);
-}, Je = (e, t) => {
+}, Ne = (e, t) => {
   if (e.includes("build"))
-    return xe(e, t);
+    return Oe(e, t);
   if (e.includes("version"))
-    return Oe(e);
+    return Je(e);
   J(a.hex("#f56c6c")(`\`auto ${e}${t ? ` ${t}` : ""}\` 命令不存在`)), g.help();
-}, $ = "https://gitee.com/biaovorg/project-template.git", Ne = {
+}, $ = "https://gitee.com/biaovorg/project-template.git", Ee = {
   vue: $,
   react: $,
   "uni-app": $,
   electron: $,
   node: $,
   "node-simple": $
-}, Ee = Object.keys(Ne);
-Ee.reduce((e, t, o) => e + (o ? ", " : "") + t, "");
+}, Pe = Object.keys(Ee);
+Pe.reduce((e, t, o) => e + (o ? ", " : "") + t, "");
 const f = (e = "jsonc") => `auto-cli.${e}`;
 j(import.meta.dirname, "./presetData.json");
 const Y = (e, t = !1) => {
@@ -142,7 +145,7 @@ const Y = (e, t = !1) => {
     return t ? {} : "";
   const o = h(e).toString();
   return t ? JSON.parse(se(o)) : o;
-}, Pe = (e) => {
+}, De = (e) => {
   if (!b(e))
     return {};
   const t = h(e).toString();
@@ -154,74 +157,74 @@ const Y = (e, t = !1) => {
 }, z = (e = !1) => Y(j(import.meta.dirname, f()), e), H = () => {
   const [e, t] = [f(), f("yml")].map((n) => j(process.cwd(), n)), o = z(!0);
   try {
-    Object.assign(o, Pe(t), Y(e, !0));
+    Object.assign(o, De(t), Y(e, !0));
   } catch {
   }
   return o;
-}, De = (e, t = !1) => {
+}, Me = (e, t = !1) => {
   let o = z(t);
   return t && (o = JSON.stringify(o, null, 2)), e.includes(".yml") ? o.trim().split(`
 `).slice(1, -1).reduce((n, s) => n + s.trim().replace(/[",]/g, "").replace("// ", "# ") + `
 `, "") : o;
-}, Me = ({ yml: e, uncomment: t, force: o }) => {
+}, Ve = ({ yml: e, uncomment: t, force: o }) => {
   l();
   const n = f(e ? "yml" : "jsonc"), s = j(process.cwd(), n);
   if (b(s) && !o) {
     l(a.yellow(`${n} 文件已存在`)), l(), l(a.yellow(`文件目录  ${s}`));
     return;
   }
-  v(s, De(n, t)), d(`${n} 文件创建成功`), l(), l(a.green(`文件目录  ${s}`));
+  v(s, Me(n, t)), d(`${n} 文件创建成功`), l(), l(a.green(`文件目录  ${s}`));
 };
-g.command("init").option("-f, --force", `强制替换 ${f()} 文件内容`, !1).option("-unc, --uncomment", `取消生成 ${f()} 带注释`, !1).option("-y, --yml", `生成 ${f("yml")} 文件`, !1).description("初始化配置文件").action(Me);
-const Ve = async (e = "更新代码") => {
-  l(), l(`${a.yellow(">>")} 开始依次执行命令...`), l(), Se(e).forEach(B), d("全部命令执行完成"), l();
+g.command("init").option("-f, --force", `强制替换 ${f()} 文件内容`, !1).option("-unc, --uncomment", `取消生成 ${f()} 带注释`, !1).option("-y, --yml", `生成 ${f("yml")} 文件`, !1).description("初始化配置文件").action(Ve);
+const Le = async (e = "更新代码") => {
+  l(), l(`${a.yellow(">>")} 开始依次执行命令...`), l(), Ce(e).forEach(B), d("全部命令执行完成"), l();
 };
-g.command("git [描述]").description("简化 Git 提交命令").action(Ve);
+g.command("git [描述]").description("简化 Git 提交命令").action(Le);
 const A = ["dist", "node_modules", ".git", "miniprogram_npm"];
 let N = 0, K = !1, P = !1, Q = 20;
 const I = ({ prev: e, i: t, index: o, arr: n, curText: s }) => {
-  const r = Array.from({ length: t }).reduce((m) => m + `${t === 1 && o === n.length - 1 ? "└ " : "│ "}   `, ""), c = e + r, i = (r + s).length, p = Array.from({ length: Q + N - i }).reduce((m) => `${m}-`, " ");
-  return !K && (N = Math.max(N, i)), `${c}${s}${P ? p : ""}
+  const r = Array.from({ length: t }).reduce((m) => m + `${t === 1 && o === n.length - 1 ? "└ " : "│ "}   `, ""), i = e + r, c = (r + s).length, p = Array.from({ length: Q + N - c }).reduce((m) => `${m}-`, " ");
+  return !K && (N = Math.max(N, c)), `${i}${s}${P ? p : ""}
 `;
 }, D = (e, t = 0) => e.reduce((o, n, s, r) => {
-  let c;
-  return n.children ? (c = `├── ${n.name}`, I({ prev: o, i: t, index: s, arr: r, curText: c }) + D(n.children, t + 1)) : (c = `${s === r.length - 1 ? "└── " : "├── "}${n.name}`, I({ prev: o, i: t, index: s, arr: r, curText: c }));
-}, ""), F = (e) => ee(e, { withFileTypes: !0 }).sort((t, o) => +o.isDirectory() - +t.isDirectory()), Le = ({ line: e, name: t }) => {
+  let i;
+  return n.children ? (i = `├── ${n.name}`, I({ prev: o, i: t, index: s, arr: r, curText: i }) + D(n.children, t + 1)) : (i = `${s === r.length - 1 ? "└── " : "├── "}${n.name}`, I({ prev: o, i: t, index: s, arr: r, curText: i }));
+}, ""), F = (e) => ee(e, { withFileTypes: !0 }).sort((t, o) => +o.isDirectory() - +t.isDirectory()), Ae = ({ line: e, name: t }) => {
   P = !!e, typeof e == "string" && (Q = +e);
-  const o = process.cwd(), n = w(o, ".gitignore");
+  const o = process.cwd(), n = k(o, ".gitignore");
   if (b(n)) {
     const p = h(n).toString().split(`\r
 `);
     A.push(...p);
   }
-  const s = o.split("\\").at(-1), c = F(o).map((p) => {
+  const s = o.split("\\").at(-1), i = F(o).map((p) => {
     const { name: m } = p, u = { name: m };
-    return !A.includes(m) && p.isDirectory() && (u.children = F(w(p.path, m)).map(({ name: k }) => ({ name: k }))), u;
-  }), i = [{ name: s, children: c }];
-  P && (D(i), K = !0), v(w(o, `${typeof t == "string" && t || "directory"}.md`), D(i));
+    return !A.includes(m) && p.isDirectory() && (u.children = F(k(p.path, m)).map(({ name: w }) => ({ name: w }))), u;
+  }), c = [{ name: s, children: i }];
+  P && (D(c), K = !0), v(k(o, `${typeof t == "string" && t || "directory"}.md`), D(c));
 };
-g.command("mkdir").option("-l, --line [数量]", "数量", !1).option("-n, --name [文件名称]", "文件名称", !1).option("-d, --depth [深度值]", "深度值", "3").description("生成目录结构文件").action(Le);
-const S = H(), [E] = ["package.json"].map((e) => j(process.cwd(), e)), Ae = (e, t) => {
-  const o = Array.from({ length: t }, (c, i) => i < e ? "=" : " ").join(""), n = ~~(e / t * 100), s = `\r查找进度：[${o}] ${e}/${t} ${n}%\r`, r = e === t ? a.green(s) : a.yellow(s);
+g.command("mkdir").option("-l, --line [数量]", "数量", !1).option("-n, --name [文件名称]", "文件名称", !1).option("-d, --depth [深度值]", "深度值", "3").description("生成目录结构文件").action(Ae);
+const S = H(), [E] = ["package.json"].map((e) => j(process.cwd(), e)), Ie = (e, t) => {
+  const o = Array.from({ length: t }, (i, c) => c < e ? "=" : " ").join(""), n = ~~(e / t * 100), s = `\r查找进度：[${o}] ${e}/${t} ${n}%\r`, r = e === t ? a.green(s) : a.yellow(s);
   process.stdout.write(r);
-}, Ie = (e, t, o) => {
+}, Fe = (e, t, o) => {
   let n = "latest";
   S.resolve.some((r) => {
-    const c = r.lastIndexOf("@");
-    if (c <= 0)
+    const i = r.lastIndexOf("@");
+    if (i <= 0)
       return !0;
-    const i = r.slice(0, c), p = r.slice(c + 1);
-    if (e === i)
+    const c = r.slice(0, i), p = r.slice(i + 1);
+    if (e === c)
       return n = p, !0;
   });
   const s = S.prefix + o[n];
   return { name: e, value: t, newVersion: s, tag: n };
-}, Fe = (e, t) => Array.from({ length: t - e }, () => " ").join(""), Te = (e, t) => (+!t + 1) * e.length, T = (e) => {
-  const [t = 0, o = 0, n = 0] = e.match(/\d.+/g)[0].split(".");
-  return [+t, +o, +n];
+}, Re = (e, t) => Array.from({ length: t - e }, () => " ").join(""), Te = (e, t) => (+!t + 1) * e.length, R = (e) => {
+  const [{ major: t = 0, minor: o = 0, patch: n = 0, release: s = "" }] = ie(e);
+  return [+t, +o, +n, s];
 }, Ue = (e, t) => {
-  const [o, n, s] = T(e), [r, c, i] = T(t);
-  return r > o ? a.red(t) : r < o ? !1 : c > n ? `${r}.${a.yellow(c)}.${a.yellow(i)}` : c < n ? !1 : i > s ? `${r}.${c}.${a.green(i)}` : !1;
+  const [o, n, s, r] = R(e), [i, c, p, m] = R(t);
+  return i > o ? a.red(t) : i < o ? !1 : c > n ? `${i}.${a.yellow(c)}.${a.yellow(p)}` : c < n ? !1 : p > s ? `${i}.${c}.${a.green(p)}` : p === s && m && m !== r ? `${i}.${c}.${p}-${a.green(m)}` : !1;
 }, qe = (e) => {
   const t = {};
   e.forEach((n) => {
@@ -230,45 +233,45 @@ const S = H(), [E] = ["package.json"].map((e) => j(process.cwd(), e)), Ae = (e,
     });
   }), e.unshift({ name: "包名", value: "版本", newVersion: "新版本", tag: "标签" });
   const o = [];
-  e.forEach(({ name: n, value: s, newVersion: r, tag: c }, i) => {
-    const [p, m, u, k] = Object.entries({ name: n, value: s, newVersion: r, tag: c }).map(([C, Z]) => Fe(Te(Z, i), t[C]));
+  e.forEach(({ name: n, value: s, newVersion: r, tag: i }, c) => {
+    const [p, m, u, w] = Object.entries({ name: n, value: s, newVersion: r, tag: i }).map(([C, Z]) => Re(Te(Z, c), t[C]));
     let y = a.yellow("→"), M = !0;
-    if (i) {
+    if (c) {
       const C = Ue(s, r);
       C ? r = C : M = !1;
     } else
-      n = a.green(n), s = a.green(s), r = a.green(r), c = a.green(c), y = " ";
-    const X = `${n + p}  ${m + s}  ${y}  ${u + r}  ${k + c}`;
+      n = a.green(n), s = a.green(s), r = a.green(r), i = a.green(i), y = " ";
+    const X = `${n + p}  ${m + s}  ${y}  ${u + r}  ${w + i}`;
     M && o.push(X);
   }), o.length > 1 ? o.forEach(l) : d("所有版本已是最新");
-}, Re = async (e, t, o) => {
+}, Ge = async (e, t, o) => {
   l();
   let n = 0;
-  const s = [], r = Object.entries(e), c = r.map(async ([i, p]) => {
-    const m = await re.packument(i, { registry: S.registry }), u = Ie(i, p, m["dist-tags"]);
-    s.push(u), t.forEach((k) => {
-      const y = o[k];
-      y && y[i] && (y[i] = u.newVersion);
-    }), n++, await Ae(n, r.length);
+  const s = [], r = Object.entries(e), i = r.map(async ([c, p]) => {
+    const m = await re.packument(c, { registry: S.registry }), u = Fe(c, p, m["dist-tags"]);
+    s.push(u), t.forEach((w) => {
+      const y = o[w];
+      y && y[c] && (y[c] = u.newVersion);
+    }), n++, await Ie(n, r.length);
   });
-  return await Promise.all(c), l(), l(), s;
-}, Ge = async ({ update: e }) => {
+  return await Promise.all(i), l(), l(), s;
+}, _e = async ({ update: e }) => {
   if (!b(E))
     return J("package.json 文件不存在");
-  const t = e || S.check, o = h(E).toString(), n = JSON.parse(o), s = ["dependencies", "devDependencies", "optionalDependencies"], r = {}, c = JSON.parse(o);
+  const t = e || S.check, o = h(E).toString(), n = JSON.parse(o), s = ["dependencies", "devDependencies", "optionalDependencies"], r = {}, i = JSON.parse(o);
   s.forEach((p) => {
     n[p] && Object.entries(n[p]).forEach(([m, u]) => {
       !S.reject.includes(m) && (r[m] = u);
     });
   });
-  const i = await Re(r, s, c);
-  t && (v(E, JSON.stringify(c, null, 2)), d("文件 package.json 已更新"), l()), qe(i);
+  const c = await Ge(r, s, i);
+  t && (v(E, JSON.stringify(i, null, 2)), d("文件 package.json 已更新"), l()), qe(c);
 };
-g.command("check").option("-u, --update", "更新 package.json 依赖内容", !1).description("升级 package.json 依赖版本").action(Ge);
-const _e = H(), W = "comment.md", Be = ["package.json", W], [U, q] = Be.map((e) => j(process.cwd(), e)), Ye = () => {
-  if (!b(U))
+g.command("check").option("-u, --update", "更新 package.json 依赖内容", !1).description("升级 package.json 依赖版本").action(_e);
+const Be = H(), W = "comment.md", Ye = ["package.json", W], [T, U] = Ye.map((e) => j(process.cwd(), e)), ze = () => {
+  if (!b(T))
     return J("package.json 文件不存在");
-  const e = h(U).toString(), t = JSON.parse(e), o = ["dependencies", "devDependencies", "optionalDependencies"];
+  const e = h(T).toString(), t = JSON.parse(e), o = ["dependencies", "devDependencies", "optionalDependencies"];
   let n = `### 依赖解析
 
 `;
@@ -276,18 +279,18 @@ const _e = H(), W = "comment.md", Be = ["package.json", W], [U, q] = Be.map((e)
     t[s] && (n += `#### ${s}
 
 `, Object.keys(t[s]).forEach((r) => {
-      n += `- \`${r}\`: ${_e.comment[r] || ""}
+      n += `- \`${r}\`: ${Be.comment[r] || ""}
 `;
     }), n += `
 `);
-  }), n = n.slice(0, -1), v(q, n), l(), d(`${W} 文件创建成功`), l(), l(a.green(`文件目录  ${q}`));
+  }), n = n.slice(0, -1), v(U, n), l(), d(`${W} 文件创建成功`), l(), l(a.green(`文件目录  ${U}`));
 };
-g.command("comment").description("生成依赖注释文件").action(Ye);
+g.command("comment").description("生成依赖注释文件").action(ze);
 g.usage("[commands] [options]").version(_, "-v, --version", "输出版本号").helpOption("-h, --help", "输出所有命令");
 g.command("build[:环境] [描述]").description("简化打包提交命令");
 g.command("version<[++]|[@<版本号>]>").description("例如：version++ 或者 version@1.0.0；自动更新 package.json 版本号，自动更新 `README.md` 中的 `version-v<version>-blue` 图标版本");
 g.arguments("<cmd> [env]").action((e, t) => {
-  Je(e, t);
+  Ne(e, t);
 });
 process.argv.length < 3 ? g.help() : g.parse(process.argv);
 const x = ce({ pkg: O, updateCheckInterval: 1e3 * 1 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mine-auto-cli",
   "private": false,
-  "version": "2.4.1-beta.1",
+  "version": "2.4.2",
   "exports": "./dist/index.js",
   "main": "./dist/index.js",
   "type": "module",
@@ -17,8 +17,7 @@
   "scripts": {},
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "engine-strict": true,
-    "provenance": true
+    "engine-strict": true
   },
   "engines": {
     "node": ">=20.12"
@@ -51,6 +50,7 @@
     "log-symbols": "^6.0.0",
     "ora": "^8.0.1",
     "pacote": "^18.0.6",
+    "semver-utils": "^1.1.4",
     "strip-json-comments": "^5.0.1",
     "update-notifier": "^7.0.0"
   },