@profullstack/hqtui 0.2.0 → 0.4.0

package/dist/richtext.d.ts

@@ -0,0 +1,79 @@
+/**
+ * Styled text: more than one colour on a line.
+ *
+ * A `Span` is a run of text with its own style; a line is a list of spans; text
+ * is a list of lines. Every widget that took a `string` takes `RichText` too,
+ * and a bare string is simply the one-span case, so nothing that worked before
+ * has to change.
+ *
+ * The measuring and cutting here mirrors `unicode.ts` exactly rather than
+ * approximating it. `truncateSpans`, `fitSpans` and `wrapSpans` produce the
+ * same columns as `truncate`, `fit` and `wrap` for single-span input — there
+ * are tests that assert precisely that over a corpus, because two text layout
+ * engines that disagree by one column is a bug you find in a screenshot six
+ * months later.
+ */
+import { type Style } from "./buffer.ts";
+import type { Color } from "./color.ts";
+export interface Span {
+    text: string;
+    fg?: Color;
+    bg?: Color;
+    attrs?: number;
+    bold?: boolean;
+    dim?: boolean;
+    italic?: boolean;
+    underline?: boolean;
+}
+/** One line of styled text. */
+export type SpanLine = Span[];
+/**
+ * Anything a widget will accept where it used to take a string.
+ *
+ * A plain string is one unstyled span. `Span[]` is one line. `Span[][]` is
+ * several. Embedded newlines split into lines wherever they appear, so a span
+ * carrying "a\nb" behaves like the string "a\nb" always did.
+ */
+export type RichText = string | SpanLine | SpanLine[];
+/** True when the value carries styling rather than being a bare string. */
+export declare function isRich(value: RichText): value is SpanLine | SpanLine[];
+/** The style a span paints with, over whatever the widget already decided. */
+export declare function spanStyle(span: Span, base?: Style): Style;
+/**
+ * Normalise any accepted shape into lines of spans, splitting on newlines.
+ *
+ * Empty spans are dropped, but a line that ends up with no spans is kept: a
+ * blank line between two paragraphs is content, not absence.
+ */
+export declare function toSpanLines(value: RichText): SpanLine[];
+/** Display width of a line in terminal columns. */
+export declare function spanWidth(line: SpanLine): number;
+/** Concatenated text of a line, with styling discarded. */
+export declare function spanText(line: SpanLine): string;
+/**
+ * Truncate a line to `max` columns, appending `ellipsis` when it does not fit.
+ *
+ * The ellipsis takes the style of the span it interrupts, so cutting a red
+ * error message short leaves a red ellipsis rather than a stray default-coloured
+ * one.
+ */
+export declare function truncateSpans(line: SpanLine, max: number, ellipsis?: string): SpanLine;
+/** Pad or truncate a line to exactly `width` columns. */
+/**
+ * A span line with its first `columns` display columns removed.
+ *
+ * The string form of this is `dropColumns`; a styled line has to drop the same
+ * columns without losing the styles of the runs that survive, so it walks the
+ * spans and cuts inside whichever one straddles the offset.
+ */
+export declare function dropSpanColumns(line: SpanLine, columns: number): SpanLine;
+export declare function fitSpans(line: SpanLine, width: number, align?: "left" | "right" | "center"): SpanLine;
+/**
+ * Greedy word wrap at `width` columns, preserving each span's style across the
+ * break. Mirrors `wrap()` in unicode.ts, including its hard split of a word
+ * longer than the line and its trimming of the soft-wrapped line end.
+ */
+export declare function wrapSpans(line: SpanLine, width: number): SpanLine[];
+/** Wrap every line of a rich value, in order. */
+export declare function wrapRich(value: RichText, width: number): SpanLine[];
+//# sourceMappingURL=richtext.d.ts.map

