@maiyunnet/kebab 6.2.2 → 7.0.1

package/index.d.ts

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

package/index.js

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

package/lib/scan.d.ts

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2022-09-24 15:23:25
- * Last: 2022-09-24 15:23:25, 2022-9-26 12:37:01, 2022-12-29 00:11:16, 2025-11-6 16:32:05
+ * Last: 2022-09-24 15:23:25, 2022-9-26 12:37:01, 2022-12-29 00:11:16, 2025-11-6 16:32:05, 2025-12-3 11:05:38
  */
 import * as lDb from '#kebab/lib/db.js';
 import * as lKv from '#kebab/lib/kv.js';
@@ -9,12 +9,14 @@ import * as sCtr from '#kebab/sys/ctr.js';
 /** --- Scan 设置的选项 --- */
 export interface IOptions {
     'ttl'?: number;
-    'sqlPre'?: sCtr.Ctr | string;
+    'ctr'?: sCtr.Ctr;
+    'pre'?: string;
     'name'?: string;
 }
 /** --- scanned 函数的选项 --- */
 export interface IStaticOptions {
-    'sqlPre'?: sCtr.Ctr | string;
+    'ctr'?: sCtr.Ctr;
+    'pre'?: string;
     'name'?: string;
 }
 export declare class Scan {

package/lib/scan.js

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2022-09-24 15:23:25
- * Last: 2022-09-24 15:23:25, 2022-9-26 12:37:01, 2022-12-29 00:11:16, 2025-11-6 16:32:05
+ * Last: 2022-09-24 15:23:25, 2022-9-26 12:37:01, 2022-12-29 00:11:16, 2025-11-6 16:32:05, 2025-12-3 11:05:38
  */
 /*
 CREATE TABLE IF NOT EXISTS `scan` (
@@ -41,7 +41,11 @@ export class Scan {
         }
         this._link = link;
         if (link instanceof lDb.Pool) {
-            this._sql = lSql.get(opt.sqlPre);
+            this._sql = lSql.get({
+                'service': link.getService(),
+                'ctr': opt.ctr,
+                'pre': opt.pre,
+            });
         }
         if (token) {
             this._token = token;
@@ -227,15 +231,19 @@ export async function scanned(link, token, opt = {}) {
     const name = opt.name ?? 'scan';
     if (link instanceof lDb.Pool) {
         // --- Db ---
-        const sql = lSql.get(opt.sqlPre);
+        const sql = lSql.get({
+            'service': link.getService(),
+            'ctr': opt.ctr,
+            'pre': opt.pre,
+        });
         sql.update(name, {
-            'time_update': time
+            'time_update': time,
         }).where([
             {
                 'token': token,
                 'time_update': '0'
             },
-            ['time_exp', '>', time]
+            ['time_exp', '>', time],
         ]);
         const r = await link.execute(sql.getSql(), sql.getData());
         if (r.error) {
@@ -281,7 +289,11 @@ export async function setData(link, token, data, opt = {}) {
     const name = opt.name ?? 'scan';
     if (link instanceof lDb.Pool) {
         // --- Db ---
-        const sql = lSql.get(opt.sqlPre);
+        const sql = lSql.get({
+            'service': link.getService(),
+            'ctr': opt.ctr,
+            'pre': opt.pre,
+        });
         sql.update(name, {
             'data': lText.stringifyJson(data)
         }).where([
@@ -289,7 +301,7 @@ export async function setData(link, token, data, opt = {}) {
                 'token': token,
             },
             ['time_update', '>', '0'],
-            ['time_exp', '>', time]
+            ['time_exp', '>', time],
         ]);
         const r = await link.execute(sql.getSql(), sql.getData());
         if (r.error) {

package/lib/session.js

@@ -41,7 +41,6 @@ export class Session {
     async init(ctr, link, auth = false, opt = {}) {
         const config = ctr.getPrototype('_config');
         const ssl = opt.ssl ?? config.session.ssl ?? false;
-        const pre = opt.sqlPre ?? null;
         this._name = opt.name ?? config.session.name;
         this._ttl = opt.ttl ?? config.session.ttl ?? 172800;
         const tim = time.stamp();
@@ -58,7 +57,11 @@ export class Session {
         }
         this._link = link;
         if (link instanceof db.Pool) {
-            this._sql = sql.get(pre ?? ctr);
+            this._sql = sql.get({
+                'service': link.getService(),
+                'ctr': ctr,
+                'pre': opt.sqlPre,
+            });
             await this._gc(); // --- 执行 gc ---
         }
         // --- 初始化 Session 数组 ---

package/lib/sql.d.ts

@@ -11,6 +11,8 @@ export declare enum ESERVICE {
     'PGSQL' = 1
 }
 export declare class Sql {
+    /** --- ctr 对象 --- */
+    private readonly _ctr?;
     /** --- 前置 --- */
     private readonly _pre;
     /** --- 服务商 --- */
@@ -23,10 +25,12 @@ export declare class Sql {
     private readonly _alias;
     /** --- PostgreSQL 占位符计数器 --- */
     private _placeholderCounter;
-    constructor(pre?: string, opt?: {
+    constructor(opt: {
+        'service': ESERVICE;
+        'ctr'?: ctr.Ctr;
+        'pre'?: string;
         'data'?: kebab.DbValue[];
         'sql'?: string[];
-        'service'?: ESERVICE;
     });
     /**
      * --- 插入数据前导 ---
@@ -215,13 +219,14 @@ export declare class Sql {
 }
 /**
  * --- 创建 sql 对象 ---
- * @param ctrPre ctr 对象或 pre 表前缀
  * @param opt 参数
  */
-export declare function get(ctrPre?: ctr.Ctr | string, opt?: {
+export declare function get(opt: {
+    'service': ESERVICE;
+    'ctr'?: ctr.Ctr;
+    'pre'?: string;
     'data'?: kebab.DbValue[];
     'sql'?: string[];
-    'service'?: ESERVICE;
 }): Sql;
 /**
  * --- 返回代入后的完整 SQL 字符串，这并不安全不能直接执行，只是用来调试打印 sql 语句 ---

package/lib/sql.js

@@ -2,8 +2,6 @@ import * as lText from '#kebab/lib/text.js';
 import * as lCore from '#kebab/lib/core.js';
 // --- 第三方 ---
 import * as mysql2 from 'mysql2/promise';
-// --- 库和定义 ---
-import * as ctr from '#kebab/sys/ctr.js';
 /** --- 服务商定义 --- */
 export var ESERVICE;
 (function (ESERVICE) {
@@ -14,7 +12,7 @@ export var ESERVICE;
 let columnToken = '';
 export class Sql {
     // --- 实例化 ---
-    constructor(pre, opt = {}) {
+    constructor(opt) {
         /** --- 前置 --- */
         this._pre = '';
         /** --- 预拼装 Sql 数组 --- */
@@ -27,7 +25,8 @@ export class Sql {
         this._placeholderCounter = 1;
         /** --- where 的 data 的开始处和结束处 --- */
         this._whereDataPosition = [0, 0];
-        this._pre = pre ?? '';
+        this._ctr = opt.ctr;
+        this._pre = opt.pre ?? '';
         this._service = opt.service ?? ESERVICE.MYSQL;
         if (opt.data) {
             this._data = opt.data;
@@ -646,7 +645,10 @@ export class Sql {
             }
             sql[0] = sql[0].replace(/FROM [`\w, ]+/, 'FROM ' + table);
         }
-        return get(this.getPre(), {
+        return get({
+            'service': this._service,
+            'ctr': this._ctr,
+            'pre': this._pre,
             'data': data,
             'sql': sql,
         });
@@ -934,11 +936,21 @@ export class Sql {
 }
 /**
  * --- 创建 sql 对象 ---
- * @param ctrPre ctr 对象或 pre 表前缀
  * @param opt 参数
  */
-export function get(ctrPre, opt = {}) {
-    return new Sql(ctrPre instanceof ctr.Ctr ? ctrPre.getPrototype('_config').sql.pre : ctrPre, opt);
+export function get(opt) {
+    let pre = opt.pre ?? opt.ctr?.getPrototype('_config').sql.pre;
+    if (pre) {
+        if (opt.service === ESERVICE.MYSQL) {
+            if (!pre.endsWith('_')) {
+                pre += '_';
+            }
+        }
+    }
+    return new Sql({
+        ...opt,
+        'pre': pre,
+    });
 }
 /**
  * --- 返回代入后的完整 SQL 字符串，这并不安全不能直接执行，只是用来调试打印 sql 语句 ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "6.2.2",
+  "version": "7.0.1",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [

package/sys/cmd.js

@@ -138,7 +138,7 @@ async function run() {
         config.session.ssl ??= false;
         // --- config - sql ---
         config.sql ??= {};
-        config.sql.pre ??= 'm_';
+        config.sql.pre ??= 'm';
         // --- config - s3 ---
         config.s3 ??= {};
         config.s3['CF'] ??= {};

package/sys/mod.js

@@ -79,8 +79,10 @@ export default class Mod {
         /** --- 导入数据库连接 --- */
         this._db = opt.db;
         /** --- 新建 sql 对象 --- */
-        this._sql = lSql.get(opt.pre ?? this.constructor._$pre ?? opt.ctr, {
+        this._sql = lSql.get({
             'service': this._db.getService() ?? lDb.ESERVICE.PGSQL,
+            'ctr': opt.ctr,
+            'pre': opt.pre ?? this.constructor._$pre,
         });
         if (opt.index) {
             this._index = typeof opt.index === 'string' ? [opt.index] : [...new Set(opt.index)];
@@ -118,8 +120,10 @@ export default class Mod {
      * @param opt 选项
      */
     static async insert(db, cs, vs, opt = {}) {
-        const sq = lSql.get(opt.pre ?? this.constructor._$pre ?? opt.ctr, {
+        const sq = lSql.get({
             'service': db.getService() ?? lDb.ESERVICE.PGSQL,
+            'ctr': opt.ctr,
+            'pre': opt.pre ?? this.constructor._$pre,
         });
         if (!vs) {
             // --- 单行 ---
@@ -165,8 +169,10 @@ export default class Mod {
      * @param opt 选项
      */
     static insertSql(db, cs, vs, opt = {}) {
-        const sq = lSql.get(opt.pre ?? this.constructor._$pre ?? opt.ctr, {
+        const sq = lSql.get({
             'service': db.getService() ?? lDb.ESERVICE.PGSQL,
+            'ctr': opt.ctr,
+            'pre': opt.pre ?? this.constructor._$pre,
         });
         sq.insert(this._$table + (opt.index ? ('_' + opt.index) : '')).values(cs, vs);
         return sq.format();
@@ -181,8 +187,10 @@ export default class Mod {
         const indexs = opt.index ? (typeof opt.index === 'string' ? [opt.index] : [...new Set(opt.index)]) : [''];
         let ar = 0;
         for (const index of indexs) {
-            const sq = lSql.get(opt.pre ?? this.constructor._$pre ?? opt.ctr, {
+            const sq = lSql.get({
                 'service': db.getService() ?? lDb.ESERVICE.PGSQL,
+                'ctr': opt.ctr,
+                'pre': opt.pre ?? this.constructor._$pre,
             });
             sq.delete(this._$table + (index ? ('_' + index) : '')).where(where);
             if (opt.by) {
@@ -209,8 +217,10 @@ export default class Mod {
      * @param opt 选项
      */
     static removeByWhereSql(db, where, opt = {}) {
-        const sq = lSql.get(opt.pre ?? this.constructor._$pre ?? opt.ctr, {
+        const sq = lSql.get({
             'service': db.getService() ?? lDb.ESERVICE.PGSQL,
+            'ctr': opt.ctr,
+            'pre': opt.pre ?? this.constructor._$pre,
         });
         sq.delete(this._$table + (opt.index ? ('_' + opt.index) : '')).where(where);
         if (opt.by) {
@@ -232,8 +242,10 @@ export default class Mod {
         const indexs = opt.index ? (typeof opt.index === 'string' ? [opt.index] : [...new Set(opt.index)]) : [''];
         let ar = 0;
         for (const index of indexs) {
-            const sq = lSql.get(opt.pre ?? this.constructor._$pre ?? opt.ctr, {
+            const sq = lSql.get({
                 'service': db.getService() ?? lDb.ESERVICE.PGSQL,
+                'ctr': opt.ctr,
+                'pre': opt.pre ?? this.constructor._$pre,
             });
             sq.update(this._$table + (index ? ('_' + index) : ''), data).where(where);
             if (opt.by) {
@@ -261,8 +273,10 @@ export default class Mod {
      * @param opt 选项
      */
     static updateByWhereSql(db, data, where, opt = {}) {
-        const sq = lSql.get(opt.pre ?? this.constructor._$pre ?? opt.ctr, {
+        const sq = lSql.get({
             'service': db.getService() ?? lDb.ESERVICE.PGSQL,
+            'ctr': opt.ctr,
+            'pre': opt.pre ?? this.constructor._$pre,
         });
         sq.update(this._$table + (opt.index ? ('_' + opt.index) : ''), data).where(where);
         if (opt.by) {
@@ -307,8 +321,10 @@ export default class Mod {
             batches.push(data.slice(i, i + batchSize));
         }
         for (const batch of batches) {
-            const sq = lSql.get(opt.pre ?? this._$pre ?? opt.ctr, {
+            const sq = lSql.get({
                 'service': db.getService() ?? lDb.ESERVICE.PGSQL,
+                'ctr': opt.ctr,
+                'pre': opt.pre ?? this.constructor._$pre,
             });
             const updates = {};
             const keys = [];
@@ -475,8 +491,10 @@ export default class Mod {
      * @param opt 选项
      */
     static async primarys(db, where = '', opt = {}) {
-        const sq = lSql.get(opt.pre ?? this.constructor._$pre ?? opt.ctr, {
+        const sq = lSql.get({
             'service': db.getService() ?? lDb.ESERVICE.PGSQL,
+            'ctr': opt.ctr,
+            'pre': opt.pre ?? this.constructor._$pre,
         });
         sq.select(this._$primary, this._$table + (opt.index ? ('_' + opt.index) : '')).where(where);
         const r = await db.query(sq.getSql(), sq.getData());

package/www/example/ctr/test.js

@@ -2098,9 +2098,9 @@ error: <pre>${JSON.stringify(res.error, null, 4)}</pre>`);
         }
         const s = this._get['s'] ?? 'db';
         const echo = [];
-        const scan = await lScan.get(link, undefined, { 'ttl': 30, 'sqlPre': this });
+        const scan = await lScan.get(link, undefined, { 'ttl': 30, 'ctr': this });
         const token = scan.getToken();
-        echo.push(`<pre>const scan = await lScan.get(this, link, undefined, { 'ttl': 30, 'sqlPre': this });
+        echo.push(`<pre>const scan = await lScan.get(this, link, undefined, { 'ttl': 30, 'ctr': this });
 const token = scan.getToken();</pre>
 token: ${token ?? 'null'}<br><br>
 Scan status: <b id="status" style="color: red;">Waiting...</b><br>
@@ -2189,7 +2189,7 @@ function confirm() {
             return [0, 'Failed, link can not be connected.'];
         }
         const scan = await lScan.get(link, this._post['token'], {
-            'sqlPre': this
+            'ctr': this
         });
         const rtn = await scan.poll();
         switch (rtn) {
@@ -2214,7 +2214,7 @@ function confirm() {
             return [0, 'Failed, link can not be connected.'];
         }
         if (!await lScan.scanned(link, this._post['token'], {
-            'sqlPre': this
+            'ctr': this
         })) {
             return [0, 'Token has expired.'];
         }
@@ -2228,7 +2228,7 @@ function confirm() {
         if (!await lScan.setData(link, this._post['token'], {
             'uid': '5'
         }, {
-            'sqlPre': this
+            'ctr': this
         })) {
             return [0, 'Token has expired.'];
         }
@@ -2315,9 +2315,11 @@ Result:<pre id="result">Nothing.</pre>`);
     }
     sql() {
         const echo = [];
-        let sql = this._get['s'] === 'pgsql' ? lSql.get('test', {
-            'service': lSql.ESERVICE.PGSQL,
-        }) : lSql.get('test_');
+        let sql = lSql.get({
+            'service': this._get['s'] === 'pgsql' ? lSql.ESERVICE.PGSQL : lSql.ESERVICE.MYSQL,
+            'ctr': this,
+            'pre': 'test'
+        });
         switch (this._get['type']) {
             case 'insert': {
                 let s = sql.insert('user').values(['name', 'age'], [