befly 3.8.34 → 3.9.0

package/befly.config.ts

@@ -85,6 +85,6 @@ export const beflyConfig = (await scanConfig({
     dirs: ['configs'],
     files: ['befly.common', `befly.${envSuffix}`, 'befly.local'],
     extensions: ['.json'],
-    mode: 'merge',
+    mode: 'all',
     defaults: defaultOptions
 })) as BeflyOptions;

package/hooks/parser.ts

@@ -36,7 +36,7 @@ const hook: Hook = {
             try {
                 // JSON 格式
                 if (contentType.includes('application/json')) {
-                    const body = await ctx.req.json();
+                    const body = (await ctx.req.json()) as Record<string, any>;
                     if (isPlainObject(ctx.api.fields) && !isEmpty(ctx.api.fields)) {
                         ctx.body = pickFields(body, Object.keys(ctx.api.fields));
                     } else {
@@ -45,7 +45,7 @@ const hook: Hook = {
                 } else if (contentType.includes('application/xml') || contentType.includes('text/xml')) {
                     // XML 格式
                     const text = await ctx.req.text();
-                    const body = xmlParser.parse(text);
+                    const body = xmlParser.parse(text) as Record<string, any>;
                     if (isPlainObject(ctx.api.fields) && !isEmpty(ctx.api.fields)) {
                         ctx.body = pickFields(body, Object.keys(ctx.api.fields));
                     } else {

package/hooks/permission.ts

@@ -40,8 +40,7 @@ const hook: Hook = {
                 // 验证角色权限
                 const apiPath = `${ctx.req.method}${new URL(ctx.req.url).pathname}`;
                 const roleApisKey = RedisKeys.roleApis(ctx.user.roleCode);
-                const isMember = await befly.redis.sismember(roleApisKey, apiPath);
-                hasPermission = isMember === 1;
+                hasPermission = await befly.redis.sismember(roleApisKey, apiPath);
             } catch (error) {
                 // Redis 异常时降级为拒绝访问
                 befly.logger.warn({ err: error, route: ctx.route }, 'Redis 权限检查失败');

package/lib/cacheHelper.ts

@@ -225,8 +225,7 @@ export class CacheHelper {
      */
     async checkRolePermission(roleCode: string, apiPath: string): Promise<boolean> {
         try {
-            const result = await this.befly.redis.sismember(RedisKeys.roleApis(roleCode), apiPath);
-            return result === 1;
+            return await this.befly.redis.sismember(RedisKeys.roleApis(roleCode), apiPath);
         } catch (error: any) {
             Logger.error({ err: error, roleCode: roleCode }, '检查角色权限失败');
             return false;

package/lib/cipher.ts

@@ -77,10 +77,10 @@ export class Cipher {
      * RSA-SHA256 签名
      * @param data - 要签名的数据
      * @param privateKey - 私钥
-     * @param encoding - 输出编码
+     * @param encoding - 输出编码（'hex' | 'base64' | 'base64url'）
      * @returns RSA-SHA256 签名
      */
-    static rsaSha256(data: string, privateKey: string | Buffer, encoding: BufferEncoding = 'hex'): string {
+    static rsaSha256(data: string, privateKey: string | Buffer, encoding: 'hex' | 'base64' | 'base64url' = 'hex'): string {
         const sign = createSign('RSA-SHA256');
         sign.update(data);
         const signature = sign.sign(privateKey, encoding);
@@ -253,6 +253,7 @@ export class Cipher {
      * @returns 64位哈希值
      */
     static fastHash(data: string | Uint8Array, seed: number = 0): number {
-        return Bun.hash(data, seed);
+        const result = Bun.hash(data, seed);
+        return typeof result === 'bigint' ? Number(result) : result;
     }
 }

package/lib/dbHelper.ts

@@ -86,7 +86,7 @@ export class DbHelper {
     private async getTableColumns(table: string): Promise<string[]> {
         // 1. 先查 Redis 缓存
         const cacheKey = RedisKeys.tableColumns(table);
-        let columns = await this.befly.redis.getObject<string[]>(cacheKey);
+        const columns = await this.befly.redis.getObject<string[]>(cacheKey);
 
         if (columns && columns.length > 0) {
             return columns;
@@ -100,12 +100,12 @@ export class DbHelper {
             throw new Error(`表 ${table} 不存在或没有字段`);
         }
 
-        columns = result.map((row: any) => row.Field);
+        const columnNames = result.map((row: any) => row.Field) as string[];
 
         // 3. 写入 Redis 缓存
-        await this.befly.redis.setObject(cacheKey, columns, RedisTTL.tableColumns);
+        await this.befly.redis.setObject(cacheKey, columnNames, RedisTTL.tableColumns);
 
-        return columns;
+        return columnNames;
     }
 
     /**
@@ -171,7 +171,7 @@ export class DbHelper {
      * 统一的查询参数预处理方法
      */
     private async prepareQueryOptions(options: QueryOptions) {
-        const cleanWhere = this.cleanFields(options.where);
+        const cleanWhere = this.cleanFields(options.where || {});
 
         // 处理 fields（支持排除语法）
         const processedFields = await this.fieldsToSnake(snakeCase(options.table), options.fields || []);
@@ -401,7 +401,7 @@ export class DbHelper {
      * getOne({ table: 'userProfile', fields: ['userId', 'userName'] })
      * getOne({ table: 'user_profile', fields: ['user_id', 'user_name'] })
      */
-    async getOne<T = any>(options: QueryOptions): Promise<T | null> {
+    async getOne<T extends Record<string, any> = Record<string, any>>(options: QueryOptions): Promise<T | null> {
         const { table, fields, where } = await this.prepareQueryOptions(options);
 
         const builder = new SqlBuilder().select(fields).from(table).where(this.addDefaultStateFilter(where));
@@ -427,7 +427,7 @@ export class DbHelper {
      * // 使用小驼峰格式（推荐）
      * getList({ table: 'userProfile', fields: ['userId', 'userName', 'createdAt'] })
      */
-    async getList<T = any>(options: QueryOptions): Promise<ListResult<T>> {
+    async getList<T extends Record<string, any> = Record<string, any>>(options: QueryOptions): Promise<ListResult<T>> {
         const prepared = await this.prepareQueryOptions(options);
 
         // 参数上限校验
@@ -451,7 +451,7 @@ export class DbHelper {
         // 如果总数为 0，直接返回，不执行第二次查询
         if (total === 0) {
             return {
-                lists: [],
+                list: [],
                 total: 0,
                 page: prepared.page,
                 limit: prepared.limit,
@@ -476,7 +476,7 @@ export class DbHelper {
 
         // 转换 BIGINT 字段（id, pid 等）为数字类型
         return {
-            lists: this.convertBigIntFields<T>(camelList),
+            list: this.convertBigIntFields<T>(camelList),
             total: total,
             page: prepared.page,
             limit: prepared.limit,
@@ -493,7 +493,7 @@ export class DbHelper {
      * // 使用小驼峰格式（推荐）
      * getAll({ table: 'userProfile', fields: ['userId', 'userName'] })
      */
-    async getAll<T = any>(options: Omit<QueryOptions, 'page' | 'limit'>): Promise<T[]> {
+    async getAll<T extends Record<string, any> = Record<string, any>>(options: Omit<QueryOptions, 'page' | 'limit'>): Promise<T[]> {
         // 添加硬性上限保护，防止内存溢出
         const MAX_LIMIT = 10000;
         const WARNING_LIMIT = 1000;
@@ -745,6 +745,7 @@ export class DbHelper {
 
     /**
      * 执行事务
+     * 使用 Bun SQL 的 begin 方法开启事务
      */
     async trans<T = any>(callback: TransactionCallback<T>): Promise<T> {
         if (this.isTransaction) {
@@ -752,37 +753,12 @@ export class DbHelper {
             return await callback(this);
         }
 
-        // 开启新事务
-        const conn = await this.befly.db.transaction();
-        let committed = false;
-
-        try {
-            const trans = new DbHelper(this.befly, conn);
-            const result = await callback(trans);
-
-            // 提交事务
-            try {
-                await conn.query('COMMIT');
-                committed = true;
-            } catch (commitError: any) {
-                Logger.error({ err: commitError }, '事务提交失败，正在回滚');
-                await conn.query('ROLLBACK');
-                throw new Error(`事务提交失败: ${commitError.message}`);
-            }
-
-            return result;
-        } catch (error: any) {
-            // 回调执行失败，回滚事务
-            if (!committed) {
-                try {
-                    await conn.query('ROLLBACK');
-                    Logger.warn('事务已回滚');
-                } catch (rollbackError: any) {
-                    Logger.error({ err: rollbackError }, '事务回滚失败');
-                }
-            }
-            throw error;
-        }
+        // 使用 Bun SQL 的 begin 方法开启事务
+        // begin 方法会自动处理 commit/rollback
+        return await this.sql.begin(async (tx: any) => {
+            const trans = new DbHelper(this.befly, tx);
+            return await callback(trans);
+        });
     }
 
     /**

package/lib/jwt.ts

@@ -4,6 +4,7 @@
 
 import { createSigner, createVerifier, createDecoder } from 'fast-jwt';
 
+import type { Algorithm as FastJwtAlgorithm } from 'fast-jwt';
 import type { AuthConfig } from '../types/befly.js';
 import type { JwtPayload, JwtSignOptions, JwtVerifyOptions, JwtDecoded, JwtHeader } from 'befly-shared/types';
 
@@ -26,15 +27,18 @@ export class Jwt {
     }
 
     sign(payload: JwtPayload, options: JwtSignOptions = {}): string {
+        const key = options.secret || this.config.secret || 'befly-secret';
+        const algorithm = (options.algorithm || this.config.algorithm || 'HS256') as FastJwtAlgorithm;
+
         const signer = createSigner({
-            key: options.secret || this.config.secret,
-            algorithm: options.algorithm || this.config.algorithm,
+            key: key,
+            algorithm: algorithm,
             expiresIn: options.expiresIn || this.config.expiresIn,
             iss: options.issuer,
             aud: options.audience,
             sub: options.subject,
             jti: options.jwtId,
-            notBefore: options.notBefore
+            notBefore: typeof options.notBefore === 'number' ? options.notBefore : undefined
         });
         return signer(payload);
     }
@@ -43,9 +47,13 @@ export class Jwt {
         if (!token || typeof token !== 'string') {
             throw new Error('Token必须是非空字符串');
         }
+        const key = options.secret || this.config.secret || 'befly-secret';
+        const algorithm = (this.config.algorithm || 'HS256') as FastJwtAlgorithm;
+        const algorithms: FastJwtAlgorithm[] = options.algorithms ? (options.algorithms as FastJwtAlgorithm[]) : [algorithm];
+
         const verifier = createVerifier({
-            key: options.secret || this.config.secret,
-            algorithms: options.algorithms || [this.config.algorithm || 'HS256'],
+            key: key,
+            algorithms: algorithms,
             allowedIss: options.issuer,
             allowedAud: options.audience,
             allowedSub: options.subject,

package/lib/redisHelper.ts

@@ -140,14 +140,15 @@ export class RedisHelper {
     /**
      * 检查键是否存在
      * @param key - 键名
+     * @returns 是否存在（true/false）
      */
-    async exists(key: string): Promise<number> {
+    async exists(key: string): Promise<boolean> {
         try {
             const pkey = `${this.prefix}${key}`;
             return await this.client.exists(pkey);
         } catch (error: any) {
             Logger.error('Redis exists 错误', error);
-            return 0;
+            return false;
         }
     }
 
@@ -221,15 +222,15 @@ export class RedisHelper {
      * 判断成员是否在 Set 中
      * @param key - 键名
      * @param member - 成员
-     * @returns 1 表示存在，0 表示不存在
+     * @returns 是否存在（true/false）
      */
-    async sismember(key: string, member: string): Promise<number> {
+    async sismember(key: string, member: string): Promise<boolean> {
         try {
             const pkey = `${this.prefix}${key}`;
             return await this.client.sismember(pkey, member);
         } catch (error: any) {
             Logger.error('Redis sismember 错误', error);
-            return 0;
+            return false;
         }
     }
 
@@ -293,8 +294,7 @@ export class RedisHelper {
         }
 
         try {
-            const results = await Promise.all(items.map((item) => this.sismember(item.key, item.member)));
-            return results.map((r) => r > 0);
+            return await Promise.all(items.map((item) => this.sismember(item.key, item.member)));
         } catch (error: any) {
             Logger.error('Redis sismemberBatch 错误', error);
             return items.map(() => false);
@@ -389,8 +389,7 @@ export class RedisHelper {
         }
 
         try {
-            const results = await Promise.all(keys.map((key) => this.exists(key)));
-            return results.map((r) => r > 0);
+            return await Promise.all(keys.map((key) => this.exists(key)));
         } catch (error: any) {
             Logger.error('Redis existsBatch 错误', error);
             return keys.map(() => false);

package/lib/sqlBuilder.ts

@@ -3,7 +3,7 @@
  * 提供链式 API 构建 SQL 查询
  */
 
-import type { WhereConditions, OrderByField } from '../types/common.js';
+import type { WhereConditions, OrderByField, WhereOperator, OrderDirection, SqlQuery, InsertData, UpdateData } from '../types/common.js';
 import type { SqlValue } from 'befly-shared/types';
 
 /**

package/lib/validator.ts

@@ -178,7 +178,8 @@ export class Validator {
     private static resolveRegex(regexp: string | null): string | null {
         if (!regexp) return null;
         if (regexp.startsWith('@')) {
-            return RegexAliases[regexp.substring(1)] || regexp;
+            const key = regexp.substring(1) as keyof typeof RegexAliases;
+            return RegexAliases[key] || regexp;
         }
         return regexp;
     }

package/loader/loadHooks.ts

@@ -19,7 +19,7 @@ export async function loadHooks(hooks: Hook[]): Promise<void> {
 
         // 2. 过滤禁用的钩子
         const disableHooks = beflyConfig.disableHooks || [];
-        const enabledHooks = coreHooks.filter((hook) => !disableHooks.includes(hook.name));
+        const enabledHooks = coreHooks.filter((hook) => hook.name && !disableHooks.includes(hook.name));
 
         if (disableHooks.length > 0) {
             Logger.info({ hooks: disableHooks }, '禁用钩子');

package/loader/loadPlugins.ts

@@ -39,7 +39,7 @@ export async function loadPlugins(plugins: Plugin[], context: BeflyContext): Pro
 
         // 5. 过滤禁用的插件
         const disablePlugins = beflyConfig.disablePlugins || [];
-        const enabledPlugins = allPlugins.filter((plugin) => !disablePlugins.includes(plugin.name));
+        const enabledPlugins = allPlugins.filter((plugin) => plugin.name && !disablePlugins.includes(plugin.name));
 
         if (disablePlugins.length > 0) {
             Logger.info({ plugins: disablePlugins }, '禁用插件');

package/main.ts

@@ -42,7 +42,7 @@ export class Befly {
     private hooks: Hook[] = [];
 
     /** 应用上下文 */
-    public context: BeflyContext = {};
+    public context: Partial<BeflyContext> = {};
 
     /** 配置引用（延迟加载） */
     private config: BeflyOptions | null = null;
@@ -51,7 +51,7 @@ export class Befly {
      * 启动完整的生命周期流程
      * @returns HTTP 服务器实例
      */
-    public async start(): Promise<Server> {
+    public async start(): Promise<ReturnType<typeof Bun.serve>> {
         try {
             const serverStartTime = Bun.nanoseconds();
 
@@ -65,7 +65,7 @@ export class Befly {
             await checkApi();
 
             // 2. 加载插件
-            await loadPlugins(this.plugins, this.context);
+            await loadPlugins(this.plugins, this.context as BeflyContext);
 
             // 3. 加载钩子
             await loadHooks(this.hooks);
@@ -84,7 +84,7 @@ export class Befly {
                 hostname: this.config!.appHost,
                 routes: {
                     '/': () => Response.json({ code: 0, msg: `${this.config!.appName} 接口服务已启动` }),
-                    '/api/*': apiHandler(this.apis, this.hooks, this.context),
+                    '/api/*': apiHandler(this.apis, this.hooks, this.context as BeflyContext),
                     '/*': staticHandler()
                 },
                 error: (error: Error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.8.34",
+    "version": "3.9.0",
     "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -64,7 +64,7 @@
         "bun": ">=1.3.0"
     },
     "dependencies": {
-        "befly-shared": "^1.1.2",
+        "befly-shared": "^1.2.0",
         "chalk": "^5.6.2",
         "es-toolkit": "^1.42.0",
         "fast-jwt": "^6.1.0",
@@ -73,7 +73,7 @@
         "pino": "^10.1.0",
         "pino-roll": "^4.0.0"
     },
-    "gitHead": "e6528128e0532df2c2f0ad96e32bc73e167aac84",
+    "gitHead": "ebb51601e566ac01ef09824309a6ec60a5d32388",
     "devDependencies": {
         "typescript": "^5.9.3"
     }

package/sync/syncDb/apply.ts

@@ -11,9 +11,9 @@ import { isMySQL, isPG, isSQLite, IS_PLAN, CHANGE_TYPE_LABELS, getTypeMapping }
 import { logFieldChange, resolveDefaultValue, isStringOrArrayType } from './helpers.js';
 import { executeDDLSafely, buildIndexSQL } from './ddl.js';
 import { rebuildSqliteTable } from './sqlite.js';
-import type { FieldChange, IndexAction, TablePlan, ColumnInfo } from '../../types.js';
+import type { FieldChange, IndexAction, TablePlan, ColumnInfo } from '../../types/sync.js';
 import type { SQL } from 'bun';
-import type { FieldDefinition } from 'befly/types/common';
+import type { FieldDefinition } from 'befly-shared/types';
 
 /**
  * 构建 ALTER TABLE SQL 语句

package/sync/syncDb/ddl.ts

@@ -15,7 +15,8 @@ import { quoteIdentifier, escapeComment } from './helpers.js';
 import { resolveDefaultValue, generateDefaultSql, getSqlType } from './types.js';
 
 import type { SQL } from 'bun';
-import type { FieldDefinition, AnyObject } from 'befly/types/common.js';
+import type { FieldDefinition } from 'befly-shared/types';
+import type { AnyObject } from '../../types/common.js';
 
 /**
  * 构建索引操作 SQL（统一使用在线策略）

package/sync/syncDb/schema.ts

@@ -8,7 +8,7 @@
  */
 
 import { isMySQL, isPG, isSQLite } from './constants.js';
-import type { ColumnInfo, IndexInfo } from '../../types.js';
+import type { ColumnInfo, IndexInfo } from '../../types/sync.js';
 import type { SQL } from 'bun';
 
 /**
@@ -83,6 +83,7 @@ export async function getTableColumns(sql: SQL, tableName: string, dbName: strin
                 columns[row.COLUMN_NAME] = {
                     type: row.DATA_TYPE,
                     columnType: row.COLUMN_TYPE,
+                    length: row.CHARACTER_MAXIMUM_LENGTH,
                     max: row.CHARACTER_MAXIMUM_LENGTH,
                     nullable: row.IS_NULLABLE === 'YES',
                     defaultValue: defaultValue,
@@ -111,6 +112,7 @@ export async function getTableColumns(sql: SQL, tableName: string, dbName: strin
                 columns[row.column_name] = {
                     type: row.data_type,
                     columnType: row.data_type,
+                    length: row.character_maximum_length,
                     max: row.character_maximum_length,
                     nullable: String(row.is_nullable).toUpperCase() === 'YES',
                     defaultValue: row.column_default,
@@ -130,6 +132,7 @@ export async function getTableColumns(sql: SQL, tableName: string, dbName: strin
                 columns[row.name] = {
                     type: baseType.toLowerCase(),
                     columnType: baseType.toLowerCase(),
+                    length: max,
                     max: max,
                     nullable: row.notnull === 0,
                     defaultValue: row.dflt_value,
@@ -186,7 +189,7 @@ export async function getTableIndexes(sql: SQL, tableName: string, dbName: strin
             const list = await sql.unsafe(`PRAGMA index_list(${tableName})`);
             for (const idx of list) {
                 const info = await sql.unsafe(`PRAGMA index_info(${idx.name})`);
-                const cols = info.map((r) => r.name);
+                const cols = info.map((r: any) => r.name);
                 if (cols.length === 1) indexes[idx.name] = cols;
             }
         }

package/sync/syncDb/sqlite.ts

@@ -9,6 +9,7 @@ import { Logger } from '../../lib/logger.js';
 import { IS_PLAN } from './constants.js';
 import { createTable } from './tableCreate.js';
 import type { SQL } from 'bun';
+import type { FieldDefinition } from 'befly-shared/types';
 
 /**
  * SQLite 重建表迁移（简化版）
@@ -25,10 +26,10 @@ import type { SQL } from 'bun';
  * @param tableName - 表名
  * @param fields - 字段定义对象
  */
-export async function rebuildSqliteTable(sql: SQL, tableName: string, fields: Record<string, string>): Promise<void> {
+export async function rebuildSqliteTable(sql: SQL, tableName: string, fields: Record<string, FieldDefinition>): Promise<void> {
     // 1. 读取现有列顺序
     const info = await sql.unsafe(`PRAGMA table_info(${tableName})`);
-    const existingCols = info.map((r) => r.name);
+    const existingCols = info.map((r: any) => r.name);
     const targetCols = ['id', 'created_at', 'updated_at', 'deleted_at', 'state', ...Object.keys(fields)];
     const tmpTable = `${tableName}__tmp__${Date.now()}`;
 

package/sync/syncDb/table.ts

@@ -14,9 +14,9 @@ import { logFieldChange, resolveDefaultValue, generateDefaultSql, isStringOrArra
 import { generateDDLClause, isPgCompatibleTypeChange } from './ddl.js';
 import { getTableColumns, getTableIndexes } from './schema.js';
 import { compareFieldDefinition, applyTablePlan } from './apply.js';
-import type { TablePlan } from '../../types.js';
+import type { TablePlan } from '../../types/sync.js';
 import type { SQL } from 'bun';
-import type { FieldDefinition } from 'befly/types/common';
+import type { FieldDefinition } from 'befly-shared/types';
 
 /**
  * 同步表结构（对比和应用变更）
@@ -34,30 +34,30 @@ import type { FieldDefinition } from 'befly/types/common';
  * @param dbName - 数据库名称
  */
 export async function modifyTable(sql: SQL, tableName: string, fields: Record<string, FieldDefinition>, force: boolean = false, dbName?: string): Promise<TablePlan> {
-    const existingColumns = await getTableColumns(sql, tableName, dbName);
-    const existingIndexes = await getTableIndexes(sql, tableName, dbName);
+    const existingColumns = await getTableColumns(sql, tableName, dbName || '');
+    const existingIndexes = await getTableIndexes(sql, tableName, dbName || '');
     let changed = false;
 
-    const addClauses = [];
-    const modifyClauses = [];
-    const defaultClauses = [];
-    const indexActions = [];
+    const addClauses: string[] = [];
+    const modifyClauses: string[] = [];
+    const defaultClauses: string[] = [];
+    const indexActions: Array<{ action: 'create' | 'drop'; indexName: string; fieldName: string }> = [];
 
     for (const [fieldKey, fieldDef] of Object.entries(fields)) {
         // 转换字段名为下划线格式
         const dbFieldName = snakeCase(fieldKey);
 
         if (existingColumns[dbFieldName]) {
-            const comparison = compareFieldDefinition(existingColumns[dbFieldName], fieldDef, dbFieldName);
+            const comparison = compareFieldDefinition(existingColumns[dbFieldName], fieldDef);
             if (comparison.length > 0) {
                 for (const c of comparison) {
                     // 使用统一的日志格式函数和常量标签
-                    const changeLabel = CHANGE_TYPE_LABELS[c.type] || '未知';
+                    const changeLabel = CHANGE_TYPE_LABELS[c.type as keyof typeof CHANGE_TYPE_LABELS] || '未知';
                     logFieldChange(tableName, dbFieldName, c.type, c.current, c.expected, changeLabel);
                 }
 
-                if (isStringOrArrayType(fieldDef.type) && existingColumns[dbFieldName].max) {
-                    if (existingColumns[dbFieldName].max > fieldDef.max) {
+                if (isStringOrArrayType(fieldDef.type) && existingColumns[dbFieldName].max && fieldDef.max !== null) {
+                    if (existingColumns[dbFieldName].max! > fieldDef.max) {
                         if (force) {
                             Logger.warn(`[强制执行] ${tableName}.${dbFieldName} 长度收缩 ${existingColumns[dbFieldName].max} -> ${fieldDef.max}`);
                         } else {
@@ -106,8 +106,8 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
                 // 若不仅仅是默认值变化，继续生成修改子句
                 if (!onlyDefaultChanged) {
                     let skipModify = false;
-                    if (hasLengthChange && isStringOrArrayType(fieldDef.type) && existingColumns[dbFieldName].max) {
-                        const isShrink = existingColumns[dbFieldName].max > fieldDef.max;
+                    if (hasLengthChange && isStringOrArrayType(fieldDef.type) && existingColumns[dbFieldName].max && fieldDef.max !== null) {
+                        const isShrink = existingColumns[dbFieldName].max! > fieldDef.max;
                         if (isShrink && !force) skipModify = true;
                     }
 

package/sync/syncDb/tableCreate.ts

@@ -16,7 +16,7 @@ import { buildSystemColumnDefs, buildBusinessColumnDefs, buildIndexSQL } from '.
 import { getTableIndexes } from './schema.js';
 
 import type { SQL } from 'bun';
-import type { FieldDefinition } from 'befly/types/common';
+import type { FieldDefinition } from 'befly-shared/types';
 
 /**
  * 为 PostgreSQL 表添加列注释
@@ -74,7 +74,7 @@ async function createTableIndexes(sql: SQL, tableName: string, fields: Record<st
     // 获取现有索引（MySQL 不支持 IF NOT EXISTS，需要先检查）
     let existingIndexes: Record<string, string[]> = {};
     if (isMySQL()) {
-        existingIndexes = await getTableIndexes(sql, tableName, dbName);
+        existingIndexes = await getTableIndexes(sql, tableName, dbName || '');
     }
 
     // 系统字段索引

package/sync/syncDb/types.ts

@@ -70,7 +70,7 @@ export function getSqlType(fieldType: string, fieldMax: number | null, unsigned:
  * resolveDefaultValue('admin', 'string') // => 'admin'
  * resolveDefaultValue(0, 'number') // => 0
  */
-export function resolveDefaultValue(fieldDefault: any, fieldType: 'number' | 'string' | 'text' | 'array'): any {
+export function resolveDefaultValue(fieldDefault: any, fieldType: string): any {
     // null 或字符串 'null' 都表示使用类型默认值
     if (fieldDefault !== null && fieldDefault !== 'null') {
         return fieldDefault;
@@ -83,6 +83,8 @@ export function resolveDefaultValue(fieldDefault: any, fieldType: 'number' | 'st
         case 'string':
             return '';
         case 'array':
+        case 'array_string':
+        case 'array_text':
             return '[]';
         case 'text':
             // text 类型不设置默认值，保持 'null'
@@ -104,15 +106,16 @@ export function resolveDefaultValue(fieldDefault: any, fieldType: 'number' | 'st
  * generateDefaultSql('admin', 'string') // => " DEFAULT 'admin'"
  * generateDefaultSql('', 'string') // => " DEFAULT ''"
  * generateDefaultSql('null', 'text') // => ''
+ * generateDefaultSql('[]', 'array_text') // => '' (TEXT 类型不能有默认值)
  */
-export function generateDefaultSql(actualDefault: any, fieldType: 'number' | 'string' | 'text' | 'array'): string {
-    // text 类型不设置默认值
-    if (fieldType === 'text' || actualDefault === 'null') {
+export function generateDefaultSql(actualDefault: any, fieldType: string): string {
+    // text 和 array_text 类型不设置默认值（MySQL TEXT 类型不支持默认值）
+    if (fieldType === 'text' || fieldType === 'array_text' || actualDefault === 'null') {
         return '';
     }
 
-    // 仅 number/string/array 类型设置默认值
-    if (fieldType === 'number' || fieldType === 'string' || fieldType === 'array') {
+    // 仅 number/string/array_string 类型设置默认值
+    if (fieldType === 'number' || fieldType === 'string' || fieldType === 'array_string') {
         if (typeof actualDefault === 'number' && !Number.isNaN(actualDefault)) {
             return ` DEFAULT ${actualDefault}`;
         } else {

package/sync/syncDb.ts

@@ -117,7 +117,7 @@ export async function syncDbCommand(options: SyncDbOptions = {}): Promise<void>
                     applyFieldDefaults(fieldDef);
                 }
 
-                const dbName = beflyConfig.db?.database;
+                const dbName = beflyConfig.db?.database || '';
                 const existsTable = await tableExists(sql!, tableName, dbName);
 
                 // 读取 force 参数

package/sync/syncDev.ts

@@ -7,8 +7,6 @@
  * - 表名: addon_admin_admin
  */
 
-import { scanAddons, getAddonDir, normalizeModuleForSync } from 'befly-shared/addonHelper';
-
 import { Logger } from '../lib/logger.js';
 import { Cipher } from '../lib/cipher.js';
 import { Connect } from '../lib/connect.js';
@@ -17,7 +15,7 @@ import { RedisHelper } from '../lib/redisHelper.js';
 import { CacheHelper } from '../lib/cacheHelper.js';
 import { beflyConfig } from '../befly.config.js';
 
-import type { SyncDevOptions, SyncDevStats } from '../types/index.js';
+import type { SyncDevOptions } from '../types/index.js';
 
 /**
  * SyncDev 命令主函数

package/sync/syncMenu.ts

@@ -243,7 +243,7 @@ async function syncMenus(helper: any, menus: MenuConfig[]): Promise<void> {
 
     for (const menu of menus) {
         try {
-            await syncMenuRecursive(helper, menu, 0, existingMenuMap, 1);
+            await syncMenuRecursive(helper, menu, 0, existingMenuMap);
         } catch (error: any) {
             Logger.error({ err: error, menu: menu.name }, '同步菜单失败');
             throw error;

package/tests/cacheHelper.test.ts

@@ -261,7 +261,7 @@ describe('CacheHelper', () => {
 
     describe('checkRolePermission', () => {
         it('有权限时返回 true', async () => {
-            mockRedis.sismember = mock(() => Promise.resolve(1));
+            mockRedis.sismember = mock(() => Promise.resolve(true));
 
             const result = await cacheHelper.checkRolePermission('admin', 'POST/api/login');
 
@@ -270,7 +270,7 @@ describe('CacheHelper', () => {
         });
 
         it('无权限时返回 false', async () => {
-            mockRedis.sismember = mock(() => Promise.resolve(0));
+            mockRedis.sismember = mock(() => Promise.resolve(false));
 
             const result = await cacheHelper.checkRolePermission('user', 'POST/api/admin/del');
 

package/tests/cipher.test.ts

@@ -219,14 +219,14 @@ describe('Cipher - 快速哈希', () => {
 
     test('快速哈希 - 字符串输入', () => {
         const result = Cipher.fastHash(testData);
-        expect(typeof result).toBe('bigint');
-        expect(result).toBeGreaterThan(0n);
+        expect(typeof result).toBe('number');
+        expect(result).toBeGreaterThan(0);
     });
 
     test('快速哈希 - Uint8Array 输入', () => {
         const bytes = new TextEncoder().encode(testData);
         const result = Cipher.fastHash(bytes);
-        expect(typeof result).toBe('bigint');
+        expect(typeof result).toBe('number');
     });
 
     test('快速哈希 - 相同输入产生相同哈希', () => {
@@ -243,6 +243,6 @@ describe('Cipher - 快速哈希', () => {
 
     test('快速哈希 - 空字符串', () => {
         const result = Cipher.fastHash('');
-        expect(typeof result).toBe('bigint');
+        expect(typeof result).toBe('number');
     });
 });

package/tests/syncDb-types.test.ts

@@ -93,8 +93,12 @@ describe('generateDefaultSql', () => {
         expect(generateDefaultSql('null', 'text')).toBe('');
     });
 
-    test('array 类型生成 JSON 数组默认值', () => {
-        expect(generateDefaultSql('[]', 'array')).toBe(" DEFAULT '[]'");
+    test('array_string 类型生成 JSON 数组默认值', () => {
+        expect(generateDefaultSql('[]', 'array_string')).toBe(" DEFAULT '[]'");
+    });
+
+    test('array_text 类型不生成默认值（MySQL TEXT 不支持）', () => {
+        expect(generateDefaultSql('[]', 'array_text')).toBe('');
     });
 
     test('单引号被正确转义', () => {

package/tsconfig.json

@@ -46,11 +46,10 @@
         "types": ["bun"],
 
         // 路径
-        "baseUrl": ".",
         "paths": {
             "@/*": ["./*"]
         }
     },
     "include": ["**/*.ts", "**/*.js"],
-    "exclude": ["node_modules", "dist", "**/*.test.ts", "**/*.test.js"]
+    "exclude": ["node_modules", "dist", "logs", "temp", "main.single.ts", "**/*.test.ts", "**/*.test.js"]
 }

package/types/befly.d.ts

@@ -142,31 +142,31 @@ export interface BeflyOptions {
 export interface BeflyContext extends KeyValue {
     // ========== 核心插件 ==========
     /** 数据库助手 */
-    db?: DbHelper;
+    db: DbHelper;
 
     /** Redis 助手 */
-    redis?: RedisHelper;
+    redis: RedisHelper;
 
     /** 日志器 */
-    logger?: typeof Logger;
+    logger: typeof Logger;
 
     /** 缓存助手 */
-    cache?: CacheHelper;
+    cache: CacheHelper;
 
     /** 工具函数 */
-    tool?: {
+    tool: {
         Yes: (msg: string, data?: any, other?: Record<string, any>) => { code: 0; msg: string; data: any };
         No: (msg: string, data?: any, other?: Record<string, any>) => { code: 1; msg: string; data: any };
     };
 
     /** 加密解密 */
-    cipher?: typeof Cipher;
+    cipher: typeof Cipher;
 
     /** JWT 令牌 */
-    jwt?: typeof Jwt;
+    jwt: Jwt;
 
     /** 项目配置 */
-    config?: BeflyOptions;
+    config: BeflyOptions;
 
     // ========== 动态插件 ==========
     /** 组件插件：addon_{addonName}_{pluginName} */

package/types/common.d.ts

@@ -3,6 +3,55 @@
  * Core 专用类型，通用类型请直接从 befly-shared/types 导入
  */
 
+import type { SqlValue } from 'befly-shared/types';
+
+// ============================================
+// SQL 查询相关类型
+// ============================================
+
+/**
+ * WHERE 条件操作符
+ */
+export type WhereOperator = '$eq' | '$ne' | '$not' | '$gt' | '$gte' | '$lt' | '$lte' | '$like' | '$notLike' | '$in' | '$notIn' | '$nin' | '$isNull' | '$isNotNull' | '$null' | '$notNull' | '$between' | '$notBetween';
+
+/**
+ * WHERE 条件类型
+ */
+export type WhereConditions = Record<string, any>;
+
+/**
+ * 排序方向
+ */
+export type OrderDirection = 'ASC' | 'DESC';
+
+/**
+ * 排序字段
+ */
+export type OrderByField = string | { field: string; direction: OrderDirection };
+
+/**
+ * SQL 查询结果
+ */
+export interface SqlQuery {
+    sql: string;
+    params: SqlValue[];
+}
+
+/**
+ * 插入数据类型
+ */
+export type InsertData = Record<string, SqlValue> | Record<string, SqlValue>[];
+
+/**
+ * 更新数据类型
+ */
+export type UpdateData = Record<string, SqlValue>;
+
+/**
+ * 任意对象类型
+ */
+export type AnyObject = Record<string, any>;
+
 // ============================================
 // Core 专用类型（不适合放在 shared 中的类型）
 // ============================================

package/types/database.d.ts

@@ -3,15 +3,35 @@
  */
 
 import type { SqlValue } from 'befly-shared/types';
-import type { WhereConditions } from './common';
 import type { DatabaseTables, TableName, TableType, TableInsertType, TableUpdateType, TypedWhereConditions } from './table';
 
-// 重新导出 WhereOperator 和 WhereConditions，供其他模块使用
-export type { WhereOperator, WhereConditions } from './index';
-
 // 重新导出表类型工具
 export type { DatabaseTables, TableName, TableType, TableInsertType, TableUpdateType, SystemFields, BaseTable, InsertType, UpdateType, SelectType, TypedWhereConditions } from './table';
 
+// ============================================
+// SQL 查询相关类型
+// ============================================
+
+/**
+ * WHERE 条件操作符
+ */
+export type WhereOperator = '$eq' | '$ne' | '$not' | '$gt' | '$gte' | '$lt' | '$lte' | '$like' | '$notLike' | '$in' | '$notIn' | '$nin' | '$isNull' | '$isNotNull' | '$null' | '$notNull' | '$between' | '$notBetween';
+
+/**
+ * WHERE 条件类型
+ */
+export type WhereConditions = Record<string, any>;
+
+/**
+ * 排序方向
+ */
+export type OrderDirection = 'ASC' | 'DESC';
+
+/**
+ * 排序字段
+ */
+export type OrderByField = string | { field: string; direction: OrderDirection };
+
 // ============================================
 // 泛型查询选项（类型安全版本）
 // ============================================

package/types/index.ts

@@ -8,12 +8,17 @@
 export * from './api.js';
 export * from './befly.js';
 export * from './cache.js';
-export * from './common.js';
 export * from './context.js';
-export * from './database.js';
 export * from './hook.js';
 export * from './plugin.js';
 export * from './redis.js';
 export * from './table.js';
-export * from './validator.js';
-export * from './sync.js';
+
+// common.js 包含基础类型
+export * from './common.js';
+
+// database.js 中除了与 common.js 重复的类型外，其他都导出
+export type { TypedQueryOptions, TypedInsertOptions, TypedUpdateOptions, TypedDeleteOptions, QueryOptions, InsertOptions, UpdateOptions, DeleteOptions, ListResult, TransactionCallback, DbType, ColumnInfo, IndexInfo } from './database.js';
+
+// sync.js 中不重复的类型
+export type { SyncDbOptions, SyncOptions, SyncMenuOptions, MenuConfig, SyncDevOptions, SyncApiOptions, ApiInfo, SyncMenuStats, SyncApiStats, GlobalStats, PhaseStats, SyncReport, SyncReportMeta, DatabaseReport, ApiReport, MenuReport } from './sync.js';

package/types/plugin.d.ts

@@ -15,6 +15,11 @@ export type PluginInitFunction = (befly: BeflyContext) => Promise<any> | any;
  */
 export type Next = () => Promise<void>;
 
+/**
+ * 插件请求钩子类型
+ */
+export type PluginRequestHook = (ctx: RequestContext, next: Next) => Promise<void> | void;
+
 /**
  * 插件配置类型
  */

package/types/sync.d.ts

@@ -101,6 +101,7 @@ export interface ColumnInfo {
     type: string;
     columnType: string;
     length: number | null;
+    max?: number | null;
     nullable: boolean;
     defaultValue: any;
     comment: string | null;
@@ -117,7 +118,7 @@ export interface IndexInfo {
  * 字段变更接口
  */
 export interface FieldChange {
-    type: 'length' | 'datatype' | 'comment' | 'default';
+    type: 'length' | 'datatype' | 'comment' | 'default' | 'nullable';
     current: any;
     expected: any;
 }