@promptctl/rich-js 0.7.0 → 0.9.0

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 (201) hide show
  1. package/README.md +99 -31
  2. package/dist/core/box.d.ts +96 -42
  3. package/dist/core/box.d.ts.map +1 -1
  4. package/dist/core/box.js +348 -490
  5. package/dist/core/box.js.map +1 -1
  6. package/dist/core/cells.d.ts +46 -1
  7. package/dist/core/cells.d.ts.map +1 -1
  8. package/dist/core/cells.js +55 -14
  9. package/dist/core/cells.js.map +1 -1
  10. package/dist/core/color.d.ts.map +1 -1
  11. package/dist/core/color.js +22 -8
  12. package/dist/core/color.js.map +1 -1
  13. package/dist/core/console.d.ts +30 -14
  14. package/dist/core/console.d.ts.map +1 -1
  15. package/dist/core/console.js +176 -104
  16. package/dist/core/console.js.map +1 -1
  17. package/dist/core/highlighter.d.ts +2 -1
  18. package/dist/core/highlighter.d.ts.map +1 -1
  19. package/dist/core/highlighter.js +28 -6
  20. package/dist/core/highlighter.js.map +1 -1
  21. package/dist/{renderables → core}/json.d.ts +8 -3
  22. package/dist/core/json.d.ts.map +1 -0
  23. package/dist/{renderables → core}/json.js +7 -2
  24. package/dist/core/json.js.map +1 -0
  25. package/dist/core/markup.d.ts +6 -9
  26. package/dist/core/markup.d.ts.map +1 -1
  27. package/dist/core/markup.js +153 -47
  28. package/dist/core/markup.js.map +1 -1
  29. package/dist/core/measure.d.ts +11 -0
  30. package/dist/core/measure.d.ts.map +1 -1
  31. package/dist/core/measure.js +15 -3
  32. package/dist/core/measure.js.map +1 -1
  33. package/dist/core/oklch.d.ts +22 -0
  34. package/dist/core/oklch.d.ts.map +1 -1
  35. package/dist/core/oklch.js +62 -18
  36. package/dist/core/oklch.js.map +1 -1
  37. package/dist/core/pretty.d.ts +122 -0
  38. package/dist/core/pretty.d.ts.map +1 -0
  39. package/dist/core/pretty.js +398 -0
  40. package/dist/core/pretty.js.map +1 -0
  41. package/dist/core/protocol.d.ts +80 -0
  42. package/dist/core/protocol.d.ts.map +1 -1
  43. package/dist/core/protocol.js +85 -0
  44. package/dist/core/protocol.js.map +1 -1
  45. package/dist/core/segment.d.ts +26 -0
  46. package/dist/core/segment.d.ts.map +1 -1
  47. package/dist/core/segment.js +45 -0
  48. package/dist/core/segment.js.map +1 -1
  49. package/dist/core/strip.d.ts +9 -5
  50. package/dist/core/strip.d.ts.map +1 -1
  51. package/dist/core/strip.js +39 -41
  52. package/dist/core/strip.js.map +1 -1
  53. package/dist/core/style.d.ts +19 -0
  54. package/dist/core/style.d.ts.map +1 -1
  55. package/dist/core/style.js +46 -38
  56. package/dist/core/style.js.map +1 -1
  57. package/dist/core/subscription.d.ts +13 -0
  58. package/dist/core/subscription.d.ts.map +1 -0
  59. package/dist/core/subscription.js +13 -0
  60. package/dist/core/subscription.js.map +1 -0
  61. package/dist/core/text.d.ts +102 -4
  62. package/dist/core/text.d.ts.map +1 -1
  63. package/dist/core/text.js +332 -162
  64. package/dist/core/text.js.map +1 -1
  65. package/dist/core/wrap.d.ts +42 -0
  66. package/dist/core/wrap.d.ts.map +1 -0
  67. package/dist/core/wrap.js +128 -0
  68. package/dist/core/wrap.js.map +1 -0
  69. package/dist/host/host-stream.d.ts.map +1 -0
  70. package/dist/host/host-stream.js.map +1 -0
  71. package/dist/host/index.d.ts +4 -0
  72. package/dist/host/index.d.ts.map +1 -0
  73. package/dist/host/index.js +3 -0
  74. package/dist/host/index.js.map +1 -0
  75. package/dist/{widgets → host}/terminal-host.d.ts +20 -64
  76. package/dist/host/terminal-host.d.ts.map +1 -0
  77. package/dist/host/terminal-host.js +133 -0
  78. package/dist/host/terminal-host.js.map +1 -0
  79. package/dist/index.d.ts +13 -36
  80. package/dist/index.d.ts.map +1 -1
  81. package/dist/index.js +35 -22
  82. package/dist/index.js.map +1 -1
  83. package/dist/node/terminal-host.d.ts +85 -0
  84. package/dist/node/terminal-host.d.ts.map +1 -0
  85. package/dist/node/terminal-host.js +161 -0
  86. package/dist/node/terminal-host.js.map +1 -0
  87. package/dist/node/traceback.d.ts +28 -0
  88. package/dist/node/traceback.d.ts.map +1 -0
  89. package/dist/node/traceback.js +113 -0
  90. package/dist/node/traceback.js.map +1 -0
  91. package/dist/renderables/columns.d.ts +24 -2
  92. package/dist/renderables/columns.d.ts.map +1 -1
  93. package/dist/renderables/columns.js +91 -32
  94. package/dist/renderables/columns.js.map +1 -1
  95. package/dist/renderables/layout.d.ts +61 -5
  96. package/dist/renderables/layout.d.ts.map +1 -1
  97. package/dist/renderables/layout.js +191 -19
  98. package/dist/renderables/layout.js.map +1 -1
  99. package/dist/renderables/markdown.d.ts +1 -1
  100. package/dist/renderables/markdown.d.ts.map +1 -1
  101. package/dist/renderables/markdown.js +7 -14
  102. package/dist/renderables/markdown.js.map +1 -1
  103. package/dist/renderables/padding.d.ts +16 -3
  104. package/dist/renderables/padding.d.ts.map +1 -1
  105. package/dist/renderables/padding.js +96 -47
  106. package/dist/renderables/padding.js.map +1 -1
  107. package/dist/renderables/panel.d.ts +48 -7
  108. package/dist/renderables/panel.d.ts.map +1 -1
  109. package/dist/renderables/panel.js +175 -106
  110. package/dist/renderables/panel.js.map +1 -1
  111. package/dist/renderables/progress.d.ts +3 -3
  112. package/dist/renderables/progress.d.ts.map +1 -1
  113. package/dist/renderables/progress.js +11 -9
  114. package/dist/renderables/progress.js.map +1 -1
  115. package/dist/renderables/progressBar.d.ts +3 -3
  116. package/dist/renderables/progressBar.d.ts.map +1 -1
  117. package/dist/renderables/progressBar.js +9 -15
  118. package/dist/renderables/progressBar.js.map +1 -1
  119. package/dist/renderables/prompt.js +1 -1
  120. package/dist/renderables/prompt.js.map +1 -1
  121. package/dist/renderables/rule.d.ts +1 -1
  122. package/dist/renderables/rule.d.ts.map +1 -1
  123. package/dist/renderables/rule.js +5 -10
  124. package/dist/renderables/rule.js.map +1 -1
  125. package/dist/renderables/spinner.d.ts +2 -2
  126. package/dist/renderables/spinner.d.ts.map +1 -1
  127. package/dist/renderables/spinner.js +6 -11
  128. package/dist/renderables/spinner.js.map +1 -1
  129. package/dist/renderables/status.d.ts.map +1 -1
  130. package/dist/renderables/status.js +5 -11
  131. package/dist/renderables/status.js.map +1 -1
  132. package/dist/renderables/table.d.ts +90 -16
  133. package/dist/renderables/table.d.ts.map +1 -1
  134. package/dist/renderables/table.js +481 -223
  135. package/dist/renderables/table.js.map +1 -1
  136. package/dist/renderables/traceback.d.ts +7 -3
  137. package/dist/renderables/traceback.d.ts.map +1 -1
  138. package/dist/renderables/traceback.js +15 -18
  139. package/dist/renderables/traceback.js.map +1 -1
  140. package/dist/renderables/tree.d.ts +29 -4
  141. package/dist/renderables/tree.d.ts.map +1 -1
  142. package/dist/renderables/tree.js +86 -33
  143. package/dist/renderables/tree.js.map +1 -1
  144. package/dist/template-bindings/color-funcs.d.ts +3 -3
  145. package/dist/template-bindings/color-funcs.js +3 -3
  146. package/dist/template-bindings/helpers.d.ts.map +1 -1
  147. package/dist/template-bindings/helpers.js +19 -1
  148. package/dist/template-bindings/helpers.js.map +1 -1
  149. package/dist/template-bindings/index.d.ts +6 -7
  150. package/dist/template-bindings/index.d.ts.map +1 -1
  151. package/dist/template-bindings/index.js +6 -7
  152. package/dist/template-bindings/index.js.map +1 -1
  153. package/dist/template-bindings/palette-funcs.d.ts +17 -5
  154. package/dist/template-bindings/palette-funcs.d.ts.map +1 -1
  155. package/dist/template-bindings/palette-funcs.js +69 -6
  156. package/dist/template-bindings/palette-funcs.js.map +1 -1
  157. package/dist/template-bindings/style-funcs.d.ts +1 -1
  158. package/dist/template-bindings/style-funcs.js +1 -1
  159. package/dist/themes/ramp.d.ts +84 -0
  160. package/dist/themes/ramp.d.ts.map +1 -0
  161. package/dist/themes/ramp.js +123 -0
  162. package/dist/themes/ramp.js.map +1 -0
  163. package/dist/widgets/dropdown.d.ts +1 -1
  164. package/dist/widgets/dropdown.js +1 -1
  165. package/dist/widgets/event-router.d.ts +3 -2
  166. package/dist/widgets/event-router.d.ts.map +1 -1
  167. package/dist/widgets/focus-manager.d.ts +2 -1
  168. package/dist/widgets/focus-manager.d.ts.map +1 -1
  169. package/dist/widgets/index.d.ts +3 -6
  170. package/dist/widgets/index.d.ts.map +1 -1
  171. package/dist/widgets/index.js +4 -3
  172. package/dist/widgets/index.js.map +1 -1
  173. package/dist/widgets/screen.d.ts +1 -1
  174. package/dist/widgets/screen.d.ts.map +1 -1
  175. package/dist/widgets/text-input.d.ts +2 -3
  176. package/dist/widgets/text-input.d.ts.map +1 -1
  177. package/dist/widgets/text-input.js +4 -12
  178. package/dist/widgets/text-input.js.map +1 -1
  179. package/dist/widgets/types.d.ts +1 -1
  180. package/dist/widgets/types.d.ts.map +1 -1
  181. package/dist/widgets/types.js.map +1 -1
  182. package/dist/widgets/widget-base.d.ts +2 -1
  183. package/dist/widgets/widget-base.d.ts.map +1 -1
  184. package/package.json +38 -6
  185. package/dist/renderables/json.d.ts.map +0 -1
  186. package/dist/renderables/json.js.map +0 -1
  187. package/dist/renderables/pretty.d.ts +0 -29
  188. package/dist/renderables/pretty.d.ts.map +0 -1
  189. package/dist/renderables/pretty.js +0 -141
  190. package/dist/renderables/pretty.js.map +0 -1
  191. package/dist/themes/paletteResolver.d.ts +0 -35
  192. package/dist/themes/paletteResolver.d.ts.map +0 -1
  193. package/dist/themes/paletteResolver.js +0 -88
  194. package/dist/themes/paletteResolver.js.map +0 -1
  195. package/dist/widgets/host-stream.d.ts.map +0 -1
  196. package/dist/widgets/host-stream.js.map +0 -1
  197. package/dist/widgets/terminal-host.d.ts.map +0 -1
  198. package/dist/widgets/terminal-host.js +0 -258
  199. package/dist/widgets/terminal-host.js.map +0 -1
  200. /package/dist/{widgets → host}/host-stream.d.ts +0 -0
  201. /package/dist/{widgets → host}/host-stream.js +0 -0
