befly 3.15.21 → 3.15.23

package/dist/index.js

@@ -26,7 +26,7 @@ import { syncCache } from "./sync/syncCache";
 import { syncDev } from "./sync/syncDev";
 import { syncMenu } from "./sync/syncMenu";
 import { SyncTable } from "./sync/syncTable";
-import { isCoreError } from "./types/coreError";
+import { CoreError, isCoreError } from "./types/coreError";
 // 工具
 import { calcPerfTime } from "./utils/calcPerfTime";
 import { getProcessRole } from "./utils/processInfo";
@@ -226,10 +226,22 @@ export class Befly {
             catch {
                 // ignore
             }
-            if (error instanceof Error) {
+            // 重要：避免宿主入口再打印一遍相同错误。
+            // 约定：start() 失败后向上抛出的异常应可被识别为“已在 core 侧输出过日志”。
+            // - 若本身已是 CoreError：标记 logged=true 后原样抛出
+            // - 否则：包装成 CoreError(logged=true, cause=原始错误)
+            if (isCoreError(error)) {
+                error.logged = true;
                 throw error;
             }
-            throw new Error(String(error));
+            throw new CoreError({
+                kind: kind,
+                message: errMessage,
+                logged: true,
+                noLog: noLog,
+                meta: { subsystem: "start", operation: "start" },
+                cause: error
+            });
         }
     }
 }

package/dist/sync/syncTable.d.ts

