feat(@142vip/fairy-cli): 丰富TS类型，增加branch参数，默认从next分支获取commit信息，增加release交互全局错误捕获

Author: mmdapl

packages/fairy-cli/src/commands/release.ts

@@ -137,6 +137,9 @@ function execVipRelease(args: { checkRelease?: boolean }) {
       // 发布根模块
       await releaseRoot()
     })
+    .catch(() => {
+      // 避免错误过分暴露
+    })
 }
 
 /**

packages/fairy-cli/src/shared/git.ts

@@ -1,4 +1,5 @@
 import { execSync } from 'node:child_process'
+import process from 'node:process'
 
 /**
  * 获取当前分支名
@@ -13,7 +14,7 @@ export function getBranchName(): string {
  * - 优先从package.json中获取version
  * - version对应的tag不存在时，再从git记录中获取最新tag
  */
-export function getLatestTagName(): string | null {
+export function getLatestTagName(): string {
   try {
     // 读取 package.json 文件中的 version 值
     const packageJSON = execSync('cat package.json').toString()
@@ -30,7 +31,18 @@ export function getLatestTagName(): string | null {
     return execSync('git describe --tags --abbrev=0').toString().trim()
   }
   catch (error) {
-    console.error('Failed to get the latest tag name:', error)
-    return null
+    console.log(error)
+    process.exit(0)
   }
 }
+
+/**
+ * 获取某个分支上的commit日志
+ */
+export function getCommitLogs(latestTag: string, branch?: string): string[] {
+  const command = `git log ${branch ?? ''} --pretty=format:"%s" --date=short "${latestTag}"..HEAD`
+  const commitLogs = execSync(command).toString().trim()
+
+  // 整理出git提交日志
+  return commitLogs.split('\n')
+}

packages/fairy-cli/src/shared/release-package.ts

@@ -1,7 +1,7 @@
 import { execSync } from 'node:child_process'
 import process from 'node:process'
 import { versionBump } from '@142vip/release-version'
-import { getLatestTagName } from './git'
+import { getCommitLogs, getLatestTagName } from './git'
 
 interface PackageJSON {
   name: string
@@ -10,6 +10,15 @@ interface PackageJSON {
   path: string
 }
 
+interface ValidatePkgJSON {
+  name: string
+  release: boolean
+}
+interface ValidateResponse {
+  release: boolean
+  packages: ValidatePkgJSON[]
+}
+
 /**
  * 获取发布的包名
  * 参考：
@@ -33,17 +42,15 @@ export function getReleasePkgJSON(filter?: string) {
  * 提交git当前节点到上个tag的所有提交记录
  * 分析、判断是否有公共模块，提醒及时对公共模块发布新的版本号
  */
-function validatePackage(packageName: string, template?: string) {
+function validatePackage(packageNameInCommitScope: string, template?: string) {
   const latestTag = getLatestTagName()
-  const command = `git log --pretty=format:"%s" --date=short "${latestTag}"..HEAD`
-  const commitLogs = execSync(command).toString().trim()
+  const commitLogs = getCommitLogs(latestTag)
 
   // 整理出git提交日志
-  const logsByPackage = commitLogs.split('\n')
-    .filter(commit => commit.includes(`${packageName}`))
+  const logsByPackage = commitLogs.filter(commit => commit.includes(`(${packageNameInCommitScope})`))
 
   // 判断是否需要发布新的版本
-  return logsByPackage.length > 0 && !logsByPackage[0].includes(template ?? `release(${packageName})`)
+  return logsByPackage.length > 0 && !logsByPackage[0].includes(template ?? `release(${packageNameInCommitScope})`)
 }
 
 /**
@@ -57,8 +64,6 @@ export async function releaseMonorepoPackage(pkg: PackageJSON) {
   const command = `pnpm --filter "${pkg.name}" --shell-mode exec "${rpCommand}"`
 
   console.log('等价命令-->', command)
-  console.log(pkg)
-  console.log('aaaa dir-->', pkg.path)
 
   await versionBump({
     preid: 'alpha',
@@ -76,11 +81,14 @@ export async function releaseMonorepoPackage(pkg: PackageJSON) {
   })
 }
 
-export function validateBeforeReleaseRoot() {
+/**
+ * 在发布根模块前线上进行校验
+ */
+export function validateBeforeReleaseRoot(): ValidateResponse {
   const pkgJSON = getReleasePkgJSON()
   const packageNames = pkgJSON.map(pkg => pkg.name)
   let isRootRelease = true
-  const packages = []
+  const packages: ValidatePkgJSON[] = []
   for (const packageName of packageNames) {
     const isRelease = validatePackage(packageName)
     if (!isRelease) {