@maiyunnet/kebab 7.4.1 → 7.5.0

package/index.d.ts

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

package/index.js

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

package/lib/sql.d.ts

@@ -10,6 +10,19 @@ export declare enum ESERVICE {
     'MYSQL' = 0,
     'PGSQL' = 1
 }
+/** --- JSON 查询操作符 --- */
+export declare enum EJSON {
+    /** --- 包含 (MySQL: JSON_CONTAINS, PG: @>) --- */
+    'CONTAINS' = "json",
+    /** --- 被包含 (MySQL: JSON_CONTAINS, PG: <@) --- */
+    'CONTAINED_BY' = "json_in",
+    /** --- 存在 Key (MySQL: JSON_CONTAINS_PATH one, PG: ?) --- */
+    'HAS_KEY' = "json_key",
+    /** --- 存在任意 Key (MySQL: JSON_CONTAINS_PATH one, PG: ?|) --- */
+    'HAS_ANY_KEYS' = "json_any",
+    /** --- 存在所有 Key (MySQL: JSON_CONTAINS_PATH all, PG: ?&) --- */
+    'HAS_ALL_KEYS' = "json_all"
+}
 export declare class Sql {
     /** --- ctr 对象 --- */
     private readonly _ctr?;
@@ -145,6 +158,7 @@ export declare class Sql {
      * --- 5. '$or': [{'city': 'bj'}, {'city': 'sh'}, [['age', '>', '10']]], 'type': '2' ---
      * --- 6. 'city_in': column('city_out') ---
      * --- 7. ['JSON_CONTAINS(`uid`, ?)', ['hello']] ---
+     * --- 8. ['info', 'json', {'a': 1}] ---
      * @param s 筛选数据
      */
     where(s: string | kebab.Json): this;

package/lib/sql.js

@@ -8,6 +8,20 @@ export var ESERVICE;
     ESERVICE[ESERVICE["MYSQL"] = 0] = "MYSQL";
     ESERVICE[ESERVICE["PGSQL"] = 1] = "PGSQL";
 })(ESERVICE || (ESERVICE = {}));
