@nmakarov/cli-toolkit 0.80.0 → 0.82.0

package/dist/init.js

@@ -1001,9 +1001,68 @@ var init_ui_elements = __esm({
   }
 });
 
-// src/screen/scrollable-text.js
-import { useState as useState3, useEffect as useEffect2, useMemo, useRef as useRef2, createElement as createElement2 } from "react";
-import { Box as Box4, Text as Text5 } from "ink";
+// src/screen/follow-scroll.js
+function clampScroll(scrollTop, maxScroll) {
+  const max = Math.max(0, Number(maxScroll) || 0);
+  const top = Number(scrollTop) || 0;
+  return Math.min(Math.max(0, top), max);
+}
+function isScrolledToBottom(scrollTop, maxScroll) {
+  return clampScroll(scrollTop, maxScroll) >= Math.max(0, Number(maxScroll) || 0);
+}
+function nextScrollAfterUserMove(scrollTop, maxScroll, delta) {
+  const next = clampScroll((Number(scrollTop) || 0) + (Number(delta) || 0), maxScroll);
+  return { scrollTop: next, following: isScrolledToBottom(next, maxScroll) };
+}
+function nextScrollAfterContentChange({ following, scrollTop, maxScroll }) {
+  const max = Math.max(0, Number(maxScroll) || 0);
+  if (following) return { scrollTop: max, following: true };
+  const next = clampScroll(scrollTop, max);
+  return { scrollTop: next, following: isScrolledToBottom(next, max) };
+}
+var init_follow_scroll = __esm({
+  "src/screen/follow-scroll.js"() {
+  }
+});
+
+// src/screen/visible-text.js
+function stripAnsi(text) {
+  return String(text ?? "").replace(ANSI_RE, "");
+}
+function visibleWidth(text) {
+  return [...stripAnsi(text)].length;
+}
+function sliceVisible(text, cols) {
+  const w = Math.max(0, Math.floor(Number(cols) || 0));
+  const s = String(text ?? "");
+  if (w === 0) return "";
+  let vis = 0;
+  let out = "";
+  let i = 0;
+  while (i < s.length && vis < w) {
+    ANSI_RE.lastIndex = i;
+    const m = ANSI_RE.exec(s);
+    if (m && m.index === i) {
+      out += m[0];
+      i += m[0].length;
+      continue;
+    }
+    const cp = s.codePointAt(i);
+    const ch = String.fromCodePoint(cp);
+    out += ch;
+    i += ch.length;
+    vis += 1;
+  }
+  return out;
+}
+function padEndVisible(text, cols) {
+  const w = Math.max(0, Math.floor(Number(cols) || 0));
+  const s = String(text ?? "");
+  const vis = visibleWidth(s);
+  if (vis === w) return s;
+  if (vis > w) return sliceVisible(s, w);
+  return s + " ".repeat(w - vis);
+}
 function wrapTextLines(text, cols) {
   const w = Math.max(1, Math.floor(Number(cols) || 1));
   const out = [];
@@ -1012,20 +1071,30 @@ function wrapTextLines(text, cols) {
       out.push("");
       continue;
     }
+    if (visibleWidth(raw) <= w) {
+      out.push(raw);
+      continue;
+    }
     let rest = raw;
-    while (rest.length > w) {
-      out.push(rest.slice(0, w));
-      rest = rest.slice(w);
+    while (visibleWidth(rest) > w) {
+      const head = sliceVisible(rest, w);
+      out.push(head);
+      rest = rest.slice(head.length);
     }
     if (rest.length > 0) out.push(rest);
   }
   return out;
 }
