befly 3.76.4 → 3.76.5

package/package.json

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

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) {