@maiyunnet/kebab 6.2.0 → 6.2.2

package/index.d.ts

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

package/index.js

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

package/lib/sql.js

@@ -703,8 +703,6 @@ export class Sql {
      * @param suf 表后缀，仅请在 field 表名时倒入后缀，前面加 # 代表要强制 AS，可能是分表查询时用
      */
     field(str, pre = '', suf = '') {
-        let left = '';
-        let right = '';
         const q = this._service === ESERVICE.MYSQL ? '`' : '"';
         if (Array.isArray(str)) {
             this._data.push(...str[1]);
@@ -713,21 +711,21 @@ export class Sql {
         if (typeof str === 'number') {
             str = str.toString();
         }
-        str = str.trim(); // --- 去除前导尾随 ---
-        str = str.replace(/ {2,}/g, ' '); // --- 去除多余的空格 ---
-        str = str.replace(/ +([),])/g, ' $1');
-        str = str.replace(/([(,]) +/g, '$1 ');
-        str = str.replace(/(\W)(JOIN|WHERE|UNION)(\W)/ig, '$1$3');
+        str = str.trim() // --- 去除前导尾随 ---
+            .replace(/ {2,}/g, ' ') // --- 去除多余的空格 ---
+            .replace(/ +([),])/g, ' $1')
+            .replace(/([(,]) +/g, '$1 ')
+            .replace(/(\W)(JOIN|WHERE|UNION)(\W)/ig, '$1$3');
         // --- 先判断 suf 强制性 AS ---
-        let sufAs = false;
-        if (suf.startsWith('#')) {
+        const sufAs = suf.startsWith('#');
+        if (sufAs) {
             // --- 强制 AS ---
             suf = suf.slice(1);
-            sufAs = true;
         }
         // --- 先判断有没有别名（也就是 as） ---
-        const loStr = str.toLowerCase();
-        const asPos = loStr.indexOf(' as ');
+        const asPos = str.toLowerCase().indexOf(' as ');
+        let left = '';
+        let right = '';
         if (asPos === -1) {
             // --- 没有 as ---
             let spacePos = str.lastIndexOf(' ');
@@ -736,21 +734,12 @@ export class Sql {
                 // --- 连接符 ---
                 spacePos = -1;
             }
-            if (spacePos !== -1) {
-                const spaceRight = str.slice(spacePos + 1);
-                if (/^[a-zA-Z_`"][\w`"]*$/.test(spaceRight)) {
-                    // --- OK ---
-                    left = str.slice(0, spacePos);
-                    right = spaceRight;
-                }
-                else {
-                    left = str;
-                    right = '';
-                }
+            if (spacePos !== -1 && /^[a-zA-Z_`"][\w`"]*$/.test(str.slice(spacePos + 1))) {
+                left = str.slice(0, spacePos);
+                right = str.slice(spacePos + 1);
             }
             else {
                 left = str;
-                right = '';
             }
         }
         else {
@@ -760,90 +749,60 @@ export class Sql {
         }
         if (right) {
             // --- 处理右侧 ---
+            const hasQuote = right.startsWith(q);
+            if (!left.includes('.')) {
+                // --- 存储表别名 ---
+                this._alias.push(hasQuote ? right.slice(1, -1) : right);
+            }
             if (this._service === ESERVICE.MYSQL) {
-                if (right.startsWith('`')) {
-                    if (!left.includes('.')) {
-                        // --- 存储表别名 ---
-                        this._alias.push(right.slice(1, -1));
-                    }
-                    right = '`' + pre + right.slice(1);
-                }
-                else {
-                    if (!left.includes('.')) {
-                        // --- 存储表别名 ---
-                        this._alias.push(right);
-                    }
-                    right = '`' + pre + right + '`';
-                }
-                right = ' AS ' + right;
+                right = ' AS `' + pre + (hasQuote ? right.slice(1) : right + '`');
             }
             else {
-                if (right.startsWith('"')) {
-                    if (!left.includes('.')) {
-                        // --- 存储表别名 ---
-                        this._alias.push(right.slice(1, -1));
-                    }
-                    if (pre) {
-                        right = `"${pre}".${right}`;
-                    }
-                }
-                else {
-                    if (!left.includes('.')) {
-                        // --- 存储表别名 ---
-                        this._alias.push(right);
-                    }
-                    right = (pre ? `"${pre}".` : '') + `"${right}"`;
-                }
-                right = ' AS ' + right;
+                right = ' AS ' + (pre ? `"${pre}".` : '') + (hasQuote ? right : `"${right}"`);
             }
         }
-        else {
+        else if (sufAs) {
             // --- 没有右侧 ---
-            if (sufAs) {
-                // --- 强制 AS ---
-                if (!left.includes('.')) {
-                    // --- 存储表别名 ---
-                    this._alias.push(left.startsWith('`') || left.startsWith('"') ? left.slice(1, -1) : left);
-                }
-                right = ' AS ' + this.field(left, pre);
+            // --- 强制 AS ---
+            if (!left.includes('.')) {
+                // --- 存储表别名 ---
+                this._alias.push(left.startsWith(q) ? left.slice(1, -1) : left);
             }
+            right = ' AS ' + this.field(left, pre);
         }
         // --- 处理 left ---
         if (/^[\w`"_.*]+$/.test(left)) {
+            // --- 简单字段或表名 ---
+            /** --- 分左右 --- */
             const l = left.split('.');
             if (l[0] === '*') {
                 return '*' + right;
             }
-            if (l[0].startsWith('`') || l[0].startsWith(`"`)) {
-                l[0] = l[0].replace(/[`"]/g, '');
-            }
+            l[0] = l[0].replace(this._service === ESERVICE.MYSQL ? /`/g : /"/g, '');
             if (l[1] === undefined) {
-                // --- xxx ---
+                // --- xxx，代表无 . 右侧 ---
+                if ((this._service === ESERVICE.MYSQL && l[0].startsWith('"')) ||
+                    (this._service === ESERVICE.PGSQL && l[0].startsWith(`'`))) {
+                    // --- 字符串，无需包裹 ---
+                    return l[0] + right;
+                }
                 if (/^[A-Z0-9_]+$/.test(l[0])) {
                     // --- 纯大写是内置函数，不能加 `" ---
                     return l[0] + right;
                 }
                 return this._service === ESERVICE.MYSQL ?
-                    '`' + pre + l[0] + suf + '`' + right :
-                    (pre ? `"${pre}".` : '') + '"' + l[0] + suf + '"' + right;
+                    `\`${pre}${l[0]}${suf}\`${right}` :
+                    (pre ? `"${pre}".` : '') + `"${l[0]}${suf}"${right}`;
             }
             // --- x.xxx ---
             // --- 只有在此模式才知道 . 前面的一定是表名，因此自动加 sql 级的 _pre ---
-            const w = l[1] === '*'
-                ? '*' :
-                (q + ((l[1].startsWith('`') || l[1].startsWith('"')) ?
-                    l[1].slice(1, -1) :
-                    l[1]) + q);
+            const w = l[1] === '*' ? '*' : q + (l[1].startsWith(q) ? l[1].slice(1, -1) : l[1]) + q;
             return this._service === ESERVICE.MYSQL ?
-                '`' + this._pre + l[0] + suf + '`.' + w + right :
-                (this._pre ? `"${this._pre}".` : '') + '"' + l[0] + suf + '".' + w + right;
-        }
-        else {
-            // return left.replace(/([(, ])([a-zA-Z`"_][\w`"_.]*)(?=[), ])/g, (
-            return left.replace(/(^|[(, ])([a-zA-Z`"_][\w`"_.]*)(?=[), ]|$)/g, (t, t1, t2) => {
-                return t1 + this.field(t2, pre, suf);
-            }) + right;
+                `\`${this._pre}${l[0]}${suf}\`.${w}${right}` :
+                (this._pre ? `"${this._pre}".` : '') + `"${l[0]}${suf}".${w}${right}`;
         }
+        // --- 复杂字段或表达式 ---
+        return left.replace(/(^|[(, ])([a-zA-Z`"_][\w`"_.]*)(?=[), ]|$)/g, (t, t1, t2) => t1 + this.field(t2, pre, suf)) + right;
     }
     /**
      * --- 判断传入值是否是 field，还是别的对象 ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "6.2.0",
+  "version": "6.2.2",
   "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"
@@ -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) {

package/www/example/ctr/test.js

@@ -2422,9 +2422,12 @@ Result:<pre id="result">Nothing.</pre>`);
 <b>getSql() :</b> ${s}<br>
 <b>getData():</b> <pre>${JSON.stringify(sd, undefined, 4)}</pre>
 <b>format() :</b> ${sql.format(s, sd)}<hr>`);
-                s = sql.select(['SUM(user.age) age', 'UTC_TIMESTAMP', 'FROM_UNIXTIME(user.time, \'%Y-%m\') as time'], 'order').leftJoin('user', { 'order.user_id': lSql.column('user.id') }).getSql();
+                const data = this._get['s'] === 'pgsql' ?
+                    [`IFNULL(user.nick, '') nick`, `IFNULL(user.nick, 'a2') nick2`] :
+                    [`IFNULL(user.nick, "") nick`, `IFNULL(user.nick, "a2") nick2`];
+                s = sql.select(['SUM(user.age) age', 'UTC_TIMESTAMP', 'FROM_UNIXTIME(user.time, \'%Y-%m\') as time', ...data], 'order').leftJoin('user', { 'order.user_id': lSql.column('user.id') }).getSql();
                 sd = sql.getData();
-                echo.push(`<pre>sql.select(['SUM(user.age) age', 'UTC_TIMESTAMP', 'FROM_UNIXTIME(user.time, \\'%Y-%m\\') as time'], 'order').leftJoin('user', { 'order.user_id': lSql.column('user.id') });</pre>
+                echo.push(`<pre>sql.select(['SUM(user.age) age', 'UTC_TIMESTAMP', 'FROM_UNIXTIME(user.time, \\'%Y-%m\\') as time', \`${data[0]}\`, \`${data[1]}\`], 'order').leftJoin('user', { 'order.user_id': lSql.column('user.id') });</pre>
 <b>getSql() :</b> ${s}<br>
 <b>getData():</b> <pre>${JSON.stringify(sd, undefined, 4)}</pre>
 <b>format() :</b> ${sql.format(s, sd)}<hr>`);