@agile-team/robot-cli 1.0.3 → 1.0.5

package/lib/utils.js

@@ -1,58 +1,155 @@
-// lib/utils.js - 优化版本
+// lib/utils.js - 增强版本
 import fs from 'fs-extra';
 import path from 'path';
-import { execSync } from 'child_process';
 import chalk from 'chalk';
+import { execSync } from 'child_process';
+import fetch from 'node-fetch';
+
+/**
+ * 检测当前使用的包管理器
+ */
+export function detectPackageManager() {
+  try {
+    // 检查各种包管理器的可用性
+    const managers = [];
+    
+    // 检查 bun
+    try {
+      execSync('bun --version', { stdio: 'ignore' });
+      managers.push('bun');
+    } catch {}
+    
+    // 检查 pnpm
+    try {
+      execSync('pnpm --version', { stdio: 'ignore' });
+      managers.push('pnpm');
+    } catch {}
+    
+    // 检查 yarn
+    try {
+      execSync('yarn --version', { stdio: 'ignore' });
+      managers.push('yarn');
+    } catch {}
+    
+    // npm 通常总是可用的
+    try {
+      execSync('npm --version', { stdio: 'ignore' });
+      managers.push('npm');
+    } catch {}
+    
+    return managers;
+  } catch (error) {
+    return ['npm']; // 默认返回 npm
+  }
+}
+
+/**
+ * 获取当前CLI的安装信息
+ */
+export function getInstallationInfo() {
+  try {
+    const packagePath = process.env.npm_config_global 
+      ? path.join(process.env.npm_config_global, 'node_modules', '@agile-team', 'robot-cli')
+      : null;
+      
+    return {
+      binPath: process.argv[1],
+      packagePath,
+      nodeVersion: process.version,
+      platform: process.platform,
+      arch: process.arch
+    };
+  } catch (error) {
+    return {
+      binPath: process.argv[1],
+      packagePath: null,
+      nodeVersion: process.version,
+      platform: process.platform,
+      arch: process.arch
+    };
+  }
+}
+
+/**
+ * 诊断安装问题
+ */
+export function diagnoseInstallation() {
+  const info = getInstallationInfo();
+  const managers = detectPackageManager();
+  
+  console.log(chalk.blue('🔍 安装诊断信息:'));
+  console.log();
+  console.log(`  执行文件: ${chalk.cyan(info.binPath)}`);
+  console.log(`  Node版本: ${chalk.cyan(info.nodeVersion)}`);
+  console.log(`  系统平台: ${chalk.cyan(info.platform)} (${info.arch})`);
+  console.log(`  可用包管理器: ${chalk.cyan(managers.join(', '))}`);
+  
+  if (info.packagePath) {
+    console.log(`  包路径: ${chalk.cyan(info.packagePath)}`);
+  }
+  
+  console.log();
+  console.log(chalk.blue('💡 推荐的安装方式:'));
+  
+  if (managers.includes('bun')) {
+    console.log(chalk.green('  bun install -g @agile-team/robot-cli'));
+  }
+  if (managers.includes('pnpm')) {
+    console.log(chalk.green('  pnpm install -g @agile-team/robot-cli'));
+  }
+  if (managers.includes('yarn')) {
+    console.log(chalk.green('  yarn global add @agile-team/robot-cli'));
+  }
+  if (managers.includes('npm')) {
+    console.log(chalk.green('  npm install -g @agile-team/robot-cli'));
+  }
+  
+  console.log();
+  console.log(chalk.yellow('⚠️  建议只使用一种包管理器来避免冲突'));
+}
 
 /**
  * 验证项目名称
  */
 export function validateProjectName(name) {
   const errors = [];
-  
-  // 检查是否为空
-  if (!name || !name.trim()) {
+
+  if (!name || typeof name !== 'string') {
     errors.push('项目名称不能为空');
     return { valid: false, errors };
   }
-  
+
   const trimmedName = name.trim();
-  
-  // 检查长度
-  if (trimmedName.length < 1) {
+
+  if (trimmedName.length === 0) {
     errors.push('项目名称不能为空');
   }
-  
+
   if (trimmedName.length > 214) {
-    errors.push('项目名称过长 (最大214个字符)');
+    errors.push('项目名称不能超过214个字符');
   }
-  
-  // 检查字符规则
-  if (!/^[a-z0-9\-_@.]+$/i.test(trimmedName)) {
-    errors.push('项目名称只能包含字母、数字、连字符、下划线、@和点');
+
+  if (trimmedName.toLowerCase() !== trimmedName) {
+    errors.push('项目名称只能包含小写字母');
   }
-  
-  // 检查开头字符
+
   if (/^[._]/.test(trimmedName)) {
-    errors.push('项目名称不能以点或下划线开头');
+    errors.push('项目名称不能以 "." 或 "_" 开头');
   }
-  
-  // 检查是否包含空格
-  if (/\s/.test(trimmedName)) {
-    errors.push('项目名称不能包含空格');
+
+  if (!/^[a-z0-9._-]+$/.test(trimmedName)) {
+    errors.push('项目名称只能包含字母、数字、点、下划线和短横线');
   }
-  
-  // 检查保留字
+
   const reservedNames = [
-    'node_modules', 'favicon.ico', 'con', 'prn', 'aux', 'nul',
-    'com1', 'com2', 'com3', 'com4', 'com5', 'com6', 'com7', 'com8', 'com9',
-    'lpt1', 'lpt2', 'lpt3', 'lpt4', 'lpt5', 'lpt6', 'lpt7', 'lpt8', 'lpt9'
+    'node_modules', 'favicon.ico', '.git', '.env', 'package.json',
+    'npm', 'yarn', 'pnpm', 'bun', 'robot'
   ];
-  
-  if (reservedNames.includes(trimmedName.toLowerCase())) {
-    errors.push(`"${trimmedName}" 是保留字，不能作为项目名称`);
+
+  if (reservedNames.includes(trimmedName)) {
+    errors.push(`"${trimmedName}" 是保留名称，请使用其他名称`);
   }
-  
+
   return {
     valid: errors.length === 0,
     errors
@@ -63,208 +160,79 @@ export function validateProjectName(name) {
  * 复制模板文件
  */
 export async function copyTemplate(sourcePath, targetPath) {
-  try {
-    // 确保目标目录存在
-    await fs.ensureDir(targetPath);
-    
-    // 获取源目录中的所有文件和文件夹
-    const items = await fs.readdir(sourcePath);
-    
-    for (const item of items) {
-      const sourceItemPath = path.join(sourcePath, item);
-      const targetItemPath = path.join(targetPath, item);
-      
-      // 跳过不需要的文件
-      if (shouldSkipFile(item)) {
-        continue;
-      }
-      
-      const stats = await fs.stat(sourceItemPath);
-      
-      if (stats.isDirectory()) {
-        // 递归复制目录
-        await copyTemplate(sourceItemPath, targetItemPath);
-      } else {
-        // 复制文件
-        await fs.copy(sourceItemPath, targetItemPath);
-      }
-    }
-  } catch (error) {
-    throw new Error(`复制模板文件失败: ${error.message}`);
+  if (!fs.existsSync(sourcePath)) {
+    throw new Error(`源路径不存在: ${sourcePath}`);
   }
-}
 
-/**
- * 判断是否应该跳过文件/目录
- */
-function shouldSkipFile(fileName) {
-  const skipPatterns = [
-    '.git',
-    '.DS_Store',
-    'Thumbs.db',
-    '.vscode',
-    '.idea',
-    'node_modules',
-    '.cache',
-    'dist',
-    'build',
-    '*.log',
-    '.env.local',
-    '.env.*.local'
-  ];
-  
-  return skipPatterns.some(pattern => {
-    if (pattern.includes('*')) {
-      // 简单的通配符匹配
-      const regex = new RegExp(pattern.replace(/\*/g, '.*'));
-      return regex.test(fileName);
+  await fs.ensureDir(targetPath);
+  await fs.copy(sourcePath, targetPath, {
+    filter: (src) => {
+      const basename = path.basename(src);
+      // 排除不需要的文件
+      return ![
+        '.git',
+        'node_modules',
+        '.DS_Store',
+        'Thumbs.db',
+        '.vscode',
+        '.idea'
+      ].includes(basename);
     }
-    return fileName === pattern;
   });
 }
 
 /**
- * 安装项目依赖
+ * 安装依赖
  */
-export async function installDependencies(projectPath, spinner, packageManager) {
+export async function installDependencies(projectPath, spinner, packageManager = 'npm') {
   const originalCwd = process.cwd();
-  
+
   try {
     process.chdir(projectPath);
-    
-    // 如果没有指定包管理器，自动检测（优先bun和pnpm）
-    const pm = packageManager || detectPackageManager(projectPath);
-    
-    if (spinner) {
-      spinner.text = `使用 ${pm} 安装依赖...`;
-    }
-    
-    // 安装依赖
-    const installCommand = getInstallCommand(pm);
-    
-    execSync(installCommand, {
-      stdio: 'pipe', // 不显示安装输出
-      timeout: 300000 // 5分钟超时
-    });
-    
-  } catch (error) {
-    throw new Error(`安装依赖失败: ${error.message}`);
-  } finally {
-    process.chdir(originalCwd);
-  }
-}
 
-/**
- * 检测包管理器 - 优先推荐bun和pnpm
- */
-function detectPackageManager(projectPath) {
-  // 1. 检查项目中是否有锁文件
-  if (fs.existsSync(path.join(projectPath, 'bun.lockb'))) {
-    return 'bun';
-  }
-  
-  if (fs.existsSync(path.join(projectPath, 'pnpm-lock.yaml'))) {
-    return 'pnpm';
-  }
-  
-  // 2. 检查全局是否安装了bun（最优先）
-  try {
-    execSync('bun --version', { stdio: 'ignore' });
-    return 'bun';
-  } catch {
-    // bun 不可用
-  }
-  
-  // 3. 检查全局是否安装了pnpm（次优先）
-  try {
-    execSync('pnpm --version', { stdio: 'ignore' });
-    return 'pnpm';
-  } catch {
-    // pnpm 不可用
-  }
-  
-  // 4. 检查yarn（兼容性）
-  if (fs.existsSync(path.join(projectPath, 'yarn.lock'))) {
-    return 'yarn';
-  }
-  
-  try {
-    execSync('yarn --version', { stdio: 'ignore' });
-    return 'yarn';
-  } catch {
-    // yarn 不可用
-  }
-  
-  // 5. 默认使用npm（最后选择）
-  return 'npm';
-}
+    // 检查 package.json 是否存在
+    const packageJsonPath = path.join(projectPath, 'package.json');
+    if (!fs.existsSync(packageJsonPath)) {
+      if (spinner) {
+        spinner.text = '⚠️  跳过依赖安装 (无 package.json)';
+      }
+      return;
+    }
 
-/**
- * 获取安装命令
- */
-function getInstallCommand(packageManager) {
-  const commands = {
-    bun: 'bun install',
-    pnpm: 'pnpm install',
-    yarn: 'yarn install',
-    npm: 'npm install'
-  };
-  
-  return commands[packageManager] || commands.npm;
-}
+    // 根据包管理器选择安装命令
+    const installCommands = {
+      bun: 'bun install',
+      pnpm: 'pnpm install',
+      yarn: 'yarn install',
+      npm: 'npm install'
+    };
 
-/**
- * 检查命令是否存在
- */
-export function commandExists(command) {
-  try {
-    execSync(`${command} --version`, { stdio: 'ignore' });
-    return true;
-  } catch {
-    return false;
-  }
-}
+    const command = installCommands[packageManager] || 'npm install';
 
-/**
- * 格式化文件大小
- */
-export function formatFileSize(bytes) {
-  if (bytes === 0) return '0 B';
-  
-  const k = 1024;
-  const sizes = ['B', 'KB', 'MB', 'GB'];
-  const i = Math.floor(Math.log(bytes) / Math.log(k));
-  
-  return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
-}
+    if (spinner) {
+      spinner.text = `📦 使用 ${packageManager} 安装依赖...`;
+    }
 
-/**
- * 获取文件夹大小
- */
-export async function getFolderSize(folderPath) {
-  let size = 0;
+    execSync(command, { 
+      stdio: 'ignore',
+      timeout: 300000 // 5分钟超时
+    });
 
-  async function calculateSize(currentPath) {
-    try {
-      const items = await fs.readdir(currentPath);
-      
-      for (const item of items) {
-        const itemPath = path.join(currentPath, item);
-        const stats = await fs.stat(itemPath);
-        
-        if (stats.isDirectory()) {
-          await calculateSize(itemPath);
-        } else {
-          size += stats.size;
-        }
-      }
-    } catch (error) {
-      // 忽略权限错误等
+  } catch (error) {
+    if (spinner) {
+      spinner.text = `⚠️  依赖安装失败，请手动安装`;
     }
+    console.log();
+    console.log(chalk.yellow('⚠️  自动安装依赖失败'));
+    console.log(chalk.dim(`   错误: ${error.message}`));
+    console.log();
+    console.log(chalk.blue('💡 请手动安装:'));
+    console.log(chalk.cyan(`   cd ${path.basename(projectPath)}`));
+    console.log(chalk.cyan(`   ${packageManager} install`));
+    console.log();
+  } finally {
+    process.chdir(originalCwd);
   }
-
-  await calculateSize(folderPath);
-  return size;
 }
 
 /**
@@ -272,19 +240,27 @@ export async function getFolderSize(folderPath) {
  */
 export async function checkNetworkConnection() {
   try {
-    const { default: fetch } = await import('node-fetch');
-    const response = await fetch('https://github.com', {
+    const response = await fetch('https://api.github.com', {
       method: 'HEAD',
       timeout: 5000
     });
     return response.ok;
-  } catch {
-    return false;
+  } catch (error) {
+    // 尝试备用检查
+    try {
+      const response = await fetch('https://www.npmjs.com', {
+        method: 'HEAD',
+        timeout: 5000
+      });
+      return response.ok;
+    } catch (backupError) {
+      return false;
+    }
   }
 }
 
 /**
- * 生成项目统计信息
+ * 生成项目统计
  */
 export async function generateProjectStats(projectPath) {
   try {
@@ -292,35 +268,35 @@ export async function generateProjectStats(projectPath) {
       files: 0,
       directories: 0,
       size: 0,
-      types: {}
+      fileTypes: {}
     };
 
-    async function analyze(currentPath) {
-      const items = await fs.readdir(currentPath);
-      
+    async function walkDir(dirPath) {
+      const items = await fs.readdir(dirPath);
+
       for (const item of items) {
-        if (shouldSkipFile(item)) continue;
-        
-        const itemPath = path.join(currentPath, item);
-        const itemStats = await fs.stat(itemPath);
-        
-        if (itemStats.isDirectory()) {
-          stats.directories++;
-          await analyze(itemPath);
+        const itemPath = path.join(dirPath, item);
+        const stat = await fs.stat(itemPath);
+
+        if (stat.isDirectory()) {
+          // 跳过 node_modules 等目录
+          if (!['node_modules', '.git', '.DS_Store'].includes(item)) {
+            stats.directories++;
+            await walkDir(itemPath);
+          }
         } else {
           stats.files++;
-          stats.size += itemStats.size;
-          
-          // 统计文件类型
+          stats.size += stat.size;
+
           const ext = path.extname(item).toLowerCase();
           if (ext) {
-            stats.types[ext] = (stats.types[ext] || 0) + 1;
+            stats.fileTypes[ext] = (stats.fileTypes[ext] || 0) + 1;
           }
         }
       }
     }
 
-    await analyze(projectPath);
+    await walkDir(projectPath);
     return stats;
   } catch (error) {
     return null;
@@ -328,17 +304,37 @@ export async function generateProjectStats(projectPath) {
 }
 
 /**
- * 美化打印项目统计
+ * 打印项目统计
  */
 export function printProjectStats(stats) {
   if (!stats) return;
-  
+
   console.log(chalk.blue('📊 项目统计:'));
-  console.log(`   文件数量: ${chalk.cyan(stats.files)}`);
-  console.log(`   目录数量: ${chalk.cyan(stats.directories)}`);
-  console.log(`   总大小: ${chalk.cyan(formatFileSize(stats.size))}`);
-  
-  if (Object.keys(stats.types).length > 0) {
-    console.log(`   文件类型: ${chalk.cyan(Object.keys(stats.types).join(', '))}`);
+  console.log(`   文件数量: ${chalk.cyan(stats.files)} 个`);
+  console.log(`   目录数量: ${chalk.cyan(stats.directories)} 个`);
+  console.log(`   项目大小: ${chalk.cyan(formatBytes(stats.size))}`);
+
+  const topTypes = Object.entries(stats.fileTypes)
+    .sort(([,a], [,b]) => b - a)
+    .slice(0, 5);
+
+  if (topTypes.length > 0) {
+    console.log('   主要文件类型:');
+    topTypes.forEach(([ext, count]) => {
+      console.log(`     ${ext}: ${chalk.cyan(count)} 个`);
+    });
   }
+}
+
+/**
+ * 格式化字节大小
+ */
+function formatBytes(bytes) {
+  if (bytes === 0) return '0 B';
+
+  const k = 1024;
+  const sizes = ['B', 'KB', 'MB', 'GB'];
+  const i = Math.floor(Math.log(bytes) / Math.log(k));
+
+  return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agile-team/robot-cli",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "🤖 现代化项目脚手架工具，支持多技术栈快速创建项目",
   "type": "module",
   "bin": {