Files
next-ai-draw-io/packages/mcp-server/tests/wrap-cells.test.ts
T
Dayuan Jiang 60105ddb51 refactor: remove dead code and over-engineering found by two audits (#986)
## Problem

Two audits of the repository (a workflow of finder, dedup and per-file verifier agents, run on 2026-10-11 against 1f4141e and again against 07f3e3c after a first round of refactoring) found dead code and features that were more machinery than the app needs: an Electron configuration-preset system with its own settings window, three copies of the about page, a hand-written `.env` parser, an "extended" system prompt nobody selected, two data migrations for formats from 2025-12 and 2026-01, a server-side example cache, type-to-confirm provider deletion, 81 unused dictionary keys, wrapper components around single call sites, and a long tail of unused exports, props, options and tests.

## Change

Every item below was either approved one by one or covered by "fix all of the others".

- **Electron:** the configuration-preset system is gone (settings window, preload, IPC, menu entry, dev watcher); `config-manager.ts` keeps only `userLocale`; `.env` files are parsed with `dotenv`. Entitlements file and a duplicate CI workflow removed; `test.yml` gets a type check and concurrency.
- **Server:** no extended prompt, no example cache, no `ENABLE_HISTORY_XML_REPLACE`, no message metadata or `hasConfig`; the connection test is one shared helper; EdgeOne loses its mock branch and model aliases; `DEBUG_LLM_PAYLOAD` logs message structure instead of payloads; Langfuse scoring helper; `apiKeyEnv` arrays kept and documented in `env.example` and the provider docs.
- **Pages:** one about page per language from a single component (old `/cn` and `/ja` URLs redirect with 308); layout uses `hasLocale`; the GitHub icon is a local component instead of `react-icons`; Cloudflare deploys without an R2 cache by default.
- **Chat and canvas:** the legacy `diagramHistory` conversion, the localStorage chat migration and the templates storage are gone; `chat-engine` reads the diagram through the context's refs; the diagram context has one tagged export path (`requestTaggedExport` / `fetchDiagramXml`); the screenshot check uses fetch + JSON and `generateText` with `Output.object`; `load-diagram` accepts `<svg:svg>` and strips the XML prolog.
- **Settings UI:** `model-selector` inlines its Dialog, Command and Tooltip; `ai-elements/model-selector`, `button-with-tooltip`, `error-toast` removed; no type-to-confirm, no footer, no `bedrockApiKey`; `use-model-config` loses the old-format migration; one reasoning component; the shimmer is CSS (no `motion`, no `@radix-ui/react-use-controllable-state`); 81 dictionary keys removed in all four languages.
- **MCP server:** `registerTool` / `ok` / `fail` replace per-tool try/catch; `syncFromBrowser`, `commitDocument`, `describePages`; the hand-written XML syntax check, unused result fields, `pickPageSelector`, `expandStyles` and the `host` attribute handling are gone; tests get a shared `setup.ts` and drive the server through the SDK client.
- **Prompt:** the web app's style rules come from the MCP drawing guide (`styleRules`), byte-identical to before.
- **Tests:** shared e2e helpers (`openApp`, `sse`, `toolCallEvents`, `chunkedReplies`); placeholder specs dropped; `settings-review-fixes` split by topic; unit tests use `vi.stubEnv`.
- **Dependencies removed:** `@xmldom/xmldom`, `remark-gfm`, `@anthropic-ai/tokenizer`, `@testing-library/user-event`, `concurrently`, `wait-on`, `eslint`, `eslint-config-next`, `@vitest/coverage-v8`, `shx`, `motion`, `@radix-ui/react-use-controllable-state`, `react-icons`.

Source lines: 74,983 before, 67,418 after (excluding lockfiles).

The last commit merges #984 (the canvas shell). Where the shell, the classic page or their tests depend on a wire format or signature this branch had changed, main's version wins (export fields of the poll response, `addHistory` signature); where main only extended code this branch restructured, main's change is carried into the new structure (`start_session`, `get_selection`, `prepareNewDiagram`, the diagram context's `requestExport`).

## Testing

- `tsc --noEmit` for the web app, `packages/mcp-server`, its shell and `electron`: clean
- `biome ci`: 0 errors (37 pre-existing warnings)
- Root `vitest run`: 719 passed; `packages/mcp-server` `vitest run`: 372 passed
- `next build`: clean
- Playwright, whole web suite on the dev server (4 workers): 280 tests, 279 passed; `language.spec.ts` "a stale offer to switch without saving does nothing once a message is being sent" failed under parallel load and passed alone, as it does on main
2026-10-12 12:35:55 +09:00

220 lines
8.5 KiB
TypeScript

/**
* Tests for wrapCellsInModel: the model may send only the mxCell elements of
* a page, like in the web app, and the server adds the wrapper and root cells.
*/
import { describe, expect, it } from "vitest"
import { prepareNewDiagram, reservedIdError } from "../src/new-diagram.ts"
import { hasCells, wrapCellsInModel } from "../src/pages.ts"
import { validateAndFixXml } from "../src/xml-validation.ts"
const A = `<mxCell id="2" value="A" vertex="1" parent="1"><mxGeometry x="0" y="0" width="80" height="40" as="geometry"/></mxCell>`
const B = `<mxCell id="3" value="B" vertex="1" parent="1"><mxGeometry x="200" y="0" width="80" height="40" as="geometry"/></mxCell>`
const ROOTS = `<mxCell id="0"/><mxCell id="1" parent="0"/>`
describe("wrapCellsInModel", () => {
it("wraps sibling cells so they pass validation", () => {
expect(validateAndFixXml(A + B).valid).toBe(false)
const wrapped = wrapCellsInModel(A + B)
expect(wrapped).toBe(
`<mxGraphModel><root>${ROOTS}${A}${B}</root></mxGraphModel>`,
)
expect(validateAndFixXml(wrapped).valid).toBe(true)
})
it("replaces root cells the model wrote itself", () => {
const wrapped = wrapCellsInModel(
`<mxCell id="0"></mxCell><mxCell id="1" parent="0"/>${A}`,
)
expect(wrapped.match(/id="0"/g)).toHaveLength(1)
expect(wrapped.match(/id="1"/g)).toHaveLength(1)
expect(wrapped).toContain(A)
})
it("unwraps a <root> and drops trailing provider tags", () => {
const wrapped = wrapCellsInModel(
`<root>${A}</root></invoke></function_calls>`,
)
expect(wrapped).toBe(
`<mxGraphModel><root>${ROOTS}${A}</root></mxGraphModel>`,
)
})
it("drops comments and text before the first cell", () => {
const expected = `<mxGraphModel><root>${ROOTS}${A}</root></mxGraphModel>`
expect(wrapCellsInModel(`Here is the diagram: ${A}`)).toBe(expected)
expect(wrapCellsInModel(`<!-- boxes -->\n${A}`)).toBe(expected)
})
it("leaves <mxGraphModel> and <mxfile> input unchanged", () => {
const model = `<mxGraphModel><root>${ROOTS}${A}</root></mxGraphModel>`
const file = `<mxfile><diagram id="p" name="P">${model}</diagram></mxfile>`
expect(wrapCellsInModel(model)).toBe(model)
expect(wrapCellsInModel(file)).toBe(file)
})
it("replaces root cells written over two lines", () => {
const wrapped = wrapCellsInModel(
`<mxCell id="0">\n</mxCell>\n<mxCell id="1" parent="0">\n</mxCell>\n${A}`,
)
expect(wrapped).toBe(
`<mxGraphModel><root>${ROOTS}${A}</root></mxGraphModel>`,
)
})
it("keeps a UserObject cell at the end", () => {
const wrapped = `<UserObject id="u" label="U"><mxCell vertex="1" parent="1"><mxGeometry as="geometry"/></mxCell></UserObject>`
expect(wrapCellsInModel(A + wrapped)).toContain(wrapped)
expect(wrapCellsInModel(`${wrapped}</invoke>`)).toBe(
`<mxGraphModel><root>${ROOTS}${wrapped}</root></mxGraphModel>`,
)
})
})
describe("hasCells", () => {
it("counts cells written with single quotes", () => {
expect(hasCells(`<mxCell id='2' vertex='1' parent='1'/>`)).toBe(true)
expect(hasCells(`<mxCell id='0'/><mxCell id='1' parent='0'/>`)).toBe(
false,
)
})
it("counts a compressed page as having cells", () => {
// draw.io's compressed format: the page's model is text
expect(
hasCells(
`<mxfile><diagram id="p" name="P">dZHBDoIwDIafhjtsGPWM6MkTB8/LVmBxrGQMQZ/eLRuIUS/bv/VfmybF</diagram></mxfile>`,
),
).toBe(true)
})
it("counts cells with spaces around the =", () => {
expect(hasCells(`<mxCell id = "a" vertex="1" parent="1"/>`)).toBe(true)
expect(
hasCells(`<mxCell id = "0"/><mxCell id = "1" parent="0"/>`),
).toBe(false)
})
it("does not mistake ids that start with 0 or 1 for root cells", () => {
expect(
hasCells(
'<mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="10"/>',
),
).toBe(true)
})
it("counts a cell wrapped in a UserObject", () => {
expect(
hasCells(
'<mxCell id="0"/><mxCell id="1" parent="0"/><UserObject id="u" link="x"><mxCell vertex="1" parent="1"/></UserObject>',
),
).toBe(true)
})
})
describe("reservedIdError", () => {
it("finds a shape that uses a root cell id", () => {
expect(reservedIdError(A)).toBeNull()
expect(reservedIdError(ROOTS + A)).toBeNull()
expect(
reservedIdError(`<mxCell id = "1" vertex="1" parent="1"/>`),
).toMatch(/"0" and "1"/)
// A linked or labelled shape has its id on the wrapper
expect(
reservedIdError(
`<UserObject id="1" label="Docs"><mxCell vertex="1" parent="1"><mxGeometry as="geometry"/></mxCell></UserObject>`,
),
).toMatch(/"0" and "1"/)
// Other attributes ending in id, and id text inside a label
expect(
reservedIdError(
`<UserObject label="Server" rack-id="1" id="7"><mxCell vertex="1" parent="1"/></UserObject>`,
),
).toBeNull()
expect(
reservedIdError(
`<UserObject id="u" label="Example: id='1'"><mxCell vertex="1" parent="1"/></UserObject>`,
),
).toBeNull()
expect(
reservedIdError(
`<mxCell id="5" data-id="0" vertex="1" parent="1"/>`,
),
).toBeNull()
expect(
reservedIdError(
`<mxCell id="5" value="id=&quot;1&quot; vertex=&quot;1&quot;" vertex="1" parent="1"/>`,
),
).toBeNull()
// A whole model has its own root cells
expect(
reservedIdError(
`<mxGraphModel><root>${ROOTS}</root></mxGraphModel>`,
),
).toBeNull()
})
})
describe("prepareNewDiagram", () => {
it("gives every <diagram> without an id one, so the server and draw.io name the same pages", () => {
// draw.io makes up an id for a page without one, which the server
// never sees; get_selection would then name a page edit_diagram
// cannot find
const out = prepareNewDiagram(
`<mxfile><diagram name="One"><mxGraphModel><root><mxCell id="0"/><mxCell id="1" parent="0"/></root></mxGraphModel></diagram><diagram name="Two" id="kept"><mxGraphModel><root><mxCell id="0"/><mxCell id="1" parent="0"/></root></mxGraphModel></diagram></mxfile>`,
)
expect(out.ok).toBe(true)
if (!out.ok) return
const ids = [...out.xml.matchAll(/<diagram\b[^>]*\bid="([^"]*)"/g)].map(
(m) => m[1],
)
expect(ids).toHaveLength(2)
expect(ids[0]).toMatch(/^[a-z0-9]+-[a-z0-9]+$/)
expect(ids[1]).toBe("kept")
expect(out.xml).toContain('name="One"')
})
it("rejects a shape that uses a root cell id", () => {
// It would clash with the added root cell "1" and be renamed,
// which breaks the edges that point to it
const cells =
`<mxCell id="1" value="Start" vertex="1" parent="1"><mxGeometry x="0" y="0" width="80" height="40" as="geometry"/></mxCell>` +
`<mxCell id="3" edge="1" parent="1" source="1" target="2"><mxGeometry relative="1" as="geometry"/></mxCell>`
const out = prepareNewDiagram(cells)
expect(out.ok).toBe(false)
if (out.ok) return
expect(out.error).toMatch(/"0" and "1"/)
})
it("still accepts the root cells sent along with the shapes", () => {
const out = prepareNewDiagram(
`<mxCell id="0"/><mxCell id="1" parent="0"/>${A}`,
)
expect(out.ok).toBe(true)
})
it("accepts the root cells alone as a blank page", () => {
const out = prepareNewDiagram(
`<mxCell id="0"/><mxCell id="1" parent="0"/>`,
)
expect(out.ok).toBe(true)
if (!out.ok) return
expect(hasCells(out.xml)).toBe(false)
})
})
describe("labels that look like attributes", () => {
const layer = `<mxCell id="5" value="Move to id='1'" vertex="1" parent="1"/>`
it("keep their cell when the root cells are stripped", () => {
const wrapped = wrapCellsInModel(ROOTS + layer)
expect(wrapped).toBe(
`<mxGraphModel><root>${ROOTS}${layer}</root></mxGraphModel>`,
)
})
it("are not taken for a reserved id", () => {
expect(reservedIdError(layer)).toBeNull()
})
})