package/dist/richtext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"richtext.d.ts","sourceRoot":"","sources":["../src/richtext.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAQ,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAGxC,MAAM,WAAW,IAAI;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,KAAK,CAAC;IACX,EAAE,CAAC,EAAE,KAAK,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,+BAA+B;AAC/B,MAAM,MAAM,QAAQ,GAAG,IAAI,EAAE,CAAC;AAE9B;;;;;;GAMG;AACH,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,EAAE,CAAC;AAEtD,2EAA2E;AAC3E,wBAAgB,MAAM,CAAC,KAAK,EAAE,QAAQ,GAAG,KAAK,IAAI,QAAQ,GAAG,QAAQ,EAAE,CAEtE;AAMD,8EAA8E;AAC9E,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,GAAE,KAAU,GAAG,KAAK,CAW7D;AAQD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAoBvD;AAMD,mDAAmD;AACnD,wBAAgB,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAIhD;AAED,2DAA2D;AAC3D,wBAAgB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAI/C;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,SAAM,GAAG,QAAQ,CAuBnF;AAED,yDAAyD;AACzD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,GAAG,QAAQ,CAmBzE;AAED,wBAAgB,QAAQ,CACtB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,MAAM,EACb,KAAK,GAAE,MAAM,GAAG,OAAO,GAAG,QAAiB,GAC1C,QAAQ,CAaV;AAmDD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,CAmCnE;AAED,iDAAiD;AACjD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,CAWnE"}

package/dist/richtext.js