package/dist/core/text.js CHANGED
@@ -1,29 +1,55 @@
1
1
  /**
2
2
  * RichText — styled text with spans. The primary text type for the library.
3
3
  */
4
- import { cellLen } from "./cells.js";
4
+ import { cellLen, cellCount } from "./cells.js";
5
+ import { divideLine } from "./wrap.js";
5
6
  import { Segment } from "./segment.js";
6
7
  import { Style, NULL_STYLE, StyleSyntaxError } from "./style.js";
7
8
  import { stripOscTerminators } from "./sanitize.js";
9
+ import { getStyle, withBoundedWidth } from "./protocol.js";
8
10
  // Strip control characters except \t and \n
9
11
  // [LAW:single-enforcer] Single place where control chars are sanitized
10
12
  const CONTROL_CHARS_RE = /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g;
11
13
  function stripControlChars(text) {
12
14
  return text.replace(CONTROL_CHARS_RE, "");
13
15
  }
14
- // [LAW:single-enforcer] RichText is the *data-model* trust boundary for
15
- // link URLs — any Style carrying a link that enters a RichText is sanitized
16
- // in place, so callers that inspect `richText.style.link` or
17
- // `richText.spans[].style.link` see the same clean URL the renderer will
18
- // emit. Wire-byte safety is enforced separately in render.ts and style.ts
19
- // via the same shared `stripOscTerminators` helper (one rule, applied at
20
- // both seams). Together those layers guarantee the dirty bytes can neither
21
- // live in the in-memory model nor escape on the wire — even if a Style is
22
- // constructed and rendered via a path that bypasses RichText entirely.
23
- //
24
- // Co-located inside `resolveStyle` so any current or future RichText method
25
- // that normalizes a `string | Style` argument inherits sanitization
26
- // automatically; no per-callsite wrap to forget.
16
+ const TRAILING_WHITESPACE_RE = /\s+$/;
17
+ /**
18
+ * The plain text of one line of segments, in the coordinate system
19
+ * `divideLine` and `Segment.divide` share: cell offsets into the styled line
20
+ * are cell offsets into this string. [LAW:one-source-of-truth] for that
21
+ * correspondence — the offsets are found in this text and applied to the
22
+ * segments it came from.
23
+ */
24
+ function plainOf(line) {
25
+ return line.map((segment) => segment.text).join("");
26
+ }
27
+ /**
28
+ * The cells of trailing whitespace on a wrapped line.
29
+ *
30
+ * A wrap cuts before a word, so the line it closes ends with the whitespace
31
+ * that followed *its* last word — padding the break created, not content the
32
+ * author wrote. Measuring it is what lets the overflow method tell "this line
33
+ * was cut" from "this line ends in spaces" and stamp an ellipsis only on the
34
+ * first, and what keeps a centred line from drifting half a space off true.
35
+ *
36
+ * Asked of the line's text rather than walked back through its segments,
37
+ * because where a line ends is a fact about the characters and not about how
38
+ * they were split. Walking the segments made it a fact about both: it read a
39
+ * segment with no trailing whitespace as content and stopped there, which an
40
+ * empty segment also looks like — and a crop leaves one behind. A styled line
41
+ * whose last cells were cropped therefore reported no hanging whitespace at
42
+ * all and was centred as though it were content to the edge, so a span landing
43
+ * anywhere in a wrap's whitespace un-centred the line it closed.
44
+ */
45
+ function hangingWhitespace(line) {
46
+ return cellLen(TRAILING_WHITESPACE_RE.exec(plainOf(line))?.[0] ?? "");
47
+ }
48
+ // [LAW:single-enforcer] RichText is the data-model trust boundary for link
49
+ // URLs: a `Style` is sanitized as it enters (`admitStyle`), and the `Style` a
50
+ // stored string resolves to is sanitized as it leaves for a render
51
+ // (`resolveStyle`). Wire-byte safety is enforced separately in render.ts and
52
+ // style.ts through the same `stripOscTerminators`.
27
53
  function sanitizeStyleLink(style) {
28
54
  const link = style.link;
29
55
  if (!link)
@@ -33,28 +59,39 @@ function sanitizeStyleLink(style) {
33
59
  return style;
34
60
  return style.withLink(cleaned);
35
61
  }
36
- function resolveStyle(style) {
37
- if (style === undefined)
38
- return NULL_STYLE;
39
- let resolved;
40
- if (typeof style === "string") {
41
- try {
42
- resolved = Style.parse(style);
43
- }
44
- catch (err) {
45
- // [LAW:single-enforcer] Styling is non-critical — an unrecognized style
46
- // name (typo, missing theme key, bad concatenation) degrades to unstyled
47
- // rather than crashing. Absorb only StyleSyntaxError at this trust
48
- // boundary; other errors are genuine bugs and must surface.
49
- if (err instanceof StyleSyntaxError)
50
- return NULL_STYLE;
51
- throw err;
52
- }
53
- }
54
- else {
55
- resolved = style;
56
- }
57
- return sanitizeStyleLink(resolved);
62
+ /**
63
+ * A style as a RichText keeps it: as given. A name stays a name because what
64
+ * it stands for depends on the theme of the render that draws it, which no
65
+ * RichText knows when the name arrives — the reference stores span styles the
66
+ * same way. A string holds no link until it is parsed, so only a `Style` has
67
+ * one to sanitize here.
68
+ */
69
+ function admitStyle(style) {
70
+ return style instanceof Style ? sanitizeStyleLink(style) : style;
71
+ }
72
+ /** A style that adds nothing: the empty definition, or a null `Style`. */
73
+ function isEmptyStyle(style) {
74
+ return style instanceof Style ? style.isNull : style === "";
75
+ }
76
+ /**
77
+ * The style a stored `string | Style` stands for in this render.
78
+ *
79
+ * [LAW:single-enforcer] Styling is non-critical — an unrecognized style name
80
+ * (typo, missing theme key, bad concatenation) degrades to unstyled rather
81
+ * than crashing, as the reference's `Text.render` resolves with a null
82
+ * default. Absorb only StyleSyntaxError here; other errors are genuine bugs
83
+ * and must surface. A parsed string can carry a link, so the result is
84
+ * sanitized on the way out as well.
85
+ */
86
+ function resolveStyle(options, style) {
87
+ try {
88
+ return sanitizeStyleLink(getStyle(options, style));
89
+ }
90
+ catch (err) {
91
+ if (err instanceof StyleSyntaxError)
92
+ return NULL_STYLE;
93
+ throw err;
94
+ }
58
95
  }
59
96
  // --- Span ---
60
97
  export class Span {
@@ -104,9 +141,9 @@ export class RichText {
104
141
  constructor(text, options) {
105
142
  this._text = text ? stripControlChars(text) : "";
106
143
  this._spans = [];
107
- // [LAW:single-enforcer] `resolveStyle` is the boundary that sanitizes
144
+ // [LAW:single-enforcer] `admitStyle` is the boundary that sanitizes
108
145
  // any link URL crossing into a RichText; downstream trusts the invariant.
109
- this._style = resolveStyle(options?.style);
146
+ this._style = admitStyle(options?.style ?? NULL_STYLE);
110
147
  this._justify = options?.justify;
111
148
  this._overflow = options?.overflow;
112
149
  this._end = options?.end ?? "\n";
@@ -135,14 +172,12 @@ export class RichText {
135
172
  get hasContent() {
136
173
  return this._text.length > 0;
137
174
  }
175
+ /** The base style every span layers over: a `Style`, or a name resolved at render. */
138
176
  get style() {
139
177
  return this._style;
140
178
  }
141
179
  set style(value) {
142
- // [LAW:single-enforcer] The setter is the only entry that doesn't pass
143
- // through `resolveStyle` (its argument is already a Style); sanitize
144
- // directly so the boundary contract holds for every Style assignment.
145
- this._style = sanitizeStyleLink(value);
180
+ this._style = admitStyle(value);
146
181
  }
147
182
  get justify() {
148
183
  return this._justify;
@@ -171,6 +206,14 @@ export class RichText {
171
206
  get spans() {
172
207
  return this._spans;
173
208
  }
209
+ /**
210
+ * This text's own style, spans aside, as the render drawing it resolves it.
211
+ * A name the render's theme does not define resolves to no style, because
212
+ * text forgives a missing name.
213
+ */
214
+ resolvedStyle(options) {
215
+ return resolveStyle(options, this._style);
216
+ }
174
217
  /**
175
218
  * The style of the cell-column at the named edge — base style merged with
176
219
  * any spans covering the leftmost (side="left") or rightmost (side="right")
@@ -187,16 +230,19 @@ export class RichText {
187
230
  * text, the last character occupies the rightmost cell column — the bg
188
231
  * of that character covers both columns, so character-index lookup gives
189
232
  * the correct edge color.
233
+ *
234
+ * Takes the render's options because the edge is reported as it will be
235
+ * drawn, and a style name draws as whatever the render's theme says.
190
236
  */
191
- edgeStyle(side) {
237
+ edgeStyle(side, options) {
238
+ const base = this.resolvedStyle(options);
192
239
  if (this._text.length === 0)
193
- return this._style;
240
+ return base;
194
241
  const pos = side === "left" ? 0 : this._text.length - 1;
195
- let result = this._style;
242
+ let result = base;
196
243
  for (const span of this._spans) {
197
244
  if (span.start <= pos && pos < span.end) {
198
- const spanStyle = typeof span.style === "string" ? Style.parse(span.style) : span.style;
199
- result = result.add(spanStyle);
245
+ result = result.add(resolveStyle(options, span.style));
200
246
  }
201
247
  }
202
248
  return result;
@@ -217,12 +263,7 @@ export class RichText {
217
263
  const sanitized = stripControlChars(content);
218
264
  const start = this._text.length;
219
265
  this._text += sanitized;
220
- if (style !== undefined) {
221
- const resolved = resolveStyle(style);
222
- if (!resolved.isNull) {
223
- this._spans.push(new Span(start, this._text.length, resolved));
224
- }
225
- }
266
+ this._addSpan(start, this._text.length, style ?? "");
226
267
  return this;
227
268
  }
228
269
  contains(needle) {
@@ -258,10 +299,17 @@ export class RichText {
258
299
  return result;
259
300
  }
260
301
  // --- Styling Operations ---
302
+ /**
303
+ * The one way a span enters this text. [LAW:single-enforcer] An empty style
304
+ * adds nothing, as the reference's `if style:` has it, and every other style
305
+ * is admitted as given.
306
+ */
307
+ _addSpan(start, end, style) {
308
+ if (isEmptyStyle(style))
309
+ return;
310
+ this._spans.push(new Span(start, end, admitStyle(style)));
311
+ }
261
312
  stylize(style, start, end) {
262
- const resolved = resolveStyle(style);
263
- if (resolved.isNull)
264
- return this;
265
313
  const len = this._text.length;
266
314
  const s = start !== undefined ? (start < 0 ? len + start : start) : 0;
267
315
  const e = end !== undefined ? (end < 0 ? len + end : end) : len;
@@ -269,7 +317,7 @@ export class RichText {
269
317
  return this;
270
318
  const clampedStart = Math.max(0, s);
271
319
  const clampedEnd = Math.min(len, e);
272
- this._spans.push(new Span(clampedStart, clampedEnd, resolved));
320
+ this._addSpan(clampedStart, clampedEnd, style);
273
321
  return this;
274
322
  }
275
323
  highlightRegex(pattern, style) {
@@ -292,7 +340,7 @@ export class RichText {
292
340
  const posInMatch = match[0].indexOf(groupValue, searchFrom);
293
341
  if (posInMatch >= 0) {
294
342
  const groupStart = match.index + posInMatch;
295
- this._spans.push(new Span(groupStart, groupStart + groupValue.length, groupName));
343
+ this._addSpan(groupStart, groupStart + groupValue.length, groupName);
296
344
  searchFrom = posInMatch + groupValue.length;
297
345
  }
298
346
  }
@@ -300,19 +348,13 @@ export class RichText {
300
348
  count++;
301
349
  continue;
302
350
  }
303
- const resolvedStyle = style !== undefined ? resolveStyle(style) : NULL_STYLE;
304
- if (!resolvedStyle.isNull) {
305
- this._spans.push(new Span(match.index, match.index + match[0].length, resolvedStyle));
306
- }
351
+ this._addSpan(match.index, match.index + match[0].length, style ?? "");
307
352
  count++;
308
353
  }
309
354
  return count;
310
355
  }
311
356
  highlightWords(words, style, options) {
312
357
  const caseSensitive = options?.caseSensitive !== false;
313
- const resolved = resolveStyle(style);
314
- if (resolved.isNull)
315
- return 0;
316
358
  let count = 0;
317
359
  for (const word of words) {
318
360
  if (word.length === 0)
@@ -322,7 +364,7 @@ export class RichText {
322
364
  const re = new RegExp(`\\b${escaped}\\b`, flags);
323
365
  let match;
324
366
  while ((match = re.exec(this._text)) !== null) {
325
- this._spans.push(new Span(match.index, match.index + match[0].length, resolved));
367
+ this._addSpan(match.index, match.index + match[0].length, style);
326
368
  count++;
327
369
  }
328
370
  }
@@ -645,9 +687,7 @@ export class RichText {
645
687
  for (const frag of fragments) {
646
688
  const start = result.length;
647
689
  result.append(frag.plain);
648
- if (!frag.style.isNull) {
649
- result.stylize(frag.style, start, result.length);
650
- }
690
+ result.stylize(frag.style, start, result.length);
651
691
  for (const span of frag.spans) {
652
692
  result.stylize(span.style, start + span.start, start + span.end);
653
693
  }
@@ -662,28 +702,47 @@ export class RichText {
662
702
  yield new Segment(this._end);
663
703
  return;
664
704
  }
665
- const allSegments = this._buildSegments(text);
705
+ const base = this.resolvedStyle(options);
706
+ const allSegments = this._buildSegments(text, base, options);
666
707
  const logicalLines = Segment.splitLines(allSegments);
667
- const maxWidth = options.maxWidth;
708
+ // [LAW:single-enforcer] The one crossing for this renderable's width, and
709
+ // the call every other renderable already makes. A bare `cellCount` stood
710
+ // here doing half of it: it caught a NaN width, which had made every
711
+ // overflow arm a no-op, but passed an unbounded one through to `justify`,
712
+ // which pads — and `" ".repeat(Infinity)` throws.
713
+ const maxWidth = cellCount(withBoundedWidth(options, this).maxWidth);
668
714
  const overflow = this._overflow ?? options.overflow ?? "fold";
669
715
  const justify = this._justify ?? options.justify;
670
716
  const noWrap = this._noWrap || (options.noWrap ?? false);
717
+ // The width a line is cut to, which is not always the width it is
718
+ // justified in. `noWrap` means the line is not bounded at all: it leaves at
719
+ // its natural width and whatever asked for it decides about the overhang —
720
+ // `Console`'s soft wrap and `FlexStrip`'s too-wide fallback both want the
721
+ // text intact rather than cropped.
722
+ //
723
+ // [LAW:dataflow-not-control-flow] It reaches the pipeline as a width, not
724
+ // as a step to skip: an unbounded budget has no edge to break at, so
725
+ // `divideLine` finds no cuts and `_fitLine` finds nothing past the edge,
726
+ // and every line runs the same three steps. `Infinity` is already this
727
+ // library's spelling of an unbounded width offer — `withBoundedWidth` in
728
+ // protocol.ts parses one on the way in.
729
+ const budget = noWrap ? cellCount(Infinity) : maxWidth;
671
730
  const endsWithNewline = text.endsWith("\n");
672
731
  for (let index = 0; index < logicalLines.length; index += 1) {
673
732
  const line = logicalLines[index];
674
- const lineWidth = Segment.getLineLength(line);
675
733
  const terminateLine = index < logicalLines.length - 1 || endsWithNewline;
676
- if (noWrap || lineWidth <= maxWidth) {
677
- // Line fits — apply justification
678
- yield* this._justifyLine(line, maxWidth, justify);
679
- if (terminateLine) {
734
+ // Wrap first, overflow last — the reference's order, and the reason a
735
+ // long sentence grows a table row while an unbreakable word in the same
736
+ // column still ellipsizes.
737
+ const cuts = divideLine(plainOf(line), budget, { fold: overflow === "fold" });
738
+ const wrapped = Segment.divide(line, cuts);
739
+ const placed = this._justifyLines(wrapped.map((piece) => [...this._fitLine(piece, budget, overflow)]), maxWidth, base, justify);
740
+ for (let piece = 0; piece < placed.length; piece += 1) {
741
+ yield* placed[piece];
742
+ if (piece < placed.length - 1 || terminateLine) {
680
743
  yield Segment.line();
681
744
  }
682
745
  }
683
- else {
684
- // Line too long — handle overflow
685
- yield* this._overflowLine(line, lineWidth, maxWidth, overflow, terminateLine);
686
- }
687
746
  }
688
747
  if (this._end && this._end !== "\n") {
689
748
  yield new Segment(this._end);
@@ -706,9 +765,13 @@ export class RichText {
706
765
  }
707
766
  }
708
767
  }
768
+ // Parsed for the same reason `render` parses it: an unparsed NaN ceiling
769
+ // makes both `Math.min` calls NaN, and a range of NaN..NaN is one no parent
770
+ // layout can divide.
771
+ const ceiling = cellCount(options.maxWidth);
709
772
  return {
710
- minimum: Math.min(maxWordWidth, options.maxWidth),
711
- maximum: Math.min(maxLineWidth, options.maxWidth),
773
+ minimum: Math.min(maxWordWidth, ceiling),
774
+ maximum: Math.min(maxLineWidth, ceiling),
712
775
  };
713
776
  }
714
777
  // --- Internal ---
@@ -717,107 +780,214 @@ export class RichText {
717
780
  return text;
718
781
  return text.replace(/\t/g, " ".repeat(this._tabSize));
719
782
  }
720
- _buildSegments(text) {
721
- if (text.length === 0)
722
- return [];
723
- // Collect all unique boundary positions
783
+ /**
784
+ * The rendered text cut at every span edge, each piece carrying the base
785
+ * style plus every span covering it.
786
+ *
787
+ * Walked span-first rather than piece-first, and that direction is the whole
788
+ * performance argument. The pieces are cut at the span edges themselves, so
789
+ * a span covers a piece exactly when it covers the piece's first character —
790
+ * which makes each span's run of pieces a contiguous range it can be written
791
+ * into once, instead of a question every piece asks of every span. The
792
+ * piece-first form charged `spans x pieces`, and the pieces are themselves
793
+ * cut by the spans, so anything styling densely paid the square in ordinary
794
+ * use: 8,000 one-character spans took 211ms where 1,000 took 3.2ms. Every
795
+ * `Highlighter` over a large value reaches that, and so does `Pretty`, whose
796
+ * indent guides emit a span per indent character.
797
+ *
798
+ * Span-first is also what keeps the composition honest, for free. `Style.add`
799
+ * is order-dependent and the last writer wins, so the pieces have to fold
800
+ * their styles in `_spans` order — which iterating `_spans` is, and which a
801
+ * sweep ordered by position would have had to reconstruct.
802
+ *
803
+ * [LAW:dataflow-not-control-flow] A span covering nothing — empty, reversed,
804
+ * or entirely past the text — still cuts the text where its edges land, as it
805
+ * always did, and then folds into no piece at all: its range comes out empty
806
+ * and no case handles it.
807
+ */
808
+ _buildSegments(text, base, options) {
809
+ const clamp = (offset) => Math.max(0, Math.min(offset, text.length));
724
810
  const positions = new Set([0, text.length]);
725
811
  for (const span of this._spans) {
726
- const start = Math.max(0, Math.min(span.start, text.length));
727
- const end = Math.max(0, Math.min(span.end, text.length));
728
- positions.add(start);
729
- positions.add(end);
730
- }
731
- const sorted = [...positions].sort((a, b) => a - b);
732
- const segments = [];
733
- // [LAW:dataflow-not-control-flow] Always iterate all regions; empty ones produce nothing
734
- for (let i = 0; i < sorted.length - 1; i++) {
735
- const regionStart = sorted[i];
736
- const regionEnd = sorted[i + 1];
737
- const regionText = text.slice(regionStart, regionEnd);
738
- if (regionText.length === 0)
739
- continue;
740
- // Combine base style with all active span styles
741
- let style = this._style;
742
- for (const span of this._spans) {
743
- if (span.start <= regionStart && span.end >= regionEnd) {
744
- const spanStyle = resolveStyle(span.style);
745
- style = style.add(spanStyle);
746
- }
812
+ positions.add(clamp(span.start));
813
+ positions.add(clamp(span.end));
814
+ }
815
+ const boundaries = [...positions].sort((a, b) => a - b);
816
+ // Every span edge is a boundary, so where a span's range opens is a lookup
817
+ // rather than a search.
818
+ const pieceAt = new Map(boundaries.map((position, piece) => [position, piece]));
819
+ const styles = boundaries.slice(0, -1).map(() => base);
820
+ for (const span of this._spans) {
821
+ const end = clamp(span.end);
822
+ const style = resolveStyle(options, span.style);
823
+ const opensAt = pieceAt.get(clamp(span.start));
824
+ for (let piece = opensAt; boundaries[piece] < end; piece++) {
825
+ styles[piece] = styles[piece].add(style);
747
826
  }
748
- segments.push(new Segment(regionText, style.isNull ? undefined : style));
749
827
  }
750
- return segments;
828
+ return styles.map((style, piece) => new Segment(text.slice(boundaries[piece], boundaries[piece + 1]), style.isNull ? undefined : style));
751
829
  }
752
- *_justifyLine(line, maxWidth, justify) {
753
- const lineWidth = Segment.getLineLength(line);
754
- const gap = maxWidth - lineWidth;
830
+ /**
831
+ * The pieces one logical line wrapped into, each placed in a canvas
832
+ * `maxWidth` wide, as Rich's `Lines.justify` places them — pinned block for
833
+ * block against the reference in `test/core/text-justify.test.ts`.
834
+ *
835
+ * It is handed the whole wrapped line because `full` is the one mode a
836
+ * piece cannot answer alone: the reference leaves a paragraph's last line
837
+ * ragged, so where the piece sits decides its answer where the other three
838
+ * modes need only the piece itself. The set that decides "last" is this one
839
+ * and not the whole render — `Text.wrap` calls `Lines.justify` once per
840
+ * *logical* line — and `Segment.divide` already handed it over whole.
841
+ */
842
+ _justifyLines(lines, maxWidth, base, justify) {
843
+ if (justify !== "full") {
844
+ return lines.map((line) => [...this._justifyLine(line, maxWidth, justify)]);
845
+ }
846
+ return lines.map((line, index) => index === lines.length - 1 ? line : this._fillLine(line, maxWidth, base));
847
+ }
848
+ /**
849
+ * One line placed in a canvas `maxWidth` wide.
850
+ *
851
+ * Centre and right align on the line's *content*. The whitespace a wrap
852
+ * leaves on the end of the line it closed is the break's own padding, not
853
+ * text, and aligning around it pushes the text half a gap off true — a
854
+ * centred title that wraps drifts left on every line that happens to end in
855
+ * a space. Left keeps that whitespace, because there it is already on the
856
+ * side the padding goes.
857
+ *
858
+ * `undefined` is not `"left"`: it is Rich's `"default"`, which places the
859
+ * line without padding it at all. That distinction is what lets a soft-wrapped
860
+ * `Console.print` leave its lines at their natural width.
861
+ */
862
+ *_justifyLine(line, maxWidth,
863
+ // [LAW:types-are-the-program] `full` is absent rather than ignored: it
864
+ // needs the lines either side of this one, so the type refuses it here
865
+ // instead of a branch quietly rendering it as `left`, which is the bug
866
+ // this signature replaces (rich-justify-0cr.1).
867
+ justify) {
755
868
  switch (justify) {
756
- case "center": {
757
- const leftPad = Math.floor(gap / 2);
869
+ case "center":
870
+ case "right": {
871
+ const body = Segment.adjustLineLength(line, Segment.getLineLength(line) - hangingWhitespace(line), undefined, false);
872
+ const gap = Math.max(maxWidth - Segment.getLineLength(body), 0);
873
+ const leftPad = justify === "center" ? Math.floor(gap / 2) : gap;
758
874
  if (leftPad > 0)
759
875
  yield new Segment(" ".repeat(leftPad));
760
- yield* line;
876
+ yield* body;
761
877
  const rightPad = gap - leftPad;
762
878
  if (rightPad > 0)
763
879
  yield new Segment(" ".repeat(rightPad));
764
880
  break;
765
881
  }
766
- case "right": {
767
- if (gap > 0)
768
- yield new Segment(" ".repeat(gap));
769
- yield* line;
770
- break;
771
- }
772
- case "full": {
773
- // Full justification: distribute spaces between words
774
- // For now, fall through to left alignment
775
- yield* line;
882
+ case "left":
883
+ yield* Segment.adjustLineLength(line, Math.max(maxWidth, Segment.getLineLength(line)));
776
884
  break;
777
- }
778
885
  default:
779
- // "left" or undefined — just yield the line as-is
780
886
  yield* line;
781
887
  break;
782
888
  }
783
889
  }
784
- *_overflowLine(line, lineWidth, maxWidth, overflow, terminateLine) {
785
- switch (overflow) {
786
- case "fold": {
787
- // Split at maxWidth boundaries
788
- const cuts = [];
789
- for (let w = maxWidth; w < lineWidth; w += maxWidth)
790
- cuts.push(w);
791
- const foldedLines = Segment.divide(line, cuts);
792
- for (let index = 0; index < foldedLines.length; index += 1) {
793
- const fLine = foldedLines[index];
794
- yield* fLine;
795
- if (index < foldedLines.length - 1 || terminateLine) {
796
- yield Segment.line();
797
- }
798
- }
799
- break;
800
- }
801
- case "crop": {
802
- const cropped = Segment.adjustLineLength(line, maxWidth, undefined, false);
803
- yield* cropped;
804
- if (terminateLine) {
805
- yield Segment.line();
806
- }
807
- break;
808
- }
809
- case "ellipsis": {
810
- if (maxWidth > 1) {
811
- const cropped = Segment.adjustLineLength(line, maxWidth - 1, undefined, false);
812
- yield* cropped;
813
- yield new Segment("\u2026");
814
- }
815
- if (terminateLine) {
816
- yield Segment.line();
817
- }
818
- break;
890
+ /**
891
+ * One line of a wrapped paragraph, its gaps widened until it fills the
892
+ * canvas — what `justify: "full"` promises, and what the reference's
893
+ * `Lines.justify` does to every line of a paragraph but the last.
894
+ *
895
+ * Slack goes in a cell at a time, starting at the rightmost gap and walking
896
+ * left, round and round until the line is full. That order is the
897
+ * reference's own, and what it decides is where an odd cell lands when the
898
+ * slack will not divide evenly: the right-hand gaps take it.
899
+ *
900
+ * The words come from the line's *text* split on a single space, with the
901
+ * blank a trailing separator leaves behind dropped — `Text.split` and
902
+ * `String.prototype.split` agree on that list, empty words and all. Two
903
+ * consequences read as bugs until you know whose they are: a run of n
904
+ * spaces is n gaps rather than one, so spacing an author widened stretches
905
+ * instead of collapsing, and the whitespace a wrap left hanging is a gap
906
+ * like the rest, which is why a filled line does not keep it. Both are
907
+ * pinned in `text-justify.golden.txt`, by the `uneven` and `sentence`
908
+ * blocks respectively.
909
+ */
910
+ _fillLine(line, maxWidth, base) {
911
+ const plain = plainOf(line);
912
+ const words = plain.split(" ");
913
+ if (plain.endsWith(" "))
914
+ words.pop();
915
+ const gaps = words.length - 1;
916
+ const spaces = new Array(gaps).fill(1);
917
+ let filled = words.reduce((total, word) => total + cellLen(word), 0) + gaps;
918
+ for (let turn = 0; filled < maxWidth && gaps > 0; turn = (turn + 1) % gaps) {
919
+ spaces[gaps - 1 - turn] += 1;
920
+ filled += 1;
921
+ }
922
+ // Cut at both edges of every gap, so a word is an even piece and the
923
+ // separator that followed it is the odd piece after it. Measured in cells
924
+ // because that is the coordinate system `Segment.divide` reads, which a
925
+ // line of wide glyphs is the only thing that notices.
926
+ const cuts = [];
927
+ let edge = 0;
928
+ for (let index = 0; index < words.length; index += 1) {
929
+ edge += cellLen(words[index]);
930
+ cuts.push(edge);
931
+ edge += 1;
932
+ if (index < gaps)
933
+ cuts.push(edge);
934
+ }
935
+ const pieces = Segment.divide(line, cuts);
936
+ // A widened gap takes the style the words either side of it agree on, and
937
+ // the line's own where they disagree — the reference reads that off the
938
+ // character each side turns towards the gap, which is the offset `at` is
939
+ // given here. A word with no characters turns none and answers with the
940
+ // line's style, which is what two adjacent separators leave between them.
941
+ const edgeStyle = (word, at) => word.filter((segment) => segment.hasText).at(at)?.style ?? base;
942
+ const result = [];
943
+ for (let index = 0; index < words.length; index += 1) {
944
+ result.push(...pieces[index * 2]);
945
+ if (index < gaps) {
946
+ const before = edgeStyle(pieces[index * 2], -1);
947
+ const after = edgeStyle(pieces[index * 2 + 2], 0);
948
+ const style = before.equals(after) ? before : base;
949
+ result.push(new Segment(" ".repeat(spaces[index]), style.isNull ? undefined : style));
819
950
  }
820
951
  }
952
+ return result;
953
+ }
954
+ /**
955
+ * One wrapped line cut to the canvas.
956
+ *
957
+ * Everything reaching here already survived wrapping, so the only text still
958
+ * too wide is text no break could help: a word longer than the canvas under
959
+ * a non-folding overflow method, a glyph wider than the budget, or a canvas
960
+ * with no cells at all. That is what makes the overflow method a last
961
+ * resort rather than the first thing a long cell meets.
962
+ */
963
+ *_fitLine(line, maxWidth, overflow) {
964
+ const lineWidth = Segment.getLineLength(line);
965
+ const contentWidth = lineWidth - hangingWhitespace(line);
966
+ // Whitespace hanging past the edge is the wrap's own padding: cropping it
967
+ // away is not truncation, so it earns no marker. Without this an ellipsis
968
+ // landed on any break that fell a space past the column — the common case
969
+ // in a table, not an edge one.
970
+ if (contentWidth <= maxWidth) {
971
+ yield* Segment.adjustLineLength(line, Math.min(lineWidth, maxWidth), undefined, false);
972
+ return;
973
+ }
974
+ // The marker takes the last cell and the text keeps the rest. At maxWidth 1
975
+ // that is zero cells of text and the marker alone, which is the honest
976
+ // rendering of "all of this was cut"; the `maxWidth > 1` guard that used to
977
+ // stand here emitted no line at all, so every table column squeezed to a
978
+ // single cell rendered blank rather than truncated — `ellipsis` being the
979
+ // default column overflow, a hard-squeezed table looked like an empty frame.
980
+ //
981
+ // At maxWidth 0 there is no cell to put the marker in, so every method
982
+ // yields the same bare empty line. Agreement there is what keeps a
983
+ // `Columns` or `Layout` squeezed to no width at all from rendering
984
+ // three different kinds of nothing.
985
+ if (overflow === "ellipsis" && maxWidth > 0) {
986
+ yield* Segment.adjustLineLength(line, maxWidth - 1, undefined, false);
987
+ yield new Segment("\u2026");
988
+ return;
989
+ }
990
+ yield* Segment.adjustLineLength(line, maxWidth, undefined, false);
821
991
  }
822
992
  }
823
993
  //# sourceMappingURL=text.js.map