chore: update

Author: sonofmagic

.changeset/commander-cli-refactor.md

@@ -0,0 +1,7 @@
+---
+"@icebreakers/monorepo-templates": patch
+"@icebreakers/monorepo": patch
+"create-icebreaker": patch
+---
+
+将 commander 与 inquirer 提示组件统一放入 monorepo-templates，并用更规范的 Commander 风格重写 create-icebreaker 的 CLI 解析。

packages/create-icebreaker/src/args.ts

@@ -1,8 +1,8 @@
 import type { SourceType } from './types'
 import path from 'node:path'
 import process from 'node:process'
-import { parseArgs } from './args'
-import { DEFAULT_SOURCE } from './constants'
+import { Command } from '@icebreakers/monorepo-templates'
+import { DEFAULT_BRANCH, DEFAULT_REPO, DEFAULT_SOURCE, DEFAULT_TARGET } from './constants'
 import { prepareTarget } from './fs-utils'
 import { updateRootPackageJson } from './package-json'
 import { promptTargetDir, promptTemplates } from './prompts'
@@ -11,17 +11,12 @@ import { cloneRepo } from './source-git'
 import { scaffoldFromNpm } from './source-npm'
 import { resolveTemplateSelections } from './templates'
 
-function printHelp() {
-  process.stdout.write(`${[
-    'Usage: create-icebreaker [dir] [--source npm|git] [--repo <repo>] [--branch <branch>]',
-    'Options:',
-    '  --source <npm|git>     Source for templates (default npm)',
-    '  --repo <repo>          GitHub repo or git url to clone (default sonofmagic/monorepo-template)',
-    '  --branch <branch>      Branch or tag to checkout (default main)',
-    '  --templates <list>     Comma-separated template keys or indexes to keep',
-    '  --force                Remove existing target directory before cloning',
-    '  -h, --help             Show this help message',
-  ].join('\n')}\n`)
+interface CreateOptions {
+  source?: string
+  repo?: string
+  branch?: string
+  templates?: string
+  force?: boolean
 }
 
 function printNextSteps(targetDir: string) {
@@ -36,28 +31,28 @@ function printNextSteps(targetDir: string) {
   ].join('\n'))
 }
 
