@maiyunnet/kebab 9.2.7 → 9.3.0

package/index.d.ts

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

package/index.js

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

package/lib/s3.d.ts

@@ -1,5 +1,5 @@
 /**
- * Project: Kebab, User: Tang Rukun, JianSuoQiYue
+ * Project: Kebab, User: JianSuoQiYue
  * Date: 2024-2-18 18:32:45
  * Last: 2024-2-18 18:32:47, 2024-3-16 16:42:27, 2024-5-31 21:36:26, 2024-7-8 00:28:42, 2024-7-19 11:32:43, 2025-6-10 21:45:34, 2025-12-5 23:42:59
  */

package/lib/s3.js

@@ -1,5 +1,5 @@
 /**
- * Project: Kebab, User: Tang Rukun, JianSuoQiYue
+ * Project: Kebab, User: JianSuoQiYue
  * Date: 2024-2-18 18:32:45
  * Last: 2024-2-18 18:32:47, 2024-3-16 16:42:27, 2024-5-31 21:36:26, 2024-7-8 00:28:42, 2024-7-19 11:32:43, 2025-6-10 21:45:34, 2025-12-5 23:42:59
  */

package/lib/sql.d.ts

@@ -1,7 +1,7 @@
 /**
  * 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, 2025-11-9 16:20:23
+ * 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, 2025-11-9 16:20:23, 2026-4-30 13:49:44
  */
 import * as kebab from '#kebab/index.js';
 import * as ctr from '#kebab/sys/ctr.js';
