befly 3.18.17 → 3.18.18

package/checks/config.js

@@ -42,7 +42,7 @@ const configSchema = z
                 password: noTrimString,
                 database: noTrimString,
                 max: z.number().min(1),
-                stateFilter: z.union([z.literal(0), z.literal(1)]).optional()
+                beflyMode: z.union([z.literal(0), z.literal(1)]).optional()
             })
             .strict(),
 

package/configs/beflyConfig.json

@@ -26,7 +26,7 @@
         "password": "root",
         "database": "befly_dev",
         "max": 10,
-        "stateFilter": 1
+        "beflyMode": 1
     },
 
     "redis": {

package/lib/dbHelper/builders.js

@@ -355,8 +355,8 @@ export function processJoinOn(on) {
     return result;
 }
 
-export function addDefaultStateFilter(where = {}, table, hasJoins = false, enableStateFilter = true) {
-    if (!enableStateFilter) {
+export function addDefaultStateFilter(where = {}, table, hasJoins = false, beflyMode = 1) {
+    if (beflyMode === 0) {
         return where;
     }
 
@@ -494,8 +494,10 @@ export function buildInsertRow(options) {
         result["id"] = options.id;
     }
 
-    result["created_at"] = options.now;
-    result["updated_at"] = options.now;
+    if (options.beflyMode !== 0) {
+        result["created_at"] = options.now;
+        result["updated_at"] = options.now;
+    }
     result["state"] = 1;
     return result;
 }
@@ -508,7 +510,9 @@ export function buildUpdateRow(options) {
     for (const [key, value] of Object.entries(userData)) {
         result[key] = value;
     }
-    result["updated_at"] = options.now;
+    if (options.beflyMode !== 0) {
+        result["updated_at"] = options.now;
+    }
     return result;
 }
 

package/lib/dbHelper/dataOps.js

@@ -13,7 +13,7 @@ export const dataOpsMethods = {
         const { table, where, joins, tableQualifier } = await this.prepareQueryOptions(options, "getCount.options");
         const hasJoins = Array.isArray(joins) && joins.length > 0;
 
-        const whereFiltered = addDefaultStateFilter(where, tableQualifier, hasJoins, this.enableStateFilter);
+        const whereFiltered = addDefaultStateFilter(where, tableQualifier, hasJoins, this.beflyMode);
         const result = await this.fetchCount({ table: table, joins: joins }, whereFiltered, "COUNT(*) as count");
 
         return {
@@ -26,7 +26,7 @@ export const dataOpsMethods = {
         const { table, fields, where, joins, tableQualifier } = await this.prepareQueryOptions(options, "getOne.options");
         const hasJoins = Array.isArray(joins) && joins.length > 0;
 
-        const whereFiltered = addDefaultStateFilter(where, tableQualifier, hasJoins, this.enableStateFilter);
+        const whereFiltered = addDefaultStateFilter(where, tableQualifier, hasJoins, this.beflyMode);
         const builder = this.createSqlBuilder().select(fields).from(table).where(whereFiltered);
         this.applyJoins(builder, joins);
 
@@ -50,7 +50,7 @@ export const dataOpsMethods = {
         validatePageLimitRange(prepared, options.table);
 
         const hasJoins = Array.isArray(prepared.joins) && prepared.joins.length > 0;
-        const whereFiltered = addDefaultStateFilter(prepared.where, prepared.tableQualifier, hasJoins, this.enableStateFilter);
+        const whereFiltered = addDefaultStateFilter(prepared.where, prepared.tableQualifier, hasJoins, this.beflyMode);
         const countResult = await this.fetchCount(prepared, whereFiltered, "COUNT(*) as total");
         const total = countResult.total;
 
@@ -102,7 +102,7 @@ export const dataOpsMethods = {
         const prepared = await this.prepareQueryOptions(prepareOptions, "getAll.options");
 
         const hasJoins = Array.isArray(prepared.joins) && prepared.joins.length > 0;
-        const whereFiltered = addDefaultStateFilter(prepared.where, prepared.tableQualifier, hasJoins, this.enableStateFilter);
+        const whereFiltered = addDefaultStateFilter(prepared.where, prepared.tableQualifier, hasJoins, this.beflyMode);
         const countResult = await this.fetchCount(prepared, whereFiltered, "COUNT(*) as total");
         const total = countResult.total;
 
@@ -150,7 +150,7 @@ export const dataOpsMethods = {
         validateNoJoinReadOptions(options, "exists", "exists 不支持 joins（请使用显式 query 或拆分查询）");
         const snakeTable = snakeCase(options.table);
         const snakeWhere = whereKeysToSnake(clearDeep(options.where || {}));
-        const whereFiltered = addDefaultStateFilter(snakeWhere, snakeTable, false, this.enableStateFilter);
+        const whereFiltered = addDefaultStateFilter(snakeWhere, snakeTable, false, this.beflyMode);
 
         const builder = this.createSqlBuilder().selectRaw("COUNT(1) as cnt").from(snakeTable).where(whereFiltered).limit(1);
         const { sql, params } = builder.toSelectSql();
@@ -194,7 +194,7 @@ export const dataOpsMethods = {
 
         let processed;
         if (this.idMode === "autoId") {
-            processed = buildInsertRow({ idMode: "autoId", data: data, now: now });
+            processed = buildInsertRow({ idMode: "autoId", data: data, now: now, beflyMode: this.beflyMode });
         } else {
             let id;
             try {
@@ -208,7 +208,7 @@ export const dataOpsMethods = {
                     table: table
                 });
             }
-            processed = buildInsertRow({ idMode: "timeId", data: data, id: id, now: now });
+            processed = buildInsertRow({ idMode: "timeId", data: data, id: id, now: now, beflyMode: this.beflyMode });
         }
 
         assertNoUndefinedInRecord(processed, `insData 插入数据 (table: ${snakeTable})`);
@@ -253,7 +253,7 @@ export const dataOpsMethods = {
         let processedList;
         if (this.idMode === "autoId") {
             processedList = dataList.map((data) => {
-                return buildInsertRow({ idMode: "autoId", data: data, now: now });
+                return buildInsertRow({ idMode: "autoId", data: data, now: now, beflyMode: this.beflyMode });
             });
         } else {
             const nextIds = [];
@@ -264,7 +264,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 });
+                return buildInsertRow({ idMode: "timeId", data: data, id: id, now: now, beflyMode: this.beflyMode });
             });
         }
 
@@ -383,10 +383,10 @@ export const dataOpsMethods = {
             rows: processedList,
             fields: fields,
             quoteIdent: quoteIdentMySql,
-            updatedAtField: "updated_at",
-            updatedAtValue: now,
+            updatedAtField: this.beflyMode === 1 ? "updated_at" : "",
+            updatedAtValue: this.beflyMode === 1 ? now : null,
             stateField: "state",
-            stateGtZero: true
+            stateGtZero: this.beflyMode === 1
         });
 
         const executeRes = await this.execute(query.sql, query.params);
@@ -404,8 +404,8 @@ export const dataOpsMethods = {
         const snakeTable = snakeCase(table);
         const snakeWhere = whereKeysToSnake(clearDeep(where));
 
-        const processed = buildUpdateRow({ data: data, now: Date.now(), allowState: true });
-        const whereFiltered = addDefaultStateFilter(snakeWhere, snakeTable, false, this.enableStateFilter);
+        const processed = buildUpdateRow({ data: data, now: Date.now(), allowState: true, beflyMode: this.beflyMode });
+        const whereFiltered = addDefaultStateFilter(snakeWhere, snakeTable, false, this.beflyMode);
         const builder = this.createSqlBuilder().where(whereFiltered);
         const { sql, params } = builder.toUpdateSql(snakeTable, processed);
 
@@ -423,7 +423,7 @@ export const dataOpsMethods = {
 
         return await this.updData({
             table: table,
-            data: { state: 0, deleted_at: Date.now() },
+            data: this.beflyMode === 1 ? { state: 0, deleted_at: Date.now() } : { state: 0 },
             where: where
         });
     },
@@ -478,7 +478,7 @@ export const dataOpsMethods = {
         const snakeField = snakeCase(field);
 
         const snakeWhere = whereKeysToSnake(clearDeep(where));
-        const whereFiltered = addDefaultStateFilter(snakeWhere, snakeTable, false, this.enableStateFilter);
+        const whereFiltered = addDefaultStateFilter(snakeWhere, snakeTable, false, this.beflyMode);
         const builder = this.createSqlBuilder().where(whereFiltered);
         const { sql: whereClause, params: whereParams } = builder.getWhereConditions();
 

package/lib/dbHelper/index.js

@@ -19,7 +19,7 @@ function DbHelper(options) {
     this.sql = options.sql || null;
     this.isTransaction = Boolean(options.sql);
     this.idMode = options.idMode === "autoId" ? "autoId" : "timeId";
-    this.enableStateFilter = options.stateFilter === 0 ? false : true;
+    this.beflyMode = options.beflyMode === 0 ? 0 : 1;
 }
 
 Object.assign(DbHelper.prototype, builderMethods, executeMethods, dataOpsMethods, transactionMethods);

package/lib/dbHelper/transaction.js

@@ -26,7 +26,7 @@ export const transactionMethods = {
 
         try {
             return await sql.begin(async (tx) => {
-                const trans = new this.constructor({ redis: this.redis, dbName: this.dbName, sql: tx, idMode: this.idMode, stateFilter: this.enableStateFilter ? 1 : 0 });
+                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);

package/lib/sqlBuilder/batch.js

@@ -97,8 +97,10 @@ export function toUpdateCaseByIdSql(options) {
         setSqlList.push(`${quotedField} = CASE ${quotedId} ${whenList.join(" ")} ELSE ${quotedField} END`);
     }
 
-    setSqlList.push(`${options.quoteIdent(options.updatedAtField)} = ?`);
-    args.push(options.updatedAtValue);
+    if (isNonEmptyString(options.updatedAtField)) {
+        setSqlList.push(`${options.quoteIdent(options.updatedAtField)} = ?`);
+        args.push(options.updatedAtValue);
+    }
 
     for (const id of ids) {
         args.push(id);

package/package.json

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

package/plugins/mysql.js

@@ -20,7 +20,7 @@ export default {
                 dbName: befly.config?.mysql?.database,
                 sql: Connect.getMysql(),
                 idMode: befly.config?.mysql?.idMode,
-                stateFilter: befly.config?.mysql?.stateFilter
+                beflyMode: befly.config?.mysql?.beflyMode
             });
 
             return dbManager;

package/scripts/syncDb/context.js

@@ -68,7 +68,7 @@ export async function prepareSyncDbBaseContext(mysqlConfig) {
         dbName: mysqlConfig.database,
         sql: Connect.getMysql(),
         idMode: mysqlConfig.idMode,
-        stateFilter: mysqlConfig.stateFilter
+        beflyMode: mysqlConfig.beflyMode
     });
 
     const dbColumns = await querySyncDbColumns(mysql);