flu-cli 2.0.5 → 2.1.0

package/lib/generators/service_generator.js

@@ -2,89 +2,94 @@
  * Service 生成器
  */
 
-import { existsSync, mkdirSync, writeFileSync } from 'fs';
-import { join } from 'path';
-import { logger } from '../utils/logger.js';
-import { toPascalCase, toSnakeCase } from '../utils/string_helper.js';
-import { updateIndexFile } from '../utils/index_updater.js';
-import { getSnippetContent } from '../utils/snippet_loader.js';
+import { existsSync, mkdirSync, writeFileSync } from 'fs'
+import { join } from 'path'
+import { logger } from '../utils/logger.js'
+import { toPascalCase, toSnakeCase } from '../utils/string_helper.js'
+import { updateIndexFile } from '../utils/index_updater.js'
+import { getSnippetContent } from '../utils/snippet_loader.js'
 
 /**
  * 生成 Service 文件
  */
-export function generateService (name, options = {}) {
+export function generateService(name, options = {}) {
   try {
     const {
       feature = null,
       type = 'api', // api, storage, auth
-      outputDir = process.cwd()
-    } = options;
+      outputDir = process.cwd(),
+    } = options
 
     // 转换命名
-    const namePascal = toPascalCase(name);
-    const nameSnake = toSnakeCase(name);
+    const namePascal = toPascalCase(name)
+    const nameSnake = toSnakeCase(name)
 
     // 确定输出路径
-    let servicesDir;
+    let servicesDir
     if (feature) {
       // Modular/Clean 架构
-      servicesDir = join(outputDir, 'lib', 'features', feature, 'services');
+      servicesDir = join(outputDir, 'lib', 'features', feature, 'services')
     } else {
       // Lite 架构
-      servicesDir = join(outputDir, 'lib', 'services');
+      servicesDir = join(outputDir, 'lib', 'services')
     }
 
     // 创建目录
     if (!existsSync(servicesDir)) {
-      mkdirSync(servicesDir, { recursive: true });
+      mkdirSync(servicesDir, { recursive: true })
     }
 
     // 生成文件内容（优先片段）
-    const keyMap = { api: 'flu.service.api', storage: 'flu.service.storage', auth: 'flu.service.auth' };
-    const key = keyMap[type] || keyMap.api;
-    const content = getSnippetContent(outputDir, key, { Name: namePascal }) || generateServiceContent(namePascal, type);
+    const keyMap = {
+      api: 'flu.service.api',
+      storage: 'flu.service.storage',
+      auth: 'flu.service.auth',
+    }
+    const key = keyMap[type] || keyMap.api
+    const content =
+      getSnippetContent(outputDir, key, { Name: namePascal }) ||
+      generateServiceContent(namePascal, type)
 
     // 写入文件
-    const filePath = join(servicesDir, `${nameSnake}_service.dart`);
+    const filePath = join(servicesDir, `${nameSnake}_service.dart`)
     if (existsSync(filePath)) {
-      logger.error(`文件已存在: ${filePath}`);
-      return false;
+      logger.error(`文件已存在: ${filePath}`)
+      return false
     }
 
-    writeFileSync(filePath, content, 'utf8');
-    logger.success(`Service 创建成功: ${filePath}`);
+    writeFileSync(filePath, content, 'utf8')
+    logger.success(`Service 创建成功: ${filePath}`)
 
     // 更新 index.dart
-    updateIndexFile(servicesDir, `${nameSnake}_service.dart`);
-
-    return true;
+    updateIndexFile(servicesDir, `${nameSnake}_service.dart`)
 
+    return true
   } catch (error) {
-    logger.error(`生成 Service 失败: ${error.message}`);
-    return false;
+    logger.error(`生成 Service 失败: ${error.message}`)
+    return false
   }
 }
 
 /**
  * 生成 Service 内容
  */
