march-cli 0.1.23 → 0.1.25

package/src/cli/tui/markdown-renderer.mjs

@@ -1,285 +1,285 @@
-import { marked } from "marked";
-import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { R, brightBlack, dim, orange, softGreen, bold, cyan } from "./ui-theme.mjs";
-import { highlightCodeLines } from "./syntax/highlighting.mjs";
-const TABLE_CELL_PADDING = 2;
-export function renderMarkdown(markdown, width) {
-  return renderMarkdownText(markdown, Math.max(1, width));
-}
-export function renderStreamingMarkdown(markdown, width, cache = new Map()) {
-  const text = String(markdown ?? "");
-  const maxWidth = Math.max(1, width);
-  const split = splitStableMarkdown(text);
-  if (!split.prefix) return renderMarkdownText(split.tail, maxWidth);
-
-  const key = `${maxWidth}\0${split.prefix}`;
-  let prefixLines = cache.get(key);
-  if (!prefixLines) {
-    prefixLines = renderMarkdownText(split.prefix, maxWidth);
-    cache.set(key, prefixLines);
-  }
-  const tailLines = split.tail ? renderMarkdownText(split.tail, maxWidth) : [];
-  return tailLines.length ? [...prefixLines, ...tailLines] : prefixLines;
-}
-
-function renderMarkdownText(markdown, maxWidth) {
-  let tokens;
-  try {
-    tokens = marked.lexer(String(markdown ?? ""));
-  } catch {
-    return renderPlainMarkdownFallback(markdown, maxWidth);
-  }
-  const lines = [];
-  for (const token of tokens) renderBlock(token, lines, maxWidth, 0);
-  return clampRenderedLines(lines.length ? lines : [""], maxWidth);
-}
-
-function clampRenderedLines(lines, width) {
-  return lines.flatMap((line) => String(line ?? "").split(/\r?\n/).map((part) => fitMarkdownLine(part, width)));
-}
-
-function fitMarkdownLine(line, width) {
-  if (visibleWidth(line) <= width) return line;
-  const truncated = truncateToWidth(line, width, "…");
-  return visibleWidth(truncated) <= width ? truncated : "";
-}
-
-function splitStableMarkdown(text) {
-  const lines = text.split("\n");
-  let offset = 0;
-  let stableOffset = 0;
-  let inFence = false;
-  for (const line of lines) {
-    const nextOffset = offset + line.length + 1;
-    if (/^\s*```/.test(line)) {
-      inFence = !inFence;
-      if (!inFence) stableOffset = Math.min(text.length, nextOffset);
-    } else if (!inFence && line.trim() === "") {
-      stableOffset = Math.min(text.length, nextOffset);
-    }
-    offset = nextOffset;
-  }
-  return { prefix: text.slice(0, stableOffset), tail: text.slice(stableOffset) };
-}
-
-function renderBlock(token, lines, width, depth) {
-  if (!token) return;
-  if (token.type === "space") {
-    if (lines.length && lines.at(-1) !== "") lines.push("");
-    return;
-  }
-  if (token.type === "heading") {
-    if (lines.length && lines.at(-1) !== "") lines.push("");
-    appendWrappedRuns(lines, inlineRuns(token.tokens ?? [{ type: "text", text: token.text }], "heading"), width, 0);
-    return;
-  }
-  if (token.type === "paragraph" || token.type === "text") {
-    appendWrappedRuns(lines, inlineRuns(token.tokens ?? [{ type: "text", text: token.text }]), width, depth * 2);
-    return;
-  }
-  if (token.type === "list") return renderList(token, lines, width, depth);
-  if (token.type === "table") return renderTable(token, lines, width);
-  if (token.type === "blockquote") return renderBlockquote(token, lines, width, depth);
-  if (token.type === "code") return renderCode(token, lines, width);
-  if (token.type === "hr") {
-    lines.push(brightBlack("─".repeat(Math.min(width, 60))));
-    return;
-  }
-  appendWrappedRuns(lines, [{ text: token.raw ?? token.text ?? "", style: null }], width, depth * 2);
-}
-
-function renderList(token, lines, width, depth) {
-  token.items?.forEach((item, index) => {
-    const marker = token.ordered ? `${Number(token.start || 1) + index}.` : "•";
-    const prefix = `${'  '.repeat(depth)}${cyan(marker)} `;
-    const inlineTokens = item.tokens?.filter((t) => t.type !== "list") ?? [];
-    const nested = item.tokens?.filter((t) => t.type === "list") ?? [];
-    const runs = inlineTokens.length
-      ? inlineTokens.flatMap((t) => inlineRuns(t.tokens ?? [{ type: "text", text: t.text }]))
-      : inlineRuns([{ type: "text", text: item.text ?? "" }]);
-    appendWrappedRuns(lines, runs, width, visibleWidth(stripAnsi(prefix)), prefix);
-    for (const child of nested) renderList(child, lines, width, depth + 1);
-  });
-}
-
-function renderTable(token, lines, width) {
-  const rows = [token.header ?? [], ...(token.rows ?? [])];
-  if (!rows.length) return;
-  const cells = rows.map((row) => row.map((cell) => plainInline(cell.tokens ?? [{ type: "text", text: cell.text }])));
-  const columnCount = Math.max(...cells.map((row) => row.length));
-  const widths = Array.from({ length: columnCount }, (_, i) => Math.max(3, ...cells.map((row) => visibleWidth(row[i] ?? ""))));
-  const borderWidth = columnCount + 1;
-  const paddingWidth = TABLE_CELL_PADDING * columnCount;
-  shrinkColumns(widths, Math.max(1, width - borderWidth - paddingWidth));
-
-  lines.push(formatTableBorder(widths, "┌", "┬", "┐"));
-  lines.push(formatTableRow(cells[0], widths, true));
-  lines.push(formatTableBorder(widths, "├", "┼", "┤"));
-  for (const row of cells.slice(1)) lines.push(formatTableRow(row, widths, false));
-  lines.push(formatTableBorder(widths, "└", "┴", "┘"));
-}
-
-function renderBlockquote(token, lines, width, depth) {
-  const inner = [];
-  for (const child of token.tokens ?? []) renderBlock(child, inner, Math.max(1, width - 2), depth);
-  for (const line of inner) lines.push(`${brightBlack("│")} ${dim(line)}`);
-}
-
-function renderCode(token, lines, width) {
-  const innerWidth = Math.max(1, width - 4);
-  lines.push(formatCodeBorder("╭", token.lang ? ` ${token.lang} ` : "", "╮", width));
-  for (const line of highlightCodeLines(String(token.text ?? ""), token.lang)) {
-    for (const wrapped of wrapAnsi(line, innerWidth)) {
-      lines.push(formatCodeLine(wrapped, width));
-    }
-  }
-  lines.push(formatCodeBorder("╰", "", "╯", width));
-}
-
-function formatCodeBorder(left, label, right, width) {
-  const prefix = `${left}─${label}`;
-  const fill = "─".repeat(Math.max(0, width - visibleWidth(prefix) - 1));
-  return brightBlack(`${prefix}${fill}${right}`);
-}
-
-function formatCodeLine(content, width) {
-  const padding = " ".repeat(Math.max(0, width - visibleWidth(stripAnsi(content)) - 4));
-  return `${brightBlack("│")} ${content}${padding} ${brightBlack("│")}`;
-}
-
-function inlineRuns(tokens, forcedStyle = null) {
-  const runs = [];
-  for (const token of tokens ?? []) {
-    if (token.type === "strong") runs.push(...inlineRuns(token.tokens, "strong"));
-    else if (token.type === "em") runs.push(...inlineRuns(token.tokens, "em"));
-    else if (token.type === "codespan") runs.push({ text: token.text ?? "", style: "code" });
-    else if (token.type === "link") runs.push(...inlineRuns(token.tokens ?? [{ type: "text", text: token.text }], "link"));
-    else runs.push({ text: token.text ?? token.raw ?? "", style: forcedStyle });
-  }
-  return runs;
-}
-
-function appendWrappedRuns(lines, runs, width, indent = 0, firstPrefix = null) {
-  const prefix = firstPrefix ?? " ".repeat(indent);
-  const restPrefix = " ".repeat(indent);
-  let current = prefix;
-  let currentWidth = visibleWidth(stripAnsi(prefix));
-  const maxWidth = Math.max(1, width);
-  for (const run of runs) {
-    for (const ch of run.text) {
-      if (ch === "\n") {
-        lines.push(current);
-        current = restPrefix;
-        currentWidth = visibleWidth(restPrefix);
-        continue;
-      }
-      const charWidth = visibleWidth(ch);
-      if (currentWidth + charWidth > maxWidth && currentWidth > visibleWidth(stripAnsi(prefix))) {
-        lines.push(current);
-        current = restPrefix;
-        currentWidth = visibleWidth(restPrefix);
-      }
-      current += styleText(ch, run.style);
-      currentWidth += charWidth;
-    }
-  }
-  lines.push(current);
-}
-
-function styleText(text, style) {
-  if (!style) return text;
-  if (style === "heading" || style === "strong") return orange(text);
-  if (style === "code") return softGreen(text);
-  if (style === "em") return dim(text);
-  if (style === "link") return cyan(text);
-  return text;
-}
-
-function plainInline(tokens) {
-  return stripAnsi(inlineRuns(tokens).map((run) => run.text).join(""));
-}
-
-function formatTableRow(row, widths, header) {
-  const cells = widths.map((width, i) => {
-    const text = truncateCell(row[i] ?? "", width);
-    const padded = text + " ".repeat(Math.max(0, width - visibleWidth(text)));
-    return ` ${header ? bold(padded) : padded} `;
-  });
-  return `${brightBlack("│")}${cells.join(brightBlack("│"))}${brightBlack("│")}`;
-}
-
-function formatTableBorder(widths, left, join, right) {
-  return brightBlack(`${left}${widths.map((width) => "─".repeat(width + TABLE_CELL_PADDING)).join(join)}${right}`);
-}
-
-function shrinkColumns(widths, maxTotal) {
-  while (widths.reduce((a, b) => a + b, 0) > maxTotal && Math.max(...widths) > 6) {
-    const index = widths.indexOf(Math.max(...widths));
-    widths[index] -= 1;
-  }
-}
-
-function truncateCell(text, width) {
-  const chars = [];
-  const sourceChars = Array.from(text);
-  let used = 0;
-  for (const ch of sourceChars) {
-    const w = visibleWidth(ch);
-    if (used + w > width) break;
-    chars.push(ch);
-    used += w;
-  }
-  if (chars.length < sourceChars.length && width > 1) {
-    while (chars.length && used + 1 > width) used -= visibleWidth(chars.pop());
-    return `${chars.join("")}…`;
-  }
-  return chars.join("");
-}
-
-function renderPlainMarkdownFallback(markdown, width) {
-  return String(markdown ?? "").split("\n").flatMap((line) => wrapAnsi(line, width));
-}
-
-function wrapAnsi(text, maxWidth) {
-  if (maxWidth <= 0) return [""];
-  const result = [];
-  let cur = "";
-  let curW = 0;
-  let activeSgr = "";
-  for (let i = 0; i < text.length;) {
-    if (text[i] === "\x1b") {
-      const match = text.slice(i).match(/^\x1b\[[0-?]*[ -/]*[@-~]/);
-      if (match) {
-        const seq = match[0];
-        cur += seq;
-        activeSgr = updateActiveSgr(activeSgr, seq);
-        i += seq.length;
-        continue;
-      }
-    }
-    const ch = text[i];
-    const w = visibleWidth(ch);
-    if (curW + w > maxWidth) {
-      result.push(activeSgr ? `${cur}${R}` : cur);
-      cur = activeSgr + ch;
-      curW = w;
-    } else {
-      cur += ch;
-      curW += w;
-    }
-    i += 1;
-  }
-  if (cur) result.push(cur);
-  return result.length ? result : [""];
-}
-
-function updateActiveSgr(activeSgr, seq) {
-  if (!seq.endsWith("m")) return activeSgr;
-  const body = seq.slice(2, -1);
-  if (body === "" || body.split(";").includes("0")) return "";
-  return seq;
-}
-
-function stripAnsi(text) {
-  return String(text ?? "").replace(/\x1b(?:\][^\x07]*(?:\x07|\x1b\\)|[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "");
-}
+import { marked } from "marked";
+import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { R, brightBlack, dim, orange, softGreen, bold, cyan } from "./ui-theme.mjs";
+import { highlightCodeLines } from "./syntax/highlighting.mjs";
+const TABLE_CELL_PADDING = 2;
+export function renderMarkdown(markdown, width) {
+  return renderMarkdownText(markdown, Math.max(1, width));
+}
+export function renderStreamingMarkdown(markdown, width, cache = new Map()) {
+  const text = String(markdown ?? "");
+  const maxWidth = Math.max(1, width);
+  const split = splitStableMarkdown(text);
+  if (!split.prefix) return renderMarkdownText(split.tail, maxWidth);
+
+  const key = `${maxWidth}\0${split.prefix}`;
+  let prefixLines = cache.get(key);
+  if (!prefixLines) {
+    prefixLines = renderMarkdownText(split.prefix, maxWidth);
+    cache.set(key, prefixLines);
+  }
+  const tailLines = split.tail ? renderMarkdownText(split.tail, maxWidth) : [];
+  return tailLines.length ? [...prefixLines, ...tailLines] : prefixLines;
+}
+
+function renderMarkdownText(markdown, maxWidth) {
+  let tokens;
+  try {
+    tokens = marked.lexer(String(markdown ?? ""));
+  } catch {
+    return renderPlainMarkdownFallback(markdown, maxWidth);
+  }
+  const lines = [];
+  for (const token of tokens) renderBlock(token, lines, maxWidth, 0);
+  return clampRenderedLines(lines.length ? lines : [""], maxWidth);
+}
+
+function clampRenderedLines(lines, width) {
+  return lines.flatMap((line) => String(line ?? "").split(/\r?\n/).map((part) => fitMarkdownLine(part, width)));
+}
+
+function fitMarkdownLine(line, width) {
+  if (visibleWidth(line) <= width) return line;
+  const truncated = truncateToWidth(line, width, "…");
+  return visibleWidth(truncated) <= width ? truncated : "";
+}
+
+function splitStableMarkdown(text) {
+  const lines = text.split("\n");
+  let offset = 0;
+  let stableOffset = 0;
+  let inFence = false;
+  for (const line of lines) {
+    const nextOffset = offset + line.length + 1;
+    if (/^\s*```/.test(line)) {
+      inFence = !inFence;
+      if (!inFence) stableOffset = Math.min(text.length, nextOffset);
+    } else if (!inFence && line.trim() === "") {
+      stableOffset = Math.min(text.length, nextOffset);
+    }
+    offset = nextOffset;
+  }
+  return { prefix: text.slice(0, stableOffset), tail: text.slice(stableOffset) };
+}
+
+function renderBlock(token, lines, width, depth) {
+  if (!token) return;
+  if (token.type === "space") {
+    if (lines.length && lines.at(-1) !== "") lines.push("");
+    return;
+  }
+  if (token.type === "heading") {
+    if (lines.length && lines.at(-1) !== "") lines.push("");
+    appendWrappedRuns(lines, inlineRuns(token.tokens ?? [{ type: "text", text: token.text }], "heading"), width, 0);
+    return;
+  }
+  if (token.type === "paragraph" || token.type === "text") {
+    appendWrappedRuns(lines, inlineRuns(token.tokens ?? [{ type: "text", text: token.text }]), width, depth * 2);
+    return;
+  }
+  if (token.type === "list") return renderList(token, lines, width, depth);
+  if (token.type === "table") return renderTable(token, lines, width);
+  if (token.type === "blockquote") return renderBlockquote(token, lines, width, depth);
+  if (token.type === "code") return renderCode(token, lines, width);
+  if (token.type === "hr") {
+    lines.push(brightBlack("─".repeat(Math.min(width, 60))));
+    return;
+  }
+  appendWrappedRuns(lines, [{ text: token.raw ?? token.text ?? "", style: null }], width, depth * 2);
+}
+
+function renderList(token, lines, width, depth) {
+  token.items?.forEach((item, index) => {
+    const marker = token.ordered ? `${Number(token.start || 1) + index}.` : "•";
+    const prefix = `${'  '.repeat(depth)}${cyan(marker)} `;
+    const inlineTokens = item.tokens?.filter((t) => t.type !== "list") ?? [];
+    const nested = item.tokens?.filter((t) => t.type === "list") ?? [];
+    const runs = inlineTokens.length
+      ? inlineTokens.flatMap((t) => inlineRuns(t.tokens ?? [{ type: "text", text: t.text }]))
+      : inlineRuns([{ type: "text", text: item.text ?? "" }]);
+    appendWrappedRuns(lines, runs, width, visibleWidth(stripAnsi(prefix)), prefix);
+    for (const child of nested) renderList(child, lines, width, depth + 1);
+  });
+}
+
+function renderTable(token, lines, width) {
+  const rows = [token.header ?? [], ...(token.rows ?? [])];
+  if (!rows.length) return;
+  const cells = rows.map((row) => row.map((cell) => plainInline(cell.tokens ?? [{ type: "text", text: cell.text }])));
+  const columnCount = Math.max(...cells.map((row) => row.length));
+  const widths = Array.from({ length: columnCount }, (_, i) => Math.max(3, ...cells.map((row) => visibleWidth(row[i] ?? ""))));
+  const borderWidth = columnCount + 1;
+  const paddingWidth = TABLE_CELL_PADDING * columnCount;
+  shrinkColumns(widths, Math.max(1, width - borderWidth - paddingWidth));
+
+  lines.push(formatTableBorder(widths, "┌", "┬", "┐"));
+  lines.push(formatTableRow(cells[0], widths, true));
+  lines.push(formatTableBorder(widths, "├", "┼", "┤"));
+  for (const row of cells.slice(1)) lines.push(formatTableRow(row, widths, false));
+  lines.push(formatTableBorder(widths, "└", "┴", "┘"));
+}
+
+function renderBlockquote(token, lines, width, depth) {
+  const inner = [];
+  for (const child of token.tokens ?? []) renderBlock(child, inner, Math.max(1, width - 2), depth);
+  for (const line of inner) lines.push(`${brightBlack("│")} ${dim(line)}`);
+}
+
+function renderCode(token, lines, width) {
+  const innerWidth = Math.max(1, width - 4);
+  lines.push(formatCodeBorder("╭", token.lang ? ` ${token.lang} ` : "", "╮", width));
+  for (const line of highlightCodeLines(String(token.text ?? ""), token.lang)) {
+    for (const wrapped of wrapAnsi(line, innerWidth)) {
+      lines.push(formatCodeLine(wrapped, width));
+    }
+  }
+  lines.push(formatCodeBorder("╰", "", "╯", width));
+}
+
+function formatCodeBorder(left, label, right, width) {
+  const prefix = `${left}─${label}`;
+  const fill = "─".repeat(Math.max(0, width - visibleWidth(prefix) - 1));
+  return brightBlack(`${prefix}${fill}${right}`);
+}
+
+function formatCodeLine(content, width) {
+  const padding = " ".repeat(Math.max(0, width - visibleWidth(stripAnsi(content)) - 4));
+  return `${brightBlack("│")} ${content}${padding} ${brightBlack("│")}`;
+}
+
+function inlineRuns(tokens, forcedStyle = null) {
+  const runs = [];
+  for (const token of tokens ?? []) {
+    if (token.type === "strong") runs.push(...inlineRuns(token.tokens, "strong"));
+    else if (token.type === "em") runs.push(...inlineRuns(token.tokens, "em"));
+    else if (token.type === "codespan") runs.push({ text: token.text ?? "", style: "code" });
+    else if (token.type === "link") runs.push(...inlineRuns(token.tokens ?? [{ type: "text", text: token.text }], "link"));
+    else runs.push({ text: token.text ?? token.raw ?? "", style: forcedStyle });
+  }
+  return runs;
+}
+
+function appendWrappedRuns(lines, runs, width, indent = 0, firstPrefix = null) {
+  const prefix = firstPrefix ?? " ".repeat(indent);
+  const restPrefix = " ".repeat(indent);
+  let current = prefix;
+  let currentWidth = visibleWidth(stripAnsi(prefix));
+  const maxWidth = Math.max(1, width);
+  for (const run of runs) {
+    for (const ch of run.text) {
+      if (ch === "\n") {
+        lines.push(current);
+        current = restPrefix;
+        currentWidth = visibleWidth(restPrefix);
+        continue;
+      }
+      const charWidth = visibleWidth(ch);
+      if (currentWidth + charWidth > maxWidth && currentWidth > visibleWidth(stripAnsi(prefix))) {
+        lines.push(current);
+        current = restPrefix;
+        currentWidth = visibleWidth(restPrefix);
+      }
+      current += styleText(ch, run.style);
+      currentWidth += charWidth;
+    }
+  }
+  lines.push(current);
+}
+
+function styleText(text, style) {
+  if (!style) return text;
+  if (style === "heading" || style === "strong") return orange(text);
+  if (style === "code") return softGreen(text);
+  if (style === "em") return dim(text);
+  if (style === "link") return cyan(text);
+  return text;
+}
+
+function plainInline(tokens) {
+  return stripAnsi(inlineRuns(tokens).map((run) => run.text).join(""));
+}
+
+function formatTableRow(row, widths, header) {
+  const cells = widths.map((width, i) => {
+    const text = truncateCell(row[i] ?? "", width);
+    const padded = text + " ".repeat(Math.max(0, width - visibleWidth(text)));
+    return ` ${header ? bold(padded) : padded} `;
+  });
+  return `${brightBlack("│")}${cells.join(brightBlack("│"))}${brightBlack("│")}`;
+}
+
+function formatTableBorder(widths, left, join, right) {
+  return brightBlack(`${left}${widths.map((width) => "─".repeat(width + TABLE_CELL_PADDING)).join(join)}${right}`);
+}
+
+function shrinkColumns(widths, maxTotal) {
+  while (widths.reduce((a, b) => a + b, 0) > maxTotal && Math.max(...widths) > 6) {
+    const index = widths.indexOf(Math.max(...widths));
+    widths[index] -= 1;
+  }
+}
+
+function truncateCell(text, width) {
+  const chars = [];
+  const sourceChars = Array.from(text);
+  let used = 0;
+  for (const ch of sourceChars) {
+    const w = visibleWidth(ch);
+    if (used + w > width) break;
+    chars.push(ch);
+    used += w;
+  }
+  if (chars.length < sourceChars.length && width > 1) {
+    while (chars.length && used + 1 > width) used -= visibleWidth(chars.pop());
+    return `${chars.join("")}…`;
+  }
+  return chars.join("");
+}
+
+function renderPlainMarkdownFallback(markdown, width) {
+  return String(markdown ?? "").split("\n").flatMap((line) => wrapAnsi(line, width));
+}
+
+function wrapAnsi(text, maxWidth) {
+  if (maxWidth <= 0) return [""];
+  const result = [];
+  let cur = "";
+  let curW = 0;
+  let activeSgr = "";
+  for (let i = 0; i < text.length;) {
+    if (text[i] === "\x1b") {
+      const match = text.slice(i).match(/^\x1b\[[0-?]*[ -/]*[@-~]/);
+      if (match) {
+        const seq = match[0];
+        cur += seq;
+        activeSgr = updateActiveSgr(activeSgr, seq);
+        i += seq.length;
+        continue;
+      }
+    }
+    const ch = text[i];
+    const w = visibleWidth(ch);
+    if (curW + w > maxWidth) {
+      result.push(activeSgr ? `${cur}${R}` : cur);
+      cur = activeSgr + ch;
+      curW = w;
+    } else {
+      cur += ch;
+      curW += w;
+    }
+    i += 1;
+  }
+  if (cur) result.push(cur);
+  return result.length ? result : [""];
+}
+
+function updateActiveSgr(activeSgr, seq) {
+  if (!seq.endsWith("m")) return activeSgr;
+  const body = seq.slice(2, -1);
+  if (body === "" || body.split(";").includes("0")) return "";
+  return seq;
+}
+
+function stripAnsi(text) {
+  return String(text ?? "").replace(/\x1b(?:\][^\x07]*(?:\x07|\x1b\\)|[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "");
+}