reslop 0.2.7 → 0.3.0

package/lib/render/commits.js

@@ -1,12 +1,11 @@
 'use strict';
 
-const ansi = require('../ansi.js');
-const files = require('../files.js');
-const wrap = require('../wrap.js');
+const ansi = require('../term/ansi.js');
+const { shortAge } = require('../common/format.js');
+const { wrapMultiline, wrapDoc, cursorInWrap } = require('../term/wrap.js');
 const primitives = require('./primitives.js');
+const { trimText } = require('../common/utilities.js');
 
-const { shortAge } = files;
-const { wrapMultiline, wrapDoc, cursorInWrap } = wrap;
 const { THEME, paint, visibleWidth, trimVisible, seq, EL } = ansi;
 const { MARK_W, markPrefix, padVisible } = primitives;
 const { editSpan, fieldWindow, paintBodyFill, listLine } = primitives;
@@ -55,10 +54,9 @@ const countLabel = (entry) => {
     const unstagedDel = entry.unstagedRemoved ?? 0;
     const any = stagedAdd || unstagedAdd || stagedDel || unstagedDel;
     if (!any) return NO_COUNT;
-    return {
-      add: `+${stagedAdd}/${unstagedAdd}`,
-      del: `-${stagedDel}/${unstagedDel}`,
-    };
+    const add = `+${stagedAdd}/${unstagedAdd}`;
+    const del = `-${stagedDel}/${unstagedDel}`;
+    return { add, del };
   }
   const added = entry.added ?? 0;
   const removed = entry.removed ?? 0;
