reslop 0.2.3 → 0.2.5

package/lib/render/chrome.js

@@ -5,11 +5,11 @@ const keys = require('../keys.js');
 const files = require('../files.js');
 const primitives = require('./primitives.js');
 
-const { itemPath, TODO_FILE, isTodosEntry, fileTotals } = files;
+const { itemPath, REPO_TASKS_LABEL, isTasksEntry, fileTotals } = files;
 const { ACTION_IDS, BRANCH_ACTIONS, COMMIT_ACTIONS, actionLetter } = keys;
 const { buttonWord } = keys;
 const { FILES_HIDDEN, FILES_GIT_DISABLED, BRANCHES_DISABLED } = keys;
-const { COMMITS_DISABLED, TODO_DISABLED, DIFF_DISABLED, UNIT_DISABLED } = keys;
+const { COMMITS_DISABLED, TASKS_DISABLED, DIFF_DISABLED, UNIT_DISABLED } = keys;
 const { NPM_DISABLED } = keys;
 const { diffGitDisabled, branchGitDisabled, commitGitDisabled } = keys;
 const { CONFIRM, confirmPrefix, promptFromChoices } = keys;
@@ -122,6 +122,9 @@ const BUTTON_LEAD = ' ';
 const BUTTON_GAP = '  ';
 const BUTTON_EDGE = 1;
 const buttonGap = (index) => (index ? BUTTON_GAP : BUTTON_LEAD);
