reslop 0.2.5 → 0.2.7

package/lib/render/files.js

@@ -3,11 +3,15 @@
 const ansi = require('../ansi.js');
 const files = require('../files.js');
 const primitives = require('./primitives.js');
-const { measureColumns, padColumns } = primitives;
 
 const { isTasksEntry, shortAge } = files;
-const { THEME, paint, visibleWidth, truncateVisible, seq, EL } = ansi;
-const { fill, FILE_MARK, paintCursorList } = primitives;
+const { THEME, paint, visibleWidth, trimVisible, seq, EL } = ansi;
+const { fill, markPrefix, paintCursorList } = primitives;
+const { measureColumns, padColumns } = primitives;
+const searchPaint = require('./search.js');
+const { paintPathText } = searchPaint;
+const locate = require('../find.js');
+const { activeHit, spansFor } = locate;
 
 const FILE_STATUS_FG = {
   unstaged: THEME.delLineFg,
@@ -27,115 +31,85 @@ const FILE_COL_ALIGN = {
 
 const FILE_DATE_GAP = '   ';
 
-const signedCount = (sign, n) => `${sign}${n ?? 0}`;
-
 const fileRowFields = (entry) => {
+  const n = `${entry.staged ?? 0}`;
+  const m = `${entry.remaining ?? 0}`;
   if (isTasksEntry(entry)) {
-    const n = `${entry.staged ?? 0}`;
-    const m = `${entry.remaining ?? 0}`;
     return { add: '', del: '', status: '', n, m, date: '' };
   }
-  const { added, removed, staged, remaining } = entry;
-  const add = signedCount('+', added);
-  const del = signedCount('-', removed);
+  const add = `+${entry.added ?? 0}`;
+  const del = `-${entry.removed ?? 0}`;
   const status = entry.status ?? '';
-  const n = `${staged ?? 0}`;
-  const m = `${remaining ?? 0}`;
-  const date = shortAge(entry.date ?? '');
-  return { add, del, status, n, m, date };
+  return { add, del, status, n, m, date: shortAge(entry.date) };
 };
 
-const fileRowFg = (status, selected) => {
-  const statusFg = FILE_STATUS_FG[status];
+const fileRowFg = (entry, selected) => {
+  if (isTasksEntry(entry)) return THEME.buttonHotFg;
+  const statusFg = FILE_STATUS_FG[entry.status];
   if (statusFg) return statusFg;
-  if (selected) return THEME.chromeFg;
-  return THEME.mutedFg;
-};
-
-const joinFileDate = (parts, cols) => {
-  if (!cols?.date) return '';
-  return `${FILE_DATE_GAP}${parts.date}`;
+  return selected ? THEME.chromeFg : THEME.mutedFg;
 };
 
-const joinFileMeta = (parts) => {
-  const { add, del, status, n, m } = parts;
-  return `  ${add}  ${del}  ${status}  ${n}/${m}`;
-};
-
-const paintFileSuffix = (parts, cols, fgRgb, bgRgb, color) => {
-  const { add, del, status, n, m } = parts;
+const paintFileMeta = (parts, fgRgb, bgRgb, color) => {
   const gap = paint('  ', fgRgb, bgRgb, color);
-  const addText = paint(add, THEME.addLineFg, bgRgb, color);
-  const delText = paint(del, THEME.delLineFg, bgRgb, color);
-  const statusText = paint(status, fgRgb, bgRgb, color);
-  const nText = paint(n, fgRgb, bgRgb, color);
-  const slash = paint('/', fgRgb, bgRgb, color);
-  const mText = paint(m, fgRgb, bgRgb, color);
-  const counts = addText + gap + delText;
-  const meta = statusText + gap + nText + slash + mText;
-  if (!cols?.date) return gap + counts + gap + meta;
-  const dateGap = paint(FILE_DATE_GAP, fgRgb, bgRgb, color);
-  const age = paint(parts.date, THEME.mutedFg, bgRgb, color);
-  return gap + counts + gap + meta + dateGap + age;
+  let out = gap + paint(parts.add, THEME.addLineFg, bgRgb, color);
+  out += gap + paint(parts.del, THEME.delLineFg, bgRgb, color);
+  out += gap + paint(parts.status, fgRgb, bgRgb, color);
+  out += gap + paint(parts.n, fgRgb, bgRgb, color);
+  out += paint('/', fgRgb, bgRgb, color);
+  return out + paint(parts.m, fgRgb, bgRgb, color);
 };
 
-const paintTodosRow = (entry, width, color, selected, cols) => {
-  const inner = Math.max(1, width - 1);
-  const mark = selected ? FILE_MARK : ' ';
-  const prefix = ` ${mark} `;
-  const parts = padColumns(fileRowFields(entry), cols, FILE_COL_ALIGN);
-  const meta = joinFileMeta(parts);
-  const dated = joinFileDate(parts, cols);
-  const suffix = `${meta}${dated}`;
-  const pathW = Math.max(1, inner - visibleWidth(prefix + suffix));
-  const clipped = truncateVisible(entry.path, pathW);
-  const pad = Math.max(0, pathW - visibleWidth(clipped));
-  const left = `${prefix}${clipped}${' '.repeat(pad)}`;
-  const fgRgb = THEME.buttonHotFg;
-  const bgRgb = selected ? THEME.buttonBg : THEME.ctxBg;
-  const edge = fill(1, fgRgb, bgRgb, color);
-  if (!color) return `${left}${suffix}${edge}`;
-  let out = `${seq(fgRgb, bgRgb)}${EL}`;
-  out += paint(left, fgRgb, bgRgb, color, true);
-  out += paint(meta, fgRgb, bgRgb, color, true);
-  if (!dated) return out + edge;
-  out += paint(FILE_DATE_GAP, fgRgb, bgRgb, color);
-  out += paint(parts.date, THEME.mutedFg, bgRgb, color);
-  return out + edge;
+const rowSpans = (entry, path, marks) => {
+  if (!marks || !marks.query) return [];
+  const hit = marks.hit && marks.hit.index === marks.index ? marks.hit : null;
+  return spansFor(path, entry.path ?? '', marks.query, hit);
 };
 
-const paintFileRow = (entry, width, color, selected, cols) => {
-  if (isTasksEntry(entry)) {
-    return paintTodosRow(entry, width, color, selected, cols);
-  }
+const paintFileRow = (entry, width, color, selected, cols, marks) => {
+  const tasks = isTasksEntry(entry);
   const inner = Math.max(1, width - 1);
-  const mark = selected ? FILE_MARK : ' ';
-  const prefix = ` ${mark} `;
+  const prefix = markPrefix(selected);
   const parts = padColumns(fileRowFields(entry), cols, FILE_COL_ALIGN);
-  const suffix = `${joinFileMeta(parts)}${joinFileDate(parts, cols)}`;
-  const pathW = Math.max(1, inner - visibleWidth(prefix + suffix));
-  const { path, status } = entry;
-  const clipped = truncateVisible(path, pathW);
-  const pad = Math.max(0, pathW - visibleWidth(clipped));
-  const left = `${prefix}${clipped}${' '.repeat(pad)}`;
-  const fgRgb = fileRowFg(status, selected);
+  const { add, del, status, n, m } = parts;
+  const meta = `  ${add}  ${del}  ${status}  ${n}/${m}`;
+  const date = cols.date ? `${FILE_DATE_GAP}${parts.date}` : '';
+  const pathW = Math.max(1, inner - visibleWidth(prefix + meta + date));
+  const path = trimVisible(entry.path, pathW);
+  const pad = ' '.repeat(Math.max(0, pathW - visibleWidth(path)));
+  const left = `${prefix}${path}${pad}`;
+  const fgRgb = fileRowFg(entry, selected);
   const bgRgb = selected ? THEME.buttonBg : THEME.ctxBg;
   const edge = fill(1, fgRgb, bgRgb, color);
-  if (!color) return `${left}${suffix}${edge}`;
+  if (!color) return `${left}${meta}${date}${edge}`;
+  const spans = rowSpans(entry, path, marks);
   let out = `${seq(fgRgb, bgRgb)}${EL}`;
-  out += paint(left, fgRgb, bgRgb, color);
-  out += paintFileSuffix(parts, cols, fgRgb, bgRgb, color);
+  out += paint(prefix, fgRgb, bgRgb, color, tasks);
+  out += paintPathText(path, fgRgb, bgRgb, color, tasks, spans);
+  out += paint(pad, fgRgb, bgRgb, color, tasks);
+  if (tasks) out += paint(meta, fgRgb, bgRgb, color, true);
+  else out += paintFileMeta(parts, fgRgb, bgRgb, color);
+  if (date) {
+    out += paint(FILE_DATE_GAP, fgRgb, bgRgb, color);
+    out += paint(parts.date, THEME.mutedFg, bgRgb, color);
+  }
   return out + edge;
 };
 
 const paintBodyFiles = (view, width, color, bodyH, headerLines) => {
-  const files = view.files ?? [];
-  const cols = measureColumns(files, fileRowFields, FILE_COL_ALIGN);
+  const entries = view.files ?? [];
+  const cols = measureColumns(entries, fileRowFields, FILE_COL_ALIGN);
   const cursor = view.fileCursor ?? 0;
   const pane = { width, color, bodyH, headerLines, offset: view.listScroll };
-  const paintRow = (entry, selected) =>
-    paintFileRow(entry, width, color, selected, cols);
-  return paintCursorList(files, cursor, pane, paintRow);
+  const hit = activeHit(entries, view.find);
+  const query = view.find && view.find.query ? view.find.query : '';
+  const paintRow = (entry, selected, index) =>
+    paintFileRow(entry, width, color, selected, cols, {
+      query,
+      hit,
+      index,
+    });
+  return paintCursorList(entries, cursor, pane, paintRow);
 };
 
 module.exports = { paintBodyFiles };

package/lib/render/frame.js

@@ -2,7 +2,6 @@
 
 const ansi = require('../ansi.js');
 const select = require('../select.js');
-const { overlayRows, markEditorSelection } = select;
 const primitives = require('./primitives.js');
 const chrome = require('./chrome.js');
 const files = require('./files.js');
@@ -12,91 +11,58 @@ const notes = require('./notes.js');
 const npm = require('./npm.js');
 const diff = require('./diff.js');
 const unit = require('./unit.js');
+const dashboard = require('./dashboard.js');
+const packages = require('./packages.js');
+const repos = require('./repos.js');
 
 const { RESET } = ansi;
-const { LIST_PANES, paintBodyFill, paneResult } = primitives;
+const { overlayRows, markEditorSelection } = select;
+const { isListPane, isTaskView, paintBodyFill, paneResult } = primitives;
 const { paintHeader, paintFooter, footerHits, paintStatusLine } = chrome;
 const { footerLayout, statusBranchHit, statusChoiceHits } = chrome;
 const { paintNotePanel, paintBodyTodo } = notes;
-const { paintBodyFiles } = files;
-const { paintBodyBranches } = branches;
-const { paintBodyCommits } = commits;
-const { paintBodyNpm } = npm;
 const { paintBodyDiff } = diff;
-const { paintBodyUnit } = unit;
 
-const bodyKind = (view) => {
-  const pane = view.pane ?? 'diff';
-  if (pane === 'files' || pane === 'branches' || pane === 'commits') {
-    return pane;
-  }
-  if (pane === 'npm') return 'npm';
-  if (pane === 'unit') return 'unit';
-  if (!view.item) return 'empty';
-  if (view.item.origin === 'task') return 'tasks';
-  return 'diff';
+const PANE_BODY = {
+  dashboard: dashboard.paintBodyDashboard,
+  repos: repos.paintBodyRepos,
+  files: files.paintBodyFiles,
+  branches: branches.paintBodyBranches,
+  commits: commits.paintBodyCommits,
+  npm: npm.paintBodyNpm,
+  packages: packages.paintBodyPackages,
+  unit: unit.paintBodyUnit,
+  tasks: paintBodyTodo,
 };
 
 const paintBodyEmpty = () => paneResult();
 
-const BODY_PAINT = {
-  files: paintBodyFiles,
-  branches: paintBodyBranches,
-  commits: paintBodyCommits,
-  npm: paintBodyNpm,
-  empty: paintBodyEmpty,
-  tasks: paintBodyTodo,
-  diff: paintBodyDiff,
-  unit: paintBodyUnit,
-};
-
-const paintFrameBody = (view, width, color, bodyH, headerLines) => {
-  const paint = BODY_PAINT[bodyKind(view)];
-  return paint(view, width, color, bodyH, headerLines);
+const bodyPainter = (view) => {
+  if (Object.hasOwn(PANE_BODY, view.pane)) return PANE_BODY[view.pane];
+  if (!view.item) return paintBodyEmpty;
+  return paintBodyDiff;
 };
 
 const frameNotes = (view, width, height, color) => {
   const notesCap = Math.max(0, height - 4);
-  const notesWanted = paintNotePanel(view, width, color, notesCap);
-  const noteRows = notesWanted.rows.slice(0, notesCap);
-  let noteCursor = notesWanted.cursor;
-  if (noteCursor && noteCursor.row >= noteRows.length) noteCursor = null;
-  const chrome = 3 + noteRows.length;
-  const bodyH = Math.max(1, height - chrome);
-  return { notesWanted, noteRows, noteCursor, bodyH };
-};
-
-const bodyFillKind = (listPane, splitBody) => {
-  if (listPane) return 'files';
-  if (splitBody) return 'split';
-  return 'plain';
-};
-
-const ownerSpan = (owners, focus) => {
-  let first = -1;
-  let last = -1;
-  for (let i = 0; i < owners.length; i++) {
-    if (owners[i] !== focus) continue;
-    if (first < 0) first = i;
-    last = i;
-  }
-  return { first, last };
+  const panel = paintNotePanel(view, width, color, notesCap);
+  const rows = panel.rows.slice(0, notesCap);
+  const inside = panel.cursor && panel.cursor.row < rows.length;
+  const cursor = inside ? panel.cursor : null;
+  const bodyH = Math.max(1, height - 3 - rows.length);
+  return { panel, rows, cursor, bodyH };
 };
 
 const revealScroll = (owners, focus, height, prefer) => {
-  const span = ownerSpan(owners, focus);
-  if (span.first < 0) return prefer;
+  const first = owners.indexOf(focus);
+  if (first < 0) return prefer;
+  const last = owners.lastIndexOf(focus);
   const room = Math.max(1, height);
-  let start = prefer;
-  if (span.first < start) start = span.first;
-  if (span.last >= start + room) {
-    const fits = span.last - span.first + 1 <= room;
-    start = fits ? span.last - room + 1 : span.first;
+  let start = Math.min(prefer, first);
+  if (last >= start + room) {
+    start = last - first + 1 <= room ? last - room + 1 : first;
   }
-  const maxStart = Math.max(0, owners.length - room);
-  if (start > maxStart) start = maxStart;
-  if (start < 0) start = 0;
-  return start;
+  return Math.max(0, Math.min(start, owners.length - room));
 };
 
 const windowY = (win, row) => {
@@ -123,20 +89,25 @@ const mapBodyCursor = (cursor, win) => {
   return point;
 };
 
-const windowBody = (view, paintedBody, frame) => {
+const bodyFillKind = (listPane, splitBody) => {
+  if (listPane) return 'files';
+  return splitBody ? 'split' : 'plain';
+};
+
+const windowBody = (view, painted, frame) => {
   const { width, color, bodyH, headerLines } = frame;
-  const listPane = LIST_PANES.includes(view.pane ?? 'diff');
-  const fillKind = bodyFillKind(listPane, paintedBody.splitBody);
+  const listPane = isListPane(view.pane);
+  const fillKind = bodyFillKind(listPane, painted.splitBody);
   const filler = paintBodyFill(width, color, fillKind);
-  const shift = !listPane && paintedBody.body.length > 0 ? 1 : 0;
+  const shift = !listPane && painted.body.length > 0 ? 1 : 0;
   const lead = (items, first) =>
     shift && items.length ? [first, ...items] : items;
-  const body = lead(paintedBody.body, filler);
-  const taskOwners = lead(paintedBody.taskOwners, null);
-  const taskChecks = lead(paintedBody.taskChecks, false);
+  const body = lead(painted.body, filler);
+  const taskOwners = lead(painted.taskOwners, null);
+  const taskChecks = lead(painted.taskChecks, false);
   const scrollMax = Math.max(0, body.length - bodyH);
   let scroll = listPane ? 0 : Math.min(view.scroll ?? 0, scrollMax);
-  if (view.item && view.item.origin === 'task') {
+  if (isTaskView(view)) {
     scroll = revealScroll(taskOwners, view.tasksFocus ?? 0, bodyH, scroll);
   }
   const slice = body.slice(scroll, scroll + bodyH);
@@ -151,85 +122,79 @@ const windowBody = (view, paintedBody, frame) => {
     }
     taskHits.push({ y, cursor: owner });
   }
-  const cursor = mapBodyCursor(paintedBody.cursor, win);
-  const editHits = mapEditHits(paintedBody.editHits, win);
   while (slice.length < bodyH) slice.push(filler);
-  const { listScroll, fileHits } = paintedBody;
   return {
     slice,
     scroll,
     scrollMax,
-    listScroll,
+    listScroll: painted.listScroll,
     taskHits,
-    fileHits,
-    editHits,
-    cursor,
+    fileHits: painted.fileHits,
+    editHits: mapEditHits(painted.editHits, win),
+    cursor: mapBodyCursor(painted.cursor, win),
   };
 };
 
 const notePointerHits = (notes, bodyH) => {
-  const { notesWanted, noteRows, noteCursor } = notes;
+  const { panel, rows, cursor } = notes;
   const top = 2 + bodyH;
-  const x = noteCursor ? noteCursor.x : 0;
-  const y = noteCursor ? top + noteCursor.row : 0;
-  const cursor = noteCursor ? { x, y } : null;
   const templateHits = [];
-  for (const hit of notesWanted.templateHits ?? []) {
-    if (hit.row >= noteRows.length) continue;
-    templateHits.push({ y: top + hit.row, cursor: hit.cursor });
+  for (const hit of panel.templateHits) {
+    if (hit.row < rows.length) {
+      templateHits.push({ y: top + hit.row, cursor: hit.cursor });
+    }
   }
   const editHits = [];
-  for (const hit of notesWanted.editHits ?? []) {
-    if (hit.row >= noteRows.length) continue;
-    editHits.push({ ...hit, y: top + hit.row });
+  for (const hit of panel.editHits) {
+    if (hit.row < rows.length) editHits.push({ ...hit, y: top + hit.row });
   }
-  return { cursor, templateHits, editHits };
+  const point = cursor ? { x: cursor.x, y: top + cursor.row } : null;
+  return { cursor: point, templateHits, editHits };
 };
 
 const renderFrame = (view, options = {}) => {
   const width = Math.max(20, options.width ?? 80);
   const height = Math.max(6, options.height ?? 24);
   const color = options.color ?? true;
-  const header = paintHeader(view, width, color);
+  const headerLines = 1;
   const layout = footerLayout(view, width);
   const notes = frameNotes(view, width, height, color);
-  const headerLines = 1;
   const { bodyH } = notes;
-  const paintedBody = paintFrameBody(view, width, color, bodyH, headerLines);
+  const paint = bodyPainter(view);
+  const painted = paint(view, width, color, bodyH, headerLines);
   const frame = { width, color, bodyH, headerLines };
-  const windowed = windowBody(view, paintedBody, frame);
-  const rows = [
-    header,
-    ...windowed.slice,
-    ...notes.noteRows,
-    paintStatusLine(view, view.status ?? '', width, color),
-    paintFooter(view, layout, width, color),
-  ];
-  const painted = overlayRows(rows, view.selection);
+  const windowed = windowBody(view, painted, frame);
+  const rows = overlayRows(
+    [
+      paintHeader(view, width, color),
+      ...windowed.slice,
+      ...notes.rows,
+      paintStatusLine(view, view.status ?? '', width, color),
+      paintFooter(view, layout, width, color),
+    ],
+    view.selection,
+  );
   const hits = notePointerHits(notes, bodyH);
-  const statusY = painted.length - 1;
+  const statusY = rows.length - 1;
   const branchHit = statusBranchHit(view, width, statusY);
   const statusHits = branchHit ? [branchHit] : statusChoiceHits(view, statusY);
-  const { fileHits, taskHits, scroll, scrollMax, listScroll } = windowed;
-  const { templateHits } = hits;
   const editHits = [...windowed.editHits, ...hits.editHits];
-  const shown = markEditorSelection(painted, view, editHits, color);
+  const shown = markEditorSelection(rows, view, editHits, color);
   const text = shown.map((row) => (color ? row + RESET : row)).join('\n');
-  const footerY = painted.length;
   return {
     text,
     rows: shown,
     buttons: footerHits(view, layout),
-    fileHits,
-    taskHits,
-    templateHits,
+    fileHits: windowed.fileHits,
+    taskHits: windowed.taskHits,
+    templateHits: hits.templateHits,
     editHits,
     statusHits,
-    footerY,
-    height: footerY,
-    scroll,
-    scrollMax,
-    listScroll,
+    footerY: rows.length,
+    height: rows.length,
+    scroll: windowed.scroll,
+    scrollMax: windowed.scrollMax,
+    listScroll: windowed.listScroll,
     cursor: hits.cursor ?? windowed.cursor,
     bodyH,
   };