flu-cli 2.0.6 → 2.1.0

package/lib/commands/newClack.js

@@ -4,369 +4,460 @@
  * 说明：保留平台与包名，模板文件覆盖通用代码；支持内置/自定义模板与缓存开关
  */
 
-import * as p from '@clack/prompts';
-import chalk from 'chalk';
-import { join, dirname } from 'path';
-import { fileURLToPath } from 'url';
-import { existsSync } from 'fs';
-import { getTemplate, isValidTemplate, getAllTemplates } from '../../config/templates.js';
-import { selectTemplateWithEnquirer } from '../utils/templateSelectorEnquirer.js';
-import { cloneOrUpdateTemplate } from '../templates/templateManager.js';
-import { getAuthorName, saveAuthorName, saveDefaultTemplate } from '../utils/config.js';
-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 { syncSnippets } from './snippets.js';
-import { configAssets } from './assets.js';
+import * as p from '@clack/prompts'
+import chalk from 'chalk'
+import { join, dirname } from 'path'
+import { fileURLToPath } from 'url'
+import { existsSync } from 'fs'
+import { getTemplate, isValidTemplate, getAllTemplates } from '../../config/templates.js'
+import { selectTemplateWithEnquirer } from '../utils/templateSelectorEnquirer.js'
+import { cloneOrUpdateTemplate } from '../templates/templateManager.js'
+import { getAuthorName, saveAuthorName, saveDefaultTemplate } from '../utils/config.js'
+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 { syncSnippets } from './snippets.js'
+import { configAssets } from './assets.js'
+import { buildVNextProjectOptions } from './vnext-options.js'
 
 /**
  * 创建新项目
  */
-export async function newProjectWithClack (projectName, options) {
-  p.intro(chalk.cyan.bold('🚀 创建 Flutter 项目'));
+export async function newProjectWithClack(projectName, options) {
+  const jsonMode = options?.json === true
+  if (jsonMode) {
+    process.env.FLU_CLI_NON_INTERACTIVE = '1'
+    process.env.FLU_CLI_JSON_OUTPUT = '1'
+    if (!projectName) throw new Error('json 模式下必须提供 project-name')
+    if (!options.template) throw new Error('json 模式下必须提供 --template <type>')
+  } else {
+    p.intro(chalk.cyan.bold('🚀 创建 Flutter 项目'))
+  }
 
   try {
-    const isInteractive = !projectName;
-    let finalProjectName = projectName;
-    let templateSelection = null;
-    let stateManager = options.state || 'default';
-    const nonInteractive = process.env.FLU_CLI_NON_INTERACTIVE === '1';
+    const isInteractive = !projectName
+    let finalProjectName = projectName
+    let templateSelection = null
+    let stateManager = options.state || 'default'
+    const nonInteractive = process.env.FLU_CLI_NON_INTERACTIVE === '1'
 
     // ========== 交互式模式 ==========
     if (isInteractive) {
       // Step 1: 项目名称
       finalProjectName = await p.text({
         message: '请输入项目名称（直接回车使用: my_app）',
-        placeholder: 'my_app'
-      });
+        placeholder: 'my_app',
+      })
 
       if (p.isCancel(finalProjectName)) {
-        p.cancel('操作已取消');
-        process.exit(0);
+        p.cancel('操作已取消')
+        process.exit(0)
       }
 
       if (!finalProjectName || finalProjectName === '') {
-        finalProjectName = 'my_app';
+        finalProjectName = 'my_app'
       }
 
       // Step 2: 选择模板（实时预览，支持内置/自定义）
-      templateSelection = await selectTemplateWithEnquirer();
+      templateSelection = await selectTemplateWithEnquirer()
 
       // Step 2.5: 选择状态管理器 (Native 模板跳过)
-      let includeNetworkLayer = true; // 默认包含网络层
+      let includeNetworkLayer = true // 默认包含网络层
       if (templateSelection.kind === 'builtin' && templateSelection.name === 'native') {
-        stateManager = 'default';
-        includeNetworkLayer = false; // 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: 'getx', label: 'GetX' },
             // { value: 'riverpod', label: 'Riverpod' }
           ],
-          initialValue: 'default'
-        });
+          initialValue: 'default',
+        })
         if (p.isCancel(smChoice)) {
-          p.cancel('操作已取消');
-          process.exit(0);
+          p.cancel('操作已取消')
+          process.exit(0)
         }
