reslop 0.2.3 → 0.2.5

package/lib/render/commits.js

@@ -1,39 +1,101 @@
 'use strict';
 
 const ansi = require('../ansi.js');
+const files = require('../files.js');
 const primitives = require('./primitives.js');
-const { wrapMultiline, cursorInWrap } = require('../wrap.js');
+const wrap = require('../wrap.js');
+const { shortAge } = files;
+const { wrapMultiline, wrapDoc, cursorInWrap } = wrap;
 const { measureColumns, padColumns, joinColumns, paintColumns } = primitives;
+const { padVisible } = primitives;
 
 const { THEME, paint, visibleWidth, truncateVisible, seq, EL } = ansi;
-const { FILE_MARK, paneResult, paintCursorList } = primitives;
-const { paintBodyFill, listWindowStart } = primitives;
+const { FILE_MARK, paintCursorList, fieldWindow } = primitives;
+const { paintBodyFill, listLine, paintListWindow } = primitives;
 
 const COMMIT_COL_ALIGN = {
   sha: 'end',
   refs: 'end',
+  add: 'start',
+  del: 'start',
   date: 'start',
 };
 
 const COMMIT_COL_FG = {
   sha: THEME.shaFg,
   refs: THEME.warnFg,
+  add: THEME.addLineFg,
+  del: THEME.delLineFg,
   date: THEME.mutedFg,
 };
 
 const COMMIT_CURRENT_COL_FG = {
   sha: THEME.shaDarkFg,
+  refs: THEME.shaDarkFg,
   date: THEME.headerFg,
 };
 
 const REFS_MAX = 28;
-const LIST_PAD = 1;
 const COMMIT_TAIL = 1;
-const commitRowFields = (entry) => ({
-  sha: entry.shortSha ?? '',
-  refs: truncateVisible(entry.refs ?? '', REFS_MAX),
-  date: entry.date ?? '',
-});
+const lineCounts = (entry) => {
+  const added = entry.added ?? 0;
+  const removed = entry.removed ?? 0;
+  if (!added && !removed) return null;
+  return { added, removed };
+};
+
+const countLabel = (entry) => {
+  if (entry && entry.pending) {
+    const stagedAdd = entry.stagedAdded ?? 0;
+    const unstagedAdd = entry.unstagedAdded ?? 0;
+    const stagedDel = entry.stagedRemoved ?? 0;
+    const unstagedDel = entry.unstagedRemoved ?? 0;
+    const any = stagedAdd || unstagedAdd || stagedDel || unstagedDel;
+    if (!any) return null;
+    return {
+      add: `+${stagedAdd}/${unstagedAdd}`,
+      del: `-${stagedDel}/${unstagedDel}`,
+    };
+  }
+  const counts = lineCounts(entry);
+  if (!counts) return null;
+  return { add: `+${counts.added}`, del: `-${counts.removed}` };
+};
+
+const DIFF_LABEL = 'Diffs:';
+const DIFF_GAP = '  ';
+
+const entryCountWidth = (entry) => {
+  const label = countLabel(entry);
+  if (!label) return { add: 0, del: 0 };
+  return {
+    add: visibleWidth(label.add),
+    del: visibleWidth(label.del),
+  };
+};
+
+const listCountWidth = (commits) => {
+  let add = 0;
+  let del = 0;
+  for (const entry of commits) {
+    const width = entryCountWidth(entry);
+    add = Math.max(add, width.add);
+    del = Math.max(del, width.del);
+  }
+  return { add, del };
+};
+
+const commitRowFields = (entry) => {
+  const refs = `${entry.refs ?? ''}`.trim();
+  const label = countLabel(entry);
+  return {
+    sha: entry.shortSha ?? '',
+    refs: refs ? truncateVisible(refs, REFS_MAX) : '',
+    add: label ? label.add : '',
+    del: label ? label.del : '',
+    date: shortAge(entry.date ?? ''),
+  };
+};
 
 const contentWidth = (width) => Math.max(1, width - COMMIT_TAIL);
 
@@ -116,46 +178,38 @@ const paintCommitRow = (entry, width, color, selected, cols, current) => {
   return out;
 };
 
