befly 3.18.20 → 3.18.22

package/lib/dbHelper/builders.js

@@ -2,8 +2,7 @@ import { fieldClear } from "../../utils/fieldClear.js";
 import { isFiniteNumber, isNonEmptyString, isNullable, isPlainObject, isString } from "../../utils/is.js";
 import { arrayKeysToCamel, keysToCamel, keysToSnake, snakeCase } from "../../utils/util.js";
 import { SqlBuilder } from "../sqlBuilder/index.js";
-import { convertBigIntFields, quoteIdentMySql } from "./context.js";
-import { getJoinMainQualifier, normalizeTableRef } from "./util.js";
+import { convertBigIntFields, getJoinMainQualifier, normalizeTableRef, quoteIdentMySql } from "./util.js";
 import { assertNoExprField, validateAndClassifyFields, validateExcludeFieldsResult, validateQueryOptions, validateTimeIdValue } from "./validate.js";
 
 export function clearDeep(value, options) {
@@ -497,8 +496,8 @@ export function buildInsertRow(options) {
     if (options.beflyMode !== 0) {
         result["created_at"] = options.now;
         result["updated_at"] = options.now;
+        result["state"] = 1;
     }
-    result["state"] = 1;
     return result;
 }
 

package/lib/dbHelper/dataOps.js

@@ -2,8 +2,7 @@ import { isNumber } from "../../utils/is.js";
 import { snakeCase } from "../../utils/util.js";
 import { Logger } from "../logger.js";
 import { SqlBuilder } from "../sqlBuilder/index.js";
-import { quoteIdentMySql } from "./context.js";
-import { toNumberFromSql } from "./util.js";
+import { quoteIdentMySql, toNumberFromSql } from "./util.js";
 import { addDefaultStateFilter, buildInsertRow, buildPartialUpdateData, buildUpdateRow, clearDeep, whereKeysToSnake } from "./builders.js";
 import { assertBatchInsertRowsConsistent, assertNoUndefinedInRecord, validateGeneratedBatchId, validateIncrementOptions, validateInsertBatchSize, validateNoJoinReadOptions, validatePageLimitRange, validateSafeFieldName, validateTableBatchDataOptions, validateTableDataOptions, validateTableName, validateTableWhereOptions } from "./validate.js";
 
@@ -194,7 +193,12 @@ export const dataOpsMethods = {
 
         let processed;
         if (this.idMode === "autoId") {
-            processed = buildInsertRow({ idMode: "autoId", data: data, now: now, beflyMode: this.beflyMode });
+            processed = buildInsertRow({
+                idMode: "autoId",
+                data: data,
+                now: now,
+                beflyMode: this.beflyMode
+            });
         } else {
             let id;
             try {
@@ -208,7 +212,13 @@ export const dataOpsMethods = {
                     table: table
                 });
             }
-            processed = buildInsertRow({ idMode: "timeId", data: data, id: id, now: now, beflyMode: this.beflyMode });
+            processed = buildInsertRow({
+                idMode: "timeId",
+                data: data,
+                id: id,
+                now: now,
+                beflyMode: this.beflyMode
+            });
         }
 
         assertNoUndefinedInRecord(processed, `insData 插入数据 (table: ${snakeTable})`);
@@ -421,9 +431,17 @@ export const dataOpsMethods = {
         validateTableWhereOptions(options, "delData", true);
         const { table, where } = options;
 
+        // beflyMode=0：关闭默认 state 软删语义，delData 直接走物理删除
+        if (this.beflyMode === 0) {
+            return await this.delForce({
+                table: table,
+                where: where
+            });
+        }
+
         return await this.updData({
             table: table,
-            data: this.beflyMode === 1 ? { state: 0, deleted_at: Date.now() } : { state: 0 },
+            data: { state: 0, deleted_at: Date.now() },
             where: where
         });
     },
@@ -501,5 +519,58 @@ export const dataOpsMethods = {
 
     async decrement(table, field, where, value = 1) {
         return await this.increment(table, field, where, -value);
+    },
+
+    async trans(callback) {
+        const abortMark = "__beflyTransAbort";
+
+        if (this.isTransaction) {
+            const result = await callback(this);
+            if (result?.code !== undefined && result.code !== 0) {
+                const abortError = new Error("TRANSACTION_ABORT", {
+                    cause: null,
+                    code: "runtime"
+                });
+                abortError[abortMark] = true;
+                abortError.payload = result;
+                throw abortError;
+            }
+            return result;
+        }
+
+        if (typeof this.sql?.begin !== "function") {
+            throw new Error("不支持事务 begin() 方法", {
+                cause: null,
+                code: "runtime"
+            });
+        }
+
+        try {
+            return await this.sql.begin(async (tx) => {
+                const trans = new this.constructor({
+                    redis: this.redis,
+                    dbName: this.dbName,
+                    sql: tx,
+                    idMode: this.idMode,
+                    beflyMode: this.beflyMode
+                });
+                const result = await callback(trans);
+                if (result?.code !== undefined && result.code !== 0) {
+                    const abortError = new Error("TRANSACTION_ABORT", {
+                        cause: null,
+                        code: "runtime"
+                    });
+                    abortError[abortMark] = true;
+                    abortError.payload = result;
+                    throw abortError;
+                }
+                return result;
+            });
+        } catch (error) {
+            if (error && error[abortMark] === true) {
+                return error.payload;
+            }
+            throw error;
+        }
     }
 };

package/lib/dbHelper/execute.js

@@ -1,6 +1,5 @@
 import { toSqlParams } from "../sqlBuilder/util.js";
 import { snakeCase } from "../../utils/util.js";
-import { DbSqlError } from "./context.js";
 import { validateExecuteSql } from "./validate.js";
 
 export const executeMethods = {
@@ -47,8 +46,11 @@ export const executeMethods = {
             const duration = Date.now() - startTime;
             const msg = error instanceof Error ? error.message : String(error);
 
-            throw new DbSqlError(`SQL执行失败: ${msg}`, {
-                originalError: error,
+            throw new Error(`SQL执行失败: ${msg}`, {
+                cause: error,
+                code: "runtime",
+                subsystem: "sql",
+                operation: "execute",
                 params: safeParams,
                 duration: duration,
                 sqlInfo: {

package/lib/dbHelper/index.js

@@ -2,8 +2,6 @@ import { isNonEmptyString } from "../../utils/is.js";
 import { builderMethods } from "./builders.js";
 import { dataOpsMethods } from "./dataOps.js";
 import { executeMethods } from "./execute.js";
-import { transactionMethods } from "./transaction.js";
-import { convertBigIntFields } from "./context.js";
 
 function DbHelper(options) {
     this.redis = options.redis;
@@ -22,7 +20,6 @@ function DbHelper(options) {
     this.beflyMode = options.beflyMode === 0 ? 0 : 1;
 }
 
-Object.assign(DbHelper.prototype, builderMethods, executeMethods, dataOpsMethods, transactionMethods);
-DbHelper.convertBigIntFields = convertBigIntFields;
+Object.assign(DbHelper.prototype, builderMethods, executeMethods, dataOpsMethods);
 
 export { DbHelper };

package/lib/dbHelper/util.js

@@ -1,7 +1,26 @@
-import { isNullable } from "../../utils/is.js";
-import { snakeCase } from "../../utils/util.js";
+import { isNonEmptyString, isNullable, isString } from "../../utils/is.js";
+import { canConvertToNumber, snakeCase } from "../../utils/util.js";
 import { parseTableRef } from "./validate.js";
 
+export function quoteIdentMySql(identifier) {
+    if (!isString(identifier)) {
+        throw new Error(`quoteIdentifier 需要字符串类型标识符 (identifier: ${String(identifier)})`, {
+            cause: null,
+            code: "validation"
+        });
+    }
+
+    const trimmed = identifier.trim();
+    if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(trimmed)) {
+        throw new Error(`无效的 SQL 标识符: ${trimmed}`, {
+            cause: null,
+            code: "validation"
+        });
+    }
+
+    return `\`${trimmed}\``;
+}
+
 export function normalizeTableRef(tableRef) {
     const parsed = parseTableRef(tableRef);
     const schemaPart = parsed.schema ? snakeCase(parsed.schema) : null;
@@ -56,3 +75,83 @@ export function toNumberFromSql(value) {
 
     return 0;
 }
+
+export function convertBigIntFields(arr, fields) {
+    if (isNullable(arr)) {
+        return arr;
+    }
+
+    const defaultFields = ["id", "pid", "sort"];
+
+    const buildFields = (userFields) => {
+        if (!userFields || userFields.length === 0) {
+            return defaultFields;
+        }
+
+        const merged = ["id", "pid", "sort"];
+        for (const f of userFields) {
+            if (!isString(f)) {
+                continue;
+            }
+            if (!isNonEmptyString(f)) {
+                continue;
+            }
+            const trimmed = f.trim();
+            if (!merged.includes(trimmed)) {
+                merged.push(trimmed);
+            }
+        }
+        return merged;
+    };
+
+    const effectiveFields = buildFields(fields);
+    const fieldSet = new Set(effectiveFields);
+
+    const convertRecord = (source) => {
+        const converted = {};
+
+        for (const [key, value] of Object.entries(source)) {
+            let nextValue = value;
+
+            if (!isNullable(value)) {
+                const shouldConvert = fieldSet.has(key) || key.endsWith("Id") || key.endsWith("_id") || key.endsWith("At") || key.endsWith("_at");
+
+                if (shouldConvert) {
+                    let bigintValue = null;
+                    if (typeof value === "bigint") {
+                        bigintValue = value;
+                    } else if (isString(value)) {
+                        if (/^-?\d+$/.test(value)) {
+                            try {
+                                bigintValue = BigInt(value);
+                            } catch {
+                                bigintValue = null;
+                            }
+                        }
+                    }
+
+                    if (bigintValue !== null) {
+                        const convertedNumber = canConvertToNumber(bigintValue);
+                        if (convertedNumber !== null) {
+                            nextValue = convertedNumber;
+                        }
+                    }
+                }
+            }
+
+            converted[key] = nextValue;
+        }
+
+        return converted;
+    };
+
+    if (Array.isArray(arr)) {
+        return arr.map((item) => convertRecord(item));
+    }
+
+    if (typeof arr === "object") {
+        return convertRecord(arr);
+    }
+
+    return arr;
+}

package/package.json

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

package/lib/dbHelper/context.js

@@ -1,131 +0,0 @@
-import { isNonEmptyString, isNullable, isNumber, isPlainObject, isString } from "../../utils/is.js";
-import { canConvertToNumber } from "../../utils/util.js";
-
-export function quoteIdentMySql(identifier) {
-    if (!isString(identifier)) {
-        throw new Error(`quoteIdentifier 需要字符串类型标识符 (identifier: ${String(identifier)})`, {
-            cause: null,
-            code: "validation"
-        });
-    }
-
-    const trimmed = identifier.trim();
-    if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(trimmed)) {
-        throw new Error(`无效的 SQL 标识符: ${trimmed}`, {
-            cause: null,
-            code: "validation"
-        });
-    }
-
-    return `\`${trimmed}\``;
-}
-
-export function hasBegin(sql) {
-    return typeof sql.begin === "function";
-}
-
-export class DbSqlError extends Error {
-    constructor(message, options) {
-        super(message);
-        this.originalError = options.originalError;
-        this.params = options.params;
-        this.duration = options.duration;
-        this.sqlInfo = options.sqlInfo;
-    }
-}
-
-export class TransAbortError extends Error {
-    constructor(payload) {
-        super("TRANSACTION_ABORT");
-        this.payload = payload;
-    }
-}
-
-export function isBeflyResponse(value) {
-    if (!isPlainObject(value)) {
-        return false;
-    }
-
-    const record = value;
-    return isNumber(record["code"]) && isString(record["msg"]);
-}
-
-export function convertBigIntFields(arr, fields) {
-    if (isNullable(arr)) {
-        return arr;
-    }
-
-    const defaultFields = ["id", "pid", "sort"];
-
-    const buildFields = (userFields) => {
-        if (!userFields || userFields.length === 0) {
-            return defaultFields;
-        }
-
-        const merged = ["id", "pid", "sort"];
-        for (const f of userFields) {
-            if (!isString(f)) {
-                continue;
-            }
-            if (!isNonEmptyString(f)) {
-                continue;
-            }
-            const trimmed = f.trim();
-            if (!merged.includes(trimmed)) {
-                merged.push(trimmed);
-            }
-        }
-        return merged;
-    };
-
-    const effectiveFields = buildFields(fields);
-    const fieldSet = new Set(effectiveFields);
-
-    const convertRecord = (source) => {
-        const converted = {};
-
-        for (const [key, value] of Object.entries(source)) {
-            let nextValue = value;
-
-            if (!isNullable(value)) {
-                const shouldConvert = fieldSet.has(key) || key.endsWith("Id") || key.endsWith("_id") || key.endsWith("At") || key.endsWith("_at");
-
-                if (shouldConvert) {
-                    let bigintValue = null;
-                    if (typeof value === "bigint") {
-                        bigintValue = value;
-                    } else if (isString(value)) {
-                        if (/^-?\d+$/.test(value)) {
-                            try {
-                                bigintValue = BigInt(value);
-                            } catch {
-                                bigintValue = null;
-                            }
-                        }
-                    }
-
-                    if (bigintValue !== null) {
-                        const convertedNumber = canConvertToNumber(bigintValue);
-                        if (convertedNumber !== null) {
-                            nextValue = convertedNumber;
-                        }
-                    }
-                }
-            }
-
-            converted[key] = nextValue;
-        }
-
-        return converted;
-    };
-
-    if (Array.isArray(arr)) {
-        return arr.map((item) => convertRecord(item));
-    }
-
-    if (typeof arr === "object") {
-        return convertRecord(arr);
-    }
-
-    return arr;
-}

package/lib/dbHelper/transaction.js

@@ -1,43 +0,0 @@
-import { hasBegin, isBeflyResponse, TransAbortError } from "./context.js";
-
-export const transactionMethods = {
-    async trans(callback) {
-        if (this.isTransaction) {
-            const innerResult = await callback(this);
-            if (isBeflyResponse(innerResult) && innerResult.code !== 0) {
-                throw new TransAbortError(innerResult);
-            }
-            return innerResult;
-        }
-
-        const sql = this.sql;
-        if (!sql) {
-            throw new Error("数据库连接未初始化", {
-                cause: null,
-                code: "runtime"
-            });
-        }
-        if (!hasBegin(sql)) {
-            throw new Error("当前 SQL 客户端不支持事务 begin() 方法", {
-                cause: null,
-                code: "runtime"
-            });
-        }
-
-        try {
-            return await sql.begin(async (tx) => {
-                const trans = new this.constructor({ redis: this.redis, dbName: this.dbName, sql: tx, idMode: this.idMode, beflyMode: this.beflyMode });
-                const result = await callback(trans);
-                if (isBeflyResponse(result) && result.code !== 0) {
-                    throw new TransAbortError(result);
-                }
-                return result;
-            });
-        } catch (error) {
-            if (error instanceof TransAbortError) {
-                return error.payload;
-            }
-            throw error;
-        }
-    }
-};