@maiyunnet/kebab 3.1.3 → 3.1.5

package/lib/net/request.d.ts

@@ -1,11 +1,11 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2020-4-9 20:02:39
- * Last: 2020-4-9 20:47:58, 2022-09-10 01:35:34
+ * Last: 2020-4-9 20:47:58, 2022-09-10 01:35:34, 2025-9-23 12:41:58
  */
 import * as stream from 'stream';
-import * as response from './response.js';
-import * as types from '#types/index.js';
+import * as lNet from '#lib/net.js';
+import * as lResponse from './response.js';
 export declare class Request {
     /** --- get 或 post 的数据 --- */
     private _data;
@@ -70,7 +70,7 @@ export declare class Request {
      * --- 批量设置提交的 headers ---
      * @param headers
      */
-    headers(headers: types.THttpHeaders): this;
+    headers(headers: lNet.THttpHeaders): this;
     /**
      * --- 设置单条 header ---
      * @param name
@@ -81,5 +81,5 @@ export declare class Request {
      * --- 发起请求 ---
      * @param cookie
      */
-    request(cookie?: Record<string, types.ICookie>): Promise<response.Response>;
+    request(cookie?: Record<string, lNet.ICookie>): Promise<lResponse.Response>;
 }

package/lib/net/request.js

@@ -1,4 +1,4 @@
-import * as net from '#lib/net.js';
+import * as lNet from '#lib/net.js';
 export class Request {
     constructor(url) {
         /** --- get 或 post 的数据 --- */
@@ -115,6 +115,6 @@ export class Request {
      */
     request(cookie) {
         this._opt.cookie = cookie;
-        return net.request(this._url, this._data, this._opt);
+        return lNet.request(this._url, this._data, this._opt);
     }
 }

package/lib/net/response.d.ts

@@ -4,13 +4,13 @@
  * Last: 2020-4-12 11:12:03, 2022-09-10 12:43:23, 2022-12-25 15:12:57, 2023-9-26 14:20:41
  */
 import * as hc from '@litert/http-client';
-import * as nStream from 'stream';
-import * as types from '#types/index.js';
+import * as stream from 'stream';
+import * as lNet from '#lib/net.js';
 export declare class Response {
     /** --- httpClient 请求对象 --- */
     private readonly _req;
     /** --- 返回的 headers --- */
-    headers: types.THttpHeaders | null;
+    headers: lNet.THttpHeaders | null;
     error: Error | null;
     /** --- 用户自定义的 content 内容 --- */
     private _content;
@@ -27,9 +27,9 @@ export declare class Response {
     /**
      * --- 获取响应读取流对象 ---
      */
-    getStream(): nStream.Readable;
+    getStream(): stream.Readable;
     /**
      * --- 获取原生响应读取流对象 ---
      */
-    getRawStream(): nStream.Readable;
+    getRawStream(): stream.Readable;
 }

package/lib/net.d.ts

@@ -7,61 +7,11 @@
 import * as stream from 'stream';
 import * as http from 'http';
 import * as http2 from 'http2';
-import * as ctr from '#sys/ctr.js';
-import * as types from '#types/index.js';
+import * as kebab from '#index.js';
+import * as sCtr from '#sys/ctr.js';
 import * as fd from './net/formdata.js';
 import * as lRequest from './net/request.js';
-import * as response from './net/response.js';
-/** --- 请求的传入参数选项 --- */
-export interface IRequestOptions {
-    'method'?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'OPTIONS';
-    'type'?: 'form' | 'json';
-    /** --- 秒数 --- */
-    'timeout'?: number;
-    'follow'?: number;
-    'hosts'?: Record<string, string>;
-    'save'?: string;
-    'local'?: string;
-    'headers'?: types.THttpHeaders;
-    /** --- 正向 mproxy 代理，url 如 https://xxx/abc --- */
-    'mproxy'?: {
-        'url': string;
-        'auth': string;
-        'data'?: any;
-    };
-    /** --- 默认为 default --- */
-    'reuse'?: string;
-    /** --- cookie 托管对象 --- */
-    'cookie'?: Record<string, types.ICookie>;
-}
-/** --- 正向代理请求的传入参数选项 --- */
-export interface IMproxyOptions {
-    /** --- 秒数 --- */
-    'timeout'?: number;
-    'follow'?: number;
-    'hosts'?: Record<string, string>;
-    'local'?: string;
-    'headers'?: types.THttpHeaders;
-    /** --- 默认为 default --- */
-    'reuse'?: string;
-}
-/** --- 反向代理请求的传入参数选项 --- */
-export interface IRproxyOptions {
-    /** --- 秒数 --- */
-    'timeout'?: number;
-    'follow'?: number;
-    'hosts'?: Record<string, string>;
-    'local'?: string;
-    'headers'?: types.THttpHeaders;
-    /** --- 正向 mproxy 代理，url 如 https://xxx/abc --- */
-    'mproxy'?: {
-        'url': string;
-        'auth': string;
-        'data'?: any;
-    };
-    /** --- 默认为 default --- */
-    'reuse'?: string;
-}
+import * as lResponse from './net/response.js';
 /** --- 获取 CA 证书 --- */
 export declare function getCa(): Promise<string>;
 /**
@@ -74,26 +24,26 @@ export declare function open(u: string): lRequest.Request;
  * @param u 请求的 URL
  * @param opt 参数
  */
-export declare function get(u: string, opt?: IRequestOptions): Promise<response.Response>;
+export declare function get(u: string, opt?: IRequestOptions): Promise<lResponse.Response>;
 /**
  * --- 发起一个 post 请求 ---
  * @param u 请求的 URL
  * @param data 要发送的数据
  * @param opt 参数
  */
-export declare function post(u: string, data: Record<string, types.Json> | Buffer | string | stream.Readable, opt?: IRequestOptions): Promise<response.Response>;
+export declare function post(u: string, data: Record<string, kebab.Json> | Buffer | string | stream.Readable, opt?: IRequestOptions): Promise<lResponse.Response>;
 /**
  * --- 发起 JSON 请求 ---
  * @param u
  * @param data
  * @param opt
  */
-export declare function postJson(u: string, data: types.Json[] | Record<string, types.Json>, opt?: IRequestOptions): Promise<response.Response>;
+export declare function postJson(u: string, data: kebab.Json[] | Record<string, kebab.Json>, opt?: IRequestOptions): Promise<lResponse.Response>;
 /**
  * --- 发起一个请求 ---
  * @param opt 配置项
  */
-export declare function request(u: string, data?: Record<string, types.Json> | Buffer | string | stream.Readable, opt?: IRequestOptions): Promise<response.Response>;
+export declare function request(u: string, data?: Record<string, kebab.Json> | Buffer | string | stream.Readable, opt?: IRequestOptions): Promise<lResponse.Response>;
 /**
  * --- 对 cookie 对象进行操作 ---
  * @param cookie 要操作的对象
@@ -102,7 +52,7 @@ export declare function request(u: string, data?: Record<string, types.Json> | B
  * @param domain 应用网址，如 .xxx.com
  * @param opt 选项 ttl, path, ssl, httponly
  */
-export declare function setCookie(cookie: Record<string, types.ICookie>, name: string, value: string, domain: string, opt?: {
+export declare function setCookie(cookie: Record<string, ICookie>, name: string, value: string, domain: string, opt?: {
     'ttl'?: number;
     'path'?: string;
     'ssl'?: boolean;
@@ -113,12 +63,12 @@ export declare function setCookie(cookie: Record<string, types.ICookie>, name: s
  * @param cookie cookie 对象
  * @param uri 请求的 URI 对象
  */
-export declare function buildCookieQuery(cookie: Record<string, types.ICookie>, uri: types.IUrlParse): string;
+export declare function buildCookieQuery(cookie: Record<string, ICookie>, uri: kebab.IUrlParse): string;
 /**
  * --- 模拟重启浏览器后的状态 ---
  * @param cookie cookie 对象
  */
-export declare function resetCookieSession(cookie: Record<string, types.ICookie>): void;
+export declare function resetCookieSession(cookie: Record<string, ICookie>): void;
 /**
  * --- 创建 FormData 对象, Mutton: false, Kebab: true ---
  */
@@ -128,7 +78,7 @@ export declare function getFormData(): fd.FormData;
  * @param headers 剔除前的 header
  * @param res 直接设置头部而不返回，可置空
  */
-export declare function filterProxyHeaders(headers: http.IncomingHttpHeaders | http2.IncomingHttpHeaders | types.THttpHeaders, res?: http2.Http2ServerResponse | http.ServerResponse): Record<string, string | string[]>;
+export declare function filterProxyHeaders(headers: http.IncomingHttpHeaders | http2.IncomingHttpHeaders | THttpHeaders, res?: http2.Http2ServerResponse | http.ServerResponse): Record<string, string | string[]>;
 /**
  * --- 正向 mproxy 代理，读取 get 的 url 为实际请求地址 ---
  * --- get: url, auth ---
@@ -136,16 +86,83 @@ export declare function filterProxyHeaders(headers: http.IncomingHttpHeaders | h
  * @param auth 校验字符串，读取 get 的 auth 和本参数做比对
  * @param opt 参数
  */
-export declare function mproxy(ctr: ctr.Ctr, auth: string, opt?: IMproxyOptions): Promise<number>;
+export declare function mproxy(ctr: sCtr.Ctr, auth: string, opt?: IMproxyOptions): Promise<number>;
 /**
  * --- 获取 mproxy 的附加数据 ---
  * @param ctr 当前控制器
  */
-export declare function mproxyData(ctr: ctr.Ctr): any;
+export declare function mproxyData(ctr: sCtr.Ctr): any;
 /**
  * --- 反向代理，将本服务器的某个路由反代到其他网址 ---
  * @param ctr 当前控制器
  * @param route 要反代的路由
  * @param opt 参数
  */
-export declare function rproxy(ctr: ctr.Ctr, route: Record<string, string>, opt?: IRproxyOptions): Promise<boolean>;
+export declare function rproxy(ctr: sCtr.Ctr, route: Record<string, string>, opt?: IRproxyOptions): Promise<boolean>;
+/** --- 请求的传入参数选项 --- */
+export interface IRequestOptions {
+    'method'?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'OPTIONS';
+    'type'?: 'form' | 'json';
+    /** --- 秒数 --- */
+    'timeout'?: number;
+    'follow'?: number;
+    'hosts'?: Record<string, string>;
+    'save'?: string;
+    'local'?: string;
+    'headers'?: THttpHeaders;
+    /** --- 正向 mproxy 代理，url 如 https://xxx/abc --- */
+    'mproxy'?: {
+        'url': string;
+        'auth': string;
+        'data'?: any;
+    };
+    /** --- 默认为 default --- */
+    'reuse'?: string;
+    /** --- cookie 托管对象 --- */
+    'cookie'?: Record<string, ICookie>;
+}
+/** --- 正向代理请求的传入参数选项 --- */
+export interface IMproxyOptions {
+    /** --- 秒数 --- */
+    'timeout'?: number;
+    'follow'?: number;
+    'hosts'?: Record<string, string>;
+    'local'?: string;
+    'headers'?: THttpHeaders;
+    /** --- 默认为 default --- */
+    'reuse'?: string;
+}
+/** --- 反向代理请求的传入参数选项 --- */
+export interface IRproxyOptions {
+    /** --- 秒数 --- */
+    'timeout'?: number;
+    'follow'?: number;
+    'hosts'?: Record<string, string>;
+    'local'?: string;
+    'headers'?: THttpHeaders;
+    /** --- 正向 mproxy 代理，url 如 https://xxx/abc --- */
+    'mproxy'?: {
+        'url': string;
+        'auth': string;
+        'data'?: any;
+    };
+    /** --- 默认为 default --- */
+    'reuse'?: string;
+}
+/** --- http headers --- */
+export type THttpHeaders = http.IncomingHttpHeaders & {
+    'http-version'?: '1.1' | '2.0';
+    'http-code'?: number;
+    'http-url'?: string;
+};
+/** --- Net Cookie 对象 --- */
+export interface ICookie {
+    'name': string;
+    'value': string;
+    /** --- 有效期秒级时间戳 --- */
+    'exp': number;
+    'path': string;
+    'domain': string;
+    'secure': boolean;
+    'httponly': boolean;
+}

package/lib/net.js

@@ -8,14 +8,14 @@ import * as stream from 'stream';
 // --- 第三方 ---
 import * as hc from '@litert/http-client';
 // --- 库和定义 ---
-import * as fs from '#lib/fs.js';
-import * as text from '#lib/text.js';
-import * as time from '#lib/time.js';
 import * as kebab from '#index.js';
+import * as lFs from '#lib/fs.js';
+import * as lText from '#lib/text.js';
+import * as lTime from '#lib/time.js';
 // --- 自己 ---
 import * as fd from './net/formdata.js';
 import * as lRequest from './net/request.js';
-import * as response from './net/response.js';
+import * as lResponse from './net/response.js';
 /** --- ca 根证书内容 --- */
 let ca = '';
 /** --- 获取 CA 证书 --- */
@@ -23,12 +23,12 @@ export async function getCa() {
     if (ca) {
         return ca;
     }
-    ca = (await fs.getContent(kebab.LIB_PATH + 'net/cacert.pem', 'utf8')) ?? '';
+    ca = (await lFs.getContent(kebab.LIB_PATH + 'net/cacert.pem', 'utf8')) ?? '';
     return ca;
 }
 /** --- 复用的 hc 对象列表 --- */
 const reuses = {
-    'default': hc.createHttpClient()
+    'default': hc.createHttpClient(),
 };
 /**
  * --- 创建一个请求对象 ---
@@ -71,9 +71,9 @@ export async function postJson(u, data, opt = {}) {
  * @param opt 配置项
  */
 export async function request(u, data, opt = {}) {
-    const uri = text.parseUrl(u);
+    const uri = lText.parseUrl(u);
     /** --- 正向代理的地址 --- */
-    const puri = opt.mproxy ? text.parseUrl(opt.mproxy.url) : null;
+    const puri = opt.mproxy ? lText.parseUrl(opt.mproxy.url) : null;
     const method = opt.method ?? 'GET';
     const type = opt.type ?? 'form';
     const timeout = opt.timeout ?? 10;
@@ -93,7 +93,7 @@ export async function request(u, data, opt = {}) {
     if (method === 'GET') {
         if (data && !(data instanceof stream.Readable) && !Buffer.isBuffer(data)) {
             u += (u.includes('?') ? '&' : '?') +
-                (typeof data === 'string' ? data : text.queryStringify(data));
+                (typeof data === 'string' ? data : lText.queryStringify(data));
             data = undefined;
         }
     }
@@ -101,11 +101,11 @@ export async function request(u, data, opt = {}) {
         // --- POST ---
         if (data && !(data instanceof stream.Readable) && !Buffer.isBuffer(data) && typeof data !== 'string') {
             if (type === 'form') {
-                data = text.queryStringify(data);
+                data = lText.queryStringify(data);
                 headers['content-type'] = 'application/x-www-form-urlencoded';
             }
             else {
-                data = text.stringifyJson(data);
+                data = lText.stringifyJson(data);
                 headers['content-type'] = 'application/json; charset=utf-8';
             }
         }
@@ -129,7 +129,7 @@ export async function request(u, data, opt = {}) {
         // --- 重定义 IP ---
         const host = (puri ? puri.hostname : uri.hostname) ?? '';
         if (!host) {
-            const res = new response.Response(null);
+            const res = new lResponse.Response(null);
             res.error = {
                 'name': 'Possible mProxy error',
                 'message': 'host not found'
@@ -137,7 +137,7 @@ export async function request(u, data, opt = {}) {
             return res;
         }
         if (hosts[host] !== undefined && !hosts[host]) {
-            const res = new response.Response(null);
+            const res = new lResponse.Response(null);
             res.error = {
                 'name': 'hosts error',
                 'message': 'hosts param error'
@@ -148,10 +148,10 @@ export async function request(u, data, opt = {}) {
             reuses[reuse] = hc.createHttpClient();
         }
         req = await reuses[reuse].request({
-            'url': opt.mproxy ? opt.mproxy.url + (opt.mproxy.url.includes('?') ? '&' : '?') + text.queryStringify({
+            'url': opt.mproxy ? opt.mproxy.url + (opt.mproxy.url.includes('?') ? '&' : '?') + lText.queryStringify({
                 'url': u,
                 'auth': opt.mproxy.auth,
-                'data': opt.mproxy.data ? text.stringifyJson(opt.mproxy.data) : '{}'
+                'data': opt.mproxy.data ? lText.stringifyJson(opt.mproxy.data) : '{}'
             }) : u,
             'method': method,
             'data': data,
@@ -165,7 +165,7 @@ export async function request(u, data, opt = {}) {
         });
     }
     catch (err) {
-        const res = new response.Response(null);
+        const res = new lResponse.Response(null);
         res.error = err;
         return res;
     }
@@ -181,7 +181,7 @@ export async function request(u, data, opt = {}) {
     if (save && (!req.headers['location'] || follow === 0)) {
         await new Promise(function (resolve) {
             req.getStream().on('end', () => {
-                fs.stats(save).then((stat) => {
+                lFs.stats(save).then((stat) => {
                     total = stat?.size ?? 0;
                     resolve();
                 }).catch(() => {
@@ -189,11 +189,11 @@ export async function request(u, data, opt = {}) {
                 });
             }).on('error', function () {
                 resolve();
-            }).pipe(fs.createWriteStream(save));
+            }).pipe(lFs.createWriteStream(save));
         });
     }
     // --- 创建 Response 对象 ---
-    const res = new response.Response(req);
+    const res = new lResponse.Response(req);
     if (total) {
         res.setContent(total.toString());
     }
@@ -219,7 +219,7 @@ export async function request(u, data, opt = {}) {
     }
     // --- 哦，要追踪 ---
     headers['referer'] = u;
-    return request(text.urlResolve(u, req.headers['location']), data, {
+    return request(lText.urlResolve(u, req.headers['location']), data, {
         'method': method,
         'type': type,
         'timeout': timeout,
@@ -241,7 +241,7 @@ export async function request(u, data, opt = {}) {
  * @param opt 选项 ttl, path, ssl, httponly
  */
 export function setCookie(cookie, name, value, domain, opt = {}) {
-    const tim = time.stamp();
+    const tim = lTime.stamp();
     const ttl = opt.ttl ?? 0;
     domain = domain.split(':')[0];
     const domainN = domain.startsWith('.') ? domain.slice(1) : domain;
@@ -266,7 +266,7 @@ export function setCookie(cookie, name, value, domain, opt = {}) {
  * @param uri 请求的 URI 对象
  */
 async function buildCookieObject(cookie, setCookies, uri) {
-    const tim = time.stamp();
+    const tim = lTime.stamp();
     uri.path ??= '/';
     for (const setCookie of setCookies) {
         const cookieTmp = {};
@@ -312,10 +312,10 @@ async function buildCookieObject(cookie, setCookies, uri) {
         // --- ok.xxx.com   vs  .zz.ok.xxx.com: false ---
         if (uri.hostname !== domainN) {
             // --- 设置的域名和当前 host 不相等，如果是 IP、无 . 域名，则直接失败 ---
-            if (!text.isDomain(uri.hostname ?? '')) {
+            if (!lText.isDomain(uri.hostname ?? '')) {
                 continue;
             }
-            const parseDomain = await text.parseDomain(domainN);
+            const parseDomain = await lText.parseDomain(domainN);
             if (parseDomain.tld === domainN.toLowerCase()) {
                 // --- 不能给 tld 设置 cookie ---
                 continue;
@@ -366,7 +366,7 @@ async function buildCookieObject(cookie, setCookies, uri) {
  * @param uri 请求的 URI 对象
  */
 export function buildCookieQuery(cookie, uri) {
-    const tim = time.stamp();
+    const tim = lTime.stamp();
     let cookieStr = '';
     for (const key in cookie) {
         const item = cookie[key];
@@ -503,7 +503,7 @@ export function mproxyData(ctr) {
     if (!get['data']) {
         return {};
     }
-    const data = text.parseJson(get['data']);
+    const data = lText.parseJson(get['data']);
     if (!data) {
         return {};
     }

package/lib/sql.d.ts

@@ -3,8 +3,8 @@
  * Date: 2019-5-27 20:18:50
  * Last: 2020-3-29 19:37:25, 2022-07-24 22:38:11, 2023-5-24 18:49:18, 2023-6-13 22:20:21, 2023-12-11 13:58:54, 2023-12-14 13:14:40, 2023-12-21 00:04:40, 2024-4-11 19:29:29, 2024-9-2 17:15:28, 2025-8-3 21:28:18
  */
+import * as kebab from '#index.js';
 import * as ctr from '#sys/ctr.js';
-import * as types from '#types/index.js';
 export declare class Sql {
     /** --- 前置 --- */
     private readonly _pre;
@@ -13,7 +13,7 @@ export declare class Sql {
     /** --- 所有 data 数据 --- */
     private _data;
     constructor(pre?: string, opt?: {
-        'data'?: types.DbValue[];
+        'data'?: kebab.DbValue[];
         'sql'?: string[];
     });
     /**
@@ -31,19 +31,19 @@ export declare class Sql {
      * @param cs [] 数据列或字段列
      * @param vs [] | [][] 数据
      */
-    values(cs: string[] | Record<string, types.DbValue>, vs?: types.DbValue[] | types.DbValue[][]): this;
+    values(cs: string[] | Record<string, kebab.DbValue>, vs?: kebab.DbValue[] | kebab.DbValue[][]): this;
     /**
      * --- 不存在则插入，衔接在 insert 之后 ---
      * @param table 表名
      * @param insert {'xx': 'xx', 'xx': 'xx'}
      * @param where [{'xx': 'xx', 'xx': 'xx'}], {'xx': 'xx'}
      */
-    notExists(table: string, insert: Record<string, types.DbValue>, where: string | types.Json): this;
+    notExists(table: string, insert: Record<string, kebab.DbValue>, where: string | kebab.Json): this;
     /**
      * --- 当不能 insert 时，update（仅能配合 insert 方法用） ---
      * @param s 更新数据
      */
-    duplicate(s: types.Json): this;
+    duplicate(s: kebab.Json): this;
     /**
      * --- '*', 'xx' ---
      * @param c 字段字符串或字段数组
@@ -55,7 +55,7 @@ export declare class Sql {
      * @param f 表名
      * @param s 设定 update 的值
      */
-    update(f: string, s: types.Json): this;
+    update(f: string, s: kebab.Json): this;
     private _updateSub;
     /**
      * --- 'xx' ---
@@ -81,7 +81,7 @@ export declare class Sql {
      * @param suf 表后缀
      * @param pre 表前缀，仅在 join 非默认表前缀时填写
      */
-    join(f: string, s?: types.Json, type?: string, suf?: string, pre?: string): this;
+    join(f: string, s?: kebab.Json, type?: string, suf?: string, pre?: string): this;
     /**
      * --- left join 方法 ---
      * @param f 表名
@@ -89,7 +89,7 @@ export declare class Sql {
      * @param suf 表后缀
      * @param pre 表前缀，仅在 join 非默认表前缀时填写
      */
-    leftJoin(f: string, s?: types.Json, suf?: string, pre?: string): this;
+    leftJoin(f: string, s?: kebab.Json, suf?: string, pre?: string): this;
     /**
      * --- right join 方法 ---
      * @param f 表名
@@ -97,7 +97,7 @@ export declare class Sql {
      * @param suf 表后缀
      * @param pre 表前缀，仅在 join 非默认表前缀时填写
      */
-    rightJoin(f: string, s?: types.Json, suf?: string, pre?: string): this;
+    rightJoin(f: string, s?: kebab.Json, suf?: string, pre?: string): this;
     /**
      * --- inner join 方法 ---
      * @param f 表名
@@ -105,7 +105,7 @@ export declare class Sql {
      * @param suf 表后缀
      * @param pre 表前缀，仅在 join 非默认表前缀时填写
      */
-    innerJoin(f: string, s?: types.Json, suf?: string, pre?: string): this;
+    innerJoin(f: string, s?: kebab.Json, suf?: string, pre?: string): this;
     /**
      * --- full join 方法 ---
      * @param f 表名
@@ -113,7 +113,7 @@ export declare class Sql {
      * @param suf 表后缀
      * @param pre 表前缀，仅在 join 非默认表前缀时填写
      */
-    fullJoin(f: string, s?: types.Json, suf?: string, pre?: string): this;
+    fullJoin(f: string, s?: kebab.Json, suf?: string, pre?: string): this;
     /**
      * --- cross join 方法 ---
      * @param f 表名
@@ -121,11 +121,11 @@ export declare class Sql {
      * @param suf 表后缀
      * @param pre 表前缀，仅在 join 非默认表前缀时填写
      */
-    crossJoin(f: string, s?: types.Json, suf?: string, pre?: string): this;
+    crossJoin(f: string, s?: kebab.Json, suf?: string, pre?: string): this;
     /**
      * --- having 后置筛选器，用法类似 where ---
      */
-    having(s?: string | types.Json): this;
+    having(s?: string | kebab.Json): this;
     /** --- where 的 data 的开始处和结束处 --- */
     private _whereDataPosition;
     /**
@@ -139,7 +139,7 @@ export declare class Sql {
      * --- 7. ['JSON_CONTAINS(`uid`, ?)', ['hello']] ---
      * @param s 筛选数据
      */
-    where(s: string | types.Json): this;
+    where(s: string | kebab.Json): this;
     private _whereSub;
     /**
      * --- ORDER BY ---
@@ -167,7 +167,7 @@ export declare class Sql {
      * @param f 可为空，可设置新对象的 table 名变化
      */
     copy(f?: string | string[], opt?: {
-        'where'?: string | types.Json;
+        'where'?: string | kebab.Json;
     }): Sql;
     /**
      * --- 获取 sql 语句 ---
@@ -176,7 +176,7 @@ export declare class Sql {
     /**
      * --- 获取全部 data ---
      */
-    getData(): types.DbValue[];
+    getData(): kebab.DbValue[];
     /**
      * --- 获取定义的 pre ---
      */
@@ -186,7 +186,7 @@ export declare class Sql {
      * @param sql
      * @param data
      */
-    format(sql?: string, data?: types.DbValue[]): string;
+    format(sql?: string, data?: kebab.DbValue[]): string;
     /**
      * --- 在 sql 最后追加字符串 ---
      * @param sql
@@ -211,7 +211,7 @@ export declare class Sql {
  * @param opt 参数
  */
 export declare function get(ctrPre?: ctr.Ctr | string, opt?: {
-    'data'?: types.DbValue[];
+    'data'?: kebab.DbValue[];
     'sql'?: string[];
 }): Sql;
 /**
@@ -219,12 +219,12 @@ export declare function get(ctrPre?: ctr.Ctr | string, opt?: {
  * @param sql SQL 字符串
  * @param data DATA 数据
  */
-export declare function format(sql: string, data: types.DbValue[]): string;
+export declare function format(sql: string, data: kebab.DbValue[]): string;
 /**
  * --- 将数组兑换为组合的对象（Array/Object mix） ---
  * @param arr 要转换的数组
  */
-export declare function aoMix(arr: types.Json): Record<string, string | number | types.Json>;
+export declare function aoMix(arr: kebab.Json): Record<string, string | number | kebab.Json>;
 /** --- 创建字段对象 --- */
 export declare function column(field: string): {
     'type': 'column';

package/lib/sql.js

@@ -1,8 +1,3 @@
-/**
- * Project: Kebab, User: JianSuoQiYue
- * Date: 2019-5-27 20:18:50
- * Last: 2020-3-29 19:37:25, 2022-07-24 22:38:11, 2023-5-24 18:49:18, 2023-6-13 22:20:21, 2023-12-11 13:58:54, 2023-12-14 13:14:40, 2023-12-21 00:04:40, 2024-4-11 19:29:29, 2024-9-2 17:15:28, 2025-8-3 21:28:18
- */
 import * as lText from '#lib/text.js';
 import * as lCore from '#lib/core.js';
 // --- 第三方 ---