flu-cli 2.0.3 → 2.0.4

package/lib/commands/newClack.js

@@ -13,11 +13,11 @@ import { getTemplate, isValidTemplate, getAllTemplates } from '../../config/temp
 import { selectTemplateWithEnquirer } from '../utils/templateSelectorEnquirer.js';
 import { cloneOrUpdateTemplate } from '../templates/templateManager.js';
 import { getAuthorName, saveAuthorName, saveDefaultTemplate } from '../utils/config.js';
-import { ConfigManager } from '@flu-cli/core';
+import { ConfigManager, ProjectGenerator } from '@flu-cli/core';
 import { copyTemplate, replaceVariables, copyCustomTemplate, ensurePubspecName, mergePubspecFromTemplate, cleanupTemplateFiles } from '../templates/templateCopier.js';
 import { runFlutterCreate } from '../utils/flutterHelper.js';
-import { ProjectGenerator } from '../generators/project_generator.js';
 import { syncSnippets } from './snippets.js';
+import { configAssets } from './assets.js';
 
 /**
  * 创建新项目
@@ -52,19 +52,42 @@ export async function newProjectWithClack (projectName, options) {
       // Step 2: 选择模板（实时预览，支持内置/自定义）
       templateSelection = await selectTemplateWithEnquirer();
 
-      // Step 2.5: 选择状态管理器
-      const smChoice = await p.select({
-        message: '请选择状态管理器',
-        options: [
-          { value: 'default', label: 'ChangeNotifier (默认)' },
-          { value: 'provider', label: 'Provider' },
-          { value: 'getx', label: 'GetX' },
-          { value: 'riverpod', label: 'Riverpod' }
-        ],
-        initialValue: 'default'
-      });
-      if (!p.isCancel(smChoice)) {
+      // Step 2.5: 选择状态管理器 (Native 模板跳过)
+      let includeNetworkLayer = true; // 默认包含网络层
+      if (templateSelection.kind === 'builtin' && templateSelection.name === 'native') {
+        stateManager = 'default';
+        includeNetworkLayer = false; // Native 模板不需要网络层
+      } else {
+        const smChoice = await p.select({
+          message: '请选择状态管理器',
+          options: [
+            { value: 'default', label: 'ChangeNotifier (默认)' },
+            { value: 'provider', label: 'Provider' },
+            { value: 'getx', label: 'GetX' }
+            // { value: 'riverpod', label: 'Riverpod' }
+          ],
+          initialValue: 'default'
+        });
+        if (p.isCancel(smChoice)) {
+          p.cancel('操作已取消');
+          process.exit(0);
+        }
         stateManager = smChoice;
+
+        // Step 2.6: 选择是否包含网络层
+        const nlChoice = await p.select({
+          message: '是否包含网络层？',
+          options: [
+            { value: true, label: '包含网络层 (推荐)', hint: '包含 Dio 网络工具、AppConfig、StorageUtil' },
+            { value: false, label: '不包含网络层', hint: '纯净项目，适合工具类或离线应用' }
+          ],
+          initialValue: true
+        });
+        if (p.isCancel(nlChoice)) {
+          p.cancel('操作已取消');
+          process.exit(0);
+        }
+        includeNetworkLayer = nlChoice;
       }
 
       // Step 3: 项目路径（含冲突检测与删除确认）
@@ -158,6 +181,7 @@ export async function newProjectWithClack (projectName, options) {
       console.log('');
       console.log(`  ${chalk.gray('项目名称:')} ${chalk.green(finalProjectName)}`);
       console.log(`  ${chalk.gray('项目模板:')} ${chalk.green(templateDisplay)}`);
+      console.log(`  ${chalk.gray('网络层:')} ${chalk.green(includeNetworkLayer ? '包含' : '不包含')}`);
       console.log(`  ${chalk.gray('项目路径:')} ${chalk.green(projectPath)}`);
       console.log(`  ${chalk.gray('包名:')} ${chalk.green(packageName)}`);
       console.log(`  ${chalk.gray('作者:')} ${chalk.green(author)}`);
@@ -173,7 +197,7 @@ export async function newProjectWithClack (projectName, options) {
       }
 
       // Step 8: 创建项目
-      await createProject(finalProjectName, templateSelection, projectPath, { projectName: finalProjectName, packageName, author, stateManager }, options);
+      await createProject(finalProjectName, templateSelection, projectPath, { projectName: finalProjectName, packageName, author, stateManager, includeNetworkLayer }, options);
 
     } else {
       // ========== 命令行模式 ==========
@@ -251,7 +275,8 @@ export async function newProjectWithClack (projectName, options) {
       }
 
       // CLI 模式支持 --state 传参
-      await createProject(finalProjectName, templateSelection, projectDir, { projectName: finalProjectName, packageName, author, stateManager }, options);
+      const includeNetworkLayer = options.network !== false; // 默认包含，除非明确指定 --no-network
+      await createProject(finalProjectName, templateSelection, projectDir, { projectName: finalProjectName, packageName, author, stateManager, includeNetworkLayer }, options);
     }
   } catch (error) {
     p.cancel(`创建失败: ${error.message}`);
@@ -266,106 +291,44 @@ async function createProject (projectName, templateSelection, projectDir, projec
   const s = p.spinner();
 
   try {
-    // 1. 准备模板
-    s.start('正在准备模板...');
-    let templatePath;
-    if (templateSelection?.kind === 'builtin') {
-      const template = getTemplate(templateSelection.name);
-      // 根据运行环境决定是否使用本地模板
-      // 生产环境（production）默认走远程，其他环境默认走本地（除非显式使用 --remote）
-      const runMode = process.env.FLU_CLI_MODE || process.env.NODE_ENV || 'development';
-      const useLocal = !options.remote && runMode !== 'production' && (template.local || false);
-      const __here = dirname(fileURLToPath(import.meta.url));
-      const cliRoot = dirname(dirname(__here)); // flu-cli/flu-cli
-      const workspaceRoot = dirname(cliRoot);
-      const sourceLocalPath = join(workspaceRoot, `template-${templateSelection.name}`);
-      const forceUpdate = useLocal ? true : !options.cache;
-      templatePath = await cloneOrUpdateTemplate(
-        templateSelection.name,
-        template.repo,
-        template.branch,
-        forceUpdate,
-        useLocal,
-        sourceLocalPath
-      );
-    } else if (templateSelection?.kind === 'custom') {
-      const configManager = ConfigManager.getInstance();
-      const ct = configManager.getTemplate(templateSelection.id);
-
-      if (!ct) {
-        s.stop('模板准备失败');
-        throw new Error('未找到自定义模板');
-      }
-      if (ct.type === 'local') {
-        templatePath = await cloneOrUpdateTemplate(
-          ct.id,
-          null,
-          'main',
-          !options.cache,
-          true,
-          ct.path || ct.url // 兼容旧配置
-        );
-      } else {
-        templatePath = await cloneOrUpdateTemplate(
-          ct.id,
-          ct.url,
-          ct.branch || 'main',
-          !options.cache,
-          false
-        );
-      }
-    } else {
-      throw new Error('模板选择无效');
-    }
-
-    if (!templatePath) {
-      s.stop('模板准备失败');
-      throw new Error('模板准备失败');
-    }
-    s.stop('✓ 模板准备完成');
-
-    // 2. 创建 Flutter 项目
-    s.start('正在创建 Flutter 项目...');
-    const created = await runFlutterCreate(projectDir, projectInfo.projectName, projectInfo.packageName);
-    if (created) {
-      s.stop('✓ Flutter 项目创建成功');
-    } else {
-      s.stop('Flutter 项目创建失败');
-    }
-
-    // 3. 复制模板文件（自定义模板仅覆盖通用代码，保留平台与包名）
-    s.start('正在复制模板文件...');
-    const isCustom = templateSelection?.kind === 'custom';
-    const copied = isCustom
-      ? await copyCustomTemplate(templatePath, projectDir)
-      : await copyTemplate(templatePath, projectDir);
+    // 1. 设置生成选项
+    const templateId = templateSelection.kind === 'builtin'
+      ? templateSelection.name
+      : templateSelection.id;
+
+    const generatorOptions = {
+      templateType: templateId,
+      stateManager: projectInfo.stateManager || 'default',
+      packageName: projectInfo.packageName,
+      outputDir: dirname(projectDir),
+      createFlutterProject: true, // v2 总是需要 flutter create
+      forceUpdate: !options.cache,
+      author: projectInfo.author,
+      flutterTemplate: options.flutterTemplate || 'app',
+      includeNetworkLayer: projectInfo.includeNetworkLayer !== false // 默认包含网络层
+    };
+
+    // 2. 调用核心生成器
+    s.start('正在生成项目 (Core Engine)...');
+    const pg = new ProjectGenerator();
+    const success = await pg.generate(projectName, generatorOptions);
 
-    if (!copied) {
-      s.stop('模板文件复制失败');
-      throw new Error('模板文件复制失败');
+    if (!success) {
+      s.stop('项目生成失败');
+      throw new Error('核心生成器返回失败');
     }
-    s.stop('✓ 模板文件复制成功');
-
-    // 4. 配置项目
-    s.start('正在配置项目...');
-    const pg = new ProjectGenerator();
-    await pg.processTemplates(projectDir);
-    await replaceVariables(projectDir, projectInfo);
-    if (isCustom) {
-      mergePubspecFromTemplate(templatePath, projectDir, projectInfo.projectName);
-    } else {
-      ensurePubspecName(projectDir, projectInfo.projectName);
+    s.stop('✓ 项目生成成功');
+
+    // 3. CLI 特色功能：同步标准代码片段 (Native 模板跳过)
+    const isNative = templateId === 'native' || templateId === 'none';
+    if (!isNative) {
+      s.start('正在同步代码片段...');
+      await syncSnippets(projectDir);
+      s.stop('✓ 代码片段同步完成');
     }
-    // 配置状态管理器
-    await pg.configureStateManager(projectDir, projectInfo.stateManager || 'default');
-
-    // 同步标准代码片段
-    s.start('正在同步代码片段...');
-    await syncSnippets(projectDir);
-    s.stop('✓ 代码片段同步完成');
 
+    // 4. 清理模板残余（ProjectGenerator 可能已经做了一部分，这里确保万一）
     cleanupTemplateFiles(projectDir);
-    s.stop('✓ 项目配置完成');
 
     // 完成
     p.outro(
@@ -376,7 +339,17 @@ async function createProject (projectName, templateSelection, projectDir, projec
       chalk.yellow(`  flutter run`)
     );
 
-    // 记忆默认模板
+    // 5. 提示资源配置
+    const shouldConfigAssets = await p.confirm({
+      message: '项目已创建。是否现在就配置 App 图标和启动图?',
+      initialValue: false
+    });
+
+    if (shouldConfigAssets) {
+      await configAssets({ dir: projectDir });
+    }
+
+    // 6. 记忆默认模板
     if (templateSelection?.kind === 'builtin') {
       saveDefaultTemplate({ type: 'builtin', idOrName: templateSelection.name });
     } else if (templateSelection?.kind === 'custom') {

package/lib/commands/snippets.js

@@ -2,8 +2,8 @@ import fs from 'fs-extra';
 import path from 'path';
 import chalk from 'chalk';
 import { fileURLToPath } from 'url';
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
+import { ProjectConfigManager, getTemplatesRootDir } from '@flu-cli/core';
+import { t } from '../utils/i18n.js';
 
 /**
  * 同步代码片段到当前项目
@@ -13,23 +13,64 @@ export async function syncSnippets (targetDir) {
   const vscodeDir = path.join(projectRoot, '.vscode');
   const targetFile = path.join(vscodeDir, 'dart.code-snippets');
 
-  // 获取 centralized snippets 路径
-  // 假设结构: packages/v2/lib/commands/snippets.js -> packages/v2/templates/snippets/dart.code-snippets
-  const snippetsSource = path.join(__dirname, '../../templates/snippets/dart.code-snippets');
+  // 获取 centralized snippets 路径 (从 Core 的模板根目录获取)
+  const templatesDir = getTemplatesRootDir();
+  const snippetsSource = path.join(templatesDir, 'snippets/dart.code-snippets');
 
   if (!fs.existsSync(snippetsSource)) {
-    console.log(chalk.red('❌ 错误: 找不到标准代码片段源文件'));
+    console.log(chalk.red(`❌ 错误: 找不到标准代码片段源文件: ${snippetsSource}`));
     return;
   }
 
   try {
+    // 读取原始 Snippets
+    const originalSnippets = await fs.readJson(snippetsSource);
+    let finalSnippets = { ...originalSnippets };
+
+    // 读取项目配置
+    const config = ProjectConfigManager.loadConfig(projectRoot);
+
+    if (config) {
+      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;
+
+      // 过滤规则
+      if (!withBasePage) {
+        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'];
+      }
+
+      if (!withBaseViewModel) {
+        delete finalSnippets['flu.viewmodel'];
+        delete finalSnippets['flu.listViewModel'];
+      }
+    }
+
     // 确保 .vscode 目录存在
     await fs.ensureDir(vscodeDir);
 
-    // 复制文件
-    await fs.copy(snippetsSource, targetFile, { overwrite: true });
+    // 写入文件
+    await fs.writeJson(targetFile, finalSnippets, { spaces: 2 });
 
-    console.log(chalk.green('✅ 代码片段同步成功！'));
+    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(`已更新: ${targetFile}`));
     console.log(chalk.cyan('提示: 重启 VS Code 或运行 "Developer: Reload Window" 以应用更改'));
 

package/lib/templates/templateCopier.js

@@ -1,108 +1,24 @@
 /**
- * 模板复制器
- * 职责：复制内置/自定义模板至目标目录，并执行变量替换与文件筛选
- * 特性：保留平台工程与包名、支持 .template 文件落地、清理模板特有文件
+ * 模板复制器 - 桥接至 @flu-cli/core
  */
 
