@icode-js/icode 3.2.0 → 3.4.0

package/src/core/tools/interactive.js

@@ -1,5 +1,6 @@
 import { createInterface } from 'node:readline/promises'
 import { stdin, stdout } from 'node:process'
+import { c, stripAnsi } from './theme.js'
 
 /**
  * 判断当前 stdin/stdout 是否连接到交互式终端。
@@ -33,9 +34,71 @@ function resolveConfirmDefaultValue(optionsOrDefaultValue) {
   return false
 }
 
+// 用户按 Ctrl+C 时恢复终端并退出，和常见 CLI 行为一致。
+function exitOnCancel() {
+  stdout.write(`\n${c.gray('已取消')}\n`)
+  process.exit(130)
+}
+
+function questionPrefix(message) {
+  return `${c.green('?')} ${c.bold(message)}`
+}
+
+function supportsRawMode() {
+  return typeof stdin.setRawMode === 'function'
+}
+
+/**
+ * 进入 raw 模式逐键读取输入，onKey 返回 true 表示结束。
+ * 输入为按键处理函数，输出为 Promise（结束时 resolve）。
+ */
+function readKeys(onKey) {
+  const wasRaw = stdin.isRaw === true
+  return new Promise((resolve) => {
+    let done = false
+    const finish = () => {
+      if (done) {
+        return
+      }
+      done = true
+      stdin.off('data', onData)
+      stdin.setRawMode(wasRaw)
+      stdin.pause()
+      resolve()
+    }
+    function onData(chunk) {
+      const text = chunk.toString('utf8')
+      const keys = []
+      for (let index = 0; index < text.length; index += 1) {
+        const rest = text.slice(index)
+        const escape = rest.match(/^\x1b\[[0-9;]*[A-Za-z~]/)
+        if (escape) {
+          keys.push(escape[0])
+          index += escape[0].length - 1
+          continue
+        }
+        keys.push(text[index])
+      }
+      for (const key of keys) {
+        if (key === '\u0003') {
+          stdin.setRawMode(wasRaw)
+          exitOnCancel()
+        }
+        if (onKey(key) === true) {
+          finish()
+          return
+        }
+      }
+    }
+    stdin.setRawMode(true)
+    stdin.resume()
+    stdin.on('data', onData)
+  })
+}
+
 /**
  * 读取确认输入并返回布尔结果；非交互环境直接返回默认值。
- * 输入为提示文案与默认值配置，输出为用户是否确认。
+ * 交互终端中单键作答：y / n，回车取默认值。
  */
 export async function confirm(message, optionsOrDefaultValue = false) {
   const defaultValue = resolveConfirmDefaultValue(optionsOrDefaultValue)
@@ -43,24 +106,46 @@ export async function confirm(message, optionsOrDefaultValue = false) {
     return defaultValue
   }
 
-  const rl = createInterface({ input: stdin, output: stdout })
-  const suffix = defaultValue ? '[Y/n]' : '[y/N]'
-  const answer = (await rl.question(`${message} ${suffix} `)).trim().toLowerCase()
-  rl.close()
-
-  if (!answer) {
+  const hint = c.gray(defaultValue ? '(Y/n)' : '(y/N)')
+  if (!supportsRawMode()) {
+    const rl = createInterface({ input: stdin, output: stdout })
+    const answer = (await rl.question(`${questionPrefix(message)} ${hint} `)).trim().toLowerCase()
+    rl.close()
+    if (!answer) {
+      return defaultValue
+    }
+    if (['y', 'yes', '1', 'true', 'ok', 'sure', '是'].includes(answer)) {
+      return true
+    }
+    if (['n', 'no', '0', 'false', '否'].includes(answer)) {
+      return false
+    }
     return defaultValue
   }
 
-  if (['y', 'yes', '1', 'true', 'ok', 'sure', '是'].includes(answer)) {
-    return true
-  }
-
-  if (['n', 'no', '0', 'false', '否'].includes(answer)) {
+  stdout.write(`${questionPrefix(message)} ${hint} `)
+  let result = defaultValue
+  await readKeys((key) => {
+    const lower = key.toLowerCase()
+    if (lower === 'y') {
+      result = true
+      return true
+    }
+    if (lower === 'n') {
+      result = false
+      return true
+    }
+    if (key === '\r' || key === '\n') {
+      return true
+    }
+    if (key === '\x1b') {
+      result = false
+      return true
+    }
     return false
-  }
-
-  return defaultValue
+  })
+  stdout.write(`${result ? c.green('是') : c.gray('否')}\n`)
+  return result
 }
 
 /**
@@ -73,45 +158,170 @@ export async function input(message, defaultValue = '') {
   }
 
   const rl = createInterface({ input: stdin, output: stdout })
-  const answer = await rl.question(`${message}${defaultValue ? ` (${defaultValue})` : ''}: `)
+  rl.on('SIGINT', () => {
+    rl.close()
+    exitOnCancel()
+  })
+  const answer = await rl.question(`${questionPrefix(message)}${defaultValue ? ` ${c.gray(`(${defaultValue})`)}` : ''} ${c.cyan('›')} `)
   rl.close()
   const normalized = answer.trim()
   return normalized || defaultValue
 }
 
+// 不支持 raw 模式的终端：退回数字菜单。
+async function chooseOneByNumber(message, choices, safeDefaultIndex) {
+  stdout.write(`${questionPrefix(message)}\n`)
+  choices.forEach((choice, index) => {
+    stdout.write(`  ${c.cyan(String(index + 1).padStart(2))}. ${choice.label}${choice.hint ? `  ${c.gray(choice.hint)}` : ''}\n`)
+  })
+
+  const rl = createInterface({ input: stdin, output: stdout })
+  const answer = (await rl.question(`${c.gray('输入编号')} [${safeDefaultIndex + 1}]: `)).trim()
+  rl.close()
+
+  const numeric = Number(answer)
+  if (!answer || !Number.isInteger(numeric) || numeric < 1 || numeric > choices.length) {
+    return choices[safeDefaultIndex].value
+  }
+  return choices[numeric - 1].value
+}
+
+function matchesFilter(choice, filter) {
+  if (!filter) {
+    return true
+  }
+  const haystack = stripAnsi(`${choice.label} ${choice.hint || ''} ${choice.value}`).toLowerCase()
+  const needle = filter.toLowerCase()
+  if (haystack.includes(needle)) {
+    return true
+  }
+  // 子序列匹配：输入 flg 也能匹配 feature/login。
+  let pointer = 0
+  for (const char of haystack) {
+    if (char === needle[pointer]) {
+      pointer += 1
+      if (pointer === needle.length) {
+        return true
+      }
+    }
+  }
+  return false
+}
+
 /**
- * 在给定选项中返回单个值；非交互环境返回默认索引对应值。
- * 输入为提示文案、选项列表与默认索引，输出为选中的 value。
+ * 方向键单选：↑/↓ 移动，回车确认；选项较多时可直接打字过滤；数字键快速选择（不过滤时）。
  */
-export async function chooseOne(message, choices, defaultIndex = 0) {
-  if (!Array.isArray(choices) || choices.length === 0) {
-    throw new Error('chooseOne 需要至少一个可选项')
+async function chooseOneByKeys(message, choices, safeDefaultIndex, options) {
+  const pageSize = Math.max(3, Math.min(options.pageSize || 12, (stdout.rows || 24) - 4))
+  const filterable = options.filter ?? choices.length > 8
+  let filter = ''
+  let visible = choices.map((choice, index) => ({ choice, index }))
+  let cursor = safeDefaultIndex
+  let offset = 0
+  let renderedLines = 0
+  let selected = null
+
+  const render = () => {
+    if (renderedLines > 0) {
+      stdout.write(`\x1b[${renderedLines}F\x1b[J`)
+    }
+    const hintText = filterable
+      ? `↑↓ 选择 · 回车确认 · 打字过滤${filter ? ` · 当前: ${c.cyan(filter)}` : ''}`
+      : '↑↓ 选择 · 回车确认 · 数字快速选择'
+    const lines = [`${questionPrefix(message)} ${c.gray(hintText)}`]
+
+    if (!visible.length) {
+      lines.push(`  ${c.gray('没有匹配项，按退格修改')}`)
+    } else {
+      if (cursor < offset) {
+        offset = cursor
+      } else if (cursor >= offset + pageSize) {
+        offset = cursor - pageSize + 1
+      }
+      const page = visible.slice(offset, offset + pageSize)
+      page.forEach((item, pageIndex) => {
+        const active = offset + pageIndex === cursor
+        const number = filterable ? '' : c.gray(`${item.index + 1}. `)
+        const label = active ? c.cyan(stripAnsi(item.choice.label)) : item.choice.label
+        const hint = item.choice.hint ? `  ${c.gray(item.choice.hint)}` : ''
+        lines.push(`${active ? c.cyan('❯') : ' '} ${number}${label}${hint}`)
+      })
+      if (visible.length > pageSize) {
+        lines.push(c.gray(`  （${cursor + 1}/${visible.length}）`))
+      }
+    }
+    stdout.write(`${lines.join('\n')}\n`)
+    renderedLines = lines.length
   }
 
-  const safeDefaultIndex = Math.min(Math.max(defaultIndex, 0), choices.length - 1)
-  if (!isInteractive()) {
-    return choices[safeDefaultIndex].value
+  const applyFilter = () => {
+    visible = choices.map((choice, index) => ({ choice, index })).filter((item) => matchesFilter(item.choice, filter))
+    cursor = 0
+    offset = 0
   }
 
-  stdout.write(`${message}\n`)
-  choices.forEach((choice, index) => {
-    stdout.write(`  ${index + 1}. ${choice.label}\n`)
+  stdout.write('\x1b[?25l')
+  render()
+  await readKeys((key) => {
+    if (key === '\x1b[A' || (!filterable && key === 'k')) {
+      cursor = visible.length ? (cursor - 1 + visible.length) % visible.length : 0
+    } else if (key === '\x1b[B' || (!filterable && key === 'j')) {
+      cursor = visible.length ? (cursor + 1) % visible.length : 0
+    } else if (key === '\r' || key === '\n') {
+      if (visible.length) {
+        selected = visible[cursor]
+        return true
+      }
+    } else if (key === '\x1b') {
+      if (filter) {
+        filter = ''
+        applyFilter()
+      } else {
+        stdout.write('\x1b[?25h')
+        exitOnCancel()
+      }
+    } else if (key === '\x7f' || key === '\b') {
+      if (filterable && filter) {
+        filter = filter.slice(0, -1)
+        applyFilter()
+      }
+    } else if (!filterable && /^[1-9]$/.test(key) && Number(key) <= choices.length) {
+      selected = { choice: choices[Number(key) - 1], index: Number(key) - 1 }
+      return true
+    } else if (filterable && key.length === 1 && key >= ' ') {
+      filter += key
+      applyFilter()
+    }
+    render()
+    return false
   })
 
-  const rl = createInterface({ input: stdin, output: stdout })
-  const answer = (await rl.question(`请选择 [${safeDefaultIndex + 1}]: `)).trim()
-  rl.close()
+  stdout.write(`\x1b[${renderedLines}F\x1b[J`)
+  stdout.write(`${questionPrefix(message)} ${c.cyan(stripAnsi(selected.choice.label))}\n`)
+  stdout.write('\x1b[?25h')
+  return selected.choice.value
+}
 
-  if (!answer) {
-    return choices[safeDefaultIndex].value
+/**
+ * 在给定选项中返回单个值；非交互环境返回默认索引对应值。
+ * 输入为提示文案、选项列表（{ value, label, hint? }）与默认索引，输出为选中的 value。
+ * options.filter 强制开启/关闭打字过滤（默认选项超过 8 个时开启）。
+ */
+export async function chooseOne(message, choices, defaultIndex = 0, options = {}) {
+  if (!Array.isArray(choices) || choices.length === 0) {
+    throw new Error('chooseOne 需要至少一个可选项')
   }
 
-  const numeric = Number(answer)
-  if (!Number.isInteger(numeric) || numeric < 1 || numeric > choices.length) {
+  const safeDefaultIndex = Math.min(Math.max(defaultIndex, 0), choices.length - 1)
+  if (!isInteractive()) {
     return choices[safeDefaultIndex].value
   }
 
-  return choices[numeric - 1].value
+  if (!supportsRawMode()) {
+    return chooseOneByNumber(message, choices, safeDefaultIndex)
+  }
+
+  return chooseOneByKeys(message, choices, safeDefaultIndex, options)
 }
 
 /**
@@ -189,8 +399,8 @@ function renderCheckboxChoices(message, choices, context, cursorIndex, selected,
   }
 
   const lines = [
-    message,
-    `↑/↓ 移动，Space 选中/取消，Enter ${context.doneLabel}，q ${context.cancelLabel}（已选 ${selected.size} 项）`
+    `${questionPrefix(message)} ${c.gray(`（已选 ${selected.size} 项）`)}`,
+    c.gray(`  ↑↓ 移动 · 空格 选中/取消 · a 全选/全不选 · 回车 ${context.doneLabel} · q ${context.cancelLabel}`)
   ]
 
   if (statusMessage) {
@@ -198,9 +408,11 @@ function renderCheckboxChoices(message, choices, context, cursorIndex, selected,
   }
 
   choices.forEach((choice, index) => {
-    const cursor = index === cursorIndex ? '>' : ' '
-    const checkbox = selected.has(choice.value) ? '[x]' : '[ ]'
-    lines.push(`${cursor} ${checkbox} ${choice.label}`)
+    const active = index === cursorIndex
+    const cursor = active ? c.cyan('❯') : ' '
+    const checkbox = selected.has(choice.value) ? c.green('◉') : c.gray('◯')
+    const label = active ? c.cyan(stripAnsi(choice.label)) : choice.label
+    lines.push(`${cursor} ${checkbox} ${label}${choice.hint ? `  ${c.gray(choice.hint)}` : ''}`)
   })
 
   stdout.write(`${lines.join('\n')}\n`)
@@ -229,6 +441,15 @@ function chooseManyByCheckbox(message, choices, context) {
       stdin.off('data', onData)
       stdin.setRawMode(wasRaw)
       stdin.pause()
+      // 选完后把列表收起成一行摘要。
+      if (renderedLines > 0) {
+        stdout.write(`\x1b[${renderedLines}F\x1b[J`)
+      }
+      const labels = value
+        ? choices.filter((choice) => value.includes(choice.value)).map((choice) => stripAnsi(choice.label))
+        : []
+      const summary = value == null ? c.gray('已取消') : labels.length ? c.cyan(labels.join(', ')) : c.gray('（未选择）')
+      stdout.write(`${questionPrefix(message)} ${summary}\n`)
       resolve(value)
     }
 
@@ -307,6 +528,17 @@ function chooseManyByCheckbox(message, choices, context) {
           continue
         }
 
+        if (key.toLowerCase() === 'a') {
+          statusMessage = ''
+          if (selected.size === choices.length || selected.size >= context.maxSelections) {
+            selected.clear()
+          } else {
+            choices.slice(0, context.maxSelections).forEach((choice) => selected.add(choice.value))
+          }
+          render()
+          continue
+        }
+
         if (key.toLowerCase() === 'k') {
           moveCursor(-1)
           continue

package/src/core/tools/logger.js

@@ -1,53 +1,63 @@
-const COLORS = {
-  reset: '\x1b[0m',
-  gray: '\x1b[90m',
-  green: '\x1b[32m',
-  yellow: '\x1b[33m',
-  red: '\x1b[31m',
-  cyan: '\x1b[36m'
-}
+import { c, setColorStream } from './theme.js'
 
 let verboseEnabled = process.env.ICODE_LOG_LEVEL === 'verbose'
+// JSON 输出模式下 stdout 只留给结构化结果，普通日志改走 stderr。
+// node --test 的子进程用 stdout 和主进程传递序列化数据，日志混在里面偶尔会导致解析失败，
+// 所以在测试子进程中默认把日志写到 stderr。
+let logsToStderr = Boolean(process.env.NODE_TEST_CONTEXT)
 
-function colorize(color, message) {
-  return `${COLORS[color] || ''}${message}${COLORS.reset}`
+function infoStream() {
+  return logsToStderr ? process.stderr : process.stdout
 }
 
-// Prefix every rendered line so multiline logs keep the same visible marker.
-function print(stream, level, message) {
-  const normalizedMessage = String(message ?? '')
-  const formattedMessage = normalizedMessage
-    .split('\n')
-    .map((line) => `${level}${line}`)
+// 首行带图标，后续行缩进对齐，多行日志更易读。
+function print(stream, icon, message, colorLine) {
+  const lines = String(message ?? '').split('\n')
+  const rendered = lines
+    .map((line, index) => {
+      const content = colorLine ? colorLine(line) : line
+      return index === 0 ? `${icon} ${content}` : `  ${content}`
+    })
     .join('\n')
 
-  stream.write(`${formattedMessage}\n`)
+  stream.write(`${rendered}\n`)
 }
 
 export const logger = {
   // 按指定颜色渲染短文本，输入颜色名和文本，输出可直接拼进日志的 ANSI 字符串。
   color(color, message) {
-    return colorize(color, String(message ?? ''))
+    const painter = c[color]
+    return painter ? painter(String(message ?? '')) : String(message ?? '')
   },
 
   setVerbose(enabled) {
     verboseEnabled = Boolean(enabled)
   },
 
+  setLogsToStderr(enabled) {
+    logsToStderr = Boolean(enabled)
+    setColorStream(logsToStderr ? process.stderr : null)
+  },
+
   info(message) {
-    print(process.stdout, colorize('cyan', '[icode] '), `${message}`)
+    print(infoStream(), c.cyan('›'), `${message}`)
   },
 
   success(message) {
-    print(process.stdout, colorize('green', '[icode] '), `${message}`)
+    print(infoStream(), c.green('✔'), `${message}`)
   },
 
   warn(message) {
-    print(process.stderr, colorize('yellow', '[icode] '), `${message}`)
+    print(process.stderr, c.yellow('▲'), `${message}`)
   },
 
   error(message) {
-    print(process.stderr, colorize('red', '[icode] '), `${message}`)
+    print(process.stderr, c.red('✖'), `${message}`, c.red)
+  },
+
+  // 次要信息（提示、下一步建议），灰色显示。
+  hint(message) {
+    print(infoStream(), c.gray('·'), `${message}`, c.gray)
   },
 
   debug(message) {
@@ -55,6 +65,6 @@ export const logger = {
       return
     }
 
-    print(process.stdout, colorize('gray', '[icode:debug] '), `${message}`)
+    print(infoStream(), c.gray('[debug]'), `${message}`, c.gray)
   }
 }