flu-cli 2.0.3 → 2.0.5

package/index.js

@@ -4,19 +4,53 @@
  * flu-cli v2.0
  * Flutter MVVM 脚手架工具
  * 
- * 支持多种架构模板和代码生成功能
+ * 支持多种架构模板 and 代码生成功能
  */
 
+// ========== 加载 .env 文件 ==========
+import { readFileSync, existsSync } from 'fs';
+import { resolve } from 'path';
+
+function loadEnvFile () {
+  try {
+    const envPath = resolve(process.cwd(), '.env');
+    if (existsSync(envPath)) {
+      const envContent = readFileSync(envPath, 'utf8');
+      const lines = envContent.split('\n');
+
+      for (const line of lines) {
+        const trimmed = line.trim();
+        // 跳过注释和空行
+        if (!trimmed || trimmed.startsWith('#')) continue;
+
+        const [key, ...valueParts] = trimmed.split('=');
+        const value = valueParts.join('=').trim();
+
+        // 移除引号
+        const cleanValue = value.replace(/^["']|["']$/g, '');
+
+        // 只设置未定义的环境变量
+        if (!process.env[key]) {
+          process.env[key] = cleanValue;
+        }
+      }
+    }
+  } catch (error) {
+    // 忽略加载错误
+  }
+}
+
+loadEnvFile();
+
 import { program } from 'commander';
 import chalk from 'chalk';
-import { readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import { newProjectWithClack } from './lib/commands/newClack.js';
 import { addComponent } from './lib/commands/add.js';
 import { listTemplates, showTemplateDetail } from './lib/commands/templates.js';
 import { updateTemplates, cleanCache } from './lib/commands/cache.js';
-// generate-sm 命令已移除
+import { t } from './lib/utils/i18n.js';
 
 // 获取 package.json
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -25,10 +59,9 @@ const packageJson = JSON.parse(readFileSync(join(__dirname, 'package.json'), 'ut
 // 设置版本和描述
 program
   .version(packageJson.version)
-  .description(chalk.cyan('🚀 Flutter MVVM 脚手架工具'));
+  .description(chalk.cyan(t('cli.description')));
 
 // ========== 创建项目命令（V1 已废弃） ==========
-// V1 命令已移除，请使用 'flu new' 命令
 program
   .command('create')
   .description('⚠️  已废弃：请使用 flu new 命令')
@@ -36,11 +69,6 @@ program
     console.log(chalk.yellow('\n⚠️  create 命令已在 V2 中废弃\n'));
     console.log(chalk.cyan('请使用新命令：'));
     console.log(chalk.green('  flu new <project-name>\n'));
-    console.log(chalk.gray('示例：'));
-    console.log(chalk.gray('  flu new my_app --template lite'));
-    console.log(chalk.gray('  flu new my_app --template modular'));
-    console.log(chalk.gray('  flu new my_app --template clean\n'));
-    console.log(chalk.blue('查看帮助：flu new --help\n'));
     process.exit(0);
   });
 
@@ -48,12 +76,16 @@ program
 program
   .command('new [project-name]')
   .alias('n')
-  .description('创建 Flutter 项目（实时模板预览）')
-  .option('-t, --template <type>', '模板类型: lite, modular, clean')
-  .option('-s, --state <type>', '状态管理器: default, provider, getx, riverpod', 'default')
-  .option('-d, --dir <path>', '项目存放目录', process.cwd())
-  .option('--no-cache', '不使用缓存，强制从 Git 拉取')
-  .option('--remote', '使用远程 Gitee 模板（默认使用本地模板）')
+  .description(t('cmd.new.desc'))
+  .option('-t, --template <type>', t('cmd.new.opt.template'))
+  .option('-s, --state <type>', t('cmd.new.opt.state'), 'default')
+  .option('-d, --dir <path>', t('cmd.new.opt.dir'), process.cwd())
+  .option('-p, --package <name>', '指定包名 (e.g., com.example.myapp)')
+  .option('-a, --author <name>', '指定作者名称')
+  .option('--no-cache', t('cmd.new.opt.no_cache'))
+  .option('--no-network', '不包含网络层（默认包含）')
+  .option('--remote', t('cmd.new.opt.remote'))
+  .option('--flutter-template <type>', 'Flutter official template (app, module, package, plugin)', 'app')
   .action((projectName, options) => {
     newProjectWithClack(projectName, options);
   });
@@ -62,14 +94,14 @@ program
 program
   .command('add [type] [name]')
   .alias('a')
-  .description('添加 Flutter 代码组件 (page/p, widget/w, component/c, ...)')
-  .option('-f, --feature <name>', '所属功能模块（仅 modular/clean 模式）')
-  .option('--stateful', '创建 StatefulWidget（默认 StatelessWidget）')
-  .option('--stateless', '强制创建 StatelessWidget（即使有 ViewModel，不推荐）')
-  .option('--list-page', '创建列表页 (BaseListPage)')
-  .option('--no-vm', '不生成 ViewModel（仅 page 类型）')
-  .option('--json <file>', '从 JSON 文件生成（仅 model 类型）')
-  .option('--list', '查看支持的类型列表')
+  .description(t('cmd.add.desc'))
+  .option('-f, --feature <name>', t('cmd.add.opt.feature'))
+  .option('--stateful', t('cmd.add.opt.stateful'))
+  .option('--stateless', t('cmd.add.opt.stateless'))
+  .option('--list-page', t('cmd.add.opt.list_page'))
+  .option('--no-vm', t('cmd.add.opt.no_vm'))
+  .option('--json <file>', t('cmd.add.opt.json'))
+  .option('--list', t('cmd.add.opt.list'))
   .action((type, name, options) => {
     addComponent(type, name, options);
   });
@@ -78,7 +110,7 @@ program
 program
   .command('templates [template-name]')
   .alias('t')
-  .description('查看所有模板或指定模板详情')
+  .description(t('cmd.templates.desc'))
   .action((templateName) => {
     if (templateName) {
       showTemplateDetail(templateName);
@@ -87,15 +119,13 @@ program
     }
   });
 
-// generate-sm 命令已移除
-
 // ========== 缓存管理命令 ==========
 program
   .command('update-templates [template-name]')
   .alias('update')
   .alias('u')
-  .description('更新模板缓存')
-  .option('--force', '强制刷新并清理未跟踪文件')
+  .description(t('cmd.update.desc'))
+  .option('--force', t('cmd.update.opt.force'))
   .action((templateName, options) => {
     updateTemplates(templateName, options);
   });
@@ -103,7 +133,7 @@ program
 program
   .command('cache <action>')
   .alias('c')
-  .description('缓存管理 (action: clean)')
+  .description(t('cmd.cache.desc'))
   .action((action) => {
     if (action === 'clean') {
       cleanCache();
@@ -113,13 +143,25 @@ program
     }
   });
 
+// ========== 应用资源管理 ==========
+import { configAssets } from './lib/commands/assets.js';
+
+program
+  .command('assets')
+  .alias('as')
+  .description(t('cmd.assets.desc'))
+  .option('-d, --dir <path>', t('cmd.new.opt.dir'), process.cwd())
+  .action((options) => {
+    configAssets(options);
+  });
+
 // ========== 代码片段管理 ==========
 import { syncSnippets } from './lib/commands/snippets.js';
 
 program
   .command('sync-snippets')
   .alias('sync')
-  .description('同步最新版本的标准代码片段到当前项目')
+  .description(t('cmd.sync.desc'))
   .action(() => {
     syncSnippets();
   });
@@ -128,35 +170,34 @@ program
 import { listAllTemplates, addTemplate, removeTemplate } from './lib/commands/template.js';
 
 const templateCmd = program.command('template');
-
 templateCmd
-  .description('管理自定义项目模板')
+  .description(t('cmd.template.desc'))
   .action(() => {
     listAllTemplates();
   });
 
 templateCmd
   .command('list')
-  .description('列出所有模板')
+  .description(t('cmd.template.list.desc'))
   .action(() => {
     listAllTemplates();
   });
 
 templateCmd
   .command('add <id> <source>')
-  .description('添加自定义模板 (id: 唯一标识, source: Git URL 或本地路径)')
-  .option('--local', '添加本地模板 (source 为路径)')
-  .option('-n, --name <name>', '显示名称')
-  .option('-b, --branch <branch>', 'Git 分支 (默认 main)')
-  .option('-d, --description <text>', '描述信息')
-  .option('-f, --force', '覆盖已存在的模板')
+  .description(t('cmd.template.add.desc'))
+  .option('--local', t('cmd.template.add.opt.local'))
+  .option('-n, --name <name>', t('cmd.template.add.opt.name'))
+  .option('-b, --branch <branch>', t('cmd.template.add.opt.branch'))
+  .option('-d, --description <text>', t('cmd.template.add.opt.desc'))
+  .option('-f, --force', t('cmd.template.add.opt.force'))
   .action((id, source, options) => {
     addTemplate(id, source, options);
   });
 
 templateCmd
   .command('remove <id>')
-  .description('删除自定义模板')
+  .description(t('cmd.template.remove.desc'))
   .action((id) => {
     removeTemplate(id);
   });
@@ -167,37 +208,46 @@ import { completion } from './lib/commands/completion.js';
 program
   .command('completion')
   .alias('comp')
-  .description('生成 Shell 自动补全脚本 (bash/zsh)')
+  .description(t('cmd.completion.desc'))
   .action(() => {
     completion();
   });
 
-
 // ========== 配置管理命令 ==========
-import { initConfig } from './lib/commands/config.js';
+import { initConfig, setConfig, getConfig } from './lib/commands/config.js';
 
 const configCmd = program.command('config');
-
 configCmd
-  .description('管理项目生成配置 (.flu-cli.json)')
+  .description(t('cmd.config.desc'))
   .action(() => {
     configCmd.help();
   });
 
 configCmd
   .command('init')
-  .description('初始化配置文件 (基于当前项目结构)')
-  .option('-d, --dir <path>', '项目目录', process.cwd())
+  .description(t('cmd.config.init.desc'))
+  .option('-d, --dir <path>', t('cmd.new.opt.dir'), process.cwd())
   .option('-f, --force', '覆盖已存在的配置文件')
   .action((options) => {
     initConfig(options);
   });
 
+configCmd
+  .command('set <key> <value>')
+  .description('Set global configuration (e.g., locale)')
+  .action((key, value) => {
+    setConfig(key, value);
+  });
+
+configCmd
+  .command('get [key]')
+  .description('Get global configuration')
+  .action((key) => {
+    getConfig(key);
+  });
 
-// 解析命令行参数
 program.parse(process.argv);
 
-// 如果没有提供命令，显示帮助信息
 if (process.argv.length === 2) {
   console.log(chalk.bold.cyan('\n🚀 欢迎使用 flu-cli v2.0\n'));
   program.help({ error: false });

package/lib/commands/add.js

@@ -12,7 +12,7 @@ import {
   generateModel,
   generateComponent,
   generateModule
-} from '@flu-cli/core';
+} from 'flu-cli-core';
 
 const logger = new ConsoleLogger();
 
@@ -162,7 +162,7 @@ async function addPage (name, options) {
     logger.info(`不生成 ViewModel`);
   }
 
-  const success = generatePage(name, {
+  const success = await generatePage(name, {
     feature,
     stateful: finalStateful,
     stateless: finalStateless,
@@ -209,7 +209,7 @@ async function addWidget (name, options) {
     logger.info(`类型: StatefulWidget`);
   }
 
-  const success = generateWidget(name, {
+  const success = await generateWidget(name, {
     feature,
     stateful,
     outputDir: process.cwd()
@@ -234,7 +234,7 @@ async function addComponentItem (name, options) {
     logger.info(`功能模块: ${feature}`);
   }
 
-  const success = generateComponent(name, {
+  const success = await generateComponent(name, {
     feature,
     outputDir: options.outputDir || process.cwd()
   }, logger);
@@ -258,7 +258,7 @@ async function addViewModel (name, options) {
     logger.info(`功能模块: ${feature}`);
   }
 
-  const success = generateViewModel(name, {
+  const success = await generateViewModel(name, {
     feature,
     outputDir: process.cwd()
   }, logger);
@@ -282,7 +282,7 @@ async function addService (name, options) {
     logger.info(`功能模块: ${feature}`);
   }
 
-  const success = generateService(name, {
+  const success = await generateService(name, {
     feature,
     outputDir: process.cwd()
   }, logger);
@@ -386,7 +386,7 @@ async function addModel (name, options) {
     logger.info(`从 JSON 文件生成: ${json}`);
   }
 
-  const success = generateModel(name, {
+  const success = await generateModel(name, {
     feature,
     jsonFile: options.json || json,
     jsonData,
@@ -405,7 +405,7 @@ async function addModel (name, options) {
 async function addModule (name, options) {
   logger.info(`生成模块: ${name}`);
 
-  const success = generateModule(name, {
+  const success = await generateModule(name, {
     outputDir: options.outputDir || process.cwd()
   });
 

package/lib/commands/assets.js

@@ -0,0 +1,183 @@
+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();
+
+/**
+ * 交互式配置应用资源
+ */
+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;
+  }
+
+  p.intro(chalk.cyan.bold(t('assets.intro')));
+
+  try {
+    const assets = {};
+
+    // 1. 配置应用图标
+    const setupIcon = await p.confirm({
+      message: t('assets.setup_icon'),
+      initialValue: true
+    });
+
+    if (p.isCancel(setupIcon)) {
+      p.cancel(t('common.cancel'));
+      return;
+    }
+
+    if (setupIcon) {
+      const iconPath = await p.text({
+        message: t('assets.icon_path'),
+        placeholder: 'assets/logo.png',
+        validate: (value) => {
+          if (!value) return '路径不能为空';
+          if (!existsSync(join(projectPath, value)) && !existsSync(value)) {
+            return '找不到该文件，请确认路径是否正确';
+          }
+        }
+      });
+
+      if (p.isCancel(iconPath)) {
+        p.cancel(t('common.cancel'));
+        return;
+      }
+      assets.appIcon = iconPath;
+    }
+
+    // 2. 配置启动图
+    const setupSplash = await p.confirm({
+      message: t('assets.setup_splash'),
+      initialValue: true
+    });
+
+    if (p.isCancel(setupSplash)) {
+      p.cancel(t('common.cancel'));
+      return;
+    }
+
+    if (setupSplash) {
+      const splashLogo = await p.text({
+        message: t('assets.splash_logo'),
+        placeholder: 'assets/logo.png',
+        validate: (value) => {
+          if (!value) return '路径不能为空';
+          if (!existsSync(join(projectPath, value)) && !existsSync(value)) {
+            return '找不到该文件，请确认路径是否正确';
+          }
+        }
+      });
+
+      if (p.isCancel(splashLogo)) {
+        p.cancel(t('common.cancel'));
+        return;
+      }
+      assets.splashLogo = splashLogo;
+
+      const bgColor = await p.text({
+        message: t('assets.bg_color'),
+        placeholder: '#FFFFFF',
+        initialValue: '#FFFFFF'
+      });
+
+      if (p.isCancel(bgColor)) {
+        p.cancel(t('common.cancel'));
+        return;
+      }
+      assets.splashBackgroundColor = bgColor;
+
+      const useBgImage = await p.confirm({
+        message: t('assets.use_bg_image'),
+        initialValue: false
+      });
+
+      if (p.isCancel(useBgImage)) {
+        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 (!existsSync(join(projectPath, value)) && !existsSync(value)) {
+              return '找不到该文件';
+            }
+          }
+        });
+        if (p.isCancel(bgImagePath)) {
+          p.cancel(t('common.cancel'));
+          return;
+        }
+        assets.splashBackground = bgImagePath;
+      }
+
+      // 暗黑模式支持
+      const enableDark = await p.confirm({
+        message: t('assets.setup_dark'),
+        initialValue: false
+      });
+
+      if (p.isCancel(enableDark)) {
+        p.cancel(t('common.cancel'));
+        return;
+      }
+
+      if (enableDark) {
+        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;
+
+        const useDarkLogo = await p.confirm({
+          message: t('assets.use_dark_logo'),
+          initialValue: false
+        });
+        if (useDarkLogo) {
+          const darkLogoPath = await p.text({
+            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;
+    }
+
+    const s = p.spinner();
+    s.start(t('assets.configuring'));
+
+    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')));
+    } else {
+      s.stop(t('assets.failed'));
+      p.outro(chalk.red(t('assets.error_outro')));
+    }
+
+  } catch (error) {
+    p.cancel(`发生错误: ${error.message}`);
+    process.exit(1);
+  }
+}

package/lib/commands/config.js

@@ -3,7 +3,7 @@
  * 职责：初始化和管理项目配置文件
  */
 
-import { ProjectConfigManager, detectProjectTemplate } from '@flu-cli/core';
+import { ProjectConfigManager, detectProjectTemplate, ConfigManager } from 'flu-cli-core';
 import { writeFileSync, existsSync } from 'fs';
 import { join } from 'path';
 import chalk from 'chalk';
@@ -68,3 +68,43 @@ export function initConfig (options) {
     process.exit(1);
   }
 }
+
+/**
+ * 设置全局配置
+ */
+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;
+    }
+    config.setLocale(value);
+    console.log(chalk.green(`✓ 全局配置已更新: ${key} = ${value}`));
+  } else {
+    console.log(chalk.yellow(`不支持的配置项: ${key}`));
+  }
+}
+
+/**
+ * 获取全局配置
+ */
+export function getConfig (key) {
+  const config = ConfigManager.getInstance();
+
+  if (key === 'locale') {
+    const val = config.getLocale();
+    console.log(`${key} = ${val}`);
+  } else {
+    // 简单起见，如果 key 未知，显示 list
+    if (key) {
+      console.log(chalk.yellow(`未知配置项: ${key}`));
+    } else {
+      console.log(`locale = ${config.getLocale()}`);
+      console.log(`author = ${config.getAuthorName()}`);
+    }
+  }
+}