-        stateManager = smChoice;
+        stateManager = smChoice
 
         // Step 2.6: 选择是否包含网络层
         const nlChoice = await p.select({
           message: '是否包含网络层？',
           options: [
-            { value: true, label: '包含网络层 (推荐)', hint: '包含 Dio 网络工具、AppConfig、StorageUtil' },
-            { value: false, label: '不包含网络层', hint: '纯净项目，适合工具类或离线应用' }
+            {
+              value: true,
+              label: '包含网络层 (推荐)',
+              hint: '包含 Dio 网络工具、AppConfig、StorageUtil',
+            },
+            { value: false, label: '不包含网络层', hint: '纯净项目，适合工具类或离线应用' },
           ],
-          initialValue: true
-        });
+          initialValue: true,
+        })
         if (p.isCancel(nlChoice)) {
-          p.cancel('操作已取消');
-          process.exit(0);
+          p.cancel('操作已取消')
+          process.exit(0)
         }
-        includeNetworkLayer = nlChoice;
+        includeNetworkLayer = nlChoice
       }
 
       // Step 3: 项目路径（含冲突检测与删除确认）
-      const defaultPath = join(options.dir, finalProjectName);
+      const defaultPath = join(options.dir, finalProjectName)
       let projectPath = await p.text({
         message: `请输入项目路径（直接回车使用: ${defaultPath}）`,
-        placeholder: defaultPath
-      });
+        placeholder: defaultPath,
+      })
 
       if (p.isCancel(projectPath)) {
-        p.cancel('操作已取消');
-        process.exit(0);
+        p.cancel('操作已取消')
+        process.exit(0)
       }
 
       if (!projectPath || projectPath === '') {
-        projectPath = defaultPath;
+        projectPath = defaultPath
       }
 
       // Step 4: 包名
-      const defaultPackageName = `com.example.${finalProjectName}`;
+      const defaultPackageName = `com.example.${finalProjectName}`
       let packageName = await p.text({
         message: `请输入包名（直接回车使用: ${defaultPackageName}）`,
-        placeholder: defaultPackageName
-      });
+        placeholder: defaultPackageName,
+      })
 
       if (p.isCancel(packageName)) {
-        p.cancel('操作已取消');
-        process.exit(0);
+        p.cancel('操作已取消')
+        process.exit(0)
       }
 
       if (!packageName || packageName === '') {
-        packageName = defaultPackageName;
+        packageName = defaultPackageName
       }
 
       // Step 5: 作者（使用缓存的名字）
-      const cachedAuthor = getAuthorName();
+      const cachedAuthor = getAuthorName()
       let author = await p.text({
         message: `请输入作者名称（直接回车使用: ${cachedAuthor}）`,
-        placeholder: cachedAuthor
-      });
+        placeholder: cachedAuthor,
+      })
 
       if (p.isCancel(author)) {
-        p.cancel('操作已取消');
-        process.exit(0);
+        p.cancel('操作已取消')
+        process.exit(0)
       }
 
       if (!author || author === '') {
-        author = cachedAuthor;
+        author = cachedAuthor
       } else {
         // 保存新的作者名字
-        saveAuthorName(author);
+        saveAuthorName(author)
       }
 
       // Step 6: 检查目录是否存在（交互确认删除）
       if (existsSync(projectPath)) {
-        console.log('');
-        console.log(chalk.yellow(`⚠️  目录已存在: ${projectPath}`));
+        console.log('')
+        console.log(chalk.yellow(`⚠️  目录已存在: ${projectPath}`))
 
         const shouldDelete = await p.confirm({
           message: '是否删除现有目录并重新创建?',
-          initialValue: true
-        });
+          initialValue: true,
+        })
 
         if (p.isCancel(shouldDelete)) {
-          p.cancel('操作已取消');
-          process.exit(0);
+          p.cancel('操作已取消')
+          process.exit(0)
         }
 
         if (shouldDelete) {
-          const { rmSync } = await import('fs');
+          const { rmSync } = await import('fs')
           try {
-            rmSync(projectPath, { recursive: true, force: true });
-            console.log(chalk.green(`✓ 已删除目录: ${projectPath}`));
+            rmSync(projectPath, { recursive: true, force: true })
+            console.log(chalk.green(`✓ 已删除目录: ${projectPath}`))
           } catch (error) {
-            p.cancel(`删除目录失败: ${error.message}`);
-            process.exit(1);
+            p.cancel(`删除目录失败: ${error.message}`)
+            process.exit(1)
           }
         } else {
-          p.cancel('操作已取消');
-          process.exit(0);
+          p.cancel('操作已取消')
+          process.exit(0)
         }
       }
 
       // Step 7: 显示信息并确认
