@jrichman/ink 6.5.1-beta.2 → 6.5.1-beta.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (98) hide show
  1. package/build/colorize.d.ts +2 -0
  2. package/build/colorize.js +24 -0
  3. package/build/colorize.js.map +1 -1
  4. package/build/components/Static.js +2 -1
  5. package/build/components/Static.js.map +1 -1
  6. package/build/components/Text.js +8 -8
  7. package/build/components/Text.js.map +1 -1
  8. package/build/debug-log.js +3 -2
  9. package/build/debug-log.js.map +1 -1
  10. package/build/dom.js +3 -5
  11. package/build/dom.js.map +1 -1
  12. package/build/index.d.ts +2 -2
  13. package/build/index.js +2 -2
  14. package/build/index.js.map +1 -1
  15. package/build/ink.d.ts +2 -2
  16. package/build/ink.js +3 -0
  17. package/build/ink.js.map +1 -1
  18. package/build/measure-element.js +3 -3
  19. package/build/measure-element.js.map +1 -1
  20. package/build/measure-text.d.ts +14 -1
  21. package/build/measure-text.js +46 -38
  22. package/build/measure-text.js.map +1 -1
  23. package/build/output.d.ts +6 -0
  24. package/build/output.js +26 -18
  25. package/build/output.js.map +1 -1
  26. package/build/render-background.js +16 -4
  27. package/build/render-background.js.map +1 -1
  28. package/build/render-cached.d.ts +2 -2
  29. package/build/render-cached.js +7 -6
  30. package/build/render-cached.js.map +1 -1
  31. package/build/render-container.d.ts +2 -2
  32. package/build/render-node-to-output.d.ts +3 -3
  33. package/build/render-node-to-output.js +2 -0
  34. package/build/render-node-to-output.js.map +1 -1
  35. package/build/render-scrollbar.d.ts +1 -2
  36. package/build/render-scrollbar.js +14 -28
  37. package/build/render-scrollbar.js.map +1 -1
  38. package/build/render-sticky.d.ts +3 -3
  39. package/build/render-text-node.d.ts +2 -2
  40. package/build/render-text-node.js +47 -43
  41. package/build/render-text-node.js.map +1 -1
  42. package/build/render.d.ts +2 -2
  43. package/build/renderer.d.ts +2 -2
  44. package/build/renderer.js +2 -1
  45. package/build/renderer.js.map +1 -1
  46. package/build/replay.js +4 -4
  47. package/build/replay.js.map +1 -1
  48. package/build/selection.d.ts +2 -3
  49. package/build/selection.js +35 -57
  50. package/build/selection.js.map +1 -1
  51. package/build/serialization.js +2 -0
  52. package/build/serialization.js.map +1 -1
  53. package/build/styled-line.d.ts +18 -33
  54. package/build/styled-line.js +373 -156
  55. package/build/styled-line.js.map +1 -1
  56. package/build/text-wrap.d.ts +5 -0
  57. package/build/text-wrap.js +78 -79
  58. package/build/text-wrap.js.map +1 -1
  59. package/build/tokenize.d.ts +1 -1
  60. package/build/tokenize.js +2 -2
  61. package/build/tokenize.js.map +1 -1
  62. package/build/worker/canvas.d.ts +13 -1
  63. package/build/worker/canvas.js +16 -5
  64. package/build/worker/canvas.js.map +1 -1
  65. package/build/worker/compositor.js +9 -23
  66. package/build/worker/compositor.js.map +1 -1
  67. package/build/worker/render-worker.js +2 -2
  68. package/build/worker/render-worker.js.map +1 -1
  69. package/build/worker/terminal-writer.js +1 -1
  70. package/build/worker/terminal-writer.js.map +1 -1
  71. package/package.json +2 -2
  72. package/build/render-worker.d.ts +0 -25
  73. package/build/render-worker.js +0 -370
  74. package/build/render-worker.js.map +0 -1
  75. package/build/styled-lines.d.ts +0 -29
  76. package/build/styled-lines.js +0 -110
  77. package/build/styled-lines.js.map +0 -1
  78. package/build/terminal-writer.d.ts +0 -69
  79. package/build/terminal-writer.js +0 -546
  80. package/build/terminal-writer.js.map +0 -1
  81. package/build/web/ansi-to-css.d.ts +0 -16
  82. package/build/web/ansi-to-css.js +0 -147
  83. package/build/web/ansi-to-css.js.map +0 -1
  84. package/build/web/client.d.ts +0 -51
  85. package/build/web/client.js +0 -315
  86. package/build/web/client.js.map +0 -1
  87. package/build/web/server.d.ts +0 -1
  88. package/build/web/server.js +0 -179
  89. package/build/web/server.js.map +0 -1
  90. package/build/worker/dump-replay.d.ts +0 -1
  91. package/build/worker/dump-replay.js +0 -15
  92. package/build/worker/dump-replay.js.map +0 -1
  93. package/build/worker/replay.d.ts +0 -55
  94. package/build/worker/replay.js +0 -133
  95. package/build/worker/replay.js.map +0 -1
  96. package/build/wrap-text.d.ts +0 -6
  97. package/build/wrap-text.js +0 -120
  98. package/build/wrap-text.js.map +0 -1
