@maiyunnet/kebab 6.1.0 → 6.2.1

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "6.1.0";
+export declare const VER = "6.2.1";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;

package/index.js

@@ -6,7 +6,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export const VER = '6.1.0';
+export const VER = '6.2.1';
 // --- 服务端用的路径 ---
 const imu = decodeURIComponent(import.meta.url).replace('file://', '').replace(/^\/(\w:)/, '$1');
 /** --- /xxx/xxx --- */

package/lib/kv.d.ts

@@ -230,7 +230,43 @@ export declare class Kv {
     bRPop(key: string | string[], timeout: number): Promise<Record<string, string> | false>;
     lRange(key: string, start: number, stop: number): Promise<string[] | false>;
     lLen(key: string): Promise<number | false>;
+    /**
+     * --- 添加有序集合元素（单个元素） ---
+     * @param key key 名
+     * @param score 分数
+     * @param member 成员
+     */
     zAdd(key: string, score: number, member: string | Buffer): Promise<boolean>;
+    /**
+     * --- 添加有序集合元素（多个元素，含 INCR 选项） ---
+     * @param key key 名
+     * @param elements 元素数组
+     * @param options 选项，需要 INCR
+     */
+    zAdd(key: string, elements: Array<{
+        'score': number;
+        'member': string | Buffer;
+    }>, options: redis.IZAddOptionsIncr): Promise<number | false>;
+    /**
+     * --- 添加有序集合元素（多个元素，含 INCR 选项，可空） ---
+     * @param key key 名
+     * @param elements 元素数组
+     * @param options 选项，需要 INCR Nullable
+     */
+    zAdd(key: string, elements: Array<{
+        'score': number;
+        'member': string | Buffer;
+    }>, options: redis.IZAddOptionsIncrNullable): Promise<number | null | false>;
+    /**
+     * --- 添加有序集合元素（多个元素） ---
+     * @param key key 名
+     * @param elements 元素数组
+     * @param options 选项
+     */
+    zAdd(key: string, elements: Array<{
+        'score': number;
+        'member': string | Buffer;
+    }>, options?: redis.IZAddOptions): Promise<number | false>;
     zRangeWithScores(key: string, start: number, stop: number, options?: IZRangeOptions): Promise<Array<{
         member: string;
         score: number;

package/lib/kv.js

@@ -728,13 +728,16 @@ end`;
             return false;
         }
     }
-    async zAdd(key, score, member) {
+    /**
+     * --- 添加有序集合元素 ---
+     */
+    async zAdd(key, scoreOrItems, memberOrOptions) {
         const conn = await this._getConnection();
         if (!conn) {
             return false;
         }
         try {
-            return await conn.zAdd(this._etc.pre + key, score, member);
+            return await conn.zAdd(this._etc.pre + key, scoreOrItems, memberOrOptions);
         }
         catch {
             return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "6.1.0",
+  "version": "6.2.1",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [
@@ -13,7 +13,7 @@
   "license": "Apache-2.0",
   "types": "./index.d.ts",
   "scripts": {
-    "build-md-doc": "bash ./utils/generate-api-doc-md.sh"
+    "build-doc": "bash ./utils/build-doc.sh"
   },
   "bin": {
     "kebab": "./bin/kebab.js"
@@ -22,11 +22,11 @@
     "#kebab/*": "./*"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.939.0",
-    "@aws-sdk/lib-storage": "^3.939.0",
+    "@aws-sdk/client-s3": "^3.940.0",
+    "@aws-sdk/lib-storage": "^3.940.0",
     "@litert/http-client": "^1.1.2",
     "@litert/mime": "^0.1.3",
-    "@litert/redis": "^3.0.6",
+    "@litert/redis": "^3.1.0",
     "@litert/websocket": "^0.2.8",
     "@types/ssh2": "^1.15.5",
     "@zilliz/milvus2-sdk-node": "^2.6.5",
@@ -38,14 +38,14 @@
     "pg": "^8.16.3",
     "ssh2": "^1.17.0",
     "svg-captcha": "^1.4.0",
-    "tencentcloud-sdk-nodejs": "^4.1.149"
+    "tencentcloud-sdk-nodejs": "^4.1.152"
   },
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.3.1",
     "@types/ejs": "^3.1.5",
     "@types/node": "^24.10.1",
     "@types/pg": "^8.15.6",
-    "typedoc": "^0.28.14",
+    "typedoc": "^0.28.15",
     "typedoc-plugin-markdown": "^4.9.0",
     "typescript": "^5.9.3"
   }

package/sys/mod.d.ts

@@ -78,7 +78,6 @@ export default class Mod {
             'key': string;
             'list': string[];
         };
-        'raw'?: boolean;
         'pre'?: string;
     });
     /** --- 创建字段对象 --- */
@@ -118,7 +117,6 @@ export default class Mod {
      * @param opt 选项
      */
     static removeByWhere(db: lDb.Pool | lDb.Transaction, where: string | kebab.Json, opt?: {
-        'raw'?: boolean;
         'pre'?: string;
         'ctr'?: sCtr.Ctr;
         'index'?: string | string[];
@@ -132,7 +130,6 @@ export default class Mod {
      * @param opt 选项
      */
     static removeByWhereSql(db: lDb.Pool | lDb.Transaction, where: string | kebab.Json, opt?: {
-        'raw'?: boolean;
         'pre'?: string;
         'ctr'?: sCtr.Ctr;
         'index'?: string;
@@ -147,7 +144,6 @@ export default class Mod {
      * @param opt 选项
      */
     static updateByWhere(db: lDb.Pool | lDb.Transaction, data: kebab.Json, where: string | kebab.Json, opt?: {
-        'raw'?: boolean;
         'pre'?: string;
         'ctr'?: sCtr.Ctr;
         'index'?: string | string[];
@@ -162,7 +158,6 @@ export default class Mod {
      * @param opt 选项
      */
     static updateByWhereSql(db: lDb.Pool | lDb.Transaction, data: kebab.Json, where: string | kebab.Json, opt?: {
-        'raw'?: boolean;
         'pre'?: string;
         'ctr'?: sCtr.Ctr;
         'index'?: string;
@@ -205,7 +200,6 @@ export default class Mod {
      */
     static where<T extends Mod>(db: lDb.Pool | lDb.Transaction, s?: string | kebab.Json, opt?: {
         'ctr'?: sCtr.Ctr;
-        'raw'?: boolean;
         'pre'?: string;
         'index'?: string | string[];
         'alias'?: string;
@@ -233,7 +227,6 @@ export default class Mod {
     static find<T extends Mod>(db: lDb.Pool | lDb.Transaction, val: string | number | null, opt?: {
         'ctr'?: sCtr.Ctr;
         'lock'?: boolean;
-        'raw'?: boolean;
         'pre'?: string;
         'index'?: string | string[];
         /** --- 通过 key 字段获取，默认为 false，即从主键获取 --- */
@@ -241,7 +234,6 @@ export default class Mod {
     }): Promise<false | null | (T & Record<string, any>)>;
     static one(db: lDb.Pool | lDb.Transaction, s: string | kebab.Json, opt: {
         'ctr'?: sCtr.Ctr;
-        'raw'?: boolean;
         'pre'?: string;
         'index'?: string | string[];
         'select'?: string | string[];
@@ -250,7 +242,6 @@ export default class Mod {
     }): Promise<false | null | Record<string, any>>;
     static one<T extends Mod>(db: lDb.Pool | lDb.Transaction, s: string | kebab.Json, opt: {
         'ctr'?: sCtr.Ctr;
-        'raw'?: boolean;
         'pre'?: string;
         'index'?: string | string[];
         'select'?: string | string[];
@@ -265,7 +256,6 @@ export default class Mod {
      */
     static oneArray(db: lDb.Pool | lDb.Transaction, s: string | kebab.Json, opt?: {
         'ctr'?: sCtr.Ctr;
-        'raw'?: boolean;
         'pre'?: string;
         'index'?: string | string[];
         'select'?: string | string[];
@@ -278,7 +268,6 @@ export default class Mod {
      */
     static primarys(db: lDb.Pool | lDb.Transaction, where?: string | kebab.Json, opt?: {
         'ctr'?: sCtr.Ctr;
-        'raw'?: boolean;
         'pre'?: string;
         'index'?: string;
     }): Promise<any[] | false>;

package/sys/mod.js

@@ -374,7 +374,6 @@ export default class Mod {
             'ctr': opt.ctr,
             'pre': opt.pre,
             'where': s,
-            'raw': opt.raw,
             'index': opt.index,
             'contain': opt.contain,
             'alias': opt.alias,
@@ -411,7 +410,6 @@ export default class Mod {
             'where': [{
                     [opt.key ? this._$key : this._$primary]: val,
                 }],
-            'raw': opt.raw,
             'index': opt.index,
         }).first(opt.lock);
     }
@@ -430,7 +428,6 @@ export default class Mod {
                 'ctr': opt.ctr,
                 'pre': opt.pre,
                 'where': s,
-                'raw': opt.raw
             });
             if (opt.by) {
                 o.by(opt.by[0], opt.by[1]);
@@ -445,7 +442,6 @@ export default class Mod {
                 'ctr': opt.ctr,
                 'pre': opt.pre,
                 'where': s,
-                'raw': opt.raw,
                 'index': item,
             });
             if (opt.by) {