@zjex/git-workflow 0.0.2 → 0.1.1

package/README.md

@@ -1,9 +1,9 @@
 # @zjex/git-workflow
 
 <p align="center">
-  <img src="https://img.shields.io/npm/v/@zjex/git-workflow.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="npm version">
-  <img src="https://img.shields.io/npm/dm/@zjex/git-workflow.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="npm downloads">
-  <img src="https://img.shields.io/npm/l/@zjex/git-workflow.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="license">
+  <a href="https://www.npmjs.com/package/@zjex/git-workflow"><img src="https://img.shields.io/npm/v/@zjex/git-workflow.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="npm version"></a>
+  <a href="https://www.npmjs.com/package/@zjex/git-workflow"><img src="https://img.shields.io/npm/dm/@zjex/git-workflow.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="npm downloads"></a>
+  <a href="https://www.npmjs.com/package/@zjex/git-workflow"><img src="https://img.shields.io/npm/l/@zjex/git-workflow.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="license"></a>
   <img src="https://img.shields.io/badge/node-%3E%3D18-28CF8D?style=flat&colorA=18181B" alt="node version">
 </p>
 

package/dist/index.js

@@ -82,7 +82,7 @@ Commit \u547D\u4EE4:
 \u5206\u652F\u547D\u540D\u683C\u5F0F:
   feature/${W}-<Story ID>-<\u63CF\u8FF0>
   hotfix/${W}-<Issue ID>-<\u63CF\u8FF0>
-`}process.on("uncaughtException",e=>{e instanceof z&&process.exit(0),console.error(e),process.exit(1)});var Wt="0.0.2";async function pu(){switch(console.log(l.green(`
+`}process.on("uncaughtException",e=>{e instanceof z&&process.exit(0),console.error(e),process.exit(1)});var Wt="0.1.1";async function pu(){switch(console.log(l.green(`
  \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557     \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2557  \u2588\u2588\u2557
  \u255A\u2550\u2550\u2588\u2588\u2588\u2554\u255D     \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u255A\u2588\u2588\u2557\u2588\u2588\u2554\u255D
    \u2588\u2588\u2588\u2554\u255D      \u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2557   \u255A\u2588\u2588\u2588\u2554\u255D 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zjex/git-workflow",
-	"version": "0.0.2",
+	"version": "0.1.1",
 	"description": "个人常用的 Git 工作流工具，快速创建规范的开发分支和管理 Tag",
 	"type": "module",
 	"bin": {
@@ -14,9 +14,10 @@
 		"build": "tsup",
 		"dev": "tsx src/index.ts",
 		"changelog": "changelogen -o CHANGELOG.md",
+		"version": "node scripts/version.js",
 		"release": "./scripts/release.sh",
 		"release:dry": "./scripts/release.sh --dry-run",
-		"publish:npm": "npm run build && npm run changelog && npm publish",
+		"publish:npm": "./scripts/publish.sh",
 		"prepublishOnly": "npm run build",
 		"prepare": "husky"
 	},
@@ -50,4 +51,4 @@
 		"tsx": "^4.21.0",
 		"typescript": "^5.9.3"
 	}
-}
+}

package/scripts/publish.sh

