befly 3.4.7 → 3.4.9

package/bin/index.ts

@@ -18,16 +18,24 @@ await launch(import.meta.path);
  * 此时环境变量已正确加载
  */
 import { Command } from 'commander';
-import { scriptCommand } from '../commands/script.js';
 import { devCommand } from '../commands/dev.js';
 import { buildCommand } from '../commands/build.js';
 import { startCommand } from '../commands/start.js';
 import { syncDbCommand } from '../commands/syncDb.js';
-import { addonCommand } from '../commands/addon.js';
 import { syncApiCommand } from '../commands/syncApi.js';
 import { syncMenuCommand } from '../commands/syncMenu.js';
 import { syncDevCommand } from '../commands/syncDev.js';
 import { Logger } from '../lib/logger.js';
+import { join } from 'pathe';
+import { getPackageVersion } from '../commands/util.js';
+
+/**
+ * 读取 package.json 版本号
+ */
+function getVersion(): string {
+    const coreDir = join(import.meta.dir, '..');
+    return getPackageVersion(coreDir);
+}
 
 /**
  * Bun 版本要求
@@ -109,40 +117,39 @@ checkBunVersion();
 
 const program = new Command();
 
-program.name('befly').description('Befly CLI - 为 Befly 框架提供命令行工具').version('3.0.0');
+program.name('befly').description('Befly CLI - 为 Befly 框架提供命令行工具').version(getVersion());
 
-// script 命令 - 执行脚本
-program.command('script').description('列出并执行 befly 脚本').option('--dry-run', '预演模式，只显示不执行', false).action(scriptCommand);
+/**
+ * 包装命令处理函数，在执行后打印环境
+ */
+function wrapCommand<T extends (...args: any[]) => any>(fn: T): T {
+    return (async (...args: any[]) => {
+        const result = await fn(...args);
+        Logger.printEnv();
+        return result;
+    }) as T;
+}
 
 // dev 命令 - 开发服务器
-program.command('dev').description('启动开发服务器').option('-p, --port <number>', '端口号', '3000').option('-h, --host <string>', '主机地址', '0.0.0.0').option('--no-sync', '跳过表同步', false).option('-v, --verbose', '详细日志', false).action(devCommand);
+program.command('dev').description('启动开发服务器').option('-p, --port <number>', '端口号', '3000').option('-h, --host <string>', '主机地址', '0.0.0.0').option('--no-sync', '跳过表同步', false).option('-v, --verbose', '详细日志', false).action(wrapCommand(devCommand));
 
 // build 命令 - 构建项目
-program.command('build').description('构建项目').option('-o, --outdir <path>', '输出目录', 'dist').option('--minify', '压缩代码', false).option('--sourcemap', '生成 sourcemap', false).action(buildCommand);
+program.command('build').description('构建项目').option('-o, --outdir <path>', '输出目录', 'dist').option('--minify', '压缩代码', false).option('--sourcemap', '生成 sourcemap', false).action(wrapCommand(buildCommand));
 
 // start 命令 - 启动生产服务器
-program.command('start').description('启动生产服务器').option('-p, --port <number>', '端口号', '3000').option('-h, --host <string>', '主机地址', '0.0.0.0').option('-c, --cluster <instances>', '集群模式（数字或 max）').action(startCommand);
+program.command('start').description('启动生产服务器').option('-p, --port <number>', '端口号', '3000').option('-h, --host <string>', '主机地址', '0.0.0.0').option('-c, --cluster <instances>', '集群模式（数字或 max）').action(wrapCommand(startCommand));
 
 // syncDb 命令 - 同步数据库
-program.command('syncDb').description('同步数据库表结构').option('-t, --table <name>', '指定表名').option('--dry-run', '预览模式，只显示不执行', false).option('-e, --env <environment>', '指定环境 (development, production, test)').action(syncDbCommand);
+program.command('syncDb').description('同步数据库表结构').option('-t, --table <name>', '指定表名').option('--dry-run', '预览模式，只显示不执行', false).option('-e, --env <environment>', '指定环境 (development, production, test)').action(wrapCommand(syncDbCommand));
 
 // syncApi 命令 - 同步 API 接口
