wok-server 0.4.5 → 0.4.7

package/dist/mysql/manager/base.js

@@ -122,12 +122,13 @@ class BaseMysqlManager {
     }
     /**
      * 按条件查询第一条记录.
-     * @param table
-     * @param criteria
+     * @param table 表信息
+     * @param criteria 查询条件
+     * @param orderBy 排序规则，按先后顺序放入，每个规则是一个元组，第一个元素是字段名称，第二个元素是顺序
      * @returns
      */
-    findFirst(table, criteria) {
-        return this.queryWithConnection(conn => (0, ops_1.findFirst)(this.opts.config, conn, table, criteria));
+    findFirst(table, criteria, orderBy) {
+        return this.queryWithConnection(conn => (0, ops_1.findFirst)(this.opts.config, conn, table, criteria, orderBy));
     }
     /**
      * 插入数据. 不支持自增加长id,id必须提前生成，请使用 uuid.

package/dist/mysql/manager/ops/criteria.js

@@ -209,8 +209,9 @@ class MysqlCriteria {
             }
             if (typeof criterion.value !== 'number' &&
                 typeof criterion.value !== 'string' &&
+                typeof criterion.value !== 'boolean' &&
                 !(criterion.value instanceof Date)) {
-                throw new exception_1.MysqlException('The value of the query criteria is invalid，only number,string and Date are supported，' +
+                throw new exception_1.MysqlException('The value of the query criteria is invalid，only number,string,boolean and Date are supported，' +
                     `column name : ${criterion.key.toString()}，value : ${criterion.value} .`);
             }
         }

package/dist/mysql/manager/ops/find.js

@@ -97,14 +97,33 @@ exports.findByIdIn = findByIdIn;
  * @param criteria
  * @returns
  */
-async function findFirst(config, conn, table, criteria) {
+async function findFirst(config, conn, table, criteria, 
+/**
+ * 排序规则，按先后顺序放入，每个规则是一个元组，第一个元素是字段名称，第二个元素是顺序
+ */
+orderBy) {
     let query = criteria ? (0, criteria_1.buildQuery)(criteria) : undefined;
     let sql = `select * from ?? `;
+    const values = [table.tableName];
     if (query) {
         sql += ` where ${query.sql} `;
+        values.push(...query.values);
+    }
+    // 排序
+    if (orderBy && orderBy.length) {
+        orderBy.forEach((orderBy, idx) => {
+            const [field, sort] = orderBy;
+            if (idx == 0) {
+                sql += ` order by ?? ${sort} `;
+            }
+            else {
+                sql += ` , ?? ${sort} `;
+            }
+            values.push(field);
+        });
     }
     sql += ' limit 1';
-    const res = await (0, utils_1.promiseQuery)(config, conn, sql, [table.tableName].concat(query ? query.values : []));
+    const res = await (0, utils_1.promiseQuery)(config, conn, sql, values);
     const list = res;
     return list.length ? list[0] : null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wok-server",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "packageManager": "pnpm@8.9.0",
   "description": "一个基于 NodeJs 和 TypeScript 的后端框架，轻量级、克制、简洁。A lightweight, restrained, and concise backend framework based on Node.js and TypeScript.",
   "scripts": {

package/types/mysql/manager/base.d.ts

@@ -78,11 +78,12 @@ export declare abstract class BaseMysqlManager {
     findAll<T>(table: Table<T>): Promise<T[]>;
     /**
      * 按条件查询第一条记录.
-     * @param table
-     * @param criteria
+     * @param table 表信息
+     * @param criteria 查询条件
+     * @param orderBy 排序规则，按先后顺序放入，每个规则是一个元组，第一个元素是字段名称，第二个元素是顺序
      * @returns
      */
-    findFirst<T>(table: Table<T>, criteria?: MixCriteria<T>): Promise<T | null>;
+    findFirst<T>(table: Table<T>, criteria?: MixCriteria<T>, orderBy?: Array<[keyof T, 'asc' | 'desc']>): Promise<T | null>;
     /**
      * 插入数据. 不支持自增加长id,id必须提前生成，请使用 uuid.
      * @param table 表信息

package/types/mysql/manager/ops/find.d.ts

@@ -63,4 +63,8 @@ export declare function findByIdIn<T>(config: MysqlConfig, connection: PoolConne
  * @param criteria
  * @returns
  */
-export declare function findFirst<T>(config: MysqlConfig, conn: PoolConnection, table: Table<T>, criteria?: MixCriteria<T>): Promise<T | null>;
+export declare function findFirst<T>(config: MysqlConfig, conn: PoolConnection, table: Table<T>, criteria?: MixCriteria<T>, 
+/**
+ * 排序规则，按先后顺序放入，每个规则是一个元组，第一个元素是字段名称，第二个元素是顺序
+ */
+orderBy?: Array<[keyof T, 'asc' | 'desc']>): Promise<T | null>;