flu-cli 2.0.6 → 2.1.0

package/lib/commands/snippets.js

@@ -1,80 +1,95 @@
-import fs from 'fs-extra';
-import path from 'path';
-import chalk from 'chalk';
-import { fileURLToPath } from 'url';
-import { ProjectConfigManager, getTemplatesRootDir } from 'flu-cli-core';
-import { t } from '../utils/i18n.js';
+import fs from 'fs-extra'
+import path from 'path'
+import chalk from 'chalk'
+import { fileURLToPath } from 'url'
+import { ProjectConfigManager, getTemplatesRootDir } from 'flu-cli-core'
+import { t } from '../utils/i18n.js'
 
 /**
  * 同步代码片段到当前项目
  */
-export async function syncSnippets (targetDir) {
-  const projectRoot = targetDir || process.cwd();
-  const vscodeDir = path.join(projectRoot, '.vscode');
-  const targetFile = path.join(vscodeDir, 'dart.code-snippets');
+export async function syncSnippets(targetDir) {
+  const projectRoot = targetDir || process.cwd()
+  const vscodeDir = path.join(projectRoot, '.vscode')
+  const targetFile = path.join(vscodeDir, 'dart.code-snippets')
 
   // 获取 centralized snippets 路径 (从 Core 的模板根目录获取)
-  const templatesDir = getTemplatesRootDir();
-  const snippetsSource = path.join(templatesDir, 'snippets/dart.code-snippets');
+  const templatesDir = getTemplatesRootDir()
+  const snippetsSource = path.join(templatesDir, 'snippets/flu-cli.code-snippets')
 
   if (!fs.existsSync(snippetsSource)) {
-    console.log(chalk.red(`❌ 错误: 找不到标准代码片段源文件: ${snippetsSource}`));
-    return;
+    console.log(chalk.red(`❌ 错误: 找不到标准代码片段源文件: ${snippetsSource}`))
+    return
   }
 
   try {
-    // 读取原始 Snippets
-    const originalSnippets = await fs.readJson(snippetsSource);
-    let finalSnippets = { ...originalSnippets };
+    // 读取原始 Snippets（源文件可能含尾随逗号等非严格 JSON，readJson 失败时原样复制）
+    let originalSnippets
+    try {
+      originalSnippets = await fs.readJson(snippetsSource)
+    } catch {
+      await fs.ensureDir(vscodeDir)
+      await fs.copy(snippetsSource, targetFile)
+      console.log(chalk.green(t('snippets.sync_success')))
+      console.log(
+        chalk.gray(`已复制: ${targetFile}（源片段非严格 JSON，未按 .flu-cli.json 过滤键）`),
+      )
+      return
+    }
+    let finalSnippets = { ...originalSnippets }
 
     // 读取项目配置
-    const config = ProjectConfigManager.loadConfig(projectRoot);
+    const resolvedConfig = ProjectConfigManager.resolveEffectiveConfig(projectRoot)
+    const config = resolvedConfig?.config
 
     if (config) {
-      console.log(chalk.cyan(t('snippets.detect_config')));
-      const pageConfig = config.generators?.page;
-      const vmConfig = config.generators?.viewModel;
+      console.log(chalk.cyan(t('snippets.detect_config')))
+      const pageConfig = config.generators?.page
+      const vmConfig = config.generators?.viewModel
 
-      const withBasePage = pageConfig?.withBasePage ?? true;
-      const withViewModel = pageConfig?.withViewModel ?? true;
-      const withBaseViewModel = vmConfig?.withBaseViewModel ?? true;
+      const withBasePage = pageConfig?.withBasePage ?? true
+      const withViewModel = pageConfig?.withViewModel ?? true
+      const withBaseViewModel = vmConfig?.withBaseViewModel ?? true
 
       // 过滤规则
       if (!withBasePage) {
-        delete finalSnippets['flu.stPage'];
-        delete finalSnippets['flu.listPage'];
+        delete finalSnippets['flu.stPage']
+        delete finalSnippets['flu.listPage']
       }
 
       if (!withViewModel) {
-        delete finalSnippets['flu.stPage'];
-        delete finalSnippets['flu.viewmodel'];
-        delete finalSnippets['flu.listPage'];
-        delete finalSnippets['flu.listViewModel'];
+        delete finalSnippets['flu.stPage']
+        delete finalSnippets['flu.viewmodel']
+        delete finalSnippets['flu.listPage']
+        delete finalSnippets['flu.listViewModel']
       }
 
       if (!withBaseViewModel) {
-        delete finalSnippets['flu.viewmodel'];
-        delete finalSnippets['flu.listViewModel'];
+        delete finalSnippets['flu.viewmodel']
+        delete finalSnippets['flu.listViewModel']
       }
     }
 
     // 确保 .vscode 目录存在
-    await fs.ensureDir(vscodeDir);
+    await fs.ensureDir(vscodeDir)
 
     // 写入文件
-    await fs.writeJson(targetFile, finalSnippets, { spaces: 2 });
+    await fs.writeJson(targetFile, finalSnippets, { spaces: 2 })
 
-    console.log(chalk.green(t('snippets.sync_success')));
+    console.log(chalk.green(t('snippets.sync_success')))
     if (config) {
-      console.log(chalk.gray(t('snippets.applied_filter', {
-        basePage: config.generators?.page?.withBasePage ? 'ON' : 'OFF',
-        viewModel: config.generators?.page?.withViewModel ? 'ON' : 'OFF'
-      })));
+      console.log(
+        chalk.gray(
+          t('snippets.applied_filter', {
+            basePage: config.generators?.page?.withBasePage ? 'ON' : 'OFF',
+            viewModel: config.generators?.page?.withViewModel ? 'ON' : 'OFF',
+          }),
+        ),
+      )
     }
-    console.log(chalk.gray(`已更新: ${targetFile}`));
-    console.log(chalk.cyan('提示: 重启 VS Code 或运行 "Developer: Reload Window" 以应用更改'));
-
+    console.log(chalk.gray(`已更新: ${targetFile}`))
+    console.log(chalk.cyan('提示: 重启 VS Code 或运行 "Developer: Reload Window" 以应用更改'))
   } catch (error) {
-    console.log(chalk.red(`❌ 同步失败: ${error.message}`));
+    console.log(chalk.red(`❌ 同步失败: ${error.message}`))
   }
 }

package/lib/commands/template.js

@@ -1,113 +1,153 @@
-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
+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');
+function formatDate(timestamp) {
+  if (!timestamp) return '从未'
+  return new Date(timestamp).toLocaleString('zh-CN')
 }
 
 /**
  * 列出所有模板（内置 + 自定义）
  */
-export function listAllTemplates () {
-  logger.title('📦 可用的项目模板');
+export function listAllTemplates() {
+  logger.title('📦 可用的项目模板')
 
   // 1. 内置模板
-  console.log(chalk.bold.cyan('📌 内置模板'));
-  const builtinTemplates = getAllTemplates();
+  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('未缓存');
+    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}`));
-  });
+    console.log(chalk.bold(`  • ${template.name} (${template.displayName})`) + ` [${status}]`)
+    console.log(chalk.gray(`    ${template.description}`))
+  })
 
   // 2. 自定义模板
-  const configManager = ConfigManager.getInstance();
-  const customTemplates = configManager.getTemplates();
+  const configManager = ConfigManager.getInstance()
+  const customTemplates = configManager.getTemplates()
 
   if (customTemplates.length > 0) {
-    logger.newLine();
-    console.log(chalk.bold.cyan('🔧 自定义模板'));
+    logger.newLine()
+    console.log(chalk.bold.cyan('🔧 自定义模板'))
     customTemplates.forEach((template) => {
-      const source = template.type === 'git' ? template.url : template.path;
-      let status = '';
-      let updateInfo = '';
+      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('未缓存');
+        const cachePath = getTemplateCachePath(template.id)
+        const isCached = existsSync(cachePath)
+        status = isCached ? chalk.green('已缓存') : chalk.gray('未缓存')
         if (template.lastUsedAt) {
-          updateInfo = chalk.gray(` (上次使用: ${formatDate(template.lastUsedAt)})`);
+          updateInfo = chalk.gray(` (上次使用: ${formatDate(template.lastUsedAt)})`)
         }
       } else {
-        status = chalk.blue('本地链接');
+        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}`));
+      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}`));
+        console.log(chalk.gray(`    分支: ${template.branch}`))
       }
-    });
+    })
   } else {
-    logger.newLine();
-    console.log(chalk.gray('  (暂无自定义模板)'));
+    logger.newLine()
+    console.log(chalk.gray('  (暂无自定义模板)'))
   }
 
-  logger.newLine();
-  logger.info('使用 "flu template add" 添加自定义模板');
-  logger.info('使用 "flu new <name> -t <template>" 创建项目');
+  logger.newLine()
+  logger.info('使用 "flu template add" 添加自定义模板')
+  logger.info('使用 "flu new <name> -t <template>" 创建项目')
+}
+
+export function collectAllTemplates() {
+  const builtinTemplates = getAllTemplates().map((t) => {
+    const cachePath = getTemplateCachePath(t.name)
+    const isCached = existsSync(cachePath)
+    return {
+      kind: 'builtin',
+      id: t.name,
+      name: t.name,
+      displayName: t.displayName,
+      description: t.description,
+      cached: isCached,
+      cachePath: isCached ? cachePath : null,
+    }
+  })
+
+  const configManager = ConfigManager.getInstance()
+  const customTemplates = configManager.getTemplates().map((t) => {
+    const source = t.type === 'git' ? t.url : t.path
+    const cachePath = t.type === 'git' ? getTemplateCachePath(t.id) : null
+    const cached = cachePath ? existsSync(cachePath) : null
+    return {
+      kind: 'custom',
+      id: t.id,
+      name: t.name,
+      type: t.type,
+      description: t.description || '',
+      source,
+      branch: t.branch || null,
+      cached,
+      cachePath,
+      lastUsedAt: t.lastUsedAt || null,
+    }
+  })
+
+  return {
+    builtin: builtinTemplates,
+    custom: customTemplates,
+  }
 }
 
 /**
  * 添加自定义模板
  */
-export function addTemplate (name, source, options) {
-  const configManager = ConfigManager.getInstance();
-  const existing = configManager.getTemplate(name);
+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;
+    logger.error(`模板 "${name}" 已存在`)
+    logger.info('使用 --force 覆盖，或使用 "flu template remove" 删除')
+    return
   }
 
-  const isLocal = options.local;
+  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' })
-  };
+    ...(isLocal ? { path: source } : { url: source, branch: options.branch || 'main' }),
+  }
 
-  configManager.addTemplate(template);
-  logger.success(`✅ 模板 "${name}" 添加成功`);
+  configManager.addTemplate(template)
+  logger.success(`✅ 模板 "${name}" 添加成功`)
 }
 
 /**
  * 删除自定义模板
  */
-export function removeTemplate (name) {
-  const configManager = ConfigManager.getInstance();
-  const success = configManager.removeTemplate(name);
+export function removeTemplate(name) {
+  const configManager = ConfigManager.getInstance()
+  const success = configManager.removeTemplate(name)
 
   if (success) {
-    logger.success(`🗑️ 模板 "${name}" 已删除`);
+    logger.success(`🗑️ 模板 "${name}" 已删除`)
   } else {
-    logger.error(`模板 "${name}" 不存在`);
+    logger.error(`模板 "${name}" 不存在`)
   }
 }

package/lib/commands/templates.js

@@ -3,82 +3,126 @@
  * 显示所有模板或指定模板的详细信息
  */
 
-import chalk from 'chalk';
-import { getAllTemplates, getTemplate, isValidTemplate } from '../../config/templates.js';
-import { logger } from '../utils/logger.js';
+import chalk from 'chalk'
+import { getAllTemplates, getTemplate, isValidTemplate } from '../../config/templates.js'
+import { logger } from '../utils/logger.js'
+
+export function collectTemplates() {
+  const templates = getAllTemplates()
+  return templates.map((t) => ({
+    name: t.name,
+    displayName: t.displayName,
+    description: t.description,
+    complexity: t.complexity,
+    teamSize: t.teamSize,
+    codeSize: t.codeSize,
+    features: t.features,
+    structure: t.structure,
+  }))
+}
+
+export function collectTemplateDetail(templateName) {
+  if (!isValidTemplate(templateName)) return null
+  const t = getTemplate(templateName)
+  return {
+    name: t.name,
+    displayName: t.displayName,
+    description: t.description,
+    complexity: t.complexity,
+    teamSize: t.teamSize,
+    codeSize: t.codeSize,
+    features: t.features,
+    structure: t.structure,
+  }
+}
 
 /**
  * 列出所有模板
  */
-export function listTemplates () {
-  logger.title('📦 可用的项目模板');
+export function listTemplates() {
+  logger.title('📦 可用的项目模板')
 
-  const templates = getAllTemplates();
+  const templates = getAllTemplates()
 
   templates.forEach((template, index) => {
-    console.log(chalk.bold(`${index + 1}. ${template.displayName}`));
-    console.log(chalk.gray(`   ${template.description}`));
-    console.log(chalk.gray(`   复杂度: ${'⭐'.repeat(template.complexity)}${'☆'.repeat(5 - template.complexity)}`));
-    console.log(chalk.gray(`   团队规模: ${template.teamSize}`));
-    console.log(chalk.gray(`   代码量: ${template.codeSize}`));
-    logger.newLine();
-  });
-
-  logger.info('使用 "flu-cli templates <name>" 查看详细信息');
-  logger.info('使用 "flu-cli new <project-name> -t <template>" 创建项目');
-
-  logger.newLine();
-  console.log(chalk.gray('示例:'));
-  console.log(chalk.yellow('  flu-cli templates lite'));
-  console.log(chalk.yellow('  flu-cli new my_app -t modular'));
+    console.log(chalk.bold(`${index + 1}. ${template.displayName}`))
+    console.log(chalk.gray(`   ${template.description}`))
+    console.log(
+      chalk.gray(
+        `   复杂度: ${'⭐'.repeat(template.complexity)}${'☆'.repeat(5 - template.complexity)}`,
+      ),
+    )
+    console.log(chalk.gray(`   团队规模: ${template.teamSize}`))
+    console.log(chalk.gray(`   代码量: ${template.codeSize}`))
+    logger.newLine()
+  })
+
+  logger.info('使用 "flu-cli templates <name>" 查看详细信息')
+  logger.info('使用 "flu-cli new <project-name> -t <template>" 创建项目')
+
+  logger.newLine()
+  console.log(chalk.gray('示例:'))
+  console.log(chalk.yellow('  flu-cli templates lite'))
+  console.log(chalk.yellow('  flu-cli new my_app -t modular'))
 }
 
 /**
  * 显示模板详情
  */
-export function showTemplateDetail (templateName) {
+export function showTemplateDetail(templateName) {
   if (!isValidTemplate(templateName)) {
-    logger.error(`模板 "${templateName}" 不存在`);
-    logger.info('使用 "flu-cli templates" 查看所有可用模板');
-    return;
+    logger.error(`模板 "${templateName}" 不存在`)
+    logger.info('使用 "flu-cli templates" 查看所有可用模板')
+    return
   }
 
-  const template = getTemplate(templateName);
+  const template = getTemplate(templateName)
 
   // 显示模板信息框
-  console.log(chalk.bold.cyan('\n┌─────────────────────────────────────────────────────────────┐'));
-  console.log(chalk.bold.cyan(`│ 📦 ${template.displayName.padEnd(56)} │`));
-  console.log(chalk.bold.cyan('├─────────────────────────────────────────────────────────────┤'));
+  console.log(chalk.bold.cyan('\n┌─────────────────────────────────────────────────────────────┐'))
+  console.log(chalk.bold.cyan(`│ 📦 ${template.displayName.padEnd(56)} │`))
+  console.log(chalk.bold.cyan('├─────────────────────────────────────────────────────────────┤'))
 
   // 基本信息
-  console.log(chalk.cyan('│ ') + chalk.gray('描述: ') + template.description.padEnd(50) + chalk.cyan(' │'));
-  console.log(chalk.cyan('│ ') + chalk.gray('复杂度: ') + ('⭐'.repeat(template.complexity) + '☆'.repeat(5 - template.complexity)).padEnd(50) + chalk.cyan(' │'));
-  console.log(chalk.cyan('│ ') + chalk.gray('团队规模: ') + template.teamSize.padEnd(48) + chalk.cyan(' │'));
-  console.log(chalk.cyan('│ ') + chalk.gray('代码量: ') + template.codeSize.padEnd(50) + chalk.cyan(' │'));
-
-  console.log(chalk.bold.cyan('├─────────────────────────────────────────────────────────────┤'));
-  console.log(chalk.bold.cyan('│ 特性:                                                        │'));
-  console.log(chalk.cyan('│                                                              │'));
-
-  template.features.forEach(feature => {
-    console.log(chalk.cyan('│ ') + feature.padEnd(60) + chalk.cyan(' │'));
-  });
-
-  console.log(chalk.bold.cyan('├─────────────────────────────────────────────────────────────┤'));
-  console.log(chalk.bold.cyan('│ 项目结构:                                                    │'));
-  console.log(chalk.cyan('│                                                              │'));
+  console.log(
+    chalk.cyan('│ ') + chalk.gray('描述: ') + template.description.padEnd(50) + chalk.cyan(' │'),
+  )
+  console.log(
+    chalk.cyan('│ ') +
+      chalk.gray('复杂度: ') +
+      ('⭐'.repeat(template.complexity) + '☆'.repeat(5 - template.complexity)).padEnd(50) +
+      chalk.cyan(' │'),
+  )
+  console.log(
+    chalk.cyan('│ ') + chalk.gray('团队规模: ') + template.teamSize.padEnd(48) + chalk.cyan(' │'),
+  )
+  console.log(
+    chalk.cyan('│ ') + chalk.gray('代码量: ') + template.codeSize.padEnd(50) + chalk.cyan(' │'),
+  )
+
+  console.log(chalk.bold.cyan('├─────────────────────────────────────────────────────────────┤'))
+  console.log(chalk.bold.cyan('│ 特性:                                                        │'))
+  console.log(chalk.cyan('│                                                              │'))
+
+  template.features.forEach((feature) => {
+    console.log(chalk.cyan('│ ') + feature.padEnd(60) + chalk.cyan(' │'))
+  })
+
+  console.log(chalk.bold.cyan('├─────────────────────────────────────────────────────────────┤'))
+  console.log(chalk.bold.cyan('│ 项目结构:                                                    │'))
+  console.log(chalk.cyan('│                                                              │'))
 
   // 显示项目结构
-  const structureLines = template.structure.trim().split('\n');
-  structureLines.forEach(line => {
-    const paddedLine = line.padEnd(60);
-    console.log(chalk.cyan('│ ') + paddedLine + chalk.cyan(' │'));
-  });
-
-  console.log(chalk.bold.cyan('└─────────────────────────────────────────────────────────────┘'));
-
-  logger.newLine();
-  logger.info('创建项目:');
-  console.log(chalk.yellow(`  flu-cli new my_app -t ${templateName}`));
-  logger.newLine();
+  const structureLines = template.structure.trim().split('\n')
+  structureLines.forEach((line) => {
+    const paddedLine = line.padEnd(60)
+    console.log(chalk.cyan('│ ') + paddedLine + chalk.cyan(' │'))
+  })
+
+  console.log(chalk.bold.cyan('└─────────────────────────────────────────────────────────────┘'))
+
+  logger.newLine()
+  logger.info('创建项目:')
+  console.log(chalk.yellow(`  flu-cli new my_app -t ${templateName}`))
+  logger.newLine()
 }