@maiyunnet/kebab 3.1.4 → 3.1.5

package/sys/mod.d.ts

@@ -1,18 +1,18 @@
 /**
  * Project: Mutton, User: JianSuoQiYue
  * Date: 2019-6-4 21:35
- * Last: 2020-4-14 13:33:51, 2022-07-23 16:01:34, 2022-09-06 22:59:26, 2023-5-24 19:11:37, 2023-6-13 21:47:58, 2023-7-10 18:54:03, 2023-8-23 17:03:16, 2023-12-11 15:21:22, 2023-12-20 23:12:03, 2024-3-8 16:05:29, 2024-3-20 19:58:15, 2024-8-11 21:14:54, 2024-10-5 14:00:22, 2024-12-14 19:58:34
+ * Last: 2020-4-14 13:33:51, 2022-07-23 16:01:34, 2022-09-06 22:59:26, 2023-5-24 19:11:37, 2023-6-13 21:47:58, 2023-7-10 18:54:03, 2023-8-23 17:03:16, 2023-12-11 15:21:22, 2023-12-20 23:12:03, 2024-3-8 16:05:29, 2024-3-20 19:58:15, 2024-8-11 21:14:54, 2024-10-5 14:00:22, 2024-12-14 19:58:34, 2025-9-23 11:01:36
  */
 import * as lSql from '#lib/sql.js';
 import * as lDb from '#lib/db.js';
 import * as sCtr from '#sys/ctr.js';
-import * as types from '#types/index.js';
+import * as kebab from '#index.js';
 /** --- 只获取变量 --- */
 type TOnlyProperties<T> = {
     [K in keyof T as T[K] extends (...args: any[]) => any ? never : K]: T[K];
 };
 /** --- 条数列表 --- */