+const BACK_ARROW = '🢐';
+const STOP_MARK = '⊗';
+const BACK_KEY = 'esc';
 const LOGO = '👁️';
 
 const pathSegments = (rel) => {
@@ -152,10 +155,10 @@ const headerScreen = (view) => {
   if (pane === 'files') {
     const files = view.files ?? [];
     const entry = files[view.fileCursor ?? 0];
-    if (isTodosEntry(entry)) return TODO_FILE;
+    if (isTasksEntry(entry)) return REPO_TASKS_LABEL;
     return '';
   }
-  if (view.item && view.item.origin === 'todo') return TODO_FILE;
+  if (view.item && view.item.origin === 'task') return REPO_TASKS_LABEL;
   return '';
 };
 
@@ -163,11 +166,11 @@ const headerTarget = (view) => {
   const pane = view.pane ?? 'diff';
   if (pane === 'files') {
     const entry = (view.files ?? [])[view.fileCursor ?? 0];
-    if (!entry || isTodosEntry(entry)) return '';
+    if (!entry || isTasksEntry(entry)) return '';
     return entry.path;
   }
   if (pane === 'unit') return view.reviewPath ?? '';
-  if (!view.item || view.item.origin === 'todo') return '';
+  if (!view.item || view.item.origin === 'task') return '';
   return itemPath(view.item);
 };
 
@@ -251,6 +254,38 @@ const QUIT_MARK = {
   missBold: false,
 };
 
+const backFooterId = (view) => {
+  const pane = view.pane ?? 'diff';
+  if (pane === 'branches' || pane === 'commits') return 'back';
+  if (pane === 'npm') return view.npmView ? 'npmStop' : 'back';
+  if (view.item && view.item.origin === 'task') return 'back';
+  return '';
+};
+
+const backHintMark = (view) => {
+  if (view.pane === 'npm' && view.npmView && view.npmRunning) return STOP_MARK;
+  return BACK_ARROW;
+};
+
+const hintBody = (mark) => {
+  const gap = mark === STOP_MARK ? ' ' : '';
+  return `${mark}${gap}${BACK_KEY}`;
+};
+
+const buttonLabel = (id, short, backId, mark) => {
+  if (id === backId) return hintBody(mark);
+  if (short) return actionLetter(id);
+  return buttonWord(id);
+};
+
+const paintBackHint = (color, mark) => {
+  const bgRgb = THEME.buttonBg;
+  const body = hintBody(mark);
+  const arrow = paint(mark, THEME.buttonHotFg, bgRgb, color, true);
+  const rest = paint(body.slice(mark.length), THEME.buttonFg, bgRgb, color);
+  return arrow + rest;
+};
+
 const paintMarkedWord = (label, letter, color, mark) => {
   const at = label.indexOf(letter);
   if (at < 0) {
@@ -266,37 +301,49 @@ const paintMarkedWord = (label, letter, color, mark) => {
   return out;
 };
 
-const layoutButtons = (width, compact, hidden, extra, disabled) => {
-  const hiddenIds = hidden ?? [];
-  const extraIds = extra ?? [];
-  const disabledIds = disabled ?? [];
-  const ids = [];
+const footerIds = (hidden, extra, backId) => {
+  const ids = backId ? [backId] : [];
   for (const id of ACTION_IDS) {
-    if (id === 'quit') {
-      for (const add of extraIds) {
-        if (!ids.includes(add)) ids.push(add);
-      }
+    if (id !== 'quit') {
+      if (!hidden.includes(id)) ids.push(id);
       continue;
     }
-    if (hiddenIds.includes(id)) continue;
-    ids.push(id);
+    for (const add of extra) {
+      if (!ids.includes(add)) ids.push(add);
+    }
   }
+  return ids;
+};
+
+const layoutButtons = (width, options = {}) => {
+  const { compact = false, hidden = [], extra = [] } = options;
+  const { disabled: disabledIds = [], backId = '', mark = '' } = options;
+  const hint = mark || BACK_ARROW;
+  const ids = footerIds(hidden, extra, backId);
   const build = (short) => {
     const hits = [];
     const parts = [];
     let x = 0;
     const limit = Math.max(0, width - BUTTON_EDGE);
     for (const id of ids) {
-      const letter = actionLetter(id);
-      const word = buttonWord(id);
-      const label = short ? letter : word;
+      const back = id === backId;
+      const letter = back ? BACK_KEY : actionLetter(id);
+      const label = buttonLabel(id, short, backId, hint);
       const gap = buttonGap(parts.length);
       const piece = `${gap}${label}`;
       const w = visibleWidth(piece);
       if (x + w > limit && parts.length) break;
       const off = disabledIds.includes(id);
       if (!off) hits.push({ id, x0: x, x1: x + w });
-      parts.push({ action: { id }, piece, letter, label, disabled: off });
+      parts.push({
+        action: { id },
+        piece,
+        letter,
+        label,
+        disabled: off,
+        back,
+        mark: back ? hint : '',
+      });
       x += w;
     }
     return { hits, parts, width: x };
@@ -316,7 +363,8 @@ const paintButtons = (layout, width, color) => {
     const part = layout.parts[i];
     const gap = buttonGap(i);
     out += paint(gap, fgRgb, bgRgb, color);
-    if (part.disabled) out += paint(part.label, fgRgb, bgRgb, color);
+    if (part.back) out += paintBackHint(color, part.mark);
+    else if (part.disabled) out += paint(part.label, fgRgb, bgRgb, color);
     else out += paintMarkedWord(part.label, part.letter, color, BUTTON_MARK);
     used += visibleWidth(part.piece);
   }
@@ -351,9 +399,9 @@ const countsKind = (sourceKind, revShort) => {
 
 const notesLine = (counts) => {
   const feedback = counts.feedback ?? 0;
-  const todo = counts.todo ?? 0;
+  const tasks = counts.tasks ?? 0;
   const code = counts.code ?? 0;
-  return `feedback ${feedback}  todo ${todo}  code ${code}`;
+  return `feedback ${feedback}  tasks ${tasks}  code ${code}`;
 };
 
 const statusLead = (view) => {
@@ -397,7 +445,9 @@ const statusStats = (view) => {
   const fallbackN = counts.staged ?? 0;
   const n = hasGit ? total.staged : fallbackN;
   const m = hasGit ? total.remaining : counted;
-  return joinStatus([statusDelta(total), `${n}/${m}`]);
+  const git = joinStatus([statusDelta(total), `${n}/${m}`]);
+  if (!view.npmLogs) return git;
+  return joinStatus([view.npmLogs, git]);
 };
 
 const statusLayout = (view, status, width) => {
@@ -454,6 +504,7 @@ const paintChoicePrompt = (choices, width, color, prefix = '') => {
 };
 
 const STATUS_MARK = /(\+[0-9]+(?:\/[0-9]+)?|-[0-9]+(?:\/[0-9]+)?)/g;
+const OLD_LOGS = /old logs \S+/;
 
 const paintStatusMark = (token, color) => {
   const bgRgb = THEME.chromeBg;
@@ -467,6 +518,18 @@ const paintStatusLeft = (text, color) => {
   const bgRgb = THEME.chromeBg;
   const muted = THEME.mutedFg;
   if (!color) return text;
+  const found = text.match(OLD_LOGS);
+  if (found) {
+    const at = found.index;
+    const token = found[0];
+    const before = text.slice(0, at);
+    const after = text.slice(at + token.length);
+    return (
+      paintStatusLeft(before, color) +
+      paint(token, THEME.shaFg, bgRgb, color) +
+      paintStatusLeft(after, color)
+    );
+  }
   let out = '';
   let last = 0;
   for (const match of text.matchAll(STATUS_MARK)) {
@@ -604,7 +667,7 @@ const hiddenActions = (view) => {
   if (pane === 'branches') return BRANCHES_DISABLED;
   if (pane === 'commits') return COMMITS_DISABLED;
   if (pane === 'npm') return NPM_DISABLED;
-  if (view.item && view.item.origin === 'todo') return TODO_DISABLED;
+  if (view.item && view.item.origin === 'task') return TASKS_DISABLED;
   return DIFF_DISABLED;
 };
 
@@ -613,7 +676,7 @@ const dimFooterActions = (view) => {
   if (pane === 'files') {
     const files = view.files ?? [];
     const entry = files[view.fileCursor ?? 0];
-    if (!entry || entry.kind !== 'todos') return [];
+    if (!entry || entry.kind !== 'tasks') return [];
     return FILES_GIT_DISABLED;
   }
   if (pane === 'diff' || pane === 'unit') return diffGitDisabled(view.item);
@@ -621,13 +684,18 @@ const dimFooterActions = (view) => {
   if (pane === 'commits') {
     const entry = selectedCommit(view);
     const staged = (view.counts?.staged ?? 0) > 0;
-    if (!entry) return commitGitDisabled({ canCommit: staged });
-    return commitGitDisabled({ ...entry, canCommit: staged });
+    const unstagedCurrent = !view.rev && !view.revShort;
+    return commitGitDisabled({
+      ...entry,
+      canCommit: staged,
+      unstagedCurrent,
+    });
   }
   if (pane === 'npm' && view.npmView) {
     if (view.npmRunning) return ['npmRerun'];
     return [];
   }
+  if (pane === 'npm' && !view.npmLogs) return ['npmLogs'];
   return [];
 };
 
@@ -640,12 +708,21 @@ const extraFooterActions = (view) => {
   if (pane === 'branches') return Object.keys(BRANCH_ACTIONS);
   if (pane === 'commits') return Object.keys(COMMIT_ACTIONS);
   if (pane === 'npm') {
-    if (view.npmView) return ['npmStop', 'npmRerun'];
-    return ['npmEdit', 'npmNew'];
+    if (view.npmView) return ['npmVerbose', 'npmRerun'];
+    return ['npmEdit', 'npmNew', 'npmDrop', 'npmLogs'];
   }
   return [];
 };
 
+const footerLayout = (view, width) =>
+  layoutButtons(width, {
+    hidden: hiddenActions(view),
+    extra: extraFooterActions(view),
+    disabled: dimFooterActions(view),
+    backId: backFooterId(view),
+    mark: backHintMark(view),
+  });
+
 module.exports = {
   QUIT_PROMPT,
   PUSH_PROMPT,
@@ -655,13 +732,10 @@ module.exports = {
   headerText,
   paintHeader,
   layoutButtons,
-  paintButtons,
+  footerLayout,
   paintFooter,
   footerHits,
   paintStatusLine,
   statusChoiceHits,
   statusBranchHit,
-  hiddenActions,
-  dimFooterActions,
-  extraFooterActions,
 };