@jrichman/ink 6.3.1 → 6.4.0

package/build/wrap-text.js

@@ -1,31 +1,120 @@
-import wrapAnsi from 'wrap-ansi';
-import cliTruncate from 'cli-truncate';
-const cache = {};
-const wrapText = (text, maxWidth, wrapType) => {
-    const cacheKey = text + String(maxWidth) + String(wrapType);
-    const cachedText = cache[cacheKey];
-    if (cachedText) {
-        return cachedText;
-    }
-    let wrappedText = text;
-    if (wrapType === 'wrap') {
-        wrappedText = wrapAnsi(text, maxWidth, {
-            trim: false,
-            hard: true,
-        });
-    }
-    if (wrapType.startsWith('truncate')) {
-        let position = 'end';
-        if (wrapType === 'truncate-middle') {
-            position = 'middle';
-        }
-        if (wrapType === 'truncate-start') {
-            position = 'start';
-        }
-        wrappedText = cliTruncate(text, maxWidth, { position });
-    }
-    cache[cacheKey] = wrappedText;
-    return wrappedText;
+import { inkCharacterWidth, styledCharsWidth } from './measure-text.js';
+export const sliceStyledChars = (styledChars, begin, end) => {
+    let width = 0;
+    const result = [];
+    for (const char of styledChars) {
+        const charWidth = inkCharacterWidth(char.value);
+        const charStart = width;
+        const charEnd = width + charWidth;
+        if (end !== undefined && charEnd > end) {
+            break;
+        }
+        if (charStart >= begin) {
+            result.push(char);
+        }
+        width += charWidth;
+    }
+    return result;
+};
+export const truncateStyledChars = (styledChars, columns, options = {}) => {
+    const { position = 'end' } = options;
+    const truncationCharacter = '…';
+    const truncationStyledChar = {
+        type: 'char',
+        value: truncationCharacter,
+        fullWidth: false,
+        styles: [],
+    };
+    if (columns < 1) {
+        return [];
+    }
+    if (columns === 1) {
+        return [truncationStyledChar];
+    }
+    const textWidth = styledCharsWidth(styledChars);
+    if (textWidth <= columns) {
+        return styledChars;
+    }
+    const truncationWidth = inkCharacterWidth(truncationCharacter);
+    if (position === 'start') {
+        const right = sliceStyledChars(styledChars, textWidth - columns + truncationWidth, textWidth);
+        return [truncationStyledChar, ...right];
+    }
+    if (position === 'middle') {
+        const leftWidth = Math.ceil(columns / 2);
+        const rightWidth = columns - leftWidth;
+        const left = sliceStyledChars(styledChars, 0, leftWidth - truncationWidth);
+        const right = sliceStyledChars(styledChars, textWidth - rightWidth, textWidth);
+        return [...left, truncationStyledChar, ...right];
+    }
+    const left = sliceStyledChars(styledChars, 0, columns - truncationWidth);
+    return [...left, truncationStyledChar];
+};
+const wrapWord = (rows, word, columns) => {
+    let currentLine = rows.at(-1);
+    let visible = styledCharsWidth(currentLine);
+    for (const character of word) {
+        const characterLength = inkCharacterWidth(character.value);
+        if (visible + characterLength > columns && visible > 0) {
+            rows.push([]);
+            currentLine = rows.at(-1);
+            visible = 0;
+        }
+        currentLine.push(character);
+        visible += characterLength;
+    }
+};
+export const wrapStyledChars = (styledChars, columns) => {
+    const rows = [[]];
+    const words = [];
+    let currentWord = [];
+    for (const char of styledChars) {
+        if (char.value === ' ') {
+            if (currentWord.length > 0) {
+                words.push(currentWord);
+            }
+            currentWord = [];
+        }
+        else {
+            currentWord.push(char);
+        }
+    }
+    if (currentWord.length > 0) {
+        words.push(currentWord);
+    }
+    const space = {
+        type: 'char',
+        value: ' ',
+        fullWidth: false,
+        styles: [],
+    };
+    for (const [index, word] of words.entries()) {
+        const wordWidth = styledCharsWidth(word);
+        let rowWidth = styledCharsWidth(rows.at(-1));
+        if (index > 0) {
+            rows.at(-1).push(space);
+            rowWidth++;
+        }
+        if (wordWidth > columns) {
+            if (index > 0) {
+                rows[rows.length - 1] = rows.at(-1).slice(0, -1);
+                if (rows.at(-1).length > 0) {
+                    rows.push([]);
+                }
+            }
+            wrapWord(rows, word, columns);
+            continue;
+        }
+        if (rowWidth + wordWidth > columns && rowWidth > 0) {
+            if (index > 0) {
+                rows[rows.length - 1] = rows.at(-1).slice(0, -1);
+            }
+            rows.push(word);
+        }
+        else {
+            rows.at(-1).push(...word);
+        }
+    }
+    return rows;
 };
-export default wrapText;
 //# sourceMappingURL=wrap-text.js.map

package/build/wrap-text.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrap-text.js","sourceRoot":"","sources":["../src/wrap-text.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,WAAW,MAAM,cAAc,CAAC;AAGvC,MAAM,KAAK,GAA2B,EAAE,CAAC;AAEzC,MAAM,QAAQ,GAAG,CAChB,IAAY,EACZ,QAAgB,EAChB,QAA4B,EACnB,EAAE;IACX,MAAM,QAAQ,GAAG,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEnC,IAAI,UAAU,EAAE,CAAC;QAChB,OAAO,UAAU,CAAC;IACnB,CAAC;IAED,IAAI,WAAW,GAAG,IAAI,CAAC;IAEvB,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;QACzB,WAAW,GAAG,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE;YACtC,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,IAAI;SACV,CAAC,CAAC;IACJ,CAAC;IAED,IAAI,QAAS,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACtC,IAAI,QAAQ,GAA+B,KAAK,CAAC;QAEjD,IAAI,QAAQ,KAAK,iBAAiB,EAAE,CAAC;YACpC,QAAQ,GAAG,QAAQ,CAAC;QACrB,CAAC;QAED,IAAI,QAAQ,KAAK,gBAAgB,EAAE,CAAC;YACnC,QAAQ,GAAG,OAAO,CAAC;QACpB,CAAC;QAED,WAAW,GAAG,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAC,QAAQ,EAAC,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC;IAE9B,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"wrap-text.js","sourceRoot":"","sources":["../src/wrap-text.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jrichman/ink",
-	"version": "6.3.1",
-	"description": "React for CLI local version for Gemini CLI",
+	"version": "6.4.0",
+	"description": "React for CLI",
 	"license": "MIT",
 	"repository": "jacob314/ink",
 	"author": {
@@ -43,7 +43,7 @@
 		"text"
 	],
 	"dependencies": {
-		"@alcalzone/ansi-tokenize": "^0.2.0",
+		"@alcalzone/ansi-tokenize": "^0.2.1",
 		"ansi-escapes": "^7.0.0",
 		"ansi-styles": "^6.2.1",
 		"auto-bind": "^5.0.1",
@@ -62,7 +62,6 @@
 		"stack-utils": "^2.0.6",
 		"string-width": "^8.1.0",
 		"type-fest": "^4.27.0",
-		"widest-line": "^5.0.0",
 		"wrap-ansi": "^9.0.0",
 		"ws": "^8.18.0",
 		"yoga-layout": "~3.2.1"
@@ -73,8 +72,8 @@
 		"@sinonjs/fake-timers": "^14.0.0",
 		"@types/ms": "^2.1.0",
 		"@types/node": "^22.15.24",
-		"@types/react": "^19.1.8",
-		"@types/react-reconciler": "^0.32.0",
+		"@types/react": "^19.1.5",
+		"@types/react-reconciler": "^0.32.2",
 		"@types/signal-exit": "^3.0.0",
 		"@types/sinon": "^17.0.3",
 		"@types/stack-utils": "^2.0.2",

package/readme.md

@@ -73,7 +73,6 @@ Feel free to play around with the code and fork this Repl at [https://repl.it/@v
 
 ## Who's Using Ink?
 
-- [Codex](https://github.com/openai/codex) - An agentic coding tool made by OpenAI.
 - [Claude Code](https://github.com/anthropics/claude-code) - An agentic coding tool made by Anthropic.
 - [Gemini CLI](https://github.com/google-gemini/gemini-cli) - An agentic coding tool made by Google.
 - [GitHub Copilot for CLI](https://githubnext.com/projects/copilot-cli) - Just say what you want the shell to do.
@@ -123,6 +122,7 @@ Feel free to play around with the code and fork this Repl at [https://repl.it/@v
 - [tweakcc](https://github.com/Piebald-AI/tweakcc) - Customize your Claude Code styling.
 - [argonaut](https://github.com/darksworm/argonaut) - Manage Argo CD resources.
 - [Qodo Command](https://github.com/qodo-ai/command) - Build, run, and manage AI agents.
+- [Nanocoder](https://github.com/nano-collective/nanocoder) - A community-built, local-first AI coding agent with multi-provider support.
 
 *(PRs welcome. Append new entries at the end. Repos must have 100+ stars and showcase Ink beyond a basic list picker.)*
 
@@ -2009,6 +2009,13 @@ Default: `process.stdin`
 
 Input stream where app will listen for input.
 
+###### stderr
+
+Type: `stream.Writable`\
+Default: `process.stderr`
+
+Error stream.
+
 ###### exitOnCtrlC
 
 Type: `boolean`\
@@ -2028,6 +2035,13 @@ That way, both are visible and don't overlap each other.
 
 This functionality is powered by [patch-console](https://github.com/vadimdemedes/patch-console), so if you need to disable Ink's interception of output but want to build something custom, you can use that.
 
+###### onRender
+
+Type: `({renderTime: number}) => void`\
+Default: `undefined`
+
+Runs the given callback after each render and re-render with a metrics object.
+
 ###### debug
 
 Type: `boolean`\