befly 3.19.9 → 3.20.1

package/checks/config.js

@@ -1,7 +1,7 @@
 import * as z from "zod";
 
 import { Logger } from "../lib/logger.js";
-import { DB_ID_MODE_VALUES, RUN_MODE_VALUES } from "../configs/constConfig.js";
+import { RUN_MODE_VALUES } from "../configs/constConfig.js";
 import { formatZodIssues } from "../utils/formatZodIssues.js";
 import { isNoTrimStringAllowEmpty, isValidTimeZone } from "../utils/is.js";
 
@@ -9,6 +9,7 @@ z.config(z.locales.zhCN());
 
 const boolIntSchema = z.union([z.literal(0), z.literal(1), z.literal(true), z.literal(false)]);
 const noTrimString = z.string().refine(isNoTrimStringAllowEmpty, "不允许首尾空格");
+const beflyModeSchema = z.union([z.literal("manual"), z.literal("auto")]);
 
 const configSchema = z
     .object({
@@ -36,14 +37,13 @@ const configSchema = z
 
         mysql: z
             .object({
-                idMode: z.enum(DB_ID_MODE_VALUES),
                 hostname: noTrimString,
                 port: z.int().min(1).max(65535),
                 username: noTrimString,
                 password: noTrimString,
                 database: noTrimString,
                 max: z.number().min(1),
-                beflyMode: z.union([z.literal(0), z.literal(1)]).optional()
+                beflyMode: beflyModeSchema.optional()
             })
             .strict(),
 

package/configs/beflyConfig.json

@@ -20,14 +20,13 @@
     },
 
     "mysql": {
-        "idMode": "timeId",
         "hostname": "127.0.0.1",
         "port": 3306,
         "username": "root",
         "password": "root",
         "database": "befly_dev",
         "max": 10,
-        "beflyMode": 1
+        "beflyMode": "auto"
     },
 
     "redis": {

package/configs/constConfig.js

@@ -30,9 +30,6 @@ export const ENUM_KIND_TYPES = ["enum"];
 // 运行模式可选值
 export const RUN_MODE_VALUES = ["development", "production"];
 
-// 数据库 ID 生成模式可选值
-export const DB_ID_MODE_VALUES = ["timeId", "autoId"];
-
 // ==========================
 // 字段验证规则配置
 // ==========================

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) {
@@ -354,8 +354,8 @@ export function processJoinOn(on) {
     return result;
 }
 
-export function addDefaultStateFilter(where = {}, table, hasJoins = false, beflyMode = 1) {
-    if (beflyMode === 0) {
+export function addDefaultStateFilter(where = {}, table, hasJoins = false, beflyMode = "auto") {
+    if (beflyMode === "manual") {
         return where;
     }
 
@@ -488,12 +488,12 @@ export function buildInsertRow(options) {
         result[key] = value;
     }
 
-    if (options.idMode === "timeId") {
+    if (options.beflyMode === "auto") {
         validateTimeIdValue(options.id);
         result["id"] = options.id;
     }
 
-    if (options.beflyMode !== 0) {
+    if (options.beflyMode !== "manual") {
         result["created_at"] = options.now;
         result["updated_at"] = options.now;
         result["state"] = 1;
@@ -509,7 +509,7 @@ export function buildUpdateRow(options) {
     for (const [key, value] of Object.entries(userData)) {
         result[key] = value;
     }
-    if (options.beflyMode !== 0) {
+    if (options.beflyMode !== "manual") {
         result["updated_at"] = options.now;
     }
     return result;
@@ -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: {
@@ -192,9 +192,8 @@ export const dataOpsMethods = {
         const now = Date.now();
 
         let processed;
-        if (this.idMode === "autoId") {
+        if (this.beflyMode === "manual") {
             processed = buildInsertRow({
-                idMode: "autoId",
                 data: data,
                 now: now,
                 beflyMode: this.beflyMode
@@ -213,7 +212,6 @@ export const dataOpsMethods = {
                 });
             }
             processed = buildInsertRow({
-                idMode: "timeId",
                 data: data,
                 id: id,
                 now: now,
@@ -229,11 +227,11 @@ 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.idMode === "autoId" ? lastInsertRowidNum || 0 : processedIdNum || lastInsertRowidNum || 0;
-        if (this.idMode === "autoId" && insertedId <= 0) {
-            throw new Error(`插入失败：autoId 模式下无法获取 lastInsertRowid (table: ${table})`, {
+        const insertedId = this.beflyMode === "manual" ? lastInsertRowidNum || 0 : processedIdNum || lastInsertRowidNum || 0;
+        if (this.beflyMode === "manual" && insertedId <= 0) {
+            throw new Error(`插入失败：beflyMode=manual 时无法获取 lastInsertRowid (table: ${table})`, {
                 cause: null,
                 code: "runtime"
             });
@@ -261,9 +259,9 @@ export const dataOpsMethods = {
         let ids = [];
 
         let processedList;
-        if (this.idMode === "autoId") {
+        if (this.beflyMode === "manual") {
             processedList = dataList.map((data) => {
-                return buildInsertRow({ idMode: "autoId", data: data, now: now, beflyMode: this.beflyMode });
+                return buildInsertRow({ data: data, now: now, beflyMode: this.beflyMode });
             });
         } else {
             const nextIds = [];
@@ -274,7 +272,7 @@ export const dataOpsMethods = {
             processedList = dataList.map((data, index) => {
                 const id = nextIds[index];
                 validateGeneratedBatchId(id, snakeTable, index);
-                return buildInsertRow({ idMode: "timeId", data: data, id: id, now: now, beflyMode: this.beflyMode });
+                return buildInsertRow({ data: data, id: id, now: now, beflyMode: this.beflyMode });
             });
         }
 
@@ -285,10 +283,10 @@ export const dataOpsMethods = {
         try {
             const executeRes = await this.execute(sql, params);
 
-            if (this.idMode === "autoId") {
-                const firstId = toNumberFromSql(executeRes.data?.lastInsertRowid);
+            if (this.beflyMode === "manual") {
+                const firstId = normalizeSqlMetaNumber(executeRes.data?.lastInsertRowid);
                 if (firstId <= 0) {
-                    throw new Error(`批量插入失败：autoId 模式下无法获取 lastInsertRowid (table: ${table})`, {
+                    throw new Error(`批量插入失败：beflyMode=manual 时无法获取 lastInsertRowid (table: ${table})`, {
                         cause: null,
                         code: "runtime"
                     });
@@ -347,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
@@ -393,14 +391,14 @@ export const dataOpsMethods = {
             rows: processedList,
             fields: fields,
             quoteIdent: quoteIdentMySql,
-            updatedAtField: this.beflyMode === 1 ? "updated_at" : "",
-            updatedAtValue: this.beflyMode === 1 ? now : null,
+            updatedAtField: this.beflyMode === "auto" ? "updated_at" : "",
+            updatedAtValue: this.beflyMode === "auto" ? now : null,
             stateField: "state",
-            stateGtZero: this.beflyMode === 1
+            stateGtZero: this.beflyMode === "auto"
         });
 
         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
@@ -420,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
@@ -430,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=0：关闭默认 state 软删语义，delData 直接走物理删除
-        if (this.beflyMode === 0) {
-            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) {
@@ -457,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
@@ -510,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
@@ -552,7 +558,6 @@ export const dataOpsMethods = {
                     dbName: this.dbName,
                     sql: tx,
                     isTransaction: true,
-                    idMode: this.idMode,
                     beflyMode: this.beflyMode
                 });
                 const result = await callback(trans);

package/lib/dbHelper/index.js

@@ -16,8 +16,7 @@ function DbHelper(options) {
 
     this.sql = options.sql || null;
     this.isTransaction = options.isTransaction === true;
-    this.idMode = options.idMode === "autoId" ? "autoId" : "timeId";
-    this.beflyMode = options.beflyMode === 0 ? 0 : 1;
+    this.beflyMode = options.beflyMode === "manual" ? "manual" : "auto";
 }
 
 Object.assign(DbHelper.prototype, builderMethods, executeMethods, dataOpsMethods);

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.19.9",
-    "gitHead": "558ea1598bb0547b5b068a1c014ea1f4d48939d5",
+    "version": "3.20.1",
+    "gitHead": "8563274caa09eace7480d14da3552aec0ca24296",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [

package/plugins/mysql.js

@@ -19,7 +19,6 @@ export default {
                 redis: befly.redis,
                 dbName: befly.config?.mysql?.database,
                 sql: Connect.getMysql(),
-                idMode: befly.config?.mysql?.idMode,
                 beflyMode: befly.config?.mysql?.beflyMode
             });
 

package/scripts/syncDb/context.js

@@ -64,13 +64,13 @@ export async function prepareSyncDbBaseContext(mysqlConfig) {
         });
     }
 
+    printSyncDbProcessLog(`beflyMode=${mysqlConfig.beflyMode === "manual" ? "manual" : "auto"}`);
     printSyncDbProcessLog(`连接 MySQL，database=${mysqlConfig.database}`);
     await Connect.connectMysql(mysqlConfig);
     const mysql = new DbHelper({
         redis: null,
         dbName: mysqlConfig.database,
         sql: Connect.getMysql(),
-        idMode: mysqlConfig.idMode,
         beflyMode: mysqlConfig.beflyMode
     });
 
@@ -94,7 +94,7 @@ export async function prepareSyncDbBaseContext(mysqlConfig) {
 
     const groupedDbColumns = groupSyncDbColumns(dbColumns);
     const existingTableMap = await loadSyncDbTableDefs(tablesDir);
-    const diff = buildSyncDbDiff(groupedDbColumns, existingTableMap);
+    const diff = buildSyncDbDiff(groupedDbColumns, existingTableMap, mysqlConfig.beflyMode);
     printSyncDbProcessLog(`tables定义文件数量=${existingTableMap.size}`);
     printSyncDbProcessLog(`差异扫描完成，missingTableCount=${diff.missingTables.length}，missingFieldCount=${Object.values(diff.missingFieldsByTable).reduce((sum, item) => sum + item.fields.length, 0)}`);
 

package/scripts/syncDb/diff.js

@@ -5,6 +5,17 @@ import { camelCase } from "../../utils/util.js";
 import { printSyncDbProcessLog } from "./report.js";
 import { toSyncDbFieldDef } from "./transform.js";
 
+const SYNC_DB_MANAGED_FIELD_NAMES = new Set(["id", "created_at", "updated_at", "deleted_at", "state"]);
+
+function shouldSkipSyncDbColumn(columnMeta, beflyMode) {
+    if (beflyMode !== "manual") {
+        return false;
+    }
+
+    const columnName = String(columnMeta?.columnName || "").toLowerCase();
+    return SYNC_DB_MANAGED_FIELD_NAMES.has(columnName);
+}
+
 export function groupSyncDbColumns(rows) {
     const grouped = new Map();
 
@@ -37,26 +48,31 @@ export function groupSyncDbColumns(rows) {
     return grouped;
 }
 
-export function buildSyncDbDiff(groupedDbColumns, existingTableMap) {
+export function buildSyncDbDiff(groupedDbColumns, existingTableMap, beflyMode = "auto") {
     const missingTables = [];
     const missingFieldsByTable = {};
 
     for (const [tableName, columns] of groupedDbColumns.entries()) {
         const tableFileName = camelCase(tableName);
         const existing = existingTableMap.get(String(tableFileName).toLowerCase());
+        const filteredColumns = columns.filter((columnMeta) => !shouldSkipSyncDbColumn(columnMeta, beflyMode));
 
         if (!existing) {
+            if (filteredColumns.length === 0) {
+                continue;
+            }
+
             missingTables.push({
                 tableName: tableName,
                 tableFileName: tableFileName,
-                columns: columns
+                columns: filteredColumns
             });
             continue;
         }
 
         const existingFields = isPlainObject(existing.tableDef) ? existing.tableDef : {};
         const missingFields = [];
-        for (const columnMeta of columns) {
+        for (const columnMeta of filteredColumns) {
             const fieldInfo = toSyncDbFieldDef(columnMeta);
             if (Object.hasOwn(existingFields, fieldInfo.fieldName)) {
                 continue;