@mindbase/node-tools 1.3.8 → 1.3.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindbase/node-tools",
-  "version": "1.3.8",
+  "version": "1.3.12",
   "description": "Node.js 开发工具集合：清理 node_modules、查看 Git 日志、发布包",
   "main": "src/index.js",
   "bin": {
@@ -28,7 +28,7 @@
     "cli-table3": "^0.6.3",
     "commander": "^11.0.0",
     "editor": "^1.0.0",
-    "execa": "^9.6.1",
+    "execa": "^8.0.0",
     "glob": "^13.0.2",
     "prompts": "^2.4.2",
     "semver": "^7.7.4",

package/src/clear/cleaner.js

@@ -1,41 +1,22 @@
-const { spawnSync } = require("child_process");
-const { platform } = require("process");
+const fs = require("fs");
 
-const isWin = platform === "win32";
-let rmAvailable = null;
-
-// 检测 rm 命令是否可用
-function checkRmAvailable() {
-  if (rmAvailable !== null) return rmAvailable;
-  const result = spawnSync("rm", ["--version"], { shell: true });
-  rmAvailable = result.status === 0;
-  return rmAvailable;
-}
-
-// 执行删除命令
+// 删除目录
 function removeDir(path) {
-  if (checkRmAvailable()) {
-    const result = spawnSync("rm", ["-rf", path], { shell: true, stdio: "inherit" });
-    return result.status === 0;
-  } else if (isWin) {
-    const result = spawnSync("rmdir", ["/S", "/Q", path], { shell: true, stdio: "inherit" });
-    return result.status === 0;
-  } else {
-    const result = spawnSync("rm", ["-rf", path], { shell: true, stdio: "inherit" });
-    return result.status === 0;
+  try {
+    fs.rmSync(path, { recursive: true, force: true });
+    return true;
+  } catch {
+    return false;
   }
 }
 
+// 删除文件
 function removeFile(path) {
-  if (checkRmAvailable()) {
-    const result = spawnSync("rm", [path], { shell: true, stdio: "inherit" });
-    return result.status === 0;
-  } else if (isWin) {
-    const result = spawnSync("del", [path], { shell: true, stdio: "inherit" });
-    return result.status === 0;
-  } else {
-    const result = spawnSync("rm", [path], { shell: true, stdio: "inherit" });
-    return result.status === 0;
+  try {
+    fs.rmSync(path, { force: true });
+    return true;
+  } catch {
+    return false;
   }
 }
 

package/src/common/ui/pagination.js

@@ -58,6 +58,15 @@ class PagedDisplay {
       this.currentPage = page;
     }
   }
+
+  /**
+   * 跳转到指定索引位置的记录
+   * @param {number} index - 记录的绝对索引（从0开始）
+   */
+  goToIndex(index) {
+    const page = Math.floor(index / this.pageSize);
+    this.jumpToPage(page);
+  }
 }
 
 module.exports = { PagedDisplay };

package/src/common/ui/single-select.js

@@ -1,6 +1,6 @@
 /**
  * 通用单选菜单组件
- * 使用 readline 原生键盘处理
+ * 使用 readline 原生键盘处理，支持翻页
  */
 
 const readline = require('readline');
@@ -23,19 +23,43 @@ function singleSelect(items, options = {}) {
 
     let currentIndex = 0;
 
-    // 显示选项
+    // 计算可见条目数（不超过终端高度）
+    function getVisibleCount() {
+      const terminalHeight = process.stdout.rows || 24;
+      const titleLines = options.title ? 2 : 0; // 标题 + 空行
+      const hintLines = options.hint ? 2 : 0; // 空行 + 提示
+      const reservedLines = titleLines + hintLines + 1; // 预留 1 行余量
+      return Math.max(3, terminalHeight - reservedLines);
+    }
+
+    // 显示选项（支持翻页窗口）
     function display() {
       console.clear();
       if (options.title) {
         console.log(options.title);
         console.log('');
       }
-      items.forEach((item, idx) => {
-        const isCurrent = idx === currentIndex;
+
+      const visibleCount = getVisibleCount();
+      // 计算窗口位置：确保当前项在可见区域内
+      let windowStart = 0;
+      if (items.length > visibleCount) {
+        // 当前项接近窗口底部时，向上滚动
+        windowStart = Math.max(0, currentIndex - Math.floor(visibleCount / 2));
+        // 不超过最大窗口起始位置
+        windowStart = Math.min(windowStart, items.length - visibleCount);
+      }
+      const windowEnd = Math.min(windowStart + visibleCount, items.length);
+
+      // 显示可见窗口内的选项
+      for (let i = windowStart; i < windowEnd; i++) {
+        const item = items[i];
+        const isCurrent = i === currentIndex;
         const prefix = isCurrent ? '> ' : '  ';
         const color = isCurrent ? chalk.green : chalk.gray;
         console.log(prefix + color(item.title));
-      });
+      }
+
       if (options.hint) {
         console.log('');
         console.log(chalk.dim(options.hint));
@@ -55,6 +79,20 @@ function singleSelect(items, options = {}) {
       } else if (key.name === 'down') {
         currentIndex = Math.min(items.length - 1, currentIndex + 1);
         display();
+      } else if (key.name === 'pageup' || key.name === 'left') {
+        const visibleCount = getVisibleCount();
+        currentIndex = Math.max(0, currentIndex - visibleCount);
+        display();
+      } else if (key.name === 'pagedown' || key.name === 'right') {
+        const visibleCount = getVisibleCount();
+        currentIndex = Math.min(items.length - 1, currentIndex + visibleCount);
+        display();
+      } else if (key.name === 'home') {
+        currentIndex = 0;
+        display();
+      } else if (key.name === 'end') {
+        currentIndex = items.length - 1;
+        display();
       } else if (key.name === 'return') {
         cleanup();
         resolve(items[currentIndex].value);
@@ -67,13 +105,20 @@ function singleSelect(items, options = {}) {
       }
     };
 
+    // 终端大小变化时重新渲染
+    const resizeHandler = () => {
+      display();
+    };
+
     const cleanup = () => {
       process.stdin.removeListener('keypress', handler);
+      process.stdout.off('resize', resizeHandler);
       process.stdin.setRawMode(false);
       process.stdin.pause();
     };
 
     process.stdin.on('keypress', handler);
+    process.stdout.on('resize', resizeHandler);
   });
 }
 

package/src/git-log/ui.js

@@ -172,13 +172,26 @@ async function inputFilters (repos) {
   }
 }
 
