@nuvin/ink 6.6.7 → 7.0.0-alpha

package/build/log-update.js

@@ -1,121 +1,246 @@
 import ansiEscapes from 'ansi-escapes';
 import cliCursor from 'cli-cursor';
+import { cursorPositionChanged, buildCursorSuffix, buildCursorOnlySequence, buildReturnToBottomPrefix, hideCursorEscape, } from './cursor-helpers.js';
+// Count visible lines in a string, ignoring the trailing empty element
+// that `split('\n')` produces when the string ends with '\n'.
+const visibleLineCount = (lines, str) => str.endsWith('\n') ? lines.length - 1 : lines.length;
 const createStandard = (stream, { showCursor = false } = {}) => {
     let previousLineCount = 0;
     let previousOutput = '';
     let hasHiddenCursor = false;
+    let cursorPosition;
+    let cursorDirty = false;
+    let previousCursorPosition;
+    let cursorWasShown = false;
+    const getActiveCursor = () => (cursorDirty ? cursorPosition : undefined);
+    const hasChanges = (str, activeCursor) => {
+        const cursorChanged = cursorPositionChanged(activeCursor, previousCursorPosition);
+        return str !== previousOutput || cursorChanged;
+    };
     const render = (str) => {
         if (!showCursor && !hasHiddenCursor) {
-            cliCursor.hide();
+            cliCursor.hide(stream);
             hasHiddenCursor = true;
         }
-        const output = str;
-        if (output === previousOutput) {
-            return;
+        // Only use cursor if setCursorPosition was called since last render.
+        // This ensures stale positions don't persist after component unmount.
+        const activeCursor = getActiveCursor();
+        cursorDirty = false;
+        const cursorChanged = cursorPositionChanged(activeCursor, previousCursorPosition);
+        if (!hasChanges(str, activeCursor)) {
+            return false;
+        }
+        const lines = str.split('\n');
+        const visibleCount = visibleLineCount(lines, str);
+        const cursorSuffix = buildCursorSuffix(visibleCount, activeCursor);
+        if (str === previousOutput && cursorChanged) {
+            stream.write(buildCursorOnlySequence({
+                cursorWasShown,
+                previousLineCount,
+                previousCursorPosition,
+                visibleLineCount: visibleCount,
+                cursorPosition: activeCursor,
+            }));
+        }
+        else {
+            previousOutput = str;
+            const returnPrefix = buildReturnToBottomPrefix(cursorWasShown, previousLineCount, previousCursorPosition);
+            stream.write(returnPrefix +
+                ansiEscapes.eraseLines(previousLineCount) +
+                str +
+                cursorSuffix);
+            previousLineCount = lines.length;
         }
-        previousOutput = output;
-        stream.write(ansiEscapes.eraseLines(previousLineCount) + output);
-        previousLineCount = output.split('\n').length;
+        previousCursorPosition = activeCursor ? { ...activeCursor } : undefined;
+        cursorWasShown = activeCursor !== undefined;
+        return true;
     };
     render.clear = () => {
-        stream.write(ansiEscapes.eraseLines(previousLineCount));
+        const prefix = buildReturnToBottomPrefix(cursorWasShown, previousLineCount, previousCursorPosition);
+        stream.write(prefix + ansiEscapes.eraseLines(previousLineCount));
         previousOutput = '';
         previousLineCount = 0;
+        previousCursorPosition = undefined;
+        cursorWasShown = false;
     };
     render.done = () => {
-        // On exit, we write a finally newline to restore the terminal prompt properly,
-        // unless the output was empty.
-        if (previousOutput.length > 0) {
-            stream.write('\n');
-        }
         previousOutput = '';
         previousLineCount = 0;
+        previousCursorPosition = undefined;
+        cursorWasShown = false;
         if (!showCursor) {
-            cliCursor.show();
+            cliCursor.show(stream);
             hasHiddenCursor = false;
         }
     };
+    render.reset = () => {
+        previousOutput = '';
+        previousLineCount = 0;
+        previousCursorPosition = undefined;
+        cursorWasShown = false;
+    };
     render.sync = (str) => {
-        const output = str;
-        previousOutput = output;
-        previousLineCount = output.split('\n').length;
+        const activeCursor = cursorDirty ? cursorPosition : undefined;
+        cursorDirty = false;
+        const lines = str.split('\n');
+        previousOutput = str;
+        previousLineCount = lines.length;
+        if (!activeCursor && cursorWasShown) {
+            stream.write(hideCursorEscape);
+        }
+        if (activeCursor) {
+            stream.write(buildCursorSuffix(visibleLineCount(lines, str), activeCursor));
+        }
+        previousCursorPosition = activeCursor ? { ...activeCursor } : undefined;
+        cursorWasShown = activeCursor !== undefined;
+    };
+    render.setCursorPosition = (position) => {
+        cursorPosition = position;
+        cursorDirty = true;
     };
+    render.isCursorDirty = () => cursorDirty;
+    render.willRender = (str) => hasChanges(str, getActiveCursor());
     return render;
 };
 const createIncremental = (stream, { showCursor = false } = {}) => {
     let previousLines = [];
     let previousOutput = '';
     let hasHiddenCursor = false;
+    let cursorPosition;
+    let cursorDirty = false;
+    let previousCursorPosition;
+    let cursorWasShown = false;
+    const getActiveCursor = () => (cursorDirty ? cursorPosition : undefined);
+    const hasChanges = (str, activeCursor) => {
+        const cursorChanged = cursorPositionChanged(activeCursor, previousCursorPosition);
+        return str !== previousOutput || cursorChanged;
+    };
     const render = (str) => {
         if (!showCursor && !hasHiddenCursor) {
-            cliCursor.hide();
+            cliCursor.hide(stream);
             hasHiddenCursor = true;
         }
-        const output = str;
-        if (output === previousOutput) {
-            return;
-        }
-        const previousCount = previousLines.length;
-        const nextLines = output.split('\n');
-        const nextCount = nextLines.length;
-        const visibleCount = nextCount;
-        if (output === '' || previousOutput.length === 0) {
-            stream.write(ansiEscapes.eraseLines(previousCount) + output);
-            previousOutput = output;
+        // Only use cursor if setCursorPosition was called since last render.
+        // This ensures stale positions don't persist after component unmount.
+        const activeCursor = getActiveCursor();
+        cursorDirty = false;
+        const cursorChanged = cursorPositionChanged(activeCursor, previousCursorPosition);
+        if (!hasChanges(str, activeCursor)) {
+            return false;
+        }
+        const nextLines = str.split('\n');
+        const visibleCount = visibleLineCount(nextLines, str);
+        const previousVisible = visibleLineCount(previousLines, previousOutput);
+        if (str === previousOutput && cursorChanged) {
+            stream.write(buildCursorOnlySequence({
+                cursorWasShown,
+                previousLineCount: previousLines.length,
+                previousCursorPosition,
+                visibleLineCount: visibleCount,
+                cursorPosition: activeCursor,
+            }));
+            previousCursorPosition = activeCursor ? { ...activeCursor } : undefined;
+            cursorWasShown = activeCursor !== undefined;
+            return true;
+        }
+        const returnPrefix = buildReturnToBottomPrefix(cursorWasShown, previousLines.length, previousCursorPosition);
+        if (str === '\n' || previousOutput.length === 0) {
+            const cursorSuffix = buildCursorSuffix(visibleCount, activeCursor);
+            stream.write(returnPrefix +
+                ansiEscapes.eraseLines(previousLines.length) +
+                str +
+                cursorSuffix);
+            cursorWasShown = activeCursor !== undefined;
+            previousCursorPosition = activeCursor ? { ...activeCursor } : undefined;
+            previousOutput = str;
             previousLines = nextLines;
-            return;
+            return true;
         }
+        const hasTrailingNewline = str.endsWith('\n');
         // We aggregate all chunks for incremental rendering into a buffer, and then write them to stdout at the end.
         const buffer = [];
+        buffer.push(returnPrefix);
         // Clear extra lines if the current content's line count is lower than the previous.
-        if (nextCount < previousCount) {
-            buffer.push(
-            // Erases the trailing lines.
-            ansiEscapes.eraseLines(previousCount - nextCount), 
-            // Positions cursor to the top of the rendered output.
-            ansiEscapes.cursorUp(nextCount));
+        if (visibleCount < previousVisible) {
+            const previousHadTrailingNewline = previousOutput.endsWith('\n');
+            const extraSlot = previousHadTrailingNewline ? 1 : 0;
+            buffer.push(ansiEscapes.eraseLines(previousVisible - visibleCount + extraSlot), ansiEscapes.cursorUp(visibleCount));
         }
         else {
-            buffer.push(ansiEscapes.cursorUp(previousCount - 1), ansiEscapes.cursorLeft);
+            buffer.push(ansiEscapes.cursorUp(previousLines.length - 1));
         }
         for (let i = 0; i < visibleCount; i++) {
-            // We skip writing lines if the contents are the same to prevent flickering.
-            // However, we must still handle cursor positioning.
-            const contentChanged = nextLines[i] !== previousLines[i];
-            if (contentChanged) {
-                // Erase and write the changed line
-                buffer.push(ansiEscapes.eraseLine, nextLines[i] ?? '');
-            }
-            // Move to next line, except for the last line
-            if (i < visibleCount - 1) {
-                buffer.push(contentChanged ? '\n' : ansiEscapes.cursorNextLine);
+            const isLastLine = i === visibleCount - 1;
+            // We do not write lines if the contents are the same. This prevents flickering during renders.
+            if (nextLines[i] === previousLines[i]) {
+                // Don't move past the last line when there's no trailing newline,
+                // otherwise the cursor overshoots the rendered block.
+                if (!isLastLine || hasTrailingNewline) {
+                    buffer.push(ansiEscapes.cursorNextLine);
+                }
+                continue;
             }
+            buffer.push(ansiEscapes.cursorTo(0) +
+                nextLines[i] +
+                ansiEscapes.eraseEndLine +
+                // Don't append newline after the last line when the input
+                // has no trailing newline (fullscreen mode).
+                (isLastLine && !hasTrailingNewline ? '' : '\n'));
         }
+        const cursorSuffix = buildCursorSuffix(visibleCount, activeCursor);
+        buffer.push(cursorSuffix);
         stream.write(buffer.join(''));
-        previousOutput = output;
+        cursorWasShown = activeCursor !== undefined;
+        previousCursorPosition = activeCursor ? { ...activeCursor } : undefined;
+        previousOutput = str;
         previousLines = nextLines;
+        return true;
     };
     render.clear = () => {
-        stream.write(ansiEscapes.eraseLines(previousLines.length));
+        const prefix = buildReturnToBottomPrefix(cursorWasShown, previousLines.length, previousCursorPosition);
+        stream.write(prefix + ansiEscapes.eraseLines(previousLines.length));
         previousOutput = '';
         previousLines = [];
+        previousCursorPosition = undefined;
+        cursorWasShown = false;
     };
     render.done = () => {
-        if (previousOutput.length > 0) {
-            stream.write('\n');
-        }
         previousOutput = '';
         previousLines = [];
+        previousCursorPosition = undefined;
+        cursorWasShown = false;
         if (!showCursor) {
-            cliCursor.show();
+            cliCursor.show(stream);
             hasHiddenCursor = false;
         }
     };
+    render.reset = () => {
+        previousOutput = '';
+        previousLines = [];
+        previousCursorPosition = undefined;
+        cursorWasShown = false;
+    };
     render.sync = (str) => {
-        const output = str;
-        previousOutput = output;
-        previousLines = output.split('\n');
+        const activeCursor = cursorDirty ? cursorPosition : undefined;
+        cursorDirty = false;
+        const lines = str.split('\n');
+        previousOutput = str;
+        previousLines = lines;
+        if (!activeCursor && cursorWasShown) {
+            stream.write(hideCursorEscape);
+        }
+        if (activeCursor) {
+            stream.write(buildCursorSuffix(visibleLineCount(lines, str), activeCursor));
+        }
+        previousCursorPosition = activeCursor ? { ...activeCursor } : undefined;
+        cursorWasShown = activeCursor !== undefined;
+    };
+    render.setCursorPosition = (position) => {
+        cursorPosition = position;
+        cursorDirty = true;
     };
+    render.isCursorDirty = () => cursorDirty;
+    render.willRender = (str) => hasChanges(str, getActiveCursor());
     return render;
 };
 const create = (stream, { showCursor = false, incremental = false } = {}) => {

package/build/log-update.js.map

@@ -1 +1 @@
-{"version":3,"file":"log-update.js","sourceRoot":"","sources":["../src/log-update.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,cAAc,CAAC;AACvC,OAAO,SAAS,MAAM,YAAY,CAAC;AASnC,MAAM,cAAc,GAAG,CACtB,MAAgB,EAChB,EAAC,UAAU,GAAG,KAAK,EAAC,GAAG,EAAE,EACb,EAAE;IACd,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAC1B,IAAI,cAAc,GAAG,EAAE,CAAC;IACxB,IAAI,eAAe,GAAG,KAAK,CAAC;IAE5B,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE;QAC9B,IAAI,CAAC,UAAU,IAAI,CAAC,eAAe,EAAE,CAAC;YACrC,SAAS,CAAC,IAAI,EAAE,CAAC;YACjB,eAAe,GAAG,IAAI,CAAC;QACxB,CAAC;QAED,MAAM,MAAM,GAAG,GAAG,CAAC;QACnB,IAAI,MAAM,KAAK,cAAc,EAAE,CAAC;YAC/B,OAAO;QACR,CAAC;QAED,cAAc,GAAG,MAAM,CAAC;QACxB,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC,CAAC;QACjE,iBAAiB,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;IAC/C,CAAC,CAAC;IAEF,MAAM,CAAC,KAAK,GAAG,GAAG,EAAE;QACnB,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACxD,cAAc,GAAG,EAAE,CAAC;QACpB,iBAAiB,GAAG,CAAC,CAAC;IACvB,CAAC,CAAC;IAEF,MAAM,CAAC,IAAI,GAAG,GAAG,EAAE;QAClB,+EAA+E;QAC/E,+BAA+B;QAC/B,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;QAED,cAAc,GAAG,EAAE,CAAC;QACpB,iBAAiB,GAAG,CAAC,CAAC;QAEtB,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,SAAS,CAAC,IAAI,EAAE,CAAC;YACjB,eAAe,GAAG,KAAK,CAAC;QACzB,CAAC;IACF,CAAC,CAAC;IAEF,MAAM,CAAC,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,GAAG,CAAC;QACnB,cAAc,GAAG,MAAM,CAAC;QACxB,iBAAiB,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;IAC/C,CAAC,CAAC;IAEF,OAAO,MAAM,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CACzB,MAAgB,EAChB,EAAC,UAAU,GAAG,KAAK,EAAC,GAAG,EAAE,EACb,EAAE;IACd,IAAI,aAAa,GAAa,EAAE,CAAC;IACjC,IAAI,cAAc,GAAG,EAAE,CAAC;IACxB,IAAI,eAAe,GAAG,KAAK,CAAC;IAE5B,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE;QAC9B,IAAI,CAAC,UAAU,IAAI,CAAC,eAAe,EAAE,CAAC;YACrC,SAAS,CAAC,IAAI,EAAE,CAAC;YACjB,eAAe,GAAG,IAAI,CAAC;QACxB,CAAC;QAED,MAAM,MAAM,GAAG,GAAG,CAAC;QACnB,IAAI,MAAM,KAAK,cAAc,EAAE,CAAC;YAC/B,OAAO;QACR,CAAC;QAED,MAAM,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC;QAC3C,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC;QACnC,MAAM,YAAY,GAAG,SAAS,CAAC;QAE/B,IAAI,MAAM,KAAK,EAAE,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClD,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC,CAAC;YAC7D,cAAc,GAAG,MAAM,CAAC;YACxB,aAAa,GAAG,SAAS,CAAC;YAC1B,OAAO;QACR,CAAC;QAED,6GAA6G;QAC7G,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,oFAAoF;QACpF,IAAI,SAAS,GAAG,aAAa,EAAE,CAAC;YAC/B,MAAM,CAAC,IAAI;YACV,6BAA6B;YAC7B,WAAW,CAAC,UAAU,CAAC,aAAa,GAAG,SAAS,CAAC;YACjD,sDAAsD;YACtD,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAC/B,CAAC;QACH,CAAC;aAAM,CAAC;YACP,MAAM,CAAC,IAAI,CACV,WAAW,CAAC,QAAQ,CAAC,aAAa,GAAG,CAAC,CAAC,EACvC,WAAW,CAAC,UAAU,CACtB,CAAC;QACH,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,4EAA4E;YAC5E,oDAAoD;YACpD,MAAM,cAAc,GAAG,SAAS,CAAC,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC,CAAC,CAAC;YAEzD,IAAI,cAAc,EAAE,CAAC;gBACpB,mCAAmC;gBACnC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YACxD,CAAC;YAED,8CAA8C;YAC9C,IAAI,CAAC,GAAG,YAAY,GAAG,CAAC,EAAE,CAAC;gBAC1B,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;YACjE,CAAC;QACF,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAE9B,cAAc,GAAG,MAAM,CAAC;QACxB,aAAa,GAAG,SAAS,CAAC;IAC3B,CAAC,CAAC;IAEF,MAAM,CAAC,KAAK,GAAG,GAAG,EAAE;QACnB,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3D,cAAc,GAAG,EAAE,CAAC;QACpB,aAAa,GAAG,EAAE,CAAC;IACpB,CAAC,CAAC;IAEF,MAAM,CAAC,IAAI,GAAG,GAAG,EAAE;QAClB,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;QAED,cAAc,GAAG,EAAE,CAAC;QACpB,aAAa,GAAG,EAAE,CAAC;QAEnB,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,SAAS,CAAC,IAAI,EAAE,CAAC;YACjB,eAAe,GAAG,KAAK,CAAC;QACzB,CAAC;IACF,CAAC,CAAC;IAEF,MAAM,CAAC,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,GAAG,CAAC;QACnB,cAAc,GAAG,MAAM,CAAC;QACxB,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC;IAEF,OAAO,MAAM,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,CACd,MAAgB,EAChB,EAAC,UAAU,GAAG,KAAK,EAAE,WAAW,GAAG,KAAK,EAAC,GAAG,EAAE,EAClC,EAAE;IACd,IAAI,WAAW,EAAE,CAAC;QACjB,OAAO,iBAAiB,CAAC,MAAM,EAAE,EAAC,UAAU,EAAC,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,cAAc,CAAC,MAAM,EAAE,EAAC,UAAU,EAAC,CAAC,CAAC;AAC7C,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,EAAC,MAAM,EAAC,CAAC;AAC3B,eAAe,SAAS,CAAC"}
+{"version":3,"file":"log-update.js","sourceRoot":"","sources":["../src/log-update.ts"],"names":[],"mappings":"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"}

package/build/measure-element.d.ts

@@ -11,6 +11,10 @@ type Output = {
 };
 /**
 Measure the dimensions of a particular `<Box>` element.
+Returns an object with `width` and `height` properties.
+This function is useful when your component needs to know the amount of available space it has. You can use it when you need to change the layout based on the length of its content.
+
+Note: `measureElement()` returns `{width: 0, height: 0}` when called during render (before layout is calculated). Call it from post-render code, such as `useEffect`, `useLayoutEffect`, input handlers, or timer callbacks. When content changes, pass the relevant dependency to your effect so it re-measures after each update.
 */
 declare const measureElement: (node: DOMElement) => Output;
 export default measureElement;

package/build/measure-element.js

@@ -1,5 +1,9 @@
 /**
 Measure the dimensions of a particular `<Box>` element.
+Returns an object with `width` and `height` properties.
+This function is useful when your component needs to know the amount of available space it has. You can use it when you need to change the layout based on the length of its content.
+
+Note: `measureElement()` returns `{width: 0, height: 0}` when called during render (before layout is calculated). Call it from post-render code, such as `useEffect`, `useLayoutEffect`, input handlers, or timer callbacks. When content changes, pass the relevant dependency to your effect so it re-measures after each update.
 */
 const measureElement = (node) => ({
     width: node.yogaNode?.getComputedWidth() ?? 0,

package/build/measure-element.js.map

@@ -1 +1 @@
-{"version":3,"file":"measure-element.js","sourceRoot":"","sources":["../src/measure-element.ts"],"names":[],"mappings":"AAcA;;EAEE;AACF,MAAM,cAAc,GAAG,CAAC,IAAgB,EAAU,EAAE,CAAC,CAAC;IACrD,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,gBAAgB,EAAE,IAAI,CAAC;IAC7C,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,iBAAiB,EAAE,IAAI,CAAC;CAC/C,CAAC,CAAC;AAEH,eAAe,cAAc,CAAC"}
+{"version":3,"file":"measure-element.js","sourceRoot":"","sources":["../src/measure-element.ts"],"names":[],"mappings":"AAcA;;;;;;EAME;AACF,MAAM,cAAc,GAAG,CAAC,IAAgB,EAAU,EAAE,CAAC,CAAC;IACrD,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,gBAAgB,EAAE,IAAI,CAAC;IAC7C,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,iBAAiB,EAAE,IAAI,CAAC;CAC/C,CAAC,CAAC;AAEH,eAAe,cAAc,CAAC"}

package/build/measure-text.js

@@ -1,6 +1,5 @@
-import stringWidth from 'string-width';
+import widestLine from 'widest-line';
 const cache = new Map();
-const TAB_SPACES = '  '; // 2 spaces per tab
 const measureText = (text) => {
     if (text.length === 0) {
         return {
@@ -12,15 +11,8 @@ const measureText = (text) => {
     if (cachedDimensions) {
         return cachedDimensions;
     }
-    const lines = text.split('\n');
-    let width = Math.max(0, ...lines.map(line => stringWidth(line.includes('\t') ? line.replaceAll('\t', TAB_SPACES) : line)));
-    // If width is > 0, add a tiny epsilon to prevent Yoga from wrapping
-    // items with exact integer width (like 1) in some flexbox configurations.
-    // This fixes a layout regression where items would wrap unexpectedly.
-    if (width > 0) {
-        width += 0.01;
-    }
-    const height = lines.length;
+    const width = widestLine(text);
+    const height = text.split('\n').length;
     const dimensions = { width, height };
     cache.set(text, dimensions);
     return dimensions;

package/build/measure-text.js.map

@@ -1 +1 @@
-{"version":3,"file":"measure-text.js","sourceRoot":"","sources":["../src/measure-text.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,cAAc,CAAC;AAEvC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;AAExC,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,mBAAmB;AAO5C,MAAM,WAAW,GAAG,CAAC,IAAY,EAAU,EAAE;IAC5C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO;YACN,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;SACT,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEzC,IAAI,gBAAgB,EAAE,CAAC;QACtB,OAAO,gBAAgB,CAAC;IACzB,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CACnB,CAAC,EACD,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CACnB,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAC3E,CACD,CAAC;IAEF,oEAAoE;IACpE,0EAA0E;IAC1E,sEAAsE;IACtE,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACf,KAAK,IAAI,IAAI,CAAC;IACf,CAAC;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,MAAM,UAAU,GAAG,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC;IACnC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAE5B,OAAO,UAAU,CAAC;AACnB,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"measure-text.js","sourceRoot":"","sources":["../src/measure-text.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;AAOxC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAU,EAAE;IAC5C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO;YACN,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;SACT,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEzC,IAAI,gBAAgB,EAAE,CAAC;QACtB,OAAO,gBAAgB,CAAC;IACzB,CAAC;IAED,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;IACvC,MAAM,UAAU,GAAG,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC;IACnC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAE5B,OAAO,UAAU,CAAC;AACnB,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/build/output.d.ts

@@ -1,4 +1,4 @@
-import type { OutputTransformer } from './render-node-to-output.js';
+import { type OutputTransformer } from './render-node-to-output.js';
 /**
 "Virtual" output class
 
@@ -20,6 +20,7 @@ export default class Output {
     width: number;
     height: number;
     private readonly operations;
+    private readonly caches;
     constructor(options: Options);
     write(x: number, y: number, text: string, options: {
         transformers: OutputTransformer[];

package/build/output.js

@@ -1,36 +1,44 @@
 import sliceAnsi from 'slice-ansi';
 import stringWidth from 'string-width';
 import { styledCharsFromTokens, styledCharsToString, tokenize, } from '@alcalzone/ansi-tokenize';
-const TAB_SPACES = '  '; // 2 spaces per tab
-const expandTabs = (text) => text.includes('\t') ? text.replaceAll('\t', TAB_SPACES) : text;
-const intersectClips = (clips) => {
-    if (clips.length === 0) {
-        return undefined;
-    }
-    let x1;
-    let x2;
-    let y1;
-    let y2;
-    for (const c of clips) {
-        if (c.x1 !== undefined) {
-            x1 = x1 === undefined ? c.x1 : Math.max(x1, c.x1);
-        }
-        if (c.x2 !== undefined) {
-            x2 = x2 === undefined ? c.x2 : Math.min(x2, c.x2);
+class OutputCaches {
+    widths = new Map();
+    blockWidths = new Map();
+    styledChars = new Map();
+    getStyledChars(line) {
+        let cached = this.styledChars.get(line);
+        if (cached === undefined) {
+            cached = styledCharsFromTokens(tokenize(line));
+            this.styledChars.set(line, cached);
         }
-        if (c.y1 !== undefined) {
-            y1 = y1 === undefined ? c.y1 : Math.max(y1, c.y1);
+        return cached;
+    }
+    getStringWidth(text) {
+        let cached = this.widths.get(text);
+        if (cached === undefined) {
+            cached = stringWidth(text);
+            this.widths.set(text, cached);
         }
-        if (c.y2 !== undefined) {
-            y2 = y2 === undefined ? c.y2 : Math.min(y2, c.y2);
+        return cached;
+    }
+    getWidestLine(text) {
+        let cached = this.blockWidths.get(text);
+        if (cached === undefined) {
+            let lineWidth = 0;
+            for (const line of text.split('\n')) {
+                lineWidth = Math.max(lineWidth, this.getStringWidth(line));
+            }
+            cached = lineWidth;
+            this.blockWidths.set(text, cached);
         }
+        return cached;
     }
-    return { x1, x2, y1, y2 };
-};
+}
 export default class Output {
     width;
     height;
     operations = [];
+    caches = new OutputCaches();
     constructor(options) {
         const { width, height } = options;
         this.width = width;
@@ -45,7 +53,7 @@ export default class Output {
             type: 'write',
             x,
             y,
-            text: expandTabs(text),
+            text,
             transformers,
         });
     }
@@ -87,14 +95,14 @@ export default class Output {
                 const { text, transformers } = operation;
                 let { x, y } = operation;
                 let lines = text.split('\n');
-                const clip = intersectClips(clips);
+                const clip = clips.at(-1);
                 if (clip) {
                     const clipHorizontally = typeof clip?.x1 === 'number' && typeof clip?.x2 === 'number';
                     const clipVertically = typeof clip?.y1 === 'number' && typeof clip?.y2 === 'number';
                     // If text is positioned outside of clipping area altogether,
                     // skip to the next operation to avoid unnecessary calculations
                     if (clipHorizontally) {
-                        const width = Math.max(0, ...lines.map(line => stringWidth(line)));
+                        const width = this.caches.getWidestLine(text);
                         if (x + width < clip.x1 || x > clip.x2) {
                             continue;
                         }
@@ -108,7 +116,7 @@ export default class Output {
                     if (clipHorizontally) {
                         lines = lines.map(line => {
                             const from = x < clip.x1 ? clip.x1 - x : 0;
-                            const width = stringWidth(line);
+                            const width = this.caches.getStringWidth(line);
                             const to = x + width > clip.x2 ? clip.x2 - x : width;
                             return sliceAnsi(line, from, to);
                         });
@@ -136,41 +144,34 @@ export default class Output {
                     for (const transformer of transformers) {
                         line = transformer(line, index);
                     }
-                    const characters = styledCharsFromTokens(tokenize(line));
+                    const characters = this.caches.getStyledChars(line);
                     let offsetX = x;
+                    // Nothing to write (e.g. line was clipped away).
+                    if (characters.length === 0) {
+                        offsetY++;
+                        continue;
+                    }
+                    const spaceCell = {
+                        type: 'char',
+                        value: ' ',
+                        fullWidth: false,
+                        styles: [],
+                    };
+                    // Wide characters (e.g. CJK) occupy two cells: a leading
+                    // cell with the character and a trailing placeholder with
+                    // value ''. When an overlapping write lands in the middle
+                    // of a wide character, the boundary cells need cleanup so
+                    // the terminal never renders a half-visible wide character.
+                    if (currentLine[offsetX]?.value === '' &&
+                        offsetX > 0 &&
+                        this.caches.getStringWidth(currentLine[offsetX - 1]?.value ?? '') >
+                            1) {
+                        currentLine[offsetX - 1] = spaceCell;
+                    }
                     for (const character of characters) {
-                        // Check if this is a zero-width character (like U+FE0F emoji variation selector)
-                        const rawWidth = stringWidth(character.value);
-                        if (rawWidth === 0) {
-                            // Zero-width characters (like variation selectors) should be appended
-                            // to the previous cell rather than taking up their own space
-                            const previousCell = currentLine[offsetX - 1];
-                            if (previousCell?.value) {
-                                // Measure width before and after appending to detect width changes
-                                // This handles cases like ⏭ (width 1) + ️ (VS16) = ⏭️ (width 2)
-                                const prevWidth = stringWidth(previousCell.value);
-                                previousCell.value += character.value;
-                                const newWidth = stringWidth(previousCell.value);
-                                // If combining increased the display width, add placeholder cells
-                                const extraWidth = newWidth - prevWidth;
-                                if (extraWidth > 0) {
-                                    for (let i = 0; i < extraWidth; i++) {
-                                        currentLine[offsetX + i] = {
-                                            type: 'char',
-                                            value: '',
-                                            fullWidth: false,
-                                            styles: previousCell.styles,
-                                        };
-                                    }
-                                    offsetX += extraWidth;
-                                }
-                            }
-                            // Don't advance offsetX for zero-width characters (already handled above if width changed)
-                            continue;
-                        }
                         currentLine[offsetX] = character;
-                        // Determine printed width using string-width
-                        const characterWidth = Math.max(1, rawWidth);
+                        // Determine printed width using string-width to align with measurement
+                        const characterWidth = Math.max(1, this.caches.getStringWidth(character.value));
                         // For multi-column characters, clear following cells to avoid stray spaces/artifacts
                         if (characterWidth > 1) {
                             for (let index = 1; index < characterWidth; index++) {
@@ -184,6 +185,9 @@ export default class Output {
                         }
                         offsetX += characterWidth;
                     }
+                    if (currentLine[offsetX]?.value === '') {
+                        currentLine[offsetX] = spaceCell;
+                    }
                     offsetY++;
                 }
             }