-program.command('syncApi').description('同步 API 接口到数据库').option('--plan', '计划模式，只显示不执行', false).option('-e, --env <environment>', '指定环境 (development, production, test)').action(syncApiCommand);
+program.command('syncApi').description('同步 API 接口到数据库').option('--plan', '计划模式，只显示不执行', false).option('-e, --env <environment>', '指定环境 (development, production, test)').action(wrapCommand(syncApiCommand));
 
 // syncMenu 命令 - 同步菜单
-program.command('syncMenu').description('同步菜单配置到数据库').option('--plan', '计划模式，只显示不执行', false).option('-e, --env <environment>', '指定环境 (development, production, test)').action(syncMenuCommand);
+program.command('syncMenu').description('同步菜单配置到数据库').option('--plan', '计划模式，只显示不执行', false).option('-e, --env <environment>', '指定环境 (development, production, test)').action(wrapCommand(syncMenuCommand));
 
 // syncDev 命令 - 同步开发者账号
-program.command('syncDev').description('同步开发者管理员账号').option('--plan', '计划模式，只显示不执行', false).option('-e, --env <environment>', '指定环境 (development, production, test)').action(syncDevCommand);
-
-// addon 命令 - 插件管理
-const addon = program.command('addon').description('管理 Befly 插件');
-
-addon.command('install <name>').description('安装插件').option('-s, --source <url>', '插件源地址').action(addonCommand.install);
-
-addon.command('uninstall <name>').description('卸载插件').option('--keep-data', '保留插件数据', false).action(addonCommand.uninstall);
-
-addon.command('list').description('列出已安装的插件').action(addonCommand.list);
+program.command('syncDev').description('同步开发者管理员账号').option('--plan', '计划模式，只显示不执行', false).option('-e, --env <environment>', '指定环境 (development, production, test)').action(wrapCommand(syncDevCommand));
 
 // 显示建议和错误
 program.showSuggestionAfterError();

package/bin/launcher.ts

@@ -71,12 +71,15 @@ export async function launch(entryFile: string): Promise<void> {
     }
 
     // 确定环境名称
-    const envArgIndex = process.argv.indexOf('--env');
+    const longEnvIndex = process.argv.indexOf('--env');
+    const shortEnvIndex = process.argv.indexOf('-e');
     let envInput = 'development'; // 默认环境
 