-declare class Rows<T extends Mod> implements types.Rows<T> {
+declare class Rows<T extends Mod> implements CRows<T> {
     private readonly _items;
     constructor(initialItems?: T[]);
     /** --- 总行数 --- */
@@ -72,7 +72,7 @@ export default class Mod {
         'alias'?: string;
         'row'?: Record<string, any>;
         'select'?: string | string[];
-        'where'?: string | types.Json;
+        'where'?: string | kebab.Json;
         'contain'?: {
             'key': string;
             'list': string[];
@@ -114,7 +114,7 @@ export default class Mod {
      * @param update 要更新的数据
      * @param opt 选项
      */
-    static insertDuplicate(db: lDb.Pool | lDb.Transaction, data: Record<string, any>, update: types.Json, opt?: {
+    static insertDuplicate(db: lDb.Pool | lDb.Transaction, data: Record<string, any>, update: kebab.Json, opt?: {
         'pre'?: sCtr.Ctr | string;
         'index'?: string;
     }): Promise<boolean | null>;
@@ -124,7 +124,7 @@ export default class Mod {
      * @param where 筛选条件
      * @param opt 选项
      */
-    static removeByWhere(db: lDb.Pool | lDb.Transaction, where: string | types.Json, opt?: {
+    static removeByWhere(db: lDb.Pool | lDb.Transaction, where: string | kebab.Json, opt?: {
         'raw'?: boolean;
         'pre'?: sCtr.Ctr | string;
         'index'?: string;
@@ -137,7 +137,7 @@ export default class Mod {
      * @param where 筛选条件
      * @param opt 选项
      */
-    static removeByWhereSql(db: lDb.Pool | lDb.Transaction, where: string | types.Json, opt?: {
+    static removeByWhereSql(db: lDb.Pool | lDb.Transaction, where: string | kebab.Json, opt?: {
         'raw'?: boolean;
         'pre'?: sCtr.Ctr | string;
         'index'?: string;
@@ -151,7 +151,7 @@ export default class Mod {
      * @param where 筛选条件
      * @param opt 选项
      */
-    static updateByWhere(db: lDb.Pool | lDb.Transaction, data: types.Json, where: string | types.Json, opt?: {
+    static updateByWhere(db: lDb.Pool | lDb.Transaction, data: kebab.Json, where: string | kebab.Json, opt?: {
         'raw'?: boolean;
         'pre'?: sCtr.Ctr | string;
         'index'?: string | string[];
@@ -164,7 +164,7 @@ export default class Mod {
      * @param where 筛选条件
      * @param opt 选项
      */
-    static updateByWhereSql(data: types.Json, where: string | types.Json, opt?: {
+    static updateByWhereSql(data: kebab.Json, where: string | kebab.Json, opt?: {
         'raw'?: boolean;
         'pre'?: sCtr.Ctr | string;
         'index'?: string;
@@ -193,7 +193,7 @@ export default class Mod {
      * @param s 筛选条件数组或字符串
      * @param opt 选项
      */
-    static where<T extends Mod>(db: lDb.Pool | lDb.Transaction, s?: string | types.Json, opt?: {
+    static where<T extends Mod>(db: lDb.Pool | lDb.Transaction, s?: string | kebab.Json, opt?: {
         'ctr'?: sCtr.Ctr;
         'raw'?: boolean;
         'pre'?: string;
@@ -227,7 +227,7 @@ export default class Mod {
         'pre'?: string;
         'index'?: string;
     }): Promise<false | null | (T & Record<string, any>)>;
-    static one(db: lDb.Pool | lDb.Transaction, s: string | types.Json, opt: {
+    static one(db: lDb.Pool | lDb.Transaction, s: string | kebab.Json, opt: {
         'ctr'?: sCtr.Ctr;
         'raw'?: boolean;
         'pre'?: string;
@@ -236,7 +236,7 @@ export default class Mod {
         'by'?: [string | string[], 'DESC' | 'ASC'];
         'array': true;
     }): Promise<false | null | Record<string, any>>;
-    static one<T extends Mod>(db: lDb.Pool | lDb.Transaction, s: string | types.Json, opt: {
+    static one<T extends Mod>(db: lDb.Pool | lDb.Transaction, s: string | kebab.Json, opt: {
         'ctr'?: sCtr.Ctr;
         'raw'?: boolean;
         'pre'?: string;
@@ -251,7 +251,7 @@ export default class Mod {
      * @param s 筛选条件数组或字符串
      * @param opt 选项
      */
-    static oneArray(db: lDb.Pool | lDb.Transaction, s: string | types.Json, opt?: {
+    static oneArray(db: lDb.Pool | lDb.Transaction, s: string | kebab.Json, opt?: {
         'ctr'?: sCtr.Ctr;
         'raw'?: boolean;
         'pre'?: string;
@@ -264,7 +264,7 @@ export default class Mod {
      * @param where where 条件
      * @param opt 选项
      */
-    static primarys(db: lDb.Pool | lDb.Transaction, where?: string | types.Json, opt?: {
+    static primarys(db: lDb.Pool | lDb.Transaction, where?: string | kebab.Json, opt?: {
         'ctr'?: sCtr.Ctr;
         'raw'?: boolean;
         'pre'?: string;
@@ -287,7 +287,7 @@ export default class Mod {
      * @param notWhere 若要不存在才成功，则要传入限定条件
      * @param table 可对限定条件传入适当的表
      */
-    create(notWhere?: string | types.Json, table?: string): Promise<boolean>;
+    create(notWhere?: string | kebab.Json, table?: string): Promise<boolean>;
     /**
      * --- 唯一键冲突则替换，不冲突则创建数据 ---
      */
@@ -318,12 +318,12 @@ export default class Mod {
      * @param f 要联合查询的表列表、单个表、sql 对象
      * @param type 类型
      */
-    union(f: lSql.Sql | string | types.IModUnionItem | string[] | types.IModUnionItem[], type?: string): this;
+    union(f: lSql.Sql | string | IModUnionItem | string[] | IModUnionItem[], type?: string): this;
     /**
      * --- 所有联合查询表数据 ---
      * @param f 要联合查询的表列表、单个表、sql 对象
      */
-    unionAll(f: lSql.Sql | string | types.IModUnionItem | string[] | types.IModUnionItem[]): this;
+    unionAll(f: lSql.Sql | string | IModUnionItem | string[] | IModUnionItem[]): this;
     all(): Promise<false | Rows<this>>;
     all(key: string): Promise<false | Record<string, this>>;
     allArray(): Promise<false | Array<Record<string, any>>>;
@@ -346,59 +346,59 @@ export default class Mod {
      * @param index 给本表增加 index 分表项
      * @param pre 前缀
      */
-    join(f: string, s?: types.Json, type?: string, index?: string, pre?: string): this;
+    join(f: string, s?: kebab.Json, type?: string, index?: string, pre?: string): this;
     /**
      * --- left join 方法 ---
      * @param f 表名
      * @param s ON 信息
      * @param index 给本表增加 index 分表项
      */
-    leftJoin(f: string, s: types.Json, index?: string, pre?: string): this;
+    leftJoin(f: string, s: kebab.Json, index?: string, pre?: string): this;
     /**
      * --- right join 方法 ---
      * @param f 表名
      * @param s ON 信息
      * @param index 给本表增加 index 分表项
      */
-    rightJoin(f: string, s: types.Json, index?: string, pre?: string): this;
+    rightJoin(f: string, s: kebab.Json, index?: string, pre?: string): this;
     /**
      * --- inner join 方法 ---
      * @param f 表名
      * @param s ON 信息
      * @param index 给本表增加 index 分表项
      */
-    innerJoin(f: string, s: types.Json, index?: string, pre?: string): this;
+    innerJoin(f: string, s: kebab.Json, index?: string, pre?: string): this;
     /**
      * --- full join 方法 ---
      * @param f 表名
      * @param s ON 信息
      * @param index 给本表增加 index 分表项
      */
-    fullJoin(f: string, s: types.Json, index?: string, pre?: string): this;
+    fullJoin(f: string, s: kebab.Json, index?: string, pre?: string): this;
     /**
      * --- cross join 方法 ---
      * @param f 表名
      * @param s ON 信息
      * @param index 给本表增加 index 分表项
      */
-    crossJoin(f: string, s: types.Json, index?: string, pre?: string): this;
+    crossJoin(f: string, s: kebab.Json, index?: string, pre?: string): this;
     /**
      * --- 筛选器 ---
      * @param s 筛选条件数组或字符串
      */
-    having(s: types.Json): this;
+    having(s: kebab.Json): this;
     /**
      * --- 筛选器 ---
      * @param s 筛选条件数组或字符串
      * @param raw 是否包含已被软删除的数据
      */
-    filter(s: types.Json, raw?: boolean): this;
+    filter(s: kebab.Json, raw?: boolean): this;
     /**
      * --- 是 filter 的别名 ---
      * @param s 筛选条件数组或字符串
      * @param raw 是否包含已被软删除的数据
      */
-    where(s: types.Json, raw?: boolean): this;
+    where(s: kebab.Json, raw?: boolean): this;
     /**
      * --- ORDER BY ---
      * @param c 字段字符串或数组
@@ -474,4 +474,18 @@ export default class Mod {
      */
     protected _keyGenerator(): string;
 }
+/** --- mod ls 对象 --- */
+export declare class CRows<T> implements Iterable<T> {
+    /** --- 总行数 --- */
+    get length(): number;
+    /** --- 通过索引获取一个对象 --- */
+    item(index: number): T;
+    /** --- 转换为数组对象 --- */
+    toArray(): Array<Record<string, kebab.DbValue>>;
+    [Symbol.iterator](): Iterator<T>;
+}
+export interface IModUnionItem {
+    'field': string;
+    'where'?: any;
+}
 export {};

package/sys/mod.js

@@ -1,7 +1,7 @@
 /**
  * Project: Mutton, User: JianSuoQiYue
  * Date: 2019-6-4 21:35
- * Last: 2020-4-14 13:33:51, 2022-07-23 16:01:34, 2022-09-06 22:59:26, 2023-5-24 19:11:37, 2023-6-13 21:47:58, 2023-7-10 18:54:03, 2023-8-23 17:03:16, 2023-12-11 15:21:22, 2023-12-20 23:12:03, 2024-3-8 16:05:29, 2024-3-20 19:58:15, 2024-8-11 21:14:54, 2024-10-5 14:00:22, 2024-12-14 19:58:34
+ * Last: 2020-4-14 13:33:51, 2022-07-23 16:01:34, 2022-09-06 22:59:26, 2023-5-24 19:11:37, 2023-6-13 21:47:58, 2023-7-10 18:54:03, 2023-8-23 17:03:16, 2023-12-11 15:21:22, 2023-12-20 23:12:03, 2024-3-8 16:05:29, 2024-3-20 19:58:15, 2024-8-11 21:14:54, 2024-10-5 14:00:22, 2024-12-14 19:58:34, 2025-9-23 11:01:36
  */
 import * as lSql from '#lib/sql.js';
 import * as lTime from '#lib/time.js';

package/sys/route.d.ts

@@ -1,13 +1,13 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-4-15 13:40
- * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53
+ * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53, 2025-9-23 11:26:50
  */
 import * as http from 'http';
 import * as http2 from 'http2';
 import * as net from 'net';
 import * as sCtr from './ctr.js';
-import * as types from '#types/index.js';
+import * as kebab from '#index.js';
 /**
  * --- 清除已经加载的虚拟主机配置文件 ---
  */
@@ -20,7 +20,7 @@ export declare function run(data: {
     'req': http2.Http2ServerRequest | http.IncomingMessage;
     'res'?: http2.Http2ServerResponse | http.ServerResponse;
     'socket'?: net.Socket;
-    'uri': types.IUrlParse;
+    'uri': kebab.IUrlParse;
     /** --- 虚拟主机当前动态目录的绝对根目录，末尾带 / --- */
     'rootPath': string;
     /** --- base url，如 /abc/vhost/，前后都带 / --- */
@@ -38,7 +38,7 @@ export declare function run(data: {
  * --- 删除本次请求所有已上传的临时文件, Mutton: false, Kebab: true ---
  * @param cctr Ctr 对象 或 files
  */
-export declare function unlinkUploadFiles(cctr: sCtr.Ctr | Record<string, types.IPostFile | types.IPostFile[]>): Promise<void>;
+export declare function unlinkUploadFiles(cctr: sCtr.Ctr | Record<string, kebab.IPostFile | kebab.IPostFile[]>): Promise<void>;
 /**
  * --- 等待异步任务结束，并删除临时文件，如果结束后还有事务没关闭，则会在本函数中打印控制台并且写入 log 文件 ---
  * --- 此时其实已经给客户端返回了，此处等待不消耗客户端的等待时间 ---
@@ -49,7 +49,7 @@ export declare function waitCtr(cctr: sCtr.Ctr): Promise<void>;
  * --- 将 POST 数据的值执行 trim ---
  * @param post
  */
-export declare function trimPost(post: Record<string, types.Json>): void;
+export declare function trimPost(post: Record<string, kebab.Json>): void;
 /**
  * --- 获取 formdata 的 post ---
  * @param req 请求头
@@ -60,6 +60,6 @@ export declare function getFormData(req: http2.Http2ServerRequest | http.Incomin
     onfiledata?: (chunk: Buffer) => void;
     onfileend?: () => void;
 }): Promise<{
-    'post': Record<string, types.Json>;
-    'files': Record<string, types.IPostFile | types.IPostFile[]>;
+    'post': Record<string, kebab.Json>;
+    'files': Record<string, kebab.IPostFile | kebab.IPostFile[]>;
 } | false>;

package/sys/route.js

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-4-15 13:40
- * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53
+ * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53, 2025-9-23 11:26:50
  */
 import * as http from 'http';
 import * as stream from 'stream';

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

@@ -1,4 +1,4 @@
-import * as ctr from '#sys/ctr.js';
-export default class extends ctr.Ctr {
+import * as sCtr from '#sys/ctr.js';
+export default class extends sCtr.Ctr {
     index(): string;
 }

package/www/example/ctr/main.js

@@ -1,5 +1,5 @@
-import * as ctr from '#sys/ctr.js';
-export default class extends ctr.Ctr {
+import * as sCtr from '#sys/ctr.js';
+export default class extends sCtr.Ctr {
     index() {
         return `<a href="${this._config.const.urlBase}test">Hello world! Click here to visit demo.</a>`;
     }

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

@@ -1,6 +1,6 @@
-import * as ctr from '#sys/ctr.js';
-import * as types from '#types/index.js';
-export default class extends ctr.Ctr {
+import * as kebab from '#index.js';
+import * as sCtr from '#sys/ctr.js';
+export default class extends sCtr.Ctr {
     onLoad(): string | boolean;
-    onUnload(rtn: string | boolean | types.DbValue[]): string | boolean | types.DbValue[];
+    onUnload(rtn: string | boolean | kebab.DbValue[]): string | boolean | kebab.DbValue[];
 }

package/www/example/ctr/middle.js

@@ -1,5 +1,5 @@
-import * as ctr from '#sys/ctr.js';
-export default class extends ctr.Ctr {
+import * as sCtr from '#sys/ctr.js';
+export default class extends sCtr.Ctr {
     onLoad() {
         if (this._config.const.path !== 'test/middle') {
             return true;

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

@@ -1,10 +1,10 @@
 import * as fs from 'fs';
+import * as kebab from '#index.js';
 import * as sCtr from '#sys/ctr.js';
-import * as types from '#types/index.js';
 export default class extends sCtr.Ctr {
     private _internalUrl;
     onLoad(): Array<string | number> | boolean;
-    onUnload(rtn: string | boolean | types.DbValue[]): string | boolean | types.DbValue[];
+    onUnload(rtn: string | boolean | kebab.DbValue[]): string | boolean | kebab.DbValue[];
     notfound(): string;
     index(): string;
     article(): string;
@@ -12,22 +12,22 @@ export default class extends sCtr.Ctr {
     view(): Promise<string>;
     json(): Array<number | string | object> | object;
     ctrXsrf(): string;
-    ctrXsrf1(): types.Json[];
+    ctrXsrf1(): kebab.Json[];
     ctrCheckinput(): string;
-    ctrCheckinput1(): Promise<types.Json[]>;
-    ctrLocale(): Promise<types.Json[] | string>;
+    ctrCheckinput1(): Promise<kebab.Json[]>;
+    ctrLocale(): Promise<kebab.Json[] | string>;
     ctrCachettl(): string;
     ctrHttpcode(): string;
     ctrCross(): string;
-    ctrCross1(): types.Json[];
-    ctrCross2(): types.Json[];
+    ctrCross1(): kebab.Json[];
+    ctrCross2(): kebab.Json[];
     ctrReadable(): fs.ReadStream;
     ctrAsynctask(): any[];
     ctrTimeout(): Promise<any[]>;
-    modTest(): Promise<types.Json[] | string | boolean>;
+    modTest(): Promise<kebab.Json[] | string | boolean>;
     modSplit(): Promise<string>;
     modSplit1(): Promise<void>;
-    modSplit2(): Promise<types.Json[]>;
+    modSplit2(): Promise<kebab.Json[]>;
     modInsert(): Promise<string>;
     captchaFastbuild(): string;
     captchaBase64(): string;
@@ -44,16 +44,16 @@ export default class extends sCtr.Ctr {
     coreRestart(): Promise<string>;
     coreGlobal(): Promise<string>;
     crypto(): Promise<string>;
-    db(): Promise<types.Json>;
+    db(): Promise<kebab.Json>;
     private _dbTable;
-    kv(): Promise<types.Json>;
+    kv(): Promise<kebab.Json>;
     net(): Promise<string>;
-    netPipe(): Promise<types.Json>;
-    netPost(): Promise<types.Json>;
+    netPipe(): Promise<kebab.Json>;
+    netPost(): Promise<kebab.Json>;
     netPost1(): string;
     netPostString(): Promise<string>;
-    netPostString1(): types.Json[];
-    netOpen(): Promise<types.Json>;
+    netPostString1(): kebab.Json[];
+    netOpen(): Promise<kebab.Json>;
     netFormTest(): Promise<string>;
     netUpload(): Promise<string>;
     netUpload1(): Promise<string>;
@@ -63,21 +63,21 @@ export default class extends sCtr.Ctr {
     netSave(): Promise<string>;
     netFollow(): Promise<string>;
     netFollow1(): void;
-    netFollow2(): types.Json;
+    netFollow2(): kebab.Json;
     netReuse(): Promise<string>;
     netError(): Promise<string>;
     netHosts(): Promise<string>;
     netRproxy(): Promise<string | boolean>;
     netMproxy(): Promise<string | boolean>;
     netMproxy1(): Promise<string | boolean>;
-    scan(): Promise<types.Json>;
-    scan1(): Promise<types.Json>;
-    scan2(): Promise<types.Json>;
-    scan3(): Promise<types.Json>;
+    scan(): Promise<kebab.Json>;
+    scan1(): Promise<kebab.Json>;
+    scan2(): Promise<kebab.Json>;
+    scan3(): Promise<kebab.Json>;
     private _scanLink;
-    session(): Promise<string | types.Json[]>;
-    jwt(): Promise<string | types.Json[]>;
-    jwt1(): Promise<[number, types.Json]>;
+    session(): Promise<string | kebab.Json[]>;
+    jwt(): Promise<string | kebab.Json[]>;
+    jwt1(): Promise<[number, kebab.Json]>;
     sql(): string;
     consistentHash(): string;
     consistentDistributed(): string;
@@ -87,7 +87,7 @@ export default class extends sCtr.Ctr {
     time(): string;
     wsServer(): string;
     wsClient(): Promise<string>;
-    ssh(): Promise<string | types.Json[]>;
+    ssh(): Promise<string | kebab.Json[]>;
     s3(): Promise<string>;
     zip(): Promise<string>;
     buffer(): string;

package/www/example/ctr/test.js

@@ -1,4 +1,5 @@
-// --- 库和定义 ---
+// --- 库 ---
+import * as kebab from '#index.js';
 import * as lCore from '#lib/core.js';
 import * as lNet from '#lib/net.js';
 import * as lDb from '#lib/db.js';
@@ -20,7 +21,6 @@ import * as lBuffer from '#lib/buffer.js';
 import * as lLan from '#lib/lan.js';
 import * as lCron from '#lib/cron.js';
 import * as sCtr from '#sys/ctr.js';
-import * as kebab from '#index.js';
 // --- mod ---
 import mTest from '../mod/test.js';
 import mTestData from '../mod/testdata.js';

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

@@ -1,5 +1,5 @@
+import * as kebab from '#index.js';
 import sMod from '#sys/mod.js';
-import * as types from '#types/index.js';
 export default class extends sMod {
     protected static _$table: string;
     protected static _$primary: string;
@@ -16,7 +16,7 @@ export default class extends sMod {
         'x': number;
         'y': number;
     }>>;
-    json: types.Json;
+    json: kebab.Json;
     time_add: number;
     protected _keyGenerator(): string;
 }