axhub-make 1.0.3 → 1.0.4

package/bin/index.js

@@ -6,23 +6,225 @@ const os = require('os');
 const { execFileSync, execSync } = require('child_process');
 const chalk = require('chalk');
 
+function normalizeRelPath(p) {
+  return p.split(path.sep).join('/');
+}
+
+function escapeRegExp(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function globToRegExp(pattern) {
+  const normalized = pattern.split(path.sep).join('/');
+  let re = '^';
+  for (let i = 0; i < normalized.length; i++) {
+    const ch = normalized[i];
+    const next = normalized[i + 1];
+    if (ch === '*' && next === '*') {
+      re += '.*';
+      i++;
+      continue;
+    }
+    if (ch === '*') {
+      re += '[^/]*';
+      continue;
+    }
+    if (ch === '?') {
+      re += '[^/]';
+      continue;
+    }
+    re += escapeRegExp(ch);
+  }
+  re += '$';
+  return new RegExp(re);
+}
+
+function matchesAny(relPath, patterns) {
+  if (!Array.isArray(patterns) || patterns.length === 0) return false;
+  const p = relPath.startsWith('./') ? relPath.slice(2) : relPath;
+  return patterns.some((pattern) => globToRegExp(pattern).test(p));
+}
+
+function isValidConflictMode(v) {
+  return v === 'keep' || v === 'overwrite';
+}
+
+async function readUpdateRules(tmpDir) {
+  const rulesPath = path.join(tmpDir, 'scaffold.update.json');
+  if (!(await fs.pathExists(rulesPath))) {
+    return {
+      schemaVersion: 1,
+      neverOverwrite: [],
+      conflictCheck: [],
+      defaultOverwrite: true
+    };
+  }
+  const rules = await fs.readJson(rulesPath);
+  return {
+    schemaVersion: typeof rules.schemaVersion === 'number' ? rules.schemaVersion : 1,
+    neverOverwrite: Array.isArray(rules.neverOverwrite) ? rules.neverOverwrite : [],
+    conflictCheck: Array.isArray(rules.conflictCheck) ? rules.conflictCheck : [],
+    defaultOverwrite: typeof rules.defaultOverwrite === 'boolean' ? rules.defaultOverwrite : true
+  };
+}
+
+async function isAxhubMakeProject(dir) {
+  const checks = [
+    path.join(dir, 'vite.config.ts'),
+    path.join(dir, 'entries.json'),
+    path.join(dir, 'src', 'common', 'axhub-types.ts')
+  ];
+  const results = await Promise.all(checks.map((p) => fs.pathExists(p)));
+  return results.every(Boolean);
+}
+
+async function listFilesRecursive(rootDir) {
+  const files = [];
+  const stack = [rootDir];
+
+  while (stack.length > 0) {
+    const current = stack.pop();
+    const entries = await fs.readdir(current, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.name === '.git' || entry.name === 'node_modules') continue;
+      const fullPath = path.join(current, entry.name);
+      if (entry.isDirectory()) {
+        stack.push(fullPath);
+        continue;
+      }
+      if (entry.isFile()) {
+        files.push(fullPath);
+      }
+    }
+  }
+
+  return files;
+}
+
+async function filesEqual(a, b) {
+  try {
+    const [abuf, bbuf] = await Promise.all([fs.readFile(a), fs.readFile(b)]);
+    if (abuf.length !== bbuf.length) return false;
+    return abuf.equals(bbuf);
+  } catch {
+    return false;
+  }
+}
+
+async function planUpdateFromTemplate(tmpDir, targetDir, rules, conflictMode) {
+  const templateFiles = await listFilesRecursive(tmpDir);
+  const copied = [];
+  const skipped = [];
+  const conflicts = [];
+  const wouldOverwriteConflicts = [];
+
+  for (const srcPath of templateFiles) {
+    const relPath = path.relative(tmpDir, srcPath);
+    if (!relPath || relPath.startsWith('..')) continue;
+    const relPosix = normalizeRelPath(relPath);
+
+    const destPath = path.join(targetDir, relPath);
+    const destExists = await fs.pathExists(destPath);
+
+    if (matchesAny(relPosix, rules.conflictCheck) && destExists) {
+      const same = await filesEqual(destPath, srcPath);
+      if (!same) {
+        conflicts.push(relPosix);
+        if (conflictMode === 'overwrite') {
+          wouldOverwriteConflicts.push(relPosix);
+          copied.push(relPosix);
+        }
+      }
+      continue;
+    }
+
+    if (matchesAny(relPosix, rules.neverOverwrite) && destExists) {
+      skipped.push(relPosix);
+      continue;
+    }
+
+    if (destExists && rules.defaultOverwrite === false) {
+      skipped.push(relPosix);
+      continue;
+    }
+
+    copied.push(relPosix);
+  }
+
+  return { copied, skipped, conflicts, wouldOverwriteConflicts };
+}
+
+async function applyUpdateFromTemplate(tmpDir, targetDir, rules, conflictMode) {
+  const templateFiles = await listFilesRecursive(tmpDir);
+  const copied = [];
+  const skipped = [];
+  const conflicts = [];
+  const overwrittenConflicts = [];
+
+  for (const srcPath of templateFiles) {
+    const relPath = path.relative(tmpDir, srcPath);
+    if (!relPath || relPath.startsWith('..')) continue;
+    const relPosix = normalizeRelPath(relPath);
+
+    const destPath = path.join(targetDir, relPath);
+    const destExists = await fs.pathExists(destPath);
+
+    if (matchesAny(relPosix, rules.conflictCheck) && destExists) {
+      const same = await filesEqual(destPath, srcPath);
+      if (!same) {
+        conflicts.push(relPosix);
+        if (conflictMode !== 'overwrite') continue;
+        await fs.ensureDir(path.dirname(destPath));
+        await fs.copyFile(srcPath, destPath);
+        overwrittenConflicts.push(relPosix);
+        copied.push(relPosix);
+        continue;
+      }
+      continue;
+    }
+
+    if (matchesAny(relPosix, rules.neverOverwrite) && destExists) {
+      skipped.push(relPosix);
+      continue;
+    }
+
+    if (destExists && rules.defaultOverwrite === false) {
+      skipped.push(relPosix);
+      continue;
+    }
+
+    await fs.ensureDir(path.dirname(destPath));
+    await fs.copyFile(srcPath, destPath);
+    copied.push(relPosix);
+  }
+
+  return { copied, skipped, conflicts, overwrittenConflicts };
+}
+
 // -----------------------------
 // 参数解析（无依赖，稳定）
 // -----------------------------
 function parseArgs(argv) {
   const args = argv.slice(2);
   const opts = {
+    pre: false,
     dir: '.',
     template: 'https://github.com/lintendo/Axhub-Make.git',
     install: true,
     start: true,
     force: false,
-    pm: null
+    pm: null,
+    conflict: 'keep'
   };
 
   for (let i = 0; i < args.length; i++) {
     const a = args[i];
 
+    if ((a === 'pre' || a === 'preinstall' || a === 'preupdate') && opts.dir === '.' && !opts.pre) {
+      opts.pre = true;
+      continue;
+    }
+
     if (!a.startsWith('-') && opts.dir === '.') {
       opts.dir = a;
       continue;
@@ -35,8 +237,13 @@ function parseArgs(argv) {
 
     if (a === '--no-install') opts.install = false;
     if (a === '--no-start') opts.start = false;
+    if (a === '--pre') opts.pre = true;
     if (a === '--force') opts.force = true;
     if (a === '--pm') opts.pm = args[++i];
+    if (a === '--conflict') {
+      const v = args[++i];
+      if (isValidConflictMode(v)) opts.conflict = v;
+    }
   }
 
   return opts;
@@ -57,34 +264,33 @@ async function run() {
   const projectName = path.basename(targetDir);
 
   // -----------------------------
-  // 当前目录检测
+  // 安装/更新模式识别
   // -----------------------------
-  if (fs.existsSync(targetDir)) {
-    const files = await fs.readdir(targetDir);
-
-    if (files.length > 0 && !opts.force) {
-      console.log(
-        chalk.red(
-          '❌ 当前目录非空。\n' +
-          '如确认覆盖，请使用 --force'
-        )
-      );
-      process.exit(1);
-    }
+  const targetExists = fs.existsSync(targetDir);
+  const isUpdate = targetExists ? await isAxhubMakeProject(targetDir) : false;
 
-    if (!isCurrentDir && opts.force) {
-      await fs.remove(targetDir);
+  if (!isUpdate) {
+    if (targetExists) {
+      const files = await fs.readdir(targetDir);
+      if (files.length > 0) {
+        console.log(
+          chalk.red(
+            '❌ 当前目录非空，且不是 Axhub Make 项目目录，无法安装。\n' +
+            '请在空目录中运行命令，或在已有 Axhub Make 项目目录中运行以执行更新。'
+          )
+        );
+        process.exit(1);
+      }
+    } else {
+      if (!opts.pre) await fs.ensureDir(targetDir);
     }
   }
 
   // -----------------------------
-  // 模板下载（当前目录使用临时目录）
+  // 模板下载（统一下载到临时目录）
   // -----------------------------
-  console.log(chalk.blue('\n📡 下载模板...\n'));
-
-  const tmpDir = isCurrentDir
-    ? path.join(os.tmpdir(), `axhub-make-${Date.now()}`)
-    : targetDir;
+  console.log(chalk.blue(`\n📡 下载模板（${isUpdate ? '更新' : '安装'}）...\n`));
+  const tmpDir = path.join(os.tmpdir(), `axhub-make-${Date.now()}`);
 
   execFileSync(
     'git',
@@ -94,22 +300,47 @@ async function run() {
 
   await fs.remove(path.join(tmpDir, '.git'));
 
-  if (isCurrentDir) {
-    await fs.copy(tmpDir, targetDir, {
-      overwrite: true,
-      errorOnExist: false
-    });
+  const rules = await readUpdateRules(tmpDir);
+  const conflictMode = isValidConflictMode(opts.conflict) ? opts.conflict : 'keep';
+
+  if (opts.pre) {
+    const plan = await planUpdateFromTemplate(tmpDir, targetDir, rules, conflictMode);
     await fs.remove(tmpDir);
+    console.log(JSON.stringify({
+      mode: isUpdate ? 'update' : 'install',
+      conflictMode,
+      conflicts: plan.conflicts
+    }, null, 2));
+    return;
   }
 
+  const result = await applyUpdateFromTemplate(tmpDir, targetDir, rules, conflictMode);
+  await fs.remove(tmpDir);
+
+  if (result.conflicts.length > 0 && conflictMode !== 'overwrite') {
+    console.log(chalk.yellow('\n⚠️ 发现冲突文件（已保留本地文件）：'));
+    result.conflicts.forEach((p) => console.log(chalk.yellow(`- ${p}`)));
+  }
+  if (result.overwrittenConflicts.length > 0 && conflictMode === 'overwrite') {
+    console.log(chalk.yellow('\n⚠️ 发现冲突文件（已按配置覆盖）：'));
+    result.overwrittenConflicts.forEach((p) => console.log(chalk.yellow(`- ${p}`)));
+  }
+  if (result.skipped.length > 0) {
+    console.log(chalk.gray('\n⏭️  跳过覆盖（已保留本地文件）：'));
+    result.skipped.forEach((p) => console.log(chalk.gray(`- ${p}`)));
+  }
+  console.log(chalk.green(`\n✅ 已写入/更新文件：${result.copied.length} 个`));
+
   // -----------------------------
   // package.json 处理
   // -----------------------------
-  const pkgPath = path.join(targetDir, 'package.json');
-  if (fs.existsSync(pkgPath)) {
-    const pkg = await fs.readJson(pkgPath);
-    pkg.name = projectName;
-    await fs.writeJson(pkgPath, pkg, { spaces: 2 });
+  if (!isUpdate) {
+    const pkgPath = path.join(targetDir, 'package.json');
+    if (fs.existsSync(pkgPath)) {
+      const pkg = await fs.readJson(pkgPath);
+      pkg.name = projectName;
+      await fs.writeJson(pkgPath, pkg, { spaces: 2 });
+    }
   }
 
   // -----------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "axhub-make",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Axhub Make scaffolding tool",
   "bin": {
     "axhub-make": "./bin/index.js"
@@ -15,5 +15,8 @@
     "inquirer": "^8.2.0"
   },
   "author": "Lintendo",
-  "license": "ISC"
+  "license": "ISC",
+  "devDependencies": {
+    "execa": "^9.6.1"
+  }
 }