befly 3.10.1 → 3.10.3

package/configs/presetFields.ts

@@ -0,0 +1,10 @@
+/**
+ * 预定义的默认字段（API fields 的 @ 引用）
+ */
+export const presetFields: Record<string, any> = {
+    "@id": { name: "ID", type: "number", min: 1, max: null },
+    "@page": { name: "页码", type: "number", min: 1, max: 9999, default: 1 },
+    "@limit": { name: "每页数量", type: "number", min: 1, max: 100, default: 30 },
+    "@keyword": { name: "关键词", type: "string", min: 0, max: 50 },
+    "@state": { name: "状态", type: "number", regex: "^[0-2]$" }
+};

package/configs/presetRegexp.ts

@@ -0,0 +1,225 @@
+/**
+ * 内置正则表达式别名
+ * 用于表单验证和数据校验
+ * 命名规范：小驼峰格式
+ */
+export const RegexAliases = {
+    // ============================================
+    // 数字类型
+    // ============================================
+    /** 正整数（不含0） */
+    number: "^\\d+$",
+    /** 整数（含负数） */
+    integer: "^-?\\d+$",
+    /** 浮点数 */
+    float: "^-?\\d+(\\.\\d+)?$",
+    /** 正整数（不含0） */
+    positive: "^[1-9]\\d*$",
+    /** 负整数 */
+    negative: "^-\\d+$",
+    /** 零 */
+    zero: "^0$",
+
+    // ============================================
+    // 字符串类型
+    // ============================================
+    /** 纯字母 */
+    word: "^[a-zA-Z]+$",
+    /** 字母和数字 */
+    alphanumeric: "^[a-zA-Z0-9]+$",
+    /** 字母、数字和下划线 */
+    alphanumeric_: "^[a-zA-Z0-9_]+$",
+    /** 字母、数字、下划线和短横线 */
+    alphanumericDash_: "^[a-zA-Z0-9_-]+$",
+    /** 小写字母 */
+    lowercase: "^[a-z]+$",
+    /** 大写字母 */
+    uppercase: "^[A-Z]+$",
+
+    // ============================================
+    // 中文
+    // ============================================
+    /** 纯中文 */
+    chinese: "^[\\u4e00-\\u9fa5]+$",
+    /** 中文和字母 */
+    chineseWord: "^[\\u4e00-\\u9fa5a-zA-Z]+$",
+
+    // ============================================
+    // 常用格式
+    // ============================================
+    /** 邮箱地址 */
+    email: "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
+    /** 中国大陆手机号 */
+    phone: "^1[3-9]\\d{9}$",
+    /** 固定电话（区号-号码） */
+    telephone: "^0\\d{2,3}-?\\d{7,8}$",
+    /** URL 地址 */
+    url: "^https?://",
+    /** IPv4 地址 */
+    ip: "^((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}(25[0-5]|2[0-4]\\d|[01]?\\d\\d?)$",
+    /** IPv6 地址 */
+    ipv6: "^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$",
+    /** 域名 */
+    domain: "^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,}$",
+
+    // ============================================
+    // 特殊格式
+    // ============================================
+    /** UUID */
+    uuid: "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$",
+    /** 十六进制字符串 */
+    hex: "^[0-9a-fA-F]+$",
+    /** Base64 编码 */
+    base64: "^[A-Za-z0-9+/=]+$",
+    /** MD5 哈希 */
+    md5: "^[a-f0-9]{32}$",
+    /** SHA1 哈希 */
+    sha1: "^[a-f0-9]{40}$",
+    /** SHA256 哈希 */
+    sha256: "^[a-f0-9]{64}$",
+
+    // ============================================
+    // 日期时间
+    // ============================================
+    /** 日期 YYYY-MM-DD */
+    date: "^\\d{4}-\\d{2}-\\d{2}$",
+    /** 时间 HH:MM:SS */
+    time: "^\\d{2}:\\d{2}:\\d{2}$",
+    /** ISO 日期时间 */
+    datetime: "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}",
+    /** 年份 */
+    year: "^\\d{4}$",
+    /** 月份 01-12 */
+    month: "^(0[1-9]|1[0-2])$",
+    /** 日期 01-31 */
+    day: "^(0[1-9]|[12]\\d|3[01])$",
+
+    // ============================================
+    // 代码相关
+    // ============================================
+    /** 变量名 */
+    variable: "^[a-zA-Z_][a-zA-Z0-9_]*$",
+    /** 常量名（全大写） */
+    constant: "^[A-Z][A-Z0-9_]*$",
+    /** 包名（小写+连字符） */
+    package: "^[a-z][a-z0-9-]*$",
+
+    // ============================================
+    // 证件相关
+    // ============================================
+    /** 中国身份证号（18位） */
+    idCard: "^\\d{17}[\\dXx]$",
+    /** 护照号 */
+    passport: "^[a-zA-Z0-9]{5,17}$",
+
+    // ============================================
+    // 账号相关（国内常用）
+    // ============================================
+    /** 银行卡号（16-19位数字） */
+    bankCard: "^\\d{16,19}$",
+    /** 微信号（6-20位，字母开头，可包含字母、数字、下划线、减号） */
+    wechat: "^[a-zA-Z][a-zA-Z0-9_-]{5,19}$",
+    /** QQ号（5-11位数字，首位非0） */
+    qq: "^[1-9]\\d{4,10}$",
+    /** 支付宝账号（手机号或邮箱） */
+    alipay: "^(1[3-9]\\d{9}|[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,})$",
+    /** 用户名（4-20位，字母开头，可包含字母、数字、下划线） */
+    username: "^[a-zA-Z][a-zA-Z0-9_]{3,19}$",
+    /** 昵称（2-20位，支持中文、字母、数字） */
+    nickname: "^[\\u4e00-\\u9fa5a-zA-Z0-9]{2,20}$",
+
+    // ============================================
+    // 密码强度
+    // ============================================
+    /** 弱密码（至少6位） */
+    passwordWeak: "^.{6,}$",
+    /** 中等密码（至少8位，包含字母和数字） */
+    passwordMedium: "^(?=.*[a-zA-Z])(?=.*\\d).{8,}$",
+    /** 强密码（至少8位，包含大小写字母、数字和特殊字符） */
+    passwordStrong: "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[!@#$%^&*]).{8,}$",
+
+    // ============================================
+    // 其他常用
+    // ============================================
+    /** 车牌号（新能源+普通） */
+    licensePlate: "^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-Z][A-HJ-NP-Z0-9]{4,5}[A-HJ-NP-Z0-9挂学警港澳]$",
+    /** 邮政编码 */
+    postalCode: "^\\d{6}$",
+    /** 版本号（语义化版本） */
+    semver: "^\\d+\\.\\d+\\.\\d+(-[a-zA-Z0-9.]+)?(\\+[a-zA-Z0-9.]+)?$",
+    /** 颜色值（十六进制） */
+    colorHex: "^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$",
+
+    // ============================================
+    // 空值
+    // ============================================
+    /** 空字符串 */
+    empty: "^$",
+    /** 非空 */
+    notempty: ".+"
+} as const;
+
+/**
+ * 正则别名类型
+ */
+export type RegexAliasName = keyof typeof RegexAliases;
+
+// ============================================
+// 正则表达式缓存（性能优化）
+// ============================================
+const regexCache = new Map<string, RegExp>();
+
+/**
+ * 获取正则表达式字符串
+ * @param name 正则别名（以 @ 开头）或自定义正则字符串
+ * @returns 正则表达式字符串
+ */
+export function getRegex(name: string): string {
+    if (name.startsWith("@")) {
+        const alias = name.slice(1) as RegexAliasName;
+        return RegexAliases[alias] || name;
+    }
+    return name;
+}
+
+/**
+ * 获取编译后的正则表达式对象（带缓存）
+ * @param pattern 正则别名或正则字符串
+ * @param flags 正则标志（如 'i', 'g'）
+ * @returns 编译后的 RegExp 对象
+ */
+export function getCompiledRegex(pattern: string, flags?: string): RegExp {
+    const regexStr = getRegex(pattern);
+    const cacheKey = `${regexStr}:${flags || ""}`;
+
+    let cached = regexCache.get(cacheKey);
+    if (!cached) {
+        cached = new RegExp(regexStr, flags);
+        regexCache.set(cacheKey, cached);
+    }
+    return cached;
+}
+
+/**
+ * 验证值是否匹配正则（使用缓存）
+ * @param value 要验证的值
+ * @param pattern 正则别名或正则字符串
+ * @returns 是否匹配
+ */
+export function matchRegex(value: string, pattern: string): boolean {
+    return getCompiledRegex(pattern).test(value);
+}
+
+/**
+ * 清除正则缓存
+ */
+export function clearRegexCache(): void {
+    regexCache.clear();
+}
+
+/**
+ * 获取缓存大小
+ */
+export function getRegexCacheSize(): number {
+    return regexCache.size;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.10.1",
-    "gitHead": "123125b9d7a6c26879a5b5c9d3ac05e2082141c6",
+    "version": "3.10.3",
+    "gitHead": "7dd54bc1ed484139fa52ce5408f1a6c166e2a928",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "keywords": [
@@ -20,27 +20,26 @@
     "license": "Apache-2.0",
     "author": "chensuiyi <bimostyle@qq.com>",
     "files": [
-        ".npmrc",
+        ".gitignore",
         "befly.config.ts",
         "bunfig.toml",
-        "checks",
-        "dist",
-        "docs",
-        "hooks",
-        "lib",
         "LICENSE",
-        "loader",
         "main.ts",
         "package.json",
         "paths.ts",
-        "plugins",
         "README.md",
-        "router",
-        "sync",
-        "tests",
         "tsconfig.json",
-        "types",
-        "utils"
+        "checks/",
+        "configs/",
+        "docs/",
+        "hooks/",
+        "lib/",
+        "loader/",
+        "plugins/",
+        "router/",
+        "sync/",
+        "types/",
+        "utils/"
     ],
     "type": "module",
     "main": "main.ts",
@@ -63,7 +62,7 @@
         "typecheck": "bunx tsgo --noEmit"
     },
     "dependencies": {
-        "befly-shared": "1.3.0",
+        "befly-shared": "1.3.2",
         "chalk": "^5.6.2",
         "es-toolkit": "^1.43.0",
         "fast-jwt": "^6.1.0",

package/tests/_mocks/mockSqliteDb.ts

@@ -1,204 +0,0 @@
-export type MockColumn = { name: string; type: string; notnull: 0 | 1; dflt_value: any };
-
-export type MockSqliteState = {
-    executedSql: string[];
-    tables: Record<
-        string,
-        {
-            columns: Record<string, MockColumn>;
-            indexes: Record<string, string[]>;
-        }
-    >;
-};
-
-function normalizeQuotedIdent(input: string): string {
-    return String(input).trim().replace(/^`/, "").replace(/`$/, "").replace(/^"/, "").replace(/"$/, "");
-}
-
-function parseCreateTable(sql: string): { tableName: string; columnDefs: string } | null {
-    const m = /^CREATE\s+TABLE\s+(.+?)\s*\((.*)\)\s*$/is.exec(sql.trim());
-    if (!m) return null;
-    return {
-        tableName: normalizeQuotedIdent(m[1].trim()),
-        columnDefs: m[2]
-    };
-}
-
-function parseAlterAddColumn(sql: string): { tableName: string; colName: string; colType: string; notnull: 0 | 1; dflt: any } | null {
-    const m = /^ALTER\s+TABLE\s+(.+?)\s+ADD\s+COLUMN\s+(?:IF\s+NOT\s+EXISTS\s+)?(.+?)\s+(.*)$/i.exec(sql.trim());
-    if (!m) return null;
-
-    const tableName = normalizeQuotedIdent(m[1].trim());
-    const colName = normalizeQuotedIdent(m[2].trim());
-    const rest = m[3];
-
-    const upper = rest.toUpperCase();
-    const colType = upper.includes("INTEGER") ? "INTEGER" : "TEXT";
-    const notnull: 0 | 1 = upper.includes("NOT NULL") ? 1 : 0;
-
-    let dflt: any = null;
-    const dfltMatch = /\bDEFAULT\s+(.+?)(\s|$)/i.exec(rest);
-    if (dfltMatch) {
-        const raw = dfltMatch[1].trim();
-        if (raw === "''") dflt = "";
-        else if (raw.startsWith("'") && raw.endsWith("'")) dflt = raw.slice(1, -1).replace(/''/g, "'");
-        else if (/^\d+$/.test(raw)) dflt = Number(raw);
-        else dflt = raw;
-    }
-
-    return { tableName: tableName, colName: colName, colType: colType, notnull: notnull, dflt: dflt };
-}
-
-function parseCreateIndex(sql: string): { indexName: string; tableName: string; columns: string[] } | null {
-    const m = /^CREATE\s+INDEX\s+(?:CONCURRENTLY\s+)?(?:IF\s+NOT\s+EXISTS\s+)?(.+?)\s+ON\s+(.+?)\s*\((.+)\)\s*$/is.exec(sql.trim());
-    if (!m) return null;
-
-    const indexName = normalizeQuotedIdent(m[1].trim());
-    const tableName = normalizeQuotedIdent(m[2].trim());
-    const columns = m[3]
-        .split(",")
-        .map((s) => normalizeQuotedIdent(s.trim()))
-        .filter((s) => s.length > 0);
-
-    return { indexName: indexName, tableName: tableName, columns: columns };
-}
-
-function parseDropIndex(sql: string): { indexName: string } | null {
-    const m = /^DROP\s+INDEX\s+(?:CONCURRENTLY\s+)?(?:IF\s+EXISTS\s+)?(.+?)\s*$/i.exec(sql.trim());
-    if (!m) return null;
-    return { indexName: normalizeQuotedIdent(m[1].trim()) };
-}
-
-function extractPragmaIdent(sqlStr: string): string {
-    const m = /\((.+)\)\s*$/i.exec(String(sqlStr).trim());
-    return normalizeQuotedIdent(m ? m[1] : "");
-}
-
-export function createMockSqliteDb(state: MockSqliteState) {
-    return {
-        unsafe: async (sqlStr: string, params?: unknown[]) => {
-            const sql = String(sqlStr);
-            state.executedSql.push(sql);
-
-            if (sql.includes("sqlite_version()")) {
-                return [{ version: "3.50.1" }];
-            }
-
-            if (sql.includes("sqlite_master")) {
-                const tableName = String(params?.[0] || "");
-                return [{ count: state.tables[tableName] ? 1 : 0 }];
-            }
-
-            if (/^PRAGMA\s+table_info\s*\(/i.test(sql)) {
-                const tableName = extractPragmaIdent(sql);
-                const t = state.tables[tableName];
-                if (!t) return [];
-                return Object.values(t.columns).map((c) => {
-                    return {
-                        name: c.name,
-                        type: c.type,
-                        notnull: c.notnull,
-                        dflt_value: c.dflt_value
-                    };
-                });
-            }
-
-            if (/^PRAGMA\s+index_list\s*\(/i.test(sql)) {
-                const tableName = extractPragmaIdent(sql);
-                const t = state.tables[tableName];
-                if (!t) return [];
-                return Object.keys(t.indexes).map((name) => {
-                    return { name: name };
-                });
-            }
-
-            if (/^PRAGMA\s+index_info\s*\(/i.test(sql)) {
-                const indexName = extractPragmaIdent(sql);
-                for (const table of Object.values(state.tables)) {
-                    if (table.indexes[indexName]) {
-                        return table.indexes[indexName].map((col) => {
-                            return { name: col };
-                        });
-                    }
-                }
-                return [];
-            }
-
-            const createTable = parseCreateTable(sql);
-            if (createTable) {
-                const colMap: Record<string, MockColumn> = {};
-                const parts = createTable.columnDefs
-                    .split(",")
-                    .map((s) => s.trim())
-                    .filter((s) => s.length > 0);
-
-                for (const p of parts) {
-                    const colMatch = /^(.+?)\s+(.+)$/s.exec(p);
-                    if (!colMatch) continue;
-                    const colName = normalizeQuotedIdent(colMatch[1].trim());
-                    const rest = colMatch[2];
-
-                    const upper = rest.toUpperCase();
-                    const colType = upper.includes("INTEGER") ? "INTEGER" : upper.includes("BIGINT") ? "INTEGER" : "TEXT";
-                    const notnull: 0 | 1 = upper.includes("NOT NULL") || upper.includes("PRIMARY KEY") ? 1 : 0;
-
-                    let dflt: any = null;
-                    const dfltMatch = /\bDEFAULT\s+(.+?)(\s|$)/i.exec(rest);
-                    if (dfltMatch) {
-                        const raw = dfltMatch[1].trim();
-                        if (raw === "''") dflt = "";
-                        else if (raw.startsWith("'") && raw.endsWith("'")) dflt = raw.slice(1, -1).replace(/''/g, "'");
-                        else if (/^\d+$/.test(raw)) dflt = Number(raw);
-                        else dflt = raw;
-                    }
-
-                    colMap[colName] = { name: colName, type: colType, notnull: notnull, dflt_value: dflt };
-                }
-
-                state.tables[createTable.tableName] = {
-                    columns: colMap,
-                    indexes: {}
-                };
-
-                return [];
-            }
-
-            const addColumn = parseAlterAddColumn(sql);
-            if (addColumn) {
-                const t = state.tables[addColumn.tableName];
-                if (!t) throw new Error(`mock sqlite db: 表不存在，无法 ADD COLUMN: ${addColumn.tableName}`);
-                if (!t.columns[addColumn.colName]) {
-                    t.columns[addColumn.colName] = {
-                        name: addColumn.colName,
-                        type: addColumn.colType,
-                        notnull: addColumn.notnull,
-                        dflt_value: addColumn.dflt
-                    };
-                }
-                return [];
-            }
-
-            const createIndex = parseCreateIndex(sql);
-            if (createIndex) {
-                const t = state.tables[createIndex.tableName];
-                if (!t) throw new Error(`mock sqlite db: 表不存在，无法 CREATE INDEX: ${createIndex.tableName}`);
-                t.indexes[createIndex.indexName] = createIndex.columns;
-                return [];
-            }
-
-            const dropIndex = parseDropIndex(sql);
-            if (dropIndex) {
-                for (const t of Object.values(state.tables)) {
-                    delete t.indexes[dropIndex.indexName];
-                }
-                return [];
-            }
-
-            if (/^DROP\s+TABLE/i.test(sql)) {
-                return [];
-            }
-
-            throw new Error(`mock sqlite db: 未处理的 SQL: ${sql}`);
-        }
-    };
-}

package/tests/addonHelper-cache.test.ts

@@ -1,32 +0,0 @@
-import { test, expect } from "bun:test";
-import { mkdirSync, rmSync, writeFileSync } from "node:fs";
-
-import { join } from "pathe";
-
-test("scanAddons - should scan node_modules @befly-addon", async () => {
-    const originalCwd = process.cwd();
-    const projectDir = join(originalCwd, "temp", `addonHelper-cache-test-${Date.now()}`);
-
-    try {
-        // 构造一个最小可扫描的项目结构
-        mkdirSync(join(projectDir, "node_modules", "@befly-addon", "demo"), { recursive: true });
-        mkdirSync(join(projectDir, "node_modules", "@befly-addon", "_ignore"), { recursive: true });
-
-        // 放一个非目录项，确保扫描逻辑不会误判
-        writeFileSync(join(projectDir, "node_modules", "@befly-addon", "README.md"), "x", { encoding: "utf8" });
-
-        // scanAddons 依赖 appDir=process.cwd()（模块初始化时取值），所以先切 cwd 再动态 import
-        process.chdir(projectDir);
-
-        const mod = await import(`../utils/scanAddons.js?cacheTest=${Date.now()}`);
-        const scanAddons = mod.scanAddons as () => any[];
-
-        const addons = scanAddons();
-        expect(addons.map((a) => a.name)).toEqual(["demo"]);
-        expect(addons[0].fullPath.endsWith("node_modules/@befly-addon/demo")).toBe(true);
-        expect(addons[0].camelName).toBe("demo");
-    } finally {
-        process.chdir(originalCwd);
-        rmSync(projectDir, { recursive: true, force: true });
-    }
-});