-function generateServiceContent (namePascal, type) {
+function generateServiceContent(namePascal, type) {
   switch (type) {
     case 'api':
-      return generateApiService(namePascal);
+      return generateApiService(namePascal)
     case 'storage':
-      return generateStorageService(namePascal);
+      return generateStorageService(namePascal)
     case 'auth':
-      return generateAuthService(namePascal);
+      return generateAuthService(namePascal)
     default:
-      return generateApiService(namePascal);
+      return generateApiService(namePascal)
   }
 }
 
 /**
  * 生成 API Service
  */
-function generateApiService (namePascal) {
+function generateApiService(namePascal) {
   return `import 'dart:convert';
 import 'package:http/http.dart' as http;
 
@@ -163,13 +168,13 @@ class ${namePascal}Service {
     }
   }
 }
-`;
+`
 }
 
 /**
  * 生成 Storage Service
  */
-function generateStorageService (namePascal) {
+function generateStorageService(namePascal) {
   return `import 'package:shared_preferences/shared_preferences.dart';
 import 'dart:convert';
 
@@ -263,13 +268,13 @@ class ${namePascal}Service {
     }
   }
 }
-`;
+`
 }
 
 /**
  * 生成 Auth Service
  */
-function generateAuthService (namePascal) {
+function generateAuthService(namePascal) {
   return `import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:shared_preferences/shared_preferences.dart';
@@ -404,5 +409,5 @@ class ${namePascal}Service {
     };
   }
 }
-`;
+`
 }

package/lib/generators/viewmodel_generator.js

@@ -2,69 +2,65 @@
  * ViewModel 生成器
  */
 
-import { existsSync, mkdirSync, writeFileSync } from 'fs';
-import { join } from 'path';
-import { logger } from '../utils/logger.js';
-import { toPascalCase, toSnakeCase } from '../utils/string_helper.js';
-import { updateIndexFile } from '../utils/index_updater.js';
+import { existsSync, mkdirSync, writeFileSync } from 'fs'
+import { join } from 'path'
+import { logger } from '../utils/logger.js'
+import { toPascalCase, toSnakeCase } from '../utils/string_helper.js'
+import { updateIndexFile } from '../utils/index_updater.js'
 
 /**
  * 生成 ViewModel 文件
  */
-export function generateViewModel (name, options = {}) {
+export function generateViewModel(name, options = {}) {
   try {
-    const {
-      feature = null,
-      outputDir = process.cwd()
-    } = options;
+    const { feature = null, outputDir = process.cwd() } = options
 
     // 转换命名
-    const namePascal = toPascalCase(name);
-    const nameSnake = toSnakeCase(name);
+    const namePascal = toPascalCase(name)
+    const nameSnake = toSnakeCase(name)
 
     // 确定输出路径
-    let vmDir;
+    let vmDir
     if (feature) {
       // Modular/Clean 架构
-      vmDir = join(outputDir, 'lib', 'features', feature, 'viewmodels');
+      vmDir = join(outputDir, 'lib', 'features', feature, 'viewmodels')
     } else {
       // Lite 架构
-      vmDir = join(outputDir, 'lib', 'viewmodels');
+      vmDir = join(outputDir, 'lib', 'viewmodels')
     }
 
     // 创建目录
     if (!existsSync(vmDir)) {
-      mkdirSync(vmDir, { recursive: true });
+      mkdirSync(vmDir, { recursive: true })
     }
 
     // 生成文件内容
-    const content = generateViewModelContent(namePascal);
+    const content = generateViewModelContent(namePascal)
 
     // 写入文件
-    const filePath = join(vmDir, `${nameSnake}_viewmodel.dart`);
+    const filePath = join(vmDir, `${nameSnake}_viewmodel.dart`)
     if (existsSync(filePath)) {
-      logger.error(`文件已存在: ${filePath}`);
-      return false;
+      logger.error(`文件已存在: ${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`);
-
-    return true;
+    updateIndexFile(vmDir, `${nameSnake}_viewmodel.dart`)
 
+    return true
   } catch (error) {
-    logger.error(`生成 ViewModel 失败: ${error.message}`);
-    return false;
+    logger.error(`生成 ViewModel 失败: ${error.message}`)
+    return false
   }
 }
 
 /**
  * 生成 ViewModel 内容
  */
-function generateViewModelContent (namePascal) {
+function generateViewModelContent(namePascal) {
   return `import 'package:flutter/foundation.dart';
 
 class ${namePascal}ViewModel extends ChangeNotifier {
@@ -111,5 +107,5 @@ class ${namePascal}ViewModel extends ChangeNotifier {
     super.dispose();
   }
 }
-`;
+`
 }

package/lib/generators/widget_generator.js

@@ -2,71 +2,66 @@
  * Widget 生成器
  */
 
-import { existsSync, mkdirSync, writeFileSync } from 'fs';
-import { join } from 'path';
-import { logger } from '../utils/logger.js';
-import { toPascalCase, toSnakeCase } from '../utils/string_helper.js';
-import { updateIndexFile } from '../utils/index_updater.js';
-import { detectProjectTemplate, getWidgetPath } from '../utils/project_detector.js';
-import { getSnippetContent } from '../utils/snippet_loader.js';
+import { existsSync, mkdirSync, writeFileSync } from 'fs'
+import { join } from 'path'
+import { logger } from '../utils/logger.js'
+import { toPascalCase, toSnakeCase } from '../utils/string_helper.js'
+import { updateIndexFile } from '../utils/index_updater.js'
+import { detectProjectTemplate, getWidgetPath } from '../utils/project_detector.js'
+import { getSnippetContent } from '../utils/snippet_loader.js'
 
 /**
  * 生成 Widget 文件
  */
-export function generateWidget (name, options = {}) {
+export function generateWidget(name, options = {}) {
   try {
-    const {
-      feature = null,
-      stateful = false,
-      outputDir = process.cwd()
-    } = options;
+    const { feature = null, stateful = false, 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 namePascal = toPascalCase(name)
+    const nameSnake = toSnakeCase(name)
 
     // 根据模板类型确定输出路径
-    const widgetsDir = getWidgetPath(outputDir, feature);
+    const widgetsDir = getWidgetPath(outputDir, feature)
 
     // 创建目录
     if (!existsSync(widgetsDir)) {
-      mkdirSync(widgetsDir, { recursive: true });
+      mkdirSync(widgetsDir, { recursive: true })
     }
 
     // 生成文件内容（优先片段）
-    const key = stateful ? 'flu.stWidget' : 'flu.lessWidget';
-    const contentFromSnippet = getSnippetContent(outputDir, key, { Name: namePascal });
-    const content = contentFromSnippet || generateWidgetContent(namePascal, stateful);
+    const key = stateful ? 'flu.stWidget' : 'flu.lessWidget'
+    const contentFromSnippet = getSnippetContent(outputDir, key, { Name: namePascal })
+    const content = contentFromSnippet || generateWidgetContent(namePascal, stateful)
 
     // 写入文件
-    const filePath = join(widgetsDir, `${nameSnake}_widget.dart`);
+    const filePath = join(widgetsDir, `${nameSnake}_widget.dart`)
     if (existsSync(filePath)) {
-      logger.error(`文件已存在: ${filePath}`);
-      return false;
+      logger.error(`文件已存在: ${filePath}`)
+      return false
     }
 
-    writeFileSync(filePath, content, 'utf8');
-    logger.success(`Widget 创建成功: ${filePath}`);
+    writeFileSync(filePath, content, 'utf8')
+    logger.success(`Widget 创建成功: ${filePath}`)
 
     // 更新 index.dart
-    updateIndexFile(widgetsDir, `${nameSnake}_widget.dart`);
-
-    return true;
+    updateIndexFile(widgetsDir, `${nameSnake}_widget.dart`)
 
+    return true
   } catch (error) {
-    logger.error(`生成 Widget 失败: ${error.message}`);
-    return false;
+    logger.error(`生成 Widget 失败: ${error.message}`)
+    return false
   }
 }
 
 /**
  * 生成 Widget 内容
  */
-function generateWidgetContent (namePascal, stateful) {
+function generateWidgetContent(namePascal, stateful) {
   if (stateful) {
     return `import 'package:flutter/material.dart';
 
@@ -85,7 +80,7 @@ class _${namePascal}WidgetState extends State<${namePascal}Widget> {
     );
   }
 }
-`;
+`
   } else {
     return `import 'package:flutter/material.dart';
 
@@ -99,6 +94,6 @@ class ${namePascal}Widget extends StatelessWidget {
     );
   }
 }
-`;
+`
   }
 }

package/lib/templates/templateCopier.js

@@ -7,28 +7,27 @@ export {
   copyCustomTemplate,
   replaceVariables,
   ensurePubspecName,
-  cleanupTemplateFiles
-} from 'flu-cli-core';
+  cleanupTemplateFiles,
+} from 'flu-cli-core'
 
 /**
- * 使用模板的 pubspec.yaml 合并覆盖目标项目 (仅限 V2 保持逻辑)
+ * 使用模板的 pubspec.yaml 合并覆盖目标项目（历史兼容保留）
  */
-export async function mergePubspecFromTemplate (templatePath, projectDir, projectName) {
-  // 暂时保留该逻辑或移动到 core (考虑到 core 主要是 ProjectGenerator 使用，可以先在 v2 桥接)
-  // TODO: 后续可以完全迁移到 core
+export async function mergePubspecFromTemplate(templatePath, projectDir, projectName) {
+  // 该逻辑仍保留在 CLI 桥接层，后续如需统一迁移到 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;
-    let content = readFileSync(tplPub, 'utf8');
+    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
+    let content = readFileSync(tplPub, 'utf8')
     if (/^name:\s+/m.test(content)) {
-      content = content.replace(/^name:\s+.*/m, `name: ${projectName}`);
+      content = content.replace(/^name:\s+.*/m, `name: ${projectName}`)
     } else {
-      content = `name: ${projectName}\n` + content;
+      content = `name: ${projectName}\n` + content
     }
-    writeFileSync(dstPub, content, 'utf8');
+    writeFileSync(dstPub, content, 'utf8')
   } catch (error) {
     // 忽略错误
   }

package/lib/templates/templateManager.js

@@ -1,48 +1,49 @@
 /**
  * 模板管理器 - 桥接至 flu-cli-core
  */
-import { TemplateManager } from 'flu-cli-core';
+import { TemplateManager } from 'flu-cli-core'
 
-const templateManager = TemplateManager.getInstance();
+const templateManager = TemplateManager.getInstance()
 
 /**
  * 获取模板缓存路径
  */
-export function getTemplateCachePath (templateName) {
+export function getTemplateCachePath(templateName) {
   // 保持向前兼容，虽然 core 现在内部管理缓存路径
-  return templateManager.getTemplatePath(templateName);
+  return templateManager.getTemplatePath(templateName)
 }
 
 /**
  * 克隆或更新模板
  */
-export async function cloneOrUpdateTemplate (templateName, repoUrl, branch = 'main', forceUpdate = false, isLocal = false, sourceLocalPath = null) {
-  // 如果是本地模板，我们需要在 core 的配置中确保一致性，或者直接处理
-  // 实际上 v2 的 cloneOrUpdateTemplate 承担了“查找并准备”的职责
-  // 我们直接调用 core 的 prepareTemplate
-
-  // NOTE: v2 这里的参数逻辑与 core 的 TemplateManager 略有不同
-  // v2 会根据 templateName 去查找模板
-  return await templateManager.prepareTemplate(templateName, undefined, forceUpdate);
+export async function cloneOrUpdateTemplate(
+  templateName,
+  repoUrl,
+  branch = 'main',
+  forceUpdate = false,
+  isLocal = false,
+  sourceLocalPath = null,
+) {
+  // 保持 CLI 与 core 的模板准备逻辑一致，由 core 统一负责查找、缓存与准备。
+  return await templateManager.prepareTemplate(templateName, undefined, forceUpdate)
 }
 
 /**
  * 检查模板是否有更新
  */
-export async function checkTemplateUpdate (templateName) {
-  return await templateManager.checkUpdate(templateName);
+export async function checkTemplateUpdate(templateName) {
+  return await templateManager.checkUpdate(templateName)
 }
 
 /**
  * 获取模板信息
  */
-export async function getTemplateInfo (templateName) {
-  // v2 原本返回 path, lastCommit, exists
-  // core 的 TemplateManager 目前没提供完整的 getTemplateInfo，但我们可以简单封装
-  const path = templateManager.getTemplatePath(templateName);
-  const exists = !!path; // 简化处理
+export async function getTemplateInfo(templateName) {
+  // 保留最小兼容信息，避免 CLI 侧直接依赖模板管理实现细节。
+  const path = templateManager.getTemplatePath(templateName)
+  const exists = !!path // 简化处理
   return {
     path,
-    exists
-  };
+    exists,
+  }
 }

package/lib/utils/config.js

@@ -2,60 +2,77 @@
  * 配置管理 - 桥接至 flu-cli-core
  */
 
-import { ConfigManager } from 'flu-cli-core';
+import { ConfigManager } from 'flu-cli-core'
 
-const configManager = ConfigManager.getInstance();
+const configManager = ConfigManager.getInstance()
 
 /**
  * 读取配置 (由于 ConfigManager 内部管理，此方法仅用于向下兼容)
  */
-export function getConfig () {
-  return configManager['config'] || {};
+export function getConfig() {
+  return configManager['config'] || {}
 }
 
 /**
  * 保存配置
  */
-export function saveConfig (config) {
+export function saveConfig(config) {
   // ConfigManager 内部会自动保存，这里仅为兼容
 }
 
 /**
  * 获取作者名字
  */
-export function getAuthorName () {
-  return configManager.getAuthorName();
+export function getAuthorName() {
+  return configManager.getAuthorName()
 }
 
 /**
  * 保存作者名字
  */
-export function saveAuthorName (name) {
-  configManager.setAuthorName(name);
+export function saveAuthorName(name) {
+  try {
+    configManager.setAuthorName(name)
+  } catch (error) {
+    if (!shouldIgnoreConfigPersistenceError(error)) {
+      throw error
+    }
+  }
 }
 
 // 读取默认模板（builtin/custom）
-export function getDefaultTemplate () {
-  return configManager.getDefaultTemplate();
+export function getDefaultTemplate() {
+  return configManager.getDefaultTemplate()
 }
 
 // 保存默认模板（builtin/custom）
-export function saveDefaultTemplate (defaultTemplate) {
-  configManager.setDefaultTemplate(defaultTemplate.type, defaultTemplate.idOrName);
+export function saveDefaultTemplate(defaultTemplate) {
+  try {
+    configManager.setDefaultTemplate(defaultTemplate.type, defaultTemplate.idOrName)
+  } catch (error) {
+    if (!shouldIgnoreConfigPersistenceError(error)) {
+      throw error
+    }
+  }
 }
 
 // 获取自定义模板列表
-export function getCustomTemplates () {
-  return configManager.getTemplates();
+export function getCustomTemplates() {
+  return configManager.getTemplates()
 }
 
 // 根据 id 查找自定义模板
-export function findCustomTemplateById (id) {
-  return configManager.getTemplate(id) || null;
+export function findCustomTemplateById(id) {
+  return configManager.getTemplate(id) || null
 }
 
 // 新增或更新自定义模板
-export function addOrUpdateCustomTemplate (tpl) {
-  configManager.addTemplate(tpl);
-  return tpl;
+export function addOrUpdateCustomTemplate(tpl) {
+  configManager.addTemplate(tpl)
+  return tpl
+}
+
+function shouldIgnoreConfigPersistenceError(error) {
+  const code = error?.code
+  return code === 'EPERM' || code === 'EACCES' || code === 'EROFS'
 }

package/lib/utils/flutterHelper.js

@@ -6,5 +6,5 @@ export {
   runFlutterCreate,
   runFlutterPubGet,
   checkFlutterInstalled,
-  getFlutterVersion
-} from 'flu-cli-core';
+  getFlutterVersion,
+} from 'flu-cli-core'

package/lib/utils/i18n.js

@@ -1,7 +1,7 @@
 /**
  * 国际化工具 - 桥接至 flu-cli-core
  */
-import { I18nManager, t as coreT } from 'flu-cli-core';
+import { I18nManager, t as coreT } from 'flu-cli-core'
 
-export const i18n = I18nManager.getInstance();
-export const t = (key, params) => coreT(key, params);
+export const i18n = I18nManager.getInstance()
+export const t = (key, params) => coreT(key, params)