@@ -230,6 +230,11 @@ export declare class Sql {
      * @param str
      */
     private _isField;
+    /**
+     * --- 判断传入值是否是 value 对象（由 value() 函数创建） ---
+     * @param arg
+     */
+    private _isValue;
     /** --- 获取占位符 --- */
     private _placeholder;
     /**
@@ -269,6 +274,15 @@ export declare function column(field: string): {
     'token': string;
     'value': string;
 };
+/**
+ * --- 创建字面量值对象，用于 where 条件中 v[0] 需要是值而非字段名的场景 ---
+ * --- 例：[value('hello'), 'IN', column('tags')] ---
+ */
+export declare function value(val: kebab.DbValue): {
+    'type': 'value';
+    'token': string;
+    'value': kebab.DbValue;
+};
 /**
  * --- 将对象转换为 JSON 字符串并避开类型检查，用于适配 PostgreSQL 的 jsonb 字段 ---
  * @param obj 要转换的 JSON 对象

package/lib/sql.js

@@ -26,6 +26,8 @@ export var EJSON;
 })(EJSON || (EJSON = {}));
 /** --- field 用 token --- */
 let columnToken = '';
+/** --- value 用 token --- */
+let valueToken = '';
 export class Sql {
     /** --- ctr 对象 --- */
     _ctr;
@@ -549,13 +551,19 @@ export class Sql {
                 else {
                     // --- 2, 6 ---
                     const nv = v[2];
+                    // --- v[0] 也可以是 value() 包裹的字面量值，而不一定是字段名 ---
+                    const isv0 = this._isValue(v[0]);
+                    const v0sql = isv0 ? this._placeholder() : this.field(v[0]);
+                    if (isv0) {
+                        data.push(v[0].value);
+                    }
                     const isf = this._isField(nv);
                     if (isf) {
                         // --- 6. field ---
-                        sql += this.field(v[0]) + ' ' + v[1] + ' ' + this.field(nv.value) + ' AND ';
+                        sql += v0sql + ' ' + v[1] + ' ' + this.field(nv.value) + ' AND ';
                     }
                     else {
-                        sql += this.field(v[0]) + ' ' + v[1] + ' ' + this._placeholder() + ' AND ';
+                        sql += v0sql + ' ' + v[1] + ' ' + this._placeholder() + ' AND ';
                         data.push(nv);
                     }
                 }
@@ -962,6 +970,16 @@ export class Sql {
         }
         return true;
     }
+    /**
+     * --- 判断传入值是否是 value 对象（由 value() 函数创建） ---
+     * @param arg
+     */
+    _isValue(arg) {
+        if (arg === null || typeof arg !== 'object' || arg.type !== 'value' || arg.token !== valueToken || arg.value === undefined) {
+            return false;
+        }
+        return true;
+    }
     /** --- 获取占位符 --- */
     _placeholder() {
         return this._service === ESERVICE.MYSQL ? '?' : `$${this._placeholderCounter++}`;
@@ -1172,6 +1190,20 @@ export function column(field) {
         'value': field
     };
 }
+/**
+ * --- 创建字面量值对象，用于 where 条件中 v[0] 需要是值而非字段名的场景 ---
+ * --- 例：[value('hello'), 'IN', column('tags')] ---
+ */
+export function value(val) {
+    if (!valueToken) {
+        valueToken = lCore.random(8, lCore.RANDOM_LUNS);
+    }
+    return {
+        'token': valueToken,
+        'type': 'value',
+        'value': val
+    };
+}
 /**
  * --- 将对象转换为 JSON 字符串并避开类型检查，用于适配 PostgreSQL 的 jsonb 字段 ---
  * @param obj 要转换的 JSON 对象

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "9.2.7",
+  "version": "9.3.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/master.js

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-5-2 21:03:42
- * Last: 2020-3-7 10:33:17, 2022-07-22 13:40:10, 2022-09-06 22:40:58, 2024-2-7 01:44:59, 2024-7-2 15:17:09, 2025-6-13 13:06:43, 2025-12-5 13:15:03, 2026-3-22 00:00:00
+ * Last: 2020-3-7 10:33:17, 2022-07-22 13:40:10, 2022-09-06 22:40:58, 2024-2-7 01:44:59, 2024-7-2 15:17:09, 2025-6-13 13:06:43, 2025-12-5 13:15:03, 2026-3-22 00:00:00, 2026-4-30 13:49:44
  */
 import cluster from 'cluster';
 import * as os from 'os';
@@ -543,67 +543,101 @@ function startFileWatcher() {
     /** --- 是否正在重启中 --- */
     let restarting = false;
     /**
-     * --- 监听指定目录的文件变化 ---
-     * @param dir 要监听的目录路径
+     * --- 不需要监听的目录名集合，在 Linux 上 fs.watch recursive 会为每个子目录注册 inotify ---
+     * --- 这些目录若被监听会大量消耗系统 file watcher 配额（ENOSPC），必须跳过 ---
+     */
+    const SKIP_DIRS = new Set(['.git', '.svn', '.hg', 'node_modules', 'log', 'ftmp']);
+    /** --- 触发 worker 重载 --- */
+    const triggerReload = (formatName) => {
+        if (debounceTimer) {
+            clearTimeout(debounceTimer);
+        }
+        // --- 防抖：500ms 内多次变化只触发一次 ---
+        debounceTimer = setTimeout(() => {
+            debounceTimer = null;
+            if (restarting) {
+                return;
+            }
+            restarting = true;
+            lCore.display(`[HMR] File changed: ${formatName}, reloading workers...`);
+            (async () => {
+                // --- 为所有子进程发送 stop 信息并重启 ---
+                for (const pid in workerList) {
+                    workerList[pid].worker.send({
+                        'action': 'stop'
+                    });
+                    await createChildProcess(workerList[pid].cpu);
+                    delete workerList[pid];
+                }
+                restarting = false;
+                lCore.display('[HMR] All workers reloaded.');
+            })().catch((e) => {
+                restarting = false;
+                lCore.display('[HMR] Reload error:', e);
+            });
+        }, 500);
+    };
+    /**
+     * --- 递归收集指定根目录下所有需要监听的子目录（跳过 SKIP_DIRS 和隐藏目录）---
+     * @param dir 当前目录路径
+     * @param result 收集结果数组
+     */
+    const collectDirs = async (dir, result) => {
+        let entries;
+        try {
+            entries = await fs.promises.readdir(dir, { 'withFileTypes': true });
+        }
+        catch {
+            return;
+        }
+        for (const entry of entries) {
+            if (!entry.isDirectory()) {
+                continue;
+            }
+            // --- 跳过隐藏目录（以 . 开头）及无需监听的目录 ---
+            if (entry.name.startsWith('.') || SKIP_DIRS.has(entry.name)) {
+                continue;
+            }
+            const subDir = `${dir}/${entry.name}`;
+            result.push(subDir);
+            await collectDirs(subDir, result);
+        }
+    };
+    /**
+     * --- 监听指定目录下所有需要监听的目录（非递归逐个注册，避免 OS 级别监听到 .git 等目录）---
+     * @param dir 要监听的根目录路径
      */
     const watchDir = async (dir) => {
+        // --- 去除末尾的路径分隔符，防止拼接时产生双斜杠 ---
+        dir = dir.replace(/\/+$/, '');
         if (!await lFs.isDir(dir)) {
             return;
         }
-        try {
-            const watcher = fs.watch(dir, { 'recursive': true }, (eventType, filename) => {
-                if (!filename) {
-                    return;
-                }
-                const formatName = filename.replace(/\\/g, '/');
-                // --- 仅关注 .js 文件和 .json 配置文件的变更 ---
-                if (!formatName.endsWith('.js') &&
-                    !formatName.endsWith('.json')) {
-                    return;
-                }
-                // --- 忽略日志目录、临时目录、git 目录和 node_modules ---
-                if (formatName.includes('log/') ||
-                    formatName.includes('ftmp/') ||
-                    formatName.includes('node_modules/') ||
-                    formatName.includes('.git/')) {
-                    return;
-                }
-                // --- 防抖：500ms 内多次变化只触发一次 ---
-                if (debounceTimer) {
-                    clearTimeout(debounceTimer);
-                }
-                debounceTimer = setTimeout(() => {
-                    debounceTimer = null;
-                    if (restarting) {
+        // --- 收集所有需要监听的目录（含根目录本身）---
+        const dirs = [dir];
+        await collectDirs(dir, dirs);
+        for (const d of dirs) {
+            try {
+                const watcher = fs.watch(d, (eventType, filename) => {
+                    if (!filename) {
                         return;
                     }
-                    restarting = true;
-                    lCore.display(`[HMR] File changed: ${formatName}, reloading workers...`);
-                    (async () => {
-                        // --- 为所有子进程发送 stop 信息并重启 ---
-                        for (const pid in workerList) {
-                            workerList[pid].worker.send({
-                                'action': 'stop'
-                            });
-                            await createChildProcess(workerList[pid].cpu);
-                            delete workerList[pid];
-                        }
-                        restarting = false;
-                        lCore.display('[HMR] All workers reloaded.');
-                    })().catch((e) => {
-                        restarting = false;
-                        lCore.display('[HMR] Reload error:', e);
-                    });
-                }, 500);
-            });
-            watcher.on('error', (err) => {
-                lCore.display(`[HMR] Watcher error on ${dir}:`, err);
-            });
-            lCore.display(`[HMR] Watching directory: ${dir}`);
-        }
-        catch (err) {
-            lCore.display(`[HMR] Cannot watch directory: ${dir}`, err);
+                    const formatName = filename.replace(/\\/g, '/');
+                    // --- 仅关注 .js 文件和 .json 配置文件的变更 ---
+                    if (!formatName.endsWith('.js') && !formatName.endsWith('.json')) {
+                        return;
+                    }
+                    triggerReload(formatName);
+                });
+                watcher.on('error', (err) => {
+                    lCore.display(`[HMR] Watcher error on ${d}:`, err);
+                });
+            }
+            catch (err) {
+                lCore.display(`[HMR] Cannot watch directory: ${d}`, err);
+            }
         }
+        lCore.display(`[HMR] Watching directory: ${dir} (${dirs.length} dirs)`);
     };
     // --- 监听 www/ 目录（用户项目代码）---
     watchDir(kebab.WWW_CWD).catch(() => { });

package/sys/mod.d.ts

@@ -89,6 +89,12 @@ export default class Mod {
         'token': string;
         'value': string;
     };
+    /** --- 创建字面量值对象，用于 where 条件中 v[0] 需要是值而非字段名的场景 --- */
+    static value(val: kebab.DbValue): {
+        'type': 'value';
+        'token': string;
+        'value': kebab.DbValue;
+    };
     /** --- 创建 JSON 字符串对象，用于 PGSQL 的 jsonb 字段 --- */
     static json(obj: kebab.Json): any;
     /**

package/sys/mod.js

@@ -119,6 +119,10 @@ export default class Mod {
     static column(field) {
         return lSql.column(field);
     }
+    /** --- 创建字面量值对象，用于 where 条件中 v[0] 需要是值而非字段名的场景 --- */
+    static value(val) {
+        return lSql.value(val);
+    }
     /** --- 创建 JSON 字符串对象，用于 PGSQL 的 jsonb 字段 --- */
     static json(obj) {
         return lSql.json(obj);

package/www/example/ctr/test.js

@@ -3438,6 +3438,29 @@ Result:<pre id="result">Nothing.</pre>`);
 ]);</pre>
 <b>getSql() :</b> ${s}<br>
 <b>getData():</b> <pre>${JSON.stringify(sd, undefined, 4)}</pre>
+<b>format() :</b> ${sql.format(s, sd)}<hr>`);
+                // --- 正则匹配：MySQL 用 REGEXP，PostgreSQL 用 ~ ---
+                // --- value() 对比 column()：左侧为字面量值，右侧为字段 ---
+                s = sql.select('*', 'user').where([
+                    [lSql.value('info'), this._get['s'] === 'pgsql' ? '~' : 'REGEXP', lSql.column('pattern')]
+                ]).getSql();
+                sd = sql.getData();
+                echo.push(`<pre>sql.select('*', 'user').where([
+    [lSql.value('info'), '${this._get['s'] === 'pgsql' ? '~' : 'REGEXP'}', lSql.column('pattern')]
+]);</pre>
+<b>getSql() :</b> ${s}<br>
+<b>getData():</b> <pre>${JSON.stringify(sd, undefined, 4)}</pre>
+<b>format() :</b> ${sql.format(s, sd)}<hr>`);
+                // --- value() 与普通字段混用 ---
+                s = sql.select('*', 'user').where([
+                    [lSql.value(10), '<', lSql.column('age')]
+                ]).getSql();
+                sd = sql.getData();
+                echo.push(`<pre>sql.select('*', 'user').where([
+    [lSql.value(10), '&lt;', lSql.column('age')]
+]);</pre>
+<b>getSql() :</b> ${s}<br>
+<b>getData():</b> <pre>${JSON.stringify(sd, undefined, 4)}</pre>
 <b>format() :</b> ${sql.format(s, sd)}`);
                 break;
             }