flu-cli 2.0.0 → 2.0.1

package/lib/commands/template.js

@@ -0,0 +1,113 @@
+import chalk from 'chalk';
+import { ConfigManager } from '@flu-cli/core';
+import { getAllTemplates } from '../../config/templates.js';
+import { logger } from '../utils/logger.js';
+import { existsSync } from 'fs';
+import { getTemplateCachePath } from '../templates/templateManager.js';
+import { format } from 'date-fns'; // 需要检查是否已安装 date-fns，如果没有可以用原生 Date
+
+/**
+ * 格式化日期
+ */
+function formatDate (timestamp) {
+  if (!timestamp) return '从未';
+  return new Date(timestamp).toLocaleString('zh-CN');
+}
+
+/**
+ * 列出所有模板（内置 + 自定义）
+ */
+export function listAllTemplates () {
+  logger.title('📦 可用的项目模板');
+
+  // 1. 内置模板
+  console.log(chalk.bold.cyan('📌 内置模板'));
+  const builtinTemplates = getAllTemplates();
+  builtinTemplates.forEach((template) => {
+    const cachePath = getTemplateCachePath(template.name);
+    const isCached = existsSync(cachePath);
+    const status = isCached ? chalk.green('已缓存') : chalk.gray('未缓存');
+
+    console.log(chalk.bold(`  • ${template.name} (${template.displayName})`) + ` [${status}]`);
+    console.log(chalk.gray(`    ${template.description}`));
+  });
+
+  // 2. 自定义模板
+  const configManager = ConfigManager.getInstance();
+  const customTemplates = configManager.getTemplates();
+
+  if (customTemplates.length > 0) {
+    logger.newLine();
+    console.log(chalk.bold.cyan('🔧 自定义模板'));
+    customTemplates.forEach((template) => {
+      const source = template.type === 'git' ? template.url : template.path;
+      let status = '';
+      let updateInfo = '';
+
+      if (template.type === 'git') {
+        const cachePath = getTemplateCachePath(template.id);
+        const isCached = existsSync(cachePath);
+        status = isCached ? chalk.green('已缓存') : chalk.gray('未缓存');
+        if (template.lastUsedAt) {
+          updateInfo = chalk.gray(` (上次使用: ${formatDate(template.lastUsedAt)})`);
+        }
+      } else {
+        status = chalk.blue('本地链接');
+      }
+
+      console.log(chalk.bold(`  • ${template.id} (${template.name})`) + ` [${status}]` + updateInfo);
+      console.log(chalk.gray(`    ${template.description || '无描述'}`));
+      console.log(chalk.gray(`    来源: [${template.type}] ${source}`));
+      if (template.branch) {
+        console.log(chalk.gray(`    分支: ${template.branch}`));
+      }
+    });
+  } else {
+    logger.newLine();
+    console.log(chalk.gray('  (暂无自定义模板)'));
+  }
+
+  logger.newLine();
+  logger.info('使用 "flu template add" 添加自定义模板');
+  logger.info('使用 "flu new <name> -t <template>" 创建项目');
+}
+
+/**
+ * 添加自定义模板
+ */
+export function addTemplate (name, source, options) {
+  const configManager = ConfigManager.getInstance();
+  const existing = configManager.getTemplate(name);
+
+  if (existing && !options.force) {
+    logger.error(`模板 "${name}" 已存在`);
+    logger.info('使用 --force 覆盖，或使用 "flu template remove" 删除');
+    return;
+  }
+
+  const isLocal = options.local;
+  const template = {
+    id: name,
+    name: options.name || name,
+    type: isLocal ? 'local' : 'git',
+    description: options.description || '自定义模板',
+    ...(isLocal ? { path: source } : { url: source, branch: options.branch || 'main' })
+  };
+
+  configManager.addTemplate(template);
+  logger.success(`✅ 模板 "${name}" 添加成功`);
+}
+
+/**
+ * 删除自定义模板
+ */
+export function removeTemplate (name) {
+  const configManager = ConfigManager.getInstance();
+  const success = configManager.removeTemplate(name);
+
+  if (success) {
+    logger.success(`🗑️ 模板 "${name}" 已删除`);
+  } else {
+    logger.error(`模板 "${name}" 不存在`);
+  }
+}