+/** --- JSON 查询操作符 --- */
+export var EJSON;
+(function (EJSON) {
+    /** --- 包含 (MySQL: JSON_CONTAINS, PG: @>) --- */
+    EJSON["CONTAINS"] = "json";
+    /** --- 被包含 (MySQL: JSON_CONTAINS, PG: <@) --- */
+    EJSON["CONTAINED_BY"] = "json_in";
+    /** --- 存在 Key (MySQL: JSON_CONTAINS_PATH one, PG: ?) --- */
+    EJSON["HAS_KEY"] = "json_key";
+    /** --- 存在任意 Key (MySQL: JSON_CONTAINS_PATH one, PG: ?|) --- */
+    EJSON["HAS_ANY_KEYS"] = "json_any";
+    /** --- 存在所有 Key (MySQL: JSON_CONTAINS_PATH all, PG: ?&) --- */
+    EJSON["HAS_ALL_KEYS"] = "json_all";
+})(EJSON || (EJSON = {}));
 /** --- field 用 token --- */
 let columnToken = '';
 export class Sql {
@@ -388,6 +402,7 @@ export class Sql {
      * --- 5. '$or': [{'city': 'bj'}, {'city': 'sh'}, [['age', '>', '10']]], 'type': '2' ---
      * --- 6. 'city_in': column('city_out') ---
      * --- 7. ['JSON_CONTAINS(`uid`, ?)', ['hello']] ---
+     * --- 8. ['info', 'json', {'a': 1}] ---
      * @param s 筛选数据
      */
     where(s) {
@@ -437,6 +452,55 @@ export class Sql {
                         data.push(...v[1]);
                     }
                 }
+                else if (typeof v[1] === 'string' && ['json', 'json_in', 'json_key', 'json_any', 'json_all'].includes(v[1].toLowerCase())) {
+                    // --- json ---
+                    const op = v[1].toLowerCase();
+                    const nv = v[2];
+                    if (op === 'json') {
+                        if (this._service === ESERVICE.MYSQL) {
+                            sql += `JSON_CONTAINS(${this.field(v[0])}, ${this._placeholder()}) AND `;
+                            data.push(lText.stringifyJson(nv));
+                        }
+                        else {
+                            sql += `${this.field(v[0])} @> ${this._placeholder()} AND `;
+                            data.push(lText.stringifyJson(nv));
+                        }
+                    }
+                    else if (op === 'json_in') {
+                        if (this._service === ESERVICE.MYSQL) {
+                            sql += `JSON_CONTAINS(${this._placeholder()}, ${this.field(v[0])}) AND `;
+                            data.push(lText.stringifyJson(nv));
+                        }
+                        else {
+                            sql += `${this.field(v[0])} <@ ${this._placeholder()} AND `;
+                            data.push(lText.stringifyJson(nv));
+                        }
+                    }
+                    else {
+                        // --- json_key, json_any, json_all ---
+                        const keys = Array.isArray(nv) ? nv : [nv];
+                        if (this._service === ESERVICE.MYSQL) {
+                            const type = op === 'json_all' ? 'all' : 'one';
+                            let pathSql = '';
+                            for (const k of keys) {
+                                pathSql += ', ' + this._placeholder();
+                                data.push(k.startsWith('$') ? k : `$.${k}`);
+                            }
+                            sql += `JSON_CONTAINS_PATH(${this.field(v[0])}, '${type}'${pathSql}) AND `;
+                        }
+                        else {
+                            if (op === 'json_key' && keys.length === 1) {
+                                sql += `${this.field(v[0])} ? ${this._placeholder()} AND `;
+                                data.push(keys[0]);
+                            }
+                            else {
+                                const pgOp = op === 'json_all' ? '?&' : '?|';
+                                sql += `${this.field(v[0])} ${pgOp} ${this._placeholder()} AND `;
+                                data.push(keys);
+                            }
+                        }
+                    }
+                }
                 else if (v[2] === null) {
                     // --- 3: null ---
                     let opera = v[1];
@@ -994,6 +1058,15 @@ export function format(sql, data, service = ESERVICE.MYSQL) {
         if (val instanceof Buffer) {
             return `'\\x${val.toString('hex')}'`;
         }
+        if (Array.isArray(val)) {
+            // --- PGSQL Array ---
+            return `ARRAY[${val.map(v => {
+                if (typeof v === 'string') {
+                    return `'${v.replace(/'/g, "''")}'`;
+                }
+                return v;
+            }).join(', ')}]`;
+        }
         return `'${lText.stringifyJson(val).replace(/'/g, "''")}'`;
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "7.4.1",
+  "version": "7.5.0",
   "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/ctr.js

