cli-z-develop 0.14.8 → 0.14.9

package/dist/index.js

@@ -19,13 +19,13 @@ import zt from "semver";
 import { run as Ft } from "npm-check-updates";
 import Jt from "p-limit";
 import { generateTypescriptBundleApi as Ut, validateSwagger as Bt, getParsedSwagger as Gt, generateTypescriptApi as _t } from "@lonely9/api-generate";
-import { highlight as Vt } from "cli-highlight";
+import { highlight as Wt } from "cli-highlight";
 import { ESLint as Ye } from "eslint";
-import { readFileSync as Wt } from "fs";
+import { readFileSync as Vt } from "fs";
 import qt from "prettier";
 import Zt from "minimist";
 const Qe = "dev", et = "test", tt = "release", Ht = "production", Kt = "master";
-var E = /* @__PURE__ */ ((e) => (e[e.DEV = Qe] = "DEV", e[e.TEST = et] = "TEST", e[e.RELEASE = tt] = "RELEASE", e[e.PROD = Ht] = "PROD", e))(E || {}), $ = /* @__PURE__ */ ((e) => (e[e.DEV = Qe] = "DEV", e[e.TEST = et] = "TEST", e[e.RELEASE = tt] = "RELEASE", e[e.MASTER = Kt] = "MASTER", e))($ || {}), W = /* @__PURE__ */ ((e) => (e.H5 = "h5", e.NPM = "npm", e.SERVER = "server", e))(W || {});
+var E = /* @__PURE__ */ ((e) => (e[e.DEV = Qe] = "DEV", e[e.TEST = et] = "TEST", e[e.RELEASE = tt] = "RELEASE", e[e.PROD = Ht] = "PROD", e))(E || {}), $ = /* @__PURE__ */ ((e) => (e[e.DEV = Qe] = "DEV", e[e.TEST = et] = "TEST", e[e.RELEASE = tt] = "RELEASE", e[e.MASTER = Kt] = "MASTER", e))($ || {}), V = /* @__PURE__ */ ((e) => (e.H5 = "h5", e.NPM = "npm", e.SERVER = "server", e))(V || {});
 const at = [
   {
     name: `开发环境 - ${E.DEV}`,
@@ -129,7 +129,7 @@ function ot(e, t) {
 const { red: _e, green: ca, blue: cs, magenta: ua, yellow: la } = N;
 function ye(...e) {
 }
-function Ve(...e) {
+function We(...e) {
   console.log(la(...e));
 }
 function q(...e) {
@@ -143,11 +143,11 @@ function p(e, t = !1) {
   let a = e;
   e instanceof Error ? (a = e.message, le.isAxiosError(e) && (a = `请求失败：${e.message}`), console.log(_e(a)), console.log(ua(e.stack))) : console.log(_e(e)), t || process.exit(1);
 }
-function We(e) {
+function Ve(e) {
   return A(e) ? It(e).isDirectory() : !1;
 }
 function ut(e = process.cwd()) {
-  return We(e) ? Rt(e).filter((a) => We(m.resolve(e, a))) : [];
+  return Ve(e) ? Rt(e).filter((a) => Ve(m.resolve(e, a))) : [];
 }
 async function d(e, t = {
   removeTailLinkBreak: !0,
@@ -279,7 +279,7 @@ const wa = {
     "**/*.{vue,js,jsx,cjs,mjs,ts,tsx,cts,mts}": "eslint --fix",
     "**/*.md": "markdownlint --fix"
   }
-}, ya = "cli-z-develop", va = "0.14.8", $a = "技术团队开发流程管理工具", Na = "dist/index.js", Aa = { z: "bin/z.js", "z-develop": "bin/z.js" }, ba = { prepare: "[ -n '$z' ] && z init prepare || echo 'Warning: z not exist at global'", dev: "vite build --watch", test: "bun src/main.ts", "test:debug": "DEBUG=true bun src/main.ts", "dev:debug": "DEBUG=true vite build --watch", build: "vite build", "build:w": "vite build --watch", eslint: "eslint '**/*.{ts,js}' --fix", prettier: "prettier -wu .", upload: "npm run build && npm publish --access public --registry https://registry.npmjs.org/", "upload:patch": "npm version patch && npm run upload", "upload:minor": "npm version minor && npm run upload", "upload:major": "npm version major && npm run upload" }, ja = "module", Sa = "z", ka = { "@lonely9/eslint-config-team": "^1.3.8", "@tsconfig/node22": "^22.0.5", "@types/fs-extra": "^11.0.4", "@types/inquirer": "^9.0.9", "@types/minimist": "^1.2.5", "@types/node": "^22.15.29", "@types/semver": "^7.7.1", "@types/shelljs": "^0.10.0", "@typescript-eslint/eslint-plugin": "^8.58.2", "@typescript-eslint/parser": "^8.58.2", eslint: "^9.39.2", jiti: "^2.6.1", prettier: "^3.8.2", typescript: "^5.9.3", vite: "^7.3.1", "vue-tsc": "^3.2.6" }, Ea = { "@inquirer/prompts": "^8.4.1", "@lonely9/api-generate": "^0.2.8", axios: "^1.15.0", chalk: "^5.6.2", "cli-highlight": "^2.1.11", commander: "^14.0.3", dayjs: "^1.11.20", eslint: "^9.39.2", "fs-extra": "^11.3.4", "inquirer-select-pro": "^1.0.0-alpha.9", "lint-staged": "^16.4.0", minimist: "^1.2.8", "npm-check-updates": "^19.3.1", ora: "^9.3.0", "p-limit": "^7.3.0", prettier: "^3.8.2", semver: "^7.7.4", shelljs: "^0.10.0" }, re = {
+}, ya = "cli-z-develop", va = "0.14.9", $a = "技术团队开发流程管理工具", Na = "dist/index.js", Aa = { z: "bin/z.js", "z-develop": "bin/z.js" }, ba = { prepare: "[ -n '$z' ] && z init prepare || echo 'Warning: z not exist at global'", dev: "vite build --watch", test: "bun src/main.ts", "test:debug": "DEBUG=true bun src/main.ts", "dev:debug": "DEBUG=true vite build --watch", build: "vite build", "build:w": "vite build --watch", eslint: "eslint '**/*.{ts,js}' --fix", prettier: "prettier -wu .", upload: "npm run build && npm publish --access public --registry https://registry.npmjs.org/", "upload:patch": "npm version patch && npm run upload", "upload:minor": "npm version minor && npm run upload", "upload:major": "npm version major && npm run upload" }, ja = "module", Sa = "z", ka = { "@lonely9/eslint-config-team": "^1.3.8", "@tsconfig/node22": "^22.0.5", "@types/fs-extra": "^11.0.4", "@types/inquirer": "^9.0.9", "@types/minimist": "^1.2.5", "@types/node": "^22.15.29", "@types/semver": "^7.7.1", "@types/shelljs": "^0.10.0", "@typescript-eslint/eslint-plugin": "^8.58.2", "@typescript-eslint/parser": "^8.58.2", eslint: "^9.39.2", jiti: "^2.6.1", prettier: "^3.8.2", typescript: "^5.9.3", vite: "^7.3.1", "vue-tsc": "^3.2.6" }, Ea = { "@inquirer/prompts": "^8.4.1", "@lonely9/api-generate": "^0.2.8", axios: "^1.15.0", chalk: "^5.6.2", "cli-highlight": "^2.1.11", commander: "^14.0.3", dayjs: "^1.11.20", eslint: "^9.39.2", "fs-extra": "^11.3.4", "inquirer-select-pro": "^1.0.0-alpha.9", "lint-staged": "^16.4.0", minimist: "^1.2.8", "npm-check-updates": "^19.3.1", ora: "^9.3.0", "p-limit": "^7.3.0", prettier: "^3.8.2", semver: "^7.7.4", shelljs: "^0.10.0" }, re = {
   name: ya,
   version: va,
   description: $a,
@@ -333,7 +333,7 @@ function ge(e) {
 function B(e) {
   return e ? x.constants[e] : x.constants;
 }
-let _ = null, V = null;
+let _ = null, W = null;
 function Pe() {
   if (_)
     return _;
@@ -341,18 +341,18 @@ function Pe() {
   return A(e) || p(`当前目录（${L.pwd()}）不存在${e}文件，请在项目根目录执行该命令。`), _ = I.readJsonSync(e), _;
 }
 function ie() {
-  if (V)
-    return V;
+  if (W)
+    return W;
   const e = nt();
   return A(e) || p(
     `当前目录（${L.pwd()}）不存在${e}文件，请在项目根目录执行该命令，或者初始化项目（z init .）。`
-  ), V = I.readJsonSync(e), V;
+  ), W = I.readJsonSync(e), W;
 }
 function mt(e) {
-  V ? V = {
-    ...V,
+  W ? W = {
+    ...W,
     ...e
-  } : V = e, I.writeJSONSync(nt(), V, { spaces: 2 });
+  } : W = e, I.writeJSONSync(nt(), W, { spaces: 2 });
 }
 function Ta(e) {
   _ ? _ = {
@@ -595,12 +595,12 @@ function _a() {
     url: `${z()}/user`
   });
 }
-function Va() {
+function Wa() {
   return b({
     url: `${z()}/groups`
   });
 }
-function Wa(e) {
+function Va(e) {
   return b({
     url: `${z()}/projects`,
     method: "post",
@@ -664,7 +664,7 @@ function ei() {
   return A(e) ? I.readJSONSync(e) : { groups: [] };
 }
 async function ti() {
-  const e = await Va(), t = Qt.map((a) => {
+  const e = await Wa(), t = Qt.map((a) => {
     const n = e.find((i) => i.name === a);
     return n ? {
       name: n.name,
@@ -1115,10 +1115,10 @@ async function qe(e, t) {
     } catch {
     }
   if (i.length === 0)
-    return Ve("文件太大，无法生成commit msg"), t.stop(), await Ce();
+    return We("文件太大，无法生成commit msg"), t.stop(), await Ce();
   const s = await d(`git diff HEAD -- ${i.map((r) => `"${r}"`).join(" ")}`);
   if (!s)
-    return Ve("无法获取文件差异信息"), t.stop(), await Ce();
+    return We("无法获取文件差异信息"), t.stop(), await Ce();
   const o = await Ni({
     type: "commit-message-v2",
     input: s
@@ -1250,7 +1250,7 @@ async function zi() {
     await d("npm install --registry https://registry.npmmirror.com/"), r.succeed("依赖安装完成");
     const c = y("项目推送中").start();
     await d('git add . && git commit -m "chore: 项目初始化"'), await d("git tag v0.0.1");
-    const u = await Wa({
+    const u = await Va({
       name: e.projectName,
       description: e.projectDesc,
       path: e.projectName,
@@ -1324,20 +1324,20 @@ const Ji = async (e) => {
 };
 function Ui(e, t) {
   const a = Pe();
-  if (ie()?.repository?.url || p(".z/project.json中缺少repository.url"), t === W.H5) {
+  if (ie()?.repository?.url || p(".z/project.json中缺少repository.url"), t === V.H5) {
     const i = `build:${e}`;
     a?.scripts[i] || p(`项目package.json文件scripts不存在命令${i}。`);
   }
-  t === W.NPM && (a?.scripts.build || p("项目package.json文件scripts不存在命令build。")), t === W.SERVER && (a?.scripts.build || p("项目package.json文件scripts不存在命令build。"));
+  t === V.NPM && (a?.scripts.build || p("项目package.json文件scripts不存在命令build。")), t === V.SERVER && (a?.scripts.build || p("项目package.json文件scripts不存在命令build。"));
 }
 async function yt(e, t) {
   ae(), K();
   let a = e, n = t.platform;
   const i = ie();
-  if (i.language === w.JAVA && (n = W.SERVER), a && !Object.values($).includes(a) && p("仅支持发布指定环境分支"), n && !Object.values(W).includes(n) && p("发布平台错误"), n || (n = await k({
+  if (i.language === w.JAVA && (n = V.SERVER), a && !Object.values($).includes(a) && p("仅支持发布指定环境分支"), n && !Object.values(V).includes(n) && p("发布平台错误"), n || (n = await k({
     message: "请选择平台",
     choices: Xt
-  })), n === W.NPM && (a = $.MASTER), !a) {
+  })), n === V.NPM && (a = $.MASTER), !a) {
     const u = await k({
       message: "请选择部署环境",
       choices: at
@@ -1497,8 +1497,8 @@ async function Gi(e, t) {
     skipGroupNotification: t.skipGroupNotification
   });
 }
-P.command("merge").alias("m").description("合并当前分支到指定远程分支，并部署。").argument("[branch]", "目标分支名称").option("--deploy-platform  <platform>", `合并成功后要部署的平台。可选值：${Object.values(W).join("/")}`).option("--deploy-skip-selection-notification", "部署时，是否跳过选择部署通知人环节").option("--skip-group-notification", "是否跳过选择部署通知群聊环节").option("--keep-branch-after-merge-master", "在合并到主分支之后，是否保留分支。默认否").action((...e) => M(Gi, ...e));
-P.command("deploy").alias("d").description("部署到指定环境").argument("[branchName]", `部署环境。可选值：${Object.values($).join("/")}`).option("--platform <platform>", `部署平台。可选值：${Object.values(W).join("/")}`).option("--module <module>", "部署模块。Java项目适用，填入要部署的模块名称，多个使用逗号分隔").option("--skip-selection-notification", "是否跳过选择部署通知人环节").option("--skip-group-notification", "是否跳过选择部署通知群聊环节").action((...e) => M(yt, ...e));
+P.command("merge").alias("m").description("合并当前分支到指定远程分支，并部署。").argument("[branch]", "目标分支名称").option("--deploy-platform  <platform>", `合并成功后要部署的平台。可选值：${Object.values(V).join("/")}`).option("--deploy-skip-selection-notification", "部署时，是否跳过选择部署通知人环节").option("--skip-group-notification", "是否跳过选择部署通知群聊环节").option("--keep-branch-after-merge-master", "在合并到主分支之后，是否保留分支。默认否").action((...e) => M(Gi, ...e));
+P.command("deploy").alias("d").description("部署到指定环境").argument("[branchName]", `部署环境。可选值：${Object.values($).join("/")}`).option("--platform <platform>", `部署平台。可选值：${Object.values(V).join("/")}`).option("--module <module>", "部署模块。Java项目适用，填入要部署的模块名称，多个使用逗号分隔").option("--skip-selection-notification", "是否跳过选择部署通知人环节").option("--skip-group-notification", "是否跳过选择部署通知群聊环节").action((...e) => M(yt, ...e));
 async function _i() {
   try {
     await d("java -jar ./.z/checkstyle.jar -c ./.z/checkstyle.xml .", {
@@ -1508,7 +1508,7 @@ async function _i() {
     p("checkstyle执行出错"), process.exit(1);
   }
 }
-async function Vi() {
+async function Wi() {
   A(m.resolve("node_modules", ".bin", "markdownlint")) || p("该项目未安装markdownlint，请安装后重试");
   const e = y("markdownlint执行中...").start();
   try {
@@ -1519,7 +1519,7 @@ async function Vi() {
     e.fail("markdownlint校验出错"), process.exit(1);
   }
 }
-function Wi() {
+function Vi() {
   const e = ie();
   if (e["lint-staged"])
     return e["lint-staged"];
@@ -1530,7 +1530,7 @@ async function qi() {
   await Mt({
     concurrent: 4,
     debug: !1,
-    config: Wi(),
+    config: Vi(),
     quiet: !0,
     relative: !0
   }) ? (e.succeed("代码风格检测通过！"), process.exit(0)) : (e.fail("代码风格检测未通过！"), process.exit(1));
@@ -1688,7 +1688,7 @@ async function en(e, t) {
       choices: i
     });
   }
-  n === "commit-msg" ? await Hi() : n === "commit-files" ? await qi() : n === "prettier" ? await Yi() : n === "eslint" && [w.JAVASCRIPT, w.MARKDOWN].includes(a.language) ? await Xi(t) : n === "type-check" && [w.JAVASCRIPT, w.MARKDOWN].includes(a.language) ? Qi() : n === "dependency-check" && [w.JAVASCRIPT, w.MARKDOWN].includes(a.language) ? await Ki() : n === "checkstyle" && a.language === w.JAVA ? await _i() : n === "markdown-lint" && a.language === w.MARKDOWN && await Vi();
+  n === "commit-msg" ? await Hi() : n === "commit-files" ? await qi() : n === "prettier" ? await Yi() : n === "eslint" && [w.JAVASCRIPT, w.MARKDOWN].includes(a.language) ? await Xi(t) : n === "type-check" && [w.JAVASCRIPT, w.MARKDOWN].includes(a.language) ? Qi() : n === "dependency-check" && [w.JAVASCRIPT, w.MARKDOWN].includes(a.language) ? await Ki() : n === "checkstyle" && a.language === w.JAVA ? await _i() : n === "markdown-lint" && a.language === w.MARKDOWN && await Wi();
 }
 P.command("run").alias("r").description("执行 eslint / prettier / type-check / dependency-check / checkstyle / markdown-lint。").argument(
   "[type]",
@@ -2470,7 +2470,7 @@ ${e.map(t).join(`
   const a = [];
   for (const n of e) {
     const { apis: i } = await Gt(n, {
-      throwOnValidateError: !0
+      throwOnValidateError: !t
     });
     a.push(...i.map((s) => ({ name: s.path, value: s.path })));
   }
@@ -2484,19 +2484,24 @@ ${e.map(t).join(`
     validate: (n) => n.length ? !0 : "至少选择一个API",
     filter: !0
   });
-}, En = async (e, t) => {
-  const a = y("API 开始生成...").start();
+}, En = async (e, t, a) => {
+  const n = y("API 开始生成...").start();
   try {
-    a.stop();
-    for (const { swaggerJson: n, serverName: i } of e) {
-      if (!t.some((o) => o.startsWith(`/${i}`)))
+    n.stop();
+    for (const { swaggerJson: i, serverName: s } of e) {
+      if (!t.some((r) => r.startsWith(`/${s}`)))
         continue;
-      const s = await _t({ swaggerJson: n, merge: !0, controller: t });
-      console.log(Vt(s, { language: "typescript", ignoreIllegals: !0 }));
+      const o = await _t({
+        swaggerJson: i,
+        merge: !0,
+        controller: t,
+        throwOnValidateError: !a
+      });
+      console.log(Wt(o, { language: "typescript", ignoreIllegals: !0 }));
     }
-    a.start().succeed("API 生成成功");
-  } catch (n) {
-    a.fail(`API 生成失败: ${n.message}`);
+    n.start().succeed("API 生成成功");
+  } catch (i) {
+    n.fail(`API 生成失败: ${i.message}`);
   }
 }, Tn = (e) => {
   if (e) {
@@ -2514,7 +2519,7 @@ ${e.map(t).join(`
   const t = await Rn.lintFiles(e);
   await Ye.outputFixes(t);
   for (const a of e) {
-    const n = m.resolve(a), i = Wt(n, "utf-8"), s = await qt.format(i, {
+    const n = m.resolve(a), i = Vt(n, "utf-8"), s = await qt.format(i, {
       filepath: n
     });
     xt(n, s);
@@ -2522,8 +2527,8 @@ ${e.map(t).join(`
 }, Cn = async (e, t, a, n) => {
   const i = e.map((s) => s.swaggerJson);
   if (t === "single") {
-    const s = await kn(i);
-    await En(e, s);
+    const s = await kn(i, n);
+    await En(e, s, n);
   } else {
     const s = y("API 开始生成...").start(), o = await Ut(
       i.map((l) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli-z-develop",
-  "version": "0.14.8",
+  "version": "0.14.9",
   "description": "技术团队开发流程管理工具",
   "main": "dist/index.js",
   "bin": {