package/lib/utils/templateSelectorEnquirer.js

@@ -8,7 +8,8 @@ import chalk from 'chalk';
 import { existsSync } from 'fs';
 import { basename } from 'path';
 import { getAllTemplates } from '../../config/templates.js';
-import { getDefaultTemplate, getCustomTemplates, addOrUpdateCustomTemplate, saveDefaultTemplate } from '../utils/config.js';
+import { ConfigManager } from '@flu-cli/core';
+import { getDefaultTemplate, saveDefaultTemplate } from '../utils/config.js';
 
 const { Select } = enquirer;
 
@@ -17,7 +18,8 @@ const { Select } = enquirer;
  */
 export async function selectTemplateWithEnquirer () {
   const templates = getAllTemplates();
-  const customTemplates = getCustomTemplates();
+  const configManager = ConfigManager.getInstance();
+  const customTemplates = configManager.getTemplates();
   const defaultTpl = getDefaultTemplate();
 
   // 创建自定义的 Select prompt
@@ -85,7 +87,7 @@ export async function selectTemplateWithEnquirer () {
   const customChoices = customTemplates.map(ct => ({
     name: `custom:${ct.id}`,
     message: `自定义：${ct.name}`,
-    hint: ct.type === 'git' ? ct.pathOrUrl : `本地: ${ct.pathOrUrl}`
+    hint: ct.type === 'git' ? ct.url : `本地: ${ct.path}`
   }));
   const addCustomChoice = { name: '__add_custom__', message: chalk.yellow('➕ 新增自定义模板（本地或 Git）') };
 
@@ -158,17 +160,18 @@ export async function selectTemplateWithEnquirer () {
         : basename(pathOrUrl);
       const id = `${nameGuess.replace(/\W+/g, '-').toLowerCase()}-${Date.now()}`;
 
-      const saved = addOrUpdateCustomTemplate({
+      const newTemplate = {
         id,
         name: nameGuess,
         type: sourceType,
-        pathOrUrl,
-        branch
-      });
+        ...(sourceType === 'git' ? { url: pathOrUrl, branch } : { path: pathOrUrl })
+      };
+
+      configManager.addTemplate(newTemplate);
 
-      console.log(chalk.green('✓ 已保存自定义模板:'), chalk.cyan.bold(saved.name));
-      saveDefaultTemplate({ type: 'custom', idOrName: saved.id });
-      return { kind: 'custom', id: saved.id };
+      console.log(chalk.green('✓ 已保存自定义模板:'), chalk.cyan.bold(newTemplate.name));
+      saveDefaultTemplate({ type: 'custom', idOrName: newTemplate.id });
+      return { kind: 'custom', id: newTemplate.id };
     }
 
     if (answer.startsWith('builtin:')) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "flu-cli",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "description": "Flutter MVVM 脚手架工具 - V2",
     "main": "index.js",
     "type": "module",
@@ -13,7 +13,7 @@
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "start": "node ./index.js",
-        "dev": "NODE_ENV=development node ./index.js",
+        "dev": "NODE_ENV=development node ./index.js --",
         "prod": "NODE_ENV=production node ./index.js",
         "prepublishOnly": "NODE_ENV=production"
     },
@@ -26,7 +26,7 @@
         "template",
         "generator"
     ],
-    "author": "火之夜工作室",
+    "author": "火叶工作室",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -38,8 +38,10 @@
     },
     "dependencies": {
         "@clack/prompts": "^0.11.0",
+        "@flu-cli/core": "file:../core",
         "chalk": "^4.1.2",
         "commander": "^11.1.0",
+        "date-fns": "^4.1.0",
         "enquirer": "^2.4.1",
         "fs-extra": "^11.2.0",
         "handlebars": "^4.7.8",