-function normalizeSource(value: SourceType | undefined) {
-  return value ?? DEFAULT_SOURCE
-}
-
-async function main() {
-  const parsed = parseArgs(process.argv.slice(2))
-  if (parsed.help) {
-    printHelp()
-    return
+function normalizeSource(value?: string): SourceType {
+  const normalized = value?.toLowerCase()
+  if (normalized === 'npm' || normalized === 'git') {
+    return normalized
   }
+  return DEFAULT_SOURCE
+}
 
+async function runCreate(targetDirInput: string, options: CreateOptions) {
   const isInteractive = Boolean(process.stdin.isTTY && process.stdout.isTTY)
-  const source = normalizeSource(parsed.source)
-  let targetDirInput = parsed.targetDir
+  const source = normalizeSource(options.source)
+  const repo = options.repo ?? DEFAULT_REPO
+  const branch = options.branch ?? DEFAULT_BRANCH
+  let targetInput = targetDirInput || DEFAULT_TARGET
 
   if (isInteractive) {
-    targetDirInput = await promptTargetDir(targetDirInput)
+    targetInput = await promptTargetDir(targetInput)
   }
 
   let selectedTemplates: string[] = []
-  if (parsed.templates) {
-    const { selections, unknown } = resolveTemplateSelections(parsed.templates)
+  if (options.templates) {
+    const { selections, unknown } = resolveTemplateSelections(options.templates)
     if (unknown.length) {
       process.stderr.write(`忽略未知模板：${unknown.join(', ')}\n`)
     }
@@ -67,25 +62,42 @@ async function main() {
     selectedTemplates = await promptTemplates()
   }
 
-  const targetDir = path.resolve(process.cwd(), targetDirInput)
-  const projectName = path.basename(targetDir) || targetDirInput
+  const targetDir = path.resolve(process.cwd(), targetInput)
+  const projectName = path.basename(targetDir) || targetInput
 
-  try {
-    await prepareTarget(targetDir, parsed.force)
-    if (source === 'git') {
-      await cloneRepo(parsed.repo, parsed.branch, targetDir)
-      await scaffoldFromRepo(targetDir, selectedTemplates)
-    }
-    else {
-      await scaffoldFromNpm(targetDir, selectedTemplates)
-    }
-    await updateRootPackageJson(targetDir, projectName)
-    printNextSteps(targetDir)
+  await prepareTarget(targetDir, Boolean(options.force))
+  if (source === 'git') {
+    await cloneRepo(repo, branch, targetDir)
+    await scaffoldFromRepo(targetDir, selectedTemplates)
   }
-  catch (error) {
-    process.stderr.write(`[create-icebreaker] ${error instanceof Error ? error.message : error}\n`)
-    process.exitCode = 1
+  else {
+    await scaffoldFromNpm(targetDir, selectedTemplates)
   }
+  await updateRootPackageJson(targetDir, projectName)
+  printNextSteps(targetDir)
 }
 
-main()
+const program = new Command()
+program
+  .name('create-icebreaker')
+  .description('Bootstrap the icebreaker monorepo template')
+  .argument('[dir]', 'Target directory', DEFAULT_TARGET)
+  .option('-s, --source <source>', 'Source for templates (npm|git)', DEFAULT_SOURCE)
+  .option('-r, --repo <repo>', 'GitHub repo or git url to clone', DEFAULT_REPO)
+  .option('-b, --branch <branch>', 'Branch or tag to checkout', DEFAULT_BRANCH)
+  .option('-t, --templates <list>', 'Comma-separated template keys or indexes to keep')
+  .option('-f, --force', 'Remove existing target directory before cloning', false)
+  .action(async (dir: string, options: CreateOptions) => {
+    try {
+      await runCreate(dir, options)
+    }
+    catch (error) {
+      process.stderr.write(`[create-icebreaker] ${error instanceof Error ? error.message : error}\n`)
+      process.exitCode = 1
+    }
+  })
+
+program.parseAsync(process.argv).catch((error: unknown) => {
+  process.stderr.write(`[create-icebreaker] ${error instanceof Error ? error.message : error}\n`)
+  process.exitCode = 1
+})

packages/create-icebreaker/src/index.ts

@@ -1,30 +1,21 @@
-import process from 'node:process'
-import { createInterface } from 'node:readline/promises'
-import { formatTemplateList, parseTemplateInput } from './templates'
+import { checkbox, input } from '@icebreakers/monorepo-templates'
+import { templateChoices } from './templates'
 
 export async function promptTargetDir(defaultDir: string) {
-  const rl = createInterface({ input: process.stdin, output: process.stdout })
-  try {
-    const answer = await rl.question(`项目创建目录（默认 ${defaultDir}）：`)
-    return answer.trim() || defaultDir
-  }
-  finally {
-    rl.close()
-  }
+  const answer = await input({
+    message: `项目创建目录（默认 ${defaultDir}）：`,
+    default: defaultDir,
+  })
+  return (answer?.trim?.() ?? defaultDir) || defaultDir
 }
 
 export async function promptTemplates() {
-  const rl = createInterface({ input: process.stdin, output: process.stdout })
-  try {
-    process.stdout.write(`\n可选模板（默认不选择）：\n${formatTemplateList()}\n`)
-    const answer = await rl.question('请选择要保留的模板（逗号分隔，直接回车跳过）：')
-    const { selections, unknown } = parseTemplateInput(answer)
-    if (unknown.length) {
-      process.stderr.write(`忽略未知模板：${unknown.join(', ')}\n`)
-    }
-    return selections
-  }
-  finally {
-    rl.close()
-  }
+  const selections = await checkbox({
+    message: '请选择要保留的模板（默认不选择）：',
+    choices: templateChoices.map(item => ({
+      name: `${item.key} - ${item.label}`,
+      value: item.key,
+    })),
+  })
+  return selections
 }

packages/create-icebreaker/src/prompts.ts

@@ -1,11 +1 @@
 export type SourceType = 'npm' | 'git'
-
-export interface CliOptions {
-  targetDir: string
-  repo: string
-  branch: string
-  source: SourceType
-  force: boolean
-  templates?: string
-  help?: boolean
-}

packages/create-icebreaker/src/types.ts

@@ -47,6 +47,12 @@
     "prepack": "node scripts/sync-assets.mjs",
     "lint": "eslint ."
   },
+  "dependencies": {
+    "@inquirer/checkbox": "^5.0.4",
+    "@inquirer/input": "^5.0.4",
+    "@inquirer/select": "^5.0.4",
+    "commander": "^14.0.2"
+  },
   "publishConfig": {
     "access": "public"
   }

packages/monorepo-templates/package.json

@@ -36,3 +36,7 @@ export {
   toPublishGitignorePath,
   toWorkspaceGitignorePath,
 }
+export { default as checkbox } from '@inquirer/checkbox'
+export { default as input } from '@inquirer/input'
+export { default as select } from '@inquirer/select'
+export { Command, program } from 'commander'

packages/monorepo-templates/src/index.ts

@@ -71,17 +71,13 @@
   },
   "dependencies": {
     "@icebreakers/monorepo-templates": "workspace:*",
-    "@inquirer/checkbox": "^5.0.4",
-    "@inquirer/input": "^5.0.4",
-    "@inquirer/select": "^5.0.4",
     "@pnpm/find-workspace-dir": "^1000.1.3",
     "@pnpm/logger": "^1001.0.1",
     "@pnpm/types": "^1001.2.0",
     "@pnpm/worker": "^1000.6.1",
     "@pnpm/workspace.find-packages": "^1000.0.54",
     "@pnpm/workspace.read-manifest": "^1000.2.9",
     "c12": "^3.3.3",
-    "commander": "^14.0.2",
     "comment-json": "^4.5.1",
     "consola": "^3.4.2",
     "execa": "^9.6.1",

packages/monorepo/package.json

@@ -1,9 +1,7 @@
 import type { AgenticTemplateFormat, GenerateAgenticTemplateOptions } from '../commands/ai'
 import type { CleanCommandConfig, CliOpts } from '../types'
 import process from 'node:process'
-import input from '@inquirer/input'
-import select from '@inquirer/select'
-import { program } from 'commander'
+import { input, program, select } from '@icebreakers/monorepo-templates'
 import { cleanProjects, createNewProject, createTimestampFolderName, defaultAgenticBaseDir, generateAgenticTemplate, generateAgenticTemplates, getCreateChoices, init, loadAgenticTasks, setVscodeBinaryMirror, skillTargets, syncNpmMirror, syncSkills, upgradeMonorepo } from '../commands'
 import { defaultTemplate } from '../commands/create'
 import { name as cliName, version } from '../constants'

packages/monorepo/src/cli/program.ts

@@ -1,5 +1,5 @@
 import type { CleanCommandConfig } from '../types'
-import checkbox from '@inquirer/checkbox'
+import { checkbox } from '@icebreakers/monorepo-templates'
 import fs from 'fs-extra'
 import path from 'pathe'
 import set from 'set-value'