befly 2.0.9 → 2.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "2.0.9",
+    "version": "2.0.10",
     "description": "Buma - 为 Bun 专属打造的 API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -51,5 +51,5 @@
         "README.md",
         "vitest.config.js"
     ],
-    "gitHead": "8e34968490883f145666d4cbd4bad89569b3aed8"
+    "gitHead": "e87ddebec60d7dcde96510b2177ec23719972f54"
 }

package/plugins/db.js

@@ -216,7 +216,7 @@ export default {
                             }
 
                             const { sql, params } = builder.toSelectSql();
-                            const list = await this.#executeWithConn(sql, params, conn);
+                            const rows = await this.#executeWithConn(sql, params, conn);
 
                             // 获取总数（如果需要分页）
                             let total = 0;
@@ -241,7 +241,7 @@ export default {
                             }
 
                             return {
-                                list: Array.isArray(list) ? list : [],
+                                rows: Array.isArray(rows) ? rows : [],
                                 total,
                                 page: numPage,
                                 pageSize: numPageSize

package/utils/curd.js

@@ -192,43 +192,31 @@ export class SqlBuilder {
         return this;
     }
 
-    orderBy(field, direction = 'ASC') {
-        if (Array.isArray(field)) {
-            field.forEach((item) => {
-                if (typeof item === 'string' && item.includes('#')) {
-                    const [fieldName, dir] = item.split('#');
-                    const cleanDir = (dir || 'ASC').trim().toUpperCase();
-                    if (!['ASC', 'DESC'].includes(cleanDir)) {
-                        throw new Error('ORDER BY direction must be ASC or DESC');
-                    }
-                    this._orderBy.push(`${fieldName.trim()} ${cleanDir}`);
-                } else if (Array.isArray(item) && item.length >= 1) {
-                    const [fieldName, dir] = item;
-                    const cleanDir = (dir || 'ASC').toUpperCase();
-                    if (!['ASC', 'DESC'].includes(cleanDir)) {
-                        throw new Error('ORDER BY direction must be ASC or DESC');
-                    }
-                    this._orderBy.push(`${fieldName} ${cleanDir}`);
-                } else if (typeof item === 'string') {
-                    this._orderBy.push(`${item} ASC`);
-                }
-            });
-        } else if (typeof field === 'string') {
-            if (field.includes('#')) {
-                const [fieldName, dir] = field.split('#');
-                const cleanDir = (dir || 'ASC').trim().toUpperCase();
-                if (!['ASC', 'DESC'].includes(cleanDir)) {
-                    throw new Error('ORDER BY direction must be ASC or DESC');
-                }
-                this._orderBy.push(`${fieldName.trim()} ${cleanDir}`);
-            } else {
-                const cleanDir = direction.toUpperCase();
-                if (!['ASC', 'DESC'].includes(cleanDir)) {
-                    throw new Error('ORDER BY direction must be ASC or DESC');
-                }
-                this._orderBy.push(`${field} ${cleanDir}`);
-            }
+    orderBy(fields) {
+        if (!Array.isArray(fields)) {
+            throw new Error('orderBy must be an array of strings in "field#direction" format');
         }
+
+        fields.forEach((item) => {
+            if (typeof item !== 'string' || !item.includes('#')) {
+                throw new Error('orderBy field must be a string in "field#direction" format (e.g., "name#ASC", "id#DESC")');
+            }
+
+            const [fieldName, direction] = item.split('#');
+            const cleanField = fieldName.trim();
+            const cleanDir = direction.trim().toUpperCase();
+
+            if (!cleanField) {
+                throw new Error('Field name cannot be empty in orderBy');
+            }
+
+            if (!['ASC', 'DESC'].includes(cleanDir)) {
+                throw new Error('ORDER BY direction must be ASC or DESC');
+            }
+
+            this._orderBy.push(`${cleanField} ${cleanDir}`);
+        });
+
         return this;
     }