@maiyunnet/kebab 9.0.2 → 9.1.0

package/index.d.ts

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

package/index.js

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

package/lib/db/tran.js

@@ -42,8 +42,8 @@ export class Transaction {
     async query(sql, values) {
         if (!this._conn) {
             // --- 当前连接已不可用 ---
-            lCore.display('[DB][Transaction][query] has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql);
-            lCore.log({}, '[DB][Transaction][query] has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql, '-error');
+            lCore.display('[DB][Transaction][query] has been closed, so you cannot execute SQL: ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql);
+            lCore.log({}, '[DB][Transaction][query] has been closed, so you cannot execute SQL: ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql, '-error');
             return {
                 'rows': null,
                 'fields': [],
@@ -65,8 +65,8 @@ export class Transaction {
     async execute(sql, values) {
         if (!this._conn) {
             // --- 当前连接已不可用 ---
-            lCore.display('[DB][Transaction][execute] has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql);
-            lCore.log({}, '(db.Transaction.execute) has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql, '-error');
+            lCore.display('[DB][Transaction][execute] has been closed, so you cannot execute SQL: ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql);
+            lCore.log({}, '[DB][Transaction][execute] has been closed, so you cannot execute SQL: ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql, '-error');
             return {
                 'packet': null,
                 'fields': [],
@@ -83,8 +83,8 @@ export class Transaction {
     async commit() {
         if (!this._conn) {
             // --- 当前连接已不可用 ---
-            lCore.display('[DB][Transaction][commit] has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'));
-            lCore.log({}, '[DB][Transaction][commit] has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'), '-error');
+            lCore.display('[DB][Transaction][commit] has been closed, so you cannot commit: ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'));
+            lCore.log({}, '[DB][Transaction][commit] has been closed, so you cannot commit: ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'), '-error');
             return false;
         }
         const r = await this._conn.commit();
@@ -104,8 +104,8 @@ export class Transaction {
     async rollback() {
         if (!this._conn) {
             // --- 当前连接已不可用 ---
-            lCore.display('[DB][Transaction][rollback] has been closed: ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'));
-            lCore.log({}, '[DB][Transaction][rollback] has been closed: ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'), '-error');
+            lCore.display('[DB][Transaction][rollback] has been closed, so you cannot rollback: ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'));
+            lCore.log({}, '[DB][Transaction][rollback] has been closed, so you cannot rollback: ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'), '-error');
             return false;
         }
         const r = await this._conn.rollback();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "9.0.2",
+  "version": "9.1.0",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [
@@ -28,12 +28,18 @@
     "@litert/mime": "^0.1.3",
     "@litert/redis": "^3.2.0",
     "@litert/websocket": "^0.2.8",
+    "@radix-ui/react-checkbox": "^1.3.3",
+    "@radix-ui/react-label": "^2.1.8",
+    "@radix-ui/react-slot": "^1.2.4",
+    "@radix-ui/react-switch": "^1.2.6",
+    "@tailwindcss/cli": "^4.2.2",
     "@types/ssh2": "^1.15.5",
     "@zilliz/milvus2-sdk-node": "^2.6.11",
     "ajv": "^8.18.0",
     "ajv-formats": "^3.0.1",
+    "class-variance-authority": "^0.7.1",
+    "clsx": "^2.1.1",
     "ejs": "^5.0.1",
-    "@tailwindcss/cli": "^4.2.2",
     "esbuild": "^0.27.4",
     "jszip": "^3.10.1",
     "mysql2": "^3.20.0",
@@ -45,6 +51,7 @@
     "react-router-dom": "^7.13.1",
     "ssh2": "^1.17.0",
     "svg-captcha": "^1.4.0",
+    "tailwind-merge": "^3.5.0",
     "tencentcloud-sdk-nodejs": "^4.1.199"
   },
   "devDependencies": {

package/sys/cmd.js

@@ -351,10 +351,11 @@ async function run() {
         process.exit();
     }
     if (cmds[0] === 'build') {
-        // --- 构建命令：使用 esbuild 打包入口 .tsx 文件为自包含 bundle ---
-        // --- 只打包「直属于指定目录」的 .tsx，子目录内的组件文件不会被打包 ---
-        // --- 推荐目录结构：stc/view/app.tsx（入口）+ stc/view/pages/home.tsx（子组件）---
-        // --- 用法：node ./source/main build [-d www/myapp/stc/view] ---
+        // --- 构建命令：使用 esbuild 打包 *.page.tsx 文件为自包含 bundle ---
+        // --- 约定：文件名以 .page.tsx 结尾的为页面入口，会被打包；其余 .tsx 均视为组件，不参与打包 ---
+        // --- 与 Next.js 的 page.tsx 约定同理，开发者可自由组织目录结构，框架靠文件名区分入口与组件 ---
+        // --- 推荐目录结构：stc/view/home.page.tsx（入口）+ stc/view/components/header.tsx（组件）---
+        // --- 用法：node ./source/main build [-d www/myapp/stc] ---
         let targetDir = '';
         for (let i = 1; i < cmds.length; i++) {
             if ((cmds[i] === '-d' || cmds[i] === '--dir') && cmds[i + 1]) {
@@ -362,7 +363,7 @@ async function run() {
                 i++;
             }
         }
-        /** --- 扫描目录下直属的 .tsx 文件（非递归），子目录内文件不作为打包入口 --- */
+        /** --- 递归扫描目录，收集所有 *.page.tsx 文件作为打包入口 --- */
         const entryPoints = [];
         const scanDir = async (dir) => {
             const items = await lFs.readDir(dir);
@@ -370,13 +371,16 @@ async function run() {
                 if (item.name === '.' || item.name === '..') {
                     continue;
                 }
-                if (!item.isDirectory() && item.name.endsWith('.tsx')) {
+                if (item.isDirectory()) {
+                    await scanDir(`${dir}/${item.name}`);
+                }
+                else if (item.name.endsWith('.page.tsx')) {
                     entryPoints.push(`${dir}/${item.name}`);
                 }
             }
         };
         if (targetDir) {
-            // --- 指定了目录，只扫描该目录下的直属 .tsx ---
+            // --- 指定了目录：递归扫描该目录下所有 *.page.tsx ---
             const absTarget = targetDir.startsWith('/') || /^[A-Za-z]:/.test(targetDir)
                 ? targetDir
                 : kebab.ROOT_CWD + targetDir.replace(/^\//, '');
@@ -390,8 +394,7 @@ async function run() {
             }
         }
         else {
-            // --- 未指定目录：扫描 www/*/stc/ 及其直接子目录下的 .tsx ---
-            // --- 即扫描 stc/*.tsx 和 stc/*/*.tsx（如 stc/view/app.tsx），不再深入 ---
+            // --- 未指定目录：递归扫描所有站点的 www/*/stc/ ---
             const wwwItems = await lFs.readDir(kebab.WWW_CWD);
             for (const wwwItem of wwwItems) {
                 if (wwwItem.name === '.' || wwwItem.name === '..' || !wwwItem.isDirectory()) {
@@ -401,16 +404,7 @@ async function run() {
                 if (!await lFs.isDir(stcPath)) {
                     continue;
                 }
-                // --- 扫描 stc/ 直属文件 ---
                 await scanDir(stcPath);
-                // --- 扫描 stc/ 的直接子目录（如 view/），取其顶层 .tsx 作为入口 ---
-                const stcItems = await lFs.readDir(stcPath);
-                for (const stcItem of stcItems) {
-                    if (stcItem.name === '.' || stcItem.name === '..' || !stcItem.isDirectory()) {
-                        continue;
-                    }
-                    await scanDir(`${stcPath}/${stcItem.name}`);
-                }
             }
         }
         if (entryPoints.length === 0) {
@@ -420,17 +414,32 @@ async function run() {
         }
         lCore.display('KEBAB', 'BUILD', `Found ${entryPoints.length} file(s).`);
         const esbuild = await import('esbuild');
+        // --- 按 stc/ 根目录分组：同一站点内所有页面合并为一次 esbuild 构建 ---
+        // --- 不同站点（不同 stc/）相互隔离，同站点内跨子目录页面共享 chunk ---
+        // --- splitting: true 自动将任意共享 import（React/Header/utils 等）提取为独立 chunk ---
+        /**
+         * --- 查找路径中最后一段名为 stc 的祖先目录 ---
+         */
+        const getStcRoot = (filePath) => {
+            const parts = filePath.split('/');
+            const idx = parts.lastIndexOf('stc');
+            return idx >= 0 ? parts.slice(0, idx + 1).join('/') : parts.slice(0, -1).join('/');
+        };
+        const byStc = new Map();
         for (const entry of entryPoints) {
-            const outfile = entry.replace(/\.tsx$/, '.bundle.js');
-            lCore.display('KEBAB', 'BUILD', entry.replace(kebab.ROOT_CWD, ''), '→', outfile.replace(kebab.ROOT_CWD, ''));
-            try {
-                /** --- 组件文件名（不含扩展名），用于生成 stdin 入口的 import 语句 --- */
+            const stcRoot = getStcRoot(entry);
+            if (!byStc.has(stcRoot)) {
+                byStc.set(stcRoot, []);
+            }
+            byStc.get(stcRoot).push(entry);
+        }
+        for (const [stcRoot, entries] of byStc) {
+            // --- 为每个页面写入水合入口临时文件（实际文件，splitting 不支持 stdin 多入口）---
+            const tempFiles = [];
+            for (const entry of entries) {
                 const basename = entry.split('/').pop().replace(/\.tsx$/, '');
-                /** --- 组件所在目录，esbuild 以此为基准解析相对 import --- */
-                const resolveDir = entry.substring(0, entry.lastIndexOf('/'));
-                // --- stdin 入口：含水合逻辑，_routerBase 在 props 中时自动包裹 BrowserRouter ---
-                // --- React/react-dom/react-router-dom 全部打入 bundle，浏览器只加载一个 JS ---
-                const stdinContent = [
+                const entryDir = entry.substring(0, entry.lastIndexOf('/'));
+                const hydrateCode = [
                     `import{hydrateRoot}from'react-dom/client';`,
                     `import{createElement}from'react';`,
                     `import{BrowserRouter}from'react-router-dom';`,
@@ -445,31 +454,52 @@ async function run() {
                     `}`,
                     `}`,
                 ].join('');
+                const tempFile = `${entryDir}/${basename}.hydrate.tsx`;
+                await lFs.putContent(tempFile, hydrateCode);
+                tempFiles.push(tempFile);
+                lCore.display('KEBAB', 'BUILD', entry.replace(kebab.ROOT_CWD, ''), '→', entry.replace(kebab.ROOT_CWD, '').replace(/\.tsx$/, '.bundle.js'));
+            }
+            // --- JS 构建：整站一次构建，splitting 按实际共享情况自动提取 chunk ---
+            // --- outbase = outdir = stcRoot，入口保留子目录结构，chunk 落在 stcRoot 根 ---
+            try {
                 await esbuild.build({
-                    'stdin': {
-                        'contents': stdinContent,
-                        'resolveDir': resolveDir,
-                        'sourcefile': basename + '.hydrate.tsx',
-                        'loader': 'tsx',
-                    },
+                    'entryPoints': tempFiles,
                     'bundle': true,
-                    // --- 无 external：React 全部打入 bundle，生成自包含文件，浏览器只加载一个 JS ---
+                    'splitting': true,
                     'format': 'esm',
                     'jsx': 'automatic',
                     'jsxImportSource': 'react',
                     'platform': 'browser',
                     'target': 'es2022',
                     'minify': true,
-                    'outfile': outfile,
+                    'outbase': stcRoot,
+                    'outdir': stcRoot,
+                    'entryNames': '[dir]/[name]',
+                    'chunkNames': 'chunk-[hash]',
                 });
-                lCore.display('KEBAB', 'BUILD', 'JS', outfile.replace(kebab.ROOT_CWD, ''));
-                // --- 构建 Tailwind CSS：生成同名 .css 文件 ---
+                // --- 将 *.hydrate.js 重命名为 *.bundle.js ---
+                for (const tempFile of tempFiles) {
+                    const hydrateJs = tempFile.replace(/\.tsx$/, '.js');
+                    const bundleJs = hydrateJs.replace(/\.hydrate\.js$/, '.bundle.js');
+                    await lFs.rename(hydrateJs, bundleJs);
+                    lCore.display('KEBAB', 'BUILD', 'JS', bundleJs.replace(kebab.ROOT_CWD, ''));
+                }
+            }
+            catch (e) {
+                lCore.display('KEBAB', 'BUILD', 'JS FAILED', stcRoot.replace(kebab.ROOT_CWD, ''), e.message ?? '');
+            }
+            finally {
+                // --- 清理临时水合入口文件 ---
+                for (const tempFile of tempFiles) {
+                    await lFs.unlink(tempFile);
+                }
+            }
+            // --- CSS：每个入口单独构建 Tailwind ---
+            for (const entry of entries) {
                 const cssOut = entry.replace(/\.tsx$/, '.css');
-                /** --- 临时 CSS 输入文件，@source 扫描当前目录及子目录所有 tsx 文件 ---  */
                 const tmpCss = entry + '.__tw__.css';
                 await lFs.putContent(tmpCss, `@import "tailwindcss";\n@source "./**/*.tsx";\n`);
                 try {
-                    /** --- 直接用当前 Node.js 执行 CLI 的 JS 入口，跨平台无需 shell --- */
                     const twJs = fileURLToPath(new URL('../node_modules/@tailwindcss/cli/dist/index.mjs', import.meta.url));
                     await new Promise((resolve, reject) => {
                         const proc = childProcess.spawn(process.execPath, [twJs, '-i', tmpCss, '-o', cssOut, '--minify'], { 'shell': false });
@@ -493,9 +523,6 @@ async function run() {
                     await lFs.unlink(tmpCss);
                 }
             }
-            catch (e) {
-                lCore.display('KEBAB', 'BUILD', 'FAILED', entry.replace(kebab.ROOT_CWD, ''), e.message ?? '');
-            }
         }
         lCore.display('DONE');
         process.exit();

package/sys/ctr.d.ts

@@ -185,6 +185,14 @@ export declare class Ctr {
          */
         'staticPath'?: string;
     }): Promise<string>;
+    /**
+     * --- 递归扫描 JS 文件中的 import 语句，收集第三方 bare specifier ---
+     * @param filePath 当前要扫描的文件绝对路径
+     * @param scannedFiles 已扫描文件集（去重用）
+     * @param extraImports 收集到的第三方包名集合
+     * @param builtinImports 内置 import map，已有条目不重复添加
+     */
+    private _scanImports;
     /**
      * --- 设置校验错误返回值 ---
      * @param rtn 返回值数组