flu-cli 2.0.6 → 2.1.0

package/lib/generators/model_generator.js

@@ -2,80 +2,77 @@
  * Model 生成器
  */
 
-import { existsSync, mkdirSync, writeFileSync, readFileSync } from 'fs';
-import { join } from 'path';
-import { logger } from '../utils/logger.js';
-import { toPascalCase, toSnakeCase, toCamelCase } from '../utils/string_helper.js';
-import { updateIndexFile } from '../utils/index_updater.js';
-import { getSnippetContent } from '../utils/snippet_loader.js';
+import { existsSync, mkdirSync, writeFileSync, readFileSync } from 'fs'
+import { join } from 'path'
+import { logger } from '../utils/logger.js'
+import { toPascalCase, toSnakeCase, toCamelCase } from '../utils/string_helper.js'
+import { updateIndexFile } from '../utils/index_updater.js'
+import { getSnippetContent } from '../utils/snippet_loader.js'
 
 /**
  * 生成 Model 文件
  */
-export function generateModel (name, options = {}) {
+export function generateModel(name, options = {}) {
   try {
-    const {
-      feature = null,
-      jsonFile = null,
-      outputDir = process.cwd()
-    } = options;
+    const { feature = null, jsonFile = null, outputDir = process.cwd() } = options
 
     // 转换命名
-    const namePascal = toPascalCase(name);
-    const nameSnake = toSnakeCase(name);
+    const namePascal = toPascalCase(name)
+    const nameSnake = toSnakeCase(name)
 
     // 确定输出路径
-    let modelsDir;
+    let modelsDir
     if (feature) {
       // Modular/Clean 架构
-      modelsDir = join(outputDir, 'lib', 'features', feature, 'models');
+      modelsDir = join(outputDir, 'lib', 'features', feature, 'models')
     } else {
       // Lite 架构
-      modelsDir = join(outputDir, 'lib', 'models');
+      modelsDir = join(outputDir, 'lib', 'models')
     }
 
     // 创建目录
     if (!existsSync(modelsDir)) {
-      mkdirSync(modelsDir, { recursive: true });
+      mkdirSync(modelsDir, { recursive: true })
     }
 
     // 生成文件内容
-    let content;
+    let content
     if (jsonFile && existsSync(jsonFile)) {
       // 从 JSON 文件生成
-      const jsonContent = readFileSync(jsonFile, 'utf8');
-      const jsonData = JSON.parse(jsonContent);
-      content = generateModelFromJson(namePascal, jsonData);
+      const jsonContent = readFileSync(jsonFile, 'utf8')
+      const jsonData = JSON.parse(jsonContent)
+      content = generateModelFromJson(namePascal, jsonData)
     } else {
       // 优先片段，其次基础模板
-      content = getSnippetContent(outputDir, 'flu.model', { Name: namePascal }) || generateBasicModel(namePascal);
+      content =
+        getSnippetContent(outputDir, 'flu.model', { Name: namePascal }) ||
+        generateBasicModel(namePascal)
     }
 
     // 写入文件
-    const filePath = join(modelsDir, `${nameSnake}_model.dart`);
+    const filePath = join(modelsDir, `${nameSnake}_model.dart`)
     if (existsSync(filePath)) {
-      logger.error(`文件已存在: ${filePath}`);
-      return false;
+      logger.error(`文件已存在: ${filePath}`)
+      return false
     }
 
-    writeFileSync(filePath, content, 'utf8');
-    logger.success(`Model 创建成功: ${filePath}`);
+    writeFileSync(filePath, content, 'utf8')
+    logger.success(`Model 创建成功: ${filePath}`)
 
     // 更新 index.dart
-    updateIndexFile(modelsDir, `${nameSnake}_model.dart`);
-
-    return true;
+    updateIndexFile(modelsDir, `${nameSnake}_model.dart`)
 
+    return true
   } catch (error) {
-    logger.error(`生成 Model 失败: ${error.message}`);
-    return false;
+    logger.error(`生成 Model 失败: ${error.message}`)
+    return false
   }
 }
 
 /**
  * 生成基础 Model
  */
-function generateBasicModel (namePascal) {
+function generateBasicModel(namePascal) {
   return `class ${namePascal}Model {
   final String id;
   final String name;
@@ -137,61 +134,67 @@ function generateBasicModel (namePascal) {
     return id.hashCode ^ name.hashCode ^ createdAt.hashCode;
   }
 }
-`;
+`
 }
 
 /**
  * 从 JSON 生成 Model
  */
-function generateModelFromJson (namePascal, jsonData) {
-  const fields = analyzeJsonStructure(jsonData);
+function generateModelFromJson(namePascal, jsonData) {
+  const fields = analyzeJsonStructure(jsonData)
 
   // 生成字段声明
-  const fieldDeclarations = fields.map(f => `  final ${f.type} ${f.name};`).join('\n');
+  const fieldDeclarations = fields.map((f) => `  final ${f.type} ${f.name};`).join('\n')
 
   // 生成构造函数参数
-  const constructorParams = fields.map(f => `    required this.${f.name},`).join('\n');
+  const constructorParams = fields.map((f) => `    required this.${f.name},`).join('\n')
 
   // 生成 fromJson 字段
-  const fromJsonFields = fields.map(f => {
-    if (f.type === 'String') {
-      return `      ${f.name}: json['${f.jsonKey}'] as String,`;
-    } else if (f.type === 'int') {
-      return `      ${f.name}: json['${f.jsonKey}'] as int,`;
-    } else if (f.type === 'double') {
-      return `      ${f.name}: (json['${f.jsonKey}'] as num).toDouble(),`;
-    } else if (f.type === 'bool') {
-      return `      ${f.name}: json['${f.jsonKey}'] as bool,`;
-    } else if (f.type === 'DateTime') {
-      return `      ${f.name}: DateTime.parse(json['${f.jsonKey}'] as String),`;
-    } else if (f.type.startsWith('List<')) {
-      return `      ${f.name}: (json['${f.jsonKey}'] as List).cast<${f.type.slice(5, -1)}>(),`;
-    } else {
-      return `      ${f.name}: json['${f.jsonKey}'],`;
-    }
-  }).join('\n');
+  const fromJsonFields = fields
+    .map((f) => {
+      if (f.type === 'String') {
+        return `      ${f.name}: json['${f.jsonKey}'] as String,`
+      } else if (f.type === 'int') {
+        return `      ${f.name}: json['${f.jsonKey}'] as int,`
+      } else if (f.type === 'double') {
+        return `      ${f.name}: (json['${f.jsonKey}'] as num).toDouble(),`
+      } else if (f.type === 'bool') {
+        return `      ${f.name}: json['${f.jsonKey}'] as bool,`
+      } else if (f.type === 'DateTime') {
+        return `      ${f.name}: DateTime.parse(json['${f.jsonKey}'] as String),`
+      } else if (f.type.startsWith('List<')) {
+        return `      ${f.name}: (json['${f.jsonKey}'] as List).cast<${f.type.slice(5, -1)}>(),`
+      } else {
+        return `      ${f.name}: json['${f.jsonKey}'],`
+      }
+    })
+    .join('\n')
 
   // 生成 toJson 字段
-  const toJsonFields = fields.map(f => {
-    if (f.type === 'DateTime') {
-      return `      '${f.jsonKey}': ${f.name}.toIso8601String(),`;
-    } else {
-      return `      '${f.jsonKey}': ${f.name},`;
-    }
-  }).join('\n');
+  const toJsonFields = fields
+    .map((f) => {
+      if (f.type === 'DateTime') {
+        return `      '${f.jsonKey}': ${f.name}.toIso8601String(),`
+      } else {
+        return `      '${f.jsonKey}': ${f.name},`
+      }
+    })
+    .join('\n')
 
   // 生成 copyWith 参数
-  const copyWithParams = fields.map(f => `    ${f.type}? ${f.name},`).join('\n');
-  const copyWithFields = fields.map(f => `      ${f.name}: ${f.name} ?? this.${f.name},`).join('\n');
+  const copyWithParams = fields.map((f) => `    ${f.type}? ${f.name},`).join('\n')
+  const copyWithFields = fields
+    .map((f) => `      ${f.name}: ${f.name} ?? this.${f.name},`)
+    .join('\n')
 
   // 生成 toString
-  const toStringFields = fields.map(f => `${f.name}: $${f.name}`).join(', ');
+  const toStringFields = fields.map((f) => `${f.name}: $${f.name}`).join(', ')
 
   // 生成 == 比较
-  const equalityChecks = fields.map(f => `        other.${f.name} == ${f.name}`).join(' &&\n');
+  const equalityChecks = fields.map((f) => `        other.${f.name} == ${f.name}`).join(' &&\n')
 
   // 生成 hashCode
-  const hashCodeFields = fields.map(f => `${f.name}.hashCode`).join(' ^ ');
+  const hashCodeFields = fields.map((f) => `${f.name}.hashCode`).join(' ^ ')
 
   return `class ${namePascal}Model {
 ${fieldDeclarations}
@@ -240,64 +243,64 @@ ${equalityChecks};
     return ${hashCodeFields};
   }
 }
-`;
+`
 }
 
 /**
  * 分析 JSON 结构
  */
-function analyzeJsonStructure (jsonData) {
-  const fields = [];
+function analyzeJsonStructure(jsonData) {
+  const fields = []
 
   for (const [key, value] of Object.entries(jsonData)) {
-    const camelKey = toCamelCase(key);
-    const type = inferDartType(value);
+    const camelKey = toCamelCase(key)
+    const type = inferDartType(value)
 
     fields.push({
       name: camelKey,
       jsonKey: key,
-      type: type
-    });
+      type: type,
+    })
   }
 
-  return fields;
+  return fields
 }
 
 /**
  * 推断 Dart 类型
  */
