befly 3.16.4 → 3.16.5

package/dist/befly.js

@@ -13921,57 +13921,6 @@ var configPlugin = {
 };
 var config_default = configPlugin;
 
-// utils/convertBigIntFields.ts
-function convertBigIntFields(arr, fields = ["id", "pid", "sort"]) {
-  if (arr === null || arr === undefined) {
-    return arr;
-  }
-  const MAX_SAFE_INTEGER_BIGINT = BigInt(Number.MAX_SAFE_INTEGER);
-  const MIN_SAFE_INTEGER_BIGINT = BigInt(Number.MIN_SAFE_INTEGER);
-  const convertRecord = (source) => {
-    const converted = {};
-    for (const [key, value] of Object.entries(source)) {
-      converted[key] = value;
-    }
-    for (const [key, value] of Object.entries(converted)) {
-      if (value === undefined || value === null) {
-        continue;
-      }
-      const shouldConvert = fields.includes(key) || key.endsWith("Id") || key.endsWith("_id") || key.endsWith("At") || key.endsWith("_at");
-      if (!shouldConvert) {
-        continue;
-      }
-      let bigintValue = null;
-      if (typeof value === "bigint") {
-        bigintValue = value;
-      } else if (typeof value === "string") {
-        if (!/^-?\d+$/.test(value)) {
-          continue;
-        }
-        try {
-          bigintValue = BigInt(value);
-        } catch {
-          continue;
-        }
-      } else {
-        continue;
-      }
-      if (bigintValue > MAX_SAFE_INTEGER_BIGINT || bigintValue < MIN_SAFE_INTEGER_BIGINT) {
-        throw new Error(`BIGINT \u5B57\u6BB5\u8D85\u51FA JS \u5B89\u5168\u6574\u6570\u8303\u56F4\uFF0C\u8BF7\u6539\u7528 bigint/string \u6216\u8C03\u6574\u5B57\u6BB5\u8BBE\u8BA1 (field: ${key}, value: ${String(value)})`);
-      }
-      converted[key] = Number(bigintValue);
-    }
-    return converted;
-  };
-  if (Array.isArray(arr)) {
-    return arr.map((item) => convertRecord(item));
-  }
-  if (typeof arr === "object") {
-    return convertRecord(arr);
-  }
-  return arr;
-}
-
 // lib/dbHelper.ts
 init_util();
 
@@ -15350,6 +15299,72 @@ class DbHelper {
   sql = null;
   isTransaction = false;
   idMode;
+  static convertBigIntFields(arr, fields) {
+    if (arr === null || arr === undefined) {
+      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 (typeof f !== "string") {
+          continue;
+        }
+        const trimmed = f.trim();
+        if (trimmed.length === 0) {
+          continue;
+        }
+        if (!merged.includes(trimmed)) {
+          merged.push(trimmed);
+        }
+      }
+      return merged;
+    };
+    const effectiveFields = buildFields(fields);
+    const fieldSet = new Set(effectiveFields);
+    const MAX_SAFE_INTEGER_BIGINT = BigInt(Number.MAX_SAFE_INTEGER);
+    const MIN_SAFE_INTEGER_BIGINT = BigInt(Number.MIN_SAFE_INTEGER);
+    const convertRecord = (source) => {
+      const converted = {};
+      for (const [key, value] of Object.entries(source)) {
+        let nextValue = value;
+        if (value !== undefined && value !== null) {
+          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 (typeof value === "string") {
+              if (/^-?\d+$/.test(value)) {
+                try {
+                  bigintValue = BigInt(value);
+                } catch {
+                  bigintValue = null;
+                }
+              }
+            }
+            if (bigintValue !== null) {
+              if (bigintValue <= MAX_SAFE_INTEGER_BIGINT && bigintValue >= MIN_SAFE_INTEGER_BIGINT) {
+                nextValue = Number(bigintValue);
+              }
+            }
+          }
+        }
+        converted[key] = nextValue;
+      }
+      return converted;
+    };
+    if (Array.isArray(arr)) {
+      return arr.map((item) => convertRecord(item));
+    }
+    if (typeof arr === "object") {
+      return convertRecord(arr);
+    }
+    return arr;
+  }
   constructor(options) {
     this.redis = options.redis;
     if (typeof options.dbName !== "string" || options.dbName.trim() === "") {
@@ -15524,7 +15539,7 @@ class DbHelper {
         sql: execRes.sql
       };
     }
-    const convertedList = convertBigIntFields([deserialized]);
+    const convertedList = DbHelper.convertBigIntFields([deserialized], options.bigint);
     const data = convertedList[0] ?? deserialized;
     return {
       data,
@@ -15575,7 +15590,7 @@ class DbHelper {
     const deserializedList = camelList.map((item) => DbUtils.deserializeArrayFields(item)).filter((item) => item !== null);
     return {
       data: {
-        lists: convertBigIntFields(deserializedList),
+        lists: DbHelper.convertBigIntFields(deserializedList, options.bigint),
         total,
         page: prepared.page,
         limit: prepared.limit,
@@ -15597,6 +15612,8 @@ class DbHelper {
     };
     if (options.fields !== undefined)
       prepareOptions.fields = options.fields;
+    if (options.bigint !== undefined)
+      prepareOptions.bigint = options.bigint;
     if (options.where !== undefined)
       prepareOptions.where = options.where;
     if (options.joins !== undefined)
@@ -15637,7 +15654,7 @@ class DbHelper {
     }
     const camelResult = arrayKeysToCamel(result);
     const deserializedList = camelResult.map((item) => DbUtils.deserializeArrayFields(item)).filter((item) => item !== null);
-    const lists = convertBigIntFields(deserializedList);
+    const lists = DbHelper.convertBigIntFields(deserializedList, options.bigint);
     return {
       data: {
         lists,