@@ -0,0 +1,272 @@
+/**
+ * Styled text: more than one colour on a line.
+ *
+ * A `Span` is a run of text with its own style; a line is a list of spans; text
+ * is a list of lines. Every widget that took a `string` takes `RichText` too,
+ * and a bare string is simply the one-span case, so nothing that worked before
+ * has to change.
+ *
+ * The measuring and cutting here mirrors `unicode.ts` exactly rather than
+ * approximating it. `truncateSpans`, `fitSpans` and `wrapSpans` produce the
+ * same columns as `truncate`, `fit` and `wrap` for single-span input — there
+ * are tests that assert precisely that over a corpus, because two text layout
+ * engines that disagree by one column is a bug you find in a screenshot six
+ * months later.
+ */
+import { Attr } from "./buffer.js";
+import { cellText, dropColumns, graphemes, stringWidth } from "./unicode.js";
+/** True when the value carries styling rather than being a bare string. */
+export function isRich(value) {
+    return typeof value !== "string";
+}
+function isLines(value) {
+    return value.length === 0 || Array.isArray(value[0]);
+}
+/** The style a span paints with, over whatever the widget already decided. */
+export function spanStyle(span, base = {}) {
+    let attrs = span.attrs ?? base.attrs ?? 0;
+    if (span.bold)
+        attrs |= Attr.Bold;
+    if (span.dim)
+        attrs |= Attr.Dim;
+    if (span.italic)
+        attrs |= Attr.Italic;
+    if (span.underline)
+        attrs |= Attr.Underline;
+    return {
+        fg: span.fg ?? base.fg,
+        bg: span.bg ?? base.bg,
+        attrs,
+    };
+}
+/** Everything except the text, for cloning a span's styling onto new text. */
+function styleOf(span) {
+    const { text: _text, ...rest } = span;
+    return rest;
+}
+/**
+ * Normalise any accepted shape into lines of spans, splitting on newlines.
+ *
+ * Empty spans are dropped, but a line that ends up with no spans is kept: a
+ * blank line between two paragraphs is content, not absence.
+ */
+export function toSpanLines(value) {
+    if (typeof value === "string") {
+        return value.split("\n").map((line) => (line === "" ? [] : [{ text: line }]));
+    }
+    const lines = isLines(value) ? value : [value];
+    const out = [];
+    for (const line of lines) {
+        let current = [];
+        for (const span of line) {
+            if (span.text === "")
+                continue;
+            const parts = span.text.split("\n");
+            current.push({ ...styleOf(span), text: parts[0] });
+            for (let i = 1; i < parts.length; i++) {
+                out.push(dropEmpty(current));
+                current = [{ ...styleOf(span), text: parts[i] }];
+            }
+        }
+        out.push(dropEmpty(current));
+    }
+    return out;
+}
+function dropEmpty(line) {
+    return line.filter((s) => s.text !== "");
+}
+/** Display width of a line in terminal columns. */
+export function spanWidth(line) {
+    let w = 0;
+    for (const span of line)
+        w += stringWidth(span.text);
+    return w;
+}
+/** Concatenated text of a line, with styling discarded. */
+export function spanText(line) {
+    let out = "";
+    for (const span of line)
+        out += span.text;
+    return out;
+}
+/**
+ * Truncate a line to `max` columns, appending `ellipsis` when it does not fit.
+ *
+ * The ellipsis takes the style of the span it interrupts, so cutting a red
+ * error message short leaves a red ellipsis rather than a stray default-coloured
+ * one.
+ */
+export function truncateSpans(line, max, ellipsis = "…") {
+    if (max <= 0)
+        return [];
+    if (spanWidth(line) <= max)
+        return line;
+    const limit = Math.max(0, max - stringWidth(ellipsis));
+    const out = [];
+    let w = 0;
+    let last;
+    for (const span of line) {
+        let text = "";
+        for (const g of graphemes(span.text)) {
+            if (w + g.width > limit)
+                break;
+            text += cellText(g.value);
+            w += g.width;
+        }
+        if (text !== "") {
+            last = span;
+            out.push({ ...styleOf(span), text });
+        }
+        if (w >= limit)
+            break;
+    }
+    const source = last ?? line[0];
+    out.push({ ...(source ? styleOf(source) : {}), text: ellipsis });
+    return out;
+}
+/** Pad or truncate a line to exactly `width` columns. */
+/**
+ * A span line with its first `columns` display columns removed.
+ *
+ * The string form of this is `dropColumns`; a styled line has to drop the same
+ * columns without losing the styles of the runs that survive, so it walks the
+ * spans and cuts inside whichever one straddles the offset.
+ */
+export function dropSpanColumns(line, columns) {
+    if (columns <= 0)
+        return line;
+    const out = [];
+    let skipped = 0;
+    for (const span of line) {
+        const width = stringWidth(span.text);
+        if (skipped >= columns) {
+            out.push(span);
+            continue;
+        }
+        if (skipped + width <= columns) {
+            skipped += width;
+            continue;
+        }
+        // The cut lands inside this span: keep its style, drop its first columns.
+        out.push({ ...span, text: dropColumns(span.text, columns - skipped) });
+        skipped = columns;
+    }
+    return out;
+}
+export function fitSpans(line, width, align = "left") {
+    const cut = truncateSpans(line, width);
+    const pad = width - spanWidth(cut);
+    if (pad <= 0)
+        return cut;
+    // Padding carries no style of its own so it picks up the widget's, which is
+    // what the string path has always done by padding before it draws.
+    const space = (n) => (n > 0 ? [{ text: " ".repeat(n) }] : []);
+    if (align === "right")
+        return [...space(pad), ...cut];
+    if (align === "center") {
+        const left = Math.floor(pad / 2);
+        return [...space(left), ...cut, ...space(pad - left)];
+    }
+    return [...cut, ...space(pad)];
+}
+/** Split a line into whitespace and non-whitespace runs, keeping each style. */
+function tokenize(line) {
+    const out = [];
+    for (const span of line) {
+        const style = styleOf(span);
+        for (const part of span.text.split(/(\s+)/)) {
+            if (part === "")
+                continue;
+            out.push({ text: part, style, space: /^\s+$/.test(part) });
+        }
+    }
+    return out;
+}
+/** Join runs that share a style, so the output has no needless span churn. */
+function coalesce(spans) {
+    const out = [];
+    for (const span of spans) {
+        if (span.text === "")
+            continue;
+        const previous = out[out.length - 1];
+        if (previous && sameStyle(previous, span))
+            previous.text += span.text;
+        else
+            out.push({ ...span });
+    }
+    return out;
+}
+function sameStyle(a, b) {
+    return a.fg === b.fg && a.bg === b.bg && a.attrs === b.attrs
+        && !!a.bold === !!b.bold && !!a.dim === !!b.dim
+        && !!a.italic === !!b.italic && !!a.underline === !!b.underline;
+}
+/** Drop trailing whitespace spans, the way a soft wrap trims its line end. */
+function trimEnd(spans) {
+    const out = spans.map((s) => ({ ...s }));
+    while (out.length > 0) {
+        const last = out[out.length - 1];
+        last.text = last.text.replace(/\s+$/, "");
+        if (last.text !== "")
+            break;
+        out.pop();
+    }
+    return out;
+}
+/**
+ * Greedy word wrap at `width` columns, preserving each span's style across the
+ * break. Mirrors `wrap()` in unicode.ts, including its hard split of a word
+ * longer than the line and its trimming of the soft-wrapped line end.
+ */
+export function wrapSpans(line, width) {
+    if (width <= 0)
+        return [];
+    const lines = [];
+    let current = [];
+    let currentWidth = 0;
+    const push = (trim) => {
+        lines.push(coalesce(trim ? trimEnd(current) : current));
+        current = [];
+        currentWidth = 0;
+    };
+    for (const token of tokenize(line)) {
+        const w = stringWidth(token.text);
+        if (currentWidth + w > width && currentWidth > 0) {
+            push(true);
+            // A break swallows the whitespace that caused it, exactly as `wrap` does.
+            if (token.space)
+                continue;
+        }
+        if (w > width) {
+            for (const g of graphemes(token.text)) {
+                if (currentWidth + g.width > width)
+                    push(false);
+                current.push({ ...token.style, text: cellText(g.value) });
+                currentWidth += g.width;
+            }
+            continue;
+        }
+        current.push({ ...token.style, text: token.text });
+        currentWidth += w;
+    }
+    // The last line is trimmed like a soft-wrapped one. Only the hard split of an
+    // overlong word pushes untrimmed, because there the break is mid-word and the
+    // whitespace it would trim is real content.
+    push(true);
+    return lines;
+}
+/** Wrap every line of a rich value, in order. */
+export function wrapRich(value, width) {
+    const out = [];
+    for (const line of toSpanLines(value)) {
+        if (line.length === 0) {
+            // A blank line survives wrapping as a blank line.
+            out.push([]);
+            continue;
+        }
+        for (const wrapped of wrapSpans(line, width))
+            out.push(wrapped);
+    }
+    return out;
+}
+//# sourceMappingURL=richtext.js.map