-function padEndVisible(s, w) {
-  const t = String(s ?? "");
-  if (t.length >= w) return t.slice(0, w);
-  return t + " ".repeat(w - t.length);
-}
+var ANSI_RE;
+var init_visible_text = __esm({
+  "src/screen/visible-text.js"() {
+    ANSI_RE = /\u001b(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g;
+  }
+});
+
+// src/screen/scrollable-text.js
+import { useState as useState3, useEffect as useEffect2, useMemo, useRef as useRef2, createElement as createElement2 } from "react";
+import { Box as Box4, Text as Text5 } from "ink";
 function ScrollableText({
   ctx,
   text = "",
@@ -1035,9 +1104,11 @@ function ScrollableText({
   showScrollbar = true,
   showStatus = true,
   bindKeys = true,
-  header = null
+  header = null,
+  followBottom = false
 }) {
   const [scrollTop, setScrollTop] = useState3(0);
+  const [following, setFollowing] = useState3(() => !!followBottom);
   const [, bump] = useState3(0);
   const termRows = process.stdout.rows || 24;
   const viewportRows = Math.max(
@@ -1056,48 +1127,52 @@ function ScrollableText({
   const clamped = Math.min(Math.max(0, scrollTop), maxScroll);
   const visible = allLines.slice(clamped, clamped + viewportRows);
   const bar = needsBar ? scrollbarGlyphs(viewportRows, allLines.length, clamped) : null;
-  useEffect2(() => {
-    setScrollTop((s) => Math.min(s, maxScroll));
-  }, [maxScroll]);
   const maxScrollRef = useRef2(maxScroll);
   const pageSizeRef = useRef2(viewportRows);
+  const scrollTopRef = useRef2(scrollTop);
+  const followingRef = useRef2(following);
   maxScrollRef.current = maxScroll;
   pageSizeRef.current = viewportRows;
+  scrollTopRef.current = scrollTop;
+  followingRef.current = following;
+  useEffect2(() => {
+    const next = nextScrollAfterContentChange({
+      following: followBottom && followingRef.current,
+      scrollTop: scrollTopRef.current,
+      maxScroll
+    });
+    if (next.scrollTop !== scrollTopRef.current) setScrollTop(next.scrollTop);
+    if (followBottom && next.following !== followingRef.current) setFollowing(next.following);
+  }, [maxScroll, followBottom]);
+  const applyUserScroll = (delta) => {
+    const next = nextScrollAfterUserMove(scrollTopRef.current, maxScrollRef.current, delta);
+    setScrollTop(next.scrollTop);
+    if (followBottom) setFollowing(next.following);
+    bump((n) => n + 1);
+    ctx?.update?.();
+  };
   useEffect2(() => {
     if (!ctx || !bindKeys) return void 0;
     ctx.setKeyBinding(SCROLL_KEYS);
-    ctx.setAction("scrollUp", () => {
-      setScrollTop((s) => Math.max(0, s - 1));
-      bump((n) => n + 1);
-      ctx.update?.();
-    });
-    ctx.setAction("scrollDown", () => {
-      setScrollTop((s) => Math.min(maxScrollRef.current, s + 1));
-      bump((n) => n + 1);
-      ctx.update?.();
-    });
-    ctx.setAction("pageUp", () => {
-      setScrollTop((s) => Math.max(0, s - pageSizeRef.current));
-      bump((n) => n + 1);
-      ctx.update?.();
-    });
-    ctx.setAction("pageDown", () => {
-      setScrollTop((s) => Math.min(maxScrollRef.current, s + pageSizeRef.current));
-      bump((n) => n + 1);
-      ctx.update?.();
-    });
+    ctx.setAction("scrollUp", () => applyUserScroll(-1));
+    ctx.setAction("scrollDown", () => applyUserScroll(1));
+    ctx.setAction("pageUp", () => applyUserScroll(-pageSizeRef.current));
+    ctx.setAction("pageDown", () => applyUserScroll(pageSizeRef.current));
     return void 0;
-  }, [ctx, bindKeys]);
-  const status = allLines.length === 0 ? "empty" : `lines ${clamped + 1}-${Math.min(clamped + visible.length, allLines.length)} of ${allLines.length}` + (needsBar ? " \xB7 \u2325\u2191/\u2193 or PgUp/Dn page" : "");
+  }, [ctx, bindKeys, followBottom]);
+  const status = allLines.length === 0 ? "empty" : `lines ${clamped + 1}-${Math.min(clamped + visible.length, allLines.length)} of ${allLines.length}` + (needsBar ? " \xB7 \u2325\u2191/\u2193 or PgUp/Dn page" : "") + (followBottom && following ? " \xB7 follow" : followBottom ? " \xB7 follow off" : "");
   const rowNodes = visible.map((line, i) => {
-    const body = padEndVisible(line, textWidth);
     const glyph = bar ? bar[i] ?? BAR_TRACK : showScrollbar ? " " : "";
     const isThumb = glyph === BAR_THUMB;
     return h5(
-      Text5,
-      { key: `L${clamped + i}` },
-      body,
-      glyph ? h5(Text5, { color: isThumb ? "cyan" : "gray" }, glyph) : null
+      Box4,
+      { key: `L${clamped + i}`, flexDirection: "row", width: contentCols, flexShrink: 0 },
+      h5(
+        Box4,
+        { width: textWidth, flexShrink: 0 },
+        h5(Text5, { wrap: "truncate" }, padEndVisible(line, textWidth))
+      ),
+      showScrollbar ? h5(Box4, { width: 1, flexShrink: 0 }, h5(Text5, { color: isThumb ? "cyan" : "gray" }, glyph)) : null
     );
   });
   if (bar && visible.length < viewportRows) {
@@ -1105,10 +1180,10 @@ function ScrollableText({
       const glyph = bar[i] ?? BAR_TRACK;
       rowNodes.push(
         h5(
-          Text5,
-          { key: `pad${i}` },
-          padEndVisible("", textWidth),
-          h5(Text5, { color: glyph === BAR_THUMB ? "cyan" : "gray" }, glyph)
+          Box4,
+          { key: `pad${i}`, flexDirection: "row", width: contentCols, flexShrink: 0 },
+          h5(Box4, { width: textWidth, flexShrink: 0 }, h5(Text5, {}, padEndVisible("", textWidth))),
+          h5(Box4, { width: 1, flexShrink: 0 }, h5(Text5, { color: glyph === BAR_THUMB ? "cyan" : "gray" }, glyph))
         )
       );
     }
@@ -1126,7 +1201,10 @@ var init_scrollable_text = __esm({
   "src/screen/scrollable-text.js"() {
     init_components();
     init_scrollbar();
+    init_follow_scroll();
+    init_visible_text();
     init_scrollbar();
+    init_visible_text();
     h5 = createElement2;
     SCROLL_KEYS = [
       { key: "upArrow", caption: "scroll", action: "scrollUp", order: 0 },
@@ -1294,11 +1372,16 @@ __export(screen_exports, {
   buildBreadcrumb: () => buildBreadcrumb,
   buildDetailBreadcrumb: () => buildDetailBreadcrumb,
   buildFooter: () => buildFooter,
+  clampScroll: () => clampScroll,
   formatBindingKey: () => formatBindingKey,
   h: () => createElement3,
+  isScrolledToBottom: () => isScrolledToBottom,
   load: () => load,
   memo: () => memo,
+  nextScrollAfterContentChange: () => nextScrollAfterContentChange,
+  nextScrollAfterUserMove: () => nextScrollAfterUserMove,
   organizeFooterMessages: () => organizeFooterMessages,
+  padEndVisible: () => padEndVisible,
   scrollbarGlyphs: () => scrollbarGlyphs,
   showListScreen: () => showListScreen,
   showMenuScreen: () => showMenuScreen,
@@ -1306,6 +1389,8 @@ __export(screen_exports, {
   showMultiColumnListWithPreviewScreen: () => showMultiColumnListWithPreviewScreen,
   showScreen: () => showScreen,
   showWordGridScreen: () => showWordGridScreen,
+  sliceVisible: () => sliceVisible,
+  stripAnsi: () => stripAnsi,
   useCallback: () => useCallback,
   useEffect: () => useEffect3,
   useInput: () => useInput2,
@@ -1313,6 +1398,7 @@ __export(screen_exports, {
   useMemo: () => useMemo2,
   useRef: () => useRef3,
   useState: () => useState4,
+  visibleWidth: () => visibleWidth,
   wrapTextLines: () => wrapTextLines
 });
 import React2, { useState as useState4, useEffect as useEffect3, useLayoutEffect, useRef as useRef3, useMemo as useMemo2, useCallback, memo, createElement as createElement3 } from "react";
@@ -1334,6 +1420,8 @@ var init_screen = __esm({
     init_components();
     init_ui_elements();
     init_scrollable_text();
+    init_visible_text();
+    init_follow_scroll();
     init_scrollbar();
     init_key_bindings();
     init_utils();