+// 是否已初始化 keypress 事件
+let keypressInitialized = false;
+
+/**
+ * 确保输入流初始化（只执行一次）
+ */
+function ensureInputStreamInitialized() {
+  if (!keypressInitialized) {
+    readline.emitKeypressEvents(process.stdin);
+    keypressInitialized = true;
+  }
+}
+
 /**
- * 等待日志导航按键
- * @returns {Promise<string>} 导航动作
+ * 等待日志导航按键（支持 resize）
+ * @returns {Promise<string>} 导航动作或 'resize'
  */
 function waitForLogNavigation () {
   return new Promise((resolve) => {
-    readline.emitKeypressEvents(process.stdin);
+    ensureInputStreamInitialized();
     process.stdin.resume();
     process.stdin.setRawMode(true);
 
@@ -198,13 +211,19 @@ function waitForLogNavigation () {
       }
     };
 
+    const resizeHandler = () => {
+      cleanup();
+      resolve('resize');
+    };
+
     const cleanup = () => {
       process.stdin.removeListener('keypress', handler);
-      process.stdin.setRawMode(false);
-      process.stdin.pause();
+      process.stdout.off('resize', resizeHandler);
+      // 不暂停 stdin，保持流处于活跃状态以便下次 resume
     };
 
     process.stdin.on('keypress', handler);
+    process.stdout.on('resize', resizeHandler);
   });
 }
 
