befly 2.0.12 → 2.0.14

package/.gitignore

@@ -0,0 +1,93 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+esdata
+data
+.cache
+lab
+labs
+cache
+.VSCodeCounter
+oclif.manifest.json
+dist
+report.html
+dist-ssr
+*.local
+.vscode-test/
+*.vsix
+out
+CHANGELOG.md
+note.md
+.changeset
+addons2
+pnpm-lock.yaml
+bun.lock
+other
+
+# Editor directories and files
+.vscode/*
+.cache
+.yicode/auto-imports.d.ts
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules
+jspm_packages
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history
+
+# 0x
+profile-*
+
+# mac files
+.DS_Store
+
+# vim swap files
+*.swp
+
+# webstorm
+.idea
+
+# vscode
+.vscode
+*code-workspace
+
+# clinic
+profile*
+*clinic*
+*flamegraph*

package/.npmrc

@@ -0,0 +1,3 @@
+# registry=https://registry.npmmirror.com
+registry=https://registry.npmjs.org
+link-workspace-packages=true

package/.prettierignore

@@ -0,0 +1,2 @@
+LICENSE
+LICENSE.md

package/.prettierrc

@@ -0,0 +1,11 @@
+{
+    "trailingComma": "none",
+    "tabWidth": 4,
+    "semi": true,
+    "singleQuote": true,
+    "printWidth": 1024,
+    "bracketSpacing": true,
+    "useTabs": false,
+    "arrowParens": "always",
+    "endOfLine": "lf"
+}

package/README.md

@@ -1,3 +1,3 @@
-# Befly
+# Befly - 蜜蜂飞舞
 
-自用框架，请勿使用。
+道生一，一生二，二生三，三生万物，v3版本发布后可才是公测版本。

package/USEAGE.md

@@ -0,0 +1,5 @@
+## 接口参数定义
+
+> 名称#类型#最小值#最大值#表达式
+
+如果`类型`为`number`，`表达式`可以为`x*3=2`的形式。

package/bin/befly.js

@@ -0,0 +1,176 @@
+#!/usr/bin/env node
+
+/**
+ * Befly CLI 工具
+ * 提供命令行接口来执行 befly 框架的各种脚本
+ */
+
+import { spawn } from 'node:child_process';
+import { resolve, join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { existsSync, readFileSync } from 'node:fs';
+import { readdir } from 'node:fs/promises';
+import { __dirroot, __dirscript } from '../system.js';
+
+// 使用 system.js 中定义的路径变量
+const BEFLY_ROOT = __dirroot;
+const SCRIPTS_DIR = __dirscript;
+
+// 显示帮助信息
+const showHelp = async () => {
+    console.log(`
+Befly CLI 工具 v2.0.12
+
+用法:
+  befly <script-name> [args...]
+
+可用的脚本:
+`);
+
+    // 列出所有可用的脚本
+    if (existsSync(SCRIPTS_DIR)) {
+        try {
+            const fileList = await readdir(SCRIPTS_DIR);
+            const scripts = fileList
+                .filter((file) => file.endsWith('.js'))
+                .map((file) => file.replace('.js', ''))
+                .sort();
+
+            if (scripts.length > 0) {
+                scripts.forEach((script) => {
+                    console.log(`  befly ${script}`);
+                });
+            } else {
+                console.log('  (没有找到可用的脚本)');
+            }
+        } catch (error) {
+            console.log(`  (无法读取脚本目录: ${error.message})`);
+        }
+    } else {
+        console.log('  (脚本目录不存在)');
+    }
+
+    console.log(`
+选项:
+  -h, --help               显示此帮助信息
+  -v, --version            显示版本信息
+
+更多信息请访问: https://chensuiyi.me
+`);
+};
+
+// 显示版本信息
+const showVersion = () => {
+    try {
+        const packageJsonPath = join(BEFLY_ROOT, 'package.json');
+        if (existsSync(packageJsonPath)) {
+            const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
+            console.log(`befly v${packageJson.version}`);
+        } else {
+            console.log('befly v2.0.12');
+        }
+    } catch (error) {
+        console.log('befly v2.0.12');
+    }
+};
+
+// 执行脚本
+const runScript = (scriptName, args = []) => {
+    // 检查脚本文件是否存在
+    const scriptPath = join(SCRIPTS_DIR, `${scriptName}.js`);
+
+    if (!existsSync(scriptPath)) {
+        console.error(`❌ 错误: 脚本 '${scriptName}' 不存在`);
+        console.error(`脚本路径: ${scriptPath}`);
+        console.error('');
+        console.error('运行 "befly --help" 查看可用的脚本列表');
+        process.exit(1);
+    }
+
+    console.log(`🚀 执行脚本: ${scriptName}`);
+    console.log(`📁 脚本路径: ${scriptPath}`);
+
+    // 检测运行环境，优先使用 bun，回退到 node
+    const isWindows = process.platform === 'win32';
+    let runtime = 'bun';
+    let runtimeArgs = ['run'];
+
+    // 如果 bun 不可用，回退到 node
+    const testBun = spawn(isWindows ? 'bun.exe' : 'bun', ['--version'], {
+        stdio: 'ignore',
+        shell: isWindows
+    });
+
+    testBun.on('error', () => {
+        runtime = 'node';
+        runtimeArgs = [];
+    });
+
+    testBun.on('close', (code) => {
+        if (code !== 0) {
+            runtime = 'node';
+            runtimeArgs = [];
+        }
+
+        console.log(`⚡ 使用运行时: ${runtime}`);
+        console.log('');
+
+        // 执行脚本
+        const child = spawn(isWindows ? `${runtime}.exe` : runtime, [...runtimeArgs, scriptPath, ...args], {
+            stdio: 'inherit',
+            shell: isWindows,
+            cwd: process.cwd() // 使用调用者的工作目录
+        });
+
+        child.on('error', (error) => {
+            console.error(`❌ 执行失败: ${error.message}`);
+            process.exit(1);
+        });
+
+        child.on('close', (code) => {
+            if (code !== 0) {
+                console.error(`❌ 脚本执行失败，退出码: ${code}`);
+                process.exit(code);
+            } else {
+                console.log(`✅ 脚本执行完成`);
+            }
+        });
+    });
+};
+
+// 主函数
+const main = async () => {
+    const args = process.argv.slice(2);
+
+    // 没有参数或请求帮助
+    if (args.length === 0 || args.includes('-h') || args.includes('--help')) {
+        await showHelp();
+        return;
+    }
+
+    // 显示版本
+    if (args.includes('-v') || args.includes('--version')) {
+        showVersion();
+        return;
+    }
+
+    // 执行脚本
+    const scriptName = args[0];
+    const scriptArgs = args.slice(1);
+
+    runScript(scriptName, scriptArgs);
+};
+
+// 错误处理
+process.on('uncaughtException', (error) => {
+    console.error('❌ 未捕获的异常:', error.message);
+    process.exit(1);
+});
+
+process.on('unhandledRejection', (reason, promise) => {
+    console.error('❌ 未处理的 Promise 拒绝:', reason);
+    process.exit(1);
+});
+
+// 启动 CLI
+main();

package/checks/{schema.js → table.js}

@@ -1,12 +1,13 @@
 import path from 'node:path';
-import { ruleSplit } from '../utils/util.js';
 import { Logger } from '../utils/Logger.js';
+import { parseFieldRule } from '../utils/util.js';
+import { __dirtables, getProjectDir } from '../system.js';
 
 export default async () => {
     try {
-        const schemaGlob = new Bun.Glob('*.json');
-        const coreSchemaDir = path.join(__dirname, '..', 'schema');
-        const userSchemaDir = path.join(process.cwd(), 'schema');
+        const tablesGlob = new Bun.Glob('*.json');
+        const coreTablesDir = __dirtables;
+        const userTablesDir = getProjectDir('tables');
 
         // 统计信息
         let totalFiles = 0;
@@ -19,53 +20,70 @@ export default async () => {
             const fileName = path.basename(file);
             try {
                 // 读取并解析 JSON 文件
-                const schema = await Bun.file(file).json();
+                const table = await Bun.file(file).json();
                 let fileValid = true;
                 let fileRules = 0;
 
-                // 检查 schema 中的每个验证规则
-                for (const [fieldName, rule] of Object.entries(schema)) {
+                // 保留字段列表
+                const reservedFields = ['id', 'created_at', 'updated_at', 'deleted_at', 'state'];
+
+                // 检查 table 中的每个验证规则
+                for (const [fieldName, rule] of Object.entries(table)) {
                     fileRules++;
                     totalRules++;
 
+                    // 检查是否使用了保留字段
+                    if (reservedFields.includes(fieldName)) {
+                        Logger.error(`${fileName} 文件包含保留字段 ${fieldName}，不能在表定义中使用以下字段: ${reservedFields.join(', ')}`);
+                        fileValid = false;
+                        continue;
+                    }
+
                     // 验证规则格式
-                    const ruleParts = ruleSplit(rule);
+                    const ruleParts = parseFieldRule(rule);
 
-                    if (ruleParts.length !== 5) {
-                        Logger.warn(`${fileName} 文件 ${fieldName} 验证规则错误，应包含 5 个部分，但包含 ${ruleParts.length} 个部分`);
+                    if (ruleParts.length !== 7) {
+                        Logger.warn(`${fileName} 文件 ${fieldName} 验证规则错误，应包含 7 个部分，但包含 ${ruleParts.length} 个部分`);
                         fileValid = false;
                         continue;
                     }
 
-                    const [name, type, minStr, maxStr, spec] = ruleParts;
+                    const [name, type, minStr, maxStr, defaultValue, isIndexStr, regexConstraint] = ruleParts;
 
                     // 验证类型（必须严格使用小写类型名称）
-                    const validTypes = ['number', 'string', 'array'];
+                    const validTypes = ['number', 'string', 'text', 'array'];
                     if (!validTypes.includes(type)) {
-                        Logger.warn(`${fileName} 文件 ${fieldName} 类型 ${type} 不支持，应为小写的 number、string 或 array`);
+                        Logger.warn(`${fileName} 文件 ${fieldName} 类型 ${type} 不支持，应为小写的 number、string、text 或 array`);
                         fileValid = false;
                         continue;
                     }
 
                     // 验证最小值/最大值
                     if (minStr !== 'null' && isNaN(parseInt(minStr))) {
-                        Logger.warn(`${fileName} 文件 ${fieldName} 最小值 ${minStr} 应为数字或 "null"`);
+                        Logger.warn(`${fileName} 文件 ${fieldName} 最小值 ${minStr} 应为数字或 null`);
                         fileValid = false;
                         continue;
                     }
 
                     if (maxStr !== 'null' && isNaN(parseInt(maxStr))) {
-                        Logger.warn(`${fileName} 文件 ${fieldName} 最大值 ${maxStr} 应为数字或 "null"`);
+                        Logger.warn(`${fileName} 文件 ${fieldName} 最大值 ${maxStr} 应为数字或 null`);
+                        fileValid = false;
+                        continue;
+                    }
+
+                    // 验证索引字段
+                    if (isIndexStr !== 'null' && !['0', '1'].includes(isIndexStr)) {
+                        Logger.warn(`${fileName} 文件 ${fieldName} 索引标识 ${isIndexStr} 应为 0、1 或 null`);
                         fileValid = false;
                         continue;
                     }
 
-                    // 验证特殊规则
-                    if (spec !== 'null') {
-                        if (type === 'number' && spec.includes('=')) {
+                    // 验证正则约束
+                    if (regexConstraint !== 'null') {
+                        if (type === 'number' && regexConstraint.includes('=')) {
                             // 数字计算表达式应包含安全字符
                             const safePattern = /^[x\d\+\-\*\/\(\)\.\s\%]+$/;
-                            const expressionPart = spec.split('=')[0].trim();
+                            const expressionPart = regexConstraint.split('=')[0].trim();
 
                             if (!safePattern.test(expressionPart)) {
                                 Logger.warn(`${fileName} 文件 ${fieldName} 表达式 ${expressionPart} 包含不安全的字符`);
@@ -74,18 +92,18 @@ export default async () => {
                             }
 
                             // 验证等号右侧是否为数字
-                            const rightPart = spec.split('=')[1].trim();
+                            const rightPart = regexConstraint.split('=')[1].trim();
                             if (isNaN(parseFloat(rightPart))) {
                                 Logger.error(`${fileName} 文件 ${fieldName} 计算规则右边必须是数字，而不是 ${rightPart}`);
                                 fileValid = false;
                                 continue;
                             }
-                        } else if (type === 'string' || type === 'array') {
+                        } else if (type === 'string' || type === 'array' || type === 'text') {
                             // 尝试编译正则表达式以检查是否有效
                             try {
-                                new RegExp(spec);
+                                new RegExp(regexConstraint);
                             } catch (e) {
-                                Logger.error(`${fileName} 文件 ${fieldName} 正则表达式 ${spec} 无效: ${e.message}`);
+                                Logger.error(`${fileName} 文件 ${fieldName} 正则表达式 ${regexConstraint} 无效: ${e.message}`);
                                 fileValid = false;
                                 continue;
                             }
@@ -99,21 +117,21 @@ export default async () => {
                     invalidFiles++;
                 }
             } catch (error) {
-                Logger.error(`Schema ${fileName} 解析失败: ${error.message}`);
+                Logger.error(`Table ${fileName} 解析失败: ${error.message}`);
                 invalidFiles++;
             }
         };
 
-        for await (const file of schemaGlob.scan({
-            cwd: coreSchemaDir,
+        for await (const file of tablesGlob.scan({
+            cwd: coreTablesDir,
             absolute: true,
             onlyFiles: true
         })) {
             await validateFile(file);
         }
 
-        for await (const file of schemaGlob.scan({
-            cwd: userSchemaDir,
+        for await (const file of tablesGlob.scan({
+            cwd: userTablesDir,
             absolute: true,
             onlyFiles: true
         })) {
@@ -126,7 +144,7 @@ export default async () => {
             return true;
         }
     } catch (error) {
-        Logger.error(`Schema 检查过程中出错:`, error);
+        Logger.error(`Tables 检查过程中出错:`, error);
         return false;
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "2.0.12",
+    "version": "2.0.14",
     "description": "Buma - 为 Bun 专属打造的 API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -9,11 +9,17 @@
         "registry": "https://registry.npmjs.org"
     },
     "main": "main.js",
+    "bin": {
+        "befly": "./bin/befly.js"
+    },
     "exports": {
         ".": "./main.js"
     },
     "scripts": {
         "r": "bun publish --registry=https://registry.npmjs.org --access=public",
+        "ra": "bun run scripts/release.js -a",
+        "rb": "bun run scripts/release.js -b",
+        "rc": "bun run scripts/release.js -c",
         "test": "bun test",
         "test:jwt": "bun test tests/jwt.test.js"
     },
@@ -32,11 +38,13 @@
     "license": "Apache-2.0",
     "files": [
         "apis/",
+        "bin/",
         "checks/",
         "config/",
         "libs/",
         "plugins/",
-        "schema/",
+        "scripts/",
+        "tables/",
         "utils/",
         ".gitignore",
         ".npmignore",
@@ -47,9 +55,25 @@
         ".prettierrc",
         "LICENSE",
         "main.js",
+        "system.js",
         "package.json",
         "README.md",
+        "USEAGE.md",
         "vitest.config.js"
     ],
-    "gitHead": "0c177fe05242f6c798e9f85262ee92343dbc6c46"
+    "gitHead": "1dc5f118a723969456559e758e2ba889f4601224",
+    "dependencies": {
+        "mariadb": "^3.4.5"
+    },
+    "simple-git-hooks": {
+        "pre-commit": "bunx --bun lint-staged"
+    },
+    "lint-staged": {
+        "*.{js,css,scss,less,ts,jsx,vue,html,json,md,yaml}": "bunx --bun prettier --write --cache --ignore-unknown"
+    },
+    "devDependencies": {
+        "lint-staged": "^16.1.5",
+        "prettier": "^3.6.2",
+        "simple-git-hooks": "^2.13.1"
+    }
 }