befly 3.76.3 → 3.76.5

package/libs/logger/logger.js

@@ -132,6 +132,7 @@ function resetConfig(options = {}) {
         debug: options.debug ?? 0,
         dir: dir,
         runtimeEnv: runtimeEnv,
+        clearDevelopmentLog: options.clearDevelopmentLog !== false,
         instanceId: Bun.env.BM2_INSTANCE_ID || Bun.env.BM2_APP_INSTANCE || "",
         maxBytes: maxSize * 1024 * 1024
     };
@@ -227,7 +228,7 @@ export const Logger = {
         errorSink = null;
         for (const sink of sinks) sink.shutdown().catch((error) => writeStderr(`关闭失败: ${error.message || error}`));
         resetConfig(options);
-        prepareDirectory(true);
+        prepareDirectory(config.clearDevelopmentLog);
     },
     setMock: function (mock) {
         mockInstance = mock;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.76.3",
+    "version": "3.76.5",
     "gitHead": "49c39d36695036e85fc64083cc43c1652fff96cb",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",

package/scripts/syncDb/index.js

@@ -5,7 +5,7 @@ import { isPlainObject } from "#befly/utils/is.js";
 import { scanTables } from "#befly/utils/scanSources.js";
 
 import { applySchemaPlan, createSyncDbClient } from "./apply.js";
-import { buildTargetDatabaseModel } from "./model.js";
+import { buildTargetDatabaseModel, selectTables } from "./model.js";
 import { buildSchemaPlan } from "./plan.js";
 import { runPreflight } from "./preflight.js";
 import { printPreflightFailures, printSyncPlan, writeSyncArchive } from "./report.js";
@@ -20,9 +20,9 @@ function nowText() {
     return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
 }
 
-async function buildPlan(mysql, targetTables, singleTable) {
-    const snapshot = await readDatabaseSnapshot(mysql);
-    const plan = buildSchemaPlan(targetTables, snapshot.tables, { singleTable: singleTable });
+async function buildPlan(mysql, targetTables, tableNames) {
+    const snapshot = await readDatabaseSnapshot(mysql, { tableNames: tableNames.length > 0 ? Object.keys(targetTables) : [] });
+    const plan = buildSchemaPlan(targetTables, snapshot.tables, { tableNames: tableNames });
     await runPreflight(mysql, plan);
     return { mysqlVersion: snapshot.mysqlVersion, plan: plan };
 }
@@ -30,14 +30,15 @@ async function buildPlan(mysql, targetTables, singleTable) {
 export async function syncDb(mysqlConfig, options = {}) {
     const apply = options.apply === true;
     const list = options.list === true;
-    const tableName = options.tableName || "";
+    const tableNames = Array.isArray(options.tableNames) ? options.tableNames.filter(Boolean) : options.tableName ? [options.tableName] : [];
+    const tableScope = tableNames.length > 0 ? tableNames.join(", ") : "";
     const startedAt = nowText();
     let client;
     let targetTables;
     let archivePath = "";
     let context = {
         apply: apply,
-        tableName: tableName,
+        tableName: tableScope,
         hostname: mysqlConfig?.hostname,
         port: mysqlConfig?.port,
         username: mysqlConfig?.username,
@@ -59,13 +60,14 @@ export async function syncDb(mysqlConfig, options = {}) {
         process.stdout.write(`[syncDb] 用户名：${mysqlConfig.username}\n`);
         process.stdout.write(`[syncDb] 数据库名：${mysqlConfig.database}\n\n`);
         if (apply) archivePath = await writeSyncArchive(context);
-        const tables = await scanTables({ beflyMode: mysqlConfig.beflyMode });
-        const tableErrors = await checkTable(tables);
+        const allTables = await scanTables({ beflyMode: mysqlConfig.beflyMode });
+        const selectedTables = selectTables(allTables, tableNames);
+        const tableErrors = await checkTable(selectedTables);
         if (tableErrors.length > 0) throw createError("Tables 定义校验失败", { code: "policy", subsystem: "scripts", operation: "syncDb", errors: tableErrors });
 
-        targetTables = buildTargetDatabaseModel(tables, tableName);
+        targetTables = buildTargetDatabaseModel(selectedTables);
         client = createSyncDbClient(mysqlConfig);
-        const built = await buildPlan(client, targetTables, Boolean(tableName));
+        const built = await buildPlan(client, targetTables, tableNames);
         context = {
             ...context,
             hostname: mysqlConfig.hostname,
@@ -113,7 +115,7 @@ export async function syncDb(mysqlConfig, options = {}) {
         process.stdout.write(`[syncDb] 同步存档：${archivePath}\n`);
         const executableOperations = context.plan.operations.filter((operation) => operation.preflight?.blocked !== true);
         if (executableOperations.length === 0) {
-            const finalBuilt = await buildPlan(client, targetTables, Boolean(tableName));
+            const finalBuilt = await buildPlan(client, targetTables, tableNames);
             context.remainingPlan = finalBuilt.plan;
             context.mysqlVersion = finalBuilt.mysqlVersion;
             context.status = finalBuilt.plan.blocked.length > 0 ? "blocked" : "no-change";
@@ -138,9 +140,9 @@ export async function syncDb(mysqlConfig, options = {}) {
         context.results = await applySchemaPlan(client, {
             database: mysqlConfig.database,
             plan: context.plan,
-            verify: async (connection) => (await buildPlan(connection, targetTables, Boolean(tableName))).plan
+            verify: async (connection) => (await buildPlan(connection, targetTables, tableNames)).plan
         });
-        const finalBuilt = await buildPlan(client, targetTables, Boolean(tableName));
+        const finalBuilt = await buildPlan(client, targetTables, tableNames);
         context.remainingPlan = finalBuilt.plan;
         context.mysqlVersion = finalBuilt.mysqlVersion;
         context.status = finalBuilt.plan.operations.length === 0 && finalBuilt.plan.blocked.length === 0 ? "applied" : "partial";
@@ -169,7 +171,7 @@ export async function syncDb(mysqlConfig, options = {}) {
             context.error = String(error?.message || error);
             if (client && targetTables && context.results?.length > 0) {
                 try {
-                    context.remainingPlan = (await buildPlan(client, targetTables, Boolean(tableName))).plan;
+                    context.remainingPlan = (await buildPlan(client, targetTables, tableNames)).plan;
                 } catch {
                     // 保留原始执行错误，存档沿用执行前计划
                 }

package/scripts/syncDb/model.js

@@ -22,15 +22,27 @@ function buildColumn(fieldName, field) {
     };
 }
 
-export function buildTargetDatabaseModel(tables, tableName) {
-    let selectedTables = Object.values(tables);
-    if (tableName) {
-        selectedTables = selectedTables.filter((table) => table.codeName === tableName || table.fileName === tableName);
-        if (selectedTables.length === 0) throw new TypeError(`找不到 Table 定义：${tableName}`);
-    }
+function normalizeTableNames(tableNames) {
+    const names = typeof tableNames === "string" ? [tableNames] : Array.isArray(tableNames) ? tableNames : [];
+    return [...new Set(names.filter(Boolean))];
+}
+
+export function selectTables(tables, tableNames = []) {
+    const selectedNames = normalizeTableNames(tableNames);
+    if (selectedNames.length === 0) return tables;
+
+    const selectedNameSet = new Set(selectedNames);
+    const selectedTables = Object.fromEntries(Object.entries(tables).filter(([key, table]) => selectedNameSet.has(key) || selectedNameSet.has(table.codeName) || selectedNameSet.has(table.fileName)));
+    const matchedNames = new Set(Object.values(selectedTables).flatMap((table) => [table.codeName, table.fileName]));
+    const missingName = selectedNames.find((name) => !matchedNames.has(name));
+    if (missingName) throw new TypeError(`找不到 Table 定义：${missingName}`);
+    return selectedTables;
+}
 
+export function buildTargetDatabaseModel(tables, tableNames = []) {
+    const selectedTables = selectTables(tables, tableNames);
     return Object.fromEntries(
-        selectedTables
+        Object.values(selectedTables)
             .toSorted((left, right) => snakeCase(left.codeName).localeCompare(snakeCase(right.codeName)))
             .map((table) => [
                 snakeCase(table.codeName),

package/scripts/syncDb/plan.js

@@ -67,7 +67,9 @@ export function updatePlanHash(plan) {
     return plan;
 }
 
-export function buildSchemaPlan(targetTables, actualTables, { singleTable = false } = {}) {
+export function buildSchemaPlan(targetTables, actualTables, { tableNames = [], singleTable = false } = {}) {
+    const selectedTableNames = Array.isArray(tableNames) ? tableNames : tableNames ? [tableNames] : [];
+    const restrictUnmanagedTables = selectedTableNames.length > 0 || singleTable;
     const plan = { operations: [], notices: [], blocked: [], counts: {} };
 
     for (const target of Object.values(targetTables)) {
@@ -138,7 +140,7 @@ export function buildSchemaPlan(targetTables, actualTables, { singleTable = fals
         }
     }
 
-    if (!singleTable) {
+    if (!restrictUnmanagedTables) {
         for (const actual of Object.values(actualTables)) {
             if (!targetTables[actual.dbName]) addNotice(plan, { kind: "unmanagedTable", table: actual.dbName, message: "表仅存在于 MySQL，保留且不受同步管理" });
         }

package/scripts/syncDb/report.js

@@ -39,14 +39,39 @@ function colorText(text, color, enabled) {
     return ansi ? `${ansi}${text}\x1b[0m` : text;
 }
 
+const fieldTypeProperties = new Set(["fieldType", "maxValue", "precision", "scale"]);
+
 function targetFieldTypeText(field) {
     if (!field || typeof field !== "object") return "-";
     return field.fieldType === "integer" ? "BIGINT" : field.fieldType === "number" ? `DECIMAL(${field.precision},${field.scale})` : field.fieldType === "varchar" ? `VARCHAR(${field.maxValue})` : field.fieldType === "text" ? "MEDIUMTEXT" : "-";
 }
 
+function actualFieldTypeText(field) {
+    if (!field || typeof field !== "object") return "-";
+    const dbType = String(field.dbType || "").toLowerCase();
+    if (["tinyint", "smallint", "mediumint", "int", "bigint"].includes(dbType)) return dbType.toUpperCase();
+    if (["decimal", "numeric"].includes(dbType)) return `${dbType.toUpperCase()}(${field.precision},${field.scale})`;
+    if (["varchar", "char"].includes(dbType)) return `${dbType.toUpperCase()}(${field.maxValue})`;
+    if (dbType) return dbType.toUpperCase();
+    return targetFieldTypeText(field);
+}
+
 function fieldTypeText(operation) {
     if (!["addColumn", "alterColumn"].includes(operation.kind)) return "-";
-    return targetFieldTypeText(operation.after);
+    const after = targetFieldTypeText(operation.after);
+    if (operation.kind === "addColumn" || !operation.before) return after;
+    const before = actualFieldTypeText(operation.before);
+    return before === "-" || before === after ? after : `${before} -> ${after}`;
+}
+
+function blockedFieldTypeText(blocked) {
+    const target = blocked.target;
+    if (target && typeof target === "object" && target.fieldType && typeof blocked.before === "string") {
+        const before = blocked.before.toUpperCase();
+        const after = targetFieldTypeText(target);
+        return before === after ? after : `${before} -> ${after}`;
+    }
+    return targetFieldTypeText(target || blocked.after);
 }
 
 function preflightResult(operation, colors) {
@@ -70,13 +95,14 @@ function buildSyncRows(plan, colors) {
         }));
     for (const notice of plan.notices.filter((item) => !createdTables.has(item.table))) rows.push({ 类型: colorText("保留", "deepskyblue", colors), 风险: "-", 表: notice.table, 对象: notice.object || "-", 字段类型: "-", 变更: notice.message, 预检结果: "-" });
     for (const blocked of plan.blocked.filter((item) => !createdTables.has(item.table))) {
-        const change = blocked.before !== undefined || blocked.after !== undefined ? `${formatValue(blocked.before)} -> ${formatValue(blocked.after)}` : blocked.reason;
+        const hasBooleanCompare = typeof blocked.before === "boolean" || typeof blocked.after === "boolean";
+        const change = blocked.kind === "preflight" || hasBooleanCompare ? blocked.reason : blocked.before !== undefined || blocked.after !== undefined ? `${formatValue(blocked.before)} -> ${formatValue(blocked.after)}` : blocked.reason;
         rows.push({
             类型: colorText("禁止同步", "orangered", colors),
             风险: colorText("阻塞", "orangered", colors),
             表: blocked.table,
             对象: blocked.object || "-",
-            字段类型: targetFieldTypeText(blocked.target || blocked.after),
+            字段类型: blockedFieldTypeText(blocked),
             变更: change,
             预检结果: blocked.kind === "preflight" ? colorText("否", "red", colors) : "-"
         });
@@ -139,11 +165,16 @@ function escapeTableValue(value) {
 
 function archiveChangeText(operation) {
     if (operation.kind === "createTable") return "创建全新表";
-    if (operation.kind === "addColumn") return `新增字段：${operation.after.dbName}，类型=${operation.after.fieldType}，NULL=${operation.after.nullable ? "是" : "否"}，默认值=${formatValue(operation.after.default)}`;
+    if (operation.kind === "addColumn") return `NULL=${operation.after.nullable ? "是" : "否"}，默认值=${formatValue(operation.after.default)}`;
     if (operation.kind === "addIndex") return `新增${operation.after.type === "unique" ? "唯一" : "普通"}索引：${operation.after.fields.join(", ")}`;
     if (operation.kind === "replaceIndex") return `${formatValue(operation.before)} -> ${formatValue(operation.after)}`;
     if (operation.kind === "dropIndex") return `删除未在 Tables 中声明的索引：${operation.object}`;
-    return operation.changes.map((change) => `${change.property}: ${formatValue(change.before)} -> ${formatValue(change.after)}`).join("；");
+    return (
+        operation.changes
+            .filter((change) => !fieldTypeProperties.has(change.property))
+            .map((change) => `${change.property}: ${formatValue(change.before)} -> ${formatValue(change.after)}`)
+            .join("；") || "-"
+    );
 }
 
 function renderArchive(context) {

package/scripts/syncDb/snapshot.js

@@ -106,11 +106,21 @@ export function buildDatabaseSnapshot(tableRows, columnRows, indexRows) {
     return tables;
 }
 
-export async function readDatabaseSnapshot(mysql) {
+function buildTableFilter(tableNames) {
+    const names = Array.isArray(tableNames) ? tableNames.filter(Boolean) : [];
+    if (names.length === 0) return { clause: "", params: [] };
+    return { clause: ` AND TABLE_NAME IN (${names.map(() => "?").join(", ")})`, params: names };
+}
+
+export async function readDatabaseSnapshot(mysql, options = {}) {
+    const tableFilter = buildTableFilter(options.tableNames);
     const versionRows = (await mysql.execute(VERSION_SQL)).data;
     const versionRow = versionRows[0] || {};
     const mysqlVersion = assertMysql80(versionRow.version, versionRow.versionComment);
-    const [tableResult, columnResult, indexResult] = await Promise.all([mysql.execute(TABLES_SQL), mysql.execute(COLUMNS_SQL), mysql.execute(INDEXES_SQL)]);
+    const tableSql = TABLES_SQL.replace("ORDER BY TABLE_NAME", `${tableFilter.clause} ORDER BY TABLE_NAME`);
+    const columnSql = COLUMNS_SQL.replace("ORDER BY TABLE_NAME, ORDINAL_POSITION", `${tableFilter.clause} ORDER BY TABLE_NAME, ORDINAL_POSITION`);
+    const indexSql = INDEXES_SQL.replace("ORDER BY TABLE_NAME, INDEX_NAME, SEQ_IN_INDEX", `${tableFilter.clause} ORDER BY TABLE_NAME, INDEX_NAME, SEQ_IN_INDEX`);
+    const [tableResult, columnResult, indexResult] = await Promise.all([mysql.execute(tableSql, tableFilter.params), mysql.execute(columnSql, tableFilter.params), mysql.execute(indexSql, tableFilter.params)]);
     return {
         mysqlVersion: mysqlVersion,
         tables: buildDatabaseSnapshot(tableResult.data || [], columnResult.data || [], indexResult.data || [])