@maiyunnet/kebab 7.4.2 → 7.6.0

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "7.4.2";
+export declare const VER = "7.6.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.2';
+export const VER = '7.6.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/lib/text.d.ts

@@ -95,9 +95,20 @@ export declare function isIdCardCN(idcard: string): boolean;
 /**
  * --- 将对象转换为 query string ---
  * @param query 要转换的对象
- * @param encode 是否转义
+ * @param encode 是否转义，默认为 true
  */
 export declare function queryStringify(query: Record<string, any>, encode?: boolean): string;
+/**
+ * --- 将对象转换为 query string ---
+ * @param query 要转换的对象
+ * @param options 选项
+ */
+export declare function queryStringify(query: Record<string, any>, options: {
+    /** --- 等号分隔符，默认 = --- */
+    'equal'?: string;
+    /** --- 连字符分隔符，默认 & --- */
+    'hyphen'?: string;
+}): string;
 /**
  * --- 将 query string 转换为对象 ---
  * @param query 要转换的字符串

package/lib/text.js

@@ -336,26 +336,24 @@ export function isIdCardCN(idcard) {
     // --- 比较校验码 ---
     return verifyCode === verifyCodeList[Number(mod)];
 }
-/**
- * --- 将对象转换为 query string ---
- * @param query 要转换的对象
- * @param encode 是否转义
- */
 export function queryStringify(query, encode = true) {
-    if (encode) {
-        return Object.entries(query).map(([k, v]) => {
-            if (Array.isArray(v)) {
-                return v.map((i) => `${encodeURIComponent(k)}=${encodeURIComponent(i)}`).join('&');
-            }
-            return `${encodeURIComponent(k)}=${encodeURIComponent(v)}`;
-        }).join('&');
+    let isEncode = true;
+    let equal = '=';
+    let hyphen = '&';
+    if (typeof encode === 'object') {
+        equal = encode.equal ?? '=';
+        hyphen = encode.hyphen ?? '&';
+    }
+    else {
+        isEncode = encode;
     }
     return Object.entries(query).map(([k, v]) => {
+        const key = isEncode ? encodeURIComponent(k) : k;
         if (Array.isArray(v)) {
-            return v.map((i) => `${k}=${i}`).join('&');
+            return v.map(i => `${key}${equal}${isEncode ? encodeURIComponent(i) : i}`).join(hyphen);
         }
-        return `${k}=${v}`;
-    }).join('&');
+        return `${key}${equal}${isEncode ? encodeURIComponent(v) : v}`;
+    }).join(hyphen);
 }
 /**
  * --- 将 query string 转换为对象 ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "7.4.2",
+  "version": "7.6.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/child.js

@@ -107,7 +107,9 @@ async function run() {
         const host = (req.headers[':authority'] ?? req.headers['host'] ?? '');
         if (!host) {
             lCore.writeHead(res, 403);
-            res.end('403 Forbidden');
+            res.end('403 Forbidden', () => {
+                req.socket.destroy();
+            });
             return;
         }
         wrapWithLinkCount(host + req.url, () => requestHandler(req, res, true), '[CHILD][http2][request]');
@@ -126,7 +128,9 @@ async function run() {
         if (!host) {
             res.setHeader('x-kebab-error', '0');
             lCore.writeHead(res, 403);
-            res.end();
+            res.end('403 Forbidden', () => {
+                req.socket.destroy();
+            });
             return;
         }
         wrapWithLinkCount(host + (req.url ?? ''), () => requestHandler(req, res, false), '[CHILD][http][request]');
@@ -188,7 +192,9 @@ async function requestHandler(req, res, https) {
     if (!vhost) {
         res.setHeader('x-kebab-error', '1');
         lCore.writeHead(res, 403);
-        res.end();
+        res.end('403 Forbidden', () => {
+            req.socket.destroy();
+        });
         return;
         /*
         const text = '<h1>Kebab: No permissions</h1>host: ' + (req.headers[':authority'] as string | undefined ?? req.headers['host'] ?? '') + '<br>url: ' + (lText.htmlescape(req.url ?? ''));

package/sys/master.js

@@ -238,7 +238,7 @@ function createRpcListener() {
                             // --- 特殊文件不能覆盖 ---
                             continue;
                         }
-                        if (fname.endsWith('.js.map') || fname.endsWith('.ts') || fname.endsWith('.gitignore')) {
+                        if (fname.endsWith('.js.map') || fname.endsWith('.ts') || fname.endsWith('.gitignore') || fname.endsWith('.DS_Store')) {
                             // --- 测试或开发文件不覆盖 ---
                             continue;
                         }

package/www/example/ctr/test.d.ts

@@ -92,7 +92,7 @@ export default class extends sCtr.Ctr {
     consistentDistributed(): string;
     consistentMigration(): string;
     consistentFast(): string;
-    text(): string;
+    text(): Promise<string>;
     time(): string;
     wsServer(): string;
     wsClient(): Promise<string>;

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;
             }
@@ -2825,7 +2874,7 @@ const rtn = cons.migration(rows, newTables);</pre>`);
         echo.push(JSON.stringify(rtn));
         return echo.join('') + '<br><br>' + this._getEnd();
     }
-    text() {
+    async text() {
         const echo = `<pre>json_encode(lText.parseUrl('HtTp://uSer:pAss@sUBDom.TopdOm23.CoM:29819/Adm@xw2Ksiz/dszas?Mdi=KdiMs1&a=JDd#hehHe'))</pre>
 ${lText.htmlescape(JSON.stringify(lText.parseUrl('HtTp://uSer:pAss@sUBDom.TopdOm23.CoM:29819/Adm@xw2Ksiz/dszas?Mdi=KdiMs1&a=JDd#hehHe')))}
 <pre>json_encode(lText.parseUrl('HtTp://uSer@sUBDom.TopdOm23.CoM/Admx%20w2Ksiz/dszas'))</pre>
@@ -2891,19 +2940,29 @@ ${JSON.stringify(lText.isDomain('www.xxx.com.cn'))}
 <pre>lText.isDomain('com');</pre>
 ${JSON.stringify(lText.isDomain('com'))}
 <pre>lText.parseDomain('www.xxx.com.cn');</pre>
-${JSON.stringify(lText.parseDomain('www.xxx.com.cn'))}
+${JSON.stringify(await lText.parseDomain('www.xxx.com.cn'))}
 <pre>lText.parseDomain('www.xxx.us');</pre>
-${JSON.stringify(lText.parseDomain('www.xxx.us'))}
+${JSON.stringify(await lText.parseDomain('www.xxx.us'))}
 <pre>lText.parseDomain('xxx.co.jp');</pre>
-${JSON.stringify(lText.parseDomain('xxx.co.jp'))}
+${JSON.stringify(await lText.parseDomain('xxx.co.jp'))}
 <pre>lText.parseDomain('js.cn');</pre>
-${JSON.stringify(lText.parseDomain('js.cn'))}
+${JSON.stringify(await lText.parseDomain('js.cn'))}
 <pre>lText.parseDomain('xxx.cn');</pre>
-${JSON.stringify(lText.parseDomain('xxx.cn'))}
+${JSON.stringify(await lText.parseDomain('xxx.cn'))}
 <pre>lText.parseJson('{"num":90071992547409993149,"num2":3242354,"num3":"16565","str":"abc","bool":false}');</pre>
 ${lText.stringifyJson(lText.parseJson('{"num":90071992547409993149,"num2":3242354,"num3":"16565","str":"abc","bool":false}'))}
 <pre>lText.isIdCardCN('110101200007284901')</pre>
-${JSON.stringify(lText.isIdCardCN('110101200007284901'))}`;
+${JSON.stringify(lText.isIdCardCN('110101200007284901'))}
+<pre>lText.queryStringify({'a': 1, 'b': '2'});</pre>
+${lText.queryStringify({ 'a': 1, 'b': '2' })}
+<pre>lText.queryStringify({ 'a': 1, 'b': '2' }, false);</pre>
+${lText.queryStringify({ 'a': 1, 'b': '2' }, false)}
+<pre>lText.queryStringify({ 'a': 1, 'b': '2' }, { 'equal': ':', 'hyphen': '|' });</pre>
+${lText.queryStringify({ 'a': 1, 'b': '2' }, { 'equal': ':', 'hyphen': '|' })}
+<pre>lText.queryStringify({ 'a': [1, 2], 'b': '3' }, { 'equal': ':', 'hyphen': '|' });</pre>
+${lText.queryStringify({ 'a': [1, 2], 'b': '3' }, { 'equal': ':', 'hyphen': '|' })}
+<pre>lText.queryStringify({ 'a': [1, 2], 'b': '3' }, { 'equal': '', 'hyphen': '' });</pre>
+${lText.queryStringify({ 'a': [1, 2], 'b': '3' }, { 'equal': '', 'hyphen': '' })}`;
         return echo + '<br><br>' + this._getEnd();
     }
     time() {