* build: typecheck the test suites Tests were in no TypeScript program: no tsconfig included tests/** or packages/*/tests/**, and bun strips types without checking them, so a fixture could drop a required field and keep passing until something read it. @types/bun moves to the root because it was installed per package only, and #cli-tests/* joins the paths the root config already carries. * test: fix the type errors the test suites were hiding Typechecking the tests turned up 1123 errors. Most were ordinary strictness, but some were real: `NodeChange` bound to Figma's plugin typings rather than the Kiwi codec in thirteen .fig tests, materializeInstance was called with six arguments against five so the blobs and source children were dropped, CanvasKit pixels were written to a plain object that never reached WASM, and assertions were made through accessors that do not exist, so they asserted nothing. Fixtures that had quietly lost a required field now carry it, nullable results are narrowed through the existing expectDefined helper rather than assumed, and stand-ins for CanvasKit and the editor go through one named helper instead of an unexplained cast at each site. No test was deleted, skipped, or weakened, and no `any`, non-null assertion, or ts-expect-error was introduced. * docs: record what typechecking the tests established Pins the app program's global types with an assertion rather than a note, since an unpinned types list lets any root @types package decide which platform src/** is judged against. The two environment faults that look like code regressions — Vite's dependency pre-bundle outliving a package rebuild, and heavy .fig suites failing under load — go to the development docs, where an explanation belongs. * fix: align @types/bun and keep node types resolvable when extended The root manifest declared a newer @types/bun than every package, which check:monorepo rejects, and pinning the app program's types left them unresolvable from a config that extends this one out of tree. * fix: fail the test typecheck when the compiler itself fails The gate matched diagnostics by substring, so a compiler or config failure that named no test file printed a pass while having checked nothing. Diagnostics are now split by whether they name a file: an unscoped one is the run failing and stops the gate, a test file's is a finding, and a source file's stays out by design. Also drops the parameter planComponentConstruction never read, and makes the inner-shadow verification script exit non-zero when it renders no image instead of logging and succeeding. * chore: merge master into tests-typecheck
443 lines
14 KiB
TypeScript
443 lines
14 KiB
TypeScript
import { describe, test, expect } from 'bun:test'
|
|
|
|
import type { CanvasKit } from 'canvaskit-wasm'
|
|
|
|
import { SceneGraph, TextEditor, UndoManager } from '@open-pencil/core'
|
|
import type { StyleRun } from '@open-pencil/core'
|
|
import { createTextActions } from '@open-pencil/core/editor'
|
|
import type { EditorContext, EditorState } from '@open-pencil/core/editor'
|
|
import { getInstanceOverride } from '@open-pencil/scene-graph'
|
|
import type { DerivedTextGlyph } from '@open-pencil/scene-graph'
|
|
|
|
import { fontManager } from '#core/text/fonts'
|
|
|
|
import { expectDefined, getNodeOrThrow } from '#tests/helpers/assert'
|
|
|
|
function setup() {
|
|
const graph = new SceneGraph()
|
|
const pageId = graph.getPages()[0].id
|
|
const undo = new UndoManager()
|
|
const textEditor = new TextEditor({} as CanvasKit)
|
|
|
|
const state = {
|
|
editingTextId: null,
|
|
currentPageId: pageId,
|
|
renderVersion: 0,
|
|
sceneVersion: 0
|
|
} as EditorState
|
|
|
|
const ctx: EditorContext = {
|
|
graph,
|
|
undo,
|
|
state,
|
|
requestRender: () => {
|
|
state.renderVersion++
|
|
state.sceneVersion++
|
|
},
|
|
requestRepaint: () => {
|
|
state.renderVersion++
|
|
},
|
|
getTextEditor: () => textEditor,
|
|
getRenderer: () => null,
|
|
runLayoutForNode: () => undefined,
|
|
runMutationWithLayout: async (operation) => operation(),
|
|
getCk: () => null,
|
|
loadFont: async () => null,
|
|
getViewportSize: () => ({ width: 800, height: 600 }),
|
|
subscribeToGraph: () => undefined,
|
|
resolveFigmaClipboardImages: null,
|
|
beginInteractiveEdit: () => () => undefined,
|
|
onEditorEvent: () => () => undefined,
|
|
emitEditorEvent: () => undefined,
|
|
setSelectedIds: () => undefined,
|
|
setActiveTool: () => undefined,
|
|
setNavigationPhase: () => undefined
|
|
}
|
|
|
|
const textNode = graph.createNode('TEXT', pageId, {
|
|
name: 'Label',
|
|
text: 'Hello',
|
|
width: 100,
|
|
height: 20
|
|
})
|
|
|
|
const actions = createTextActions(ctx)
|
|
return { graph, undo, textEditor, state, textNode, actions }
|
|
}
|
|
|
|
function straightTextPathNetwork() {
|
|
return {
|
|
vertices: [
|
|
{ x: 0, y: 20 },
|
|
{ x: 200, y: 20 }
|
|
],
|
|
segments: [{ start: 0, end: 1, tangentStart: { x: 0, y: 0 }, tangentEnd: { x: 0, y: 0 } }],
|
|
regions: []
|
|
}
|
|
}
|
|
|
|
async function setupPathText() {
|
|
const font = await fontManager.fetchBundledFont('/Inter-Regular.ttf')
|
|
expect(font).toBeTruthy()
|
|
if (!font) return null
|
|
fontManager.markLoaded('Inter', 'Regular', font)
|
|
|
|
const setupResult = setup()
|
|
const glyphs: DerivedTextGlyph[] = [
|
|
{ commandsBlob: new Uint8Array([0]), x: 20, y: 20, fontSize: 20, rotation: 0 },
|
|
{ commandsBlob: new Uint8Array([0]), x: 40, y: 20, fontSize: 20, rotation: 0 }
|
|
]
|
|
setupResult.graph.updateNode(setupResult.textNode.id, {
|
|
text: 'AB',
|
|
fontFamily: 'Inter',
|
|
fontSize: 20,
|
|
width: 200,
|
|
height: 40,
|
|
textPathData: {
|
|
network: straightTextPathNetwork(),
|
|
normalizedSize: { x: 200, y: 40 },
|
|
tValue: 0,
|
|
forward: true
|
|
},
|
|
textPathBox: { x: 0, y: 0, width: 200, height: 40 },
|
|
derivedTextGlyphs: glyphs
|
|
})
|
|
return setupResult
|
|
}
|
|
|
|
function paragraphWithHeight(height: number) {
|
|
return {
|
|
getHeight: () => height,
|
|
getLongestLine: () => 0,
|
|
delete: () => undefined
|
|
}
|
|
}
|
|
|
|
function deletableParagraphWithHeight(height: number) {
|
|
let deleted = false
|
|
return {
|
|
getHeight: () => {
|
|
if (deleted) throw new Error('paragraph was deleted')
|
|
return height
|
|
},
|
|
getLongestLine: () => {
|
|
if (deleted) throw new Error('paragraph was deleted')
|
|
return 0
|
|
},
|
|
delete: () => {
|
|
deleted = true
|
|
}
|
|
}
|
|
}
|
|
|
|
describe('text edit undo', () => {
|
|
test('commitTextEdit pushes undo entry when text changed', () => {
|
|
const { graph, undo, textEditor, textNode, actions } = setup()
|
|
|
|
actions.startTextEditing(textNode.id)
|
|
expect(textEditor.isActive).toBe(true)
|
|
|
|
textEditor.insert(' World', textNode)
|
|
graph.updateNode(textNode.id, {
|
|
text: expectDefined(textEditor.state, 'text editor state').text
|
|
})
|
|
|
|
actions.commitTextEdit()
|
|
|
|
expect(undo.canUndo).toBe(true)
|
|
expect(undo.undoLabel).toBe('Edit text')
|
|
expect(getNodeOrThrow(graph, textNode.id).text).toBe('Hello World')
|
|
|
|
undo.undo()
|
|
expect(getNodeOrThrow(graph, textNode.id).text).toBe('Hello')
|
|
|
|
undo.redo()
|
|
expect(getNodeOrThrow(graph, textNode.id).text).toBe('Hello World')
|
|
})
|
|
|
|
test('reflows live path-text edits and restores glyphs through undo and redo', async () => {
|
|
const setupResult = await setupPathText()
|
|
if (!setupResult) return
|
|
const { graph, undo, textEditor, textNode, actions } = setupResult
|
|
const originalGlyphs = structuredClone(
|
|
expectDefined(getNodeOrThrow(graph, textNode.id).derivedTextGlyphs)
|
|
)
|
|
|
|
actions.startTextEditing(textNode.id)
|
|
textEditor.insert('C', getNodeOrThrow(graph, textNode.id))
|
|
actions.updateTextEditNode(textNode.id, {
|
|
text: expectDefined(textEditor.state, 'text editor state').text
|
|
})
|
|
|
|
const liveGlyphs = expectDefined(getNodeOrThrow(graph, textNode.id).derivedTextGlyphs)
|
|
expect(liveGlyphs).toHaveLength(3)
|
|
expect(liveGlyphs).not.toEqual(originalGlyphs)
|
|
|
|
actions.commitTextEdit()
|
|
const committedGlyphs = structuredClone(
|
|
expectDefined(getNodeOrThrow(graph, textNode.id).derivedTextGlyphs)
|
|
)
|
|
undo.undo()
|
|
expect(getNodeOrThrow(graph, textNode.id).text).toBe('AB')
|
|
expect(getNodeOrThrow(graph, textNode.id).derivedTextGlyphs).toEqual(originalGlyphs)
|
|
|
|
undo.redo()
|
|
expect(getNodeOrThrow(graph, textNode.id).text).toBe('ABC')
|
|
expect(getNodeOrThrow(graph, textNode.id).derivedTextGlyphs).toEqual(committedGlyphs)
|
|
})
|
|
|
|
test('restores path identity when undoing an edit to empty text', async () => {
|
|
const setupResult = await setupPathText()
|
|
if (!setupResult) return
|
|
const { graph, undo, textEditor, textNode, actions } = setupResult
|
|
const originalPathData = structuredClone(
|
|
expectDefined(getNodeOrThrow(graph, textNode.id).textPathData)
|
|
)
|
|
|
|
actions.startTextEditing(textNode.id)
|
|
textEditor.selectAll()
|
|
textEditor.backspace(getNodeOrThrow(graph, textNode.id))
|
|
actions.updateTextEditNode(textNode.id, { text: '' })
|
|
actions.commitTextEdit()
|
|
|
|
expect(getNodeOrThrow(graph, textNode.id).textPathData).toBeNull()
|
|
undo.undo()
|
|
expect(getNodeOrThrow(graph, textNode.id).text).toBe('AB')
|
|
expect(getNodeOrThrow(graph, textNode.id).textPathData).toEqual(originalPathData)
|
|
undo.redo()
|
|
expect(getNodeOrThrow(graph, textNode.id).text).toBe('')
|
|
expect(getNodeOrThrow(graph, textNode.id).textPathData).toBeNull()
|
|
})
|
|
|
|
test('keeps an empty text override inside an instance through sync and undo', () => {
|
|
const { graph, undo, textEditor, actions } = setup()
|
|
const page = graph.getPages()[0]
|
|
const component = graph.createNode('COMPONENT', page.id, {
|
|
width: 100,
|
|
height: 20
|
|
})
|
|
graph.createNode('TEXT', component.id, {
|
|
text: 'Confidential',
|
|
width: 100,
|
|
height: 20
|
|
})
|
|
const instance = expectDefined(graph.createInstance(component.id, page.id), 'instance')
|
|
const instanceText = getNodeOrThrow(graph, instance.childIds[0])
|
|
|
|
actions.startTextEditing(instanceText.id)
|
|
textEditor.selectAll()
|
|
textEditor.backspace(instanceText)
|
|
actions.commitTextEdit()
|
|
|
|
expect(getNodeOrThrow(graph, instanceText.id).text).toBe('')
|
|
expect(
|
|
getInstanceOverride(
|
|
getNodeOrThrow(graph, instance.id).instanceOverrides,
|
|
instance.id,
|
|
instanceText.id,
|
|
'text'
|
|
)
|
|
).toBe('')
|
|
graph.syncInstances(component.id)
|
|
expect(getNodeOrThrow(graph, instanceText.id).text).toBe('')
|
|
|
|
undo.undo()
|
|
expect(getNodeOrThrow(graph, instanceText.id).text).toBe('Confidential')
|
|
expect(
|
|
getInstanceOverride(
|
|
getNodeOrThrow(graph, instance.id).instanceOverrides,
|
|
instance.id,
|
|
instanceText.id,
|
|
'text'
|
|
)
|
|
).toBeUndefined()
|
|
|
|
undo.redo()
|
|
graph.syncInstances(component.id)
|
|
expect(getNodeOrThrow(graph, instanceText.id).text).toBe('')
|
|
})
|
|
|
|
test('does not create a text override for a style-only instance edit', () => {
|
|
const { graph, textEditor, actions } = setup()
|
|
const page = graph.getPages()[0]
|
|
const component = graph.createNode('COMPONENT', page.id, { width: 100, height: 20 })
|
|
graph.createNode('TEXT', component.id, { text: 'Label', width: 100, height: 20 })
|
|
const instance = expectDefined(graph.createInstance(component.id, page.id), 'instance')
|
|
const instanceText = getNodeOrThrow(graph, instance.childIds[0])
|
|
|
|
actions.startTextEditing(instanceText.id)
|
|
const state = expectDefined(textEditor.state, 'text editor state')
|
|
graph.updateNode(instanceText.id, {
|
|
styleRuns: [{ start: 0, length: state.text.length, style: { fontWeight: 700 } }]
|
|
})
|
|
actions.commitTextEdit()
|
|
|
|
expect(
|
|
getInstanceOverride(
|
|
getNodeOrThrow(graph, instance.id).instanceOverrides,
|
|
instance.id,
|
|
instanceText.id,
|
|
'text'
|
|
)
|
|
).toBeUndefined()
|
|
})
|
|
|
|
test('commitTextEdit preserves auto-height text bounds', () => {
|
|
const { graph, undo, textEditor, textNode, actions } = setup()
|
|
graph.updateNode(textNode.id, { textAutoResize: 'HEIGHT', height: 18 })
|
|
|
|
actions.startTextEditing(textNode.id)
|
|
const state = expectDefined(textEditor.state, 'text editor state')
|
|
state.paragraph = paragraphWithHeight(42) as NonNullable<typeof state.paragraph>
|
|
textEditor.insert(' World', getNodeOrThrow(graph, textNode.id))
|
|
|
|
actions.commitTextEdit()
|
|
|
|
expect(getNodeOrThrow(graph, textNode.id).height).toBe(42)
|
|
undo.undo()
|
|
expect(getNodeOrThrow(graph, textNode.id).height).toBe(18)
|
|
undo.redo()
|
|
expect(getNodeOrThrow(graph, textNode.id).height).toBe(42)
|
|
})
|
|
|
|
test('commitTextEdit measures auto-size before deleting the edit paragraph', () => {
|
|
const { graph, textEditor, textNode, actions } = setup()
|
|
graph.updateNode(textNode.id, { textAutoResize: 'HEIGHT', height: 18 })
|
|
|
|
actions.startTextEditing(textNode.id)
|
|
const state = expectDefined(textEditor.state, 'text editor state')
|
|
state.paragraph = deletableParagraphWithHeight(42) as NonNullable<typeof state.paragraph>
|
|
textEditor.insert(' World', getNodeOrThrow(graph, textNode.id))
|
|
|
|
expect(() => actions.commitTextEdit()).not.toThrow()
|
|
expect(getNodeOrThrow(graph, textNode.id).height).toBe(42)
|
|
})
|
|
|
|
test('commitTextEdit does not push undo when text unchanged', () => {
|
|
const { undo, actions, textNode } = setup()
|
|
|
|
actions.startTextEditing(textNode.id)
|
|
actions.commitTextEdit()
|
|
|
|
expect(undo.canUndo).toBe(false)
|
|
})
|
|
|
|
test('commitTextEdit preserves derived glyphs when text unchanged', () => {
|
|
const { graph, actions, textNode } = setup()
|
|
const glyphs = [{ commandsBlob: new Uint8Array([0]), x: 0, y: 10, fontSize: 14 }]
|
|
graph.updateNode(textNode.id, { derivedTextGlyphs: glyphs })
|
|
|
|
actions.startTextEditing(textNode.id)
|
|
actions.commitTextEdit()
|
|
|
|
expect(getNodeOrThrow(graph, textNode.id).derivedTextGlyphs).toBe(glyphs)
|
|
})
|
|
|
|
test('undo restores original text even when graph was synced mid-edit', () => {
|
|
const { graph, undo, textEditor, textNode, actions } = setup()
|
|
|
|
actions.startTextEditing(textNode.id)
|
|
|
|
textEditor.insert(' Beautiful', textNode)
|
|
graph.updateNode(textNode.id, {
|
|
text: expectDefined(textEditor.state, 'text editor state').text
|
|
})
|
|
|
|
textEditor.insert(' World', textNode)
|
|
graph.updateNode(textNode.id, {
|
|
text: expectDefined(textEditor.state, 'text editor state').text
|
|
})
|
|
|
|
actions.commitTextEdit()
|
|
|
|
expect(getNodeOrThrow(graph, textNode.id).text).toBe('Hello Beautiful World')
|
|
expect(undo.canUndo).toBe(true)
|
|
|
|
undo.undo()
|
|
expect(getNodeOrThrow(graph, textNode.id).text).toBe('Hello')
|
|
})
|
|
|
|
test('sequential edits create separate undo entries', () => {
|
|
const { graph, undo, textEditor, textNode, actions } = setup()
|
|
|
|
actions.startTextEditing(textNode.id)
|
|
textEditor.insert('!', textNode)
|
|
graph.updateNode(textNode.id, {
|
|
text: expectDefined(textEditor.state, 'text editor state').text
|
|
})
|
|
actions.commitTextEdit()
|
|
|
|
actions.startTextEditing(textNode.id)
|
|
textEditor.insert('!', textNode)
|
|
graph.updateNode(textNode.id, {
|
|
text: expectDefined(textEditor.state, 'text editor state').text
|
|
})
|
|
actions.commitTextEdit()
|
|
|
|
expect(getNodeOrThrow(graph, textNode.id).text).toBe('Hello!!')
|
|
|
|
undo.undo()
|
|
expect(getNodeOrThrow(graph, textNode.id).text).toBe('Hello!')
|
|
|
|
undo.undo()
|
|
expect(getNodeOrThrow(graph, textNode.id).text).toBe('Hello')
|
|
})
|
|
|
|
test('undo restores styleRuns when they changed during editing', () => {
|
|
const { graph, undo, textEditor, textNode, actions } = setup()
|
|
|
|
const boldRun: StyleRun = { start: 0, length: 5, style: { fontWeight: 700 } }
|
|
graph.updateNode(textNode.id, { styleRuns: [boldRun] })
|
|
|
|
actions.startTextEditing(textNode.id)
|
|
|
|
textEditor.insert(' World', textNode)
|
|
const newRuns: StyleRun[] = [
|
|
{ start: 0, length: 5, style: { fontWeight: 700 } },
|
|
{ start: 5, length: 6, style: { fontWeight: 400 } }
|
|
]
|
|
graph.updateNode(textNode.id, {
|
|
text: expectDefined(textEditor.state, 'text editor state').text,
|
|
styleRuns: newRuns
|
|
})
|
|
|
|
actions.commitTextEdit()
|
|
|
|
expect(getNodeOrThrow(graph, textNode.id).styleRuns).toEqual(newRuns)
|
|
expect(undo.canUndo).toBe(true)
|
|
|
|
undo.undo()
|
|
expect(getNodeOrThrow(graph, textNode.id).text).toBe('Hello')
|
|
expect(getNodeOrThrow(graph, textNode.id).styleRuns).toEqual([boldRun])
|
|
|
|
undo.redo()
|
|
expect(getNodeOrThrow(graph, textNode.id).text).toBe('Hello World')
|
|
expect(getNodeOrThrow(graph, textNode.id).styleRuns).toEqual(newRuns)
|
|
})
|
|
|
|
test('undo entry is pushed when only styleRuns changed', () => {
|
|
const { graph, undo, textNode, actions } = setup()
|
|
|
|
actions.startTextEditing(textNode.id)
|
|
|
|
const newRuns: StyleRun[] = [{ start: 0, length: 5, style: { fontWeight: 700 } }]
|
|
graph.updateNode(textNode.id, { styleRuns: newRuns })
|
|
|
|
actions.commitTextEdit()
|
|
|
|
expect(undo.canUndo).toBe(true)
|
|
|
|
undo.undo()
|
|
expect(getNodeOrThrow(graph, textNode.id).styleRuns).toEqual([])
|
|
})
|
|
|
|
test('no undo entry when neither text nor styleRuns changed', () => {
|
|
const { undo, actions, textNode } = setup()
|
|
|
|
actions.startTextEditing(textNode.id)
|
|
actions.commitTextEdit()
|
|
|
|
expect(undo.canUndo).toBe(false)
|
|
})
|
|
})
|