@mindbase/node-tools 1.3.11 → 1.3.13

package/README.md

@@ -154,9 +154,20 @@ npmpublish project --init
 ### 配置文件
 
 - **全局配置**: `~/.node-tools-publish.json` - 存储注册源和 token
-- **项目配置**: `./.node-tools-publish.json` - 存储项目默认配置
+- **项目配置**: `package.json` 的 `publishConfig` 字段
+
+```json
+{
+  "publishConfig": {
+    "defaultRegistries": ["npm", "codeup"],
+    "defaultTokens": {
+      "codeup": "token-1"
+    }
+  }
+}
+```
 
-> 注意: 请将 `.node-tools-publish.json` 添加到 `.gitignore`
+> 兼容性提示: 如果存在旧版 `.node-tools-publish.json` 文件，仍可正常使用，建议迁移到 `package.json`
 
 ---
 

package/bin/publish.js

@@ -222,8 +222,7 @@ program
 
         await projectConfig.initConfig(registryId, tokenId);
         console.log(chalk.green('\n✓ 项目配置已初始化'));
-        console.log(chalk.gray(`  配置文件: ${projectConfig.configPath}`));
-        console.log(chalk.yellow('  注意: 请将 .node-tools-publish.json 添加到 .gitignore'));
+        console.log(chalk.gray(`  配置文件: package.json (publishConfig)`));
       } else {
         projectConfig.showConfig();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindbase/node-tools",
-  "version": "1.3.11",
+  "version": "1.3.13",
   "description": "Node.js 开发工具集合：清理 node_modules、查看 Git 日志、发布包",
   "main": "src/index.js",
   "bin": {
@@ -41,6 +41,12 @@
     "node": "20.20.0"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "defaultRegistries": [
+      "npm-official"
+    ],
+    "defaultTokens": {
+      "npm-official": "npm-official-1770867074417"
+    }
   }
 }

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/registry/project-config.js

@@ -1,18 +1,18 @@
 /**
  * 项目配置管理模块
- * 每个项目记录自己默认的源和 token ID
+ * 从 package.json 的 publishConfig 字段读取项目默认配置
+ * 兼容旧的 .node-tools-publish.json 文件
  */
 
 const { existsSync, readFileSync, writeFileSync } = require('fs');
 const { join } = require('path');
 
-const PROJECT_CONFIG_FILENAME = '.node-tools-publish.json';
+const OLD_CONFIG_FILENAME = '.node-tools-publish.json';
+const PACKAGE_JSON_FILENAME = 'package.json';
 
