befly 3.21.2 → 3.22.1

package/lib/sqlBuilder.js

@@ -3,20 +3,8 @@
  * 提供链式 API 构建 SQL 查询
  */
 
-import { assertBatchInsertRowsConsistent, assertNoUndefinedParam, escapeField, escapeTable, normalizeLimitValue, normalizeOffsetValue, resolveQuoteIdent, validateParam } from "./dbUtil.js";
-import { isNonEmptyString, isString } from "../utils/is.js";
-
-function createModel() {
-    return {
-        select: [],
-        from: null,
-        where: { type: "group", join: "AND", items: [] },
-        joins: [],
-        orderBy: [],
-        limit: null,
-        offset: null
-    };
-}
+import { escapeField, escapeTable, resolveQuoteIdent } from "./dbUtil.js";
+import { isNonEmptyString } from "../utils/is.js";
 
 /**
  * SQL 构建器类
@@ -27,188 +15,37 @@ export class SqlBuilder {
 
     constructor(options = {}) {
         this._quoteIdent = resolveQuoteIdent(options);
-        this._model = createModel();
+        this._model = {
+            select: [],
+            from: null,
+            where: { type: "group", join: "AND", items: [] },
+            joins: [],
+            orderBy: [],
+            limit: null,
+            offset: null
+        };
     }
 
     /**
      * 重置构建器状态
      */
     reset() {
-        this._model = createModel();
+        this._model = {
+            select: [],
+            from: null,
+            where: { type: "group", join: "AND", items: [] },
+            joins: [],
+            orderBy: [],
+            limit: null,
+            offset: null
+        };
         return this;
     }
 