@@ -0,0 +1,120 @@
+#!/bin/bash
+
+set -e
+
+# 颜色定义
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+CYAN='\033[0;36m'
+NC='\033[0m' # No Color
+
+# 打印带颜色的消息
+print_info() {
+  echo -e "${CYAN}ℹ ${1}${NC}"
+}
+
+print_success() {
+  echo -e "${GREEN}✔ ${1}${NC}"
+}
+
+print_error() {
+  echo -e "${RED}✖ ${1}${NC}"
+}
+
+print_step() {
+  echo -e "${CYAN}▶ ${1}${NC}"
+}
+
+# 检查是否在 git 仓库中
+if ! git rev-parse --git-dir > /dev/null 2>&1; then
+  print_error "当前目录不是 git 仓库"
+  exit 1
+fi
+
+# 检查是否有未提交的更改（发布前的脏工作区）
+if [[ -n $(git status --porcelain) ]]; then
+  echo ""
+  print_error "检测到未提交的更改，请先提交后再发布"
+  echo ""
+  git status --short
+  echo ""
+  print_info "提示: 可以使用 'gw c' 或 'git add . && git commit' 提交更改"
+  exit 1
+fi
+
+# 检查 npm 登录状态
+print_step "检查 npm 登录状态..."
+if ! npm whoami &> /dev/null; then
+  print_error "未登录 npm，请先执行: npm login"
+  exit 1
+fi
+NPM_USER=$(npm whoami)
+print_success "已登录 npm (用户: ${NPM_USER})"
+
+# 获取当前分支
+CURRENT_BRANCH=$(git branch --show-current)
+print_info "当前分支: ${CURRENT_BRANCH}"
+
+# 拉取最新代码
+print_step "拉取最新代码..."
+git pull origin "$CURRENT_BRANCH"
+print_success "代码已更新"
+
+# 获取当前版本
+CURRENT_VERSION=$(node -p "require('./package.json').version")
+print_info "当前版本: ${CURRENT_VERSION}"
+
+# 交互式选择版本号
+print_step "选择新版本号..."
+npm run version
+
+# 获取新版本
+NEW_VERSION=$(node -p "require('./package.json').version")
+
+if [[ "$NEW_VERSION" == "$CURRENT_VERSION" ]]; then
+  print_info "版本号未更改，已取消发布"
+  exit 0
+fi
+
+print_success "版本号已更新: ${CURRENT_VERSION} → ${NEW_VERSION}"
+
+# 构建项目
+print_step "构建项目..."
+npm run build
+print_success "构建完成"
+
+# 生成 changelog
+print_step "生成 CHANGELOG..."
+npm run changelog
+print_success "CHANGELOG 已更新"
+
+# 提交版本更新和 changelog
+print_step "提交版本更新..."
+git add package.json CHANGELOG.md
+git commit -m "🔖 chore(release): 发布 v${NEW_VERSION}"
+print_success "版本更新已提交"
+
+# 创建 tag
+print_step "创建 tag: v${NEW_VERSION}..."
+git tag -a "v${NEW_VERSION}" -m "Release v${NEW_VERSION}"
+print_success "Tag 已创建"
+
+# 推送到远程
+print_step "推送到远程仓库..."
+git push origin "$CURRENT_BRANCH"
+git push origin "v${NEW_VERSION}"
+print_success "已推送到远程"
+
+# 发布到 npm
+print_step "发布到 npm..."
+npm publish
+print_success "已发布到 npm"
+
+echo ""
+print_success "🎉 发布成功！"
+echo ""
+echo "版本: v${NEW_VERSION}"
+echo "GitHub: https://github.com/iamzjt-front-end/git-workflow/releases/tag/v${NEW_VERSION}"
+echo "npm: https://www.npmjs.com/package/@zjex/git-workflow/v/${NEW_VERSION}"
+echo ""

package/scripts/restore-prompt.js

@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+
+import { confirm } from "@inquirer/prompts";
+
+const colors = {
+  reset: "\x1b[0m",
+  cyan: "\x1b[36m",
+};
+
+async function main() {
+  console.log("");
+  console.log(`${colors.cyan}ℹ 之前暂存的更改可以恢复${colors.reset}`);
+
+  try {
+    const answer = await confirm({
+      message: "是否恢复暂存的更改? (Ctrl+C 跳过)",
+      default: false,
+    });
+
+    // 输出结果到 stdout
+    process.stdout.write((answer ? "yes" : "no") + "\n");
+    process.exit(0);
+  } catch (error) {
+    if (error.name === "ExitPromptError") {
+      // Ctrl+C 被按下，静默退出，默认不恢复
+      process.stdout.write("no\n");
+      process.exit(0);
+    }
+    process.exit(1);
+  }
+}
+
+main();

package/scripts/stash-prompt.js

@@ -0,0 +1,50 @@
+#!/usr/bin/env node
+
+import { select } from "@inquirer/prompts";
+
+const colors = {
+  reset: "\x1b[0m",
+  cyan: "\x1b[36m",
+  yellow: "\x1b[33m",
+};
+
+async function main() {
+  console.log("");
+  console.log(`${colors.cyan}ℹ 检测到未提交的更改${colors.reset}`);
+  console.log("");
+
+  try {
+    const answer = await select({
+      message: "请选择操作 (Ctrl+C 退出):",
+      choices: [
+        {
+          name: "提交这些更改后继续",
+          value: "commit",
+          description: "先提交当前更改，然后继续发布流程",
+        },
+        {
+          name: "暂存 (stash) 这些更改后继续",
+          value: "stash",
+          description: "将更改保存到 stash，发布完成后可以恢复",
+        },
+        {
+          name: "取消发布",
+          value: "cancel",
+          description: "退出发布流程",
+        },
+      ],
+    });
+
+    // 输出结果到 stdout
+    process.stdout.write(answer + "\n");
+    process.exit(0);
+  } catch (error) {
+    if (error.name === "ExitPromptError") {
+      // Ctrl+C 被按下，静默退出
+      process.exit(130); // 130 是 Ctrl+C 的标准退出码
+    }
+    process.exit(1);
+  }
+}
+
+main();

