@allbluecn/web-app 0.18.2 → 0.19.0

package/src/components/design/canvas/document/__tests__/canvas-tree-reconcile.test.ts

@@ -0,0 +1,159 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// AllBlue - 理想之海
+// Copyright (C) 2026 AllBlue Contributors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+// collab-core canvas-tree 镜像类型对账（锚点 H 模式：结构字段对账）。
+//
+// collab-core 的 CollabSceneNode/CollabSceneDocument/CollabSceneNodeExtensions
+// 是 web SceneDocument 体系的结构镜像（跨 app 依赖不可行，T14/T16 先例）。
+// 本测试锁定两侧字段集合不漂移：
+// - 类型级：keyof 双向相等（Exclude 两侧均 never）——web 加/删/改名字段而
+//   镜像未跟时 tsc --noEmit 直接失败
+// - 运行时：extensions 持久化键清单逐值对账（serialize-leafer-json
+//   EXTENSION_KEYS ↔ collab-core CANVAS_EXTENSION_KEYS）
+
+import { describe, expect, it } from "vitest"
+
+import type { ILeaf } from "leafer-editor"
+
+import type {
+  LeaferJSONPackage,
+  SceneNodeExtensions,
+} from "@/design-engine/document/serialize-leafer-json"
+import { exportLeaferJSON, EXTENSION_KEYS } from "@/design-engine/document/serialize-leafer-json"
+import type { SceneDocument, SceneNode } from "../types"
+import {
+  CANVAS_EXTENSION_KEYS,
+  type CollabSceneDocument,
+  type CollabSceneNode,
+  type CollabSceneNodeExtensions,
+} from "@allbluecn/collab-core/canvas-tree"
+import { CANVAS_TREE_FIXTURE_SNAPSHOT } from "./canvas-tree-fixture-snapshot"
+
+// keyof 双向相等：A 相对 B 无多余键，B 相对 A 也无多余键
+type SameKeys<A, B> =
+  Exclude<keyof A, keyof B> extends never
+    ? Exclude<keyof B, keyof A> extends never
+      ? true
+      : never
+    : never
+
+// 类型级对账（tsc --noEmit 关卡；赋值不成立即编译错误）
+const sceneNodeKeysMatch: SameKeys<SceneNode, CollabSceneNode> = true
+const sceneDocumentKeysMatch: SameKeys<SceneDocument, CollabSceneDocument> = true
+const extensionsKeysMatch: SameKeys<SceneNodeExtensions, CollabSceneNodeExtensions> = true
+// LeaferJSONPackage.meta 与 CollabSceneMeta 的键面（device/background）对账
+const packageMetaKeysMatch: SameKeys<
+  LeaferJSONPackage["meta"],
+  CollabSceneDocument["meta"]
+> = true
+
+void [sceneNodeKeysMatch, sceneDocumentKeysMatch, extensionsKeysMatch, packageMetaKeysMatch]
+
+describe("canvas-tree 镜像对账（web SceneDocument 体系 ↔ collab-core）", () => {
+  it("extensions 持久化键清单逐值一致", () => {
+    expect([...CANVAS_EXTENSION_KEYS]).toEqual([...EXTENSION_KEYS])
+  })
+
+  it("SceneNode 全字段清单锚点（运行时基线，与类型级 keyof 对账互补）", () => {
+    // 全字段样例：缺字段/多字段过不了 SceneNode 类型检查（编译期第一道），
+    // 键清单字面量是第二道——web 字段增删时此处连同 keyof 断言一起失败提醒
+    const full: SceneNode = {
+      id: "x",
+      kind: "shape",
+      type: "rect",
+      parentId: null,
+      name: "n",
+      x: 0,
+      y: 0,
+      width: 1,
+      height: 1,
+      rotation: 0,
+      zIndex: 0,
+      locked: false,
+      visible: true,
+      style: {},
+      props: {},
+      overrides: {},
+      fills: [],
+      strokes: [],
+      effects: [],
+      exports: [],
+      constraints: { horizontal: "min", vertical: "min" },
+      corners: [0, 0, 0, 0],
+      blendMode: "normal",
+      aspectLocked: false,
+      refCorner: "center",
+    }
+    expect(Object.keys(full).sort()).toEqual(
+      [
+        "id",
+        "kind",
+        "type",
+        "parentId",
+        "name",
+        "x",
+        "y",
+        "width",
+        "height",
+        "rotation",
+        "zIndex",
+        "locked",
+        "visible",
+        "style",
+        "props",
+        "overrides",
+        "fills",
+        "strokes",
+        "effects",
+        "exports",
+        "constraints",
+        "corners",
+        "blendMode",
+        "aspectLocked",
+        "refCorner",
+      ].sort(),
+    )
+  })
+})
+
+// ===== 活体门卫 ↔ 冻结 fixture 三点一线（防线上保存格式与协作导出格式分叉） =====
+//
+// collab-core 的 Y extensions 门卫被冻结 fixture 锁死（collab-core
+// canvas-tree.test.ts），但本文件上方只锁了「键清单」——web exportLeaferJSON
+// 门卫若日后演进（如空对象跳过 props、locked 门卫放宽），冻结 fixture 不会红、
+// collab-core 镜像也不会红，线上保存格式与协作导出格式将静默分叉。
+// 此用例用**活体** exportLeaferJSON 回放冻结 fixture：门卫行为任何变化立即红，
+// 逼迫重新生成两份 fixture 副本（web/collab-core 注释互指）——任务 27/28 消费
+// 协作导出格式前，把「活体门卫 ≡ 冻结 fixture ≡ collab-core 镜像」锁成一线。
+describe("活体 exportLeaferJSON ↔ 冻结 fixture 回放（三点一线防分叉）", () => {
+  const snapshot = CANVAS_TREE_FIXTURE_SNAPSHOT
+  const scene = snapshot.scene as unknown as SceneDocument
+  const tree = snapshot.pkg.tree
+
+  function exportViaLiveGate(): LeaferJSONPackage {
+    return exportLeaferJSON(scene, { toJSON: () => tree } as unknown as ILeaf)
+  }
+
+  it("活体门卫产物与冻结 pkg.extensions 深度相等（门卫演进即红）", () => {
+    expect(exportViaLiveGate().extensions).toEqual(snapshot.pkg.extensions)
+  })
+
+  it("活体门卫整包回放：meta/tree/format/version 全量对账", () => {
+    // 整包相等隐含根级视图变换剥离的幂等性（fixture tree 已剥离，二次导出不回添）
+    expect(exportViaLiveGate()).toEqual(snapshot.pkg)
+  })
+})

package/src/components/design/canvas/panels/toolbar.tsx

@@ -33,7 +33,7 @@ import {
   TabletSmartphone,
   Type,
 } from "lucide-react"
-import { detectPlatform, formatForDisplay, type Hotkey } from "@tanstack/hotkeys"
+import { detectPlatform, formatForDisplay, type Hotkey, type HotkeyChord } from "@tanstack/hotkeys"
 import { cn } from "@/lib/utils"
 import { m } from "@/paraglide/messages.js"
 import { Button } from "@/components/ui/button"
@@ -72,7 +72,8 @@ import { usePanMode, useTool, useCanvasCursor } from "../react/hooks"
 
 export type ToolDefinition = {
   id: ToolId
-  hotkey?: Hotkey
+  /** 单键 chord（0.18 起 Hotkey 是 chord|sequence 联合类型，工具热键恒为 chord） */
+  hotkey?: HotkeyChord
   label: () => string
   icon: ComponentType<{ className?: string }>
 }