@@ -1,5 +1,4 @@
1
1
  import { type ScrollbarBoundingBox } from './measure-element.js';
2
- import { StyledLine } from './styled-line.js';
3
2
  export type ScrollbarThumb = {
4
3
  startIndex: number;
5
4
  endIndex: number;
@@ -16,7 +15,7 @@ export type DrawOptions = {
16
15
  };
17
16
  axis: 'vertical' | 'horizontal';
18
17
  color?: string;
19
- setChar: (x: number, y: number, char: StyledLine) => void;
18
+ setChar: (x: number, y: number, value: string, formatFlags: number, fgColor?: string, bgColor?: string, link?: string) => void;
20
19
  getExistingChar?: (x: number, y: number) => {
21
20
  bgColor?: string;
22
21
  } | undefined;
@@ -1,19 +1,7 @@
1
- import colorize from './colorize.js';
2
- import { toStyledCharacters } from './measure-text.js';
3
- import { StyledLine } from './styled-line.js';
1
+ import { getForegroundColorEscape } from './colorize.js';
4
2
  export const renderScrollbar = ({ layout, clip, axis, color, setChar, getExistingChar, }) => {
5
3
  const { x, y, thumb: { start: startIndex, end: endIndex, startHalf: thumbStartHalf, endHalf: thumbEndHalf, }, } = layout;
6
- const applyBackground = (char, existingChar) => {
7
- if (!existingChar)
8
- return char;
9
- const backgroundStyle = existingChar.bgColor;
10
- if (backgroundStyle) {
11
- const newChar = new StyledLine();
12
- newChar.pushChar(char.getValue(0), char.getFormatFlags(0), char.getFgColor(0), backgroundStyle, char.getLink(0));
13
- return newChar;
14
- }
15
- return char;
16
- };
4
+ const fgColor = color ? getForegroundColorEscape(color) : undefined;
17
5
  if (axis === 'vertical') {
18
6
  for (let i = startIndex; i < endIndex; i++) {
19
7
  const drawY = y + i;
@@ -31,15 +19,14 @@ export const renderScrollbar = ({ layout, clip, axis, color, setChar, getExistin
31
19
  else if (!hasUpper && hasLower) {
32
20
  char = '▄';
33
21
  }
34
- const charString = color ? colorize(char, color, 'foreground') : char;
35
- let styled = toStyledCharacters(charString);
36
- if (styled.length > 0) {
37
- if (getExistingChar && (char === '▀' || char === '▄')) {
38
- const existing = getExistingChar(drawX, drawY);
39
- styled = applyBackground(styled, existing);
22
+ let bgColor;
23
+ if (getExistingChar && (char === '▀' || char === '▄')) {
24
+ const existing = getExistingChar(drawX, drawY);
25
+ if (existing?.bgColor) {
26
+ bgColor = existing.bgColor;
40
27
  }
41
- setChar(drawX, drawY, styled);
42
28
  }
29
+ setChar(drawX, drawY, char, 0, fgColor, bgColor, undefined);
43
30
  }
44
31
  }
45
32
  }
@@ -60,15 +47,14 @@ export const renderScrollbar = ({ layout, clip, axis, color, setChar, getExistin
60
47
  else if (!hasLeft && hasRight) {
61
48
  char = '▐';
62
49
  }
63
- const charString = color ? colorize(char, color, 'foreground') : char;
64
- let styled = toStyledCharacters(charString);
65
- if (styled.length > 0) {
66
- if (getExistingChar && (char === '▌' || char === '▐')) {
67
- const existing = getExistingChar(drawX, drawY);
68
- styled = applyBackground(styled, existing);
50
+ let bgColor;
51
+ if (getExistingChar && (char === '▌' || char === '▐')) {
52
+ const existing = getExistingChar(drawX, drawY);
53
+ if (existing?.bgColor) {
54
+ bgColor = existing.bgColor;
69
55
  }
70
- setChar(drawX, drawY, styled);
71
56
  }
57
+ setChar(drawX, drawY, char, 0, fgColor, bgColor, undefined);
72
58
  }
73
59
  }
74
60
  }
@@ -1 +1 @@
1
- {"version":3,"file":"render-scrollbar.js","sourceRoot":"","sources":["../src/render-scrollbar.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render-scrollbar.js","sourceRoot":"","sources":["../src/render-scrollbar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,wBAAwB,EAAC,MAAM,eAAe,CAAC;AAgCvD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAC/B,MAAM,EACN,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,OAAO,EACP,eAAe,GACF,EAAE,EAAE;IACjB,MAAM,EACL,CAAC,EACD,CAAC,EACD,KAAK,EAAE,EACN,KAAK,EAAE,UAAU,EACjB,GAAG,EAAE,QAAQ,EACb,SAAS,EAAE,cAAc,EACzB,OAAO,EAAE,YAAY,GACrB,GACD,GAAG,MAAM,CAAC;IAEX,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEpE,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACzB,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5C,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC;YACpB,MAAM,KAAK,GAAG,CAAC,CAAC;YAEhB,IACC,KAAK,IAAI,IAAI,CAAC,CAAC;gBACf,KAAK,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;gBACvB,KAAK,IAAI,IAAI,CAAC,CAAC;gBACf,KAAK,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EACtB,CAAC;gBACF,IAAI,IAAI,GAAG,GAAG,CAAC;gBACf,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,IAAI,cAAc,IAAI,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;gBACjE,MAAM,QAAQ,GACb,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,cAAc,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;gBAEzD,IAAI,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAC3B,IAAI,GAAG,GAAG,CAAC;gBACZ,CAAC;qBAAM,IAAI,CAAC,QAAQ,IAAI,QAAQ,EAAE,CAAC;oBAClC,IAAI,GAAG,GAAG,CAAC;gBACZ,CAAC;gBAED,IAAI,OAA2B,CAAC;gBAChC,IAAI,eAAe,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;oBACvD,MAAM,QAAQ,GAAG,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;oBAC/C,IAAI,QAAQ,EAAE,OAAO,EAAE,CAAC;wBACvB,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;oBAC5B,CAAC;gBACF,CAAC;gBAED,OAAO,CACN,KAAK,EACL,KAAK,EACL,IAAI,EACJ,CAAC,EACD,OAAO,EACP,OAAO,EACP,SAAS,CACT,CAAC;YACH,CAAC;QACF,CAAC;IACF,CAAC;SAAM,CAAC;QACP,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5C,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC;YACpB,MAAM,KAAK,GAAG,CAAC,CAAC;YAEhB,IACC,KAAK,IAAI,IAAI,CAAC,CAAC;gBACf,KAAK,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;gBACvB,KAAK,IAAI,IAAI,CAAC,CAAC;gBACf,KAAK,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EACtB,CAAC;gBACF,IAAI,IAAI,GAAG,GAAG,CAAC;gBACf,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,cAAc,IAAI,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;gBAChE,MAAM,QAAQ,GACb,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,cAAc,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;gBAEzD,IAAI,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAC1B,IAAI,GAAG,GAAG,CAAC;gBACZ,CAAC;qBAAM,IAAI,CAAC,OAAO,IAAI,QAAQ,EAAE,CAAC;oBACjC,IAAI,GAAG,GAAG,CAAC;gBACZ,CAAC;gBAED,IAAI,OAA2B,CAAC;gBAChC,IAAI,eAAe,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;oBACvD,MAAM,QAAQ,GAAG,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;oBAC/C,IAAI,QAAQ,EAAE,OAAO,EAAE,CAAC;wBACvB,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;oBAC5B,CAAC;gBACF,CAAC;gBAED,OAAO,CACN,KAAK,EACL,KAAK,EACL,IAAI,EACJ,CAAC,EACD,OAAO,EACP,OAAO,EACP,SAAS,CACT,CAAC;YACH,CAAC;QACF,CAAC;IACF,CAAC;AACF,CAAC,CAAC"}
@@ -1,4 +1,4 @@
1
- import { type StyledLine, type StyledChar } from './styled-line.js';
1
+ import { type StyledLine } from './styled-line.js';
2
2
  import { type DOMElement, type DOMNode, type StickyHeader } from './dom.js';
3
3
  import Output from './output.js';
4
4
  import { type OutputTransformer } from './render-node-to-output.js';
@@ -16,7 +16,7 @@ export declare function renderStickyNode(stickyNode: DOMElement, options: {
16
16
  start: number;
17
17
  end: number;
18
18
  }>;
19
- selectionStyle?: (char: StyledChar) => StyledChar;
19
+ selectionStyle?: (line: StyledLine, index: number) => void;
20
20
  trackSelection?: boolean;
21
21
  }): {
22
22
  naturalLines: readonly StyledLine[];
@@ -48,6 +48,6 @@ export declare function renderActiveStickyNodes(activeStickyNodes: Array<{
48
48
  start: number;
49
49
  end: number;
50
50
  }>;
51
- selectionStyle?: (char: StyledChar) => StyledChar;
51
+ selectionStyle?: (line: StyledLine, index: number) => void;
52
52
  trackSelection?: boolean;
53
53
  }): void;
@@ -1,7 +1,7 @@
1
1
  import { type DOMElement, type DOMNode } from './dom.js';
2
2
  import type Output from './output.js';
3
3
  import type { OutputTransformer } from './render-node-to-output.js';
4
- import { StyledLine, type StyledChar } from './styled-line.js';
4
+ import { StyledLine } from './styled-line.js';
5
5
  export declare const applyPaddingToStyledChars: (node: DOMElement, lines: StyledLine[]) => StyledLine[];
6
6
  export declare const calculateWrappedCursorPosition: (lines: StyledLine[], _styledChars: StyledLine, targetOffset: number) => {
7
7
  cursorLineIndex: number;
@@ -15,6 +15,6 @@ export declare function handleTextNode(node: DOMElement, output: Output, options
15
15
  start: number;
16
16
  end: number;
17
17
  }>;
18
- selectionStyle?: (char: StyledChar) => StyledChar;
18
+ selectionStyle?: (line: StyledLine, index: number) => void;
19
19
  trackSelection?: boolean;
20
20
  }): void;
@@ -10,63 +10,64 @@ export const applyPaddingToStyledChars = (node, lines) => {
10
10
  if (yogaNode) {
11
11
  const offsetX = yogaNode.getComputedLeft();
12
12
  const offsetY = yogaNode.getComputedTop();
13
- const paddedLines = [];
14
- for (const line of lines) {
15
- const newLine = new StyledLine();
16
- for (let i = 0; i < offsetX; i++) {
17
- newLine.pushChar(' ', 0);
13
+ if (offsetX > 0 || offsetY > 0) {
14
+ const paddedLines = [];
15
+ const paddingLeft = offsetX > 0 ? StyledLine.empty(offsetX) : undefined;
16
+ for (const line of lines) {
17
+ paddedLines.push(paddingLeft ? paddingLeft.combine(line) : line);
18
+ }
19
+ lines = paddedLines;
20
+ for (let i = 0; i < offsetY; i++) {
21
+ lines.unshift(new StyledLine());
18
22
  }
19
- paddedLines.push(new StyledLine([...newLine.getValues(), ...line.getValues()], [...newLine.getSpans(), ...line.getSpans().map(s => ({ ...s }))]));
20
23
  }
21
- lines = paddedLines;
22
- const paddingTop = Array.from({ length: offsetY }).map(() => new StyledLine());
23
- lines.unshift(...paddingTop);
24
24
  }
25
25
  return lines;
26
26
  };
27
27
  export const calculateWrappedCursorPosition = (lines, _styledChars, targetOffset) => {
28
- // We no longer have an object reference to Map over. We need to track by indices.
29
- // We'll calculate the offsets based on the line contents since lines are split/wrapped versions of styledChars.
30
28
  let cursorLineIndex = lines.length - 1;
31
29
  let relativeCursorPosition = targetOffset;
32
- let previousLineEndOffset = -1;
33
- // In the original code, styledCharToOffset map was used to find the offset of a character.
34
- // Since StyledLine wraps text continuously, we can just use cumulative length.
35
- let cumulativeLineLength = 0;
30
+ let sourceIndex = 0;
36
31
  for (const [i, line] of lines.entries()) {
37
- if (line.length > 0) {
38
- const lineStartOffset = cumulativeLineLength;
39
- let lineEndOffset = cumulativeLineLength;
40
- // We only count characters that correspond to the original string.
41
- // But wait, line.length is the character count.
42
- // However, padding might have been applied! The original code did `styledCharToOffset.has(char)`.
43
- // Since padding is added to the left, we can just count non-padding length if we know it.
44
- // For now, let's assume `calculateWrappedCursorPosition` is called BEFORE padding.
45
- // Yes, `applyPaddingToStyledChars` is called *after* calculating lines, but wait, the original code did it before `calculateWrappedCursorPosition`.
46
- // Let's adjust cumulative based on the text.
47
- for (let j = 0; j < line.length; j++) {
48
- lineEndOffset += line.getValue(j).length;
49
- }
50
- if (targetOffset >= lineStartOffset) {
32
+ // If the line is empty (e.g., from consecutive newlines), it consumes a newline
33
+ if (line.length === 0) {
34
+ if (targetOffset === sourceIndex) {
51
35
  cursorLineIndex = i;
52
- relativeCursorPosition = Math.max(0, targetOffset - lineStartOffset);
53
- }
54
- if (targetOffset <= lineEndOffset) {
36
+ relativeCursorPosition = 0;
55
37
  break;
56
38
  }
57
- previousLineEndOffset = lineEndOffset;
58
- cumulativeLineLength = lineEndOffset;
39
+ sourceIndex++; // Consume the newline
40
+ continue;
41
+ }
42
+ // Advance sourceIndex over dropped characters (like \n or space)
43
+ while (sourceIndex < _styledChars.length &&
44
+ _styledChars.getValue(sourceIndex) !== line.getValue(0)) {
45
+ if (targetOffset === sourceIndex) {
46
+ // Target is on a dropped character BEFORE this line
47
+ // We return the END of the previous line (or start of this line if i=0)
48
+ if (i > 0) {
49
+ cursorLineIndex = i - 1;
50
+ relativeCursorPosition = lines[i - 1].length;
51
+ }
52
+ else {
53
+ cursorLineIndex = 0;
54
+ relativeCursorPosition = 0;
55
+ }
56
+ return { cursorLineIndex, relativeCursorPosition };
57
+ }
58
+ sourceIndex++;
59
59
  }
60
- else if (i === 0 && targetOffset === 0) {
61
- cursorLineIndex = 0;
62
- relativeCursorPosition = 0;
60
+ const lineStartOffset = sourceIndex;
61
+ sourceIndex += line.length; // Advance past the line content
62
+ const lineEndOffset = sourceIndex;
63
+ if (targetOffset >= lineStartOffset && targetOffset <= lineEndOffset) {
64
+ cursorLineIndex = i;
65
+ relativeCursorPosition = targetOffset - lineStartOffset;
63
66
  break;
64
67
  }
65
- else if (i > 0 && targetOffset > previousLineEndOffset) {
68
+ else if (targetOffset > lineEndOffset && i === lines.length - 1) {
66
69
  cursorLineIndex = i;
67
- relativeCursorPosition = targetOffset - previousLineEndOffset - 1;
68
- previousLineEndOffset++;
69
- cumulativeLineLength++;
70
+ relativeCursorPosition = line.length;
70
71
  }
71
72
  }
72
73
  return { cursorLineIndex, relativeCursorPosition };
@@ -127,11 +128,14 @@ export function handleTextNode(node, output, options) {
127
128
  }
128
129
  }
129
130
  else {
130
- lines = [new StyledLine()];
131
131
  const yogaNode = node.childNodes[0]?.yogaNode;
132
132
  const offsetX = yogaNode?.getComputedLeft() ?? 0;
133
133
  const offsetY = yogaNode?.getComputedTop() ?? 0;
134
- lines = applyPaddingToStyledChars(node, lines);
134
+ const line = StyledLine.empty(offsetX);
135
+ lines = [line];
136
+ for (let i = 0; i < offsetY; i++) {
137
+ lines.unshift(new StyledLine());
138
+ }
135
139
  if (node.internal_terminalCursorFocus) {
136
140
  cursorLineIndex = offsetY;
137
141
  relativeCursorPosition = offsetX;
@@ -1 +1 @@
1
- {"version":3,"file":"render-text-node.js","sourceRoot":"","sources":["../src/render-text-node.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render-text-node.js","sourceRoot":"","sources":["../src/render-text-node.ts"],"names":[],"mappings":"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"}
package/build/render.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type { ReactNode } from 'react';
2
- import { type StyledChar } from './styled-line.js';
2
+ import { type StyledLine } from './styled-line.js';
3
3
  import Ink, { type RenderMetrics } from './ink.js';
4
4
  import { type Selection } from './selection.js';
5
5
  import { type DOMElement } from './dom.js';
@@ -88,7 +88,7 @@ export type RenderOptions = {
88
88
  /**
89
89
  * Function to transform selected text characters.
90
90
  */
91
- selectionStyle?: (char: StyledChar) => StyledChar;
91
+ selectionStyle?: (line: StyledLine, index: number) => void;
92
92
  standardReactLayoutTiming?: boolean;
93
93
  /**
94
94
  * Use a separate process-based rendering mode so that render updates are
@@ -1,4 +1,4 @@
1
- import { type StyledLine, type StyledChar } from './styled-line.js';
1
+ import { type StyledLine } from './styled-line.js';
2
2
  import { type Region } from './output.js';
3
3
  import { type DOMElement, type StickyHeader } from './dom.js';
4
4
  import { type Selection } from './selection.js';
@@ -17,7 +17,7 @@ type Result = {
17
17
  declare const renderer: (node: DOMElement, options: {
18
18
  isScreenReaderEnabled: boolean;
19
19
  selection?: Selection;
20
- selectionStyle?: (char: StyledChar) => StyledChar;
20
+ selectionStyle?: (line: StyledLine, index: number) => void;
21
21
  skipScrollbars?: boolean;
22
22
  trackSelection?: boolean;
23
23
  }) => Result;
package/build/renderer.js CHANGED
@@ -1,3 +1,4 @@
1
+ import { styledLineToString } from './tokenize.js';
1
2
  import renderNodeToOutput from './render-node-to-output.js';
2
3
  import { renderNodeToScreenReaderOutput } from './render-screen-reader.js';
3
4
  import Output, { flattenRegion, clampCursorColumn, } from './output.js';
@@ -277,7 +278,7 @@ function regionToOutput(region, options) {
277
278
  // Flatten the root region for legacy string output
278
279
  const generatedOutput = lines
279
280
  .map(line => {
280
- return line.trimEnd().getValues().join('');
281
+ return styledLineToString(line.trimEnd());
281
282
  })
282
283
  .join('\n');
283
284
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"renderer.js","sourceRoot":"","sources":["../src/renderer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"renderer.js","sourceRoot":"","sources":["../src/renderer.ts"],"names":[],"mappings":"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"}
package/build/replay.js CHANGED
@@ -97,7 +97,7 @@ export function createHumanReadableDump(data) {
97
97
  return {
98
98
  start: u.start,
99
99
  end: u.end,
100
- text: lines.map(line => line.getValues().join('').trimEnd()),
100
+ text: lines.map(line => line.getText().trimEnd()),
101
101
  };
102
102
  }),
103
103
  };
@@ -107,15 +107,15 @@ export function createHumanReadableDump(data) {
107
107
  ...h,
108
108
  lines: new Deserializer(Buffer.from(h.lines))
109
109
  .deserialize()
110
- .map(line => line.getValues().join('').trimEnd()),
110
+ .map(line => line.getText().trimEnd()),
111
111
  stuckLines: h.stuckLines
112
112
  ? new Deserializer(Buffer.from(h.stuckLines))
113
113
  .deserialize()
114
- .map(line => line.getValues().join('').trimEnd())
114
+ .map(line => line.getText().trimEnd())
115
115
  : undefined,
116
116
  styledOutput: new Deserializer(Buffer.from(h.styledOutput))
117
117
  .deserialize()
118
- .map(line => line.getValues().join('').trimEnd()),
118
+ .map(line => line.getText().trimEnd()),
119
119
  node: undefined,
120
120
  }));
121
121
  }
@@ -1 +1 @@
1
- {"version":3,"file":"replay.js","sourceRoot":"","sources":["../src/replay.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"replay.js","sourceRoot":"","sources":["../src/replay.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,7 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { StyledChar, StyledLine } from './styled-line.js';
6
+ import { StyledLine } from './styled-line.js';
7
7
  import { type DOMNode } from './dom.js';
8
8
  export declare const comparePoints: (nodeA: DOMNode, offsetA: number, nodeB: DOMNode, offsetB: number) => number;
9
9
  export declare class Range {
@@ -43,11 +43,10 @@ export declare class Selection {
43
43
  private clearState;
44
44
  private notifyChange;
45
45
  }
46
- export declare const applySelectionStyle: (char: StyledChar, selectionStyle?: (char: StyledChar) => StyledChar) => StyledChar;
47
46
  export declare const applySelectionToStyledChars: (styledChars: StyledLine, selectionState: {
48
47
  range: {
49
48
  start: number;
50
49
  end: number;
51
50
  };
52
51
  currentOffset: number;
53
- }, selectionStyle?: (char: StyledChar) => StyledChar) => StyledLine;
52
+ }, selectionStyle?: (line: StyledLine, index: number) => void) => StyledLine;
@@ -3,63 +3,47 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { StyledChar, StyledLine } from './styled-line.js';
6
+ import { StyledLine } from './styled-line.js';
7
7
  import { getPathToRoot } from './dom.js';
8
8
  import { toStyledCharacters } from './measure-text.js';
9
9
  import { processLayout } from './layout.js';
10
10
  import { squashTextNodesWithMap } from './squash-text-nodes.js';
11
11
  const getPlainTextFromDomNode = (node) => {
12
- const result = {
13
- styledChars: new StyledLine(),
14
- charOffsetMap: new Map(),
15
- };
16
- if (node.nodeName === '#text') {
17
- const styledChars = toStyledCharacters(node.nodeValue);
18
- result.styledChars = new StyledLine([...result.styledChars.getValues(), ...styledChars.getValues()], [
19
- ...result.styledChars.getSpans(),
20
- ...styledChars.getSpans().map(s => ({ ...s })),
21
- ]);
22
- result.charOffsetMap.set(node, {
23
- start: 0,
24
- end: styledChars.length,
25
- });
26
- return result;
27
- }
28
- if (node.nodeName === 'ink-static-render') {
29
- const text = node.cachedRender?.selectableText ?? '';
12
+ const isTextNode = node.nodeName === '#text';
13
+ const isStaticRender = node.nodeName === 'ink-static-render';
14
+ if (isTextNode || isStaticRender) {
15
+ const text = isTextNode
16
+ ? node.nodeValue
17
+ : (node.cachedRender?.selectableText ?? '');
30
18
  const styledChars = toStyledCharacters(text);
31
- result.styledChars = new StyledLine([...result.styledChars.getValues(), ...styledChars.getValues()], [
32
- ...result.styledChars.getSpans(),
33
- ...styledChars.getSpans().map(s => ({ ...s })),
34
- ]);
35
- result.charOffsetMap.set(node, {
36
- start: 0,
37
- end: styledChars.length,
38
- });
39
- return result;
19
+ return {
20
+ styledChars: styledChars.clone(),
21
+ charOffsetMap: new Map([[node, { start: 0, end: styledChars.length }]]),
22
+ };
40
23
  }
41
24
  const { state } = processLayout(node, {
42
25
  initialState: () => ({
43
- styledChars: new StyledLine(),
26
+ styledChars: undefined,
44
27
  charOffsetMap: new Map(),
45
28
  }),
46
29
  onNewline(count, state) {
30
+ state.styledChars ||= new StyledLine();
47
31
  for (let i = 0; i < count; i++) {
48
32
  state.styledChars.pushChar('\n', 0);
49
33
  }
50
34
  },
51
35
  onSpace(count, state) {
36
+ state.styledChars ||= new StyledLine();
52
37
  for (let i = 0; i < count; i++) {
53
38
  state.styledChars.pushChar(' ', 0);
54
39
  }
55
40
  },
56
41
  onText(fragment, state) {
57
42
  const styledChars = toStyledCharacters(fragment.text);
58
- const fragmentStartOffset = state.styledChars.length;
59
- state.styledChars = new StyledLine([...state.styledChars.getValues(), ...styledChars.getValues()], [
60
- ...state.styledChars.getSpans(),
61
- ...styledChars.getSpans().map(s => ({ ...s })),
62
- ]);
43
+ const fragmentStartOffset = state.styledChars?.length ?? 0;
44
+ state.styledChars = state.styledChars
45
+ ? state.styledChars.combine(styledChars)
46
+ : styledChars.clone();
63
47
  const map = new Map();
64
48
  const offsetRef = { current: 0 };
65
49
  squashTextNodesWithMap(fragment.node, map, offsetRef);
@@ -75,9 +59,12 @@ const getPlainTextFromDomNode = (node) => {
75
59
  }
76
60
  },
77
61
  });
78
- result.styledChars = state.styledChars;
79
- result.charOffsetMap = state.charOffsetMap;
80
- result.charOffsetMap.set(node, { start: 0, end: result.styledChars.length });
62
+ const resultStyledChars = state.styledChars ?? new StyledLine();
63
+ const result = {
64
+ styledChars: resultStyledChars,
65
+ charOffsetMap: state.charOffsetMap,
66
+ };
67
+ result.charOffsetMap.set(node, { start: 0, end: resultStyledChars.length });
81
68
  return result;
82
69
  };
83
70
  export const comparePoints = (nodeA, offsetA, nodeB, offsetB) => {
@@ -219,7 +206,7 @@ export class Range {
219
206
  return '';
220
207
  }
221
208
  const sliced = fullStyledChars.slice(offsets.start, offsets.end);
222
- return sliced.getValues().join('');
209
+ return sliced.getText();
223
210
  }
224
211
  updateCollapsed() {
225
212
  this.collapsed =
@@ -348,32 +335,23 @@ export class Selection {
348
335
  }
349
336
  }
350
337
  }
351
- export const applySelectionStyle = (char, selectionStyle) => {
352
- if (selectionStyle) {
353
- return selectionStyle(char);
354
- }
355
- const newChar = char.copyWith({});
356
- newChar.setFormatFlag(1 << 5); // INVERSE_MASK
357
- return newChar;
358
- };
359
338
  export const applySelectionToStyledChars = (styledChars, selectionState, selectionStyle) => {
360
339
  const { range, currentOffset } = selectionState;
361
340
  const { start, end } = range;
341
+ const newStyledChars = styledChars.clone();
362
342
  let charCodeUnitOffset = 0;
363
- const newStyledChars = new StyledLine();
364
- for (let i = 0; i < styledChars.length; i++) {
365
- const val = styledChars.getValue(i);
366
- const charLength = val.length;
343
+ for (let i = 0; i < newStyledChars.length; i++) {
344
+ const val = newStyledChars.getValue(i);
367
345
  const globalOffset = currentOffset + charCodeUnitOffset;
368
346
  if (globalOffset >= start && globalOffset < end) {
369
- const styledChar = new StyledChar(val, styledChars.getFormatFlags(i), styledChars.getFgColor(i), styledChars.getBgColor(i), styledChars.getLink(i));
370
- const newChar = applySelectionStyle(styledChar, selectionStyle);
371
- newStyledChars.pushChar(newChar.getValue(), newChar.formatFlags, newChar.fgColor, newChar.bgColor, newChar.link);
372
- }
373
- else {
374
- newStyledChars.pushChar(val, styledChars.getFormatFlags(i), styledChars.getFgColor(i), styledChars.getBgColor(i), styledChars.getLink(i));
347
+ if (selectionStyle) {
348
+ selectionStyle(newStyledChars, i);
349
+ }
350
+ else {
351
+ newStyledChars.setInverted(i, true);
352
+ }
375
353
  }
376
- charCodeUnitOffset += charLength;
354
+ charCodeUnitOffset += val.length;
377
355
  }
378
356
  selectionState.currentOffset += charCodeUnitOffset;
379
357
  return newStyledChars;