commit-pack 1.1.5 → 1.1.7

package/bin/index.mjs

@@ -24,6 +24,26 @@ const printBanner = () => {
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 
+// 解析命令行参数
+const args = process.argv.slice(2)
+const workspaceArgIndex = args.findIndex(
+  (arg) => arg.startsWith('--workspace=') || arg.startsWith('-w=')
+)
+let workspaceName = ''
+if (workspaceArgIndex !== -1) {
+  const arg = args[workspaceArgIndex]
+  workspaceName = arg.split('=')[1]
+} else {
+  // 查找是否有单独的 -w 或 --workspace 参数
+  const wIndex = args.findIndex((arg) => arg === '-w')
+  const workspaceIndex = args.findIndex((arg) => arg === '--workspace')
+  if (wIndex !== -1 && wIndex + 1 < args.length) {
+    workspaceName = args[wIndex + 1]
+  } else if (workspaceIndex !== -1 && workspaceIndex + 1 < args.length) {
+    workspaceName = args[workspaceIndex + 1]
+  }
+}
+
 // 向上查找带锁文件的根目录
 function findProjectRootWithLockFile() {
   let dir = __dirname
@@ -56,22 +76,99 @@ function detectPackageManager() {
 }
 
 const packageManager = detectPackageManager()
+
+// 计算实际的工作目录
+let actualProjectRoot = projectRoot
+if (workspaceName) {
+  const packageJsonContent = JSON.parse(
+    fs.readFileSync(path.join(projectRoot, 'package.json'), 'utf8')
+  )
+
+  // 根据包管理器确定工作spaces路径
+  let workspaces = []
+  if (packageJsonContent.workspaces) {
+    if (Array.isArray(packageJsonContent.workspaces)) {
+      workspaces = packageJsonContent.workspaces
+    } else if (packageJsonContent.workspaces.packages) {
+      workspaces = packageJsonContent.workspaces.packages
+    }
+  }
+
+  // 查找workspace包的路径
+  if (workspaces.length > 0) {
+    for (const workspacePattern of workspaces) {
+      // 处理通配符模式，例如 'packages/*'
+      if (workspacePattern.includes('*')) {
+        const basePath = workspacePattern.replace('/*', '')
+        const packagesDir = path.join(projectRoot, basePath)
+        if (fs.existsSync(packagesDir)) {
+          const packageDirs = fs.readdirSync(packagesDir)
+          for (const dir of packageDirs) {
+            const dirPath = path.join(packagesDir, dir)
+            if (fs.statSync(dirPath).isDirectory()) {
+              try {
+                const pkgPath = path.join(dirPath, 'package.json')
+                if (fs.existsSync(pkgPath)) {
+                  const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'))
+                  if (pkg.name === workspaceName || dir === workspaceName) {
+                    actualProjectRoot = dirPath
+                    break
+                  }
+                }
+              } catch (e) {
+                console.log(e)
+              }
+            }
+          }
+        }
+      } else {
+        // 直接路径匹配
+        const dirPath = path.join(projectRoot, workspacePattern)
+        if (fs.existsSync(dirPath) && fs.statSync(dirPath).isDirectory()) {
+          try {
+            const pkgPath = path.join(dirPath, 'package.json')
+            if (fs.existsSync(pkgPath)) {
+              const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'))
+              if (
+                pkg.name === workspaceName ||
+                path.basename(dirPath) === workspaceName
+              ) {
+                actualProjectRoot = dirPath
+                break
+              }
+            }
+          } catch (e) {
+            console.log(e)
+          }
+        }
+      }
+    }
+  }
+}
+
 console.log('')
 printBanner()
 console.log('')
 console.log('')
 console.log(`🍀 包管理器:${packageManager}`)
-console.log(`📁 根目录:${projectRoot}`)
+console.log(`📁 根目录:${actualProjectRoot}`)
+if (workspaceName) {
+  console.log(`📦 工作空间: ${workspaceName}`)
+}
 
-const packageJsonPath = path.join(projectRoot, 'package.json')
+const packageJsonPath = path.join(actualProjectRoot, 'package.json')
 const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
 
 // 检查是否已经初始化过
-const initFlagPath = path.join(projectRoot, '.commit-pack-init')
+const initFlagPath = path.join(actualProjectRoot, '.commit-pack-init')
 if (fs.existsSync(initFlagPath)) {
+  console.log(log.warn('⚠️ 该工作空间/项目已被初始化，跳过初始化'))
   process.exit(0)
 }
 
+// 回滚机制：记录初始状态
+const initialPackageJson = JSON.stringify(packageJson, null, 2)
+
 // 确保 devDependencies 存在
 if (!packageJson.devDependencies) {
   packageJson.devDependencies = {}
@@ -113,55 +210,57 @@ for (const [dep, version] of Object.entries(devDependenciesWithVersion)) {
   }
 }
 
-installWithProgress(dependenciesToInstall, packageManager, projectRoot)
-
-let isGitRepo = false
-
 try {
-  // 获取 Git 仓库的顶级目录
-  const gitTopLevel = execSync('git rev-parse --show-toplevel', { cwd: projectRoot })
-    .toString()
-    .trim()
-  // 比较顶级目录与当前项目目录
-  if (path.resolve(gitTopLevel) === path.resolve(projectRoot)) {
-    isGitRepo = true
-  } else {
+  installWithProgress(dependenciesToInstall, packageManager, actualProjectRoot)
+
+  let isGitRepo = false
+
+  try {
+    // 获取 Git 仓库的顶级目录
+    const gitTopLevel = execSync('git rev-parse --show-toplevel', {
+      cwd: actualProjectRoot
+    })
+      .toString()
+      .trim()
+    // 比较顶级目录与当前项目目录
+    if (path.resolve(gitTopLevel) === path.resolve(actualProjectRoot)) {
+      isGitRepo = true
+    } else {
+      isGitRepo = false
+    }
+  } catch {
     isGitRepo = false
   }
-} catch {
-  isGitRepo = false
-}
 
-if (isGitRepo) {
-  console.log(log.success('👍 Git仓库已存在'))
-} else {
-  console.log(log.warn('👌 Git仓库初始化...'))
-  execSync('git init', { stdio: 'inherit', cwd: projectRoot })
-}
+  if (isGitRepo) {
+    console.log(log.success('👍 Git仓库已存在'))
+  } else {
+    console.log(log.warn('👌 Git仓库初始化...'))
+    execSync('git init', { stdio: 'inherit', cwd: actualProjectRoot })
+  }
 
-// 根据包管理器，执行对应的 Husky 初始化命令
-let huskyInitCommand = ''
-switch (packageManager) {
-  case 'pnpm':
-    huskyInitCommand = 'pnpm exec husky init'
-    break
-  case 'yarn':
-    huskyInitCommand = 'yarn dlx husky init'
-    break
-  case 'bun':
-    huskyInitCommand = 'bunx husky init'
-    break
-  default:
-    huskyInitCommand = 'npx husky init'
-    break
-}
+  // 根据包管理器，执行对应的 Husky 初始化命令
+  let huskyInitCommand = ''
+  switch (packageManager) {
+    case 'pnpm':
+      huskyInitCommand = 'pnpm exec husky init'
+      break
+    case 'yarn':
+      huskyInitCommand = 'yarn dlx husky init'
+      break
+    case 'bun':
+      huskyInitCommand = 'bunx husky init'
+      break
+    default:
+      huskyInitCommand = 'npx husky init'
+      break
+  }
 
-console.log(chalk.green(`🐶 Husky初始化...`))
-execSync(huskyInitCommand, { stdio: 'inherit', cwd: projectRoot })
+  console.log(chalk.green(`🐶 Husky初始化...`))
+  execSync(huskyInitCommand, { stdio: 'inherit', cwd: actualProjectRoot })
 
-// 执行 setup-script 中的所有文件
-console.log('🚀 创建配置文件...')
-try {
+  // 执行 setup-script 中的所有文件
+  console.log('🚀 创建配置文件...')
   const setupScripts = [
     'prettier.sh',
     'lintstagedrc.sh',
@@ -174,61 +273,153 @@ try {
 
   for (const script of setupScripts) {
     const scriptPath = path.join(__dirname, '..', 'setup-script', script)
-    execSync(`sh ${scriptPath}`, { stdio: 'inherit', cwd: projectRoot })
+    execSync(`sh ${scriptPath}`, { stdio: 'inherit', cwd: actualProjectRoot })
   }
-} catch (error) {
-  console.error(log.warn('❌ 文件创建出错'), error)
-}
 
-// 创建或更新脚本
-if (!packageJson.scripts) {
-  packageJson.scripts = {}
-  console.log('🔥 创建或更新脚本...')
-}
+  // 创建或更新脚本
+  if (!packageJson.scripts) {
+    packageJson.scripts = {}
+    console.log('🔥 创建或更新脚本...')
+  }
+
+  let modified = false
+
+  if (!packageJson.scripts.lint) {
+    if (workspaceName) {
+      // 为workspace项目使用工作空间命令
+      if (packageManager === 'pnpm') {
+        packageJson.scripts.lint = `pnpm -F ${workspaceName} exec eslint ./ --ext .ts,.tsx,.json --max-warnings=0`
+      } else if (packageManager === 'yarn') {
+        packageJson.scripts.lint = `yarn workspace ${workspaceName} exec eslint ./ --ext .ts,.tsx,.json --max-warnings=0`
+      } else {
+        packageJson.scripts.lint = 'eslint ./ --ext .ts,.tsx,.json --max-warnings=0'
+      }
+    } else {
+      packageJson.scripts.lint = 'eslint ./ --ext .ts,.tsx,.json --max-warnings=0'
+    }
+    console.log(log.success('✅ 已添加 "lint" 至 package.json'))
+    modified = true
+  } else {
+    console.log(log.warn('⚠️ package.json 中已存在 "lint" 未作修改'))
+  }
 
-let modified = false
+  if (!packageJson.scripts.format) {
+    if (workspaceName) {
+      // 为workspace项目使用工作空间命令
+      if (packageManager === 'pnpm') {
+        packageJson.scripts.format = `pnpm -F ${workspaceName} exec prettier --config .prettierrc '.' --write`
+      } else if (packageManager === 'yarn') {
+        packageJson.scripts.format = `yarn workspace ${workspaceName} exec prettier --config .prettierrc '.' --write`
+      } else {
+        packageJson.scripts.format = "prettier --config .prettierrc '.' --write"
+      }
+    } else {
+      packageJson.scripts.format = "prettier --config .prettierrc '.' --write"
+    }
+    console.log(log.success('✅ 已添加 "format" 至 package.json'))
+    modified = true
+  } else {
+    console.log(log.warn('⚠️ package.json 中已存在 "format" 未作修改'))
+  }
 
-if (!packageJson.scripts.lint) {
-  packageJson.scripts.lint = 'eslint ./ --ext .ts,.tsx,.json --max-warnings=0'
-  console.log(log.success('✅ 已添加 "lint" 至 package.json'))
+  // 添加或更新 "commit" 脚本
+  if (workspaceName) {
+    // 为workspace项目使用工作空间命令
+    if (packageManager === 'pnpm') {
+      packageJson.scripts.commit = `pnpm -F ${workspaceName} exec cz`
+    } else if (packageManager === 'yarn') {
+      packageJson.scripts.commit = `yarn workspace ${workspaceName} exec cz`
+    } else {
+      packageJson.scripts.commit = 'cz'
+    }
+  } else {
+    packageJson.scripts.commit = 'cz'
+  }
+  console.log(log.success('✅ 已添加 "commit" 至 package.json'))
   modified = true
-} else {
-  console.log(log.warn('⚠️ package.json 中已存在 "lint" 未作修改'))
-}
 
-if (!packageJson.scripts.format) {
-  packageJson.scripts.format = "prettier --config .prettierrc '.' --write"
-  console.log(log.success('✅ 已添加 "format" 至 package.json'))
+  // 添加或更新 "config.commitizen" 配置
+  if (!packageJson.config) {
+    packageJson.config = {}
+  }
+
+  packageJson.config.commitizen = {
+    path: 'node_modules/cz-customizable'
+  }
   modified = true
-} else {
-  console.log(log.warn('⚠️ package.json 中已存在 "format" 未作修改'))
-}
 
-// 添加或更新 "commit" 脚本
-packageJson.scripts.commit = 'cz'
-console.log(log.success('✅ 已添加 "commit" 至 package.json'))
-modified = true
+  // 写入修改后的 package.json
+  if (modified) {
+    fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf8')
+    console.log(chalk.green('✅ 已更新 package.json'))
+    console.log('')
+    console.log('')
+  }
+
+  // 创建初始化标志文件
+  fs.writeFileSync(initFlagPath, 'initialized', 'utf8')
+  console.log(log.success('   🎉🎉🎉 完成啦!'))
+  console.log('')
+  if (workspaceName) {
+    console.log(
+      `   在 ${workspaceName} 工作空间中，运行: git add . && ${packageManager} run commit`
+    )
+  } else {
+    console.log(`   运行 git add 后 | 运行 ${packageManager} run commit 即可`)
+  }
+} catch (error) {
+  console.error(log.error('❌ 初始化过程中发生错误，正在执行回滚...'))
+  console.error('错误详情:', error.message)
+  console.error('错误堆栈:', error.stack)
+  if (error.stdout) console.error('标准输出:', error.stdout.toString())
+  if (error.stderr) console.error('错误输出:', error.stderr.toString())
+
+  try {
+    // 回滚：恢复原始的package.json
+    fs.writeFileSync(packageJsonPath, initialPackageJson, 'utf8')
+    console.log(log.warn('✅ 已恢复原始 package.json'))
+
+    // 删除可能创建的配置文件
+    const configFiles = [
+      '.prettierrc',
+      '.eslintrc',
+      '.commitlintrc.json',
+      '.cz-config.js',
+      '.czrc',
+      '.lintstagedrc',
+      '.prettierignore',
+      '.eslintignore'
+    ]
+    for (const configFile of configFiles) {
+      const configPath = path.join(actualProjectRoot, configFile)
+      if (fs.existsSync(configPath)) {
+        fs.unlinkSync(configPath)
+        console.log(log.warn(`✅ 已删除临时配置文件: ${configFile}`))
+      }
+    }
 
-// 添加或更新 "config.commitizen" 配置
-if (!packageJson.config) {
-  packageJson.config = {}
-}
+    // 删除可能创建的.husky目录
+    const huskyDir = path.join(actualProjectRoot, '.husky')
+    if (fs.existsSync(huskyDir)) {
+      fs.rmSync(huskyDir, { recursive: true, force: true })
+      console.log(log.warn('✅ 已删除临时 .husky 目录'))
+    }
 
-packageJson.config.commitizen = {
-  path: 'node_modules/cz-customizable'
-}
-modified = true
+    // 删除初始化标志文件
+    if (fs.existsSync(initFlagPath)) {
+      fs.unlinkSync(initFlagPath)
+    }
 
-// 写入修改后的 package.json
-if (modified) {
-  fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf8')
-  console.log(chalk.green('✅ 已更新 package.json'))
-  console.log('')
-  console.log('')
-}
+    console.log(log.success('   🔄 回滚完成'))
+  } catch (rollbackError) {
+    console.error(log.error('❌ 回滚过程中也发生了错误，请手动检查项目状态'))
+    console.error('回滚错误详情:', rollbackError.message)
+    console.error('回滚错误堆栈:', rollbackError.stack)
+    if (rollbackError.stdout)
+      console.error('回滚标准输出:', rollbackError.stdout.toString())
+    if (rollbackError.stderr)
+      console.error('回滚错误输出:', rollbackError.stderr.toString())
+  }
 
-// 创建初始化标志文件
-// fs.writeFileSync(initFlagPath, 'initialized', 'utf8')
-console.log(log.success('   🎉🎉🎉 完成啦!'))
-console.log('')
-console.log(`   运行 git add 后 | 运行 ${packageManager} run commit 即可`)
+  process.exit(1) // 确保进程以错误码退出
+}

package/bin/installWithProgress.js

@@ -1,6 +1,8 @@
 /* eslint-env node */
 import chalk from 'chalk'
 import { execSync } from 'child_process'
+import fs from 'fs'
+import path from 'path'
 import cliProgress from 'cli-progress'
 
 export function installWithProgress(dependencies, packageManager, projectRoot) {
@@ -12,6 +14,13 @@ export function installWithProgress(dependencies, packageManager, projectRoot) {
   console.log('')
   console.log(`⬇️ 开始安装依赖...`)
 
+  // 检查是否为 monorepo（检查是否有 pnpm-workspace.yaml 或 package.json 中的 workspaces 字段）
+  const isMonorepo =
+    fs.existsSync(path.join(projectRoot, 'pnpm-workspace.yaml')) ||
+    (fs.existsSync(path.join(projectRoot, 'package.json')) &&
+      JSON.parse(fs.readFileSync(path.join(projectRoot, 'package.json'), 'utf8'))
+        .workspaces)
+
   const bar = new cliProgress.SingleBar({
     format: `  [${chalk.cyan('{bar}')}]{percentage}% | 正在安装: {dep}`,
     barCompleteChar: '▰',
@@ -25,16 +34,21 @@ export function installWithProgress(dependencies, packageManager, projectRoot) {
     for (let i = 0; i < dependencies.length; i++) {
       const dep = dependencies[i]
 
-      const installCommand = {
-        pnpm: `pnpm add -D ${dep}`,
-        yarn: `yarn add ${dep} --dev`,
-        bun: `bun add -d ${dep}`,
-        npm: `npm install ${dep} --save-dev`
-      }[packageManager]
+      let installCommand
+      if (packageManager === 'pnpm' && isMonorepo) {
+        installCommand = `pnpm add -w -D ${dep}`
+      } else {
+        installCommand = {
+          pnpm: `pnpm add -D ${dep}`,
+          yarn: `yarn add ${dep} --dev`,
+          bun: `bun add -d ${dep}`,
+          npm: `npm install ${dep} --save-dev`
+        }[packageManager]
+      }
 
       bar.update(i, { dep })
 
-      execSync(installCommand, { cwd: projectRoot, stdio: 'ignore' })
+      execSync(installCommand, { cwd: projectRoot, stdio: ['pipe', 'pipe', 'pipe'] })
 
       bar.update(i + 1, { dep })
     }
@@ -44,7 +58,11 @@ export function installWithProgress(dependencies, packageManager, projectRoot) {
     console.log('')
   } catch (err) {
     bar.stop()
-    console.log(chalk.red('❌ 安装过程中出错'), err)
+    console.log(chalk.red('❌ 安装过程中出错'))
+    console.error('错误详情:', err.message)
+    console.error('错误堆栈:', err.stack)
+    if (err.stdout) console.error('标准输出:', err.stdout.toString())
+    if (err.stderr) console.error('错误输出:', err.stderr.toString())
     throw err
   }
 }