befly 3.16.2 → 3.16.4

package/dist/befly.js

@@ -1405,7 +1405,7 @@ function normalizeViewDirMeta(input) {
     return null;
   }
   const orderRaw = record["order"];
-  const order = typeof orderRaw === "number" && Number.isFinite(orderRaw) && Number.isInteger(orderRaw) && orderRaw >= 0 ? orderRaw : undefined;
+  const order = typeof orderRaw === "number" && Number.isFinite(orderRaw) && Number.isInteger(orderRaw) && orderRaw >= 1 ? orderRaw : undefined;
   if (order === undefined) {
     return {
       title
@@ -13972,6 +13972,9 @@ function convertBigIntFields(arr, fields = ["id", "pid", "sort"]) {
   return arr;
 }
 
+// lib/dbHelper.ts
+init_util();
+
 // utils/fieldClear.ts
 function isObject(val) {
   return val !== null && typeof val === "object" && !Array.isArray(val);
@@ -14022,9 +14025,6 @@ function fieldClear(data, options = {}) {
   return data;
 }
 
-// lib/dbHelper.ts
-init_util();
-
 // lib/dbUtils.ts
 init_util();
 
@@ -14137,6 +14137,73 @@ class SqlCheck {
 
 // lib/dbUtils.ts
 class DbUtils {
+  static clearDeep(value, options) {
+    const arrayObjectKeys = Array.isArray(options?.arrayObjectKeys) ? options.arrayObjectKeys : ["$or", "$and"];
+    const arrayObjectKeySet = new Set;
+    for (const key of arrayObjectKeys) {
+      arrayObjectKeySet.add(key);
+    }
+    const depthRaw = typeof options?.depth === "number" && Number.isFinite(options.depth) ? Math.floor(options.depth) : 0;
+    const depth = depthRaw < 0 ? 0 : depthRaw;
+    const clearInternal = (input, remainingDepth) => {
+      if (!input || typeof input !== "object") {
+        return input;
+      }
+      if (Array.isArray(input)) {
+        return input;
+      }
+      const canRecurse = remainingDepth === 0 || remainingDepth > 1;
+      const childDepth = remainingDepth === 0 ? 0 : remainingDepth - 1;
+      const result = {};
+      for (const [key, item] of Object.entries(input)) {
+        if (item === undefined || item === null) {
+          continue;
+        }
+        if (arrayObjectKeySet.has(key)) {
+          if (!Array.isArray(item)) {
+            continue;
+          }
+          const arrayChildDepth = remainingDepth;
+          const outList = [];
+          for (const child of item) {
+            if (!child || typeof child !== "object" || Array.isArray(child)) {
+              continue;
+            }
+            const cleaned = clearInternal(child, arrayChildDepth);
+            if (!cleaned || typeof cleaned !== "object" || Array.isArray(cleaned)) {
+              continue;
+            }
+            if (Object.keys(cleaned).length === 0) {
+              continue;
+            }
+            outList.push(cleaned);
+          }
+          if (outList.length > 0) {
+            result[key] = outList;
+          }
+          continue;
+        }
+        if (typeof item === "object" && !Array.isArray(item)) {
+          if (!canRecurse) {
+            result[key] = item;
+            continue;
+          }
+          const cleanedObj = clearInternal(item, childDepth);
+          if (!cleanedObj || typeof cleanedObj !== "object" || Array.isArray(cleanedObj)) {
+            continue;
+          }
+          if (Object.keys(cleanedObj).length === 0) {
+            continue;
+          }
+          result[key] = cleanedObj;
+          continue;
+        }
+        result[key] = item;
+      }
+      return result;
+    };
+    return clearInternal(value, depth);
+  }
   static parseTableRef(tableRef) {
     if (typeof tableRef !== "string") {
       throw new Error(`tableRef \u5FC5\u987B\u662F\u5B57\u7B26\u4E32 (tableRef: ${String(tableRef)})`);
@@ -15313,7 +15380,7 @@ class DbHelper {
     return columnNames;
   }
   async prepareQueryOptions(options) {
-    const cleanWhere = fieldClear(options.where || {}, { excludeValues: [null, undefined] });
+    const cleanWhere = DbUtils.clearDeep(options.where || {});
     const hasJoins = options.joins && options.joins.length > 0;
     if (hasJoins) {
       const processedFields2 = (options.fields || []).map((f) => DbUtils.processJoinField(f));
@@ -15765,7 +15832,7 @@ class DbHelper {
   }
   async updData(options) {
     const { table, data, where } = options;
-    const cleanWhere = fieldClear(where, { excludeValues: [null, undefined] });
+    const cleanWhere = DbUtils.clearDeep(where);
     const snakeTable = snakeCase(table);
     const snakeWhere = DbUtils.whereKeysToSnake(cleanWhere);
     const processed = DbUtils.buildUpdateRow({ data, now: Date.now(), allowState: true });
@@ -15790,7 +15857,7 @@ class DbHelper {
   async delForce(options) {
     const { table, where } = options;
     const snakeTable = snakeCase(table);
-    const cleanWhere = fieldClear(where, { excludeValues: [null, undefined] });
+    const cleanWhere = DbUtils.clearDeep(where);
     const snakeWhere = DbUtils.whereKeysToSnake(cleanWhere);
     const builder = this.createSqlBuilder().where(snakeWhere);
     const { sql, params } = builder.toDeleteSql(snakeTable);
@@ -15855,7 +15922,7 @@ class DbHelper {
       throw new Error(`exists \u4E0D\u652F\u6301 schema.table \u5199\u6CD5\uFF08table: ${rawTable}\uFF09`);
     }
     const snakeTable = snakeCase(rawTable);
-    const cleanWhere = fieldClear(options.where || {}, { excludeValues: [null, undefined] });
+    const cleanWhere = DbUtils.clearDeep(options.where || {});
     const snakeWhere = DbUtils.whereKeysToSnake(cleanWhere);
     const whereFiltered = DbUtils.addDefaultStateFilter(snakeWhere, snakeTable, false);
     const builder = this.createSqlBuilder().selectRaw("COUNT(1) as cnt").from(snakeTable).where(whereFiltered).limit(1);
@@ -15941,7 +16008,7 @@ class DbHelper {
     if (typeof value !== "number" || isNaN(value)) {
       throw new Error(`\u81EA\u589E\u503C\u5FC5\u987B\u662F\u6709\u6548\u7684\u6570\u5B57 (table: ${table}, field: ${field}, value: ${value})`);
     }
-    const cleanWhere = fieldClear(where, { excludeValues: [null, undefined] });
+    const cleanWhere = DbUtils.clearDeep(where);
     const snakeWhere = DbUtils.whereKeysToSnake(cleanWhere);
     const whereFiltered = DbUtils.addDefaultStateFilter(snakeWhere, snakeTable, false);
     const builder = this.createSqlBuilder().where(whereFiltered);