-const DEFAULT_PROJECT_CONFIG = {
-  defaults: {
-    registries: [],
-    tokens: {} // { registryId: tokenId }
-  }
+const DEFAULT_PUBLISH_CONFIG = {
+  defaultRegistries: [],
+  defaultTokens: {} // { registryId: tokenId }
 };
 
 /**
@@ -21,103 +21,173 @@ const DEFAULT_PROJECT_CONFIG = {
 class ProjectConfig {
   constructor(projectPath) {
     this.projectPath = projectPath;
-    this.configPath = join(projectPath, PROJECT_CONFIG_FILENAME);
+    this.packageJsonPath = join(projectPath, PACKAGE_JSON_FILENAME);
+    this.oldConfigPath = join(projectPath, OLD_CONFIG_FILENAME);
   }
 
   /**
-   * 读取项目配置
+   * 读取 package.json
    */
-  getProjectConfig() {
-    if (!existsSync(this.configPath)) {
-      return JSON.parse(JSON.stringify(DEFAULT_PROJECT_CONFIG));
+  getPackageJson() {
+    if (!existsSync(this.packageJsonPath)) {
+      return {};
     }
 
     try {
-      const content = readFileSync(this.configPath, 'utf-8');
+      const content = readFileSync(this.packageJsonPath, 'utf-8');
       return JSON.parse(content);
     } catch (error) {
-      console.error('项目配置文件读取失败');
-      return JSON.parse(JSON.stringify(DEFAULT_PROJECT_CONFIG));
+      console.error('package.json 读取失败');
+      return {};
+    }
+  }
+
+  /**
+   * 保存 package.json
+   */
+  setPackageJson(pkg) {
+    writeFileSync(this.packageJsonPath, JSON.stringify(pkg, null, 2) + '\n', 'utf-8');
+  }
+
+  /**
+   * 读取发布配置（兼容旧文件）
+   */
+  getPublishConfig() {
+    const pkg = this.getPackageJson();
+
+    // 优先从 package.json.publishConfig 读取
+    if (pkg.publishConfig) {
+      return {
+        defaultRegistries: pkg.publishConfig.defaultRegistries || [],
+        defaultTokens: pkg.publishConfig.defaultTokens || {}
+      };
+    }
+
+    // 兼容旧的 .node-tools-publish.json
+    if (existsSync(this.oldConfigPath)) {
+      try {
+        const content = readFileSync(this.oldConfigPath, 'utf-8');
+        const oldConfig = JSON.parse(content);
+        // 迁移提示
+        console.log(chalk.yellow('检测到旧配置文件，建议迁移到 package.json'));
+        return {
+          defaultRegistries: oldConfig.defaults?.registries || [],
+          defaultTokens: oldConfig.defaults?.tokens || {}
+        };
+      } catch (error) {
+        // 忽略旧文件错误
+      }
     }
+
+    return DEFAULT_PUBLISH_CONFIG;
   }
 
   /**
-   * 保存项目配置
+   * 保存发布配置到 package.json
    */
-  setProjectConfig(config) {
-    writeFileSync(this.configPath, JSON.stringify(config, null, 2), 'utf-8');
+  setPublishConfig(config) {
+    const pkg = this.getPackageJson();
+
+    // 确保 publishConfig 存在
+    if (!pkg.publishConfig) {
+      pkg.publishConfig = {};
+    }
+
+    // 保留 npm 标准 registry 字段
+    const npmRegistry = pkg.publishConfig.registry;
+
+    // 设置我们的配置
+    pkg.publishConfig.defaultRegistries = config.defaultRegistries;
+    pkg.publishConfig.defaultTokens = config.defaultTokens;
+
+    // 恢复 npm registry
+    if (npmRegistry) {
+      pkg.publishConfig.registry = npmRegistry;
+    }
+
+    this.setPackageJson(pkg);
   }
 
   /**
    * 获取默认源列表
    */
   getDefaultRegistries() {
-    const config = this.getProjectConfig();
-    return config.defaults.registries || [];
+    const config = this.getPublishConfig();
+    return config.defaultRegistries || [];
   }
 
   /**
    * 设置默认源列表
    */
   setDefaultRegistries(registryIds) {
-    const config = this.getProjectConfig();
-    config.defaults.registries = registryIds;
+    const config = this.getPublishConfig();
+    config.defaultRegistries = registryIds;
 
     // 清理无效的 token 映射
     const newTokens = {};
     for (const registryId of registryIds) {
-      if (config.defaults.tokens[registryId]) {
-        newTokens[registryId] = config.defaults.tokens[registryId];
+      if (config.defaultTokens[registryId]) {
+        newTokens[registryId] = config.defaultTokens[registryId];
       }
     }
-    config.defaults.tokens = newTokens;
+    config.defaultTokens = newTokens;
 
-    this.setProjectConfig(config);
+    this.setPublishConfig(config);
   }
 
   /**
    * 获取指定源的默认 token ID
    */
   getDefaultTokenId(registryId) {
-    const config = this.getProjectConfig();
-    return config.defaults.tokens[registryId];
+    const config = this.getPublishConfig();
+    return config.defaultTokens[registryId];
   }
 
   /**
    * 设置指定源的默认 token ID
    */
   setDefaultToken(registryId, tokenId) {
-    const config = this.getProjectConfig();
-    config.defaults.tokens[registryId] = tokenId;
-    this.setProjectConfig(config);
+    const config = this.getPublishConfig();
+    config.defaultTokens[registryId] = tokenId;
+    this.setPublishConfig(config);
   }
 
   /**
    * 初始化项目配置
    */
   async initConfig(defaultRegistryId, defaultTokenId) {
-    const config = this.getProjectConfig();
-    config.defaults.registries = [defaultRegistryId];
-    config.defaults.tokens = {
-      [defaultRegistryId]: defaultTokenId
+    const config = {
+      defaultRegistries: [defaultRegistryId],
+      defaultTokens: {
+        [defaultRegistryId]: defaultTokenId
+      }
     };
-    this.setProjectConfig(config);
+    this.setPublishConfig(config);
   }
 
   /**
    * 显示配置
    */
   showConfig() {
-    const config = this.getProjectConfig();
+    const config = this.getPublishConfig();
+    const pkg = this.getPackageJson();
 
-    console.log('项目配置:');
-    console.log(`  配置文件: ${this.configPath}`);
-    console.log(`\n默认源: ${config.defaults.registries.join(', ') || '未设置'}`);
+    console.log('项目发布配置:');
+    console.log(`  配置文件: ${this.packageJsonPath}`);
+    console.log(`\n默认源: ${config.defaultRegistries.join(', ') || '未设置'}`);
 
     console.log('\n默认 Tokens:');
-    for (const [registryId, tokenId] of Object.entries(config.defaults.tokens)) {
+    if (Object.keys(config.defaultTokens).length === 0) {
+      console.log('  未设置');
+    }
+    for (const [registryId, tokenId] of Object.entries(config.defaultTokens)) {
       console.log(`  ${registryId}: ${tokenId}`);
     }
+
+    // 兼容性提示
+    if (existsSync(this.oldConfigPath)) {
+      console.log(chalk.yellow(`\n提示: 检测到旧配置文件 ${OLD_CONFIG_FILENAME}，可删除`));
+    }
   }
 
   /**
@@ -128,12 +198,17 @@ class ProjectConfig {
     const { spawn } = require('child_process');
     const { platform } = process;
 
-    // 确保配置文件存在
-    if (!existsSync(this.configPath)) {
-      this.setProjectConfig(DEFAULT_PROJECT_CONFIG);
+    // 确保 publishConfig 字段存在
+    const pkg = this.getPackageJson();
+    if (!pkg.publishConfig) {
+      pkg.publishConfig = {
+        defaultRegistries: [],
+        defaultTokens: {}
+      };
+      this.setPackageJson(pkg);
     }
 
-    console.log(`打开项目配置文件: ${this.configPath}`);
+    console.log(`打开项目配置文件: ${this.packageJsonPath}`);
 
     // 优先使用 code（VS Code）
     const editorCmd = process.env.EDITOR || (platform === 'win32' ? 'code' : 'vim');
@@ -143,7 +218,7 @@ class ProjectConfig {
         ? { shell: true, stdio: 'inherit' }
         : { stdio: 'inherit' };
 
-      spawn('code', [this.configPath, '--wait'], spawnOptions)
+      spawn('code', [this.packageJsonPath, '--wait'], spawnOptions)
         .on('exit', (code) => {
           if (code === 0) {
             console.log('\n配置已保存');
@@ -153,20 +228,21 @@ class ProjectConfig {
         })
         .on('error', () => {
           console.log('VS Code 不可用，使用默认编辑器...');
-          edit(this.configPath, (code) => {
+          edit(this.packageJsonPath, (code) => {
             console.log(code === 0 ? '\n配置已保存' : `\n编辑器退出，代码: ${code}`);
           });
         });
     } else {
-      edit(this.configPath, (code) => {
+      edit(this.packageJsonPath, (code) => {
         console.log(code === 0 ? '\n配置已保存' : `\n编辑器退出，代码: ${code}`);
       });
     }
   }
 }
 
+const chalk = require('chalk');
+
 module.exports = {
   ProjectConfig,
-  PROJECT_CONFIG_FILENAME,
-  DEFAULT_PROJECT_CONFIG
+  DEFAULT_PUBLISH_CONFIG
 };

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);