package/dist/richtext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"richtext.js","sourceRoot":"","sources":["../src/richtext.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,IAAI,EAAc,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAyB7E,2EAA2E;AAC3E,MAAM,UAAU,MAAM,CAAC,KAAe;IACpC,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;AACnC,CAAC;AAED,SAAS,OAAO,CAAC,KAA4B;IAC3C,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACvD,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,SAAS,CAAC,IAAU,EAAE,IAAI,GAAU,EAAE;IACpD,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;IAC1C,IAAI,IAAI,CAAC,IAAI;QAAE,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC;IAClC,IAAI,IAAI,CAAC,GAAG;QAAE,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC;IAChC,IAAI,IAAI,CAAC,MAAM;QAAE,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC;IACtC,IAAI,IAAI,CAAC,SAAS;QAAE,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC;IAC5C,OAAO;QACL,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE;QACtB,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE;QACtB,KAAK;KACN,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,SAAS,OAAO,CAAC,IAAU;IACzB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;IACtC,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,KAAe;IACzC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAChF,CAAC;IACD,MAAM,KAAK,GAAe,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC3D,MAAM,GAAG,GAAe,EAAE,CAAC;IAC3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,OAAO,GAAa,EAAE,CAAC;QAC3B,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;YACxB,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE;gBAAE,SAAS;YAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAW,EAAE,CAAC,CAAC;YAC7D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACtC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC7B,OAAO,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAW,EAAE,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,SAAS,CAAC,IAAc;IAC/B,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;AAC3C,CAAC;AAED,mDAAmD;AACnD,MAAM,UAAU,SAAS,CAAC,IAAc;IACtC,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,IAAI,IAAI,IAAI;QAAE,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,2DAA2D;AAC3D,MAAM,UAAU,QAAQ,CAAC,IAAc;IACrC,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,KAAK,MAAM,IAAI,IAAI,IAAI;QAAE,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC;IAC1C,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAAC,IAAc,EAAE,GAAW,EAAE,QAAQ,GAAG,GAAG;IACvE,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACxB,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,GAAG;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;IACvD,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,IAAsB,CAAC;IAC3B,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,KAAK,MAAM,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,KAAK;gBAAE,MAAM;YAC/B,IAAI,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC1B,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC;QACf,CAAC;QACD,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;YAChB,IAAI,GAAG,IAAI,CAAC;YACZ,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,CAAC,IAAI,KAAK;YAAE,MAAM;IACxB,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/B,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IACjE,OAAO,GAAG,CAAC;AACb,CAAC;AAED,yDAAyD;AACzD;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAC,IAAc,EAAE,OAAe;IAC7D,IAAI,OAAO,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9B,MAAM,GAAG,GAAW,EAAE,CAAC;IACvB,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;YACvB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACf,SAAS;QACX,CAAC;QACD,IAAI,OAAO,GAAG,KAAK,IAAI,OAAO,EAAE,CAAC;YAC/B,OAAO,IAAI,KAAK,CAAC;YACjB,SAAS;QACX,CAAC;QACD,0EAA0E;QAC1E,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC;QACvE,OAAO,GAAG,OAAO,CAAC;IACpB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,QAAQ,CACtB,IAAc,EACd,KAAa,EACb,KAAK,GAAgC,MAAM;IAE3C,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvC,MAAM,GAAG,GAAG,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,GAAG,CAAC;IACzB,4EAA4E;IAC5E,mEAAmE;IACnE,MAAM,KAAK,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC9E,IAAI,KAAK,KAAK,OAAO;QAAE,OAAO,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC;IACtD,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;QACjC,OAAO,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC;IACxD,CAAC;IACD,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;AACjC,CAAC;AAQD,gFAAgF;AAChF,SAAS,QAAQ,CAAC,IAAc;IAC9B,MAAM,GAAG,GAAY,EAAE,CAAC;IACxB,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5C,IAAI,IAAI,KAAK,EAAE;gBAAE,SAAS;YAC1B,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,8EAA8E;AAC9E,SAAS,QAAQ,CAAC,KAAe;IAC/B,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE;YAAE,SAAS;QAC/B,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACrC,IAAI,QAAQ,IAAI,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC;YAAE,QAAQ,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC;;YACjE,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,SAAS,CAAC,CAAO,EAAE,CAAO;IACjC,OAAO,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK;WACvD,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG;WAC5C,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACpE,CAAC;AAED,8EAA8E;AAC9E,SAAS,OAAO,CAAC,KAAe;IAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACzC,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAS,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC1C,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE;YAAE,MAAM;QAC5B,GAAG,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,SAAS,CAAC,IAAc,EAAE,KAAa;IACrD,IAAI,KAAK,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IAC1B,MAAM,KAAK,GAAe,EAAE,CAAC;IAC7B,IAAI,OAAO,GAAa,EAAE,CAAC;IAC3B,IAAI,YAAY,GAAG,CAAC,CAAC;IAErB,MAAM,IAAI,GAAG,CAAC,IAAa,EAAQ,EAAE;QACnC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QACxD,OAAO,GAAG,EAAE,CAAC;QACb,YAAY,GAAG,CAAC,CAAC;IACnB,CAAC,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,MAAM,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,YAAY,GAAG,CAAC,GAAG,KAAK,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACjD,IAAI,CAAC,IAAI,CAAC,CAAC;YACX,0EAA0E;YAC1E,IAAI,KAAK,CAAC,KAAK;gBAAE,SAAS;QAC5B,CAAC;QACD,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC;YACd,KAAK,MAAM,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtC,IAAI,YAAY,GAAG,CAAC,CAAC,KAAK,GAAG,KAAK;oBAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBAChD,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC1D,YAAY,IAAI,CAAC,CAAC,KAAK,CAAC;YAC1B,CAAC;YACD,SAAS;QACX,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QACnD,YAAY,IAAI,CAAC,CAAC;IACpB,CAAC;IACD,8EAA8E;IAC9E,8EAA8E;IAC9E,4CAA4C;IAC5C,IAAI,CAAC,IAAI,CAAC,CAAC;IACX,OAAO,KAAK,CAAC;AACf,CAAC;AAED,iDAAiD;AACjD,MAAM,UAAU,QAAQ,CAAC,KAAe,EAAE,KAAa;IACrD,MAAM,GAAG,GAAe,EAAE,CAAC;IAC3B,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,kDAAkD;YAClD,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACb,SAAS;QACX,CAAC;QACD,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC;YAAE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/surface.d.ts

@@ -2,6 +2,7 @@ import { FrameBuffer, type Style, type Attributes } from "./buffer.ts";
 import { DEFAULT_COLOR, type Color } from "./color.ts";
 import { type Rect, type Padding } from "./layout.ts";
 import type { Theme } from "./theme.ts";
+import { type SpanLine } from "./richtext.ts";
 export type BorderStyle = "rounded" | "single" | "double" | "thick" | "dashed" | "ascii" | "none";
 export interface BorderChars {
     tl: string;
@@ -32,6 +33,29 @@ export declare const EDGE_LEFT = 8;
 export declare function borderGlyph(style: Exclude<BorderStyle, "none">, bits: number): string | null;
 /** The edges of a border glyph, or null when it is not one. */
 export declare function borderBits(codepoint: number): number | null;
+export type Side = "top" | "right" | "bottom" | "left";
+/**
+ * Which edges of a box to draw. "all" is every side, which is what a box was
+ * before this existed; "none" draws no rule but still insets nothing, the same
+ * as a border style of "none".
+ */
+export type Sides = "all" | "none" | readonly Side[];
+/** The four sides as flags, in the order the drawing code wants them. */
+export interface DrawnSides {
+    top: boolean;
+    right: boolean;
+    bottom: boolean;
+    left: boolean;
+}
+export declare function resolveSides(sides: Sides | undefined): DrawnSides;
+/**
+ * The glyph for a cell where two edges meet, given which of them are drawn.
+ *
+ * A corner is only a corner when both its sides are there. A top-only rule
+ * runs straight through the cell a corner would occupy, which is why this
+ * falls back to the plain rule rather than leaving a gap.
+ */
+export declare function junction(style: Exclude<BorderStyle, "none">, bits: number): string | null;
 export type Align = "left" | "center" | "right";
 export interface TextOptions extends Style {
     align?: Align;
@@ -41,6 +65,11 @@ export interface TextOptions extends Style {
 }
 export interface BoxOptions extends Style {
     border?: BorderStyle;
+    /**
+     * Which edges to draw. Defaults to all four. The interior follows the sides
+     * actually drawn, so a top-only box costs one row rather than two.
+     */
+    sides?: Sides;
     borderColor?: Color;
     title?: string;
     titleAlign?: Align;
@@ -89,6 +118,14 @@ export declare class Surface {
     private mergeBorder;
     /** Draw text at local (x, y). Returns columns written. */
     text(x: number, y: number, text: string, options?: TextOptions): number;
+    /**
+     * Draw one line of styled spans at local (x, y). Returns columns written.
+     *
+     * The same clipping, truncation and alignment as `text`, but each span paints
+     * with its own colours over the options given here, so a line can carry more
+     * than one style. `text` is the single-span case of this.
+     */
+    spans(x: number, y: number, line: SpanLine, options?: TextOptions): number;
     /** Text positioned within the full surface width. */
     textAligned(y: number, text: string, align: Align, options?: TextOptions): void;
     fill(style: Style, ch?: number): void;

package/dist/surface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"surface.d.ts","sourceRoot":"","sources":["../src/surface.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"surface.d.ts","sourceRoot":"","sources":["../src/surface.ts"],"names":[],"mappings":"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"}

package/dist/surface.js

@@ -2,6 +2,7 @@ import { FrameBuffer } from "./buffer.js";
 import { DEFAULT_COLOR } from "./color.js";
 import { inset, intersect, isEmpty } from "./layout.js";
 import { graphemes, stringWidth, truncate, fit } from "./unicode.js";
+import { fitSpans, spanStyle, spanWidth, truncateSpans } from "./richtext.js";
 export const BORDERS = {
     rounded: { tl: "╭", tr: "╮", bl: "╰", br: "╯", h: "─", v: "│", ml: "├", mr: "┤", mt: "┬", mb: "┴", cross: "┼" },
     single: { tl: "┌", tr: "┐", bl: "└", br: "┘", h: "─", v: "│", ml: "├", mr: "┤", mt: "┬", mb: "┴", cross: "┼" },
@@ -61,6 +62,35 @@ export function borderGlyph(style, bits) {
 export function borderBits(codepoint) {
     return BITS_BY_CODEPOINT.get(codepoint) ?? null;
 }
+export function resolveSides(sides) {
+    if (sides === undefined || sides === "all") {
+        return { top: true, right: true, bottom: true, left: true };
+    }
+    if (sides === "none")
+        return { top: false, right: false, bottom: false, left: false };
+    return {
+        top: sides.includes("top"),
+        right: sides.includes("right"),
+        bottom: sides.includes("bottom"),
+        left: sides.includes("left"),
+    };
+}
+/**
+ * The glyph for a cell where two edges meet, given which of them are drawn.
+ *
+ * A corner is only a corner when both its sides are there. A top-only rule
+ * runs straight through the cell a corner would occupy, which is why this
+ * falls back to the plain rule rather than leaving a gap.
+ */
+export function junction(style, bits) {
+    if (bits === 0)
+        return null;
+    const glyph = borderGlyph(style, bits);
+    if (glyph !== null)
+        return glyph;
+    const chars = BORDERS[style];
+    return bits & (EDGE_LEFT | EDGE_RIGHT) ? chars.h : chars.v;
+}
 /**
  * A clipped, translated view onto the framebuffer. Widgets only ever see a
  * Surface, so nothing can draw outside the rectangle it was given.
@@ -164,6 +194,45 @@ export class Surface {
         }
         return written;
     }
+    /**
+     * Draw one line of styled spans at local (x, y). Returns columns written.
+     *
+     * The same clipping, truncation and alignment as `text`, but each span paints
+     * with its own colours over the options given here, so a line can carry more
+     * than one style. `text` is the single-span case of this.
+     */
+    spans(x, y, line, options = {}) {
+        const ay = this.rect.y + y;
+        const c = this.clip;
+        if (ay < c.y || ay >= c.y + c.height)
+            return 0;
+        const limit = Math.min(options.maxWidth ?? this.width - x, this.width - x);
+        if (limit <= 0)
+            return 0;
+        let content = line;
+        if (options.ellipsis !== false && spanWidth(content) > limit) {
+            content = truncateSpans(content, limit);
+        }
+        if (options.align && options.align !== "left") {
+            content = fitSpans(content, limit, options.align);
+        }
+        const base = { fg: options.fg, bg: options.bg, attrs: options.attrs };
+        let cx = this.rect.x + x;
+        let written = 0;
+        for (const span of content) {
+            const style = spanStyle(span, base);
+            for (const g of graphemes(span.text)) {
+                if (written + g.width > limit)
+                    return written;
+                if (cx >= c.x && cx + g.width <= c.x + c.width) {
+                    this.buffer.setCell(cx, ay, g.value, style);
+                }
+                cx += g.width;
+                written += g.width;
+            }
+        }
+        return written;
+    }
     /** Text positioned within the full surface width. */
     textAligned(y, text, align, options = {}) {
         this.text(0, y, fit(truncate(text, this.width), this.width, align), { ...options, align: "left" });
@@ -199,11 +268,29 @@ export class Surface {
         const style = options.border ?? "rounded";
         const fg = options.borderColor ?? this.theme.border;
         const bg = options.bg;
+        const sides = resolveSides(options.sides);
+        const any = sides.top || sides.right || sides.bottom || sides.left;
+        const drawsBorder = style !== "none" && any && this.width >= 2 && this.height >= 1;
         if (options.fill !== false && bg !== undefined) {
-            this.fill({ bg });
+            if (drawsBorder && options.collapse) {
+                // The border ring is left to the border drawing below, which merges
+                // with whatever a neighbour already put in the shared column. Filling
+                // it here first would erase that border, and the merge would then find
+                // a blank cell and simply overwrite it -- which is why a panel with a
+                // background collapsed its seams into a corner rather than a junction.
+                // Every cell skipped here is painted by the border, in the same bg.
+                const top = sides.top ? 1 : 0;
+                const bottom = this.height > 1 && sides.bottom ? 1 : 0;
+                const left = sides.left ? 1 : 0;
+                const right = sides.right ? 1 : 0;
+                this.fillRect(left, top, Math.max(0, this.width - left - right), Math.max(0, this.height - top - bottom), { bg });
+            }
+            else {
+                this.fill({ bg });
+            }
         }
-        if (style === "none" || this.width < 2 || this.height < 1) {
-            return this.inset(style === "none" ? 0 : 1);
+        if (!drawsBorder) {
+            return this.inset(style === "none" || !any ? 0 : 1);
         }
         const b = BORDERS[style];
         const w = this.width;
@@ -223,22 +310,37 @@ export class Surface {
             for (let i = 0; i < length; i++)
                 put(x, y + i, ch);
         };
-        put(0, 0, b.tl);
-        put(w - 1, 0, b.tr);
-        putH(1, 0, w - 2, b.h);
+        // A corner belongs to the two sides that meet there, so it exists only if
+        // both of them are drawn; where one is, the rule runs straight through.
+        const corner = (a, aBit, c, cBit) => junction(style, (a ? aBit : 0) | (c ? cBit : 0));
+        const tl = corner(sides.top, EDGE_RIGHT, sides.left, EDGE_DOWN);
+        const tr = corner(sides.top, EDGE_LEFT, sides.right, EDGE_DOWN);
+        if (sides.top)
+            putH(1, 0, w - 2, b.h);
+        if (tl !== null)
+            put(0, 0, tl);
+        if (tr !== null)
+            put(w - 1, 0, tr);
         if (h > 1) {
-            put(0, h - 1, b.bl);
-            put(w - 1, h - 1, b.br);
-            putH(1, h - 1, w - 2, b.h);
-            putV(0, 1, h - 2, b.v);
-            putV(w - 1, 1, h - 2, b.v);
+            const bl = corner(sides.bottom, EDGE_RIGHT, sides.left, EDGE_UP);
+            const br = corner(sides.bottom, EDGE_LEFT, sides.right, EDGE_UP);
+            if (sides.bottom)
+                putH(1, h - 1, w - 2, b.h);
+            if (bl !== null)
+                put(0, h - 1, bl);
+            if (br !== null)
+                put(w - 1, h - 1, br);
+            if (sides.left)
+                putV(0, 1, h - 2, b.v);
+            if (sides.right)
+                putV(w - 1, 1, h - 2, b.v);
         }
         // Measured before the title is drawn: both share the top border row, and
         // the title used to be truncated against the full width and then painted
         // over by the subtitle.
         const subtitle = options.subtitle ? ` ${options.subtitle} ` : "";
         const subtitleWidth = subtitle && stringWidth(subtitle) + 4 < w ? stringWidth(subtitle) : 0;
-        if (options.title) {
+        if (options.title && sides.top) {
             const titleColor = options.titleColor ?? this.theme.title;
             const label = ` ${options.title} `;
             // The title lives in [2, limit). Reserving the width is not enough on its
@@ -259,20 +361,26 @@ export class Surface {
                     : Math.max(2, Math.min(limit - tw, Math.floor((w - tw) / 2)));
             this.text(tx, 0, shown, { fg: titleColor, bg, attrs: 1 /* bold */ });
         }
-        if (subtitleWidth > 0) {
+        if (subtitleWidth > 0 && sides.top) {
             this.text(w - 2 - subtitleWidth, 0, subtitle, {
                 fg: options.subtitleColor ?? this.theme.muted,
                 bg,
             });
         }
-        if (options.footer && h > 2) {
+        if (options.footer && sides.bottom && h > 2) {
             const foot = ` ${options.footer} `;
             const fw = stringWidth(foot);
             if (fw + 4 < w) {
                 this.text(2, h - 1, foot, { fg: options.footerColor ?? this.theme.muted, bg });
             }
         }
-        return this.sub(1, 1, Math.max(0, w - 2), Math.max(0, h - 2));
+        // The interior follows the sides actually drawn, so a top-only box costs
+        // one row rather than two.
+        const left = sides.left ? 1 : 0;
+        const top = sides.top ? 1 : 0;
+        const shrinkX = left + (sides.right ? 1 : 0);
+        const shrinkY = top + (sides.bottom ? 1 : 0);
+        return this.sub(left, top, Math.max(0, w - shrinkX), Math.max(0, h - shrinkY));
     }
     /** Absolute rect of this surface, for hit-testing mouse events. */
     hitRect() {