@@ -69,17 +67,14 @@ const countLabel = (entry) => {
 const countWidths = (entries) =>
   measureColumns(entries, countLabel, COUNT_ALIGN);
 
-const refsText = (entry) => `${entry.refs ?? ''}`.trim();
+const refsText = (entry) => trimText(entry.refs);
 
 const commitRowFields = (entry) => {
   const { add, del } = countLabel(entry);
-  return {
-    sha: entry.shortSha ?? '',
-    refs: trimVisible(refsText(entry), REFS_MAX),
-    add,
-    del,
-    date: shortAge(entry.date),
-  };
+  const sha = entry.shortSha ?? '';
+  const refs = trimVisible(refsText(entry), REFS_MAX);
+  const date = shortAge(entry.date);
+  return { sha, refs, add, del, date };
 };
 
 const contentWidth = (width) => Math.max(1, width - COMMIT_TAIL);
@@ -107,27 +102,21 @@ const viewedCommit = (entry, rev, revShort) => {
 
 const commitTone = (selected, current) => {
   if (current) {
-    return {
-      current: true,
-      fgRgb: THEME.headerFg,
-      bgRgb: THEME.currentBg,
-      nameFg: THEME.mutedFg,
-    };
+    const fgRgb = THEME.headerFg;
+    const bgRgb = THEME.currentBg;
+    const nameFg = THEME.mutedFg;
+    return { current, fgRgb, bgRgb, nameFg };
   }
   if (selected) {
-    return {
-      current: false,
-      fgRgb: THEME.chromeFg,
-      bgRgb: THEME.buttonBg,
-      nameFg: THEME.buttonHotFg,
-    };
+    const fgRgb = THEME.chromeFg;
+    const bgRgb = THEME.buttonBg;
+    const nameFg = THEME.buttonHotFg;
+    return { current, fgRgb, bgRgb, nameFg };
   }
-  return {
-    current: false,
-    fgRgb: THEME.mutedFg,
-    bgRgb: THEME.ctxBg,
-    nameFg: THEME.chromeFg,
-  };
+  const fgRgb = THEME.mutedFg;
+  const bgRgb = THEME.ctxBg;
+  const nameFg = THEME.chromeFg;
+  return { current, fgRgb, bgRgb, nameFg };
 };
 
 const paintCommitRow = (entry, width, color, selected, cols, current) => {
@@ -159,13 +148,13 @@ const paintCommitEdit = (compose, width, color, entry, cols, index) => {
   const shown = { ...entry, body: win.text, subject: win.text };
   const textX = MARK_W + 1;
   const edit = editSpan(1, textX, textX + rest, 0, text);
-  return {
-    row: paintCommitRow(shown, width, color, true, cols),
-    cursor: { x: textX + win.col, scroll: win.scroll },
-    at: entry ? 'replace' : 'start',
-    index,
-    edits: [{ ...edit, scroll: win.scroll }],
-  };
+  const row = paintCommitRow(shown, width, color, true, cols);
+  const x = textX + win.col;
+  const scroll = win.scroll;
+  const cursor = { x, scroll };
+  const at = entry ? 'replace' : 'start';
+  const edits = [{ ...edit, scroll }];
+  return { row, cursor, at, index, edits };
 };
 
 const editTarget = (compose, commits, cursor) => {
@@ -214,8 +203,11 @@ const paintPieces = (pieces, width, color, tone) => {
   return out + paint(tail, tone.fgRgb, tone.bgRgb, color);
 };
 
-const messageText = (entry) =>
-  `${entry.body ?? ''}`.trimEnd() || `${entry.subject ?? ''}`.trimEnd();
+const messageText = (entry) => {
+  const body = `${entry.body ?? ''}`.trimEnd();
+  const subject = `${entry.subject ?? ''}`.trimEnd();
+  return body || subject;
+};
 
 const messageParts = (text, width) => {
   if (!text) return [{ text: '', kind: 'text' }];
@@ -231,8 +223,8 @@ const messageParts = (text, width) => {
 };
 
 const authorParts = (entry) => {
-  const name = `${entry.author ?? ''}`.trim();
-  const email = `${entry.email ?? ''}`.trim();
+  const name = trimText(entry.author);
+  const email = trimText(entry.email);
   if (name && email) {
     return [
       { text: name, kind: 'author' },
@@ -248,7 +240,7 @@ const partsWidth = (parts) =>
   parts.reduce((width, part) => width + visibleWidth(part.text), 0);
 
 const timeFields = (entry) => ({
-  when: `${entry.when ?? ''}`.trim(),
+  when: trimText(entry.when),
   ago: shortAge(entry.date),
 });
 
@@ -363,21 +355,20 @@ const commitMessageWidth = (entry, screenWidth) => {
   return Math.max(1, cols.leftW);
 };
 
+const PIECE_FG = {
+  add: () => THEME.addLineFg,
+  del: () => THEME.delLineFg,
+  hash: (tone) => (tone.current ? THEME.shaDarkFg : THEME.shaFg),
+  refs: (tone) => (tone.current ? THEME.shaDarkFg : THEME.warnFg),
+  author: (tone) => (tone.current ? tone.fgRgb : THEME.addLineFg),
+  email: (tone) => (tone.current ? tone.fgRgb : THEME.mutedFg),
+  text: (tone) => (tone.current ? THEME.mutedFg : tone.nameFg),
+  body: () => THEME.mutedFg,
+};
+
 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.shaDarkFg;
-    if (kind === 'text' || kind === 'body') return THEME.mutedFg;
-    return tone.fgRgb;
-  }
-  if (kind === 'hash') return THEME.shaFg;
-  if (kind === 'author') return THEME.addLineFg;
-  if (kind === 'email') return THEME.mutedFg;
-  if (kind === 'refs') return THEME.warnFg;
-  if (kind === 'text') return tone.nameFg;
-  if (kind === 'body') return THEME.mutedFg;
+  const pick = PIECE_FG[kind];
+  if (pick) return pick(tone);
   return tone.fgRgb;
 };
 
@@ -427,9 +418,8 @@ const commitLines = (entry, index, spec) => {
     const atCaret = caret && caret.row === messageRow;
     const cursor = atCaret ? { x: textX + caret.col } : null;
     const piece = doc[messageRow];
-    const edits = piece
-      ? [editSpan(1, textX, x1, piece.start, piece.text)]
-      : [];
+    const edits = [];
+    if (piece) edits.push(editSpan(1, textX, x1, piece.start, piece.text));
     lines.push(listLine(painted, index, cursor, edits));
   }
   return lines;

package/lib/render/{dash-activity.js → dashboard/activity.js}

@@ -1,18 +1,13 @@
 'use strict';
 
-const tiles = require('./tiles.js');
-const { seg, spinner } = tiles;
-const table = require('./dash-table.js');
-const { ago, duration, isHot, waiting, cell, cellSegs, flexCell } = table;
-const { tableLines, stat, pairRows, titleAside, captionOver } = table;
+const { ago, duration } = require('../../common/format.js');
+const { seg, spinner, blinkTone, RUN_ICON } = require('../tiles.js');
+const table = require('../table.js');
+const { isHot, waiting, notice } = table;
+const { cell, cellSegs, flexCell, tableLines } = table;
+const { titleAside, captionOver } = table;
 
 const NAME_MAX = 18;
-const RUN_ICON = {
-  passed: ['✔', 'add'],
-  failed: ['✖', 'error'],
-  aborted: ['⊘', 'muted'],
-};
-
 const blankCell = () => cell('', 'muted', 'r');
 
 const ageCell = (at, now) => cell(at ? ago(at, now) : '', 'muted', 'r');
@@ -37,8 +32,9 @@ const commitsBlock = (model, width, height, ctx, tile) => {
     const step = rebaseStep(data.rebase);
     badge.push(seg(`⟳ rebase ${step}`, 'warn', true));
   }
-  const titleLine = titleAside(tile, [seg(`${total}`, 'muted')], width, badge);
-  if (!recent.length) return { titleLine, lines: [[seg('none', 'muted')]] };
+  const count = [seg(`${total}`, 'key', true)];
+  const titleLine = titleAside(tile, count, width, badge);
+  if (!recent.length) return notice('no commits', titleLine);
   const hot = isHot(data.changedAt, ctx.now);
   const shown = recent.slice(0, Math.max(0, height));
   const rows = shown.map((entry, i) => commitRow(entry, ctx, hot && i === 0));
@@ -59,8 +55,6 @@ const branchOrder = (list) =>
     return right.at - left.at || left.name.localeCompare(right.name, 'en');
   });
 
-const blinkTone = (frame) => (Math.abs(frame) % 2 ? 'hot' : 'warn');
-
 const branchRow = (entry, data, ctx) => {
   const hot = isHot(data.hot.get(entry.name) ?? 0, ctx.now);
   const tone = hot ? blinkTone(ctx.frame) : 'text';
@@ -100,11 +94,9 @@ const branchesBlock = (model, width, height, ctx, tile) => {
   const data = model.branches;
   if (!data.ready) return waiting('reading git…');
   const badge = data.rebase ? [seg('⟳', 'warn', true)] : [];
-  const aside = [seg(`${data.list.length}`, 'muted')];
+  const aside = [seg(`${data.list.length}`, 'key', true)];
   const titleLine = titleAside(tile, aside, width, badge);
-  if (!data.list.length) {
-    return { titleLine, lines: [[seg('no branches', 'muted')]] };
-  }
+  if (!data.list.length) return notice('no branches', titleLine);
   const extras = branchExtras(data, ctx);
   const room = Math.max(1, height - extras.length);
   const shown = branchOrder(data.list).slice(0, room);
@@ -126,8 +118,7 @@ const countCell = (value, tone) => {
 
 const failTone = (value) => (value ? 'error' : 'muted');
 
-const testMetrics = (done, ok, fail, total) => [
-  countCell(done, 'text'),
+const testMetrics = (ok, fail, total) => [
   countCell(ok, ok ? 'add' : 'muted'),
   countCell(fail, failTone(fail)),
   countCell(total, 'text'),
@@ -138,12 +129,13 @@ const runMetrics = (run) => {
   if (result && typeof result.tests === 'number') {
     const fail = result.failed ?? 0;
     const ok = result.passed ?? Math.max(0, result.tests - fail);
-    return testMetrics(result.tests, ok, fail, result.tests);
+    return testMetrics(ok, fail, result.tests);
   }
-  const live = run.status === 'running' && run.source !== 'reslop';
-  if (!live) return [blankCell(), blankCell(), blankCell(), blankCell()];
+  const counted = run.done > 0 || run.failed > 0 || run.expected > 0;
+  const live = run.status === 'running' && (run.source !== 'reslop' || counted);
+  if (!live) return [blankCell(), blankCell(), blankCell()];
   const total = run.expected > 0 ? run.expected : null;
-  return testMetrics(run.done + run.failed, run.done, run.failed, total);
+  return testMetrics(run.done, run.failed, total);
 };
 
 const lintNote = (run) => {
@@ -157,7 +149,7 @@ const lintNote = (run) => {
   return note;
 };
 
-const durationCell = (run, ctx) => {
+const spentCell = (run, ctx) => {
   const running = run.status === 'running';
   const end = running ? ctx.now : run.endedAt;
   if (!run.startedAt || !end) return blankCell();
@@ -168,16 +160,15 @@ const named = (icon, tone, name, nameTone) => ({
   segs: [seg(icon, tone, true), seg(' '), seg(name, nameTone)],
   align: 'l',
   flex: true,
-  min: 1,
+  min: 6,
 });
 
 const runHeader = () => [
   cell(''),
-  cell('done', 'muted', 'r'),
-  cell('ok', 'muted', 'r'),
-  cell('fail', 'muted', 'r'),
-  cell('total', 'muted', 'r'),
-  cell('duration', 'muted', 'r'),
+  cell('ok', 'caption', 'r'),
+  cell('fail', 'caption', 'r'),
+  cell('total', 'caption', 'r'),
+  cell('spent', 'caption', 'r'),
 ];
 
 const runRow = (run, ctx) => {
@@ -185,7 +176,7 @@ const runRow = (run, ctx) => {
   const tone = run.status === 'running' ? 'text' : 'muted';
   const label = named(icon[0], icon[1], run.name, tone);
   label.segs.push(...lintNote(run));
-  return [label, ...runMetrics(run), durationCell(run, ctx)];
+  return [label, ...runMetrics(run), spentCell(run, ctx)];
 };
 
 const runsBlock = (model, width, height, ctx, tile) => {
@@ -194,13 +185,7 @@ const runsBlock = (model, width, height, ctx, tile) => {
     rows.push([named(spinner(ctx.frame), 'warn', model.busy, 'warn')]);
   }
   for (const run of model.runs) rows.push(runRow(run, ctx));
-  if (!rows.length) {
-    const items = [
-      stat('status', 'idle', 'muted'),
-      stat('usage', 'reslop t -- <command>', 'muted'),
-    ];
-    return { badge: [], lines: tableLines(pairRows(items, 1), width) };
-  }
+  if (!rows.length) return notice(['idle', 'reslop t -- <command>']);
   const shown = rows.slice(0, Math.max(1, height));
   const lines = tableLines([runHeader(), ...shown], width);
   return {