flu-cli 2.0.6 → 2.1.0

package/lib/commands/assets.js

@@ -1,38 +1,38 @@
-import * as p from '@clack/prompts';
-import chalk from 'chalk';
-import { join } from 'path';
-import { existsSync } from 'fs';
-import { AppAssetsManager, ConsoleLogger } from 'flu-cli-core';
-import { t } from '../utils/i18n.js';
+import * as p from '@clack/prompts'
+import chalk from 'chalk'
+import { join } from 'path'
+import { existsSync } from 'fs'
+import { AppAssetsManager, ConsoleLogger } from 'flu-cli-core'
+import { t } from '../utils/i18n.js'
 
-const logger = new ConsoleLogger();
+const logger = new ConsoleLogger()
 
 /**
  * 交互式配置应用资源
  */
-export async function configAssets (options) {
-  const projectPath = options.dir || process.cwd();
+export async function configAssets(options) {
+  const projectPath = options.dir || process.cwd()
 
   // 检查是否在 Flutter 项目中
   if (!existsSync(join(projectPath, 'pubspec.yaml'))) {
-    logger.error(t('assets.not_flutter'));
-    return;
+    logger.error(t('assets.not_flutter'))
+    return
   }
 
-  p.intro(chalk.cyan.bold(t('assets.intro')));
+  p.intro(chalk.cyan.bold(t('assets.intro')))
 
   try {
-    const assets = {};
+    const assets = {}
 
     // 1. 配置应用图标
     const setupIcon = await p.confirm({
       message: t('assets.setup_icon'),
-      initialValue: true
-    });
+      initialValue: true,
+    })
 
     if (p.isCancel(setupIcon)) {
-      p.cancel(t('common.cancel'));
-      return;
+      p.cancel(t('common.cancel'))
+      return
     }
 
     if (setupIcon) {
@@ -40,29 +40,29 @@ export async function configAssets (options) {
         message: t('assets.icon_path'),
         placeholder: 'assets/logo.png',
         validate: (value) => {
-          if (!value) return '路径不能为空';
+          if (!value) return '路径不能为空'
           if (!existsSync(join(projectPath, value)) && !existsSync(value)) {
-            return '找不到该文件，请确认路径是否正确';
+            return '找不到该文件，请确认路径是否正确'
           }
-        }
-      });
+        },
+      })
 
       if (p.isCancel(iconPath)) {
-        p.cancel(t('common.cancel'));
-        return;
+        p.cancel(t('common.cancel'))
+        return
       }
-      assets.appIcon = iconPath;
+      assets.appIcon = iconPath
     }
 
     // 2. 配置启动图
     const setupSplash = await p.confirm({
       message: t('assets.setup_splash'),
-      initialValue: true
-    });
+      initialValue: true,
+    })
 
     if (p.isCancel(setupSplash)) {
-      p.cancel(t('common.cancel'));
-      return;
+      p.cancel(t('common.cancel'))
+      return
     }
 
     if (setupSplash) {
@@ -70,114 +70,113 @@ export async function configAssets (options) {
         message: t('assets.splash_logo'),
         placeholder: 'assets/logo.png',
         validate: (value) => {
-          if (!value) return '路径不能为空';
+          if (!value) return '路径不能为空'
           if (!existsSync(join(projectPath, value)) && !existsSync(value)) {
-            return '找不到该文件，请确认路径是否正确';
+            return '找不到该文件，请确认路径是否正确'
           }
-        }
-      });
+        },
+      })
 
       if (p.isCancel(splashLogo)) {
-        p.cancel(t('common.cancel'));
-        return;
+        p.cancel(t('common.cancel'))
+        return
       }
-      assets.splashLogo = splashLogo;
+      assets.splashLogo = splashLogo
 
       const bgColor = await p.text({
         message: t('assets.bg_color'),
         placeholder: '#FFFFFF',
-        initialValue: '#FFFFFF'
-      });
+        initialValue: '#FFFFFF',
+      })
 
       if (p.isCancel(bgColor)) {
-        p.cancel(t('common.cancel'));
-        return;
+        p.cancel(t('common.cancel'))
+        return
       }
