@taole/deploy-helper 0.7.4-beta.1 → 0.7.4-beta.3

package/index.mjs

@@ -221,10 +221,13 @@ async function main() {
             log(`mode参数只能是prod或test`);
             process.exit(1);
         }
-        const tag = process.argv[4];
+        let tag = process.argv[4];
         if(!tag){
-            log(`tag参数不能为空`);
-            process.exit(1);
+            tag = await tagRelease.getTag(workDir, mode);
+            if(!tag){
+                log(`未找到tag`);
+                process.exit(1);
+            }
         }
         // 做好回滚操作
         rollbackCleanFunc = await tagRelease.rollback(workDir, tag);

package/lib/tagRelease.mjs

@@ -4,10 +4,46 @@ import { log } from "./util.mjs";
 import path from "path";
 import fs from "fs";
 import simpleGit from "simple-git";
+import rawlist from "@inquirer/rawlist";
+
+async function getTag(workDir, mode) {
+  const packageJson = JSON.parse(
+    fs.readFileSync(path.join(workDir, "package.json"), "utf-8")
+  );
+  const prefix = getTagNamePrefix(packageJson, mode);
+  const git = simpleGit(workDir);
+  const tags = await git.tags();
+  // console.log(`tags: ${JSON.stringify(tags)}`);
+  let tagList = tags.all.filter((tag) => tag.startsWith(prefix)).slice(0, 15);
+  let tag = null;
+  if (tagList.length > 0) {
+    const propmtConfig = {
+      message: "请选择要回滚的tag版本: ",
+      choices: tagList.map((item) => ({
+        name: item,
+        value: item,
+      })),
+    };
+    try {
+      tag = await rawlist(propmtConfig);
+    } catch (error) {
+      log(`选择获取tag失败`);
+    }
+  }
+  if (tag) {
+    log(`已选择tag: ${tag}`);
+  }
+  return tag;
+}
 
 // 前置条件，项目当前是干净的，没有未提交的修改
 
+function getTagNamePrefix(packageJson, mode) {
+  return `release_${mode}_${packageJson.name}`;
+}
+
 function getTagName(packageJson, commitId, mode) {
+  const prefix = getTagNamePrefix(packageJson, mode);
   const date = new Date();
   const timeStr =
     date.getMonth() +
@@ -20,9 +56,7 @@ function getTagName(packageJson, commitId, mode) {
     date.getMinutes() +
     "_" +
     date.getSeconds();
-  return `release_${mode}_${packageJson.name}@${
-    packageJson.version
-  }_${commitId.slice(0, 8)}_${timeStr}`;
+  return `${prefix}@${packageJson.version}_${commitId.slice(0, 8)}_${timeStr}`;
 }
 
 /**
@@ -184,6 +218,7 @@ async function createRelease(workDir, config, mode) {
 }
 
 export default {
+  getTag,
   check,
   createRelease,
   rollback,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taole/deploy-helper",
-  "version": "0.7.4-beta.1",
+  "version": "0.7.4-beta.3",
   "description": "脚本部署工具，用于将项目部署到测试环境或生产环境",
   "main": "index.mjs",
   "type": "module",
@@ -24,8 +24,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "alibabacloud-devops-mcp-server": "*",
+    "@inquirer/rawlist": "^5.2.0",
     "ali-oss": "^6.23.0",
+    "alibabacloud-devops-mcp-server": "*",
     "archiver": "^7.0.1",
     "md5-file": "^5.0.0",
     "node-scp": "^0.0.25",