befly 3.20.0 → 3.20.1

package/lib/connect.js

@@ -42,7 +42,8 @@ export class Connect {
                 database: config.database,
                 username: config.username,
                 password: config.password,
-                max: config.max
+                max: config.max,
+                bigint: true
             };
 
             this.mysqlClient = new SQL(sqlConfig);

package/lib/dbHelper/builders.js

@@ -2,7 +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, getJoinMainQualifier, normalizeTableRef, quoteIdentMySql } from "./util.js";
+import { getJoinMainQualifier, normalizeBigIntValues, normalizeTableRef, quoteIdentMySql } from "./util.js";
 import { assertNoExprField, validateAndClassifyFields, validateExcludeFieldsResult, validateQueryOptions, validateTimeIdValue } from "./validate.js";
 
 export function clearDeep(value, options) {
@@ -542,14 +542,16 @@ export const builderMethods = {
         this.applyJoins(builder, prepared.joins);
         const result = builder.toSelectSql();
         const executeRes = await this.execute(result.sql, result.params);
-        const total = executeRes.data?.[0]?.total || executeRes.data?.[0]?.count || 0;
+        const countRow = executeRes.data?.[0] || null;
+        const normalizedCountRow = countRow ? normalizeBigIntValues(countRow) : null;
+        const total = normalizedCountRow?.total ?? normalizedCountRow?.count ?? 0;
         return {
             total: total,
             sql: executeRes.sql
         };
     },
 
-    normalizeRowData(row, bigintFields) {
+    normalizeRowData(row) {
         if (!row) {
             return {};
         }
@@ -560,7 +562,7 @@ export const builderMethods = {
             return {};
         }
 
-        const convertedList = convertBigIntFields([deserialized], bigintFields);
+        const convertedList = normalizeBigIntValues([deserialized]);
         if (convertedList && convertedList.length > 0) {
             return convertedList[0];
         }
@@ -568,10 +570,10 @@ export const builderMethods = {
         return deserialized;
     },
 
-    normalizeListData(list, bigintFields) {
+    normalizeListData(list) {
         const camelList = arrayKeysToCamel(list);
         const deserializedList = camelList.map((item) => deserializeArrayFields(item)).filter((item) => item !== null);
-        return convertBigIntFields(deserializedList, bigintFields);
+        return normalizeBigIntValues(deserializedList);
     },
 
     normalizeJoinOptions(options, cleanWhere) {
@@ -615,7 +617,6 @@ export const builderMethods = {
         };
 
         if (options.fields !== undefined) output.fields = options.fields;
-        if (options.bigint !== undefined) output.bigint = options.bigint;
         if (options.where !== undefined) output.where = options.where;
         if (options.joins !== undefined) output.joins = options.joins;
         if (options.orderBy !== undefined) output.orderBy = options.orderBy;

package/lib/dbHelper/dataOps.js

@@ -2,7 +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, toNumberFromSql } from "./util.js";
+import { normalizeSqlMetaNumber, quoteIdentMySql } 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";
 
@@ -33,7 +33,7 @@ export const dataOpsMethods = {
         const executeRes = await this.execute(sql, params);
         const result = executeRes.data;
 
-        const data = this.normalizeRowData(result?.[0] || null, options.bigint);
+        const data = this.normalizeRowData(result?.[0] || null);
         return {
             data: data,
             sql: executeRes.sql
@@ -81,7 +81,7 @@ export const dataOpsMethods = {
 
         return {
             data: {
-                lists: this.normalizeListData(list, options.bigint),
+                lists: this.normalizeListData(list),
                 total: total,
                 page: prepared.page,
                 limit: prepared.limit,
@@ -131,7 +131,7 @@ export const dataOpsMethods = {
             Logger.warn(`getAll 达到最大限制 ${MAX_LIMIT}，实际总数 ${total}，只返回前 ${MAX_LIMIT} 条`, { table: options.table, limit: MAX_LIMIT, total: total });
         }
 
-        const lists = this.normalizeListData(result, options.bigint);
+        const lists = this.normalizeListData(result);
 
         return {
             data: {
@@ -227,7 +227,7 @@ export const dataOpsMethods = {
 
         const processedId = processed["id"];
         const processedIdNum = isNumber(processedId) ? processedId : 0;
-        const lastInsertRowidNum = toNumberFromSql(executeRes.data?.lastInsertRowid);
+        const lastInsertRowidNum = normalizeSqlMetaNumber(executeRes.data?.lastInsertRowid);
 
         const insertedId = this.beflyMode === "manual" ? lastInsertRowidNum || 0 : processedIdNum || lastInsertRowidNum || 0;
         if (this.beflyMode === "manual" && insertedId <= 0) {
@@ -284,7 +284,7 @@ export const dataOpsMethods = {
             const executeRes = await this.execute(sql, params);
 
             if (this.beflyMode === "manual") {
-                const firstId = toNumberFromSql(executeRes.data?.lastInsertRowid);
+                const firstId = normalizeSqlMetaNumber(executeRes.data?.lastInsertRowid);
                 if (firstId <= 0) {
                     throw new Error(`批量插入失败：beflyMode=manual 时无法获取 lastInsertRowid (table: ${table})`, {
                         cause: null,
@@ -345,7 +345,7 @@ export const dataOpsMethods = {
             quoteIdent: quoteIdentMySql
         });
         const executeRes = await this.execute(query.sql, query.params);
-        const changes = toNumberFromSql(executeRes.data?.changes);
+        const changes = normalizeSqlMetaNumber(executeRes.data?.affectedRows);
         return {
             data: changes,
             sql: executeRes.sql
@@ -398,7 +398,7 @@ export const dataOpsMethods = {
         });
 
         const executeRes = await this.execute(query.sql, query.params);
-        const changes = toNumberFromSql(executeRes.data?.changes);
+        const changes = normalizeSqlMetaNumber(executeRes.data?.affectedRows);
         return {
             data: changes,
             sql: executeRes.sql
@@ -418,7 +418,7 @@ export const dataOpsMethods = {
         const { sql, params } = builder.toUpdateSql(snakeTable, processed);
 
         const executeRes = await this.execute(sql, params);
-        const changes = toNumberFromSql(executeRes.data?.changes);
+        const changes = normalizeSqlMetaNumber(executeRes.data?.affectedRows);
         return {
             data: changes,
             sql: executeRes.sql
@@ -428,20 +428,28 @@ export const dataOpsMethods = {
     async delData(options) {
         validateTableWhereOptions(options, "delData", true);
         const { table, where } = options;
+        const snakeTable = snakeCase(table);
+        const snakeWhere = whereKeysToSnake(clearDeep(where));
+        const now = Date.now();
+        const processed = {
+            state: 0,
+            deleted_at: now
+        };
 
-        // beflyMode=manual：关闭默认 state 软删语义，delData 直接走物理删除
-        if (this.beflyMode === "manual") {
-            return await this.delForce({
-                table: table,
-                where: where
-            });
+        if (this.beflyMode === "auto") {
+            processed.updated_at = now;
         }
 
-        return await this.updData({
-            table: table,
-            data: { state: 0, deleted_at: Date.now() },
-            where: where
-        });
+        const whereFiltered = addDefaultStateFilter(snakeWhere, snakeTable, false, this.beflyMode);
+        const builder = this.createSqlBuilder().where(whereFiltered);
+        const { sql, params } = builder.toUpdateSql(snakeTable, processed);
+        const executeRes = await this.execute(sql, params);
+        const changes = normalizeSqlMetaNumber(executeRes.data?.affectedRows);
+
+        return {
+            data: changes,
+            sql: executeRes.sql
+        };
     },
 
     async delForce(options) {
@@ -455,7 +463,7 @@ export const dataOpsMethods = {
         const { sql, params } = builder.toDeleteSql(snakeTable);
 
         const executeRes = await this.execute(sql, params);
-        const changes = toNumberFromSql(executeRes.data?.changes);
+        const changes = normalizeSqlMetaNumber(executeRes.data?.affectedRows);
         return {
             data: changes,
             sql: executeRes.sql
@@ -508,7 +516,7 @@ export const dataOpsMethods = {
         }
 
         const executeRes = await this.execute(sql, params);
-        const changes = toNumberFromSql(executeRes.data?.changes);
+        const changes = normalizeSqlMetaNumber(executeRes.data?.affectedRows);
         return {
             data: changes,
             sql: executeRes.sql

package/lib/dbHelper/util.js

@@ -1,4 +1,4 @@
-import { isNonEmptyString, isNullable, isString } from "../../utils/is.js";
+import { isNullable, isString } from "../../utils/is.js";
 import { canConvertToNumber, snakeCase } from "../../utils/util.js";
 import { parseTableRef } from "./validate.js";
 
@@ -41,101 +41,39 @@ export function getJoinMainQualifier(tableRef) {
     return snakeCase(parsed.table);
 }
 
-export function toNumberFromSql(value) {
+export function normalizeSqlMetaNumber(value) {
     if (isNullable(value)) {
         return 0;
     }
 
-    if (typeof value === "number") {
-        if (!Number.isFinite(value)) {
-            return 0;
-        }
-        return value;
-    }
-
-    if (typeof value === "bigint") {
-        const maxSafe = BigInt(Number.MAX_SAFE_INTEGER);
-        const minSafe = BigInt(Number.MIN_SAFE_INTEGER);
-        if (value <= maxSafe && value >= minSafe) {
-            return Number(value);
-        }
+    if (typeof value !== "number") {
         return 0;
     }
 
-    if (typeof value === "string") {
-        if (!value.trim()) {
-            return 0;
-        }
-        const parsed = Number(value);
-        if (!Number.isFinite(parsed)) {
-            return 0;
-        }
-        return parsed;
+    if (!Number.isFinite(value)) {
+        return 0;
     }
 
-    return 0;
+    return value;
 }
 
-export function convertBigIntFields(arr, fields) {
+export function normalizeBigIntValues(arr) {
     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;
-                        }
-                    }
+            if (typeof value === "bigint") {
+                const convertedNumber = canConvertToNumber(value);
+                if (convertedNumber !== null) {
+                    nextValue = convertedNumber;
+                } else {
+                    nextValue = String(value);
                 }
             }
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.20.0",
-    "gitHead": "218c4ffe07983e46bbb85f9e0a626a6b3b38c179",
+    "version": "3.20.1",
+    "gitHead": "8563274caa09eace7480d14da3552aec0ca24296",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [