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

package/build/measure-text.js

@@ -1,126 +1,115 @@
 import stringWidth from 'string-width';
-import { tokenize, styledCharsFromTokens, } from '@alcalzone/ansi-tokenize';
+import { tokenize, styledLineFromTokens } from './tokenize.js';
+import { StyledLine } from './styled-line.js';
 import { DataLimitedLruMap } from './data-limited-lru-map.js';
 const defaultStringWidth = stringWidth;
 let currentStringWidth = defaultStringWidth;
 // This cache must be cleared each time the string width function is changed.
-// The strings passed as input are single characters so there is no need to
-// limit the size of the cache as there are only a limited number of valid
-// characters.
 const widthCache = new Map();
 // This cache can persist for the lifetime of the application.
-// The keys for this cache can be very large so we need to limit the size
-// of the data cached as well as the number of keys cached to prevent
-// memory issues.
-const toStyledCharactersCache = new DataLimitedLruMap(10_000, 1_000_000);
+const toStyledCharactersCache = new DataLimitedLruMap(2000, 100_000);
+let toStyledCharactersCacheEnabled = true;
+export function setEnableToStyledCharactersCache(enabled) {
+    toStyledCharactersCacheEnabled = enabled;
+    if (!enabled) {
+        toStyledCharactersCache.clear();
+    }
+}
 export function setStringWidthFunction(fn) {
     currentStringWidth = fn;
-    // Clear the width cache to avoid stale values.
     clearStringWidthCache();
 }
 export function clearStringWidthCache() {
     widthCache.clear();
 }