-      assets.splashBackgroundColor = bgColor;
+      assets.splashBackgroundColor = bgColor
 
       const useBgImage = await p.confirm({
         message: t('assets.use_bg_image'),
-        initialValue: false
-      });
+        initialValue: false,
+      })
 
       if (p.isCancel(useBgImage)) {
-        p.cancel(t('common.cancel'));
-        return;
+        p.cancel(t('common.cancel'))
+        return
       }
 
       if (useBgImage) {
         const bgImagePath = await p.text({
           message: t('assets.bg_image_path'),
           validate: (value) => {
-            if (!value) return '路径不能为空';
+            if (!value) return '路径不能为空'
             if (!existsSync(join(projectPath, value)) && !existsSync(value)) {
-              return '找不到该文件';
+              return '找不到该文件'
             }
-          }
-        });
+          },
+        })
         if (p.isCancel(bgImagePath)) {
-          p.cancel(t('common.cancel'));
-          return;
+          p.cancel(t('common.cancel'))
+          return
         }
-        assets.splashBackground = bgImagePath;
+        assets.splashBackground = bgImagePath
       }
 
       // 暗黑模式支持
       const enableDark = await p.confirm({
         message: t('assets.setup_dark'),
-        initialValue: false
-      });
+        initialValue: false,
+      })
 
       if (p.isCancel(enableDark)) {
-        p.cancel(t('common.cancel'));
-        return;
+        p.cancel(t('common.cancel'))
+        return
       }
 
       if (enableDark) {
-        assets.enableDarkMode = true;
+        assets.enableDarkMode = true
 
         const darkBgColor = await p.text({
           message: t('assets.dark_bg_color'),
           placeholder: '#000000',
-          initialValue: '#000000'
-        });
-        if (!p.isCancel(darkBgColor)) assets.splashBackgroundColorDark = darkBgColor;
+          initialValue: '#000000',
+        })
+        if (!p.isCancel(darkBgColor)) assets.splashBackgroundColorDark = darkBgColor
 
         const useDarkLogo = await p.confirm({
           message: t('assets.use_dark_logo'),
-          initialValue: false
-        });
+          initialValue: false,
+        })
         if (useDarkLogo) {
           const darkLogoPath = await p.text({
-            message: t('assets.dark_logo_path')
-          });
-          if (!p.isCancel(darkLogoPath)) assets.splashLogoDark = darkLogoPath;
+            message: t('assets.dark_logo_path'),
+          })
+          if (!p.isCancel(darkLogoPath)) assets.splashLogoDark = darkLogoPath
         }
       }
     }
 
     if (Object.keys(assets).length === 0) {
-      p.note(t('assets.no_assets'));
-      p.outro(chalk.gray(t('common.bye')));
-      return;
+      p.note(t('assets.no_assets'))
+      p.outro(chalk.gray(t('common.bye')))
+      return
     }
 
-    const s = p.spinner();
-    s.start(t('assets.configuring'));
+    const s = p.spinner()
+    s.start(t('assets.configuring'))
 
-    const assetsManager = new AppAssetsManager();
-    const success = await assetsManager.setupAppAssets(projectPath, assets, logger);
+    const assetsManager = new AppAssetsManager()
+    const success = await assetsManager.setupAppAssets(projectPath, assets, logger)
 
     if (success) {
-      s.stop(t('assets.success'));
-      p.outro(chalk.green.bold(t('assets.done')));
+      s.stop(t('assets.success'))
+      p.outro(chalk.green.bold(t('assets.done')))
     } else {
-      s.stop(t('assets.failed'));
-      p.outro(chalk.red(t('assets.error_outro')));
+      s.stop(t('assets.failed'))
+      p.outro(chalk.red(t('assets.error_outro')))
     }
-
   } catch (error) {
-    p.cancel(`发生错误: ${error.message}`);
-    process.exit(1);
+    p.cancel(`发生错误: ${error.message}`)
+    process.exit(1)
   }
 }

