axhub-make 1.0.2 → 1.0.3

package/bin/index.js

@@ -2,90 +2,108 @@
 
 const fs = require('fs-extra');
 const path = require('path');
+const os = require('os');
 const { execFileSync, execSync } = require('child_process');
-const inquirer = require('inquirer');
 const chalk = require('chalk');
 
-async function run() {
-  console.log(chalk.magenta.bold('\n🚀 Axhub Make - 项目初始化\n'));
-
-  // -----------------------------
-  // 1. 参数解析
-  // -----------------------------
-  const args = process.argv.slice(2);
-  let templateGit = '';
+// -----------------------------
+// 参数解析（无依赖，稳定）
+// -----------------------------
+function parseArgs(argv) {
+  const args = argv.slice(2);
+  const opts = {
+    dir: '.',
+    template: 'https://github.com/lintendo/Axhub-Make.git',
+    install: true,
+    start: true,
+    force: false,
+    pm: null
+  };
 
   for (let i = 0; i < args.length; i++) {
-    if (args[i] === '-t' || args[i] === '--template') {
-      templateGit = args[i + 1];
-      break;
+    const a = args[i];
+
+    if (!a.startsWith('-') && opts.dir === '.') {
+      opts.dir = a;
+      continue;
     }
-  }
 
-  // -----------------------------
-  // 2. 交互
-  // -----------------------------
-  const questions = [
-    {
-      type: 'input',
-      name: 'projectName',
-      message: '请输入项目名称：',
-      default: 'my-app'
+    if (a === '-t' || a === '--template') {
+      opts.template = args[++i];
+      continue;
     }
-  ];
-
-  if (!templateGit) {
-    questions.push({
-      type: 'input',
-      name: 'customTemplateGit',
-      message: '请输入 Git 仓库地址：',
-      default: 'https://github.com/lintendo/Axhub-Make.git'
-    });
+
+    if (a === '--no-install') opts.install = false;
+    if (a === '--no-start') opts.start = false;
+    if (a === '--force') opts.force = true;
+    if (a === '--pm') opts.pm = args[++i];
   }
 
-  const answers = await inquirer.prompt(questions);
+  return opts;
+}
+
+async function run() {
+  console.log(chalk.magenta.bold('\n🚀 Axhub Make\n'));
+
+  const opts = parseArgs(process.argv);
+
+  const isCurrentDir =
+    opts.dir === '.' || opts.dir === './' || opts.dir === '';
+
+  const targetDir = isCurrentDir
+    ? process.cwd()
+    : path.resolve(process.cwd(), opts.dir);
 
-  const projectName = answers.projectName.trim();
-  templateGit = templateGit || answers.customTemplateGit;
-  const targetDir = path.resolve(process.cwd(), projectName);
+  const projectName = path.basename(targetDir);
 
   // -----------------------------
-  // 3. 目录检查
+  // 当前目录检测
   // -----------------------------
   if (fs.existsSync(targetDir)) {
-    const { overwrite } = await inquirer.prompt([
-      {
-        type: 'confirm',
-        name: 'overwrite',
-        message: `目录 ${projectName} 已存在，是否覆盖？`,
-        default: false
-      }
-    ]);
-
-    if (!overwrite) {
-      console.log(chalk.yellow('已取消'));
-      return;
+    const files = await fs.readdir(targetDir);
+
+    if (files.length > 0 && !opts.force) {
+      console.log(
+        chalk.red(
+          '❌ 当前目录非空。\n' +
+          '如确认覆盖，请使用 --force'
+        )
+      );
+      process.exit(1);
     }
 
-    await fs.remove(targetDir);
+    if (!isCurrentDir && opts.force) {
+      await fs.remove(targetDir);
+    }
   }
 
   // -----------------------------
-  // 4. git clone（安全版，支持空格/中文路径）
+  // 模板下载（当前目录使用临时目录）
   // -----------------------------
-  console.log(chalk.blue('\n📡 正在下载模板...\n'));
+  console.log(chalk.blue('\n📡 下载模板...\n'));
+
+  const tmpDir = isCurrentDir
+    ? path.join(os.tmpdir(), `axhub-make-${Date.now()}`)
+    : targetDir;
 
   execFileSync(
     'git',
-    ['clone', '--depth', '1', templateGit, targetDir],
+    ['clone', '--depth', '1', opts.template, tmpDir],
     { stdio: 'inherit' }
   );
 
-  // 移除 .git
-  await fs.remove(path.join(targetDir, '.git'));
+  await fs.remove(path.join(tmpDir, '.git'));
+
+  if (isCurrentDir) {
+    await fs.copy(tmpDir, targetDir, {
+      overwrite: true,
+      errorOnExist: false
+    });
+    await fs.remove(tmpDir);
+  }
 
   // -----------------------------
-  // 5. 自动修改 package.json
+  // package.json 处理
   // -----------------------------
   const pkgPath = path.join(targetDir, 'package.json');
   if (fs.existsSync(pkgPath)) {
@@ -95,55 +113,41 @@ async function run() {
   }
 
   // -----------------------------
-  // 6. 安装依赖
-  // -----------------------------
-  const pkgManager = getPackageManager();
-
-  console.log(
-    chalk.blue(`\n📦 正在使用 ${pkgManager} 安装依赖（请稍等）...\n`)
-  );
-
-  execSync(`${pkgManager} install`, {
-    cwd: targetDir,
-    stdio: 'inherit'
-  });
-
-  // -----------------------------
-  // 7. 直接启动（dev 优先，fallback start）
+  // 安装依赖
   // -----------------------------
-  console.log(chalk.green('\n🚀 依赖安装完成，正在启动项目...\n'));
+  const pm = opts.pm || detectPackageManager();
 
-  try {
-    execSync(`${pkgManager} run dev`, {
+  if (opts.install) {
+    console.log(chalk.blue(`\n📦 安装依赖（${pm}）...\n`));
+    execSync(`${pm} install`, {
       cwd: targetDir,
       stdio: 'inherit'
     });
-  } catch (e) {
+  }
+
+  // -----------------------------
+  // 启动项目
+  // -----------------------------
+  if (opts.start) {
+    console.log(chalk.green('\n🚀 启动项目...\n'));
     try {
-      execSync(`${pkgManager} run start`, {
-        cwd: targetDir,
-        stdio: 'inherit'
-      });
-    } catch (_) {
-      // Ctrl+C 中断属于正常行为
+      execSync(`${pm} run dev`, { cwd: targetDir, stdio: 'inherit' });
+    } catch {
+      try {
+        execSync(`${pm} run start`, { cwd: targetDir, stdio: 'inherit' });
+      } catch {}
     }
   }
+
+  console.log(chalk.green('\n✅ 完成'));
 }
 
 // -----------------------------
 // 包管理器检测
 // -----------------------------
-function getPackageManager() {
-  try {
-    execSync('pnpm -v', { stdio: 'ignore' });
-    return 'pnpm';
-  } catch {}
-
-  try {
-    execSync('yarn -v', { stdio: 'ignore' });
-    return 'yarn';
-  } catch {}
-
+function detectPackageManager() {
+  try { execSync('pnpm -v', { stdio: 'ignore' }); return 'pnpm'; } catch {}
+  try { execSync('yarn -v', { stdio: 'ignore' }); return 'yarn'; } catch {}
   return 'npm';
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "axhub-make",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Axhub Make scaffolding tool",
   "bin": {
     "axhub-make": "./bin/index.js"