-const paintCommitEdit = (compose, width, color, entry, cols) => {
+const lineEdit = (text, textX, span, scroll) => ({
+  x0: 1,
+  textX,
+  x1: textX + span,
+  start: 0,
+  text,
+  limit: text.length,
+  scroll,
+  live: true,
+});
+
+const subjectWindow = (compose, rest) => {
+  const line = splitMessage(compose.text).line;
+  const at = Math.min(compose.cursor ?? 0, line.length);
+  return fieldWindow(line, at, compose.scrollCol, rest);
+};
+
+const paintCommitEdit = (compose, width, color, entry = null, cols = {}) => {
   const text = splitMessage(compose.text).line;
-  if (entry && cols) {
-    const shown = { ...entry, body: text, subject: text };
-    const row = paintCommitRow(shown, width, color, true, cols);
-    const inner = contentWidth(width);
-    const prefix = ` ${FILE_MARK} `;
-    const parts = padColumns(commitRowFields(entry), cols, COMMIT_COL_ALIGN);
-    const suffix = joinColumns(parts, cols);
-    const rest = Math.max(1, inner - visibleWidth(prefix + suffix));
-    const clipped = truncateVisible(text, rest);
-    const prefixW = visibleWidth(prefix);
-    const col = Math.min(compose.cursor ?? 0, visibleWidth(clipped));
-    return {
-      row,
-      cursor: { x: prefixW + col + 1 },
-      at: 'replace',
-    };
-  }
-  const inner = contentWidth(width);
   const prefix = ` ${FILE_MARK} `;
   const prefixW = visibleWidth(prefix);
-  const rest = Math.max(1, inner - prefixW);
-  const clipped = truncateVisible(text, rest);
-  const pad = Math.max(0, rest - visibleWidth(clipped));
-  const gap = ' '.repeat(pad);
-  const tail = ' '.repeat(COMMIT_TAIL);
-  const fgRgb = THEME.chromeFg;
-  const bgRgb = THEME.buttonBg;
-  const nameFg = THEME.buttonHotFg;
-  let row = `${prefix}${clipped}${gap}${tail}`;
-  if (color) {
-    row = `${seq(fgRgb, bgRgb)}${EL}`;
-    row += paint(prefix, fgRgb, bgRgb, color);
-    row += paint(clipped, nameFg, bgRgb, color);
-    row += paint(gap, fgRgb, bgRgb, color);
-    row += paint(tail, fgRgb, bgRgb, color);
-  }
-  const col = Math.min(compose.cursor ?? 0, visibleWidth(clipped));
-  return { row, cursor: { x: prefixW + col + 1 }, at: 'start' };
+  const fields = commitRowFields(entry ?? {});
+  const suffix = joinColumns(padColumns(fields, cols, COMMIT_COL_ALIGN), cols);
+  const rest = Math.max(1, contentWidth(width) - visibleWidth(prefix + suffix));
+  const win = subjectWindow(compose, rest);
+  const shown = { ...entry, body: win.text, subject: win.text };
+  return {
+    row: paintCommitRow(shown, width, color, true, cols),
+    cursor: { x: prefixW + win.col + 1, scroll: win.scroll },
+    at: entry ? 'replace' : 'start',
+    edit: lineEdit(text, prefixW + 1, rest, win.scroll),
+  };
 };
 
 const pendingAt = (commits) => {
@@ -268,19 +322,45 @@ const partsWidth = (parts) => {
 
 const timeNeed = (entry) => {
   const when = `${entry.when ?? ''}`.trim();
-  const ago = `${entry.date ?? ''}`.trim();
+  const ago = shortAge(entry.date ?? '');
   if (when && ago) return visibleWidth(when) + COL_GAP + visibleWidth(ago);
   return visibleWidth(when || ago);
 };
 
 const refsText = (entry) => `${entry.refs ?? ''}`.trim();
 
-const rightNeed = (entry) =>
-  Math.max(
+const diffLine = (entry, widths) => {
+  const label = countLabel(entry);
+  if (!label) return null;
+  const add = padVisible(label.add, widths.add, 'start');
+  const del = padVisible(label.del, widths.del, 'start');
+  const text = `${DIFF_LABEL}${DIFF_GAP}${add}${DIFF_GAP}${del}`;
+  return { add, del, text };
+};
+
+const diffCountParts = (entry, widths, rightW) => {
+  const line = diffLine(entry, widths);
+  if (!line || !rightW) return [];
+  const pad = Math.max(0, rightW - visibleWidth(line.text));
+  return [
+    { text: ' '.repeat(pad), kind: 'meta' },
+    { text: DIFF_LABEL, kind: 'meta' },
+    { text: DIFF_GAP, kind: 'meta' },
+    { text: line.add, kind: 'add' },
+    { text: DIFF_GAP, kind: 'meta' },
+    { text: line.del, kind: 'del' },
+  ];
+};
+
+const rightNeed = (entry, widths = entryCountWidth(entry)) => {
+  const line = diffLine(entry, widths);
+  return Math.max(
     partsWidth(authorParts(entry)),
     timeNeed(entry),
     visibleWidth(refsText(entry)),
+    line ? visibleWidth(line.text) : 0,
   );
+};
 
 const spreadTime = (when, ago, width) => {
   const agoW = visibleWidth(ago);
@@ -309,7 +389,7 @@ const alignEnd = (text, width, kind) => {
 
 const timeParts = (entry, width) => {
   const when = `${entry.when ?? ''}`.trim();
-  const ago = `${entry.date ?? ''}`.trim();
+  const ago = shortAge(entry.date ?? '');
   if (!width) return [];
   if (when && ago) return spreadTime(when, ago, width);
   if (ago) return alignEnd(ago, width, 'meta');
@@ -317,10 +397,16 @@ const timeParts = (entry, width) => {
   return [];
 };
 
-const rightRows = (entry, rightW) => {
-  const rows = [authorParts(entry), timeParts(entry, rightW)];
+const rightRows = (entry, rightW, widths) => {
+  const rows = [];
+  const author = authorParts(entry);
+  if (author.length) rows.push(author);
+  const time = timeParts(entry, rightW);
+  if (time.length) rows.push(time);
   const refs = refsText(entry);
   if (refs) rows.push([{ text: refs, kind: 'refs' }]);
+  const diff = diffCountParts(entry, widths, rightW);
+  if (diff.length) rows.push(diff);
   return rows;
 };
 
@@ -342,7 +428,8 @@ const panelLeft = (entry, leftW, edit) => {
   const parts = edit
     ? messagePartsFrom(edit.text ?? '', leftW)
     : messageParts(entry, leftW);
-  return [{ text: entry.sha ?? '', kind: 'hash' }, ...parts];
+  if (!entry.sha) return parts;
+  return [{ text: entry.sha, kind: 'hash' }, ...parts];
 };
 
 const commitMessageWidth = (entry, screenWidth) => {
@@ -368,9 +455,11 @@ const messageCaret = (text, cursor, width, row, first, selected) => {
 };
 
 const pieceFg = (kind, tone) => {
+  if (kind === 'add') return THEME.addLineFg;
+  if (kind === 'del') return THEME.delLineFg;
   if (tone.current) {
     if (kind === 'hash') return THEME.shaDarkFg;
-    if (kind === 'refs') return THEME.warnFg;
+    if (kind === 'refs') return THEME.shaDarkFg;
     if (kind === 'text' || kind === 'body') return THEME.mutedFg;
     return tone.fgRgb;
   }
@@ -424,20 +513,32 @@ const paintPanelLine = (spec) => {
   );
 };
 
-const lineRecord = (commit, row, hit, cursor = null) => ({
-  commit,
-  row,
-  hit,
-  cursor,
-});
+const editFromDoc = (doc, row, textX, span) => {
+  if (row < 0 || row >= doc.length) return null;
+  const piece = doc[row];
+  return {
+    x0: 1,
+    textX,
+    x1: textX + span,
+    start: piece.start,
+    text: piece.text,
+    limit: piece.start + piece.text.length,
+    live: true,
+  };
+};
+
+const editLines = (editHit) => (editHit ? [editHit] : undefined);
 
-const commitLines = (entry, index, width, color, selected, edit, current) => {
+const commitLines = (entry, index, spec) => {
+  const { width, color, selected, edit, current, diffWidths } = spec;
   const inner = contentWidth(width);
   const hashW = visibleWidth(entry.sha ?? '');
-  const cols = panelWidths(rightNeed(entry), hashW, inner);
-  const rights = rightRows(entry, cols.rightW);
+  const widths = diffWidths ?? entryCountWidth(entry);
+  const cols = panelWidths(rightNeed(entry, widths), hashW, inner);
+  const rights = rightRows(entry, cols.rightW, widths);
   const left = panelLeft(entry, cols.leftW, edit);
   const count = Math.max(left.length, rights.length);
+  const doc = edit ? wrapDoc(`${edit.text ?? ''}`, cols.leftW) : null;
   const lines = [];
   for (let row = 0; row < count; row++) {
     const line = left[row] ?? { text: '', kind: 'text' };
@@ -455,17 +556,23 @@ const commitLines = (entry, index, width, color, selected, edit, current) => {
       leftKind: line.kind,
       rightKind: 'meta',
     });
+    const messageRow = entry.sha ? row - 1 : row;
+    const first = !entry.sha && row === 0;
     const caret = edit
       ? messageCaret(
           edit.text,
           edit.cursor,
           cols.leftW,
-          row - 1,
-          false,
+          messageRow,
+          first,
           selected,
         )
       : null;
-    lines.push(lineRecord(index, painted, true, caret));
+    const textX = prefixWidth(first, selected) + 1;
+    const editHit = doc
+      ? editFromDoc(doc, messageRow, textX, cols.leftW)
+      : null;
+    lines.push(listLine(painted, index, caret, editLines(editHit)));
   }
   return lines;
 };
@@ -474,6 +581,7 @@ const draftLines = (text, cursor, width, color) => {
   const inner = contentWidth(width);
   const leftW = Math.max(1, inner - visibleWidth(FULL_INDENT));
   const parts = messagePartsFrom(text, leftW);
+  const doc = wrapDoc(`${text ?? ''}`, leftW);
   const lines = [];
   for (let row = 0; row < parts.length; row++) {
     const line = parts[row];
@@ -491,7 +599,9 @@ const draftLines = (text, cursor, width, color) => {
       rightKind: 'meta',
     });
     const caret = messageCaret(text, cursor, leftW, row, row === 0, true);
-    lines.push(lineRecord(-1, painted, false, caret));
+    const textX = prefixWidth(row === 0, true) + 1;
+    const editHit = editFromDoc(doc, row, textX, leftW);
+    lines.push(listLine(painted, -1, caret, editLines(editHit)));
   }
   return lines;
 };
@@ -511,181 +621,71 @@ const composeShowsDraft = (compose, commits) => {
   return true;
 };
 
-const gapLine = (width, color) =>
-  lineRecord(-1, paintBodyFill(width, color, 'files'), false);
-
-const flattenCommits = (commits, cursor, width, color, compose, rev, short) => {
-  const lines = [];
+const flattenCommits = (view, commits, width, color) => {
+  const cursor = view.commitCursor ?? 0;
+  const compose = view.compose ?? null;
   const editing = compose && compose.kind === 'commit';
-  const pushGap = () => {
-    if (lines.length) lines.push(gapLine(width, color));
-  };
+  const diffWidths = listCountWidth(commits);
+  const gap = listLine(paintBodyFill(width, color, 'files'), -1);
+  const lines = [];
   if (composeShowsDraft(compose, commits)) {
-    const draft = draftLines(
-      compose.text ?? '',
-      compose.cursor ?? 0,
-      width,
-      color,
-    );
-    for (const line of draft) lines.push(line);
+    const text = compose.text ?? '';
+    lines.push(...draftLines(text, compose.cursor ?? 0, width, color));
   }
   for (let index = 0; index < commits.length; index++) {
-    pushGap();
+    if (lines.length) lines.push(gap);
+    const entry = commits[index];
     const inplace = composeEditsIndex(compose, commits, index, cursor);
     const selected = inplace || (!editing && index === cursor);
-    const edit = inplace
-      ? { text: compose.text ?? '', cursor: compose.cursor ?? 0 }
-      : null;
-    const block = commitLines(
-      commits[index],
-      index,
+    const text = compose?.text ?? '';
+    const caret = compose?.cursor ?? 0;
+    const edit = inplace ? { text, cursor: caret } : null;
+    const current = viewedCommit(entry, view.rev, view.revShort);
+    const block = commitLines(entry, index, {
       width,
       color,
       selected,
       edit,
-      viewedCommit(commits[index], rev, short),
-    );
-    for (const line of block) lines.push(line);
+      current,
+      diffWidths,
+    });
+    lines.push(...block);
   }
   return lines;
 };
 
 const focusLine = (lines, cursor, compose) => {
   if (compose && compose.kind === 'commit') {
-    for (let i = 0; i < lines.length; i++) {
-      if (lines[i].cursor) return i;
-    }
+    const at = lines.findIndex((line) => line.cursor);
+    if (at >= 0) return at;
   }
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    if (line.hit && line.commit === cursor) return i;
-  }
-  return 0;
-};
-
-const paintLineWindow = (
-  lines,
-  focus,
-  width,
-  color,
-  bodyH,
-  headerLines,
-  offset,
-) => {
-  const pad = bodyH >= LIST_PAD * 2 + 1 ? LIST_PAD : 0;
-  const listH = bodyH - pad * 2;
-  const start = listWindowStart(focus, offset, listH, lines.length);
-  const blank = paintBodyFill(width, color, 'files');
-  const body = [];
-  const fileHits = [];
-  let textCursor = null;
-  if (pad) body.push(blank);
-  for (let i = 0; i < listH; i++) {
-    const line = lines[start + i];
-    if (!line) break;
-    body.push(line.row);
-    if (line.cursor) {
-      textCursor = { x: line.cursor.x, row: body.length - 1 };
-    }
-    if (!line.hit) continue;
-    const y = headerLines + pad + i + 1;
-    fileHits.push({ y, cursor: line.commit });
-  }
-  if (pad) body.push(blank);
-  return { body, fileHits, cursor: textCursor, offset: start };
+  const at = lines.findIndex((line) => line.hit && line.index === cursor);
+  return Math.max(0, at);
 };
 
-const paintFullCommits = (view, width, color, bodyH, headerLines) => {
+const paintBodyCommits = (view, width, color, bodyH, headerLines) => {
+  const pane = { width, color, bodyH, headerLines, offset: view.listScroll };
   const commits = view.commits ?? [];
   const cursor = view.commitCursor ?? 0;
-  const compose = view.compose ?? null;
-  const lines = flattenCommits(
-    commits,
-    cursor,
-    width,
-    color,
-    compose,
-    view.rev,
-    view.revShort,
-  );
-  const focus = focusLine(lines, cursor, compose);
-  return paintLineWindow(
-    lines,
-    focus,
-    width,
-    color,
-    bodyH,
-    headerLines,
-    view.listScroll,
-  );
-};
-
-const paintBriefCommits = (
-  commits,
-  cursor,
-  width,
-  color,
-  bodyH,
-  headerLines,
-  extra,
-  offset,
-  cols,
-  rev,
-  revShort,
-) => {
-  const paintRow = (entry, rowWidth, rowColor, selected) =>
-    paintCommitRow(
-      entry,
-      rowWidth,
-      rowColor,
-      selected,
-      cols,
-      viewedCommit(entry, rev, revShort),
-    );
-  return paintCursorList(
+  if (view.commitView === 'full') {
+    const lines = flattenCommits(view, commits, width, color);
+    const focus = focusLine(lines, cursor, view.compose);
+    return paintListWindow(lines.length, focus, pane, (i) => lines[i]);
+  }
+  const cols = measureColumns(commits, commitRowFields, COMMIT_COL_ALIGN);
+  const extra = commitEditRow(
+    view.compose,
     commits,
     cursor,
     width,
     color,
-    bodyH,
-    headerLines,
-    paintRow,
-    extra,
-    offset,
+    cols,
   );
-};
-
-const paintBodyCommits = (view, width, color, bodyH, headerLines) => {
-  const commits = view.commits ?? [];
-  const cols = measureColumns(commits, commitRowFields, COMMIT_COL_ALIGN);
-  const cursor = view.commitCursor ?? 0;
-  const full = view.commitView === 'full';
-  const extra = full
-    ? null
-    : commitEditRow(view.compose, commits, cursor, width, color, cols);
-  const painted = full
-    ? paintFullCommits(view, width, color, bodyH, headerLines)
-    : paintBriefCommits(
-        commits,
-        cursor,
-        width,
-        color,
-        bodyH,
-        headerLines,
-        extra,
-        view.listScroll,
-        cols,
-        view.rev,
-        view.revShort,
-      );
-  return paneResult({
-    body: painted.body,
-    fileHits: painted.fileHits,
-    todoOwners: [],
-    cursor: painted.cursor,
-    splitBody: false,
-    listScroll: painted.offset,
-  });
+  const paintRow = (entry, selected) => {
+    const current = viewedCommit(entry, view.rev, view.revShort);
+    return paintCommitRow(entry, width, color, selected, cols, current);
+  };
+  return paintCursorList(commits, cursor, pane, paintRow, extra);
 };
 
 module.exports = {