package/scripts/version.js

@@ -0,0 +1,138 @@
+#!/usr/bin/env node
+
+import { select, input } from "@inquirer/prompts";
+import { readFileSync, writeFileSync } from "fs";
+import { fileURLToPath } from "url";
+import { dirname, join } from "path";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+// 颜色定义
+const colors = {
+  reset: "\x1b[0m",
+  green: "\x1b[32m",
+  cyan: "\x1b[36m",
+  yellow: "\x1b[33m",
+  red: "\x1b[31m",
+};
+
+const log = {
+  info: (msg) => console.log(`${colors.cyan}ℹ ${msg}${colors.reset}`),
+  success: (msg) => console.log(`${colors.green}✔ ${msg}${colors.reset}`),
+  error: (msg) => console.log(`${colors.red}✖ ${msg}${colors.reset}`),
+  warning: (msg) => console.log(`${colors.yellow}⚠ ${msg}${colors.reset}`),
+};
+
+// 读取 package.json
+const packagePath = join(__dirname, "../package.json");
+const packageJson = JSON.parse(readFileSync(packagePath, "utf-8"));
+const currentVersion = packageJson.version;
+
+// 计算下一个版本号
+function calculateNextVersion(current, type) {
+  const [major, minor, patch] = current.split(".").map(Number);
+
+  switch (type) {
+    case "patch":
+      return `${major}.${minor}.${patch + 1}`;
+    case "minor":
+      return `${major}.${minor + 1}.0`;
+    case "major":
+      return `${major + 1}.0.0`;
+    default:
+      return current;
+  }
+}
+
+// 验证版本号格式
+function validateVersion(version) {
+  const semverRegex =
+    /^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.-]+)?(\+[a-zA-Z0-9.-]+)?$/;
+  return semverRegex.test(version);
+}
+
+async function main() {
+  console.log("");
+  log.info(`当前版本: ${colors.cyan}${currentVersion}${colors.reset}`);
+  console.log("");
+
+  const patchVersion = calculateNextVersion(currentVersion, "patch");
+  const minorVersion = calculateNextVersion(currentVersion, "minor");
+  const majorVersion = calculateNextVersion(currentVersion, "major");
+
+  const choices = [
+    {
+      name: `patch  ${currentVersion} → ${patchVersion}  (bug 修复)`,
+      value: { type: "patch", version: patchVersion },
+      description: "向后兼容的 bug 修复",
+    },
+    {
+      name: `minor  ${currentVersion} → ${minorVersion}  (新功能)`,
+      value: { type: "minor", version: minorVersion },
+      description: "向后兼容的新功能",
+    },
+    {
+      name: `major  ${currentVersion} → ${majorVersion}  (破坏性更新)`,
+      value: { type: "major", version: majorVersion },
+      description: "不向后兼容的重大更改",
+    },
+    {
+      name: "custom (自定义版本号)",
+      value: { type: "custom", version: null },
+      description: "输入自定义版本号",
+    },
+  ];
+
+  try {
+    const answer = await select({
+      message: "选择新版本号:",
+      choices,
+    });
+
+    let newVersion = answer.version;
+
+    // 如果选择自定义版本号
+    if (answer.type === "custom") {
+      newVersion = await input({
+        message: "请输入版本号:",
+        default: currentVersion,
+        validate: (value) => {
+          if (!value) {
+            return "版本号不能为空";
+          }
+          if (!validateVersion(value)) {
+            return "版本号格式无效，请使用语义化版本格式 (如 1.0.0 或 1.0.0-beta.1)";
+          }
+          return true;
+        },
+      });
+    }
+
+    // 更新 package.json
+    console.log("");
+    log.info(`正在更新版本号到 ${newVersion}...`);
+
+    packageJson.version = newVersion;
+    writeFileSync(
+      packagePath,
+      JSON.stringify(packageJson, null, "\t") + "\n",
+      "utf-8"
+    );
+
+    log.success(`版本号已更新: ${currentVersion} → ${newVersion}`);
+    console.log("");
+
+    process.exit(0);
+  } catch (error) {
+    if (error.name === "ExitPromptError") {
+      console.log("");
+      log.info("已取消");
+      process.exit(0);
+    }
+    log.error(`发生错误: ${error.message}`);
+    process.exit(1);
+  }
+}
+
+main();