@@ -84,6 +84,11 @@ export class Ctr {
         if (!this._timer) {
             return;
         }
+        if (this._res.headersSent) {
+            // --- 已经开始输出的，不能设置 timeout ---
+            lCore.debug('[CTR][TIMEOUT][SET] headersSent is true, can not set timeout');
+            return;
+        }
         this._timer.timeout = num;
         clearTimeout(this._timer.timer);
         this._timer.timer = setTimeout(this._timer.callback, num);

package/www/example/ctr/test.js

@@ -187,6 +187,7 @@ export default class extends sCtr.Ctr {
             `<br><a href="${this._config.const.urlBase}test/sql?type=upsert">View "test/sql?type=upsert"</a> <a href="${this._config.const.urlBase}test/sql?type=upsert&s=pgsql">pgsql</a>`,
             `<br><a href="${this._config.const.urlBase}test/sql?type=delete">View "test/sql?type=delete"</a> <a href="${this._config.const.urlBase}test/sql?type=delete&s=pgsql">pgsql</a>`,
             `<br><a href="${this._config.const.urlBase}test/sql?type=where">View "test/sql?type=where"</a> <a href="${this._config.const.urlBase}test/sql?type=where&s=pgsql">pgsql</a>`,
+            `<br><a href="${this._config.const.urlBase}test/sql?type=json">View "test/sql?type=json"</a> <a href="${this._config.const.urlBase}test/sql?type=json&s=pgsql">pgsql</a>`,
             `<br><a href="${this._config.const.urlBase}test/sql?type=having">View "test/sql?type=having"</a> <a href="${this._config.const.urlBase}test/sql?type=having&s=pgsql">pgsql</a>`,
             `<br><a href="${this._config.const.urlBase}test/sql?type=by">View "test/sql?type=by"</a> <a href="${this._config.const.urlBase}test/sql?type=by&s=pgsql">pgsql</a>`,
             `<br><a href="${this._config.const.urlBase}test/sql?type=field">View "test/sql?type=field"</a> <a href="${this._config.const.urlBase}test/sql?type=field&s=pgsql">pgsql</a>`,
@@ -2561,6 +2562,44 @@ Result:<pre id="result">Nothing.</pre>`);
                 echo.push(`<pre>sql.delete('user').where({ 'id': '1' });</pre>
 <b>getSql() :</b> ${s}<br>
 <b>getData():</b> <pre>${JSON.stringify(sd, undefined, 4)}</pre>
+<b>format() :</b> ${sql.format(s, sd)}`);
+                break;
+            }
+            case 'json': {
+                // --- json contains ---
+                let s = sql.select('*', 'user').where([['info', lSql.EJSON.CONTAINS, { 'a': 1 }]]).getSql();
+                let sd = sql.getData();
+                echo.push(`<pre>sql.select('*', 'user').where([['info', lSql.EJSON.CONTAINS, { 'a': 1 }]]);</pre>
+<b>getSql() :</b> ${s}<br>
+<b>getData():</b> <pre>${JSON.stringify(sd, undefined, 4)}</pre>
+<b>format() :</b> ${sql.format(s, sd)}<hr>`);
+                // --- json contained by ---
+                s = sql.select('*', 'user').where([['info', lSql.EJSON.CONTAINED_BY, { 'a': 1, 'b': 2 }]]).getSql();
+                sd = sql.getData();
+                echo.push(`<pre>sql.select('*', 'user').where([['info', lSql.EJSON.CONTAINED_BY, { 'a': 1, 'b': 2 }]]);</pre>
+<b>getSql() :</b> ${s}<br>
+<b>getData():</b> <pre>${JSON.stringify(sd, undefined, 4)}</pre>
+<b>format() :</b> ${sql.format(s, sd)}<hr>`);
+                // --- json key exists ---
+                s = sql.select('*', 'user').where([['info', lSql.EJSON.HAS_KEY, 'age']]).getSql();
+                sd = sql.getData();
+                echo.push(`<pre>sql.select('*', 'user').where([['info', lSql.EJSON.HAS_KEY, 'age']]);</pre>
+<b>getSql() :</b> ${s}<br>
+<b>getData():</b> <pre>${JSON.stringify(sd, undefined, 4)}</pre>
+<b>format() :</b> ${sql.format(s, sd)}<hr>`);
+                // --- json any key exists ---
+                s = sql.select('*', 'user').where([['info', lSql.EJSON.HAS_ANY_KEYS, ['age', 'name']]]).getSql();
+                sd = sql.getData();
+                echo.push(`<pre>sql.select('*', 'user').where([['info', lSql.EJSON.HAS_ANY_KEYS, ['age', 'name']]]);</pre>
+<b>getSql() :</b> ${s}<br>
+<b>getData():</b> <pre>${JSON.stringify(sd, undefined, 4)}</pre>
+<b>format() :</b> ${sql.format(s, sd)}<hr>`);
+                // --- json all keys exist ---
+                s = sql.select('*', 'user').where([['info', lSql.EJSON.HAS_ALL_KEYS, ['age', 'name']]]).getSql();
+                sd = sql.getData();
+                echo.push(`<pre>sql.select('*', 'user').where([['info', lSql.EJSON.HAS_ALL_KEYS, ['age', 'name']]]);</pre>
+<b>getSql() :</b> ${s}<br>
+<b>getData():</b> <pre>${JSON.stringify(sd, undefined, 4)}</pre>
 <b>format() :</b> ${sql.format(s, sd)}`);
                 break;
             }
@@ -2648,6 +2687,16 @@ Result:<pre id="result">Nothing.</pre>`);
                 echo.push(`<pre>sql.select('*', 'user').where([{ 'city': 'la', 'area': null }, ['age', '>', '10'], ['soft', '<>', null], ['ware', 'IS', null]]);</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('*', 'user').where([
+                    ['info', 'json', { 'a': 1 }]
+                ]).getSql();
+                sd = sql.getData();
+                echo.push(`<pre>sql.select('*', 'user').where([
+    ['info', 'json', { 'a': 1 }]
+]);</pre>
+<b>getSql() :</b> ${s}<br>
+<b>getData():</b> <pre>${JSON.stringify(sd, undefined, 4)}</pre>
 <b>format() :</b> ${sql.format(s, sd)}`);
                 break;
             }