+export function clearToStyledCharactersCache() {
+    toStyledCharactersCache.clear();
+}
 export function toStyledCharacters(text) {
-    const cached = toStyledCharactersCache.get(text);
-    if (cached !== undefined) {
-        return cached;
+    if (toStyledCharactersCacheEnabled) {
+        const cached = toStyledCharactersCache.get(text);
+        if (cached !== undefined) {
+            return cached;
+        }
     }
     const tokens = tokenize(text);
-    const characters = styledCharsFromTokens(tokens);
-    const combinedCharacters = [];
+    const characters = styledLineFromTokens(tokens);
+    const combinedLine = new StyledLine();
     for (let i = 0; i < characters.length; i++) {
-        const character = characters[i];
-        if (!character) {
-            continue;
-        }
-        if (character.value === '\t') {
-            const spaceCharacter = { ...character, value: ' ' };
-            combinedCharacters.push(spaceCharacter, spaceCharacter, spaceCharacter, spaceCharacter);
+        const value = characters.getValue(i);
+        const formatFlags = characters.getFormatFlags(i);
+        const fgColor = characters.getFgColor(i);
+        const bgColor = characters.getBgColor(i);
+        const link = characters.getLink(i);
+        if (value === '\t') {
+            for (let j = 0; j < 4; j++) {
+                combinedLine.pushChar(' ', formatFlags, fgColor, bgColor, link);
+            }
             continue;
         }
-        if (character.value === '\b') {
+        if (value === '\b') {
             continue;
         }
-        let { value } = character;
+        let combinedValue = value;
         let isCombined = false;
-        const firstCodePoint = value.codePointAt(0);
+        const firstCodePoint = combinedValue.codePointAt(0);
         // 1. Regional Indicators (Flags)
-        // These combine in pairs.
-        // See: https://en.wikipedia.org/wiki/Regional_indicator_symbol
         if (firstCodePoint &&
             firstCodePoint >= 0x1_f1_e6 &&
             firstCodePoint <= 0x1_f1_ff &&
             i + 1 < characters.length) {
-            const nextCharacter = characters[i + 1];
-            if (nextCharacter) {
-                const nextFirstCodePoint = nextCharacter.value.codePointAt(0);
-                if (nextFirstCodePoint &&
-                    nextFirstCodePoint >= 0x1_f1_e6 &&
-                    nextFirstCodePoint <= 0x1_f1_ff) {
-                    value += nextCharacter.value;
-                    i++;
-                    combinedCharacters.push({ ...character, value });
-                    continue;
-                }
+            const nextValue = characters.getValue(i + 1);
+            const nextFirstCodePoint = nextValue.codePointAt(0);
+            if (nextFirstCodePoint &&
+                nextFirstCodePoint >= 0x1_f1_e6 &&
+                nextFirstCodePoint <= 0x1_f1_ff) {
+                combinedValue += nextValue;
+                i++;
+                isCombined = true;
             }
         }
-        // 2. Other combining characters
-        // See: https://en.wikipedia.org/wiki/Combining_character
-        while (i + 1 < characters.length) {
-            const nextCharacter = characters[i + 1];
-            if (!nextCharacter) {
-                break;
-            }
-            const codePoints = [...nextCharacter.value].map(char => char.codePointAt(0));
-            const nextFirstCodePoint = codePoints[0];
-            if (!nextFirstCodePoint) {
-                break;
-            }
-            // Unicode Mark category includes:
-            // - Combining Diacritical Marks (U+0300-036F)
-            // - Thai combining characters (U+0E31-0E3A, U+0E47-0E4E)
-            // - Variation selectors (U+FE00-FE0F)
-            // - Combining enclosing keycap (U+20E3)
-            // - And many other combining marks across Unicode
-            const isUnicodeMark = /\p{Mark}/u.test(nextCharacter.value);
-            // Skin tone modifiers (emoji modifiers, not in Mark category)
-            const isSkinToneModifier = nextFirstCodePoint >= 0x1_f3_fb && nextFirstCodePoint <= 0x1_f3_ff;
-            // Zero-width joiner (used in emoji sequences)
-            const isZeroWidthJoiner = nextFirstCodePoint === 0x20_0d;
-            // Tags block (U+E0000 - U+E007F, used for flag emoji)
-            const isTagsBlock = nextFirstCodePoint >= 0xe_00_00 && nextFirstCodePoint <= 0xe_00_7f;
-            const isCombining = isUnicodeMark || isSkinToneModifier || isZeroWidthJoiner || isTagsBlock;
-            if (!isCombining) {
-                break;
-            }
-            // Merge with previous character
-            value += nextCharacter.value;
-            i++; // Consume next character.
-            isCombined = true;
-            // If it was a ZWJ, also consume the character after it.
-            if (isZeroWidthJoiner && i + 1 < characters.length) {
-                const characterAfterZwj = characters[i + 1];
-                if (characterAfterZwj) {
-                    value += characterAfterZwj.value;
-                    i++; // Consume character after ZWJ.
+        if (!isCombined) {
+            // 2. Other combining characters
+            while (i + 1 < characters.length) {
+                const nextValue = characters.getValue(i + 1);
+                if (!nextValue)
+                    break;
+                const nextFirstCodePoint = nextValue.codePointAt(0);
+                if (!nextFirstCodePoint)
+                    break;
+                const isUnicodeMark = /\p{Mark}/u.test(nextValue);
+                const isSkinToneModifier = nextFirstCodePoint >= 0x1_f3_fb && nextFirstCodePoint <= 0x1_f3_ff;
+                const isZeroWidthJoiner = nextFirstCodePoint === 0x20_0d;
+                const isTagsBlock = nextFirstCodePoint >= 0xe_00_00 && nextFirstCodePoint <= 0xe_00_7f;
+                const isCombining = isUnicodeMark ||
+                    isSkinToneModifier ||
+                    isZeroWidthJoiner ||
+                    isTagsBlock;
+                if (!isCombining) {
+                    break;
+                }
+                combinedValue += nextValue;
+                i++;
+                if (isZeroWidthJoiner && i + 1 < characters.length) {
+                    const characterAfterZwj = characters.getValue(i + 1);
+                    if (characterAfterZwj) {
+                        combinedValue += characterAfterZwj;
+                        i++;
+                    }
                 }
             }
         }
-        if (isCombined) {
-            combinedCharacters.push({ ...character, value });
-        }
-        else {
-            combinedCharacters.push(character);
-        }
+        combinedLine.pushChar(combinedValue, formatFlags, fgColor, bgColor, link);
     }
-    toStyledCharactersCache.set(text, combinedCharacters);
-    return combinedCharacters;
+    if (toStyledCharactersCacheEnabled) {
+        toStyledCharactersCache.set(text, combinedLine);
+    }
+    return combinedLine;
 }
-export function styledCharsWidth(styledChars) {
+export function styledCharsWidth(line) {
     let length = 0;
-    for (const char of styledChars) {
-        length += inkCharacterWidth(char.value);
+    for (let i = 0; i < line.length; i++) {
+        length += inkCharacterWidth(line.getValue(i));
     }
     return length;
 }
@@ -134,27 +123,32 @@ export function inkCharacterWidth(text) {
         calculatedWidth = currentStringWidth(text);
     }
     catch {
-        // Ignore errors and use default width of 1.
-        // We catch this result to avoid throwing exceptions repeatedly.
         calculatedWidth = 1;
         console.warn(`Failed to calculate string width for ${JSON.stringify(text)}`);
     }
     widthCache.set(text, calculatedWidth);
     return calculatedWidth;
 }
-export function wordBreakStyledChars(styledChars) {
+export function wordBreakStyledChars(line) {
     const words = [];
-    let currentWord = [];
-    for (const char of styledChars) {
-        if (char.value === '\n' || char.value === ' ') {
+    let currentWord = new StyledLine();
+    for (let i = 0; i < line.length; i++) {
+        const val = line.getValue(i);
+        const flags = line.getFormatFlags(i);
+        const fg = line.getFgColor(i);
+        const bg = line.getBgColor(i);
+        const link = line.getLink(i);
+        if (val === '\n' || val === ' ') {
             if (currentWord.length > 0) {
                 words.push(currentWord);
             }
-            currentWord = [];
-            words.push([char]);
+            currentWord = new StyledLine();
+            const spaceLine = new StyledLine();
+            spaceLine.pushChar(val, flags, fg, bg, link);
+            words.push(spaceLine);
         }
         else {
-            currentWord.push(char);
+            currentWord.pushChar(val, flags, fg, bg, link);
         }
     }
     if (currentWord.length > 0) {
@@ -162,14 +156,17 @@ export function wordBreakStyledChars(styledChars) {
     }
     return words;
 }
-export function splitStyledCharsByNewline(styledChars) {
-    const lines = [[]];
-    for (const char of styledChars) {
-        if (char.value === '\n') {
-            lines.push([]);
+export function splitStyledCharsByNewline(line) {
+    const lines = [new StyledLine()];
+    for (let i = 0; i < line.length; i++) {
+        const val = line.getValue(i);
+        if (val === '\n') {
+            lines.push(new StyledLine());
         }
         else {
-            lines.at(-1).push(char);
+            lines
+                .at(-1)
+                .pushChar(val, line.getFormatFlags(i), line.getFgColor(i), line.getBgColor(i), line.getLink(i));
         }
     }
     return lines;
@@ -181,56 +178,35 @@ export function widestLineFromStyledChars(lines) {
     }
     return maxWidth;
 }
-export function styledCharsToString(styledChars) {
-    let result = '';
-    for (const char of styledChars) {
-        result += char.value;
-    }
-    return result;
+export function styledCharsToString(line) {
+    return line.getValues().join('');
 }
-export function measureStyledChars(styledChars) {
-    if (styledChars.length === 0) {
-        return {
-            width: 0,
-            height: 0,
-        };
+export function measureStyledChars(line) {
+    if (line.length === 0) {
+        return { width: 0, height: 0 };
     }
-    const lines = splitStyledCharsByNewline(styledChars);
+    const lines = splitStyledCharsByNewline(line);
     const width = widestLineFromStyledChars(lines);
     const height = lines.length;
-    const dimensions = { width, height };
-    return dimensions;
+    return { width, height };
 }
-/**
- * Calculate row and column position at a given character offset.
- * This is the unified cursor position calculation logic used by both
- * render-node-to-output.ts and output.ts.
- *
- * The character offset counting method matches CharOffsetMap used in
- * selection.ts and squash-text-nodes.ts, ensuring consistent behavior
- * between cursor positioning and text selection.
- *
- * Character counting rules:
- * - Each StyledChar counts by its value.length (handles combining marks)
- * - Newlines ('\n') advance row and reset column
- * - Other characters add their visual width to column
- */
-export function getPositionAtOffset(styledChars, targetOffset) {
+export function getPositionAtOffset(line, targetOffset) {
     let row = 0;
     let col = 0;
     let charCount = 0;
-    for (const char of styledChars) {
+    for (let i = 0; i < line.length; i++) {
         if (charCount >= targetOffset) {
             break;
         }
-        if (char.value === '\n') {
+        const val = line.getValue(i);
+        if (val === '\n') {
             row++;
             col = 0;
         }
         else {
-            col += inkCharacterWidth(char.value);
+            col += inkCharacterWidth(val);
         }
-        charCount += char.value.length;
+        charCount += val.length;
     }
     return { row, col };
 }

package/build/measure-text.js.map

@@ -1 +1 @@
-{"version":3,"file":"measure-text.js","sourceRoot":"","sources":["../src/measure-text.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"measure-text.js","sourceRoot":"","sources":["../src/measure-text.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,QAAQ,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,iBAAiB,EAAC,MAAM,2BAA2B,CAAC;AAkB5D,MAAM,kBAAkB,GAAgB,WAAW,CAAC;AAEpD,IAAI,kBAAkB,GAAgB,kBAAkB,CAAC;AAEzD,6EAA6E;AAC7E,MAAM,UAAU,GAAG,IAAI,GAAG,EAAkB,CAAC;AAE7C,8DAA8D;AAC9D,MAAM,uBAAuB,GAAG,IAAI,iBAAiB,CACpD,IAAI,EACJ,OAAO,CACP,CAAC;AAEF,IAAI,8BAA8B,GAAG,IAAI,CAAC;AAE1C,MAAM,UAAU,gCAAgC,CAAC,OAAgB;IAChE,8BAA8B,GAAG,OAAO,CAAC;IACzC,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,uBAAuB,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;AACF,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,EAAe;IACrD,kBAAkB,GAAG,EAAE,CAAC;IACxB,qBAAqB,EAAE,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,qBAAqB;IACpC,UAAU,CAAC,KAAK,EAAE,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,4BAA4B;IAC3C,uBAAuB,CAAC,KAAK,EAAE,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC9C,IAAI,8BAA8B,EAAE,CAAC;QACpC,MAAM,MAAM,GAAG,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC;QACf,CAAC;IACF,CAAC;IAED,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,UAAU,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAC;IAEtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5C,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,WAAW,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACjD,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAEnC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5B,YAAY,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YACjE,CAAC;YAED,SAAS;QACV,CAAC;QAED,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACpB,SAAS;QACV,CAAC;QAED,IAAI,aAAa,GAAG,KAAK,CAAC;QAC1B,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,MAAM,cAAc,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAEpD,iCAAiC;QACjC,IACC,cAAc;YACd,cAAc,IAAI,SAAS;YAC3B,cAAc,IAAI,SAAS;YAC3B,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,EACxB,CAAC;YACF,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7C,MAAM,kBAAkB,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YAEpD,IACC,kBAAkB;gBAClB,kBAAkB,IAAI,SAAS;gBAC/B,kBAAkB,IAAI,SAAS,EAC9B,CAAC;gBACF,aAAa,IAAI,SAAS,CAAC;gBAC3B,CAAC,EAAE,CAAC;gBACJ,UAAU,GAAG,IAAI,CAAC;YACnB,CAAC;QACF,CAAC;QAED,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,gCAAgC;YAChC,OAAO,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;gBAClC,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC7C,IAAI,CAAC,SAAS;oBAAE,MAAM;gBAEtB,MAAM,kBAAkB,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACpD,IAAI,CAAC,kBAAkB;oBAAE,MAAM;gBAE/B,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAClD,MAAM,kBAAkB,GACvB,kBAAkB,IAAI,SAAS,IAAI,kBAAkB,IAAI,SAAS,CAAC;gBACpE,MAAM,iBAAiB,GAAG,kBAAkB,KAAK,OAAO,CAAC;gBACzD,MAAM,WAAW,GAChB,kBAAkB,IAAI,SAAS,IAAI,kBAAkB,IAAI,SAAS,CAAC;gBAEpE,MAAM,WAAW,GAChB,aAAa;oBACb,kBAAkB;oBAClB,iBAAiB;oBACjB,WAAW,CAAC;gBAEb,IAAI,CAAC,WAAW,EAAE,CAAC;oBAClB,MAAM;gBACP,CAAC;gBAED,aAAa,IAAI,SAAS,CAAC;gBAC3B,CAAC,EAAE,CAAC;gBAEJ,IAAI,iBAAiB,IAAI,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;oBACpD,MAAM,iBAAiB,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;oBACrD,IAAI,iBAAiB,EAAE,CAAC;wBACvB,aAAa,IAAI,iBAAiB,CAAC;wBACnC,CAAC,EAAE,CAAC;oBACL,CAAC;gBACF,CAAC;YACF,CAAC;QACF,CAAC;QAED,YAAY,CAAC,QAAQ,CAAC,aAAa,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3E,CAAC;IAED,IAAI,8BAA8B,EAAE,CAAC;QACpC,uBAAuB,CAAC,GAAG,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,YAAY,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAgB;IAChD,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,IAAI,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC7C,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC;IACd,CAAC;IAED,IAAI,eAAuB,CAAC;IAC5B,IAAI,CAAC;QACJ,eAAe,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAAC,MAAM,CAAC;QACR,eAAe,GAAG,CAAC,CAAC;QACpB,OAAO,CAAC,IAAI,CACX,wCAAwC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAC9D,CAAC;IACH,CAAC;IAED,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACtC,OAAO,eAAe,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAgB;IACpD,MAAM,KAAK,GAAiB,EAAE,CAAC;IAC/B,IAAI,WAAW,GAAG,IAAI,UAAU,EAAE,CAAC;IAEnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAE7B,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,GAAG,EAAE,CAAC;YACjC,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5B,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzB,CAAC;YAED,WAAW,GAAG,IAAI,UAAU,EAAE,CAAC;YAC/B,MAAM,SAAS,GAAG,IAAI,UAAU,EAAE,CAAC;YACnC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAC7C,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACP,WAAW,CAAC,QAAQ,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QAChD,CAAC;IACF,CAAC;IAED,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACzB,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,IAAgB;IACzD,MAAM,KAAK,GAAiB,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC;IAE/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YAClB,KAAK,CAAC,IAAI,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACP,KAAK;iBACH,EAAE,CAAC,CAAC,CAAC,CAAE;iBACP,QAAQ,CACR,GAAG,EACH,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EACtB,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAClB,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAClB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CACf,CAAC;QACJ,CAAC;IACF,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,KAAmB;IAC5D,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QAC1B,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAgB;IACnD,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAgB;IAIlD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC,CAAC;IAC9B,CAAC;IAED,MAAM,KAAK,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,KAAK,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,OAAO,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAClC,IAAgB,EAChB,YAAoB;IAEpB,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,IAAI,SAAS,IAAI,YAAY,EAAE,CAAC;YAC/B,MAAM;QACP,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YAClB,GAAG,EAAE,CAAC;YACN,GAAG,GAAG,CAAC,CAAC;QACT,CAAC;aAAM,CAAC;YACP,GAAG,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAC/B,CAAC;QAED,SAAS,IAAI,GAAG,CAAC,MAAM,CAAC;IACzB,CAAC;IAED,OAAO,EAAC,GAAG,EAAE,GAAG,EAAC,CAAC;AACnB,CAAC"}

package/build/output.d.ts

@@ -1,4 +1,3 @@
-import { type StyledChar } from '@alcalzone/ansi-tokenize';
 import { type OutputTransformer } from './render-node-to-output.js';
 import { type CursorPosition } from './log-update.js';
 import { type StickyHeader, type DOMElement } from './dom.js';
@@ -9,12 +8,14 @@ Handles the positioning and saving of the output of each node in the tree. Also
 
 Used to generate the final output of all nodes before writing it to actual output stream (e.g. stdout)
 */
-export declare function clampCursorColumn(line: readonly StyledChar[], col: number): number;
+import { StyledLine } from './styled-line.js';
+export declare function clampCursorColumn(line: StyledLine, col: number): number;
 type Options = {
     width: number;
     height: number;
     node?: DOMElement;
     id?: string | number;
+    trackSelection?: boolean;
 };
 type Clip = {
     x1: number | undefined;
@@ -54,8 +55,8 @@ export type Region = {
     y: number;
     width: number;
     height: number;
-    readonly lines: ReadonlyArray<readonly StyledChar[]>;
-    readonly styledOutput: ReadonlyArray<readonly StyledChar[]>;
+    readonly lines: readonly StyledLine[];
+    readonly styledOutput: readonly StyledLine[];
     isScrollable: boolean;
     isVerticallyScrollable?: boolean;
     isHorizontallyScrollable?: boolean;
@@ -91,6 +92,12 @@ export type RegionNode = {
     id: string | number;
     children: RegionNode[];
 };
+export declare function treesEqual(a: RegionNode, b: RegionNode): boolean;
+export type SerializedStickyHeader = Omit<StickyHeader, 'lines' | 'stuckLines' | 'styledOutput' | 'node'> & {
+    lines: Uint8Array;
+    stuckLines?: Uint8Array;
+    styledOutput: Uint8Array;
+};
 export type RegionUpdate = {
     id: string | number;
     x?: number;
@@ -113,7 +120,7 @@ export type RegionUpdate = {
     opaque?: boolean;
     borderTop?: number;
     borderBottom?: number;
-    stickyHeaders?: StickyHeader[];
+    stickyHeaders?: SerializedStickyHeader[];
     lines?: {
         updates: Array<{
             start: number;
@@ -151,6 +158,7 @@ export declare function copyRegionProperty<K extends (typeof regionLayoutPropert
 export default class Output {
     width: number;
     height: number;
+    trackSelection: boolean;
     root: Region;
     private readonly activeRegionStack;
     private readonly clips;
@@ -190,7 +198,7 @@ export default class Output {
     }): void;
     endChildRegion(): void;
     addStickyHeader(header: StickyHeader): void;
-    write(x: number, y: number, items: string | StyledChar[], options: {
+    write(x: number, y: number, items: string | StyledLine, options: {
         transformers: OutputTransformer[];
         lineIndex?: number;
         preserveBackgroundColor?: boolean;
@@ -202,7 +210,6 @@ export default class Output {
     unclip(): void;
     get(): Region;
     addRegionTree(region: Region, x: number, y: number): void;
-    private cloneRegion;
     private trimRegionLines;
     private clampCursorPosition;
     private initLines;
@@ -210,12 +217,6 @@ export default class Output {
     private clearRange;
     private clipChars;
 }
-/**
- * Flattens a hierarchy of nested regions into a single 2D array of styled characters
- * that represents the final visual output to be written to the terminal.
- * This effectively renders the nested region tree (much like compositing layers
- * in a web browser) into a single screen buffer.
- */
 export declare function flattenRegion(root: Region, options?: {
     context?: {
         cursorPosition?: {
@@ -225,7 +226,7 @@ export declare function flattenRegion(root: Region, options?: {
     };
     skipScrollbars?: boolean;
     skipStickyHeaders?: boolean;
-}): StyledChar[][];
+}): StyledLine[];
 export declare const extractSelectableText: (spans: Array<{
     y: number;
     startX: number;