@maiyunnet/kebab 7.0.0 → 7.0.2

package/index.d.ts

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

package/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [
@@ -22,8 +22,8 @@
     "#kebab/*": "./*"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.940.0",
-    "@aws-sdk/lib-storage": "^3.940.0",
+    "@aws-sdk/client-s3": "^3.943.0",
+    "@aws-sdk/lib-storage": "^3.943.0",
     "@litert/http-client": "^1.1.2",
     "@litert/mime": "^0.1.3",
     "@litert/redis": "^3.1.0",

package/sys/mod.d.ts

@@ -41,7 +41,7 @@ export default class Mod {
     /** --- 若使用 _$key 并且有多个 unique 索引，这里指定 _$key 的索引名 --- */
     protected static _$index: string;
     /** --- 前缀，顺序：选项前缀 -> 本前缀 -> 配置文件前缀 --- */
-    protected static _$pre: string | null;
+    protected static _$pre?: string;
     /** --- 要 update 的内容 --- */
     protected _updates: Record<string, boolean>;
     /** --- 模型获取的属性 --- */

package/sys/mod.js

@@ -53,8 +53,6 @@ export default class Mod {
     static { this._$key = ''; }
     /** --- 若使用 _$key 并且有多个 unique 索引，这里指定 _$key 的索引名 --- */
     static { this._$index = ''; }
-    /** --- 前缀，顺序：选项前缀 -> 本前缀 -> 配置文件前缀 --- */
-    static { this._$pre = null; }
     /**
      * --- 构造函数 ---
      * @param opt 选项
@@ -82,7 +80,7 @@ export default class Mod {
         this._sql = lSql.get({
             'service': this._db.getService() ?? lDb.ESERVICE.PGSQL,
             'ctr': opt.ctr,
-            'pre': opt.pre,
+            'pre': opt.pre ?? this.constructor._$pre,
         });
         if (opt.index) {
             this._index = typeof opt.index === 'string' ? [opt.index] : [...new Set(opt.index)];
@@ -123,7 +121,7 @@ export default class Mod {
         const sq = lSql.get({
             'service': db.getService() ?? lDb.ESERVICE.PGSQL,
             'ctr': opt.ctr,
-            'pre': opt.pre,
+            'pre': opt.pre ?? this._$pre,
         });
         if (!vs) {
             // --- 单行 ---
@@ -172,7 +170,7 @@ export default class Mod {
         const sq = lSql.get({
             'service': db.getService() ?? lDb.ESERVICE.PGSQL,
             'ctr': opt.ctr,
-            'pre': opt.pre,
+            'pre': opt.pre ?? this._$pre,
         });
         sq.insert(this._$table + (opt.index ? ('_' + opt.index) : '')).values(cs, vs);
         return sq.format();
@@ -190,7 +188,7 @@ export default class Mod {
             const sq = lSql.get({
                 'service': db.getService() ?? lDb.ESERVICE.PGSQL,
                 'ctr': opt.ctr,
-                'pre': opt.pre,
+                'pre': opt.pre ?? this._$pre,
             });
             sq.delete(this._$table + (index ? ('_' + index) : '')).where(where);
             if (opt.by) {
@@ -220,7 +218,7 @@ export default class Mod {
         const sq = lSql.get({
             'service': db.getService() ?? lDb.ESERVICE.PGSQL,
             'ctr': opt.ctr,
-            'pre': opt.pre,
+            'pre': opt.pre ?? this._$pre,
         });
         sq.delete(this._$table + (opt.index ? ('_' + opt.index) : '')).where(where);
         if (opt.by) {
@@ -245,7 +243,7 @@ export default class Mod {
             const sq = lSql.get({
                 'service': db.getService() ?? lDb.ESERVICE.PGSQL,
                 'ctr': opt.ctr,
-                'pre': opt.pre,
+                'pre': opt.pre ?? this._$pre,
             });
             sq.update(this._$table + (index ? ('_' + index) : ''), data).where(where);
             if (opt.by) {
@@ -276,7 +274,7 @@ export default class Mod {
         const sq = lSql.get({
             'service': db.getService() ?? lDb.ESERVICE.PGSQL,
             'ctr': opt.ctr,
-            'pre': opt.pre,
+            'pre': opt.pre ?? this._$pre,
         });
         sq.update(this._$table + (opt.index ? ('_' + opt.index) : ''), data).where(where);
         if (opt.by) {
@@ -324,7 +322,7 @@ export default class Mod {
             const sq = lSql.get({
                 'service': db.getService() ?? lDb.ESERVICE.PGSQL,
                 'ctr': opt.ctr,
-                'pre': opt.pre,
+                'pre': opt.pre ?? this._$pre,
             });
             const updates = {};
             const keys = [];
@@ -494,7 +492,7 @@ export default class Mod {
         const sq = lSql.get({
             'service': db.getService() ?? lDb.ESERVICE.PGSQL,
             'ctr': opt.ctr,
-            'pre': opt.pre,
+            'pre': opt.pre ?? this._$pre,
         });
         sq.select(this._$primary, this._$table + (opt.index ? ('_' + opt.index) : '')).where(where);
         const r = await db.query(sq.getSql(), sq.getData());