mirror of
https://github.com/DayuanJiang/next-ai-draw-io.git
synced 2026-10-08 10:47:48 +08:00
- Delete the web app's own copy of the XML checks and repairs from lib/utils.ts (1,074 lines). loadDiagram now uses the MCP server's validateAndFixXml without the strict checks, because the XML may hold the user's own diagram - display_diagram and append_diagram prepare the model's XML with the new shared prepareNewDiagram, also used by the MCP create_new_diagram: wrap, validate strictly and auto-fix while it is still a bare model (where duplicate ids are renamed), then turn it into an mxfile - The streaming preview of display_diagram no longer redraws the model's raw cells after the tool handler loaded the checked diagram, and drops a queued preview once the input is complete. That redraw lost auto-fixes and UserObject/object wrappers, so a linked cell lost its label; it also showed a second error toast - The web repair regression tests now run against the MCP functions - New e2e test checks the canvas content after display_diagram - Fix the e2e upload tests, whose file input locator also matched the template import input
182 lines
7.2 KiB
TypeScript
182 lines
7.2 KiB
TypeScript
import { describe, expect, it } from "vitest"
|
|
import {
|
|
applyDiagramOperations,
|
|
cn,
|
|
extractCompleteMxCells,
|
|
isMxCellXmlComplete,
|
|
wrapWithMxFile,
|
|
} from "@/lib/utils"
|
|
|
|
describe("isMxCellXmlComplete", () => {
|
|
it("returns false for empty/null input", () => {
|
|
expect(isMxCellXmlComplete("")).toBe(false)
|
|
expect(isMxCellXmlComplete(null)).toBe(false)
|
|
expect(isMxCellXmlComplete(undefined)).toBe(false)
|
|
})
|
|
|
|
it("returns true for self-closing mxCell", () => {
|
|
const xml =
|
|
'<mxCell id="2" value="Hello" style="rounded=1;" vertex="1" parent="1"/>'
|
|
expect(isMxCellXmlComplete(xml)).toBe(true)
|
|
})
|
|
|
|
it("returns true for mxCell with closing tag", () => {
|
|
const xml = `<mxCell id="2" value="Hello" vertex="1" parent="1">
|
|
<mxGeometry x="100" y="100" width="120" height="60" as="geometry"/>
|
|
</mxCell>`
|
|
expect(isMxCellXmlComplete(xml)).toBe(true)
|
|
})
|
|
|
|
it("returns false for truncated mxCell", () => {
|
|
const xml =
|
|
'<mxCell id="2" value="Hello" style="rounded=1;" vertex="1" parent'
|
|
expect(isMxCellXmlComplete(xml)).toBe(false)
|
|
})
|
|
|
|
it("returns false for mxCell with unclosed geometry", () => {
|
|
const xml = `<mxCell id="2" value="Hello" vertex="1" parent="1">
|
|
<mxGeometry x="100" y="100" width="120"`
|
|
expect(isMxCellXmlComplete(xml)).toBe(false)
|
|
})
|
|
|
|
it("returns false when output stops after a child of an open mxCell", () => {
|
|
const xml = `<mxCell id="2" value="A" vertex="1" parent="1">
|
|
<mxGeometry x="0" y="0" width="80" height="40" as="geometry"/>
|
|
</mxCell>
|
|
<mxCell id="3" value="B" vertex="1" parent="1">
|
|
<mxGeometry x="100" y="0" width="80" height="40" as="geometry"/>`
|
|
expect(isMxCellXmlComplete(xml)).toBe(false)
|
|
})
|
|
|
|
it("returns false when output stops after </mxGeometry> of an open mxCell", () => {
|
|
const xml = `<mxCell id="e1" edge="1" parent="1" source="2" target="3">
|
|
<mxGeometry relative="1" as="geometry">
|
|
<mxPoint x="10" y="10" as="sourcePoint"/>
|
|
</mxGeometry>`
|
|
expect(isMxCellXmlComplete(xml)).toBe(false)
|
|
})
|
|
|
|
it("returns true for a self-closing last mxCell with > in its value", () => {
|
|
const xml = `<mxCell id="2" value="A" vertex="1" parent="1">
|
|
<mxGeometry as="geometry"/>
|
|
</mxCell>
|
|
<mxCell id="3" value="A -> B" vertex="1" parent="1"/></root>`
|
|
expect(isMxCellXmlComplete(xml)).toBe(true)
|
|
})
|
|
|
|
it("returns true for multiple complete mxCells", () => {
|
|
const xml = `<mxCell id="2" value="A" vertex="1" parent="1"/>
|
|
<mxCell id="3" value="B" vertex="1" parent="1"/>`
|
|
expect(isMxCellXmlComplete(xml)).toBe(true)
|
|
})
|
|
})
|
|
|
|
describe("wrapWithMxFile", () => {
|
|
it("wraps empty string with default structure", () => {
|
|
const result = wrapWithMxFile("")
|
|
expect(result).toContain("<mxfile>")
|
|
expect(result).toContain("<mxGraphModel>")
|
|
expect(result).toContain('<mxCell id="0"/>')
|
|
expect(result).toContain('<mxCell id="1" parent="0"/>')
|
|
})
|
|
|
|
it("wraps raw mxCell content", () => {
|
|
const xml = '<mxCell id="2" value="Hello"/>'
|
|
const result = wrapWithMxFile(xml)
|
|
expect(result).toContain("<mxfile>")
|
|
expect(result).toContain(xml)
|
|
expect(result).toContain("</mxfile>")
|
|
})
|
|
|
|
it("returns full mxfile unchanged", () => {
|
|
const fullXml =
|
|
'<mxfile><diagram name="Page-1"><mxGraphModel></mxGraphModel></diagram></mxfile>'
|
|
const result = wrapWithMxFile(fullXml)
|
|
expect(result).toBe(fullXml)
|
|
})
|
|
|
|
it("handles whitespace in input", () => {
|
|
const result = wrapWithMxFile(" ")
|
|
expect(result).toContain("<mxfile>")
|
|
})
|
|
})
|
|
|
|
describe("cn (class name utility)", () => {
|
|
it("merges class names", () => {
|
|
expect(cn("foo", "bar")).toBe("foo bar")
|
|
})
|
|
|
|
it("handles conditional classes", () => {
|
|
expect(cn("foo", false && "bar", "baz")).toBe("foo baz")
|
|
})
|
|
|
|
it("merges tailwind classes correctly", () => {
|
|
expect(cn("px-2", "px-4")).toBe("px-4")
|
|
expect(cn("text-red-500", "text-blue-500")).toBe("text-blue-500")
|
|
})
|
|
})
|
|
|
|
describe("extractCompleteMxCells", () => {
|
|
it("keeps the cell right after self-closing root cells", () => {
|
|
const xml = `<mxfile><diagram id="p1"><mxGraphModel><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="2" value="A" vertex="1" parent="1"><mxGeometry as="geometry"/></mxCell><mxCell id="3" value="B" vertex="1" parent="1"><mxGeometry as="geometry"/></mxCell></root></mxGraphModel></diagram></mxfile>`
|
|
const ids = [
|
|
...extractCompleteMxCells(xml).matchAll(/<mxCell id="([^"]+)"/g),
|
|
].map((m) => m[1])
|
|
expect(ids).toEqual(["0", "1", "2", "3"])
|
|
})
|
|
|
|
it("drops an incomplete trailing cell", () => {
|
|
const xml = `<mxCell id="2" vertex="1" parent="1"/><mxCell id="3" vertex="1" parent="1"><mxGeometry as="geometry"/>`
|
|
expect(extractCompleteMxCells(xml)).toBe(
|
|
'<mxCell id="2" vertex="1" parent="1"/>',
|
|
)
|
|
})
|
|
})
|
|
|
|
describe("applyDiagramOperations with wrapped cells", () => {
|
|
const xml = `<mxfile><diagram id="p1"><mxGraphModel><root><mxCell id="0"/><mxCell id="1" parent="0"/><UserObject id="5" label="Docs" link="https://example.com"><mxCell vertex="1" parent="1"><mxGeometry as="geometry"/></mxCell></UserObject><mxCell id="6" value="B" vertex="1" parent="1"><mxGeometry as="geometry"/></mxCell><mxCell id="e1" edge="1" parent="1" source="5" target="6"><mxGeometry relative="1" as="geometry"/></mxCell></root></mxGraphModel></diagram></mxfile>`
|
|
|
|
it("deletes a wrapped cell and its edges", () => {
|
|
const { result, errors } = applyDiagramOperations(xml, [
|
|
{ operation: "delete", cell_id: "5" },
|
|
{ operation: "delete", cell_id: "e1" },
|
|
])
|
|
expect(errors).toEqual([])
|
|
expect(result).not.toContain("UserObject")
|
|
expect(result).not.toContain('id="e1"')
|
|
expect(result).toContain('id="6"')
|
|
})
|
|
|
|
it("rejects adding a cell with the id of a wrapped cell", () => {
|
|
const { errors } = applyDiagramOperations(xml, [
|
|
{
|
|
operation: "add",
|
|
cell_id: "5",
|
|
new_xml: '<mxCell id="5" vertex="1" parent="1"/>',
|
|
},
|
|
])
|
|
expect(errors[0]?.message).toContain("already exists")
|
|
})
|
|
|
|
it("updates a wrapped cell", () => {
|
|
const { result, errors } = applyDiagramOperations(xml, [
|
|
{
|
|
operation: "update",
|
|
cell_id: "5",
|
|
new_xml:
|
|
'<UserObject id="5" label="New" link="https://example.org"><mxCell vertex="1" parent="1"><mxGeometry as="geometry"/></mxCell></UserObject>',
|
|
},
|
|
])
|
|
expect(errors).toEqual([])
|
|
expect(result).toContain('label="New"')
|
|
expect(result).not.toContain('label="Docs"')
|
|
})
|
|
|
|
it("reports deleting a cell that does not exist", () => {
|
|
const { errors } = applyDiagramOperations(xml, [
|
|
{ operation: "delete", cell_id: "missing" },
|
|
])
|
|
expect(errors[0]?.message).toContain("not found")
|
|
})
|
|
})
|