-    _appendWhereNode(root, node) {
-        if (node) {
-            root.items.push(node);
-        }
-    }
-
-    _buildArrayOperatorNode(fieldName, operator, value, errorFactory, emptyMessage) {
-        if (!Array.isArray(value)) {
-            throw new Error(errorFactory(operator), {
-                cause: null,
-                code: "validation"
-            });
-        }
-        if (value.length === 0) {
-            throw new Error(emptyMessage, {
-                cause: null,
-                code: "validation"
-            });
-        }
-
-        return { type: "op", field: fieldName, operator: operator, value: value };
-    }
-
-    _buildRangeOrNullOperatorNode(fieldName, operator, value) {
-        if (operator === "$between" || operator === "$notBetween") {
-            if (Array.isArray(value) && value.length === 2) {
-                return { type: "op", field: fieldName, operator: operator, value: value };
-            }
-            return null;
-        }
-
-        if (value === true) {
-            return { type: "op", field: fieldName, operator: operator, value: value };
-        }
-
-        return null;
-    }
-
-    _buildOperatorNode(fieldName, operator, value) {
-        switch (operator) {
-            case "$in":
-                return this._buildArrayOperatorNode(fieldName, operator, value, (currentOperator) => `$in 操作符的值必须是数组 (operator: ${currentOperator})`, "$in 操作符的数组不能为空。提示：空数组会导致查询永远不匹配任何记录，这通常不是预期行为。请检查查询条件或移除该字段。");
-            case "$nin":
-            case "$notIn":
-                return this._buildArrayOperatorNode(fieldName, operator, value, (currentOperator) => `$nin/$notIn 操作符的值必须是数组 (operator: ${currentOperator})`, "$nin/$notIn 操作符的数组不能为空。提示：空数组会导致查询匹配所有记录，这通常不是预期行为。请检查查询条件或移除该字段。");
-            case "$between":
-            case "$notBetween":
-            case "$null":
-            case "$notNull":
-                return this._buildRangeOrNullOperatorNode(fieldName, operator, value);
-            case "$like":
-            case "like":
-            case "$leftLike":
-            case "leftLike":
-            case "$rightLike":
-            case "rightLike":
-                if (isString(value) && value.trim() === "") {
-                    return null;
-                }
-                validateParam(value);
-                return { type: "op", field: fieldName, operator: operator, value: value };
-            default:
-                validateParam(value);
-                return { type: "op", field: fieldName, operator: operator, value: value };
-        }
-    }
-
-    _appendFieldCondition(group, key, value) {
-        if (key.includes("$")) {
-            const lastDollarIndex = key.lastIndexOf("$");
-            this._appendWhereNode(group, this._buildOperatorNode(key.substring(0, lastDollarIndex), `$${key.substring(lastDollarIndex + 1)}`, value));
-            return;
-        }
-
-        if (value && typeof value === "object" && !Array.isArray(value)) {
-            for (const [operator, operatorValue] of Object.entries(value)) {
-                this._appendWhereNode(group, this._buildOperatorNode(key, operator, operatorValue));
-            }
-            return;
-        }
-
-        this._appendWhereNode(group, this._buildOperatorNode(key, "=", value));
-    }
-
-    _appendAndConditions(group, value) {
-        if (!Array.isArray(value)) {
-            return;
-        }
-
-        for (const condition of value) {
-            if (!condition || typeof condition !== "object" || Array.isArray(condition)) {
-                continue;
-            }
-
-            const sub = this._parseWhereObject(condition);
-            if (sub.items.length === 0) {
-                continue;
-            }
-
-            if (sub.join === "AND") {
-                for (const item of sub.items) {
-                    group.items.push(item);
-                }
-                continue;
-            }
-
-            group.items.push(sub);
-        }
-    }
-
-    _appendOrConditions(group, value) {
-        if (!Array.isArray(value)) {
-            return;
-        }
-
-        const orGroup = { type: "group", join: "OR", items: [] };
-        for (const condition of value) {
-            if (!condition || typeof condition !== "object" || Array.isArray(condition)) {
-                continue;
-            }
-
-            const sub = this._parseWhereObject(condition);
-            if (sub.items.length > 0) {
-                orGroup.items.push(sub);
-            }
-        }
-
-        if (orGroup.items.length > 0) {
-            group.items.push(orGroup);
-        }
-    }
-
-    _parseWhereObject(whereObj) {
-        if (!whereObj || typeof whereObj !== "object") {
-            return { type: "group", join: "AND", items: [] };
-        }
-
-        const group = { type: "group", join: "AND", items: [] };
-
-        for (const [key, value] of Object.entries(whereObj)) {
-            if (value === undefined) {
-                continue;
-            }
-
-            if (key === "$and") {
-                this._appendAndConditions(group, value);
-                continue;
-            }
-
-            if (key === "$or") {
-                this._appendOrConditions(group, value);
-                continue;
-            }
-
-            this._appendFieldCondition(group, key, value);
-        }
-
-        return group;
-    }
-
-    _pushWhereParams(target, source) {
-        for (const param of source) {
-            target.push(param);
-        }
-    }
-
     _compileOperatorNode(node) {
         const escapedField = escapeField(node.field, this._quoteIdent);
 
-        if (node.operator === "$ne" || node.operator === "$not") {
-            validateParam(node.value);
+        if (node.operator === "$not") {
             return { sql: `${escapedField} != ?`, params: [node.value] };
         }
 
@@ -219,50 +56,42 @@ export class SqlBuilder {
             };
         }
 
-        if (node.operator === "$nin" || node.operator === "$notIn") {
+        if (node.operator === "$notIn") {
             return {
                 sql: `${escapedField} NOT IN (${node.value.map(() => "?").join(",")})`,
                 params: node.value.slice()
             };
         }
 
-        if (node.operator === "$like" || node.operator === "like") {
-            validateParam(node.value);
+        if (node.operator === "$like") {
             return { sql: `${escapedField} LIKE ?`, params: [`%${String(node.value)}%`] };
         }
 
-        if (node.operator === "$leftLike" || node.operator === "leftLike") {
-            validateParam(node.value);
+        if (node.operator === "$leftLike") {
             return { sql: `${escapedField} LIKE ?`, params: [`%${String(node.value)}`] };
         }
 
-        if (node.operator === "$rightLike" || node.operator === "rightLike") {
-            validateParam(node.value);
+        if (node.operator === "$rightLike") {
             return { sql: `${escapedField} LIKE ?`, params: [`${String(node.value)}%`] };
         }
 
         if (node.operator === "$notLike") {
-            validateParam(node.value);
             return { sql: `${escapedField} NOT LIKE ?`, params: [node.value] };
         }
 
         if (node.operator === "$gt") {
-            validateParam(node.value);
             return { sql: `${escapedField} > ?`, params: [node.value] };
         }
 
         if (node.operator === "$gte") {
-            validateParam(node.value);
             return { sql: `${escapedField} >= ?`, params: [node.value] };
         }
 
         if (node.operator === "$lt") {
-            validateParam(node.value);
             return { sql: `${escapedField} < ?`, params: [node.value] };
         }
 
         if (node.operator === "$lte") {
-            validateParam(node.value);
             return { sql: `${escapedField} <= ?`, params: [node.value] };
         }
 
@@ -282,7 +111,6 @@ export class SqlBuilder {
             return { sql: `${escapedField} IS NOT NULL`, params: [] };
         }
 
-        validateParam(node.value);
         return { sql: `${escapedField} = ?`, params: [node.value] };
     }
 
@@ -292,7 +120,10 @@ export class SqlBuilder {
         }
 
         if (node.type === "raw") {
-            return { sql: node.sql, params: Array.isArray(node.params) ? node.params.slice() : [] };
+            if (Array.isArray(node.params)) {
+                return { sql: node.sql, params: node.params.slice() };
+            }
+            return { sql: node.sql, params: [] };
         }
 
         if (node.type === "op") {
@@ -320,7 +151,9 @@ export class SqlBuilder {
             }
 
             parts.push(clause);
-            this._pushWhereParams(params, built.params);
+            for (const param of built.params) {
+                params.push(param);
+            }
         }
 
         return { sql: parts.join(` ${node.join} `), params: params };
@@ -345,9 +178,7 @@ export class SqlBuilder {
             return this;
         }
 
-        if (isString(fields)) {
-            this._model.select.push({ type: "field", value: fields });
-        }
+        this._model.select.push({ type: "field", value: fields });
         return this;
     }
 
@@ -378,18 +209,20 @@ export class SqlBuilder {
     /**
      * WHERE 条件
      */
-    where(conditionOrField, value) {
-        if (conditionOrField && typeof conditionOrField === "object" && !Array.isArray(conditionOrField)) {
-            const node = this._parseWhereObject(conditionOrField);
-            if (node.items.length > 0) {
-                this._model.where.items.push(node);
-            }
+    where(conditionOrField) {
+        if (this._model.where.items.length === 0) {
+            this._model.where = conditionOrField;
             return this;
         }
 
-        if (isString(conditionOrField)) {
-            this._appendWhereNode(this._model.where, this._buildOperatorNode(conditionOrField, "=", value));
+        if (conditionOrField.type === "group" && conditionOrField.join === "AND") {
+            for (const item of conditionOrField.items) {
+                this._model.where.items.push(item);
+            }
+            return this;
         }
+
+        this._model.where.items.push(conditionOrField);
         return this;
     }
 
@@ -397,9 +230,9 @@ export class SqlBuilder {
      * WHERE 原始片段（不做转义），可附带参数。
      */
     whereRaw(sql, params) {
-        const paramList = Array.isArray(params) ? params : [];
-        for (const param of paramList) {
-            validateParam(param);
+        let paramList = [];
+        if (Array.isArray(params)) {
+            paramList = params;
         }
 
         this._model.where.items.push({ type: "raw", sql: sql, params: paramList });
@@ -416,43 +249,11 @@ export class SqlBuilder {
 
     /**
      * ORDER BY
-     * @param fields - 格式为 ["field#ASC", "field2#DESC"]
+     * @param fields - 格式为 [{ field: "field", dir: "ASC" }]
      */
     orderBy(fields) {
         for (const item of fields) {
-            if (!isString(item) || !item.includes("#")) {
-                throw new Error(`orderBy 字段必须是 "字段#方向" 格式的字符串（例如："name#ASC", "id#DESC"） (item: ${String(item)})`, {
-                    cause: null,
-                    code: "validation"
-                });
-            }
-
-            const parts = item.split("#");
-            if (parts.length !== 2) {
-                throw new Error(`orderBy 字段必须是 "字段#方向" 格式的字符串（例如："name#ASC", "id#DESC"） (item: ${String(item)})`, {
-                    cause: null,
-                    code: "validation"
-                });
-            }
-
-            const cleanField = parts[0].trim();
-            const cleanDir = parts[1].trim().toUpperCase();
-
-            if (!cleanField) {
-                throw new Error(`orderBy 中字段名不能为空 (item: ${item})`, {
-                    cause: null,
-                    code: "validation"
-                });
-            }
-
-            if (!["ASC", "DESC"].includes(cleanDir)) {
-                throw new Error(`ORDER BY 方向必须是 ASC 或 DESC (direction: ${cleanDir})`, {
-                    cause: null,
-                    code: "validation"
-                });
-            }
-
-            this._model.orderBy.push({ field: cleanField, dir: cleanDir });
+            this._model.orderBy.push({ field: item.field, dir: item.dir });
         }
         return this;
     }
@@ -461,9 +262,8 @@ export class SqlBuilder {
      * LIMIT
      */
     limit(count, offset) {
-        const result = normalizeLimitValue(count, offset);
-        this._model.limit = result.limitValue;
-        this._model.offset = result.offsetValue;
+        this._model.limit = count;
+        this._model.offset = offset;
         return this;
     }
 
@@ -471,8 +271,7 @@ export class SqlBuilder {
      * OFFSET
      */
     offset(count) {
-        const offsetValue = normalizeOffsetValue(count);
-        this._model.offset = offsetValue;
+        this._model.offset = count;
         return this;
     }
 
@@ -480,20 +279,23 @@ export class SqlBuilder {
      * 构建 SELECT 查询
      */
     toSelectSql() {
-        const selectSql =
-            this._model.select.length > 0
-                ? this._model.select
-                      .map((item) => {
-                          if (item.type === "raw") {
-                              return item.value;
-                          }
-                          return escapeField(item.value, this._quoteIdent);
-                      })
-                      .join(", ")
-                : "*";
+        let selectSql = "*";
+        if (this._model.select.length > 0) {
+            selectSql = this._model.select
+                .map((item) => {
+                    if (item.type === "raw") {
+                        return item.value;
+                    }
+                    return escapeField(item.value, this._quoteIdent);
+                })
+                .join(", ");
+        }
 
         const params = [];
-        const fromSql = this._model.from.type === "raw" ? this._model.from.value : escapeTable(this._model.from.value, this._quoteIdent);
+        let fromSql = this._model.from.value;
+        if (this._model.from.type !== "raw") {
+            fromSql = escapeTable(this._model.from.value, this._quoteIdent);
+        }
         let sql = `SELECT ${selectSql} FROM ${fromSql}`;
 
         if (this._model.joins.length > 0) {
@@ -514,7 +316,7 @@ export class SqlBuilder {
 
         if (this._model.limit !== null) {
             sql += ` LIMIT ${this._model.limit}`;
-            if (this._model.offset !== null) {
+            if (this._model.offset !== null && this._model.offset !== undefined) {
                 sql += ` OFFSET ${this._model.offset}`;
             }
         }
@@ -529,7 +331,12 @@ export class SqlBuilder {
         const escapedTable = escapeTable(table, this._quoteIdent);
 
         if (Array.isArray(data)) {
-            const fields = assertBatchInsertRowsConsistent(data, { table: table });
+            if (data.length === 0) {
+                return { sql: "", params: [] };
+            }
+
+            const firstRow = data[0] || {};
+            const fields = Object.keys(firstRow);
             const escapedFields = fields.map((field) => escapeField(field, this._quoteIdent));
             const placeholders = fields.map(() => "?").join(", ");
             const values = data.map(() => `(${placeholders})`).join(", ");
@@ -537,9 +344,7 @@ export class SqlBuilder {
 
             for (const row of data) {
                 for (const field of fields) {
-                    const value = row[field];
-                    validateParam(value);
-                    params.push(value);
+                    params.push(row[field]);
                 }
             }
 
@@ -550,16 +355,6 @@ export class SqlBuilder {
         }
 
         const fields = Object.keys(data);
-        if (fields.length === 0) {
-            throw new Error(`插入数据必须至少有一个字段 (table: ${table})`, {
-                cause: null,
-                code: "validation"
-            });
-        }
-
-        for (const field of fields) {
-            validateParam(data[field]);
-        }
 
         const escapedFields = fields.map((field) => escapeField(field, this._quoteIdent));
         const placeholders = fields.map(() => "?").join(", ");
@@ -579,12 +374,6 @@ export class SqlBuilder {
      */
     toUpdateSql(table, data) {
         const fields = Object.keys(data);
-        if (fields.length === 0) {
-            throw new Error("更新数据必须至少有一个字段", {
-                cause: null,
-                code: "validation"
-            });
-        }
 
         const params = [];
         for (const value of Object.values(data)) {
@@ -618,7 +407,10 @@ export class SqlBuilder {
      */
     toCountSql() {
         const params = [];
-        const fromSql = this._model.from.type === "raw" ? this._model.from.value : escapeTable(this._model.from.value, this._quoteIdent);
+        let fromSql = this._model.from.value;
+        if (this._model.from.type !== "raw") {
+            fromSql = escapeTable(this._model.from.value, this._quoteIdent);
+        }
         let sql = `SELECT COUNT(*) as total FROM ${fromSql}`;
 
         if (this._model.joins.length > 0) {
@@ -676,7 +468,6 @@ export class SqlBuilder {
                 whenList.push("WHEN ? THEN ?");
                 args.push(row.id);
                 const value = row.data[field];
-                assertNoUndefinedParam(value, "SQL 参数值");
                 args.push(value);
             }
 
@@ -705,10 +496,3 @@ export class SqlBuilder {
         return { sql: sql, params: args };
     }
 }
-
-/**
- * 创建新的 SQL 构建器实例
- */
-export function createQueryBuilder() {
-    return new SqlBuilder();
-}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.21.2",
-    "gitHead": "d134ac529ad22517624353dfcfcc1b598f009a49",
+    "version": "3.22.1",
+    "gitHead": "fdeb630232962a7f6d023d368f90fd9a91ea20a0",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [

package/paths.js

@@ -112,9 +112,9 @@ export const appApiDir = join(appDir, "apis");
 export const appTableDir = join(appDir, "tables");
 
 /**
- * 项目公共静态目录
+ * 项目上传/公共文件目录
  * @description 默认 {appDir}/public，可通过 config.publicDir 覆盖
- * @usage 用于静态文件访问与本地上传保存目录解析
+ * @usage 用于本地上传文件保存目录解析，不承担 HTTP 静态托管职责
  */
 export function getAppPublicDir(publicDir = "./public") {
     if (isAbsolute(publicDir)) {

package/router/static.js

@@ -20,7 +20,8 @@ export function staticHandler(corsConfig = undefined, publicDir = "./public") {
         const corsHeaders = setCorsOptions(req, corsConfig);
 
         const url = new URL(req.url);
-        const filePath = join(getAppPublicDir(publicDir), url.pathname);
+        const publicPath = url.pathname.replace(/^\/public/, "") || "/";
+        const filePath = join(getAppPublicDir(publicDir), publicPath);
 
         try {
             // OPTIONS预检请求

package/sql/befly.sql

@@ -79,6 +79,26 @@ CREATE TABLE IF NOT EXISTS `befly_email_log` (
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
+CREATE TABLE IF NOT EXISTS `befly_file` (
+    `id` BIGINT NOT NULL,
+    `user_id` BIGINT NOT NULL DEFAULT 0,
+    `file_path` VARCHAR(500) NOT NULL DEFAULT '',
+    `url` VARCHAR(1000) NOT NULL DEFAULT '',
+    `is_image` TINYINT NOT NULL DEFAULT 0,
+    `file_type` VARCHAR(20) NOT NULL DEFAULT '',
+    `file_size` BIGINT NOT NULL DEFAULT 0,
+    `file_key` VARCHAR(100) NOT NULL DEFAULT '',
+    `file_ext` VARCHAR(20) NOT NULL DEFAULT '',
+    `file_name` VARCHAR(200) NOT NULL DEFAULT '',
+    `state` TINYINT NOT NULL DEFAULT 1,
+    `created_at` BIGINT NOT NULL DEFAULT 0,
+    `updated_at` BIGINT NOT NULL DEFAULT 0,
+    `deleted_at` BIGINT NULL DEFAULT NULL,
+    PRIMARY KEY (`id`),
+    KEY `idx_befly_file_user_id` (`user_id`),
+    KEY `idx_befly_file_is_image` (`is_image`) 
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
 CREATE TABLE IF NOT EXISTS `befly_login_log` (
     `id` BIGINT NOT NULL,
     `admin_id` BIGINT NOT NULL DEFAULT 0,