-    if (envArgIndex !== -1 && process.argv[envArgIndex + 1]) {
-        // 如果指定了 --env 参数
-        envInput = process.argv[envArgIndex + 1];
+    // 检查 --env 或 -e 参数
+    if (longEnvIndex !== -1 && process.argv[longEnvIndex + 1]) {
+        envInput = process.argv[longEnvIndex + 1];
+    } else if (shortEnvIndex !== -1 && process.argv[shortEnvIndex + 1]) {
+        envInput = process.argv[shortEnvIndex + 1];
     } else if (process.env.NODE_ENV) {
         // 如果设置了 NODE_ENV 环境变量
         envInput = process.env.NODE_ENV;
@@ -86,10 +89,10 @@ export async function launch(entryFile: string): Promise<void> {
     const envName = resolveEnvName(envInput);
     const envFile = `.env.${envName}`;
 
-    // 过滤掉 --env 参数（已通过 --env-file 处理）
+    // 过滤掉 --env/-e 参数（已通过 --env-file 处理）
     const filteredArgs = process.argv.slice(2).filter((arg, i, arr) => {
-        if (arg === '--env') return false;
-        if (arr[i - 1] === '--env') return false;
+        if (arg === '--env' || arg === '-e') return false;
+        if (arr[i - 1] === '--env' || arr[i - 1] === '-e') return false;
         return true;
     });
 

package/commands/build.ts

@@ -6,18 +6,7 @@ import { join } from 'pathe';
 import { existsSync } from 'node:fs';
 import ora from 'ora';
 import { Logger } from '../lib/logger.js';
-
-function getProjectRoot(): string {
-    let current = process.cwd();
-    const path = require('node:path');
-    while (current !== path.parse(current).root) {
-        if (existsSync(join(current, 'package.json'))) {
-            return current;
-        }
-        current = path.dirname(current);
-    }
-    return process.cwd();
-}
+import { getProjectRoot } from './util.js';
 
 interface BuildOptions {
     outdir: string;

package/commands/dev.ts

@@ -6,6 +6,7 @@ import { join } from 'pathe';
 import { existsSync } from 'node:fs';
 import { Logger } from '../lib/logger.js';
 import { Befly } from '../main.js';
+import { getProjectRoot } from './util.js';
 
 interface DevOptions {
     port: string;
@@ -14,17 +15,6 @@ interface DevOptions {
     verbose: boolean;
 }
 
-function getProjectRoot(): string {
-    let current = process.cwd();
-    while (current !== require('node:path').parse(current).root) {
-        if (existsSync(join(current, 'package.json'))) {
-            return current;
-        }
-        current = require('node:path').dirname(current);
-    }
-    return process.cwd();
-}
-
 export async function devCommand(options: DevOptions) {
     try {
         const projectRoot = getProjectRoot();

package/commands/index.ts

@@ -6,18 +6,7 @@ import { join } from 'pathe';
 import { existsSync } from 'node:fs';
 import ora from 'ora';
 import { Logger } from '../lib/logger.js';
-
-function getProjectRoot(): string {
-    let current = process.cwd();
-    const path = require('node:path');
-    while (current !== path.parse(current).root) {
-        if (existsSync(join(current, 'package.json'))) {
-            return current;
-        }
-        current = path.dirname(current);
-    }
-    return process.cwd();
-}
+import { getProjectRoot } from './util.js';
 
 // ========== Build 命令 ==========
 interface BuildOptions {

package/commands/start.ts

@@ -7,18 +7,7 @@ import { existsSync } from 'node:fs';
 import { Logger } from '../lib/logger.js';
 import { ClusterManager } from '../lifecycle/cluster.js';
 import { Befly } from '../main.js';
-
-function getProjectRoot(): string {
-    let current = process.cwd();
-    const path = require('node:path');
-    while (current !== path.parse(current).root) {
-        if (existsSync(join(current, 'package.json'))) {
-            return current;
-        }
-        current = path.dirname(current);
-    }
-    return process.cwd();
-}
+import { getProjectRoot } from './util.js';
 
 interface StartOptions {
     port: string;

package/commands/util.ts

@@ -0,0 +1,58 @@
+/**
+ * Commands 工具函数
+ * 提供命令间可复用的通用功能
+ */
+
+import { join, parse, dirname } from 'pathe';
+import { existsSync, readFileSync } from 'node:fs';
+
+/**
+ * 获取项目根目录
+ * 向上查找包含 package.json 的目录
+ *
+ * @returns 项目根目录路径
+ */
+export function getProjectRoot(): string {
+    let current = process.cwd();
+    const root = parse(current).root;
+
+    while (current !== root) {
+        if (existsSync(join(current, 'package.json'))) {
+            return current;
+        }
+        current = dirname(current);
+    }
+
+    return process.cwd();
+}
+
+/**
+ * 读取 package.json 文件内容
+ *
+ * @param pkgPath package.json 文件路径
+ * @returns package.json 的内容对象
+ */
+export function readPackageJson(pkgPath: string): Record<string, any> {
+    try {
+        const content = readFileSync(pkgPath, 'utf-8');
+        return JSON.parse(content);
+    } catch (error) {
+        throw new Error(`读取 package.json 失败: ${error}`);
+    }
+}
+
+/**
+ * 获取指定目录的 package.json 版本号
+ *
+ * @param dir 目录路径
+ * @returns 版本号字符串
+ */
+export function getPackageVersion(dir: string): string {
+    try {
+        const pkgPath = join(dir, 'package.json');
+        const pkg = readPackageJson(pkgPath);
+        return pkg.version || '0.0.0';
+    } catch (error) {
+        return '0.0.0';
+    }
+}

package/lib/logger.ts

@@ -211,4 +211,16 @@ export class Logger {
     static clearCache(): void {
         this.currentFiles.clear();
     }
+
+    /**
+     * 打印当前运行环境
+     * 用于命令开始时提示用户当前环境
+     */
+    static printEnv(): void {
+        const env = process.env.NODE_ENV || 'development';
+        const envColor = env === 'production' ? chalk.red : env === 'test' ? chalk.yellow : chalk.green;
+        console.log(chalk.gray('────────────────────────────────────────'));
+        console.log(chalk.bold('运行环境: ') + envColor.bold(env.toUpperCase()));
+        console.log(chalk.gray('────────────────────────────────────────'));
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.4.7",
+    "version": "3.4.9",
     "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -81,5 +81,5 @@
         "ora": "^9.0.0",
         "pathe": "^2.0.3"
     },
-    "gitHead": "754e5afe468859c551011ba4f8e5d70b3d0c0659"
+    "gitHead": "813660c1474980368c593c0d06d04239f3c012ba"
 }

package/commands/addon.ts

@@ -1,57 +0,0 @@
-/**
- * Addon 命令 - 插件管理
- */
-
-import { existsSync, mkdirSync, rmSync } from 'node:fs';
-import { join } from 'pathe';
-import ora from 'ora';
-import { Logger } from '../lib/logger.js';
-
-export const addonCommand = {
-    async install(name: string, options: { source?: string }) {
-        const spinner = ora({
-            text: `正在安装插件: ${name}`,
-            color: 'cyan',
-            spinner: 'dots'
-        }).start();
-
-        try {
-            // TODO: 实现插件安装逻辑
-            // 1. 从 source 或默认源下载插件
-            // 2. 解压到 addons 目录
-            // 3. 安装插件依赖
-            // 4. 执行插件安装脚本
-
-            spinner.warn(`插件安装功能开发中`);
-        } catch (error) {
-            spinner.fail(`插件 ${name} 安装失败`);
-            throw error;
-        }
-    },
-
-    async uninstall(name: string, options: { keepData: boolean }) {
-        const spinner = ora({
-            text: `正在卸载插件: ${name}`,
-            color: 'cyan',
-            spinner: 'dots'
-        }).start();
-
-        try {
-            // TODO: 实现插件卸载逻辑
-            // 1. 执行插件卸载脚本
-            // 2. 删除插件文件
-            // 3. 可选：删除插件数据
-
-            spinner.warn(`插件卸载功能开发中`);
-        } catch (error) {
-            spinner.fail(`插件 ${name} 卸载失败`);
-            throw error;
-        }
-    },
-
-    async list() {
-        // TODO: 读取已安装的插件列表
-        console.log('已安装的插件:\n');
-        console.log('(功能开发中)');
-    }
-};

package/commands/script.ts

@@ -1,303 +0,0 @@
-/**
- * Script 命令 - 列出并执行项目脚本
- */
-
-import { join, dirname, parse, resolve, basename } from 'pathe';
-import { existsSync, readdirSync, statSync } from 'node:fs';
-import { Glob } from 'bun';
-import inquirer from 'inquirer';
-import { Logger } from '../lib/logger.js';
-
-/**
- * 脚本项接口
- */
-interface ScriptItem {
-    /** 脚本名称 */
-    name: string;
-    /** 脚本来源 (core、project 或 addon 名称) */
-    source: string;
-    /** 显示名称 */
-    displayName: string;
-    /** 脚本完整路径 */
-    path: string;
-}
-
-/**
- * 查找项目根目录（向上查找 package.json）
- */
-function findProjectRoot(startDir: string): string | null {
-    let currentDir = startDir;
-    const root = parse(currentDir).root;
-
-    while (currentDir !== root) {
-        const packagePath = join(currentDir, 'package.json');
-        if (existsSync(packagePath)) {
-            return currentDir;
-        }
-        currentDir = dirname(currentDir);
-    }
-
-    return null;
-}
-
-/**
- * 安全地列出目录下的所有 .ts 脚本文件
- */
-function safeList(dir: string): string[] {
-    try {
-        if (!existsSync(dir)) {
-            return [];
-        }
-
-        const glob = new Glob('*.ts');
-        const files = Array.from(
-            glob.scanSync({
-                cwd: dir,
-                absolute: false,
-                onlyFiles: true,
-                dot: false
-            })
-        );
-
-        return files.map((f) => basename(f).replace(/\.ts$/, '')).sort();
-    } catch {
-        return [];
-    }
-}
-
-/**
- * 扫描 CLI 自带的 scripts
- */
-function scanCliScripts(): Array<{ scriptName: string; scriptPath: string }> {
-    const results: Array<{ scriptName: string; scriptPath: string }> = [];
-
-    try {
-        // 获取 CLI 包的根目录（当前文件在 commands 目录下）
-        const cliRoot = resolve(__dirname, '..');
-        const scriptsDir = join(cliRoot, 'scripts');
-
-        if (!existsSync(scriptsDir)) {
-            return results;
-        }
-
-        const scriptFiles = readdirSync(scriptsDir);
-
-        for (const file of scriptFiles) {
-            // 只处理直接子级的 .ts 文件
-            if (file.endsWith('.ts')) {
-                const scriptName = file.replace(/\.ts$/, '');
-                const scriptPath = join(scriptsDir, file);
-
-                // 确保是文件而不是目录
-                if (statSync(scriptPath).isFile()) {
-                    results.push({
-                        scriptName,
-                        scriptPath
-                    });
-                }
-            }
-        }
-    } catch {
-        // 静默失败
-    }
-
-    return results;
-}
-
-/**
- * 扫描 node_modules/@befly-addon/* 下的 scripts
- */
-function scanAddonScripts(projectRoot: string): Array<{ addonName: string; scriptName: string; scriptPath: string }> {
-    const results: Array<{ addonName: string; scriptName: string; scriptPath: string }> = [];
-
-    try {
-        const beflyAddonsDir = join(projectRoot, 'node_modules', '@befly-addon');
-
-        if (!existsSync(beflyAddonsDir)) {
-            return results;
-        }
-
-        // 读取 @befly-addon 目录下的所有 addon
-        const addonDirs = readdirSync(beflyAddonsDir);
-
-        for (const addonDir of addonDirs) {
-            const scriptsDir = join(beflyAddonsDir, addonDir, 'scripts');
-
-            if (!existsSync(scriptsDir)) {
-                continue;
-            }
-
-            try {
-                const scriptFiles = readdirSync(scriptsDir);
-
-                for (const file of scriptFiles) {
-                    if (file.endsWith('.ts')) {
-                        const scriptName = file.replace(/\.ts$/, '');
-                        const scriptPath = join(scriptsDir, file);
-
-                        results.push({
-                            addonName: addonDir,
-                            scriptName,
-                            scriptPath
-                        });
-                    }
-                }
-            } catch {
-                // 忽略无法读取的目录
-            }
-        }
-    } catch (error) {
-        // 静默失败
-    }
-
-    return results;
-}
-
-/**
- * 构建所有可用脚本的列表
- */
-function buildScriptItems(projectRoot: string): ScriptItem[] {
-    const items: ScriptItem[] = [];
-
-    // CLI 脚本
-    const cliScripts = scanCliScripts();
-    for (const script of cliScripts) {
-        items.push({
-            name: script.scriptName,
-            source: 'cli',
-            displayName: `[CLI] ${script.scriptName}`,
-            path: script.scriptPath
-        });
-    }
-
-    // 项目脚本
-    const projectScriptsDir = join(projectRoot, 'scripts');
-    const projectList = safeList(projectScriptsDir);
-    for (const name of projectList) {
-        items.push({
-            name,
-            source: 'project',
-            displayName: `[Project] ${name}`,
-            path: resolve(projectScriptsDir, `${name}.ts`)
-        });
-    }
-
-    // Addon 脚本
-    const addonScripts = scanAddonScripts(projectRoot);
-    for (const addon of addonScripts) {
-        items.push({
-            name: addon.scriptName,
-            source: `addon:${addon.addonName}`,
-            displayName: `[${addon.addonName}] ${addon.scriptName}`,
-            path: addon.scriptPath
-        });
-    }
-
-    return items;
-}
-
-/**
- * 运行脚本
- */
-async function runScript(scriptPath: string, args: string[] = []): Promise<number> {
-    const bunExe = process.execPath || 'bun';
-    const child = Bun.spawn({
-        cmd: [bunExe, scriptPath, ...args],
-        stdio: ['inherit', 'inherit', 'inherit'],
-        cwd: process.cwd(),
-        env: { ...process.env }
-    });
-
-    const code = await child.exited;
-    return code ?? 0;
-}
-
-/**
- * Script 命令处理函数
- */
-export async function scriptCommand(options: { dryRun?: boolean; plan?: boolean } = {}) {
-    try {
-        // 查找项目根目录
-        const projectRoot = findProjectRoot();
-        if (!projectRoot) {
-            Logger.error('未找到项目根目录（缺少 package.json）');
-            process.exit(1);
-        }
-
-        // 构建脚本列表
-        const items = buildScriptItems(projectRoot);
-
-        if (items.length === 0) {
-            Logger.warn('没有找到可用的脚本');
-            process.exit(0);
-        }
-
-        // 使用 inquirer 选择脚本
-        const { selectedScript } = await inquirer.prompt([
-            {
-                type: 'list',
-                name: 'selectedScript',
-                message: '请选择要执行的脚本:',
-                choices: items.map((item) => ({
-                    name: item.displayName,
-                    value: item
-                })),
-                loop: false
-            }
-        ]);
-
-        // 询问是否添加 --plan 参数
-        let scriptArgs: string[] = [];
-        if (options.plan !== false) {
-            const { addPlan } = await inquirer.prompt([
-                {
-                    type: 'confirm',
-                    name: 'addPlan',
-                    message: '是否添加 --plan 参数（预演模式）?',
-                    default: false
-                }
-            ]);
-
-            if (addPlan) {
-                scriptArgs.push('--plan');
-            }
-        }
-
-        // 预演模式
-        if (options.dryRun) {
-            Logger.info(`[预演模式] 将执行: ${selectedScript.displayName}`);
-            Logger.info(`[预演模式] 脚本路径: ${selectedScript.path}`);
-            if (scriptArgs.length > 0) {
-                Logger.info(`[预演模式] 参数: ${scriptArgs.join(' ')}`);
-            }
-            process.exit(0);
-        }
-
-        // 确认执行
-        const { confirm } = await inquirer.prompt([
-            {
-                type: 'confirm',
-                name: 'confirm',
-                message: `确认执行 ${selectedScript.displayName}?`,
-                default: true
-            }
-        ]);
-
-        if (!confirm) {
-            Logger.info('已取消执行');
-            process.exit(0);
-        }
-
-        // 执行脚本
-        const argsInfo = scriptArgs.length > 0 ? ` (参数: ${scriptArgs.join(' ')})` : '';
-        Logger.info(`正在执行: ${selectedScript.displayName}${argsInfo}\n`);
-
-        const exitCode = await runScript(selectedScript.path, scriptArgs);
-        process.exit(exitCode);
-    } catch (error) {
-        if (error instanceof Error) {
-            Logger.error(`执行失败: ${error.message}`);
-        }
-        process.exit(1);
-    }
-}