befly 3.76.4 → 3.76.6

package/package.json

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

package/scripts/syncDb/index.js

@@ -30,7 +30,7 @@ async function buildPlan(mysql, targetTables, tableNames) {
 export async function syncDb(mysqlConfig, options = {}) {
     const apply = options.apply === true;
     const list = options.list === true;
-    const tableNames = Array.isArray(options.tableNames) ? options.tableNames.filter(Boolean) : options.tableName ? [options.tableName] : [];
+    const tableNames = [...new Set((Array.isArray(options.tableNames) ? options.tableNames : options.tableName ? [options.tableName] : []).filter(Boolean))];
     const tableScope = tableNames.length > 0 ? tableNames.join(", ") : "";
     const startedAt = nowText();
     let client;

package/scripts/syncDb/model.js

@@ -33,7 +33,7 @@ export function selectTables(tables, tableNames = []) {
 
     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 matchedNames = new Set(Object.entries(selectedTables).flatMap(([key, table]) => [key, table.codeName, table.fileName]));
     const missingName = selectedNames.find((name) => !matchedNames.has(name));
     if (missingName) throw new TypeError(`找不到 Table 定义：${missingName}`);
     return selectedTables;

package/scripts/syncDb/plan.js

@@ -15,21 +15,28 @@ function targetDbType(fieldType) {
     return { integer: "bigint", number: "decimal", varchar: "varchar", text: "mediumtext" }[fieldType];
 }
 
+const compatibleFieldTypeSources = {
+    integer: new Set(["integer", "tinyint", "smallint", "mediumint", "int"]),
+    number: new Set(["number"]),
+    varchar: new Set(["varchar", "char"]),
+    text: new Set(["text", "tinytext", "longtext", "json", "varchar", "char"])
+};
+
 function compatibleFieldType(target, actual) {
-    const sources = {
-        integer: new Set(["integer", "tinyint", "smallint", "mediumint", "int"]),
-        number: new Set(["number"]),
-        varchar: new Set(["varchar", "char"]),
-        text: new Set(["text", "tinytext", "longtext", "json", "varchar", "char"])
-    };
-    return sources[target]?.has(actual) === true;
+    return compatibleFieldTypeSources[target]?.has(actual) === true;
 }
 
 function columnChanges(target, actual) {
     const changes = [];
-    for (const property of ["fieldType", "maxValue", "precision", "scale", "nullable", "name", "unsigned"]) {
-        if (target[property] !== actual[property]) changes.push({ property: property, before: actual[property], after: target[property] });
+    if (target.fieldType !== actual.fieldType) changes.push({ property: "fieldType", before: actual.fieldType, after: target.fieldType });
+    if (target.fieldType === "varchar" && target.maxValue !== actual.maxValue) changes.push({ property: "maxValue", before: actual.maxValue, after: target.maxValue });
+    if (target.fieldType === "number") {
+        if (target.precision !== actual.precision) changes.push({ property: "precision", before: actual.precision, after: target.precision });
+        if (target.scale !== actual.scale) changes.push({ property: "scale", before: actual.scale, after: target.scale });
     }
+    if (target.nullable !== actual.nullable) changes.push({ property: "nullable", before: actual.nullable, after: target.nullable });
+    if (target.name !== actual.name) changes.push({ property: "name", before: actual.name, after: target.name });
+    if (target.unsigned !== actual.unsigned) changes.push({ property: "unsigned", before: actual.unsigned, after: target.unsigned });
     if (!sameDefault(target.default, actual.default)) changes.push({ property: "default", before: actual.default, after: target.default });
     return changes;
 }
@@ -68,8 +75,7 @@ export function updatePlanHash(plan) {
 }
 
 export function buildSchemaPlan(targetTables, actualTables, { tableNames = [], singleTable = false } = {}) {
-    const selectedTableNames = Array.isArray(tableNames) ? tableNames : tableNames ? [tableNames] : [];
-    const restrictUnmanagedTables = selectedTableNames.length > 0 || singleTable;
+    const restrictUnmanagedTables = singleTable || (Array.isArray(tableNames) ? tableNames.length > 0 : Boolean(tableNames));
     const plan = { operations: [], notices: [], blocked: [], counts: {} };
 
     for (const target of Object.values(targetTables)) {

package/scripts/syncDb/report.js

@@ -2,6 +2,8 @@ import { mkdir } from "node:fs/promises";
 import { join, resolve } from "node:path";
 
 function formatValue(value) {
+    if (value === true) return "是";
+    if (value === false) return "否";
     if (value === "") return '""';
     if (value === null || value === undefined) return "无";
     if (value && typeof value === "object") {
@@ -39,18 +41,55 @@ function colorText(text, color, enabled) {
     return ansi ? `${ansi}${text}\x1b[0m` : text;
 }
 
+const fieldTypeProperties = new Set(["fieldType", "maxValue", "precision", "scale"]);
+
+const propertyNames = {
+    nullable: "是否可空",
+    name: "注释",
+    default: "默认值",
+    unsigned: "无符号",
+    type: "索引类型",
+    fields: "索引字段"
+};
+
+const indexTypeNames = { index: "普通", unique: "唯一" };
+
 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) {
-    return colorText(operation.preflight?.blocked ? "否" : "是", operation.preflight?.blocked ? "red" : "limegreen", colors);
+    if (!operation.preflight) return "-";
+    return colorText(operation.preflight.blocked ? "否" : "是", operation.preflight.blocked ? "red" : "limegreen", colors);
 }
 
 function buildSyncRows(plan, colors) {
@@ -70,13 +109,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 +179,26 @@ 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 `是否可空=${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 === "replaceIndex") {
+        return operation.changes
+            .map((change) => {
+                const label = propertyNames[change.property] || change.property;
+                if (change.property === "type") return `${label}: ${indexTypeNames[change.before] || change.before} -> ${indexTypeNames[change.after] || change.after}`;
+                const before = Array.isArray(change.before) ? change.before.join(", ") : formatValue(change.before);
+                const after = Array.isArray(change.after) ? change.after.join(", ") : formatValue(change.after);
+                return `${label}: ${before} -> ${after}`;
+            })
+            .join("；");
+    }
     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) => `${propertyNames[change.property] || change.property}: ${formatValue(change.before)} -> ${formatValue(change.after)}`)
+            .join("；") || "-"
+    );
 }
 
 function renderArchive(context) {