package/lib/commands/cache.js

@@ -3,97 +3,74 @@
  * 更新和清理模板缓存
  */
 
-import { logger } from '../utils/logger.js';
-import { getAllTemplates } from '../../config/templates.js';
-import { cloneOrUpdateTemplate, getTemplateCachePath, checkTemplateUpdate } from '../templates/templateManager.js';
-import fsExtra from 'fs-extra';
-import ora from 'ora';
-
-const { removeSync, existsSync } = fsExtra;
+import { logger } from '../utils/logger.js'
+import { getAllTemplates } from '../../config/templates.js'
+import { TemplateManager } from 'flu-cli-core'
+import { cloneOrUpdateTemplate, checkTemplateUpdate } from '../templates/templateManager.js'
+import ora from 'ora'
 
 /**
  * 更新模板缓存
  */
-export async function updateTemplates (templateName, options = {}) {
-  logger.title('🔄 更新模板缓存');
+export async function updateTemplates(templateName, options = {}) {
+  logger.title('🔄 更新模板缓存')
 
   if (templateName) {
     // 更新指定模板
-    await updateSingleTemplate(templateName, options);
+    await updateSingleTemplate(templateName, options)
   } else {
     // 更新所有模板
-    const templates = getAllTemplates();
+    const templates = getAllTemplates()
 
     for (const template of templates) {
-      await updateSingleTemplate(template.name.toLowerCase(), options);
+      await updateSingleTemplate(template.name.toLowerCase(), options)
     }
   }
 
-  logger.newLine();
-  logger.success('模板更新完成');
+  logger.newLine()
+  logger.success('模板更新完成')
 }
 
 /**
  * 更新单个模板
  */
-async function updateSingleTemplate (templateName, options = {}) {
-  const templates = getAllTemplates();
-  const template = templates.find(t => t.name.toLowerCase() === templateName);
+async function updateSingleTemplate(templateName, options = {}) {
+  const templates = getAllTemplates()
+  const template = templates.find((t) => t.name.toLowerCase() === templateName)
 
   if (!template) {
-    logger.error(`模板 "${templateName}" 不存在`);
-    return;
+    logger.error(`模板 "${templateName}" 不存在`)
+    return
   }
 
-  logger.info(`检查模板 ${template.displayName}...`);
+  logger.info(`检查模板 ${template.displayName}...`)
 
-  const updateInfo = await checkTemplateUpdate(templateName);
+  const updateInfo = await checkTemplateUpdate(templateName)
 
   // 更新模板
-  const spinner = ora(`更新 ${template.displayName}...`).start();
+  const spinner = ora(`更新 ${template.displayName}...`).start()
 
-  const result = await cloneOrUpdateTemplate(
-    templateName,
-    template.repo,
-    template.branch,
-    true
-  );
+  const result = await cloneOrUpdateTemplate(templateName, template.repo, template.branch, true)
 
   if (result) {
-    spinner.succeed(`${template.displayName} 更新成功`);
+    spinner.succeed(`${template.displayName} 更新成功`)
   } else {
-    spinner.fail(`${template.displayName} 更新失败`);
+    spinner.fail(`${template.displayName} 更新失败`)
   }
 }
 
 /**
  * 清理缓存
  */
-export async function cleanCache () {
-  logger.title('🗑️  清理模板缓存');
-
-  const templates = getAllTemplates();
-  let cleaned = 0;
-
-  for (const template of templates) {
-    const templateName = template.name.toLowerCase();
-    const cachePath = getTemplateCachePath(templateName);
+export async function cleanCache() {
+  logger.title('🗑️  清理模板缓存')
 
-    if (existsSync(cachePath)) {
-      try {
-        removeSync(cachePath);
-        logger.success(`已清理: ${template.displayName}`);
-        cleaned++;
-      } catch (error) {
-        logger.error(`清理失败: ${template.displayName} - ${error.message}`);
-      }
-    }
-  }
+  const cleaned = await TemplateManager.getInstance().cleanBuiltinTemplateCache(logger)
 
-  logger.newLine();
+  logger.newLine()
   if (cleaned > 0) {
-    logger.success(`已清理 ${cleaned} 个模板缓存`);
+    logger.success(`已清理 ${cleaned} 个内置模板缓存`)
   } else {
-    logger.info('没有需要清理的缓存');
+    logger.info('没有需要清理的缓存')
   }
 }

package/lib/commands/completion.js

@@ -1,10 +1,7 @@
-import chalk from 'chalk';
+import chalk from 'chalk'
 
-/**
- * 生成 Shell 自动补全脚本
- */
-export function completion () {
-  const script = `
+export function getCompletionScript() {
+  return `
 ###-begin-flu-cli-completion-###
 #
 # flu-cli command completion script
@@ -83,10 +80,15 @@ if type compdef &>/dev/null; then
 fi
 
 ###-end-flu-cli-completion-###
-`;
+`
+}
 
-  console.log(script);
-  console.error(chalk.green('✅ 补全脚本已生成'));
-  console.error(chalk.gray('请将其添加到您的 shell 配置文件中 (例如 ~/.zshrc 或 ~/.bashrc)'));
-  console.error(chalk.gray('用法: flu-cli completion >> ~/.zshrc && source ~/.zshrc'));
+/**
+ * 生成 Shell 自动补全脚本
+ */
+export function completion() {
+  console.log(getCompletionScript())
+  console.error(chalk.green('✅ 补全脚本已生成'))
+  console.error(chalk.gray('请将其添加到您的 shell 配置文件中 (例如 ~/.zshrc 或 ~/.bashrc)'))
+  console.error(chalk.gray('用法: flu-cli completion >> ~/.zshrc && source ~/.zshrc'))
 }

package/lib/commands/config.js

@@ -3,108 +3,214 @@
  * 职责：初始化和管理项目配置文件
  */
 
-import { ProjectConfigManager, detectProjectTemplate, ConfigManager } from 'flu-cli-core';
-import { writeFileSync, existsSync } from 'fs';
-import { join } from 'path';
-import chalk from 'chalk';
+import {
+  ProjectConfigManager,
+  detectProjectTemplate,
+  ConfigManager,
+  listGeneratorSelectableOptions,
+} from 'flu-cli-core'
+import { writeFileSync, existsSync } from 'fs'
+import { join } from 'path'
+import chalk from 'chalk'
+
+export function initConfigWithReport(options) {
+  const diagnostics = []
+  try {
+    const projectDir = options.dir || process.cwd()
+    const configPath = join(projectDir, '.flu-cli.json')
+
+    if (existsSync(configPath) && !options.force) {
+      diagnostics.push('配置文件已存在 (.flu-cli.json)，使用 --force 覆盖')
+      return { ok: false, diagnostics, configPath, template: null, written: false }
+    }
+
+    const template = detectProjectTemplate(projectDir) || 'custom'
+    const config = ProjectConfigManager.getDefaultConfigTemplate(template)
+
+    try {
+      const pageConfig = config.generators && config.generators.page
+      if (pageConfig && pageConfig.withBasePage) {
+        const possiblePaths = [
+          join(projectDir, 'lib/base/base_page.dart'),
+          join(projectDir, 'lib/core/base/base_page.dart'),
+          join(projectDir, 'lib/core/presentation/base/base_page.dart'),
+        ]
+
+        if (pageConfig.basePageImport && pageConfig.basePageImport.startsWith('lib/')) {
+          possiblePaths.unshift(join(projectDir, pageConfig.basePageImport))
+        }
+
+        const basePageExists = possiblePaths.some((p) => existsSync(p))
+        if (!basePageExists) {
+          diagnostics.push('Smart Init: 未检测到 BasePage 文件，降级为原生模式 (Native Mode)')
+          if (config.generators && config.generators.page) {
+            config.generators.page.withBasePage = false
+            config.generators.page.withViewModel = false
+          }
+          if (config.generators && config.generators.viewModel) {
+            config.generators.viewModel.withBaseViewModel = false
+          }
+        }
+      }
+    } catch (e) {
+      diagnostics.push(`Smart Init 检查失败: ${e.message || e}`)
+    }
+
+    writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf8')
+    return { ok: true, diagnostics, configPath, template, written: true }
+  } catch (error) {
+    return { ok: false, diagnostics: [`初始化配置失败: ${error.message}`], configPath: null }
+  }
+}
+
+export function setConfigWithReport(key, value) {
+  const diagnostics = []
+  try {
+    const config = ConfigManager.getInstance()
+    if (key === 'locale') {
+      if (!['zh-CN', 'en-US'].includes(value)) {
+        diagnostics.push(`不支持的语言: ${value}`)
+        diagnostics.push('支持: zh-CN, en-US')
+        return { ok: false, diagnostics, key, value }
+      }
+      config.setLocale(value)
+      return { ok: true, diagnostics, key, value }
+    }
+    diagnostics.push(`不支持的配置项: ${key}`)
+    return { ok: false, diagnostics, key, value }
+  } catch (e) {
+    return { ok: false, diagnostics: [String(e?.message || e)], key, value }
+  }
+}
+
+export function getConfigWithReport(key) {
+  const config = ConfigManager.getInstance()
+  if (key === 'locale') {
+    return { ok: true, diagnostics: [], key, value: config.getLocale() }
+  }
+  if (key) {
+    return { ok: false, diagnostics: [`未知配置项: ${key}`], key, value: null }
+  }
+  return {
+    ok: true,
+    diagnostics: [],
+    key: null,
+    value: {
+      locale: config.getLocale(),
+      author: config.getAuthorName(),
+    },
+  }
+}
+
+export function listGeneratorSelectableOptionsWithReport(options) {
+  const projectDir = options.dir || process.cwd()
+  const target = options.target || 'page'
+  try {
+    const report = listGeneratorSelectableOptions(projectDir, target)
+    return { ok: true, diagnostics: report.diagnostics ?? [], report }
+  } catch (e) {
+    return { ok: false, diagnostics: [String(e?.message || e)], report: null }
+  }
+}
 
 /**
  * 初始化配置文件
  */
-export function initConfig (options) {
+export function initConfig(options) {
   try {
-    const projectDir = options.dir || process.cwd();
-    const configPath = join(projectDir, '.flu-cli.json');
+    const projectDir = options.dir || process.cwd()
+    const configPath = join(projectDir, '.flu-cli.json')
 
     if (existsSync(configPath) && !options.force) {
-      console.log(chalk.yellow('⚠️  配置文件已存在 (.flu-cli.json)'));
-      console.log(chalk.gray('使用 --force 覆盖'));
-      return;
+      console.log(chalk.yellow('⚠️  配置文件已存在 (.flu-cli.json)'))
+      console.log(chalk.gray('使用 --force 覆盖'))
+      return
     }
 
     // 检测当前项目模板，生成对应的默认配置
-    const template = detectProjectTemplate(projectDir) || 'custom';
-    let config = ProjectConfigManager.getDefaultConfigTemplate(template);
+    const template = detectProjectTemplate(projectDir) || 'custom'
+    let config = ProjectConfigManager.getDefaultConfigTemplate(template)
 
     // Smart Init: 现实检查，防止默认配置依赖的 BasePage/BaseViewModel 在项目中不存在
     try {
-      const pageConfig = config.generators && config.generators.page;
+      const pageConfig = config.generators && config.generators.page
       if (pageConfig && pageConfig.withBasePage) {
         const possiblePaths = [
           join(projectDir, 'lib/base/base_page.dart'),
           join(projectDir, 'lib/core/base/base_page.dart'),
-          join(projectDir, 'lib/core/presentation/base/base_page.dart')
-        ];
+          join(projectDir, 'lib/core/presentation/base/base_page.dart'),
+        ]
 
         if (pageConfig.basePageImport && pageConfig.basePageImport.startsWith('lib/')) {
-          possiblePaths.unshift(join(projectDir, pageConfig.basePageImport));
+          possiblePaths.unshift(join(projectDir, pageConfig.basePageImport))
         }
 
-        const basePageExists = possiblePaths.some(p => existsSync(p));
+        const basePageExists = possiblePaths.some((p) => existsSync(p))
 
         if (!basePageExists) {
-          console.log(chalk.yellow('Smart Init: 未检测到 BasePage 文件，降级为原生模式 (Native Mode)'));
+          console.log(
+            chalk.yellow('Smart Init: 未检测到 BasePage 文件，降级为原生模式 (Native Mode)'),
+          )
           if (config.generators && config.generators.page) {
-            config.generators.page.withBasePage = false;
-            config.generators.page.withViewModel = false;
+            config.generators.page.withBasePage = false
+            config.generators.page.withViewModel = false
           }
           if (config.generators && config.generators.viewModel) {
-            config.generators.viewModel.withBaseViewModel = false;
+            config.generators.viewModel.withBaseViewModel = false
           }
         }
       }
     } catch (e) {
-      console.log(chalk.gray(`Smart Init 检查失败: ${e.message || e}`));
+      console.log(chalk.gray(`Smart Init 检查失败: ${e.message || e}`))
     }
 
-    writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf8');
-
-    console.log(chalk.green(`✓ 配置文件已生成: ${configPath}`));
-    console.log(chalk.cyan(`ℹ️  基于检测到的模板类型: ${template}`));
-    console.log(chalk.gray('你可以编辑 .flu-cli.json 来自定义生成规则'));
+    writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf8')
 
+    console.log(chalk.green(`✓ 配置文件已生成: ${configPath}`))
+    console.log(chalk.cyan(`ℹ️  基于检测到的模板类型: ${template}`))
+    console.log(chalk.gray('你可以编辑 .flu-cli.json 来自定义生成规则'))
   } catch (error) {
-    console.error(chalk.red(`初始化配置失败: ${error.message}`));
-    process.exit(1);
+    console.error(chalk.red(`初始化配置失败: ${error.message}`))
+    process.exit(1)
   }
 }
 
 /**
  * 设置全局配置
  */
-export function setConfig (key, value) {
-  const config = ConfigManager.getInstance();
+export function setConfig(key, value) {
+  const config = ConfigManager.getInstance()
 
   // 目前只支持 locale
   if (key === 'locale') {
     if (!['zh-CN', 'en-US'].includes(value)) {
-      console.log(chalk.red(`不支持的语言: ${value}`));
-      console.log(chalk.gray('支持: zh-CN, en-US'));
-      return;
+      console.log(chalk.red(`不支持的语言: ${value}`))
+      console.log(chalk.gray('支持: zh-CN, en-US'))
+      return
     }
-    config.setLocale(value);
-    console.log(chalk.green(`✓ 全局配置已更新: ${key} = ${value}`));
+    config.setLocale(value)
+    console.log(chalk.green(`✓ 全局配置已更新: ${key} = ${value}`))
   } else {
-    console.log(chalk.yellow(`不支持的配置项: ${key}`));
+    console.log(chalk.yellow(`不支持的配置项: ${key}`))
   }
 }
 
 /**
  * 获取全局配置
  */
-export function getConfig (key) {
-  const config = ConfigManager.getInstance();
+export function getConfig(key) {
+  const config = ConfigManager.getInstance()
 
   if (key === 'locale') {
-    const val = config.getLocale();
-    console.log(`${key} = ${val}`);
+    const val = config.getLocale()
+    console.log(`${key} = ${val}`)
   } else {
     // 简单起见，如果 key 未知，显示 list
     if (key) {
-      console.log(chalk.yellow(`未知配置项: ${key}`));
+      console.log(chalk.yellow(`未知配置项: ${key}`))
     } else {
-      console.log(`locale = ${config.getLocale()}`);
-      console.log(`author = ${config.getAuthorName()}`);
+      console.log(`locale = ${config.getLocale()}`)
+      console.log(`author = ${config.getAuthorName()}`)
     }
   }
 }