befly 3.20.0 → 3.20.4

package/LICENSE

@@ -1,201 +1,201 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

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,9 +2,48 @@ 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";
 
+function shouldExcludeFieldValue(key, value, excludeValueMap) {
+    if (!isPlainObject(excludeValueMap)) {
+        return false;
+    }
+
+    const excludeValues = excludeValueMap[key];
+    if (!Array.isArray(excludeValues) || excludeValues.length === 0) {
+        return false;
+    }
+
+    for (const excludeValue of excludeValues) {
+        if (Object.is(value, excludeValue)) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+function mergeExcludeValueMap(parentMap, currentMap) {
+    if (!isPlainObject(parentMap) && !isPlainObject(currentMap)) {
+        return null;
+    }
+
+    const result = {};
+    if (isPlainObject(parentMap)) {
+        for (const [key, value] of Object.entries(parentMap)) {
+            result[key] = value;
+        }
+    }
+    if (isPlainObject(currentMap)) {
+        for (const [key, value] of Object.entries(currentMap)) {
+            result[key] = value;
+        }
+    }
+
+    return result;
+}
+
 export function clearDeep(value, options) {
     const arrayObjectKeys = Array.isArray(options?.arrayObjectKeys) ? options.arrayObjectKeys : ["$or", "$and"];
     const arrayObjectKeySet = new Set();
@@ -15,7 +54,7 @@ export function clearDeep(value, options) {
     const depthRaw = isFiniteNumber(options?.depth) ? Math.floor(options.depth) : 0;
     const depth = depthRaw < 0 ? 0 : depthRaw;
 
-    const clearInternal = (input, remainingDepth) => {
+    const clearInternal = (input, remainingDepth, inheritedExcludeValueMap) => {
         if (!input || typeof input !== "object") {
             return input;
         }
@@ -27,12 +66,21 @@ export function clearDeep(value, options) {
         const canRecurse = remainingDepth === 0 || remainingDepth > 1;
         const childDepth = remainingDepth === 0 ? 0 : remainingDepth - 1;
         const result = {};
+        const currentExcludeValueMap = mergeExcludeValueMap(inheritedExcludeValueMap, input.$exclude);
 
         for (const [key, item] of Object.entries(input)) {
+            if (key === "$exclude") {
+                continue;
+            }
+
             if (isNullable(item)) {
                 continue;
             }
 
+            if (shouldExcludeFieldValue(key, item, currentExcludeValueMap)) {
+                continue;
+            }
+
             if (arrayObjectKeySet.has(key)) {
                 if (!Array.isArray(item)) {
                     continue;
@@ -43,7 +91,7 @@ export function clearDeep(value, options) {
                     if (!child || typeof child !== "object" || Array.isArray(child)) {
                         continue;
                     }
-                    const cleaned = clearInternal(child, remainingDepth);
+                    const cleaned = clearInternal(child, remainingDepth, currentExcludeValueMap);
                     if (!cleaned || typeof cleaned !== "object" || Array.isArray(cleaned)) {
                         continue;
                     }
@@ -65,7 +113,7 @@ export function clearDeep(value, options) {
                     continue;
                 }
 
-                const cleanedObj = clearInternal(item, childDepth);
+                const cleanedObj = clearInternal(item, childDepth, currentExcludeValueMap);
                 if (!cleanedObj || typeof cleanedObj !== "object" || Array.isArray(cleanedObj)) {
                     continue;
                 }
@@ -82,7 +130,7 @@ export function clearDeep(value, options) {
         return result;
     };
 
-    return clearInternal(value, depth);
+    return clearInternal(value, depth, options?.excludeValueMap);
 }
 
 export async function fieldsToSnake(table, fields, getTableColumns) {
@@ -542,14 +590,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 +610,7 @@ export const builderMethods = {
             return {};
         }
 
-        const convertedList = convertBigIntFields([deserialized], bigintFields);
+        const convertedList = normalizeBigIntValues([deserialized]);
         if (convertedList && convertedList.length > 0) {
             return convertedList[0];
         }
@@ -568,10 +618,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 +665,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/lib/dbHelper/validate.js

@@ -36,6 +36,57 @@ export function validateWhereObject(where, label, required = false) {
             code: "validation"
         });
     }
+
+    validateWhereMeta(where, label);
+}
+
+function validateExcludeRules(excludeRules, label) {
+    if (isNullable(excludeRules)) {
+        return;
+    }
+
+    if (!isPlainObject(excludeRules)) {
+        throw new Error(`${label} 必须是对象`, {
+            cause: null,
+            code: "validation"
+        });
+    }
+
+    for (const [key, value] of Object.entries(excludeRules)) {
+        assertNonEmptyString(key, `${label} 的字段名`);
+        if (!Array.isArray(value)) {
+            throw new Error(`${label}.${key} 必须是数组`, {
+                cause: null,
+                code: "validation"
+            });
+        }
+    }
+}
+
+function validateWhereMeta(where, label) {
+    if (!isPlainObject(where)) {
+        return;
+    }
+
+    for (const [key, value] of Object.entries(where)) {
+        if (key === "$exclude") {
+            validateExcludeRules(value, `${label}.$exclude`);
+            continue;
+        }
+
+        if ((key === "$or" || key === "$and") && Array.isArray(value)) {
+            for (let i = 0; i < value.length; i++) {
+                if (isPlainObject(value[i])) {
+                    validateWhereMeta(value[i], `${label}.${key}[${i}]`);
+                }
+            }
+            continue;
+        }
+
+        if (isPlainObject(value)) {
+            validateWhereMeta(value, `${label}.${key}`);
+        }
+    }
 }
 
 function validateOrderByItems(orderBy, label) {

package/package.json

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