-      const templateDisplay = templateSelection?.kind === 'builtin'
-        ? getTemplate(templateSelection.name).displayName
-        : (ConfigManager.getInstance().getTemplate(templateSelection.id)?.name || '自定义模板');
-
-      console.log('');
-      console.log(chalk.cyan('📋 项目信息确认:'));
-      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)}`);
-      console.log('');
+      const templateDisplay =
+        templateSelection?.kind === 'builtin'
+          ? getTemplate(templateSelection.name).displayName
+          : ConfigManager.getInstance().getTemplate(templateSelection.id)?.name || '自定义模板'
+
+      console.log('')
+      console.log(chalk.cyan('📋 项目信息确认:'))
+      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)}`)
+      console.log('')
 
       const shouldContinue = await p.confirm({
-        message: '确认创建项目?'
-      });
+        message: '确认创建项目?',
+      })
 
       if (!shouldContinue || p.isCancel(shouldContinue)) {
-        p.cancel('操作已取消');
-        process.exit(0);
+        p.cancel('操作已取消')
+        process.exit(0)
       }
 
       // Step 8: 创建项目
-      await createProject(finalProjectName, templateSelection, projectPath, { projectName: finalProjectName, packageName, author, stateManager, includeNetworkLayer }, options);
-
+      await createProject(
+        finalProjectName,
+        templateSelection,
+        projectPath,
+        { projectName: finalProjectName, packageName, author, stateManager, includeNetworkLayer },
+        options,
+      )
     } else {
       // ========== 命令行模式 ==========
       if (!isValidProjectName(finalProjectName)) {
-        p.cancel('项目名称只能包含小写字母、数字和下划线');
-        process.exit(1);
+        const msg = '项目名称只能包含小写字母、数字和下划线'
+        if (jsonMode) throw new Error(msg)
+        p.cancel(msg)
+        process.exit(1)
       }
 
-      // 如果通过参数传入模板名称，构造为内置模板选择
+      // 如果通过参数传入模板名称，优先识别内置模板，其次识别已保存的自定义模板 ID
       if (!templateSelection && options.template) {
-        templateSelection = { kind: 'builtin', name: options.template };
+        const customTemplate = ConfigManager.getInstance().getTemplate(options.template)
+        templateSelection = customTemplate
+          ? { kind: 'custom', id: customTemplate.id }
+          : { kind: 'builtin', name: options.template }
       }
       if (!templateSelection) {
-        templateSelection = await selectTemplateWithEnquirer();
+        templateSelection = await selectTemplateWithEnquirer()
       }
       if (templateSelection.kind === 'builtin' && !isValidTemplate(templateSelection.name)) {
-        p.cancel(`模板 "${templateSelection.name}" 不存在`);
-        process.exit(1);
+        const msg = `模板 "${templateSelection.name}" 不存在`
+        if (jsonMode) throw new Error(msg)
+        p.cancel(msg)
+        process.exit(1)
       }
 
-      const projectDir = join(options.dir, finalProjectName);
+      const projectDir = join(options.dir, finalProjectName)
 
       // 检查目录是否存在（命令行模式也提供删除确认）
       if (existsSync(projectDir)) {
         if (nonInteractive) {
-          const { rmSync } = await import('fs');
-          rmSync(projectDir, { recursive: true, force: true });
+          const { rmSync } = await import('fs')
+          rmSync(projectDir, { recursive: true, force: true })
         } else {
-          console.log('');
-          console.log(chalk.yellow(`⚠️  目录已存在: ${projectDir}`));
-          const shouldDelete = await p.confirm({ message: '是否删除现有目录并重新创建?', initialValue: true });
+          console.log('')
+          console.log(chalk.yellow(`⚠️  目录已存在: ${projectDir}`))
+          const shouldDelete = await p.confirm({
+            message: '是否删除现有目录并重新创建?',
+            initialValue: true,
+          })
           if (p.isCancel(shouldDelete)) {
-            p.cancel('操作已取消');
-            process.exit(0);
+            p.cancel('操作已取消')
+            process.exit(0)
           }
           if (shouldDelete) {
-            const { rmSync } = await import('fs');
+            const { rmSync } = await import('fs')
             try {
-              rmSync(projectDir, { recursive: true, force: true });
-              console.log(chalk.green(`✓ 已删除目录: ${projectDir}`));
+              rmSync(projectDir, { recursive: true, force: true })
+              console.log(chalk.green(`✓ 已删除目录: ${projectDir}`))
             } catch (error) {
-              p.cancel(`删除目录失败: ${error.message}`);
-              process.exit(1);
+              p.cancel(`删除目录失败: ${error.message}`)
+              process.exit(1)
             }
           } else {
-            p.cancel('操作已取消');
-            process.exit(0);
+            p.cancel('操作已取消')
+            process.exit(0)
           }
         }
       }
 
-      const defaultPackageName = `com.example.${finalProjectName}`;
-      let packageName = options.package || defaultPackageName;
+      const defaultPackageName = `com.example.${finalProjectName}`
+      let packageName = options.package || defaultPackageName
       if (!options.package && !nonInteractive) {
-        packageName = await p.text({ message: `请输入包名（直接回车使用: ${defaultPackageName}）`, placeholder: defaultPackageName });
+        packageName = await p.text({
+          message: `请输入包名（直接回车使用: ${defaultPackageName}）`,
+          placeholder: defaultPackageName,
+        })
         if (p.isCancel(packageName)) {
-          p.cancel('操作已取消');
-          process.exit(0);
+          p.cancel('操作已取消')
+          process.exit(0)
         }
         if (!packageName || packageName === '') {
-          packageName = defaultPackageName;
+          packageName = defaultPackageName
         }
       }
 
-      let author = options.author || 'Your Name';
+      let author = options.author || 'Your Name'
       if (!options.author && !nonInteractive) {
-        author = await p.text({ message: '请输入作者名称（直接回车使用: Your Name）', placeholder: 'Your Name' });
+        author = await p.text({
+          message: '请输入作者名称（直接回车使用: Your Name）',
+          placeholder: 'Your Name',
+        })
         if (p.isCancel(author)) {
-          p.cancel('操作已取消');
-          process.exit(0);
+          p.cancel('操作已取消')
+          process.exit(0)
         }
         if (!author || author === '') {
-          author = 'Your Name';
+          author = 'Your Name'
         }
       }
 
-      // CLI 模式支持 --state 传参
-      const includeNetworkLayer = options.network !== false; // 默认包含，除非明确指定 --no-network
-      await createProject(finalProjectName, templateSelection, projectDir, { projectName: finalProjectName, packageName, author, stateManager, includeNetworkLayer }, options);
+      // CLI 模式支持 --state 传参；Native 默认保持纯 Flutter，显式 --network 才注入 Core 能力。
+      const isNativeTemplate =
+        templateSelection.kind === 'builtin' && templateSelection.name === 'native'
+      const includeNetworkLayer =
+        options.network !== undefined ? options.network !== false : !isNativeTemplate
+      const vNextOptions = buildVNextProjectOptions(options)
+      return await createProject(
+        finalProjectName,
+        templateSelection,
+        projectDir,
+        {
+          projectName: finalProjectName,
+          packageName,
+          author,
+          stateManager,
+          includeNetworkLayer,
+          ...vNextOptions,
+        },
+        options,
+      )
     }
   } catch (error) {
-    p.cancel(`创建失败: ${error.message}`);
-    process.exit(1);
+    if (jsonMode) throw error
+    p.cancel(`创建失败: ${error.message}`)
+    process.exit(1)
   }
 }
 
 /**
  * 创建项目
  */
