@maiyunnet/kebab 5.3.0 → 6.0.0

package/lib/sql.js

@@ -24,7 +24,7 @@ export class Sql {
         /** --- 表别名列表 --- */
         this._alias = [];
         /** --- PostgreSQL 占位符计数器 --- */
-        this._placeholder = 1;
+        this._placeholderCounter = 1;
         /** --- where 的 data 的开始处和结束处 --- */
         this._whereDataPosition = [0, 0];
         this._pre = pre ?? '';
@@ -43,7 +43,7 @@ export class Sql {
      */
     insert(table) {
         this._data = [];
-        this._placeholder = 1;
+        this._placeholderCounter = 1;
         this._alias.length = 0;
         const sql = 'INSERT INTO ' + this.field(table, this._pre);
         this._sql = [sql];
@@ -71,84 +71,10 @@ export class Sql {
             for (const v of vs) {
                 sql += '(';
                 for (const v1 of v) {
-                    // --- v1 是项目值，如 {'x': 1, 'y': 2}, 'string', 0 ---
-                    if (v1 === undefined || Number.isNaN(v1)) {
-                        // --- 异常情况 ---
-                        lCore.log({}, '[SQL][values] value error', '-error');
-                        sql += `'', `;
-                    }
-                    else if (v1 === null) {
-                        sql += 'NULL, ';
-                    }
-                    else if (typeof v1 === 'string' || typeof v1 === 'number') {
-                        sql += this.placeholder() + ', ';
-                        this._data.push(v1);
-                    }
-                    else if (Array.isArray(v1)) {
-                        if (v1[0]?.x === undefined && typeof v1[0] === 'string' &&
-                            v1[0].includes('(') && v1[0].includes(')')) {
-                            // --- v1: ['POINT(?)', ['20']] ---
-                            sql += this.field(v1[0].replace(/\?/g, () => this.placeholder())) + ', ';
-                            if (v1[1]) {
-                                this._data.push(...v1[1]);
-                            }
-                        }
-                        else if (v1[0]?.y !== undefined) {
-                            // --- v1: [{'x': 1, 'y': 2}, { ... }, { ... }, ... ]---
-                            if (this._service === ESERVICE.MYSQL) {
-                                // --- MYSQL ---
-                                sql += `ST_POLYGONFROMTEXT(${this.placeholder()}), `;
-                                this._data.push(`POLYGON((${v1.map(item => {
-                                    return `${item.x} ${item.y}`;
-                                }).join(', ')}))`);
-                            }
-                            else {
-                                // --- PGSQL ---
-                                sql += `${this.placeholder()}, `;
-                                this._data.push(`(${v1.map(item => {
-                                    return `(${item.x}, ${item.y})`;
-                                }).join(', ')})`);
-                            }
-                        }
-                        else {
-                            // --- v1: json ---
-                            sql += this.placeholder() + ', ';
-                            this._data.push(this._service === ESERVICE.MYSQL ? lText.stringifyJson(v1) : v1);
-                        }
-                    }
-                    else if (v1.x !== undefined) {
-                        if (v1.y !== undefined) {
-                            // --- v1: {'x': 1, 'y': 2} ---
-                            if (this._service === ESERVICE.MYSQL) {
-                                // --- MYSQL ---
-                                sql += `ST_POINTFROMTEXT(${this.placeholder()}), `;
-                                this._data.push(`POINT(${v1.x} ${v1.y})`);
-                            }
-                            else {
-                                // --- PGSQL ---
-                                sql += `${this.placeholder()}, `;
-                                this._data.push(`(${v1.x}, ${v1.y})`);
-                            }
-                        }
-                        else {
-                            // --- v1: json ---
-                            sql += this.placeholder() + ', ';
-                            this._data.push(this._service === ESERVICE.MYSQL ? lText.stringifyJson(v1) : v1);
-                        }
-                    }
-                    else if (v1 instanceof Buffer) {
-                        // --- Buffer ---
-                        sql += this.placeholder() + ', ';
-                        this._data.push(v);
-                    }
-                    else if (this._isField(v1)) {
-                        // --- 3 ---
-                        sql += this.field(v1.value) + ', ';
-                    }
-                    else {
-                        // --- json ---
-                        sql += this.placeholder() + ', ';
-                        this._data.push(this._service === ESERVICE.MYSQL ? lText.stringifyJson(v1) : v1);
+                    const result = this._processValue(v1);
+                    sql += result.sql + ', ';
+                    if (result.data !== undefined) {
+                        this._data.push(...result.data);
                     }
                 }
                 sql = sql.slice(0, -2) + '), ';
@@ -162,88 +88,49 @@ export class Sql {
             for (const k in cs) {
                 const v = cs[k];
                 sql += this.field(k) + ', ';
-                if (v === undefined || Number.isNaN(v)) {
-                    // --- 异常情况 ---
-                    lCore.log({}, '[SQL][values] value error', '-error');
-                    values += `'', `;
-                }
-                else if (v === null) {
-                    values += 'NULL, ';
+                // --- 使用 _processValue 处理普通值 ---
+                const result = this._processValue(v);
+                values += result.sql + ', ';
+                if (result.data !== undefined) {
+                    this._data.push(...result.data);
                 }
-                else if (typeof v === 'string' || typeof v === 'number') {
-                    values += this.placeholder() + ', ';
-                    this._data.push(v);
-                }
-                else if (Array.isArray(v)) {
-                    if (v[0]?.x === undefined && typeof v[0] === 'string' &&
-                        v[0].includes('(') && v[0].includes(')')) {
-                        // --- v: ['POINT(?)', ['20']] ---
-                        values += this.field(v[0].replace(/\?/g, () => this.placeholder())) + ', ';
-                        if (v[1] !== undefined) {
-                            this._data.push(...v[1]);
-                        }
-                    }
-                    else if (v[0]?.y !== undefined) {
-                        // --- v: [{'x': 1, 'y': 2}, { ... }, { ... }, ... ]---
-                        if (this._service === ESERVICE.MYSQL) {
-                            // --- MYSQL ---
-                            values += `ST_POLYGONFROMTEXT(${this.placeholder()}), `;
-                            this._data.push(`POLYGON((${v.map(item => {
-                                return `${item.x} ${item.y}`;
-                            }).join(', ')}))`);
-                        }
-                        else {
-                            // --- PGSQL ---
-                            values += `${this.placeholder()}, `;
-                            this._data.push(`(${v.map(item => {
-                                return `(${item.x}, ${item.y})`;
-                            }).join(', ')})`);
-                        }
-                    }
-                    else {
-                        // --- v: json ---
-                        values += this.placeholder() + ', ';
-                        this._data.push(this._service === ESERVICE.MYSQL ? lText.stringifyJson(v) : v);
-                    }
-                }
-                else if (v.x !== undefined) {
-                    if (v.y !== undefined) {
-                        // --- v: {'x': 1, 'y': 2} ---
-                        if (this._service === ESERVICE.MYSQL) {
-                            // --- MYSQL ---
-                            values += `ST_POINTFROMTEXT(${this.placeholder()}), `;
-                            this._data.push(`POINT(${v.x} ${v.y})`);
-                        }
-                        else {
-                            // --- PGSQL ---
-                            values += `${this.placeholder()}, `;
-                            this._data.push(`(${v.x}, ${v.y})`);
-                        }
-                    }
-                    else {
-                        // --- v: json ---
-                        values += this.placeholder() + ', ';
-                        this._data.push(this._service === ESERVICE.MYSQL ? lText.stringifyJson(v) : v);
-                    }
-                }
-                else if (v instanceof Buffer) {
-                    // --- Buffer ---
-                    values += this.placeholder() + ', ';
-                    this._data.push(v);
-                }
-                else if (this._isField(v)) {
-                    // --- 3 ---
-                    values += this.field(v.value) + ', ';
+            }
+            sql = sql.slice(0, -2) + ') VALUES (' + values.slice(0, -2) + ')';
+        }
+        this._sql.push(sql);
+        return this;
+    }
+    /**
+     * --- 如果存在则更新不存在则插入（UPSERT）---
+     * @param data 更新的数据
+     * @param conflict 冲突字段，PostgreSQL 用于指定 ON CONFLICT 字段；MySQL 时忽略，因为会对所有唯一键冲突执行更新
+     */
+    upsert(data, conflict) {
+        if (this._service === ESERVICE.MYSQL) {
+            // --- MySQL: 使用 ON DUPLICATE KEY UPDATE ---
+            // --- 注意：MySQL 会对任何唯一键冲突都执行更新，无法像 PostgreSQL 那样指定具体冲突字段 ---
+            // --- 如果需要精确控制冲突字段，建议在应用层先查询再决定插入或更新 ---
+            this._sql.push(' ON DUPLICATE KEY UPDATE ' + this._updateSub(data));
+        }
+        else {
+            // --- PostgreSQL: 使用 ON CONFLICT ---
+            let clause = ' ON CONFLICT ';
+            if (conflict) {
+                // --- 指定冲突字段 ---
+                if (typeof conflict === 'string') {
+                    clause += '(' + this.field(conflict) + ') ';
                 }
                 else {
-                    // --- json ---
-                    values += this.placeholder() + ', ';
-                    this._data.push(this._service === ESERVICE.MYSQL ? lText.stringifyJson(v) : v);
+                    clause += '(';
+                    for (const f of conflict) {
+                        clause += this.field(f) + ', ';
+                    }
+                    clause = clause.slice(0, -2) + ') ';
                 }
             }
-            sql = sql.slice(0, -2) + ') VALUES (' + values.slice(0, -2) + ')';
+            // --- DO UPDATE SET ---
+            this._sql.push(clause + 'DO UPDATE SET ' + this._updateSub(data));
         }
-        this._sql.push(sql);
         return this;
     }
     /**
@@ -253,7 +140,7 @@ export class Sql {
      */
     select(c, f) {
         this._data = [];
-        this._placeholder = 1;
+        this._placeholderCounter = 1;
         let sql = 'SELECT ';
         if (typeof c === 'string') {
             sql += this.field(c);
@@ -263,7 +150,7 @@ export class Sql {
             for (const i of c) {
                 if (Array.isArray(i)) {
                     // --- i: ['xx', ['x']] ---
-                    sql += this.field(i[0].replace(/\?/g, () => this.placeholder())) + ', ';
+                    sql += this.field(i[0].replace(/\?/g, () => this._placeholder())) + ', ';
                     this._data.push(...i[1]);
                 }
                 else {
@@ -293,7 +180,7 @@ export class Sql {
      */
     update(f, s) {
         this._data = [];
-        this._placeholder = 1;
+        this._placeholderCounter = 1;
         const sql = `UPDATE ${this.field(f, this._pre)} SET ${this._updateSub(s)}`;
         this._sql = [sql];
         return this;
@@ -332,10 +219,10 @@ export class Sql {
                 }
                 else {
                     if (v[1] === '=') {
-                        sql += this.field(v[0]) + ' = ' + this.placeholder() + ', ';
+                        sql += this.field(v[0]) + ' = ' + this._placeholder() + ', ';
                     }
                     else {
-                        sql += this.field(v[0]) + ' = ' + this.field(v[0]) + ' ' + v[1] + ' ' + this.placeholder() + ', ';
+                        sql += this.field(v[0]) + ' = ' + this.field(v[0]) + ' ' + v[1] + ' ' + this._placeholder() + ', ';
                     }
                     this._data.push(nv);
                 }
@@ -343,91 +230,10 @@ export class Sql {
             else {
                 // --- 2, 3, 4, 5, 6, 7, 8 ---
                 sql += this.field(k) + ' = ';
-                if (v === undefined || Number.isNaN(v)) {
-                    // --- 异常情况 ---
-                    lCore.log({}, '[SQL][_updateSub] value error, key: ' + k, '-error');
-                    sql += '"", ';
-                }
-                else if (v === null) {
-                    sql += 'NULL, ';
-                }
-                else if (typeof v === 'string' || typeof v === 'number') {
-                    // --- 2 ---
-                    sql += this.placeholder() + ', ';
-                    this._data.push(v);
-                }
-                else if (Array.isArray(v)) {
-                    if (v[0]?.x === undefined && typeof v[0] === 'string' &&
-                        v[0].includes('(') && v[0].includes(')')) {
-                        // --- 4, 5: ['(CASE `id` WHEN 1 THEN ? WHEN 2 THEN ? END)', ['val1', 'val2']] ---
-                        sql += this.field(v[0]) + ', ';
-                        if (v[1] !== undefined) {
-                            this._data.push(...v[1]);
-                        }
-                    }
-                    else if (v[0]?.y !== undefined) {
-                        // --- 7 ---
-                        if (this._service === ESERVICE.MYSQL) {
-                            // --- MYSQL ---
-                            sql += `ST_POLYGONFROMTEXT(${this.placeholder()}), `;
-                            this._data.push(`POLYGON((${v.map(item => {
-                                return `${item.x} ${item.y}`;
-                            }).join(', ')}))`);
-                        }
-                        else {
-                            // --- PGSQL ---
-                            sql += `${this.placeholder()}, `;
-                            this._data.push(`(${v.map(item => {
-                                return `(${item.x}, ${item.y})`;
-                            }).join(', ')})`);
-                        }
-                    }
-                    else {
-                        // --- v: json ---
-                        sql += this.placeholder() + ', ';
-                        this._data.push(this._service === ESERVICE.MYSQL ? lText.stringifyJson(v) : v);
-                    }
-                }
-                else if (v.x !== undefined) {
-                    if (v.y !== undefined) {
-                        // --- 6: v: {'x': 1, 'y': 2} ---
-                        if (this._service === ESERVICE.MYSQL) {
-                            // --- MYSQL ---
-                            sql += `ST_POINTFROMTEXT(${this.placeholder()}), `;
-                            this._data.push(`POINT(${v.x} ${v.y})`);
-                        }
-                        else {
-                            // --- PGSQL ---
-                            sql += `${this.placeholder()}, `;
-                            this._data.push(`(${v.x}, ${v.y})`);
-                        }
-                    }
-                    else {
-                        // --- v: json ---
-                        if (this._isField(v)) {
-                            // --- 3 ---
-                            sql += this.field(v.value) + ', ';
-                        }
-                        else {
-                            // --- 8 ---
-                            sql += this.placeholder() + ', ';
-                            this._data.push(this._service === ESERVICE.MYSQL ? lText.stringifyJson(v) : v);
-                        }
-                    }
-                }
-                else if (v instanceof Buffer) {
-                    // --- Buffer ---
-                    sql += this.placeholder() + ', ';
-                    this._data.push(v);
-                }
-                else if (this._isField(v)) {
-                    // --- 3 ---
-                    sql += this.field(v.value) + ', ';
-                }
-                else {
-                    // --- json ---
-                    sql += this.placeholder() + ', ';
-                    this._data.push(this._service === ESERVICE.MYSQL ? lText.stringifyJson(v) : v);
+                const result = this._processValue(v);
+                sql += result.sql + ', ';
+                if (result.data !== undefined) {
+                    this._data.push(...result.data);
                 }
             }
         }
@@ -440,13 +246,13 @@ export class Sql {
      */
     delete(f) {
         this._data = [];
-        this._placeholder = 1;
+        this._placeholderCounter = 1;
         this._sql = ['DELETE FROM ' + this.field(f, this._pre)];
         return this;
     }
     /**
      * --- 联查另一个 sql 对象 ---
-     * @param sql sql 对象
+     * @param lsql sql 对象
      * @param type 类型
      */
     union(lsql, type = '') {
@@ -457,7 +263,7 @@ export class Sql {
     }
     /**
      * --- 所有联查另一个 sql 对象 ---
-     * @param sql sql 对象
+     * @param lsql sql 对象
      */
     unionAll(lsql) {
         return this.union(lsql, 'ALL');
@@ -635,7 +441,7 @@ export class Sql {
                     // --- 3 ---
                     sql += this.field(v[0]) + ' ' + v[1].toUpperCase() + ' (';
                     for (const v1 of v[2]) {
-                        sql += this.placeholder() + ', ';
+                        sql += this._placeholder() + ', ';
                         data.push(v1);
                     }
                     sql = sql.slice(0, -2) + ') AND ';
@@ -649,7 +455,7 @@ export class Sql {
                         sql += this.field(v[0]) + ' ' + v[1] + ' ' + this.field(nv.value) + ' AND ';
                     }
                     else {
-                        sql += this.field(v[0]) + ' ' + v[1] + ' ' + this.placeholder() + ' AND ';
+                        sql += this.field(v[0]) + ' ' + v[1] + ' ' + this._placeholder() + ' AND ';
                         data.push(nv);
                     }
                 }
@@ -679,7 +485,7 @@ export class Sql {
                     }
                     else if (typeof v === 'string' || typeof v === 'number') {
                         // --- 1 ---
-                        sql += this.field(k) + ' = ' + this.placeholder() + ' AND ';
+                        sql += this.field(k) + ' = ' + this._placeholder() + ' AND ';
                         data.push(v);
                     }
                     else if (this._isField(v)) {
@@ -691,7 +497,7 @@ export class Sql {
                         if (v.length > 0) {
                             sql += this.field(k) + ' IN (';
                             for (const v1 of v) {
-                                sql += this.placeholder() + ', ';
+                                sql += this._placeholder() + ', ';
                                 data.push(v1);
                             }
                             sql = sql.slice(0, -2) + ') AND ';
@@ -890,10 +696,6 @@ export class Sql {
         this._sql.push(sql);
         return this;
     }
-    /** --- 获取占位符 --- */
-    placeholder() {
-        return this._service === ESERVICE.MYSQL ? '?' : `$${this._placeholder++}`;
-    }
     /**
      * --- 对字段进行包裹 ---
      * @param str
@@ -1053,6 +855,123 @@ export class Sql {
         }
         return true;
     }
+    /** --- 获取占位符 --- */
+    _placeholder() {
+        return this._service === ESERVICE.MYSQL ? '?' : `$${this._placeholderCounter++}`;
+    }
+    /**
+     * --- 处理单个值,检测数据类型并返回 SQL 和 data ---
+     * @param v 要处理的值
+     */
+    _processValue(v) {
+        if (v === undefined || Number.isNaN(v)) {
+            // --- 异常情况 ---
+            lCore.log({}, '[SQL][_processValue] value error', '-error');
+            return { 'sql': "''", 'data': [] };
+        }
+        else if (v === null) {
+            return { 'sql': 'NULL', 'data': [] };
+        }
+        else if (typeof v === 'string' || typeof v === 'number') {
+            return { 'sql': this._placeholder(), 'data': [v] };
+        }
+        else if (Array.isArray(v)) {
+            if (v[0]?.x === undefined && typeof v[0] === 'string' &&
+                v[0].includes('(') && v[0].includes(')')) {
+                // --- 函数式插入，对参数按位置分别处理 ---
+                // --- v: ['POINT(?)', ['20']] ---
+                // --- v: ['(CASE `id` WHEN 1 THEN ? WHEN 2 THEN ? END)', ['val1', 'val2']] ---
+                /** --- 函数 SQL 字符串 --- */
+                const sql = v[0];
+                /** --- 函数参数数组 --- */
+                const ps = v[1] ?? [];
+                /** --- 所有处理后的 SQL 片段 --- */
+                const sqls = [];
+                /** --- 所有处理后的数据 --- */
+                const ds = [];
+                for (const p of ps) {
+                    const res = this._processValue(p);
+                    sqls.push(res.sql);
+                    ds.push(...res.data);
+                }
+                let i = 0;
+                const replacedSql = sql.replace(/\?/g, () => sqls[i++]);
+                return {
+                    'sql': this.field(replacedSql),
+                    'data': ds
+                };
+            }
+            else if (v[0]?.y !== undefined) {
+                // --- v: [{'x': 1, 'y': 2}, { ... }, { ... }, ... ]---
+                if (this._service === ESERVICE.MYSQL) {
+                    // --- MYSQL ---
+                    return {
+                        'sql': `ST_POLYGONFROMTEXT(${this._placeholder()})`,
+                        'data': [`POLYGON((${v.map(item => {
+                                return `${item.x} ${item.y}`;
+                            }).join(', ')}))`]
+                    };
+                }
+                else {
+                    // --- PGSQL ---
+                    return {
+                        'sql': this._placeholder(),
+                        'data': [`(${v.map(item => {
+                                return `(${item.x}, ${item.y})`;
+                            }).join(', ')})`]
+                    };
+                }
+            }
+            else {
+                // --- v: json ---
+                return {
+                    'sql': this._placeholder(),
+                    'data': [this._service === ESERVICE.MYSQL ? lText.stringifyJson(v) : v]
+                };
+            }
+        }
+        else if (v.x !== undefined) {
+            if (v.y !== undefined) {
+                // --- v: {'x': 1, 'y': 2} ---
+                if (this._service === ESERVICE.MYSQL) {
+                    // --- MYSQL ---
+                    return {
+                        'sql': `ST_POINTFROMTEXT(${this._placeholder()})`,
+                        'data': [`POINT(${v.x} ${v.y})`]
+                    };
+                }
+                else {
+                    // --- PGSQL ---
+                    return {
+                        'sql': this._placeholder(),
+                        'data': [`(${v.x}, ${v.y})`]
+                    };
+                }
+            }
+            else {
+                // --- v: json ---
+                return {
+                    'sql': this._placeholder(),
+                    'data': [this._service === ESERVICE.MYSQL ? lText.stringifyJson(v) : v]
+                };
+            }
+        }
+        else if (v instanceof Buffer) {
+            // --- Buffer ---
+            return { 'sql': this._placeholder(), 'data': [v] };
+        }
+        else if (this._isField(v)) {
+            // --- field ---
+            return { 'sql': this.field(v.value), 'data': [] };
+        }
+        else {
+            // --- json ---
+            return {
+                'sql': this._placeholder(),
+                'data': [this._service === ESERVICE.MYSQL ? lText.stringifyJson(v) : v]
+            };
+        }
+    }
 }
 /**
  * --- 创建 sql 对象 ---

package/lib/ssh.d.ts

@@ -6,7 +6,7 @@
 import * as ssh2 from 'ssh2';
 import * as shell from './ssh/shell.js';
 import * as sftp from './ssh/sftp.js';
-interface IExtOptions {
+export interface IExtOptions {
     'mproxy'?: {
         'host': string;
         'port': number;
@@ -53,4 +53,3 @@ export declare class Connection {
  * @param opt 选项
  */
 export declare function get(opt: ssh2.ConnectConfig & IExtOptions): Promise<Connection | null>;
-export {};

package/lib/text.d.ts

@@ -47,7 +47,7 @@ export declare function isIPv6(ip: string): boolean;
 export declare const REGEXP_DOMAIN: RegExp;
 /**
  * --- 判断是否是域名 ---
- * @param string $domain
+ * @param domain 域名
  * @return bool
  */
 export declare function isDomain(domain: string): boolean;
@@ -120,7 +120,7 @@ export declare function isRealPath(path: string): boolean;
 export declare function getFilename(path: string): string;
 /**
  * --- 将普通的返回 JSON 对象序列化为字符串 ---
- * @param o 返回 JSON 对象
+ * @param rtn 返回 JSON 对象
  */
 export declare function stringifyResult(rtn: kebab.Json): string;
 /**
@@ -143,7 +143,8 @@ export declare function stringifyBuffer(buf: Buffer): string;
  * --- 递归删除 json 中的字符串首尾空格，会返回一个新的对象 ---
  */
 export declare function trimJson(json: kebab.Json): kebab.Json;
-type TFalsy = false | '' | 0 | null | undefined | typeof NaN;
+/** --- 虚假值类型 --- */
+export type TFalsy = false | '' | 0 | null | undefined | typeof NaN;
 /**
  * --- 判断一个值是否是虚假的（为 null/undefined/空字符串/false/0） ---
  * @param val 要判断的值
@@ -183,4 +184,3 @@ export declare function str2int(str: string, digits?: number): number;
  * @param decimal 最终保留的小数位数
  */
 export declare function int2str(int: number, digits?: number, decimal?: number): string;
-export {};

package/lib/text.js

@@ -205,7 +205,7 @@ export function isIPv6(ip) {
 export const REGEXP_DOMAIN = /^.+?\.((?![0-9]).)+$/i;
 /**
  * --- 判断是否是域名 ---
- * @param string $domain
+ * @param domain 域名
  * @return bool
  */
 export function isDomain(domain) {
@@ -432,7 +432,7 @@ export function getFilename(path) {
 }
 /**
  * --- 将普通的返回 JSON 对象序列化为字符串 ---
- * @param o 返回 JSON 对象
+ * @param rtn 返回 JSON 对象
  */
 export function stringifyResult(rtn) {
     if (Array.isArray(rtn)) {

package/lib/vector.d.ts

@@ -66,6 +66,6 @@ export declare class Vector {
 }
 /**
  * --- 创建一个 Vector 对象 ---
- * @param opt 选项
+ * @param ctrEtc 控制器或配置信息
  */
 export declare function get(ctrEtc: sCtr.Ctr | kebab.IConfigVector): Vector;