reslop 0.2.4 → 0.2.5

package/lib/keys.js

@@ -4,8 +4,8 @@ const actions = require('./session/actions.js');
 
 const { ACTIONS, ACTION_IDS, BRANCH_ACTIONS, COMMIT_ACTIONS } = actions;
 const { DIFF_DISABLED, FILES_DISABLED, FILES_GIT_DISABLED } = actions;
-const { FILES_HIDDEN, FILES_TODO_DISABLED } = actions;
-const { TODO_DISABLED, BRANCHES_DISABLED } = actions;
+const { FILES_HIDDEN, FILES_TASKS_DISABLED } = actions;
+const { TASKS_DISABLED, BRANCHES_DISABLED } = actions;
 const { COMMITS_DISABLED, UNIT_DISABLED, NPM_DISABLED } = actions;
 const { disabledActions, diffGitDisabled, branchGitDisabled } = actions;
 const { commitGitDisabled } = actions;
@@ -65,21 +65,31 @@ const parseCsiSeq = (rest) => {
   return { params: body.slice(0, i), final: body[i], eat: 2 + i + 1 };
 };
 
-const ctrlHeld = (modText) => {
+const modifierBits = (modText) => {
   const mod = parseInt(modText, 10);
-  return Number.isFinite(mod) && ((mod - 1) & 4) !== 0;
+  if (!Number.isFinite(mod)) return 0;
+  return mod - 1;
+};
+
+const modifiedKey = (base, bits) => {
+  const arrow =
+    base === 'left' || base === 'right' || base === 'up' || base === 'down';
+  const end = base === 'home' || base === 'end';
+  if (!arrow && !end) return base;
+  const ctrl = (bits & 4) !== 0;
+  const shift = (bits & 1) !== 0;
+  if (ctrl && shift && arrow) return `ctrl-shift-${base}`;
+  if (ctrl && arrow) return `ctrl-${base}`;
+  if (shift) return `shift-${base}`;
+  return base;
 };
 
 const keyFromCsi = (paramsText, final) => {
   const params = paramsText ? paramsText.split(';') : [];
-  if (final === '~') return CSI_TILDE[params[0]] ?? null;
-  const base = CSI_KEYS[final];
+  const base = final === '~' ? CSI_TILDE[params[0]] : CSI_KEYS[final];
   if (!base) return null;
   if (params.length < 2) return base;
-  const arrow =
-    base === 'left' || base === 'right' || base === 'up' || base === 'down';
-  if (ctrlHeld(params[1]) && arrow) return `ctrl-${base}`;
-  return base;
+  return modifiedKey(base, modifierBits(params[1]));
 };
 
 const mouseKindFromButton = (button, press) => {
@@ -194,8 +204,8 @@ module.exports = {
   FILES_DISABLED,
   FILES_HIDDEN,
   FILES_GIT_DISABLED,
-  FILES_TODO_DISABLED,
-  TODO_DISABLED,
+  FILES_TASKS_DISABLED,
+  TASKS_DISABLED,
   BRANCHES_DISABLED,
   COMMITS_DISABLED,
   NPM_DISABLED,

package/lib/manifest.js

@@ -310,9 +310,7 @@ const proposedWanted = (out, vul) => {
 module.exports = {
   MANIFEST,
   LOCKFILE,
-  DEP_KIND,
   SECTION_KEYS,
-  posixRel,
   depFileMeta,
   relOf,
   listFilePath,
@@ -321,8 +319,6 @@ module.exports = {
   lockRootSections,
   lockEntries,
   lockPackageCount,
-  cloneJson,
-  stringifyJson,
   mergeDepFile,
   applyWantedRange,
   findDeclared,

package/lib/npm-commands.js

@@ -9,7 +9,7 @@ const { jsonParse } = metautil;
 const ansi = require('./ansi.js');
 const { stripAnsi, visibleWidth } = ansi;
 const utilities = require('./utilities.js');
-const { npmBin, npmOpts, spawnBase } = utilities;
+const { npmBin, npmOpts, spawnBase, unquote, dateStamp } = utilities;
 
 const MANIFEST = 'package.json';
 const SECTIONS = ['dependencies', 'devDependencies', 'optionalDependencies'];
@@ -128,17 +128,6 @@ const withoutNodeFrame = (line) => {
   return null;
 };
 
-const unquote = (value) => {
-  const text = `${value ?? ''}`;
-  if (text.length < 2) return text;
-  const open = text[0];
-  const close = text[text.length - 1];
-  const code = open.charCodeAt(0);
-  const quoted = open === close && (code === 34 || code === 39);
-  if (!quoted) return text;
-  return text.slice(1, -1);
-};
-
 const objectEnd = (lines, start) => {
   if (stripAnsi(lines[start]).trim() !== '{') return -1;
   for (let i = start + 1; i < lines.length; i++) {
@@ -284,13 +273,6 @@ const logFileName = (command, date, index) => {
   return `${date}-${safe}-${n}.log`;
 };
 
-const dateStamp = (now) => {
-  const y = now.getFullYear();
-  const m = `${now.getMonth() + 1}`.padStart(2, '0');
-  const d = `${now.getDate()}`.padStart(2, '0');
-  return `${y}-${m}-${d}`;
-};
-
 const LOG_DIR = '.log';
 const LOG_STALE_DAYS = 5;
 const DAY_MS = 24 * 60 * 60 * 1000;
@@ -403,8 +385,6 @@ const parseScriptLine = (text) => {
   return { name, command };
 };
 
-const scriptLine = (entry) => `${entry.name}: ${entry.command}`;
-
 const orderedScripts = (pkg) => {
   const scripts = pkg.scripts;
   if (!scripts || typeof scripts !== 'object' || Array.isArray(scripts)) {
@@ -577,7 +557,6 @@ module.exports = {
   removeStaleLogs,
   formatSize,
   parseScriptLine,
-  scriptLine,
   saveScript,
   removeScript,
   reorderScript,

package/lib/remote.js

@@ -347,7 +347,7 @@ const loadChange = async (ref, options, source) => {
   const items = foldDepItems(itemsFromFiles(files, 'pr'));
   const change = source.toChange(ref, data, items);
   const sourceLabel = `${source.prefix}${change.number}`;
-  let imported = { feedback: [], todos: [] };
+  let imported = { feedback: [], tasks: [] };
   try {
     const discussion = await source.loadDiscussion(ref, request);
     imported = source.discussionToNotes(discussion, items, paths);
@@ -359,22 +359,16 @@ const loadChange = async (ref, options, source) => {
 };
 
 module.exports = {
-  RETRY_ATTEMPTS,
-  RETRY_DELAY_MS,
-  TRANSIENT_STATUS,
   isRecord,
   isAbortError,
   createTransport,
-  headerValue,
   parseLinkNext,
   parseNextPage,
   createClient,
   listUrl,
-  findItemForLine,
   importedText,
   importedTodo,
   noteFromLocation,
-  changePath,
   filterChangeFiles,
   changeFiles,
   loadChange,

package/lib/render/branches.js

@@ -124,19 +124,10 @@ const paintBodyBranches = (view, width, color, bodyH, headerLines) => {
   const compose = view.compose;
   const editing = compose && compose.kind === 'branch';
   const tail = editing ? paintListEdit(compose, width, color) : null;
-  const paintRow = (entry, rowWidth, rowColor, selected) =>
-    paintBranchRow(entry, rowWidth, rowColor, selected, cols);
-  return paintCursorList(
-    branches,
-    cursor,
-    width,
-    color,
-    bodyH,
-    headerLines,
-    paintRow,
-    tail,
-    view.listScroll,
-  );
+  const pane = { width, color, bodyH, headerLines, offset: view.listScroll };
+  const paintRow = (entry, selected) =>
+    paintBranchRow(entry, width, color, selected, cols);
+  return paintCursorList(branches, cursor, pane, paintRow, tail);
 };
 
 module.exports = { paintBodyBranches };

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, REPO_TODOS_LABEL, 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 REPO_TODOS_LABEL;
+    if (isTasksEntry(entry)) return REPO_TASKS_LABEL;
     return '';
   }
-  if (view.item && view.item.origin === 'todo') return REPO_TODOS_LABEL;
+  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) => {
@@ -619,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;
 };
 
@@ -628,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);
@@ -660,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'];
+    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,
@@ -675,13 +732,10 @@ module.exports = {
   headerText,
   paintHeader,
   layoutButtons,
-  paintButtons,
+  footerLayout,
   paintFooter,
   footerHits,
   paintStatusLine,
   statusChoiceHits,
   statusBranchHit,
-  hiddenActions,
-  dimFooterActions,
-  extraFooterActions,
 };