85a5b12f45
* chore(parity): record sweep-4 (G32-G38) + G32 pr-open Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * fix(runtime): recurse into nested <Transform> in <Text> squash (Ink parity, G32) paint.ts renderTextWithInlineStyles and text-measure.ts flattenLeaves now factor their per-child text squashing into a recursive squashTransformChild helper that recurses GENERICALLY into transform-typed children to any nesting depth, applying each transform with its positional sibling index and the innerText.length > 0 guard — matching Ink squashTextNodes generic recursion (squash-text-nodes.ts:22-39). Previously a <Transform> nested directly inside another <Transform> (inside a <Text>) was dropped: its grandchild loop only handled text-leaf/virtual-text/text, so a transform grandchild contributed nothing — silent total content loss in paint and 0-width measurement (broken layout). Paint and measure stay behaviourally identical so layout and output agree. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
227 lines
7.4 KiB
TypeScript
227 lines
7.4 KiB
TypeScript
import { defineComponent } from "vue";
|
|
import { expect, test } from "vite-plus/test";
|
|
import { render } from "@vue-tui/testing";
|
|
import { Box, Text, Transform } from "@vue-tui/runtime";
|
|
|
|
test("Transform uppercases descendant text", async () => {
|
|
const { lastFrame } = await render(() => (
|
|
<Transform transform={(line: string) => line.toUpperCase()}>
|
|
<Text>abc</Text>
|
|
</Transform>
|
|
));
|
|
expect(lastFrame()).toContain("ABC");
|
|
});
|
|
|
|
// --- Ink transform tests ---
|
|
|
|
test("transform children — <Transform> inside <Text>", async () => {
|
|
const { lastFrame } = await render(
|
|
defineComponent(() => () => (
|
|
<Transform transform={(s: string, idx: number) => `[${idx}: ${s}]`}>
|
|
<Text>
|
|
<Transform transform={(s: string, idx: number) => `{${idx}: ${s}}`}>
|
|
<Text>test</Text>
|
|
</Transform>
|
|
</Text>
|
|
</Transform>
|
|
)),
|
|
{ columns: 100 },
|
|
);
|
|
expect(lastFrame()).toBe("[0: {0: test}]");
|
|
});
|
|
|
|
test("squash multiple text nodes — <Transform> inside <Text>", async () => {
|
|
const { lastFrame } = await render(
|
|
defineComponent(() => () => (
|
|
<Transform transform={(s: string, idx: number) => `[${idx}: ${s}]`}>
|
|
<Text>
|
|
<Transform transform={(s: string, idx: number) => `{${idx}: ${s}}`}>
|
|
<Text>hello world</Text>
|
|
</Transform>
|
|
</Text>
|
|
</Transform>
|
|
)),
|
|
{ columns: 100 },
|
|
);
|
|
expect(lastFrame()).toBe("[0: {0: hello world}]");
|
|
});
|
|
|
|
// G21: a nested <Transform> receives its POSITIONAL sibling index among the
|
|
// parent <Text>'s children, matching Ink squash-text-nodes.ts:13,38 (the index
|
|
// is the plain loop counter over ALL childNodes, including text-leaf siblings).
|
|
test("nested <Transform> as 2nd child of <Text> gets index 1", async () => {
|
|
const { lastFrame } = await render(
|
|
defineComponent(() => () => (
|
|
<Text>
|
|
a<Transform transform={(s: string, i: number) => `${s}[${i}]`}>b</Transform>
|
|
</Text>
|
|
)),
|
|
{ columns: 100 },
|
|
);
|
|
expect(lastFrame()).toBe("ab[1]");
|
|
});
|
|
|
|
test("nested <Transform> as 3rd child of <Text> gets index 2", async () => {
|
|
const { lastFrame } = await render(
|
|
defineComponent(() => () => (
|
|
<Text>
|
|
a<Text>b</Text>
|
|
<Transform transform={(s: string, i: number) => `${s}[${i}]`}>c</Transform>
|
|
</Text>
|
|
)),
|
|
{ columns: 100 },
|
|
);
|
|
expect(lastFrame()).toBe("abc[2]");
|
|
});
|
|
|
|
test("sole/first-child nested <Transform> still gets index 0", async () => {
|
|
const { lastFrame } = await render(
|
|
defineComponent(() => () => (
|
|
<Text>
|
|
<Transform transform={(s: string, i: number) => `${s}[${i}]`}>a</Transform>b
|
|
</Text>
|
|
)),
|
|
{ columns: 100 },
|
|
);
|
|
expect(lastFrame()).toBe("a[0]b");
|
|
});
|
|
|
|
// Resolved: Transform nodes are now yoga carriers, so multi-line text
|
|
// under a Transform node is properly laid out. See transform-yoga.test.tsx.
|
|
|
|
test("squash multiple nested text nodes — <Transform> inside <Text>", async () => {
|
|
const { lastFrame } = await render(
|
|
defineComponent(() => () => (
|
|
<Transform transform={(s: string, idx: number) => `[${idx}: ${s}]`}>
|
|
<Text>
|
|
<Transform transform={(s: string, idx: number) => `{${idx}: ${s}}`}>
|
|
hello
|
|
<Text> world</Text>
|
|
</Transform>
|
|
</Text>
|
|
</Transform>
|
|
)),
|
|
{ columns: 100 },
|
|
);
|
|
expect(lastFrame()).toBe("[0: {0: hello world}]");
|
|
});
|
|
|
|
test("squash empty <Text> nodes — <Transform> inside <Text>", async () => {
|
|
const { lastFrame } = await render(
|
|
defineComponent(() => () => (
|
|
<Transform transform={(s: string) => `[${s}]`}>
|
|
<Text>
|
|
<Transform transform={(s: string) => `{${s}}`}>
|
|
<Text>{[]}</Text>
|
|
</Transform>
|
|
</Text>
|
|
</Transform>
|
|
)),
|
|
{ columns: 100 },
|
|
);
|
|
expect(lastFrame()).toBe("");
|
|
});
|
|
|
|
test("<Transform> with undefined children", async () => {
|
|
const { lastFrame } = await render(
|
|
defineComponent(() => () => <Transform transform={(s: string) => s} />),
|
|
{ columns: 100 },
|
|
);
|
|
expect(lastFrame()).toBe("");
|
|
});
|
|
|
|
test("<Transform> with null children", async () => {
|
|
const { lastFrame } = await render(
|
|
defineComponent(() => () => <Transform transform={(s: string) => s} />),
|
|
{ columns: 100 },
|
|
);
|
|
expect(lastFrame()).toBe("");
|
|
});
|
|
|
|
test("nested transforms apply inner-first: outer wraps inner result", async () => {
|
|
const outer = (s: string) => `(${s})`;
|
|
const inner = (s: string) => `{${s}}`;
|
|
|
|
const App = defineComponent(() => () => (
|
|
<Transform transform={outer}>
|
|
<Transform transform={inner}>
|
|
<Text>x</Text>
|
|
</Transform>
|
|
</Transform>
|
|
));
|
|
const { lastFrame } = await render(App, { columns: 100 });
|
|
// With prepend [node.transform, ...transformers]:
|
|
// Inner: transformers = [inner, outer]
|
|
// Apply left-to-right: inner("x") = "{x}", then outer("{x}") = "({x})"
|
|
expect(lastFrame()).toBe("({x})");
|
|
});
|
|
|
|
// G32: a <Transform> nested DIRECTLY inside another <Transform> (both inside a
|
|
// <Text>) must be recursed into during squash so BOTH transforms run. Ink's
|
|
// squash-text-nodes.ts:22-39 recurses generically into any ink-text/ink-virtual-text
|
|
// child (a <Transform> renders an ink-text with internal_transform) — inner applied
|
|
// first, then outer. Previously vue-tui dropped the inner transform's content
|
|
// entirely (silent total content loss + 0-width measurement).
|
|
test("nested <Transform> directly inside <Transform> in <Text> — both apply", async () => {
|
|
const { lastFrame } = await render(
|
|
defineComponent(() => () => (
|
|
<Text>
|
|
<Transform transform={(s: string) => `[O${s}O]`}>
|
|
<Transform transform={(s: string) => `<I${s}I>`}>x</Transform>
|
|
</Transform>
|
|
</Text>
|
|
)),
|
|
{ columns: 100 },
|
|
);
|
|
expect(lastFrame()).toBe("[O<IxI>O]");
|
|
});
|
|
|
|
test("triple-nested <Transform> in <Text> — all three apply to any depth", async () => {
|
|
const { lastFrame } = await render(
|
|
defineComponent(() => () => (
|
|
<Text>
|
|
<Transform transform={(s: string) => `A${s}A`}>
|
|
<Transform transform={(s: string) => `B${s}B`}>
|
|
<Transform transform={(s: string) => `C${s}C`}>x</Transform>
|
|
</Transform>
|
|
</Transform>
|
|
</Text>
|
|
)),
|
|
{ columns: 100 },
|
|
);
|
|
expect(lastFrame()).toBe("ABCxCBA");
|
|
});
|
|
|
|
test("nested <Transform>-in-<Transform> reserves correct width (measurement)", async () => {
|
|
// The whole box must be wide enough to hold "[O<IxI>O]" (9 cols) — if the inner
|
|
// transform were dropped at measure time the box would reserve width 0/3 and the
|
|
// sibling marker would overlap. Place a sibling after the text and assert it lands
|
|
// at the expected column, proving measurement counted the full transformed width.
|
|
const { lastFrame } = await render(
|
|
defineComponent(() => () => (
|
|
<Box flexDirection="row">
|
|
<Text>
|
|
<Transform transform={(s: string) => `[O${s}O]`}>
|
|
<Transform transform={(s: string) => `<I${s}I>`}>x</Transform>
|
|
</Transform>
|
|
</Text>
|
|
<Text>|</Text>
|
|
</Box>
|
|
)),
|
|
{ columns: 100 },
|
|
);
|
|
expect(lastFrame()).toBe("[O<IxI>O]|");
|
|
});
|
|
|
|
test("transform with multiple lines", async () => {
|
|
const { lastFrame } = await render(
|
|
defineComponent(() => () => (
|
|
<Transform transform={(s: string, idx: number) => `[${idx}: ${s}]`}>
|
|
<Text>{"hello world\ngoodbye world"}</Text>
|
|
</Transform>
|
|
)),
|
|
{ columns: 100 },
|
|
);
|
|
expect(lastFrame()).toBe("[0: hello world]\n[1: goodbye world]");
|
|
});
|