@yivan-lab/pretty-please 1.0.0 → 1.2.0

package/src/utils/{console.js → console.ts}

@@ -1,26 +1,30 @@
 import chalk from 'chalk'
+import { getCurrentTheme } from '../ui/theme.js'
 
 /**
  * 原生控制台输出工具函数
  * 用于不需要 Ink 的场景，避免清屏和性能问题
  */
 
-// 主题色
-const colors = {
-  primary: '#00D9FF',
-  secondary: '#A78BFA',
-  accent: '#F472B6',
-  success: '#10B981',
-  error: '#EF4444',
-  warning: '#F59E0B',
-  info: '#3B82F6',
-  muted: '#6B7280',
+// 获取当前主题颜色
+function getColors() {
+  const theme = getCurrentTheme()
+  return {
+    primary: theme.primary,
+    secondary: theme.secondary,
+    accent: theme.accent,
+    success: theme.success,
+    error: theme.error,
+    warning: theme.warning,
+    info: theme.info,
+    muted: theme.text.muted,
+  }
 }
 
 /**
  * 计算字符串的显示宽度（中文占2个宽度）
  */
-export function getDisplayWidth(str) {
+export function getDisplayWidth(str: string): number {
   let width = 0
   for (const char of str) {
     if (char.match(/[\u4e00-\u9fff\u3400-\u4dbf\uff00-\uffef\u3000-\u303f]/)) {
@@ -35,10 +39,11 @@ export function getDisplayWidth(str) {
 /**
  * 绘制命令框（原生版本）
  */
-export function drawCommandBox(command, title = '生成命令') {
+export function drawCommandBox(command: string, title: string = '生成命令'): void {
+  const colors = getColors()
   const lines = command.split('\n')
   const titleWidth = getDisplayWidth(title)
-  const maxContentWidth = Math.max(...lines.map(l => getDisplayWidth(l)))
+  const maxContentWidth = Math.max(...lines.map((l) => getDisplayWidth(l)))
   const boxWidth = Math.max(maxContentWidth + 4, titleWidth + 6, 20)
 
   const topPadding = boxWidth - titleWidth - 5
@@ -50,10 +55,7 @@ export function drawCommandBox(command, title = '生成命令') {
     const lineWidth = getDisplayWidth(line)
     const padding = ' '.repeat(boxWidth - lineWidth - 4)
     console.log(
-      chalk.hex(colors.warning)('│ ') +
-      chalk.hex(colors.primary)(line) +
-      padding +
-      chalk.hex(colors.warning)(' │')
+      chalk.hex(colors.warning)('│ ') + chalk.hex(colors.primary)(line) + padding + chalk.hex(colors.warning)(' │')
     )
   }
   console.log(chalk.hex(colors.warning)(bottomBorder))
@@ -62,7 +64,7 @@ export function drawCommandBox(command, title = '生成命令') {
 /**
  * 格式化耗时
  */
-export function formatDuration(ms) {
+export function formatDuration(ms: number): string {
   if (ms < 1000) {
     return `${ms}ms`
   }
@@ -72,9 +74,10 @@ export function formatDuration(ms) {
 /**
  * 输出分隔线
  */
-export function printSeparator(text = '输出', length = 38) {
+export function printSeparator(text: string = '输出', length: number = 38): void {
   const textPart = text ? ` ${text} ` : ''
-  const lineLength = Math.max(0, length - textPart.length)
+  const textWidth = getDisplayWidth(textPart) // 使用显示宽度而不是字符数
+  const lineLength = Math.max(0, length - textWidth)
   const leftDashes = '─'.repeat(Math.floor(lineLength / 2))
   const rightDashes = '─'.repeat(Math.ceil(lineLength / 2))
   console.log(chalk.gray(`${leftDashes}${textPart}${rightDashes}`))
@@ -83,48 +86,54 @@ export function printSeparator(text = '输出', length = 38) {
 /**
  * 输出成功消息
  */
-export function success(message) {
+export function success(message: string): void {
+  const colors = getColors()
   console.log(chalk.hex(colors.success)('✓ ' + message))
 }
 
 /**
  * 输出错误消息
  */
-export function error(message) {
+export function error(message: string): void {
+  const colors = getColors()
   console.log(chalk.hex(colors.error)('✗ ' + message))
 }
 
 /**
  * 输出警告消息
  */
-export function warning(message) {
+export function warning(message: string): void {
+  const colors = getColors()
   console.log(chalk.hex(colors.warning)('⚠️  ' + message))
 }
 
 /**
  * 输出信息消息
  */
-export function info(message) {
+export function info(message: string): void {
+  const colors = getColors()
   console.log(chalk.hex(colors.info)(message))
 }
 
 /**
  * 输出灰色文本
  */
-export function muted(message) {
+export function muted(message: string): void {
+  const colors = getColors()
   console.log(chalk.hex(colors.muted)(message))
 }
 
 /**
  * 输出标题
  */
-export function title(message) {
+export function title(message: string): void {
   console.log(chalk.bold(message))
 }
 
 /**
  * 输出主色文本
  */
-export function primary(message) {
+export function primary(message: string): void {
+  const colors = getColors()
   console.log(chalk.hex(colors.primary)(message))
 }