-function inferDartType (value) {
-  if (value === null) return 'dynamic';
+function inferDartType(value) {
+  if (value === null) return 'dynamic'
 
-  const type = typeof value;
+  const type = typeof value
 
   if (type === 'string') {
     // 尝试判断是否是日期
     if (/^\d{4}-\d{2}-\d{2}/.test(value)) {
-      return 'DateTime';
+      return 'DateTime'
     }
-    return 'String';
+    return 'String'
   }
 
   if (type === 'number') {
-    return Number.isInteger(value) ? 'int' : 'double';
+    return Number.isInteger(value) ? 'int' : 'double'
   }
 
   if (type === 'boolean') {
-    return 'bool';
+    return 'bool'
   }
 
   if (Array.isArray(value)) {
     if (value.length === 0) {
-      return 'List<dynamic>';
+      return 'List<dynamic>'
     }
-    const itemType = inferDartType(value[0]);
-    return `List<${itemType}>`;
+    const itemType = inferDartType(value[0])
+    return `List<${itemType}>`
   }
 
   if (type === 'object') {
-    return 'Map<String, dynamic>';
+    return 'Map<String, dynamic>'
   }
 
-  return 'dynamic';
+  return 'dynamic'
 }

package/lib/generators/page_generator.js

@@ -2,19 +2,19 @@
  * 页面生成器
  */
 
-import { existsSync, mkdirSync, writeFileSync } from 'fs';
-import { join, relative, dirname } from 'path';
-import { logger } from '../utils/logger.js';
-import { toPascalCase, toSnakeCase, toTitleCase } from '../utils/string_helper.js';
-import { updateIndexFile } from '../utils/index_updater.js';
-import { detectProjectTemplate, getPagePath, getViewModelPath } from '../utils/project_detector.js';
-import { getSnippetContent } from '../utils/snippet_loader.js';
-import { generateModel } from './model_generator.js';
+import { existsSync, mkdirSync, writeFileSync } from 'fs'
+import { join, relative, dirname } from 'path'
+import { logger } from '../utils/logger.js'
+import { toPascalCase, toSnakeCase, toTitleCase } from '../utils/string_helper.js'
+import { updateIndexFile } from '../utils/index_updater.js'
+import { detectProjectTemplate, getPagePath, getViewModelPath } from '../utils/project_detector.js'
+import { getSnippetContent } from '../utils/snippet_loader.js'
+import { generateModel } from './model_generator.js'
 
 /**
  * 生成页面文件
  */
-export function generatePage (name, options = {}) {
+export function generatePage(name, options = {}) {
   try {
     const {
       feature = null,
@@ -22,36 +22,36 @@ export function generatePage (name, options = {}) {
       stateless = false,
       withViewModel = true,
       isListPage = false,
-      outputDir = process.cwd()
-    } = options;
+      outputDir = process.cwd(),
+    } = options
 
     // 检测项目模板类型
-    const template = detectProjectTemplate(outputDir);
-    logger.info(`检测到项目类型: ${template || '未知'}`);
+    const template = detectProjectTemplate(outputDir)
+    logger.info(`检测到项目类型: ${template || '未知'}`)
 
     // 转换命名
-    const namePascal = toPascalCase(name);
-    const nameSnake = toSnakeCase(name);
-    const nameTitle = toTitleCase(name);
+    const namePascal = toPascalCase(name)
+    const nameSnake = toSnakeCase(name)
+    const nameTitle = toTitleCase(name)
 
     // 确定模块名称
-    let moduleName = feature || name;
+    let moduleName = feature || name
 
     // 根据模板类型确定输出路径
-    const pagesDir = getPagePath(outputDir, moduleName);
+    const pagesDir = getPagePath(outputDir, moduleName)
 
     // 创建目录
     if (!existsSync(pagesDir)) {
-      mkdirSync(pagesDir, { recursive: true });
+      mkdirSync(pagesDir, { recursive: true })
     }
 
     // 获取 ViewModel 路径用于计算相对导入
-    const vmDir = getViewModelPath(outputDir, moduleName);
-    const pageFilePath = join(pagesDir, `${nameSnake}_page.dart`);
-    const vmFilePath = join(vmDir, `${nameSnake}_viewmodel.dart`);
+    const vmDir = getViewModelPath(outputDir, moduleName)
+    const pageFilePath = join(pagesDir, `${nameSnake}_page.dart`)
+    const vmFilePath = join(vmDir, `${nameSnake}_viewmodel.dart`)
 
     // 计算相对导入路径
-    const vmImportPath = calculateRelativeImport(pageFilePath, vmFilePath);
+    const vmImportPath = calculateRelativeImport(pageFilePath, vmFilePath)
 
     // 生成文件内容（优先使用项目片段）
     const variables = {
@@ -60,114 +60,112 @@ export function generatePage (name, options = {}) {
       snake_name: nameSnake,
       title: nameTitle,
       vm_import: withViewModel ? vmImportPath : '',
-      ModelName: namePascal + 'Model' // 默认 Model 名称
-    };
+      ModelName: namePascal + 'Model', // 默认 Model 名称
+    }
 
     // 智能选择片段:
-    let content = null;
-    let key;
+    let content = null
+    let key
 
     if (isListPage) {
       // 列表页
-      key = 'flu.listPage';
-      logger.info('生成类型: ListPage (BaseListPage) + ViewModel');
+      key = 'flu.listPage'
+      logger.info('生成类型: ListPage (BaseListPage) + ViewModel')
     } else if (stateless) {
       // 强制使用 StatelessWidget
-      key = 'flu.lessPage';
+      key = 'flu.lessPage'
       if (withViewModel) {
-        logger.warn('⚠️  警告: 使用 StatelessWidget + ViewModel 组合,无法监听状态变化');
+        logger.warn('⚠️  警告: 使用 StatelessWidget + ViewModel 组合,无法监听状态变化')
       }
-      logger.info('生成类型: StatelessWidget (强制)');
+      logger.info('生成类型: StatelessWidget (强制)')
     } else if (stateful) {
       // 明确指定 StatefulWidget
-      key = 'flu.stPage';
-      logger.info(`生成类型: StatefulWidget${withViewModel ? ' (BasePage) + ViewModel' : ''}`);
+      key = 'flu.stPage'
+      logger.info(`生成类型: StatefulWidget${withViewModel ? ' (BasePage) + ViewModel' : ''}`)
     } else if (withViewModel) {
       // 有 ViewModel 时,默认使用 StatefulWidget (BasePage)
-      key = 'flu.stPage';
-      logger.info('生成类型: StatefulWidget (BasePage) + ViewModel');
+      key = 'flu.stPage'
+      logger.info('生成类型: StatefulWidget (BasePage) + ViewModel')
     } else {
       // 无 ViewModel 且未指定,默认 Stateless
-      key = 'flu.lessPage';
-      logger.info('生成类型: StatelessWidget (无 ViewModel)');
+      key = 'flu.lessPage'
+      logger.info('生成类型: StatelessWidget (无 ViewModel)')
     }
 
-    content = getSnippetContent(outputDir, key, variables);
+    content = getSnippetContent(outputDir, key, variables)
 
     if (!content) {
       // 如果没有片段，使用默认生成逻辑 (这里简化处理，列表页必须有片段)
       if (isListPage) {
-        logger.error('❌ 错误: 找不到列表页代码片段 (flu.listPage)');
-        logger.info('提示: 请运行 flu-cli sync-snippets 更新代码片段');
-        return false;
+        logger.error('❌ 错误: 找不到列表页代码片段 (flu.listPage)')
+        logger.info('提示: 请运行 flu-cli sync-snippets 更新代码片段')
+        return false
       }
       content = generatePageContent(namePascal, nameSnake, nameTitle, {
         stateful,
         withViewModel,
         vmImportPath,
-        template
-      });
+        template,
+      })
     }
 
     // 写入文件
     if (existsSync(pageFilePath)) {
-      logger.error(`文件已存在: ${pageFilePath}`);
-      return false;
+      logger.error(`文件已存在: ${pageFilePath}`)
+      return false
     }
 
-    writeFileSync(pageFilePath, content, 'utf8');
-    logger.success(`页面创建成功: ${pageFilePath}`);
+    writeFileSync(pageFilePath, content, 'utf8')
+    logger.success(`页面创建成功: ${pageFilePath}`)
 
     // 更新 index.dart
-    updateIndexFile(pagesDir, `${nameSnake}_page.dart`);
+    updateIndexFile(pagesDir, `${nameSnake}_page.dart`)
 
     // 如果是列表页，先生成 Model
     if (isListPage) {
-      logger.info('列表页需要 Model，正在自动生成...');
+      logger.info('列表页需要 Model，正在自动生成...')
       // 只有 modular/clean 架构才使用 feature
-      const modelFeature = (template === 'modular' || template === 'clean') ? moduleName : null;
-      generateModel(name, { feature: modelFeature, outputDir });
+      const modelFeature = template === 'modular' || template === 'clean' ? moduleName : null
+      generateModel(name, { feature: modelFeature, outputDir })
     }
 
     // 如果需要 ViewModel，也生成它
     if (withViewModel) {
-      generateViewModel(name, { feature: moduleName, outputDir, template, isListPage });
+      generateViewModel(name, { feature: moduleName, outputDir, template, isListPage })
     }
 
-    return true;
-
+    return true
   } catch (error) {
-    logger.error(`生成页面失败: ${error.message}`);
-    return false;
+    logger.error(`生成页面失败: ${error.message}`)
+    return false
   }
 }
 
 /**
  * 计算相对导入路径
  */