package/scripts/version.sh

@@ -0,0 +1,133 @@
+#!/bin/bash
+
+set -e
+
+# 颜色定义
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+CYAN='\033[0;36m'
+NC='\033[0m' # No Color
+
+# 打印带颜色的消息
+print_info() {
+  echo -e "${CYAN}ℹ ${1}${NC}"
+}
+
+print_success() {
+  echo -e "${GREEN}✔ ${1}${NC}"
+}
+
+print_error() {
+  echo -e "${RED}✖ ${1}${NC}"
+}
+
+# 获取当前版本
+CURRENT_VERSION=$(node -p "require('./package.json').version")
+
+# 计算下一个版本号
+calculate_next_version() {
+  local current=$1
+  local type=$2
+  
+  IFS='.' read -r major minor patch <<< "$current"
+  
+  case $type in
+    patch)
+      echo "${major}.${minor}.$((patch + 1))"
+      ;;
+    minor)
+      echo "${major}.$((minor + 1)).0"
+      ;;
+    major)
+      echo "$((major + 1)).0.0"
+      ;;
+  esac
+}
+
+# 验证版本号格式
+validate_version() {
+  if [[ ! $1 =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.-]+)?(\+[a-zA-Z0-9.-]+)?$ ]]; then
+    return 1
+  fi
+  return 0
+}
+
+# 显示当前版本
+echo ""
+print_info "当前版本: ${CURRENT_VERSION}"
+echo ""
+
+# 计算版本选项
+PATCH_VERSION=$(calculate_next_version "$CURRENT_VERSION" "patch")
+MINOR_VERSION=$(calculate_next_version "$CURRENT_VERSION" "minor")
+MAJOR_VERSION=$(calculate_next_version "$CURRENT_VERSION" "major")
+
+# 显示选项
+echo "选择新版本号:"
+echo ""
+echo -e "  ${GREEN}1)${NC} patch  ${CYAN}${CURRENT_VERSION}${NC} → ${GREEN}${PATCH_VERSION}${NC}  (bug 修复)"
+echo -e "  ${GREEN}2)${NC} minor  ${CYAN}${CURRENT_VERSION}${NC} → ${GREEN}${MINOR_VERSION}${NC}  (新功能)"
+echo -e "  ${GREEN}3)${NC} major  ${CYAN}${CURRENT_VERSION}${NC} → ${GREEN}${MAJOR_VERSION}${NC}  (破坏性更新)"
+echo -e "  ${GREEN}4)${NC} custom (自定义版本号)"
+echo -e "  ${RED}5)${NC} cancel (取消)"
+echo ""
+
+# 读取用户选择
+while true; do
+  read -p "请选择 (1-5): " -n 1 -r VERSION_TYPE
+  echo ""
+  
+  if [[ "$VERSION_TYPE" =~ ^[1-5]$ ]]; then
+    break
+  else
+    print_error "无效的选择，请输入 1-5"
+  fi
+done
+
+# 处理选择
+case $VERSION_TYPE in
+  1)
+    NEW_VERSION=$PATCH_VERSION
+    ;;
+  2)
+    NEW_VERSION=$MINOR_VERSION
+    ;;
+  3)
+    NEW_VERSION=$MAJOR_VERSION
+    ;;
+  4)
+    while true; do
+      read -p "请输入版本号 (如 1.0.0 或 1.0.0-beta.1): " CUSTOM_VERSION
+      
+      if [[ -z "$CUSTOM_VERSION" ]]; then
+        print_error "版本号不能为空"
+        continue
+      fi
+      
+      if ! validate_version "$CUSTOM_VERSION"; then
+        print_error "版本号格式无效，请使用语义化版本格式 (如 1.0.0 或 1.0.0-beta.1)"
+        continue
+      fi
+      
+      NEW_VERSION=$CUSTOM_VERSION
+      break
+    done
+    ;;
+  5)
+    print_info "已取消"
+    exit 0
+    ;;
+esac
+
+# 更新版本号
+echo ""
+print_info "正在更新版本号到 ${NEW_VERSION}..."
+
+npm version "$NEW_VERSION" --no-git-tag-version > /dev/null 2>&1 || {
+  print_error "更新版本号失败"
+  exit 1
+}
+
+print_success "版本号已更新: ${CURRENT_VERSION} → ${NEW_VERSION}"
+echo ""