@@ -243,18 +262,21 @@ function renderLogPage (page, totalCount) {
 
 /**
  * 计算动态分页大小
+ * 精确计算确保不超过终端高度
  * @returns {number} 每页显示条数
  */
 function calculateDynamicPageSize () {
   const terminalHeight = process.stdout.rows || 24;
-  const reservedLines = 6; // 头部3行 + 提示2行 + 底部1行
-  const availableLines = Math.max(terminalHeight - reservedLines, 10);
-  const linesPerLog = 5; // 每条日志约5行
+  // 头部：标题1行 + 空行1行 + 提示1行 = 3行
+  const reservedLines = 3;
+  const availableLines = Math.max(terminalHeight - reservedLines, 5);
+  // 每条日志：仓库1行 + 提交1行 + 作者1行 + 日期1行 + 信息1行 + 分隔空行1行 = 6行
+  const linesPerLog = 6;
   return Math.floor(availableLines / linesPerLog);
 }
 
 /**
- * 显示日志（支持重新筛选）
+ * 显示日志（支持重新筛选和 resize）
  * @param {array} logs - 日志列表
  * @param {function} onRefilter - 重新筛选的回调
  * @returns {Promise<void>}
@@ -267,8 +289,8 @@ async function displayLogs (logs, onRefilter) {
 
   await withScreenSession(async (renderer) => {
     // 创建分页显示（动态计算每页条数）
-    const pageSize = calculateDynamicPageSize();
-    const pagedDisplay = new PagedDisplay(logs, pageSize);
+    let pageSize = calculateDynamicPageSize();
+    let pagedDisplay = new PagedDisplay(logs, pageSize);
 
     // 主循环
     while (true) {
@@ -289,7 +311,22 @@ async function displayLogs (logs, onRefilter) {
         onRefilter();
         return;
       } else if (action === 'exit') {
+        // 退出时恢复 stdin 状态
+        process.stdin.setRawMode(false);
+        process.stdin.pause();
         break;
+      } else if (action === 'resize') {
+        // 终端大小改变，重新计算分页
+        const oldPageSize = pageSize;
+        pageSize = calculateDynamicPageSize();
+        if (oldPageSize !== pageSize) {
+          // 获取当前页第一条记录的绝对索引
+          const currentIndex = pagedDisplay.currentPage * pagedDisplay.pageSize;
+          // 重新创建分页器
+          pagedDisplay = new PagedDisplay(logs, pageSize);
+          // 尝试恢复到之前的位置
+          pagedDisplay.goToIndex(Math.min(currentIndex, logs.length - 1));
+        }
       }
     }
   });

package/src/publish/core/builder.js

@@ -3,7 +3,7 @@
  * 检测和执行构建脚本
  */
 
-const { execaCommand } = require('execa');
+const { execa } = require('execa');
 
 /**
  * 检测构建脚本
@@ -36,7 +36,7 @@ function detectBuildScripts(scripts) {
  */
 async function runBuild(pkgPath, scriptName) {
   try {
-    const result = await execaCommand(`npm run ${scriptName}`, {
+    const result = await execa(`npm`, ['run', scriptName], {
       cwd: pkgPath,
       stdout: 'inherit',
       stderr: 'inherit'

package/src/publish/registry/adapters/npm.js

@@ -3,7 +3,7 @@
  * 支持发布到 npm 兼容的注册源
  */
 
-const { execaCommand } = require('execa');
+const { execa } = require('execa');
 const { writeFileSync, unlinkSync, existsSync } = require('fs');
 const { join } = require('path');
 const { BaseAdapter } = require('./base.js');
@@ -28,7 +28,7 @@ class NpmAdapter extends BaseAdapter {
       if (tag) args.push('--tag', tag);
       if (dryRun) args.push('--dry-run');
 
-      await execaCommand('npm ' + args.join(' '), {
+      await execa('npm', args, {
         cwd: pkg.path,
         stdout: 'inherit',
         stderr: 'inherit'
@@ -62,7 +62,7 @@ class NpmAdapter extends BaseAdapter {
     writeFileSync(tmpNpmrcPath, npmrcContent, 'utf-8');
 
     try {
-      const result = await execaCommand('npm whoami', {
+      const result = await execa('npm', ['whoami'], {
         env: {
           ...process.env,
           npm_config_userconfig: tmpNpmrcPath
@@ -100,7 +100,7 @@ class NpmAdapter extends BaseAdapter {
         args.push('--registry', this.registry);
       }
 
-      await execaCommand('npm ' + args.join(' '), {
+      await execa('npm', args, {
         env: {
           ...process.env,
           npm_config_registry: this.registry

package/src/publish/ui.js

@@ -423,6 +423,18 @@ async function showPublishResults(renderer, results, registries) {
  * 运行发布流程
  */
 async function runPublishFlow(targetPath, options) {
+  const { existsSync } = require('fs');
+  const { join } = require('path');
+
+  // 检查 package.json 是否存在
+  const packageJsonPath = join(targetPath, 'package.json');
+  if (!existsSync(packageJsonPath)) {
+    console.error(chalk.red('\n错误: 当前目录不是 npm 包或 npm 工作空间'));
+    console.error(chalk.yellow(`\n未找到 package.json 文件: ${packageJsonPath}`));
+    console.error(chalk.gray('\n请确保在正确的 npm 项目目录下执行此命令\n'));
+    process.exit(1);
+  }
+
   return withScreenSession(async (renderer) => {
     // 1. 扫描预览页
     const scanResult = await showScanPreview(renderer, targetPath);