-function calculateRelativeImport (fromFile, toFile) {
-  const fromDir = dirname(fromFile);
-  const relPath = relative(fromDir, toFile);
-  return relPath.replace(/\\/g, '/');
+function calculateRelativeImport(fromFile, toFile) {
+  const fromDir = dirname(fromFile)
+  const relPath = relative(fromDir, toFile)
+  return relPath.replace(/\\/g, '/')
 }
 
 /**
  * 生成页面内容
  */
-function generatePageContent (namePascal, nameSnake, nameTitle, options) {
-  const { stateful, withViewModel, vmImportPath, template } = options;
+function generatePageContent(namePascal, nameSnake, nameTitle, options) {
+  const { stateful, withViewModel, vmImportPath, template } = options
 
-  let imports = `import 'package:flutter/material.dart';\n`;
+  let imports = `import 'package:flutter/material.dart';\n`
 
   // StatefulWidget with BasePage
   if (stateful && withViewModel) {
     // 导入 BasePage
-    const baseImport = template === 'lite'
-      ? '../base/base_page.dart'
-      : '../../core/base/base_page.dart';
+    const baseImport =
+      template === 'lite' ? '../base/base_page.dart' : '../../core/base/base_page.dart'
 
-    imports += `import '${baseImport}';\n`;
-    imports += `import '${vmImportPath}';\n`;
+    imports += `import '${baseImport}';\n`
+    imports += `import '${vmImportPath}';\n`
 
     return `${imports}
 class ${namePascal}Page extends BasePage<${namePascal}ViewModel> {
@@ -194,7 +192,7 @@ class _${namePascal}PageState extends BasePageState<${namePascal}ViewModel, ${na
     );
   }
 }
-`;
+`
   } else if (stateful) {
     // 普通 StatefulWidget (无 ViewModel)
     return `${imports}
@@ -218,7 +216,7 @@ class _${namePascal}PageState extends State<${namePascal}Page> {
     );
   }
 }
-`;
+`
   } else {
     // StatelessWidget
     return `${imports}
@@ -237,37 +235,44 @@ class ${namePascal}Page extends StatelessWidget {
     );
   }
 }
-`;
+`
   }
 }
 
 /**
  * 生成 ViewModel
  */
-function generateViewModel (name, options = {}) {
-  const { feature = null, outputDir = process.cwd(), template = 'lite', isListPage = false } = options;
+function generateViewModel(name, options = {}) {
+  const {
+    feature = null,
+    outputDir = process.cwd(),
+    template = 'lite',
+    isListPage = false,
+  } = options
 
-  const namePascal = toPascalCase(name);
-  const nameSnake = toSnakeCase(name);
+  const namePascal = toPascalCase(name)
+  const nameSnake = toSnakeCase(name)
 
   // 根据模板类型确定输出路径
-  const vmDir = getViewModelPath(outputDir, feature);
+  const vmDir = getViewModelPath(outputDir, feature)
 
   if (!existsSync(vmDir)) {
-    mkdirSync(vmDir, { recursive: true });
+    mkdirSync(vmDir, { recursive: true })
   }
 
   // 根据片段或模板类型生成内容
-  const snippetKey = isListPage ? 'flu.listViewModel' : 'flu.viewmodel';
+  const snippetKey = isListPage ? 'flu.listViewModel' : 'flu.viewmodel'
   const vmSnippet = getSnippetContent(outputDir, snippetKey, {
     Name: namePascal,
     snake_name: nameSnake,
-    ModelName: namePascal + 'Model'
-  });
-  let content = vmSnippet;
+    ModelName: namePascal + 'Model',
+  })
+  let content = vmSnippet
   if (template === 'clean') {
     // Clean 架构的 ViewModel 需要依赖 UseCase
-    content = content || `import 'package:flutter/foundation.dart';
+    content =
+      content ||
+      `import 'package:flutter/foundation.dart';
 
 class ${namePascal}ViewModel extends ChangeNotifier {
   // TODO: 注入 UseCase
@@ -287,10 +292,12 @@ class ${namePascal}ViewModel extends ChangeNotifier {
     super.dispose();
   }
 }
-`;
+`
   } else {
     // Lite 和 Modular 使用标准的 ViewModel
-    content = content || `import 'package:flutter/foundation.dart';
+    content =
+      content ||
+      `import 'package:flutter/foundation.dart';
 
 class ${namePascal}ViewModel extends ChangeNotifier {
   void init() {
@@ -303,20 +310,20 @@ class ${namePascal}ViewModel extends ChangeNotifier {
     super.dispose();
   }
 }
-`;
+`
   }
 
-  const filePath = join(vmDir, `${nameSnake}_viewmodel.dart`);
+  const filePath = join(vmDir, `${nameSnake}_viewmodel.dart`)
   if (existsSync(filePath)) {
-    logger.warn(`ViewModel 已存在: ${filePath}`);
-    return false;
+    logger.warn(`ViewModel 已存在: ${filePath}`)
+    return false
   }
 
-  writeFileSync(filePath, content, 'utf8');
-  logger.success(`ViewModel 创建成功: ${filePath}`);
+  writeFileSync(filePath, content, 'utf8')
+  logger.success(`ViewModel 创建成功: ${filePath}`)
 
   // 更新 index.dart
-  updateIndexFile(vmDir, `${nameSnake}_viewmodel.dart`);
+  updateIndexFile(vmDir, `${nameSnake}_viewmodel.dart`)
 
-  return true;
+  return true
 }