@@ -85,8 +85,9 @@ export declare class SyncTable {
     private static buildFieldPlan;
     private static buildSystemFieldPlan;
     private static buildIndexPlan;
-    private static assertCompatibleTypeChange;
+    private static getIncompatibleTypeChange;
     private static collectIncompatibleTypeChanges;
+    private static throwIfIncompatibleTypeChanges;
     private static truncateForLog;
     static stripAlgorithmAndLock(stmt: string): string;
     static buildDdlFallbackCandidates(stmt: string): Array<{

package/dist/sync/syncTable.js

@@ -7,6 +7,7 @@
  * - core 仅支持 MySQL 8.0+
  */
 import { Logger } from "../lib/logger";
+import { CoreError, isCoreError } from "../types/coreError";
 import { normalizeFieldDefinition } from "../utils/normalizeFieldDefinition";
 import { escapeComment, normalizeColumnDefaultValue } from "../utils/sqlUtil";
 import { snakeCase } from "../utils/util";
@@ -139,23 +140,8 @@ export class SyncTable {
                 }
                 tableTasks.push(task);
             }
-            if (incompatibleTypeChanges.length > 0) {
-                const lines = [];
-                for (const change of incompatibleTypeChanges) {
-                    lines.push(`- ${change.tableName}.${change.dbFieldName}: ${change.currentType} -> ${change.expectedType}`);
-                }
-                const msgLines = [];
-                msgLines.push("禁止字段类型变更（检测到不兼容/收缩变更）:");
-                for (const line of lines) {
-                    msgLines.push(line);
-                }
-                msgLines.push("说明: 仅允许同类型的宽化变更（如 TINYINT->SMALLINT->INT->BIGINT），以及部分兼容变更（如 VARCHAR->TEXT、CHAR/VARCHAR 互转、float->double）。");
-                msgLines.push("提示: 若确需收缩，请先手工迁移/清洗数据后再执行同步。");
-                // 预检/校验类错误：不在 syncTable 内部重复打印 error，让上层启动流程统一输出一次即可。
-                const err = new Error(msgLines.join("\n"));
-                err.__syncTableNoLog = true;
-                throw err;
-            }
+            // 预检阶段若已检测到不兼容/收缩变更：直接汇总抛错（不在 syncTable 内部重复打印）。
+            SyncTable.throwIfIncompatibleTypeChanges(incompatibleTypeChanges);
             // 预检通过后：基于预检阶段缓存的元信息为每张“已存在的表”构建 plan。
             // 说明：这里构建 plan 不会执行 DDL；仅用于后续 applyTablePlan。
             for (const task of tableTasks) {
@@ -176,7 +162,13 @@ export class SyncTable {
                 task.plan = built.plan;
                 task.planSummary = built.summary;
                 task.planDetails = built.details;
+                // 双保险：若 plan 构建阶段发现不兼容/收缩变更，也统一汇总到同一列表。
+                for (const change of built.incompatibleTypeChanges) {
+                    incompatibleTypeChanges.push(change);
+                }
             }
+            // plan 阶段补充的兼容性检查：保证“遇到第一条 throw”不会中止汇总。
+            SyncTable.throwIfIncompatibleTypeChanges(incompatibleTypeChanges);
             // 预检通过后，再执行实际同步（DDL）。
             for (const task of tableTasks) {
                 const item = task.item;
@@ -254,6 +246,10 @@ export class SyncTable {
                 throw error;
             }
             // 预检/校验类错误：不在 syncTable 打印 error，直接抛给上层（例如 start()）统一处理。
+            if (isCoreError(error) && error.noLog === true) {
+                throw error;
+            }
+            // 预检/校验类错误：不在 syncTable 打印 error，直接抛给上层（例如 start()）统一处理。
             if (error?.__syncTableNoLog === true) {
                 throw error;
             }
@@ -521,6 +517,7 @@ export class SyncTable {
         const addedBusiness = fieldPlan.addedBusiness;
         const modified = fieldPlan.modified;
         const addedSystem = systemPlan.addedSystem;
+        const incompatibleTypeChanges = fieldPlan.incompatibleTypeChanges;
         const plan = {
             changed: alterClauses.length > 0 || indexActions.length > 0,
             alterClauses: alterClauses,
@@ -537,7 +534,8 @@ export class SyncTable {
             details: {
                 fieldChanges: fieldPlan.changeDetails,
                 indexChanges: indexPlan.indexActions
-            }
+            },
+            incompatibleTypeChanges: incompatibleTypeChanges
         };
     }
     static buildFieldPlan(options) {
@@ -545,6 +543,7 @@ export class SyncTable {
         let addedBusiness = 0;
         let modified = 0;
         const changeDetails = [];
+        const incompatibleTypeChanges = [];
         for (const [fieldKey, fieldDef] of Object.entries(options.fields)) {
             const dbFieldName = snakeCase(fieldKey);
             if (options.existingColumns[dbFieldName]) {
@@ -552,7 +551,16 @@ export class SyncTable {
                 if (comparison.length > 0) {
                     modified = modified + 1;
                     changeDetails.push({ fieldKey: fieldKey, dbFieldName: dbFieldName, changes: comparison });
-                    SyncTable.assertCompatibleTypeChange(options.tableName, dbFieldName, comparison, fieldDef);
+                    // 兼容性检查：不在这里 throw，避免“遇到第一条就中止导致无法汇总”。
+                    // 统一由 run() 收集所有不兼容项后再一次性抛错。
+                    const typeChange = comparison.find((c) => c.type === "datatype");
+                    if (typeChange) {
+                        const expectedType = SyncTable.getSqlType(fieldDef.type, fieldDef.max ?? null, fieldDef.unsigned ?? false, fieldDef.precision ?? null, fieldDef.scale ?? null);
+                        const incompatible = SyncTable.getIncompatibleTypeChange(options.tableName, dbFieldName, String(typeChange.current ?? ""), expectedType);
+                        if (incompatible) {
+                            incompatibleTypeChanges.push(incompatible);
+                        }
+                    }
                     // 简化实现：无论变更类型（含仅默认值变更），统一走 MODIFY COLUMN。
                     alterClauses.push(SyncTable.generateDDLClause(fieldKey, fieldDef, false));
                 }
@@ -562,7 +570,7 @@ export class SyncTable {
                 alterClauses.push(SyncTable.generateDDLClause(fieldKey, fieldDef, true));
             }
         }
-        return { alterClauses: alterClauses, addedBusiness: addedBusiness, modified: modified, changeDetails: changeDetails };
+        return { alterClauses: alterClauses, addedBusiness: addedBusiness, modified: modified, changeDetails: changeDetails, incompatibleTypeChanges: incompatibleTypeChanges };
     }
     static buildSystemFieldPlan(options) {
         const alterClauses = [];
@@ -602,12 +610,9 @@ export class SyncTable {
         ];
         return { indexActions: indexActions };
     }
-    static assertCompatibleTypeChange(tableName, dbFieldName, comparison, fieldDef) {
-        const typeChange = comparison.find((c) => c.type === "datatype");
-        if (!typeChange)
-            return;
-        const currentType = String(typeChange.current || "").toLowerCase();
-        const expectedType = SyncTable.getSqlType(fieldDef.type, fieldDef.max ?? null, fieldDef.unsigned ?? false, fieldDef.precision ?? null, fieldDef.scale ?? null).toLowerCase();
+    static getIncompatibleTypeChange(tableName, dbFieldName, currentTypeRaw, expectedTypeRaw) {
+        const currentType = String(currentTypeRaw || "").toLowerCase();
+        const expectedType = String(expectedTypeRaw || "").toLowerCase();
         const currentBase = currentType
             .replace(/\s*unsigned/gi, "")
             .replace(/\([^)]*\)/g, "")
@@ -616,8 +621,15 @@ export class SyncTable {
             .replace(/\s*unsigned/gi, "")
             .replace(/\([^)]*\)/g, "")
             .trim();
-        if (currentBase !== expectedBase && !SyncTable.isCompatibleTypeChange(currentType, expectedType))
-            throw new Error([`禁止字段类型变更: ${tableName}.${dbFieldName}`, `当前类型: ${typeChange.current}`, `目标类型: ${typeChange.expected}`, "说明: 仅允许宽化型变更（如 INT->BIGINT, VARCHAR->TEXT），以及 CHAR/VARCHAR 互转；DATETIME 与 BIGINT 不允许互转（需要手动迁移数据）"].join("\n"));
+        if (currentBase !== expectedBase && !SyncTable.isCompatibleTypeChange(currentType, expectedType)) {
+            return {
+                tableName: tableName,
+                dbFieldName: dbFieldName,
+                currentType: String(currentTypeRaw ?? ""),
+                expectedType: String(expectedTypeRaw ?? "")
+            };
+        }
+        return null;
     }
     static collectIncompatibleTypeChanges(tableName, existingColumns, fields) {
         const out = [];
@@ -630,27 +642,36 @@ export class SyncTable {
             const typeChange = comparison.find((c) => c.type === "datatype");
             if (!typeChange)
                 continue;
-            const currentType = String(typeChange.current || "").toLowerCase();
-            const expectedType = String(typeChange.expected || "").toLowerCase();
-            const currentBase = currentType
-                .replace(/\s*unsigned/gi, "")
-                .replace(/\([^)]*\)/g, "")
-                .trim();
-            const expectedBase = expectedType
-                .replace(/\s*unsigned/gi, "")
-                .replace(/\([^)]*\)/g, "")
-                .trim();
-            if (currentBase !== expectedBase && !SyncTable.isCompatibleTypeChange(currentType, expectedType)) {
-                out.push({
-                    tableName: tableName,
-                    dbFieldName: dbFieldName,
-                    currentType: String(typeChange.current ?? ""),
-                    expectedType: String(typeChange.expected ?? "")
-                });
+            const expectedType = SyncTable.getSqlType(fieldDef.type, fieldDef.max ?? null, fieldDef.unsigned ?? false, fieldDef.precision ?? null, fieldDef.scale ?? null);
+            const incompatible = SyncTable.getIncompatibleTypeChange(tableName, dbFieldName, String(typeChange.current ?? ""), expectedType);
+            if (incompatible) {
+                out.push(incompatible);
             }
         }
         return out;
     }
+    static throwIfIncompatibleTypeChanges(incompatibleTypeChanges) {
+        if (incompatibleTypeChanges.length === 0) {
+            return;
+        }
+        const lines = [];
+        for (const change of incompatibleTypeChanges) {
+            lines.push(`- ${change.tableName}.${change.dbFieldName}: ${change.currentType} -> ${change.expectedType}`);
+        }
+        const msgLines = [];
+        msgLines.push("禁止字段类型变更（检测到不兼容/收缩变更）:");
+        for (const line of lines) {
+            msgLines.push(line);
+        }
+        msgLines.push("说明: 仅允许同类型的宽化变更（如 TINYINT->SMALLINT->INT->BIGINT），以及部分兼容变更（如 VARCHAR->TEXT、CHAR/VARCHAR 互转、float->double）。");
+        msgLines.push("提示: 若确需收缩，请先手工迁移/清洗数据后再执行同步。");
+        throw new CoreError({
+            kind: "policy",
+            message: msgLines.join("\n"),
+            noLog: true,
+            meta: { subsystem: "syncTable", operation: "precheck" }
+        });
+    }
     /* ---------------------------------------------------------------------- */
     /* DDL 执行（失败时降级 algorithm/lock） */
     /* ---------------------------------------------------------------------- */

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.15.21",
-    "gitHead": "f804b648c68421288137547d70a978e8230ece2f",
+    "version": "3.15.23",
+    "gitHead": "d1f9f15baf452a71fcebc220a9b2a20376616628",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "keywords": [