befly 3.14.2 → 3.15.0

package/dist/types/befly.d.ts

@@ -3,7 +3,8 @@
  */
 import type { CacheHelper } from "./cache";
 import type { CipherStatic } from "./cipher";
-import type { KeyValue } from "./common";
+import type { JsonValue } from "./common";
+import type { RequestContext } from "./context";
 import type { DbHelper } from "./database";
 import type { Jwt } from "./jwt";
 import type { Logger, LoggerConfig } from "./logger";
@@ -161,15 +162,15 @@ export interface BeflyOptions {
      * Addon 运行时配置
      * 按 addon 名称分组，如 addons.admin.email
      */
-    addons?: Record<string, Record<string, any>>;
+    addons?: Record<string, Record<string, JsonValue | undefined>>;
     /** 其他插件配置 */
-    [key: string]: any;
+    [key: string]: unknown;
 }
 /**
  * Befly 应用上下文
  * 包含所有插件挂载的实例
  */
-export interface BeflyContext extends KeyValue {
+export interface BeflyContext {
     /** 数据库助手 */
     db: DbHelper;
     /** Redis 助手 */
@@ -180,16 +181,21 @@ export interface BeflyContext extends KeyValue {
     cache: CacheHelper;
     /** 工具函数 */
     tool: {
-        Yes: (msg: string, data?: any, other?: Record<string, any>) => {
+        Yes: <TData extends JsonValue = JsonValue, TOther extends Record<string, JsonValue | undefined> = Record<string, JsonValue | undefined>>(msg: string, data?: TData, other?: TOther) => {
             code: 0;
             msg: string;
-            data: any;
-        };
-        No: (msg: string, data?: any, other?: Record<string, any>) => {
+            data: TData;
+        } & TOther;
+        No: <TData extends JsonValue = JsonValue, TOther extends Record<string, JsonValue | undefined> = Record<string, JsonValue | undefined>>(msg: string, data?: TData, other?: TOther) => {
             code: 1;
             msg: string;
-            data: any;
-        };
+            data: TData;
+        } & TOther;
+        Raw: (ctx: RequestContext, data: JsonValue | string, options?: {
+            status?: number;
+            contentType?: string;
+            headers?: Record<string, string>;
+        }) => Response;
     };
     /** 加密解密 */
     cipher: CipherStatic;
@@ -201,7 +207,7 @@ export interface BeflyContext extends KeyValue {
     env: BeflyRuntimeEnv;
     /** 组件插件：addon_{addonName}_{pluginName} */
     /** 项目插件：app_{pluginName} */
-    [key: string]: any;
+    [key: string]: unknown;
 }
 /**
  * Validator 静态类（注入到 ctx 的用法）

package/dist/types/common.d.ts

@@ -2,14 +2,22 @@
  * Befly 框架通用类型定义
  * 框架核心通用类型定义
  */
+/**
+ * JSON 可序列化值（用于对外类型的兜底数据类型）
+ */
+export type JsonPrimitive = string | number | boolean | null;
+export interface JsonObject {
+    [key: string]: JsonValue | undefined;
+}
+export type JsonValue = JsonPrimitive | JsonObject | JsonValue[];
 /**
  * SQL 值类型
  */
-export type SqlValue = string | number | boolean | null | Date | Record<string, unknown> | unknown[];
+export type SqlValue = string | number | boolean | null | Date | JsonObject | JsonValue[];
 /**
  * 通用键值对类型
  */
-export type KeyValue<T = unknown> = Record<string, T>;
+export type KeyValue<T = JsonValue> = Record<string, T>;
 /**
  * WHERE 条件操作符
  */
@@ -17,7 +25,16 @@ export type WhereOperator = "$eq" | "$ne" | "$not" | "$gt" | "$gte" | "$lt" | "$
 /**
  * WHERE 条件类型
  */
-export type WhereConditions = Record<string, unknown>;
+export interface WhereOperatorObject {
+    [op: string]: SqlValue | SqlValue[] | undefined;
+}
+export type WhereFieldValue = SqlValue | SqlValue[] | WhereOperatorObject | WhereConditions;
+export type WhereEntryValue = WhereFieldValue | WhereConditions[];
+export interface WhereConditions {
+    $and?: WhereConditions[];
+    $or?: WhereConditions[];
+    [key: string]: WhereEntryValue | undefined;
+}
 /**
  * 排序方向
  */
@@ -47,7 +64,7 @@ export type UpdateData = Record<string, SqlValue>;
 /**
  * 任意对象类型
  */
-export type AnyObject = Record<string, unknown>;
+export type AnyObject = JsonObject;
 /**
  * 字段规则字符串（已废弃，保留用于兼容）
  * 格式: "字段名|类型|最小值|最大值|默认值|是否索引|正则约束"
@@ -68,7 +85,7 @@ export interface ParsedFieldRule {
     type: "string" | "number" | "text" | "array_string" | "array_text";
     min: number | null;
     max: number | null;
-    default: unknown;
+    default: JsonValue | null;
     index: 0 | 1;
     regex: string | null;
 }
@@ -95,7 +112,7 @@ export interface JoinOption {
 /**
  * 工具函数返回类型
  */
-export interface ToolResponse<T = unknown> {
+export interface ToolResponse<T = JsonValue> {
     success: boolean;
     data?: T;
     error?: string;

package/dist/types/context.d.ts

@@ -2,16 +2,20 @@
  * 请求上下文类型定义
  */
 import type { ApiRoute } from "./api";
+import type { JsonValue } from "./common";
+import type { JwtPayload } from "./jwt";
+export type RequestUser = Partial<JwtPayload>;
+export type RequestResult = Response | JsonValue;
 /**
  * 请求上下文接口
  */
-export interface RequestContext<TBody = Record<string, any>> {
+export interface RequestContext<TBody = Record<string, JsonValue>> {
     /** 请求方法 (GET/POST) */
     method: string;
     /** 请求体参数 */
     body: TBody;
     /** 用户信息 */
-    user: Record<string, any>;
+    user: RequestUser;
     /** 原始请求对象 */
     req: Request;
     /** 请求开始时间（毫秒） */
@@ -31,5 +35,5 @@ export interface RequestContext<TBody = Record<string, any>> {
     /** 响应对象（如果设置了此属性，将直接返回该响应） */
     response?: Response;
     /** 原始处理结果（未转换为 Response 对象前） */
-    result?: any;
+    result?: RequestResult;
 }

package/dist/types/database.d.ts

@@ -2,6 +2,19 @@
  * 数据库操作相关类型定义
  */
 import type { JoinOption, SqlValue, WhereConditions } from "./common";
+/**
+ * 表名到行类型的映射（项目侧可通过 declaration merging 扩展）。
+ *
+ * 用法（项目侧）：
+ * declare module "befly/types/database" {
+ *   interface DbRowMap {
+ *     user: { id: number; nickname?: string };
+ *   }
+ * }
+ */
+export interface DbRowMap {
+}
+export type DbTableName = keyof DbRowMap & string;
 /**
  * 数据库类型
  */
@@ -63,7 +76,7 @@ export interface DeleteOptions {
  */
 export interface SqlInfo {
     sql: string;
-    params: unknown[];
+    params: SqlValue[];
     duration: number;
 }
 /**
@@ -76,14 +89,15 @@ export interface ListSql {
 /**
  * 统一返回结构
  */
-export type DbResult<TData = unknown, TSql = SqlInfo> = {
+export type DbUnknownRow = Record<string, SqlValue>;
+export type DbResult<TData = DbUnknownRow, TSql = SqlInfo> = {
     data: TData;
     sql: TSql;
 };
 /**
  * 分页结果
  */
-export interface DbPageResult<TItem = unknown> {
+export interface DbPageResult<TItem = DbUnknownRow> {
     lists: TItem[];
     total: number;
     page: number;
@@ -93,14 +107,14 @@ export interface DbPageResult<TItem = unknown> {
 /**
  * 不分页结果（带 total）
  */
-export interface DbListResult<TItem = unknown> {
+export interface DbListResult<TItem = DbUnknownRow> {
     lists: TItem[];
     total: number;
 }
 /**
  * 事务回调
  */
-export type TransactionCallback<TResult = unknown, TDb = unknown> = (db: TDb) => Promise<TResult>;
+export type TransactionCallback<TResult = void, TDb = DbHelper> = (db: TDb) => Promise<TResult>;
 /**
  * DbHelper 公开接口（类型层）。
  *
@@ -109,13 +123,35 @@ export type TransactionCallback<TResult = unknown, TDb = unknown> = (db: TDb) =>
  */
 export interface DbHelper {
     tableExists(tableName: string): Promise<DbResult<boolean>>;
+    getCount<TTable extends DbTableName>(options: Omit<QueryOptions, "fields" | "page" | "limit" | "orderBy" | "table"> & {
+        table: TTable;
+    }): Promise<DbResult<number>>;
     getCount(options: Omit<QueryOptions, "fields" | "page" | "limit" | "orderBy">): Promise<DbResult<number>>;
-    getOne<TItem = unknown>(options: QueryOptions): Promise<DbResult<TItem>>;
-    getDetail<TItem = unknown>(options: QueryOptions): Promise<DbResult<TItem>>;
-    getList<TItem = unknown>(options: QueryOptions): Promise<DbResult<DbPageResult<TItem>, ListSql>>;
-    getAll<TItem = unknown>(options: Omit<QueryOptions, "page" | "limit">): Promise<DbResult<DbListResult<TItem>, ListSql>>;
+    getOne<TTable extends DbTableName>(options: Omit<QueryOptions, "table"> & {
+        table: TTable;
+    }): Promise<DbResult<DbRowMap[TTable]>>;
+    getOne<TItem = DbUnknownRow>(options: QueryOptions): Promise<DbResult<TItem>>;
+    getDetail<TTable extends DbTableName>(options: Omit<QueryOptions, "table"> & {
+        table: TTable;
+    }): Promise<DbResult<DbRowMap[TTable]>>;
+    getDetail<TItem = DbUnknownRow>(options: QueryOptions): Promise<DbResult<TItem>>;
+    getList<TTable extends DbTableName>(options: Omit<QueryOptions, "table"> & {
+        table: TTable;
+    }): Promise<DbResult<DbPageResult<DbRowMap[TTable]>, ListSql>>;
+    getList<TItem = DbUnknownRow>(options: QueryOptions): Promise<DbResult<DbPageResult<TItem>, ListSql>>;
+    getAll<TTable extends DbTableName>(options: Omit<QueryOptions, "table" | "page" | "limit"> & {
+        table: TTable;
+    }): Promise<DbResult<DbListResult<DbRowMap[TTable]>, ListSql>>;
+    getAll<TItem = DbUnknownRow>(options: Omit<QueryOptions, "page" | "limit">): Promise<DbResult<DbListResult<TItem>, ListSql>>;
+    exists<TTable extends DbTableName>(options: Omit<QueryOptions, "fields" | "orderBy" | "page" | "limit" | "table"> & {
+        table: TTable;
+    }): Promise<DbResult<boolean>>;
     exists(options: Omit<QueryOptions, "fields" | "orderBy" | "page" | "limit">): Promise<DbResult<boolean>>;
-    getFieldValue<TValue = unknown>(options: Omit<QueryOptions, "fields"> & {
+    getFieldValue<TTable extends DbTableName, TField extends keyof DbRowMap[TTable] & string>(options: Omit<QueryOptions, "fields" | "table"> & {
+        table: TTable;
+        field: TField;
+    }): Promise<DbResult<DbRowMap[TTable][TField] | null>>;
+    getFieldValue<TValue = SqlValue>(options: Omit<QueryOptions, "fields"> & {
         field: string;
     }): Promise<DbResult<TValue | null>>;
     insData<TInsert extends Record<string, SqlValue> = Record<string, SqlValue>>(options: Omit<InsertOptions, "data"> & {
@@ -125,17 +161,16 @@ export interface DbHelper {
     updData(options: UpdateOptions): Promise<DbResult<number>>;
     updBatch(table: string, dataList: Array<{
         id: number;
-        data: Record<string, unknown>;
+        data: Record<string, SqlValue>;
     }>): Promise<DbResult<number>>;
     delData(options: DeleteOptions): Promise<DbResult<number>>;
     delForce(options: Omit<DeleteOptions, "hard">): Promise<DbResult<number>>;
     delForceBatch(table: string, ids: number[]): Promise<DbResult<number>>;
     enableData(options: Omit<DeleteOptions, "hard">): Promise<DbResult<number>>;
     disableData(options: Omit<DeleteOptions, "hard">): Promise<DbResult<number>>;
-    query<TResult = unknown>(sql: string, params?: unknown[]): Promise<DbResult<TResult>>;
-    unsafe<TResult = unknown>(sqlStr: string, params?: unknown[]): Promise<DbResult<TResult>>;
-    trans<TResult = unknown>(callback: TransactionCallback<TResult, DbHelper>): Promise<TResult>;
+    query<TResult = DbUnknownRow[]>(sql: string, params?: SqlValue[]): Promise<DbResult<TResult>>;
+    unsafe<TResult = DbUnknownRow[]>(sqlStr: string, params?: SqlValue[]): Promise<DbResult<TResult>>;
+    trans<TResult = void>(callback: TransactionCallback<TResult, DbHelper>): Promise<TResult>;
     increment(table: string, field: string, where: WhereConditions, value?: number): Promise<DbResult<number>>;
     decrement(table: string, field: string, where: WhereConditions, value?: number): Promise<DbResult<number>>;
-    [key: string]: unknown;
 }

package/dist/types/jwt.d.ts

@@ -1,6 +1,7 @@
 /**
  * JWT 相关类型定义
  */
+import type { JsonValue } from "./common";
 /**
  * JWT Payload 类型
  */
@@ -18,7 +19,7 @@ export interface JwtPayload {
     /** 签发时间 */
     iat?: number;
     /** 其他字段 */
-    [key: string]: any;
+    [key: string]: JsonValue | undefined;
 }
 /**
  * JWT header（最常用字段）
@@ -27,7 +28,7 @@ export interface JwtHeader {
     alg?: string;
     typ?: string;
     kid?: string;
-    [key: string]: any;
+    [key: string]: JsonValue | undefined;
 }
 /**
  * sign() 选项（映射 fast-jwt 的 signer 参数）

package/dist/types/logger.d.ts

@@ -3,6 +3,7 @@
  *
  * 说明：这里的类型需要与 core/runtime 的 logger 实现保持一致（大量配置项以 0/1 表示开关）。
  */
+import type { JsonValue } from "./common";
 export type LoggerFlag = 0 | 1;
 /**
  * Logger 插件配置
@@ -32,14 +33,30 @@ export interface LoggerConfig {
     excludeFields?: string[];
 }
 export type LogLevelName = "debug" | "info" | "warn" | "error";
+/**
+ * LoggerRecord 允许出现的值类型。
+ * - JsonValue：可序列化数据
+ * - Error：允许直接传入错误对象（运行时会清洗成可序列化结构）
+ * - object：允许传入非 plain object（如 Date/Map/Set/自定义 class 实例），由运行时做安全预览/截断
+ */
+export type LoggerRecordValue = JsonValue | Error | object;
 export type LoggerRecord = {
     /** 文本消息（推荐直接放在 record 里） */
     msg?: string;
     /** 错误对象（会在运行时被清洗为可序列化结构） */
-    err?: unknown;
+    err?: Error | JsonValue;
     /** 其他自定义字段 */
-    [key: string]: unknown;
+    [key: string]: LoggerRecordValue | undefined;
 };
+/**
+ * Logger 的可替换 sink（用于测试 mock）。
+ */
+export interface LoggerSink {
+    info(record: LoggerRecord): void;
+    warn(record: LoggerRecord): void;
+    error(record: LoggerRecord): void;
+    debug(record: LoggerRecord): void;
+}
 /**
  * Logger 接口（类型层）。
  *
@@ -52,12 +69,12 @@ export interface Logger {
      * - plain object（{}）会作为 record 写入
      * - 其他任何类型会被包装成对象后写入（例如 { msg: "..." } 或 { value: ... }）
      */
-    info(input: unknown): any;
-    warn(input: unknown): any;
-    error(input: unknown): any;
-    debug(input: unknown): any;
+    info(input: unknown): void;
+    warn(input: unknown): void;
+    error(input: unknown): void;
+    debug(input: unknown): void;
     configure(cfg: LoggerConfig): void;
-    setMock(mock: any | null): void;
+    setMock(mock: LoggerSink | null): void;
     /**
      * 将当前 buffer 尽快刷入 sink（不会关闭文件句柄）。
      *

package/dist/types/sync.d.ts

@@ -2,7 +2,7 @@
  * 数据同步相关类型定义
  */
 import type { BeflyContext } from "./befly";
-import type { KeyValue } from "./common";
+import type { JsonValue, KeyValue } from "./common";
 /**
  * 同步结果
  */
@@ -27,7 +27,7 @@ export interface SyncOptions {
     /** 同步批次大小 */
     batchSize?: number;
     /** 其他选项 */
-    [key: string]: any;
+    [key: string]: JsonValue | undefined;
 }
 /**
  * 同步器接口
@@ -54,7 +54,7 @@ export interface MenuConfig {
     sort?: number;
     parentPath?: string;
     children?: MenuConfig[];
-    [key: string]: any;
+    [key: string]: JsonValue | undefined;
 }
 export interface SyncApiItem {
     type?: "api" | string;
@@ -64,7 +64,7 @@ export interface SyncApiItem {
     path: string;
     parentPath: string;
     addonName: string;
-    [key: string]: any;
+    [key: string]: JsonValue | undefined;
 }
 export interface ColumnInfo {
     type: string;
@@ -72,14 +72,14 @@ export interface ColumnInfo {
     length: number | null;
     max: number | null;
     nullable: boolean;
-    defaultValue: any;
+    defaultValue: JsonValue;
     comment: string | null;
 }
 export type IndexInfo = Record<string, string[]>;
 export interface FieldChange {
     type: string;
-    current: any;
-    expected: any;
+    current: JsonValue;
+    expected: JsonValue;
 }
 export interface TablePlan {
     changed: boolean;

package/dist/types/validate.d.ts

@@ -1,6 +1,7 @@
 /**
  * 数据验证相关类型定义
  */
+import type { JsonValue } from "./common";
 /**
  * 字段类型
  */
@@ -27,7 +28,7 @@ export interface FieldDefinition {
      * 默认值。
      * - 缺省默认：null（表示字段未提供默认值）
      */
-    default?: any;
+    default?: JsonValue | null;
     /**
      * 字段描述。
      * - 缺省默认：""（空字符串）
@@ -78,7 +79,7 @@ export interface ValidateResult {
  * single(value, fieldDef) 的返回结构
  */
 export interface SingleResult {
-    value: any;
+    value: JsonValue | null;
     error: string | null;
 }
 /**
@@ -89,6 +90,13 @@ export interface SingleResult {
  * - `Validator.single(value, fieldDef)`
  */
 export interface ValidatorStatic {
-    validate(data: Record<string, any>, rules: TableDefinition, required?: string[]): ValidateResult;
-    single(value: any, fieldDef: FieldDefinition): SingleResult;
+    /**
+     * 推荐签名：正常业务使用。
+     */
+    validate(data: Record<string, JsonValue>, rules: TableDefinition, required?: string[]): ValidateResult;
+    /**
+     * 宽签名：用于边界输入（例如测试传入非法参数）——实现内部会做运行时校验。
+     */
+    validate(data: unknown, rules: unknown, required?: string[]): ValidateResult;
+    single(value: unknown, fieldDef: FieldDefinition): SingleResult;
 }

package/dist/utils/convertBigIntFields.d.ts

@@ -8,4 +8,5 @@
  * 2. 所有以 'Id' 或 '_id' 结尾的字段会被自动转换
  * 3. 所有以 'At' 或 '_at' 结尾的字段会被自动转换（时间戳字段）
  */
-export declare function convertBigIntFields<T = any>(arr: Record<string, any>[], fields?: string[]): T[];
+export declare function convertBigIntFields<T extends Record<string, unknown> = Record<string, unknown>>(arr: T[], fields?: readonly string[]): T[];
+export declare function convertBigIntFields<T>(arr: T, fields?: readonly string[]): T;

package/dist/utils/convertBigIntFields.js

@@ -1,20 +1,11 @@
-/**
- * 转换数据库 BIGINT 字段为数字类型
- *
- * 当 bigint: false 时，Bun SQL 会将大于 u32 的 BIGINT 返回为字符串，此方法将其转换为 number。
- *
- * 转换规则：
- * 1. 白名单中的字段会被转换
- * 2. 所有以 'Id' 或 '_id' 结尾的字段会被自动转换
- * 3. 所有以 'At' 或 '_at' 结尾的字段会被自动转换（时间戳字段）
- */
 export function convertBigIntFields(arr, fields = ["id", "pid", "sort"]) {
     if (!arr || !Array.isArray(arr)) {
         return arr;
     }
     return arr.map((item) => {
+        const source = item;
         const converted = {};
-        for (const [key, value] of Object.entries(item)) {
+        for (const [key, value] of Object.entries(source)) {
             converted[key] = value;
         }
         for (const [key, value] of Object.entries(converted)) {
@@ -24,7 +15,7 @@ export function convertBigIntFields(arr, fields = ["id", "pid", "sort"]) {
             const shouldConvert = fields.includes(key) || key.endsWith("Id") || key.endsWith("_id") || key.endsWith("At") || key.endsWith("_at");
             if (shouldConvert && typeof value === "string") {
                 const num = Number(value);
-                if (!isNaN(num)) {
+                if (!Number.isNaN(num)) {
                     converted[key] = num;
                 }
             }

package/dist/utils/isDirentDirectory.d.ts

@@ -1,2 +1,3 @@
 import type { Dirent } from "node:fs";
-export declare const isDirentDirectory: (parentDir: string, entry: Dirent<string>) => boolean;
+export type DirentLike = Pick<Dirent, "name" | "isDirectory" | "isSymbolicLink">;
+export declare const isDirentDirectory: (parentDir: string, entry: DirentLike) => boolean;

package/dist/utils/loadMenuConfigs.d.ts

@@ -4,7 +4,7 @@ type ViewDirMeta = {
     title: string;
     order?: number;
 };
-export declare function normalizeViewDirMeta(input: any): ViewDirMeta | null;
+export declare function normalizeViewDirMeta(input: unknown): ViewDirMeta | null;
 export declare function scanViewsDirToMenuConfigs(viewsDir: string, prefix: string, parentPath?: string): Promise<MenuConfig[]>;
 export declare function getParentPath(path: string): string;
 export declare function loadMenuConfigs(addons: AddonInfo[]): Promise<MenuConfig[]>;

package/dist/utils/loadMenuConfigs.js

@@ -8,12 +8,20 @@ export function normalizeViewDirMeta(input) {
     if (!input || typeof input !== "object") {
         return null;
     }
-    if (typeof input.title !== "string" || !input.title) {
+    const record = input;
+    const title = record["title"];
+    if (typeof title !== "string" || !title) {
         return null;
     }
-    const order = typeof input.order === "number" && Number.isFinite(input.order) && Number.isInteger(input.order) && input.order >= 0 ? input.order : undefined;
+    const orderRaw = record["order"];
+    const order = typeof orderRaw === "number" && Number.isFinite(orderRaw) && Number.isInteger(orderRaw) && orderRaw >= 0 ? orderRaw : undefined;
+    if (order === undefined) {
+        return {
+            title: title
+        };
+    }
     return {
-        title: input.title,
+        title: title,
         order: order
     };
 }

package/dist/utils/mergeAndConcat.d.ts

@@ -4,4 +4,4 @@
  * - plain object 深合并
  * - array 与 array 合并为新数组（保持输入不被污染）
  */
-export declare function mergeAndConcat(...items: any[]): any;
+export declare function mergeAndConcat<T>(...items: unknown[]): T;

package/dist/utils/mergeAndConcat.js

@@ -9,8 +9,9 @@ function cloneDeepLoose(value) {
     }
     if (isPlainObject(value)) {
         const out = {};
-        for (const key of Object.keys(value)) {
-            out[key] = cloneDeepLoose(value[key]);
+        const record = value;
+        for (const key of Object.keys(record)) {
+            out[key] = cloneDeepLoose(record[key]);
         }
         return out;
     }
@@ -21,18 +22,28 @@ function mergeInto(target, source) {
         return target;
     }
     if (Array.isArray(target) && Array.isArray(source)) {
+        const nextArr = [];
+        for (const item of target) {
+            nextArr.push(cloneDeepLoose(item));
+        }
         for (const item of source) {
-            target.push(cloneDeepLoose(item));
+            nextArr.push(cloneDeepLoose(item));
         }
-        return target;
+        return nextArr;
     }
     if (isPlainObject(target) && isPlainObject(source)) {
-        for (const key of Object.keys(source)) {
-            const srcVal = source[key];
+        const targetRecord = target;
+        const sourceRecord = source;
+        const out = {};
+        for (const key of Object.keys(targetRecord)) {
+            out[key] = cloneDeepLoose(targetRecord[key]);
+        }
+        for (const key of Object.keys(sourceRecord)) {
+            const srcVal = sourceRecord[key];
             if (srcVal === undefined) {
                 continue;
             }
-            const curVal = target[key];
+            const curVal = out[key];
             if (Array.isArray(curVal) && Array.isArray(srcVal)) {
                 const nextArr = [];
                 for (const item of curVal) {
@@ -41,25 +52,19 @@ function mergeInto(target, source) {
                 for (const item of srcVal) {
                     nextArr.push(cloneDeepLoose(item));
                 }
-                target[key] = nextArr;
+                out[key] = nextArr;
                 continue;
             }
             if (isPlainObject(curVal) && isPlainObject(srcVal)) {
-                target[key] = mergeInto(cloneDeepLoose(curVal), srcVal);
+                out[key] = mergeInto(cloneDeepLoose(curVal), srcVal);
                 continue;
             }
-            target[key] = cloneDeepLoose(srcVal);
+            out[key] = cloneDeepLoose(srcVal);
         }
-        return target;
+        return out;
     }
     return cloneDeepLoose(source);
 }
-/**
- * 深度合并对象，并对数组执行 concat（保持 scanConfig 现有语义）。
- * - undefined 会被忽略
- * - plain object 深合并
- * - array 与 array 合并为新数组（保持输入不被污染）
- */
 export function mergeAndConcat(...items) {
     let acc = {};
     for (const item of items) {

package/dist/utils/normalizeFieldDefinition.d.ts

@@ -1,3 +1,4 @@
+import type { JsonValue } from "../types/common";
 import type { FieldDefinition } from "../types/validate";
 export type NormalizedFieldDefinition = {
     name: string;
@@ -5,7 +6,7 @@ export type NormalizedFieldDefinition = {
     detail: string;
     min: number | null;
     max: number | null;
-    default: any | null;
+    default: JsonValue | null;
     index: boolean;
     unique: boolean;
     nullable: boolean;