befly 3.24.10 → 3.24.11

package/apis/admin/cacheRefresh.js

@@ -23,7 +23,7 @@ export default {
     auth: true,
     fields: {},
     required: [],
-    handler: async (befly, _ctx) => {
+    handler: async (befly) => {
         try {
             const results = {
                 apis: { success: false, count: 0 },

package/apis/menu/select.js

@@ -10,7 +10,7 @@ export default {
         state: { name: "状态", input: "integer", min: 0, max: 2 }
     },
     required: [],
-    handler: async (befly, _ctx) => {
+    handler: async (befly) => {
         try {
             const menus = await befly.mysql.getAll({
                 table: "beflyMenu"

package/apis/role/select.js

@@ -10,7 +10,7 @@ export default {
         state: { name: "状态", input: "integer", min: 0, max: 2 }
     },
     required: [],
-    handler: async (befly, _ctx) => {
+    handler: async (befly) => {
         const roles = await befly.mysql.getList({
             limit: 30,
             table: "beflyRole",

package/index.js

@@ -235,11 +235,6 @@ export class Befly {
             Logger.info(`服务器监听地址: ${server.url}`);
             Logger.info(`Mysql 数据库地址：${this.context.config.mysql.hostname}`);
             Logger.info(`Redis 缓存地址：${this.context.config.redis.hostname}`);
-            console.log(`${this.context.config.appName} 启动成功!`);
-            console.log(`服务器启动耗时: ${finalStartupTime}`);
-            console.log(`服务器监听地址: ${server.url}`);
-            console.log(`Mysql 数据库地址：${this.context.config.mysql.hostname}`);
-            console.log(`Redis 缓存地址：${this.context.config.redis.hostname}`);
             // 注意：作为库代码，这里不注册 SIGINT/SIGTERM 处理器，也不调用 process.exit。
             // 宿主应用应自行处理信号并决定退出策略（包括是否调用 server.stop / Connect.disconnect / Logger.flush）。
             return server;

package/lib/dbHelper.js

@@ -435,14 +435,14 @@ class DbHelper {
         return normalizeBigIntValues(deserializedList);
     }
 
-    _prepareWriteInputData(data) {
+    prepareWriteInputData(data) {
         return serializeArrayFields(keysToSnake(fieldClear(data, { excludeValues: [null, undefined] })));
     }
 
-    _prepareWriteUserData(data, allowState) {
+    prepareWriteUserData(data, allowState) {
         const result = {};
 
-        for (const [key, value] of Object.entries(this._prepareWriteInputData(data))) {
+        for (const [key, value] of Object.entries(this.prepareWriteInputData(data))) {
             if (key === "id") continue;
             if (key === "created_at") continue;
             if (key === "updated_at") continue;
@@ -454,8 +454,8 @@ class DbHelper {
         return result;
     }
 
-    _buildInsertRow(options) {
-        const result = options.beflyMode === "manual" ? this._prepareWriteInputData(options.data) : this._prepareWriteUserData(options.data, false);
+    buildInsertRow(options) {
+        const result = options.beflyMode === "manual" ? this.prepareWriteInputData(options.data) : this.prepareWriteUserData(options.data, false);
 
         if (options.beflyMode === "auto") {
             assertTimeIdValue(options.id);
@@ -471,8 +471,8 @@ class DbHelper {
         return result;
     }
 
-    _buildUpdateRow(options) {
-        const result = options.beflyMode === "manual" ? this._prepareWriteInputData(options.data) : this._prepareWriteUserData(options.data, options.allowState);
+    buildUpdateRow(options) {
+        const result = options.beflyMode === "manual" ? this.prepareWriteInputData(options.data) : this.prepareWriteUserData(options.data, options.allowState);
         if (options.beflyMode !== "manual") {
             result.updated_at = options.now;
         }
@@ -508,7 +508,7 @@ class DbHelper {
             return {
                 ids: [],
                 processedList: dataList.map((data) =>
-                    this._buildInsertRow({
+                    this.buildInsertRow({
                         data: data,
                         now: now,
                         beflyMode: this.beflyMode
@@ -541,7 +541,7 @@ class DbHelper {
                 assertGeneratedBatchId(id, snakeTable, index);
             }
 
-            return this._buildInsertRow({
+            return this.buildInsertRow({
                 data: data,
                 id: id,
                 now: now,
@@ -744,7 +744,7 @@ class DbHelper {
     async insData(options) {
         const parsed = this.createDbParse().parseInsert(options);
         const { table, snakeTable, data } = parsed;
-        const inputData = this._prepareWriteInputData(data);
+        const inputData = this.prepareWriteInputData(data);
         assertWriteDataHasFields(inputData, "插入数据必须至少有一个字段", snakeTable);
         const now = Date.now();
         const insertRows = await this.createInsertRows(table, snakeTable, [data], now);
@@ -857,7 +857,7 @@ class DbHelper {
         const fieldSet = new Set();
 
         for (const item of dataList) {
-            const userData = this._prepareWriteUserData(item.data, true);
+            const userData = this.prepareWriteUserData(item.data, true);
 
             for (const key of Object.keys(userData)) {
                 fieldSet.add(key);
@@ -896,10 +896,10 @@ class DbHelper {
 
     async updData(options) {
         const parsed = this.createDbParse().parseUpdate(options);
-        const inputData = this._prepareWriteInputData(parsed.data);
+        const inputData = this.prepareWriteInputData(parsed.data);
         assertWriteDataHasFields(inputData, "更新数据必须至少有一个字段", parsed.snakeTable);
 
-        const processed = this._buildUpdateRow({
+        const processed = this.buildUpdateRow({
             data: parsed.data,
             now: Date.now(),
             allowState: true,
@@ -922,7 +922,7 @@ class DbHelper {
         let processed;
 
         if (parsed.deleteMode === "manual") {
-            processed = this._prepareWriteInputData(parsed.data);
+            processed = this.prepareWriteInputData(parsed.data);
             assertWriteDataHasFields(processed, "delData 在 beflyMode=manual 时 data 必须至少有一个字段", parsed.snakeTable);
         } else {
             const now = Date.now();

package/lib/dbParse.js

@@ -805,9 +805,9 @@ export class DbParse {
 
         let prepared;
         if (hasLeftJoin) {
-            prepared = await this._normalizeLeftJoinReadOptions(options, cleanWhere, classifiedFields);
+            prepared = await this.normalizeLeftJoinReadOptions(options, cleanWhere, classifiedFields);
         } else {
-            prepared = await this._normalizeSingleTableReadOptions(options, cleanWhere, classifiedFields);
+            prepared = await this.normalizeSingleTableReadOptions(options, cleanWhere, classifiedFields);
         }
 
         if (mode === "list") {
@@ -823,7 +823,7 @@ export class DbParse {
         const hasLeftJoin = Array.isArray(options.leftJoin) && options.leftJoin.length > 0;
 
         if (hasLeftJoin) {
-            return this._normalizeLeftJoinCountOptions(options, cleanWhere);
+            return this.normalizeLeftJoinCountOptions(options, cleanWhere);
         }
 
         const snakeTable = snakeCase(Array.isArray(options.table) ? options.table[0] : options.table);
@@ -841,7 +841,7 @@ export class DbParse {
 
     parseExists(options) {
         validateNoLeftJoinReadOptions(options, "exists", "exists 不支持 leftJoin（请使用显式 query 或拆分查询）");
-        return this._prepareSingleTableWhere(options.table, options.where, true, false, "exists");
+        return this.prepareSingleTableWhere(options.table, options.where, true, false, "exists");
     }
 
     parseInsert(options) {
@@ -871,7 +871,7 @@ export class DbParse {
         return {
             table: options.table,
             snakeTable: snakeCase(options.table),
-            where: this._prepareSingleTableWhere(options.table, options.where, true, true, "updData").where,
+            where: this.prepareSingleTableWhere(options.table, options.where, true, true, "updData").where,
             data: options.data
         };
     }
@@ -884,7 +884,7 @@ export class DbParse {
         const result = {
             table: options.table,
             snakeTable: snakeCase(options.table),
-            where: this._prepareSingleTableWhere(options.table, options.where, !force, true, label, deleteMode).where,
+            where: this.prepareSingleTableWhere(options.table, options.where, !force, true, label, deleteMode).where,
             deleteMode: deleteMode
         };
 
@@ -923,7 +923,7 @@ export class DbParse {
 
     parseIncrement(table, field, where, value, label = "increment") {
         validateIncrementOptions(table, field, where, value, label);
-        const prepared = this._prepareSingleTableWhere(table, where, true, true, label);
+        const prepared = this.prepareSingleTableWhere(table, where, true, true, label);
         return {
             table: table,
             snakeTable: prepared.snakeTable,
@@ -933,9 +933,9 @@ export class DbParse {
         };
     }
 
-    async _normalizeLeftJoinReadOptions(options, cleanWhere, classifiedFields) {
+    async normalizeLeftJoinReadOptions(options, cleanWhere, classifiedFields) {
         const mainTableRef = options.table[0];
-        const processedFields = await this._joinFieldsToSnake(mainTableRef, classifiedFields);
+        const processedFields = await this.joinFieldsToSnake(mainTableRef, classifiedFields);
         const joinTableRefs = options.table.slice(1);
         const normalizedTableRef = normalizeTableRef(mainTableRef);
         const mainQualifier = getTableQualifier(mainTableRef);
@@ -953,7 +953,7 @@ export class DbParse {
         };
     }
 
-    _normalizeLeftJoinCountOptions(options, cleanWhere) {
+    normalizeLeftJoinCountOptions(options, cleanWhere) {
         const mainTableRef = options.table[0];
         const joinTableRefs = options.table.slice(1);
         const normalizedTableRef = normalizeTableRef(mainTableRef);
@@ -972,7 +972,7 @@ export class DbParse {
         };
     }
 
-    async _normalizeSingleTableReadOptions(options, cleanWhere, classifiedFields) {
+    async normalizeSingleTableReadOptions(options, cleanWhere, classifiedFields) {
         const tableRef = Array.isArray(options.table) ? options.table[0] : options.table;
         const snakeTable = snakeCase(tableRef);
         const processedFields = await fieldsToSnake(tableRef, classifiedFields, this.getTableColumns);
@@ -989,7 +989,7 @@ export class DbParse {
         };
     }
 
-    _prepareSingleTableWhere(table, where, useDefaultStateFilter, required, label, beflyMode = this.beflyMode) {
+    prepareSingleTableWhere(table, where, useDefaultStateFilter, required, label, beflyMode = this.beflyMode) {
         const snakeTable = snakeCase(table);
         const normalizedWhere = whereKeysToSnake(clearDeep(where || {}));
         if (required) {
@@ -1002,7 +1002,7 @@ export class DbParse {
         };
     }
 
-    async _joinFieldsToSnake(mainTableRef, classifiedFields) {
+    async joinFieldsToSnake(mainTableRef, classifiedFields) {
         if (classifiedFields.type !== "join") {
             return [];
         }

package/lib/dbUtil.js

@@ -508,7 +508,10 @@ export function processJoinOrderBy(orderBy) {
 }
 
 function replaceJoinOnSegment(segment) {
-    return segment.replace(/([a-zA-Z_][a-zA-Z0-9_]*)(\s*\.\s*)([a-zA-Z_][a-zA-Z0-9_]*)/g, (_match, left, dot, right) => {
+    return segment.replace(/([a-zA-Z_][a-zA-Z0-9_]*)(\s*\.\s*)([a-zA-Z_][a-zA-Z0-9_]*)/g, (...matchParts) => {
+        const left = matchParts[1];
+        const dot = matchParts[2];
+        const right = matchParts[3];
         return `${snakeCase(left)}${dot}${snakeCase(right)}`;
     });
 }

package/lib/logger.js

@@ -531,7 +531,7 @@ function logWrite(level, input) {
  * 日志实例（延迟初始化）
  */
 export const Logger = {
-    info(msg, data) {
+    info: function (msg, data) {
         if (isPlainObject(msg)) {
             logWrite("info", msg);
             return;
@@ -539,7 +539,7 @@ export const Logger = {
 
         logWrite("info", { msg: msg, data: data });
     },
-    warn(msg, data) {
+    warn: function (msg, data) {
         if (isPlainObject(msg)) {
             logWrite("warn", msg);
             return;
@@ -547,7 +547,7 @@ export const Logger = {
 
         logWrite("warn", { msg: msg, data: data });
     },
-    error(msg, err, data) {
+    error: function (msg, err, data) {
         if (isPlainObject(msg)) {
             logWrite("error", msg);
             return;
@@ -555,7 +555,7 @@ export const Logger = {
 
         logWrite("error", { msg: msg, err: err, data: data });
     },
-    debug(msg, data) {
+    debug: function (msg, data) {
         if (isPlainObject(msg)) {
             logWrite("debug", msg);
             return;
@@ -563,16 +563,16 @@ export const Logger = {
 
         logWrite("debug", { msg: msg, data: data });
     },
-    async flush() {
+    flush: async function () {
         await flush();
     },
-    configure(cfg) {
+    configure: function (cfg) {
         configure(cfg);
     },
-    setMock(mock) {
+    setMock: function (mock) {
         setMockLogger(mock);
     },
-    async shutdown() {
+    shutdown: async function () {
         await shutdown();
     }
 };

package/lib/sqlBuilder.js

@@ -10,12 +10,12 @@ import { escapeField, escapeTable, resolveQuoteIdent } from "./dbUtil.js";
  * SQL 构建器类
  */
 export class SqlBuilder {
-    _model;
-    _quoteIdent;
+    queryModel;
+    quoteIdentifier;
 
     constructor(options = {}) {
-        this._quoteIdent = resolveQuoteIdent(options);
-        this._model = {
+        this.quoteIdentifier = resolveQuoteIdent(options);
+        this.queryModel = {
             select: [],
             from: null,
             where: { type: "group", join: "AND", items: [] },
@@ -30,7 +30,7 @@ export class SqlBuilder {
      * 重置构建器状态
      */
     reset() {
-        this._model = {
+        this.queryModel = {
             select: [],
             from: null,
             where: { type: "group", join: "AND", items: [] },
@@ -42,8 +42,8 @@ export class SqlBuilder {
         return this;
     }
 
-    _compileOperatorNode(node) {
-        const escapedField = escapeField(node.field, this._quoteIdent);
+    compileOperatorNode(node) {
+        const escapedField = escapeField(node.field, this.quoteIdentifier);
 
         switch (node.operator) {
             case "$not":
@@ -87,7 +87,7 @@ export class SqlBuilder {
         }
     }
 
-    _compileWhereNode(node) {
+    compileWhereNode(node) {
         if (!node) {
             return { sql: "", params: [] };
         }
@@ -100,7 +100,7 @@ export class SqlBuilder {
         }
 
         if (node.type === "op") {
-            return this._compileOperatorNode(node);
+            return this.compileOperatorNode(node);
         }
 
         if (node.type !== "group" || !node.items || node.items.length === 0) {
@@ -111,7 +111,7 @@ export class SqlBuilder {
         const params = [];
 
         for (const item of node.items) {
-            const built = this._compileWhereNode(item);
+            const built = this.compileWhereNode(item);
             if (!built.sql) {
                 continue;
             }
@@ -136,7 +136,7 @@ export class SqlBuilder {
      * 获取 WHERE 条件（供 DbHelper 使用）
      */
     getWhereConditions() {
-        const result = this._compileWhereNode(this._model.where);
+        const result = this.compileWhereNode(this.queryModel.where);
         return { sql: result.sql, params: result.params };
     }
 
@@ -146,12 +146,12 @@ export class SqlBuilder {
     select(fields = "*") {
         if (Array.isArray(fields)) {
             for (const field of fields) {
-                this._model.select.push({ type: "field", value: field });
+                this.queryModel.select.push({ type: "field", value: field });
             }
             return this;
         }
 
-        this._model.select.push({ type: "field", value: fields });
+        this.queryModel.select.push({ type: "field", value: fields });
         return this;
     }
 
@@ -159,7 +159,7 @@ export class SqlBuilder {
      * SELECT 原始表达式（不做转义）
      */
     selectRaw(expr) {
-        this._model.select.push({ type: "raw", value: expr });
+        this.queryModel.select.push({ type: "raw", value: expr });
         return this;
     }
 
@@ -167,7 +167,7 @@ export class SqlBuilder {
      * FROM 表名
      */
     from(table) {
-        this._model.from = { type: "table", value: table.trim() };
+        this.queryModel.from = { type: "table", value: table.trim() };
         return this;
     }
 
@@ -175,7 +175,7 @@ export class SqlBuilder {
      * FROM 原始表达式（不做转义）
      */
     fromRaw(tableExpr) {
-        this._model.from = { type: "raw", value: tableExpr.trim() };
+        this.queryModel.from = { type: "raw", value: tableExpr.trim() };
         return this;
     }
 
@@ -183,19 +183,19 @@ export class SqlBuilder {
      * WHERE 条件
      */
     where(conditionOrField) {
-        if (this._model.where.items.length === 0) {
-            this._model.where = conditionOrField;
+        if (this.queryModel.where.items.length === 0) {
+            this.queryModel.where = conditionOrField;
             return this;
         }
 
         if (conditionOrField.type === "group" && conditionOrField.join === "AND") {
             for (const item of conditionOrField.items) {
-                this._model.where.items.push(item);
+                this.queryModel.where.items.push(item);
             }
             return this;
         }
 
-        this._model.where.items.push(conditionOrField);
+        this.queryModel.where.items.push(conditionOrField);
         return this;
     }
 
@@ -208,7 +208,7 @@ export class SqlBuilder {
             paramList = params;
         }
 
-        this._model.where.items.push({ type: "raw", sql: sql, params: paramList });
+        this.queryModel.where.items.push({ type: "raw", sql: sql, params: paramList });
         return this;
     }
 
@@ -216,7 +216,7 @@ export class SqlBuilder {
      * LEFT JOIN
      */
     leftJoin(table, on) {
-        this._model.joins.push({ type: "left", table: table, on: on });
+        this.queryModel.joins.push({ type: "left", table: table, on: on });
         return this;
     }
 
@@ -226,7 +226,7 @@ export class SqlBuilder {
      */
     orderBy(fields) {
         for (const item of fields) {
-            this._model.orderBy.push({ field: item.field, dir: item.dir });
+            this.queryModel.orderBy.push({ field: item.field, dir: item.dir });
         }
         return this;
     }
@@ -235,8 +235,8 @@ export class SqlBuilder {
      * LIMIT
      */
     limit(count, offset) {
-        this._model.limit = count;
-        this._model.offset = offset;
+        this.queryModel.limit = count;
+        this.queryModel.offset = offset;
         return this;
     }
 
@@ -244,7 +244,7 @@ export class SqlBuilder {
      * OFFSET
      */
     offset(count) {
-        this._model.offset = count;
+        this.queryModel.offset = count;
         return this;
     }
 
@@ -253,29 +253,29 @@ export class SqlBuilder {
      */
     toSelectSql() {
         let selectSql = "*";
-        if (this._model.select.length > 0) {
-            selectSql = this._model.select
+        if (this.queryModel.select.length > 0) {
+            selectSql = this.queryModel.select
                 .map((item) => {
                     if (item.type === "raw") {
                         return item.value;
                     }
-                    return escapeField(item.value, this._quoteIdent);
+                    return escapeField(item.value, this.quoteIdentifier);
                 })
                 .join(", ");
         }
 
         const params = [];
-        let fromSql = this._model.from.value;
-        if (this._model.from.type !== "raw") {
-            fromSql = escapeTable(this._model.from.value, this._quoteIdent);
+        let fromSql = this.queryModel.from.value;
+        if (this.queryModel.from.type !== "raw") {
+            fromSql = escapeTable(this.queryModel.from.value, this.quoteIdentifier);
         }
         let sql = `SELECT ${selectSql} FROM ${fromSql}`;
 
-        if (this._model.joins.length > 0) {
-            sql += ` ${this._model.joins.map((join) => `${join.type.toUpperCase()} JOIN ${escapeTable(join.table, this._quoteIdent)} ON ${join.on}`).join(" ")}`;
+        if (this.queryModel.joins.length > 0) {
+            sql += ` ${this.queryModel.joins.map((join) => `${join.type.toUpperCase()} JOIN ${escapeTable(join.table, this.quoteIdentifier)} ON ${join.on}`).join(" ")}`;
         }
 
-        const whereResult = this._compileWhereNode(this._model.where);
+        const whereResult = this.compileWhereNode(this.queryModel.where);
         if (whereResult.sql) {
             sql += ` WHERE ${whereResult.sql}`;
             for (const param of whereResult.params) {
@@ -283,14 +283,14 @@ export class SqlBuilder {
             }
         }
 
-        if (this._model.orderBy.length > 0) {
-            sql += ` ORDER BY ${this._model.orderBy.map((item) => `${escapeField(item.field, this._quoteIdent)} ${item.dir}`).join(", ")}`;
+        if (this.queryModel.orderBy.length > 0) {
+            sql += ` ORDER BY ${this.queryModel.orderBy.map((item) => `${escapeField(item.field, this.quoteIdentifier)} ${item.dir}`).join(", ")}`;
         }
 
-        if (this._model.limit !== null) {
-            sql += ` LIMIT ${this._model.limit}`;
-            if (this._model.offset !== null && this._model.offset !== undefined) {
-                sql += ` OFFSET ${this._model.offset}`;
+        if (this.queryModel.limit !== null) {
+            sql += ` LIMIT ${this.queryModel.limit}`;
+            if (this.queryModel.offset !== null && this.queryModel.offset !== undefined) {
+                sql += ` OFFSET ${this.queryModel.offset}`;
             }
         }
 
@@ -301,7 +301,7 @@ export class SqlBuilder {
      * 构建 INSERT 查询
      */
     toInsertSql(table, data) {
-        const escapedTable = escapeTable(table, this._quoteIdent);
+        const escapedTable = escapeTable(table, this.quoteIdentifier);
 
         if (Array.isArray(data)) {
             if (data.length === 0) {
@@ -310,7 +310,7 @@ export class SqlBuilder {
 
             const firstRow = data[0] || {};
             const fields = Object.keys(firstRow);
-            const escapedFields = fields.map((field) => escapeField(field, this._quoteIdent));
+            const escapedFields = fields.map((field) => escapeField(field, this.quoteIdentifier));
             const placeholders = fields.map(() => "?").join(", ");
             const values = data.map(() => `(${placeholders})`).join(", ");
             const params = [];
@@ -329,7 +329,7 @@ export class SqlBuilder {
 
         const fields = Object.keys(data);
 
-        const escapedFields = fields.map((field) => escapeField(field, this._quoteIdent));
+        const escapedFields = fields.map((field) => escapeField(field, this.quoteIdentifier));
         const placeholders = fields.map(() => "?").join(", ");
         const params = [];
         for (const field of fields) {
@@ -353,13 +353,13 @@ export class SqlBuilder {
             params.push(value);
         }
 
-        const whereResult = this._compileWhereNode(this._model.where);
+        const whereResult = this.compileWhereNode(this.queryModel.where);
         for (const param of whereResult.params) {
             params.push(param);
         }
 
         return {
-            sql: `UPDATE ${escapeTable(table, this._quoteIdent)} SET ${fields.map((field) => `${escapeField(field, this._quoteIdent)} = ?`).join(", ")} WHERE ${whereResult.sql}`,
+            sql: `UPDATE ${escapeTable(table, this.quoteIdentifier)} SET ${fields.map((field) => `${escapeField(field, this.quoteIdentifier)} = ?`).join(", ")} WHERE ${whereResult.sql}`,
             params: params
         };
     }
@@ -368,9 +368,9 @@ export class SqlBuilder {
      * 构建 DELETE 查询
      */
     toDeleteSql(table) {
-        const whereResult = this._compileWhereNode(this._model.where);
+        const whereResult = this.compileWhereNode(this.queryModel.where);
         return {
-            sql: `DELETE FROM ${escapeTable(table, this._quoteIdent)} WHERE ${whereResult.sql}`,
+            sql: `DELETE FROM ${escapeTable(table, this.quoteIdentifier)} WHERE ${whereResult.sql}`,
             params: whereResult.params
         };
     }
@@ -380,17 +380,17 @@ export class SqlBuilder {
      */
     toCountSql() {
         const params = [];
-        let fromSql = this._model.from.value;
-        if (this._model.from.type !== "raw") {
-            fromSql = escapeTable(this._model.from.value, this._quoteIdent);
+        let fromSql = this.queryModel.from.value;
+        if (this.queryModel.from.type !== "raw") {
+            fromSql = escapeTable(this.queryModel.from.value, this.quoteIdentifier);
         }
         let sql = `SELECT COUNT(*) as total FROM ${fromSql}`;
 
-        if (this._model.joins.length > 0) {
-            sql += ` ${this._model.joins.map((join) => `${join.type.toUpperCase()} JOIN ${escapeTable(join.table, this._quoteIdent)} ON ${join.on}`).join(" ")}`;
+        if (this.queryModel.joins.length > 0) {
+            sql += ` ${this.queryModel.joins.map((join) => `${join.type.toUpperCase()} JOIN ${escapeTable(join.table, this.quoteIdentifier)} ON ${join.on}`).join(" ")}`;
         }
 
-        const whereResult = this._compileWhereNode(this._model.where);
+        const whereResult = this.compileWhereNode(this.queryModel.where);
         if (whereResult.sql) {
             sql += ` WHERE ${whereResult.sql}`;
             for (const param of whereResult.params) {

package/lib/validator.js

@@ -50,10 +50,10 @@ export class Validator {
 
         // 参数检查
         if (!isPlainObject(data)) {
-            return this.buildResult({ _error: "数据必须是对象格式" });
+            return this.buildResult({ rootError: "数据必须是对象格式" });
         }
         if (!isPlainObject(rules)) {
-            return this.buildResult({ _error: "验证规则必须是对象格式" });
+            return this.buildResult({ rootError: "验证规则必须是对象格式" });
         }
 
         // 检查必填字段

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.24.10",
+    "version": "3.24.11",
     "gitHead": "49c39d36695036e85fc64083cc43c1652fff96cb",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",

package/paths.js

@@ -15,8 +15,8 @@ import { fileURLToPath } from "node:url";
 import { dirname, isAbsolute, join, normalize, resolve } from "pathe";
 
 // 当前文件的路径信息
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+const moduleFilePath = fileURLToPath(import.meta.url);
+const moduleDir = dirname(moduleFilePath);
 
 // ==================== Core 框架路径 ====================
 
@@ -24,48 +24,48 @@ const __dirname = dirname(__filename);
  * Core 框架根目录
  * @description packages/core/
  */
-export const coreDir = __dirname;
+export const coreDir = moduleDir;
 
 /**
  * Core 框架 dist 目录
  * @description 源码态为 packages/core/dist；dist 运行态为 packages/core/dist
  */
-export const coreDistDir = normalize(__dirname).endsWith("/dist") ? __dirname : join(__dirname, "dist");
+export const coreDistDir = normalize(moduleDir).endsWith("/dist") ? moduleDir : join(moduleDir, "dist");
 
 /**
  * Core 框架检查目录
  * @description packages/core/checks/
  * @usage 存放启动检查模块（返回 boolean 的 default 函数）
  */
-export const coreCheckDir = join(__dirname, "checks");
+export const coreCheckDir = join(moduleDir, "checks");
 
 /**
  * Core 框架插件目录
  * @description packages/core/plugins/
  * @usage 存放内置插件（mysql, logger, redis, tool 等）
  */
-export const corePluginDir = join(__dirname, "plugins");
+export const corePluginDir = join(moduleDir, "plugins");
 
 /**
  * Core 框架钩子目录
  * @description packages/core/hooks/
  * @usage 存放内置钩子（auth, cors, parser 等）
  */
-export const coreHookDir = join(__dirname, "hooks");
+export const coreHookDir = join(moduleDir, "hooks");
 
 /**
  * Core 框架 API 目录
  * @description packages/core/apis/
  * @usage 存放框架级别的 API 接口
  */
-export const coreApiDir = join(__dirname, "apis");
+export const coreApiDir = join(moduleDir, "apis");
 
 /**
  * Core 框架表定义目录
  * @description packages/core/tables/
  * @usage 存放框架核心表定义（JSON 格式）
  */
-export const coreTableDir = join(__dirname, "tables");
+export const coreTableDir = join(moduleDir, "tables");
 
 // ==================== 用户项目路径 ====================
 

package/plugins/cache.js

@@ -10,7 +10,7 @@ import { CacheHelper } from "../lib/cacheHelper.js";
  */
 export default {
     order: 6,
-    async handler(befly) {
+    handler: async function (befly) {
         return new CacheHelper({ mysql: befly.mysql, redis: befly.redis });
     }
 };

package/plugins/email.js

@@ -9,7 +9,7 @@ import { Logger } from "../lib/logger.js";
 
 export default {
     order: 7,
-    async handler(befly) {
+    handler: async function (befly) {
         const config = befly?.config?.email || {};
         let transporter = null;
 

package/plugins/logger.js

@@ -10,7 +10,7 @@ import { Logger } from "../lib/logger.js";
  */
 export default {
     order: 2,
-    async handler(befly) {
+    handler: async function (befly) {
         // 配置 Logger
         if (befly.config && befly.config.logger) {
             Logger.configure(befly.config.logger);

package/plugins/mysql.js

@@ -12,7 +12,7 @@ import { Logger } from "../lib/logger.js";
  */
 export default {
     order: 5,
-    async handler(befly) {
+    handler: async function (befly) {
         try {
             // 创建数据库管理器实例
             const dbManager = new DbHelper({

package/plugins/redis.js

@@ -12,7 +12,7 @@ import { RedisHelper } from "../lib/redisHelper.js";
  */
 export default {
     order: 4,
-    async handler(befly) {
+    handler: async function (befly) {
         const env = befly.config?.runMode;
         const redisPrefix = befly.config?.redis?.prefix;
         try {