371a5ed556
Ink's screen-reader branch (ink.tsx:617-621) writes the wrapped output
verbatim — `stdout.write(erase + wrappedOutput)` with
`lastOutputToRender = wrappedOutput` (NO appended "\n" in ANY case) and
`lastOutputHeight = wrappedOutput === "" ? 0 : wrappedOutput.split("\n").length`.
The earlier G17 fix only suppressed the trailing newline for the EMPTY SR
frame (`output === ""`); a non-empty multi-line SR frame still fell through
to `output + "\n"`, which (1) parked the cursor on a spurious blank line
below the content and (2) made log-update count the previous frame as N+1
lines, emitting `eraseLines(N+1)` instead of `eraseLines(N)` on every
subsequent multi-line SR frame (off-by-one erase).
Broaden the suppression to ALL screen-reader frames so the written output
and its height match Ink's SR branch exactly. Non-SR interactive frames are
untouched — they still append "\n" as before.
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
248 lines
7.9 KiB
TypeScript
248 lines
7.9 KiB
TypeScript
import { defineComponent, nextTick, shallowRef } from "vue";
|
|
import { expect, test } from "vite-plus/test";
|
|
import ansiEscapes from "ansi-escapes";
|
|
import { Box, createApp, Static, Text } from "@vue-tui/runtime";
|
|
import {
|
|
makeFakeStdin,
|
|
makeFakeWritable,
|
|
captureWrites,
|
|
getContentWrites,
|
|
} from "../lifecycle/test-streams.ts";
|
|
|
|
// G03 (Ink parity): the LIVE commit path must branch on isScreenReaderEnabled
|
|
// and emit the flat, linearized screen-reader text (via renderScreenReaderOutput),
|
|
// NOT the 2D grid produced by paint() — which would include border glyphs.
|
|
|
|
test.sequential("live commit path emits linear screen-reader text (no border glyphs) when SR enabled", async () => {
|
|
const App = defineComponent(() => {
|
|
return () => (
|
|
<Box borderStyle="round">
|
|
<Text>Hello world</Text>
|
|
</Box>
|
|
);
|
|
});
|
|
|
|
const app = createApp(App);
|
|
const stdout = makeFakeWritable({ columns: 80 });
|
|
const stderr = makeFakeWritable({ columns: 80 });
|
|
const { stream: stdin } = makeFakeStdin();
|
|
const writes = captureWrites(stdout);
|
|
|
|
app.mount({
|
|
stdout,
|
|
stdin,
|
|
stderr,
|
|
exitOnCtrlC: false,
|
|
isScreenReaderEnabled: true,
|
|
});
|
|
|
|
await nextTick();
|
|
await nextTick();
|
|
|
|
const content = getContentWrites(writes).join("");
|
|
|
|
// The flat text content must be present.
|
|
expect(content).toContain("Hello world");
|
|
|
|
// Border / box-drawing glyphs must NOT appear — SR mode linearizes the tree.
|
|
const borderGlyphs = ["╭", "╮", "╰", "╯", "─", "│"];
|
|
for (const glyph of borderGlyphs) {
|
|
expect(content).not.toContain(glyph);
|
|
}
|
|
|
|
app.unmount();
|
|
});
|
|
|
|
test.sequential("live commit path WITHOUT SR still emits 2D grid with border glyphs (contrast)", async () => {
|
|
const App = defineComponent(() => {
|
|
return () => (
|
|
<Box borderStyle="round">
|
|
<Text>Hello world</Text>
|
|
</Box>
|
|
);
|
|
});
|
|
|
|
const app = createApp(App);
|
|
const stdout = makeFakeWritable({ columns: 80 });
|
|
const stderr = makeFakeWritable({ columns: 80 });
|
|
const { stream: stdin } = makeFakeStdin();
|
|
const writes = captureWrites(stdout);
|
|
|
|
app.mount({
|
|
stdout,
|
|
stdin,
|
|
stderr,
|
|
exitOnCtrlC: false,
|
|
});
|
|
|
|
await nextTick();
|
|
await nextTick();
|
|
|
|
const content = getContentWrites(writes).join("");
|
|
expect(content).toContain("Hello world");
|
|
// Non-SR path renders the visual frame, which DOES contain border glyphs.
|
|
expect(content).toContain("─");
|
|
|
|
app.unmount();
|
|
});
|
|
|
|
// G17 edge (a) (Ink parity): the LIVE static channel must ALSO linearize in SR
|
|
// mode. The dynamic frame already excludes <Static> (skipStaticElements:true),
|
|
// but commit() flushes statics separately — and previously via the 2D grid
|
|
// painter (paintIsolated), so a bordered static item leaked box glyphs even in
|
|
// SR mode. Ink linearizes static too: renderer.ts renders node.staticNode via
|
|
// renderNodeToScreenReaderOutput({ skipStaticElements:false }).
|
|
test.sequential("live static channel emits linear screen-reader text (no border glyphs) when SR enabled", async () => {
|
|
const App = defineComponent(() => {
|
|
const items = ["Logged in"];
|
|
return () => (
|
|
<Box flexDirection="column">
|
|
<Static items={items}>
|
|
{{
|
|
default: ({ item }: { item: string }) => (
|
|
<Box key={item} borderStyle="round">
|
|
<Text>{item}</Text>
|
|
</Box>
|
|
),
|
|
}}
|
|
</Static>
|
|
<Text>Live</Text>
|
|
</Box>
|
|
);
|
|
});
|
|
|
|
const app = createApp(App);
|
|
const stdout = makeFakeWritable({ columns: 80 });
|
|
const stderr = makeFakeWritable({ columns: 80 });
|
|
const { stream: stdin } = makeFakeStdin();
|
|
const writes = captureWrites(stdout);
|
|
|
|
app.mount({
|
|
stdout,
|
|
stdin,
|
|
stderr,
|
|
exitOnCtrlC: false,
|
|
isScreenReaderEnabled: true,
|
|
});
|
|
|
|
await nextTick();
|
|
await nextTick();
|
|
|
|
const content = getContentWrites(writes).join("");
|
|
|
|
// The flat static text content must be present.
|
|
expect(content).toContain("Logged in");
|
|
|
|
// Border / box-drawing glyphs must NOT appear — the static channel must
|
|
// linearize the bordered Box in SR mode just like the dynamic frame.
|
|
const borderGlyphs = ["╭", "╮", "╰", "╯", "─", "│"];
|
|
for (const glyph of borderGlyphs) {
|
|
expect(content).not.toContain(glyph);
|
|
}
|
|
|
|
app.unmount();
|
|
});
|
|
|
|
// G17 edge (b) (Ink parity): an EMPTY SR frame must not write a spurious blank
|
|
// trailing line. Ink's SR path writes the wrapped output directly with
|
|
// lastOutputToRender = wrappedOutput (NO appended "\n"), and an empty frame is
|
|
// "" → height 0, so nothing is emitted (ink.tsx:599-621). The normal frame
|
|
// writer appends "\n" even for empty frames, which would leak a blank line.
|
|
test.sequential("empty SR frame does not write a spurious blank trailing line", async () => {
|
|
const App = defineComponent(() => {
|
|
// A Box with no visible text produces an empty linearized SR frame.
|
|
return () => <Box />;
|
|
});
|
|
|
|
const app = createApp(App);
|
|
const stdout = makeFakeWritable({ columns: 80 });
|
|
const stderr = makeFakeWritable({ columns: 80 });
|
|
const { stream: stdin } = makeFakeStdin();
|
|
const writes = captureWrites(stdout);
|
|
|
|
app.mount({
|
|
stdout,
|
|
stdin,
|
|
stderr,
|
|
exitOnCtrlC: false,
|
|
isScreenReaderEnabled: true,
|
|
});
|
|
|
|
await nextTick();
|
|
await nextTick();
|
|
|
|
const content = getContentWrites(writes).join("");
|
|
|
|
// An empty SR frame must not produce any newline-only / blank write. The
|
|
// non-empty case appends a newline via the frame writer; the empty case
|
|
// must produce zero output lines (Ink: wrappedOutput === "" writes nothing).
|
|
expect(content).not.toContain("\n");
|
|
expect(content).toBe("");
|
|
|
|
app.unmount();
|
|
});
|
|
|
|
// G46 (Ink parity): a NON-empty multi-line SR frame must be written verbatim
|
|
// with NO appended trailing newline, matching Ink's SR branch (ink.tsx:617-621):
|
|
// stdout.write(erase + wrappedOutput); lastOutputToRender = wrappedOutput (no
|
|
// "\n"); lastOutputHeight = wrappedOutput.split("\n").length. G17 only handled
|
|
// the empty case, so a 2-line frame "Line one\nLine two" got a spurious "\n"
|
|
// appended — parking the cursor on a blank line below content AND making every
|
|
// subsequent multi-line SR frame erase N+1 lines instead of N (off-by-one).
|
|
test.sequential("non-empty multi-line SR frame appends no trailing newline and erases exactly N lines", async () => {
|
|
const labels = shallowRef<[string, string]>(["Line one", "Line two"]);
|
|
const App = defineComponent(() => {
|
|
return () => (
|
|
<Box flexDirection="column">
|
|
<Text>{labels.value[0]}</Text>
|
|
<Text>{labels.value[1]}</Text>
|
|
</Box>
|
|
);
|
|
});
|
|
|
|
const app = createApp(App);
|
|
const stdout = makeFakeWritable({ columns: 80 });
|
|
const stderr = makeFakeWritable({ columns: 80 });
|
|
const { stream: stdin } = makeFakeStdin();
|
|
const writes = captureWrites(stdout);
|
|
|
|
app.mount({
|
|
stdout,
|
|
stdin,
|
|
stderr,
|
|
exitOnCtrlC: false,
|
|
isScreenReaderEnabled: true,
|
|
});
|
|
|
|
await nextTick();
|
|
await nextTick();
|
|
|
|
const firstContent = getContentWrites(writes).join("");
|
|
|
|
// (a) The first SR frame must end exactly at the last content line — no
|
|
// spurious trailing newline below "Line two".
|
|
expect(firstContent).toContain("Line one\nLine two");
|
|
expect(firstContent.endsWith("Line two")).toBe(true);
|
|
expect(firstContent.endsWith("Line two\n")).toBe(false);
|
|
|
|
// Reactive update to a second multi-line frame.
|
|
writes.length = 0;
|
|
labels.value = ["Line three", "Line four"];
|
|
await nextTick();
|
|
await nextTick();
|
|
|
|
const secondRaw = writes.join("");
|
|
|
|
// (b) The erase for the previous 2-line frame must be exactly eraseLines(2),
|
|
// NOT eraseLines(3) (the off-by-one caused by the spurious trailing newline).
|
|
expect(secondRaw).toContain(ansiEscapes.eraseLines(2));
|
|
expect(secondRaw).not.toContain(ansiEscapes.eraseLines(3));
|
|
|
|
// And the second frame is itself written verbatim with no trailing newline.
|
|
const secondContent = getContentWrites(writes).join("");
|
|
expect(secondContent.endsWith("Line four")).toBe(true);
|
|
expect(secondContent.endsWith("Line four\n")).toBe(false);
|
|
|
|
app.unmount();
|
|
});
|