-async function createProject (projectName, templateSelection, projectDir, projectInfo, options) {
-  const s = p.spinner();
+async function createProject(projectName, templateSelection, projectDir, projectInfo, options) {
+  const s = p.spinner()
+  const jsonMode = process.env.FLU_CLI_JSON_OUTPUT === '1'
 
   try {
     // 1. 设置生成选项
-    const templateId = templateSelection.kind === 'builtin'
-      ? templateSelection.name
-      : templateSelection.id;
+    const templateId =
+      templateSelection.kind === 'builtin' ? templateSelection.name : templateSelection.id
+    const shouldCreateProjectConfig =
+      templateSelection.kind === 'builtin' && ['lite', 'modular', 'clean'].includes(templateId)
 
     const generatorOptions = {
       templateType: templateId,
       stateManager: projectInfo.stateManager || 'default',
       packageName: projectInfo.packageName,
       outputDir: dirname(projectDir),
-      createFlutterProject: true, // v2 总是需要 flutter create
+      createFlutterProject: true, // 新建项目默认需要 flutter create
       forceUpdate: !options.cache,
       author: projectInfo.author,
       flutterTemplate: options.flutterTemplate || 'app',
-      includeNetworkLayer: projectInfo.includeNetworkLayer !== false // 默认包含网络层
-    };
+      includeNetworkLayer: projectInfo.includeNetworkLayer !== false, // 默认包含网络层
+      examples: projectInfo.examples || [],
+      composition: projectInfo.composition,
+      architectureMode: projectInfo.architectureMode,
+      enableMixinOptions: projectInfo.enableMixinOptions,
+      platforms: projectInfo.platforms,
+      flutterSdk: projectInfo.flutterSdk,
+      capabilities: projectInfo.capabilities,
+      helpers: projectInfo.helpers,
+      createProjectConfig: shouldCreateProjectConfig,
+    }
 
     // 2. 调用核心生成器
-    s.start('正在生成项目 (Core Engine)...');
-    const pg = new ProjectGenerator();
-    const success = await pg.generate(projectName, generatorOptions);
+    s.start('正在生成项目 (Core Engine)...')
+    const pg = new ProjectGenerator()
+    const success = await pg.generate(projectName, generatorOptions)
 
     if (!success) {
-      s.stop('项目生成失败');
-      throw new Error('核心生成器返回失败');
+      s.stop('项目生成失败')
+      throw new Error('核心生成器返回失败')
     }
-    s.stop('✓ 项目生成成功');
+    s.stop('✓ 项目生成成功')
 
     // 3. CLI 特色功能：同步标准代码片段 (Native 模板跳过)
-    const isNative = templateId === 'native' || templateId === 'none';
+    const isNative = templateId === 'native' || templateId === 'none'
     if (!isNative) {
-      s.start('正在同步代码片段...');
-      await syncSnippets(projectDir);
-      s.stop('✓ 代码片段同步完成');
+      s.start('正在同步代码片段...')
+      await syncSnippets(projectDir)
+      s.stop('✓ 代码片段同步完成')
     }
 
     // 4. 清理模板残余（ProjectGenerator 可能已经做了一部分，这里确保万一）
-    cleanupTemplateFiles(projectDir);
-
-    // 完成
-    p.outro(
-      chalk.green.bold('✨ 项目创建成功！\n\n') +
-      chalk.cyan('下一步:\n') +
-      chalk.yellow(`  cd ${projectName}\n`) +
-      chalk.yellow(`  flutter pub get\n`) +
-      chalk.yellow(`  flutter run`)
-    );
-
-    // 5. 提示资源配置
-    const shouldConfigAssets = await p.confirm({
-      message: '项目已创建。是否现在就配置 App 图标和启动图?',
-      initialValue: false
-    });
-
-    if (shouldConfigAssets) {
-      await configAssets({ dir: projectDir });
+    cleanupTemplateFiles(projectDir)
+
+    if (!jsonMode) {
+      p.outro(
+        chalk.green.bold('✨ 项目创建成功！\n\n') +
+          chalk.cyan('下一步:\n') +
+          chalk.yellow(`  cd ${projectName}\n`) +
+          chalk.yellow(`  flutter pub get\n`) +
+          chalk.yellow(`  flutter run`),
+      )
+    }
+
+    // 5. 提示资源配置（非交互模式下跳过，避免 CI / 脚本挂起）
+    const nonInteractiveExit = process.env.FLU_CLI_NON_INTERACTIVE === '1'
+    if (!nonInteractiveExit) {
+      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 });
+      saveDefaultTemplate({ type: 'builtin', idOrName: templateSelection.name })
     } else if (templateSelection?.kind === 'custom') {
-      saveDefaultTemplate({ type: 'custom', idOrName: templateSelection.id });
+      saveDefaultTemplate({ type: 'custom', idOrName: templateSelection.id })
     }
 
-    // 正常退出
-    process.exit(0);
+    if (!jsonMode) process.exit(0)
+    return {
+      ok: true,
+      projectName,
+      projectDir,
+      templateId,
+      stateManager: generatorOptions.stateManager,
+      packageName: generatorOptions.packageName,
+      includeNetworkLayer: generatorOptions.includeNetworkLayer,
+      examples: generatorOptions.examples,
+      platforms: generatorOptions.platforms,
+      flutterSdk: generatorOptions.flutterSdk,
+      capabilities: generatorOptions.capabilities,
+      helpers: generatorOptions.helpers,
+      snippetsSynced: !isNative,
+    }
   } catch (error) {
-    s.stop('创建失败');
-    throw error;
+    s.stop('创建失败')
+    throw error
   }
 }
 
 /**
  * 验证项目名称
  */
-function isValidProjectName (name) {
-  return /^[a-z][a-z0-9_]*$/.test(name);
+function isValidProjectName(name) {
+  return /^[a-z][a-z0-9_]*$/.test(name)
 }