-import fsExtra from 'fs-extra';
-import { join } from 'path';
-import { readFileSync, writeFileSync, readdirSync, statSync, existsSync } from 'fs';
-import { logger } from '../utils/logger.js';
-
-const { copySync, removeSync } = fsExtra;
+export {
+  copyTemplate,
+  copyCustomTemplate,
+  replaceVariables,
+  ensurePubspecName,
+  cleanupTemplateFiles
+} from '@flu-cli/core';
 
 /**
- * 复制模板到目标目录
- * @param {string} templatePath - 模板路径
- * @param {string} targetPath - 目标路径
- * @returns {Promise<boolean>} 是否成功
+ * 使用模板的 pubspec.yaml 合并覆盖目标项目 (仅限 V2 保持逻辑)
  */
-export async function copyTemplate (templatePath, targetPath) {
-  try {
-    // 检查模板路径是否存在
-    if (!existsSync(templatePath)) {
-      logger.error(`模板路径不存在: ${templatePath}`);
-      return false;
-    }
-
-    // 需要排除的文件和目录
-    const excludes = [
-      '.git',
-      '.github',
-      'node_modules',
-      '.flu-cli.yaml',
-      'README.template.md',
-      '.DS_Store',
-      'pubspec.yaml'  // 排除本地调试用的 pubspec.yaml
-    ];
-
-    // 复制文件，排除特定文件
-    copySync(templatePath, targetPath, {
-      filter: (src) => {
-        const basename = src.split('/').pop();
-        return !excludes.includes(basename);
-      },
-      overwrite: true
-    });
-
-    // 处理 pubspec.yaml.template -> pubspec.yaml
-    const templatePubspec = join(templatePath, 'pubspec.yaml.template');
-    const targetPubspec = join(targetPath, 'pubspec.yaml');
-    if (existsSync(templatePubspec)) {
-      // 复制 .template 文件并覆盖 Flutter 生成的 pubspec.yaml
-      copySync(templatePubspec, targetPubspec, { overwrite: true });
-      logger.info('已使用模板的 pubspec.yaml.template');
-    } else {
-      logger.warn('未找到 pubspec.yaml.template，使用 Flutter 默认配置');
-    }
-
-    return true;
-
-  } catch (error) {
-    logger.error(`复制模板失败: ${error.message}`);
-    return false;
-  }
-}
-
-// 仅复制自定义模板中的通用代码与配置，保留目标工程的平台与包名
-export async function copyCustomTemplate (templatePath, targetPath) {
-  try {
-    if (!existsSync(templatePath)) {
-      logger.error(`模板路径不存在: ${templatePath}`);
-      return false;
-    }
-
-    const includeDirs = ['lib', 'assets', '.vscode'];
-    const includeFiles = ['analysis_options.yaml', 'README.md', 'pubspec.yaml'];
-
-    for (const dir of includeDirs) {
-      const srcDir = join(templatePath, dir);
-      const dstDir = join(targetPath, dir);
-      if (existsSync(srcDir)) {
-        copySync(srcDir, dstDir, { overwrite: true });
-      }
-    }
-
-    for (const file of includeFiles) {
-      const srcFile = join(templatePath, file);
-      const dstFile = join(targetPath, file);
-      if (existsSync(srcFile)) {
-        copySync(srcFile, dstFile, { overwrite: true });
-      }
-    }
-
-    return true;
-  } catch (error) {
-    logger.error(`复制自定义模板失败: ${error.message}`);
-    return false;
-  }
-}
-
-/**
- * 使用模板的 pubspec.yaml 合并覆盖目标项目（仅修改 name 保持项目名）
- */
-export function mergePubspecFromTemplate (templatePath, projectDir, projectName) {
+export async function mergePubspecFromTemplate (templatePath, projectDir, projectName) {
+  // 暂时保留该逻辑或移动到 core (考虑到 core 主要是 ProjectGenerator 使用，可以先在 v2 桥接)
+  // TODO: 后续可以完全迁移到 core
   try {
+    const { readFileSync, writeFileSync, existsSync } = await import('fs');
+    const { join } = await import('path');
     const tplPub = join(templatePath, 'pubspec.yaml');
     const dstPub = join(projectDir, 'pubspec.yaml');
     if (!existsSync(tplPub) || !existsSync(dstPub)) return;
@@ -117,180 +33,3 @@ export function mergePubspecFromTemplate (templatePath, projectDir, projectName)
     // 忽略错误
   }
 }
-
-/**
- * 替换文件中的变量
- * @param {string} projectDir - 项目目录
- * @param {object} variables - 变量对象
- */
-export async function replaceVariables (projectDir, variables) {
-  try {
-    // 需要替换变量的文件模式
-    const patterns = [
-      '**/*.dart',
-      'pubspec.yaml',
-      'README.md',
-      'android/app/build.gradle',
-      'ios/Runner/Info.plist'
-    ];
-
-    // 变量映射
-    const replacements = {
-      '{{projectName}}': variables.projectName,
-      '{{project_name}}': variables.projectName,
-      '{{package_name}}': variables.packageName,
-      '{{author}}': variables.author || 'Your Name',
-      '{{year}}': new Date().getFullYear().toString()
-    };
-
-    // 递归替换目录中的文件
-    replaceInDirectory(projectDir, replacements);
-
-    // 修复 test 文件中的导入路径
-    fixTestFile(projectDir, variables.projectName);
-
-    return true;
-
-  } catch (error) {
-    logger.error(`替换变量失败: ${error.message}`);
-    return false;
-  }
-}
-
-/**
- * 递归替换目录中的文件内容
- */
-function replaceInDirectory (dir, replacements) {
-  const files = readdirSync(dir);
-
-  files.forEach(file => {
-    const filePath = join(dir, file);
-    const stat = statSync(filePath);
-
-    if (stat.isDirectory()) {
-      // 跳过特定目录
-      if (['.git', 'node_modules', '.dart_tool', 'build'].includes(file)) {
-        return;
-      }
-      replaceInDirectory(filePath, replacements);
-    } else if (stat.isFile()) {
-      // 只处理文本文件
-      if (isTextFile(filePath)) {
-        replaceInFile(filePath, replacements);
-      }
-    }
-  });
-}
-
-/**
- * 替换单个文件中的内容
- */
-function replaceInFile (filePath, replacements) {
-  try {
-    let content = readFileSync(filePath, 'utf8');
-    let modified = false;
-
-    // 执行所有替换
-    Object.entries(replacements).forEach(([pattern, value]) => {
-      if (content.includes(pattern)) {
-        content = content.replace(new RegExp(pattern, 'g'), value);
-        modified = true;
-      }
-    });
-
-    // 如果有修改，写回文件
-    if (modified) {
-      writeFileSync(filePath, content, 'utf8');
-    }
-
-  } catch (error) {
-    // 忽略二进制文件等错误
-  }
-}
-
-/**
- * 判断是否为文本文件
- */
-function isTextFile (filePath) {
-  const textExtensions = [
-    '.dart', '.yaml', '.yml', '.json', '.md', '.txt',
-    '.gradle', '.xml', '.plist', '.swift', '.kt', '.java',
-    '.js', '.ts', '.html', '.css', '.sh'
-  ];
-
-  return textExtensions.some(ext => filePath.endsWith(ext));
-}
-
-/**
- * 修复 test 文件中的导入路径
- */
-function fixTestFile (projectDir, projectName) {
-  const testFile = join(projectDir, 'test', 'widget_test.dart');
-
-  if (existsSync(testFile)) {
-    try {
-      let content = readFileSync(testFile, 'utf8');
-
-      // 替换导入路径：从 main.dart 改为 app.dart
-      content = content.replace(
-        `import 'package:${projectName}/main.dart';`,
-        `import 'package:${projectName}/app.dart';`
-      );
-
-      // 如果测试内容还是默认的计数器测试，可以注释掉或删除
-      if (content.includes('Counter increments smoke test')) {
-        content = `import 'package:flutter_test/flutter_test.dart';
-import 'package:${projectName}/app.dart';
-
-void main() {
-  testWidgets('App smoke test', (WidgetTester tester) async {
-    await tester.pumpWidget(const App());
-    expect(find.byType(App), findsOneWidget);
-  });
-}
-`;
-      }
-
-      writeFileSync(testFile, content, 'utf8');
-    } catch (error) {
-      // 忽略错误
-    }
-  }
-}
-
-/**
- * 强制校正 pubspec.yaml 的 name 字段为项目名
- */
-export function ensurePubspecName (projectDir, projectName) {
-  try {
-    const pubspec = join(projectDir, 'pubspec.yaml');
-    if (!existsSync(pubspec)) return;
-    let content = readFileSync(pubspec, 'utf8');
-    if (/^name:\s+/m.test(content)) {
-      content = content.replace(/^name:\s+.*/m, `name: ${projectName}`);
-    } else {
-      content = `name: ${projectName}\n` + content;
-    }
-    writeFileSync(pubspec, content, 'utf8');
-  } catch (error) {
-    // 忽略错误
-  }
-}
-
-/**
- * 清理模板特有文件
- */
-export function cleanupTemplateFiles (projectDir) {
-  const filesToRemove = [
-    '.flu-cli.yaml',
-    'README.template.md',
-    '.git'
-  ];
-
-  filesToRemove.forEach(file => {
-    const filePath = join(projectDir, file);
-    if (existsSync(filePath)) {
-      removeSync(filePath);
-    }
-  });
-}