reslop 0.2.5 → 0.2.7

package/lib/session/actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const LIST_PANES = ['files', 'branches', 'commits', 'npm'];
+const LIST_PANES = ['files', 'branches', 'commits', 'npm', 'packages'];
 
 const ACTIONS = {
   add: ['a'],
@@ -10,66 +10,121 @@ const ACTIONS = {
   commit: ['c'],
   prev: ['left', 'p', 'k'],
   next: ['right', 'n', 'j'],
-  check: ['x', ' '],
+  check: [' '],
   layout: ['m'],
-  feedback: ['f'],
+  feedback: [],
   tasks: ['t'],
   code: ['e'],
   branch: ['b'],
   file: ['f'],
   diff: ['d'],
-  quit: ['q', 'ctrl-c'],
+  quit: ['ctrl-c'],
 };
 const ACTION_IDS = Object.keys(ACTIONS);
 
 const BRANCH_ACTIONS = {
-  newBranch: ['n'],
-  rebase: ['r'],
-  drop: ['d'],
+  newBranch: ['insert'],
+  rebase: ['e'],
+  drop: ['delete'],
   pull: ['p'],
   push: ['s'],
 };
 
 const COMMIT_ACTIONS = {
-  amend: ['a'],
-  apply: ['a'],
-  reword: ['r'],
-  fixup: ['f'],
-  drop: ['d'],
+  newCommit: ['insert'],
+  apply: ['p'],
+  reword: ['e'],
+  drop: ['delete'],
   view: ['v'],
-  pull: ['p'],
-  push: ['s'],
+};
+
+const PACKAGE_ACTIONS = {
+  packageNew: ['insert'],
+  packageDrop: ['delete'],
+  packageWanted: ['w'],
+  packageLatest: ['l'],
 };
 
 const NPM_ACTIONS = {
   npm: ['n'],
   npmEdit: ['e'],
-  npmNew: ['n'],
-  npmDrop: ['d'],
-  npmLogs: ['c'],
+  npmNew: ['insert'],
+  npmDrop: ['delete'],
+  npmLogs: ['l'],
   npmStop: ['escape'],
   npmVerbose: ['v'],
   npmRerun: ['r'],
 };
 
+const DASH_ACTIONS = {
+  dashFiles: ['f'],
+  dashDiffs: ['d'],
+  dashTasks: ['t'],
+  dashBranches: ['b'],
+  dashCommits: ['c'],
+  dashRun: ['r'],
+  dashNpm: ['n'],
+};
+const DASH_IDS = Object.keys(DASH_ACTIONS);
+const DASH_BLOCKS = {
+  dashFiles: 'files',
+  dashDiffs: 'diffs',
+  dashCommits: 'commits',
+  dashBranches: 'branches',
+  dashNpm: 'npm',
+  dashRun: 'run',
+  dashTasks: 'tasks',
+};
+const DASH_ALLOWED = [...DASH_IDS, 'pull', 'push', 'quit', 'theme'];
+const REPOS_ALLOWED = [
+  'repoLeft',
+  'repoRight',
+  'repoUp',
+  'repoDown',
+  'open',
+  'quit',
+  'theme',
+];
+const DASH_HIDDEN = ACTION_IDS.filter((id) => id !== 'quit');
+
 const ACTION_HOT = {
   prev: '←',
   next: '→',
+  drop: 'del',
+  newBranch: 'ins',
+  newCommit: 'ins',
+  feedback: 'q',
+  check: 'space',
+  theme: 'l',
+  npmNew: 'ins',
+  npmDrop: 'del',
   npmStop: 'esc',
+  packageNew: 'ins',
+  packageDrop: 'del',
 };
 
 const ACTION_LABEL = {
+  ...DASH_BLOCKS,
   revert: 'drop',
-  check: 'x',
+  check: 'space',
+  theme: 'light',
   layout: 'mode',
   tasks: 'tasks',
   view: 'view',
   code: 'edit',
-  newBranch: 'new',
+  reword: 'edit',
+  drop: 'delete',
+  newBranch: 'insert',
+  newCommit: 'insert',
+  feedback: 'quote',
   npmEdit: 'edit',
-  npmNew: 'new',
+  npmNew: 'insert',
   npmDrop: 'delete',
   npmLogs: 'cleanup',
+  packageNew: 'insert',
+  packageDrop: 'delete',
+  packageWanted: 'wanted',
+  packageLatest: 'latest',
   npmStop: 'esc',
   npmVerbose: 'verbose',
   npmRerun: 're-run',
@@ -86,10 +141,9 @@ const DIFF_DISABLED = [
   'push',
   'file',
   'diff',
-  'ignore',
 ];
-const UNIT_DISABLED = [...DIFF_DISABLED, 'layout'];
-const FILES_DISABLED = ['layout', 'feedback', 'code'];
+const UNIT_DISABLED = [...DIFF_DISABLED, 'layout', 'ignore'];
+const FILES_DISABLED = ['layout', 'feedback'];
 const FILES_HIDDEN = [
   ...FILES_DISABLED,
   'check',
@@ -98,9 +152,11 @@ const FILES_HIDDEN = [
   'commit',
   'file',
   'diff',
+  'tasks',
+  'branch',
 ];
 const FILES_GIT_DISABLED = ['add', 'unstage', 'revert', 'ignore'];
-const FILES_TASKS_DISABLED = [...FILES_GIT_DISABLED, ...FILES_DISABLED];
+const FILES_TASKS_DISABLED = [...FILES_GIT_DISABLED, ...FILES_DISABLED, 'code'];
 const TASKS_DISABLED = [
   'add',
   'unstage',
@@ -140,19 +196,44 @@ const NPM_DISABLED = [...BRANCHES_DISABLED, 'pull', 'push'];
 const isTasksTarget = (item) =>
   !!(item && (item.kind === 'tasks' || item.origin === 'task'));
 
+const DIFF_MOVE_IDS = ['add', 'unstage', 'revert'];
+
+const entryHasDiff = (entry) => {
+  if (!entry || entry.kind === 'tasks') return false;
+  const keys = [
+    'added',
+    'removed',
+    'stagedAdded',
+    'stagedRemoved',
+    'unstagedAdded',
+    'unstagedRemoved',
+    'remaining',
+  ];
+  let total = 0;
+  for (const key of keys) total += entry[key] ?? 0;
+  return total > 0;
+};
+
+const lineHasDiff = (line) =>
+  !!line && (line.type === 'add' || line.type === 'del');
+
+const withoutMoves = (off, hasDiff) => {
+  if (hasDiff) return off;
+  const next = off.slice();
+  for (const id of DIFF_MOVE_IDS) {
+    if (!next.includes(id)) next.push(id);
+  }
+  return next;
+};
+
 const diffGitDisabled = (item) => {
   if (!item || isTasksTarget(item)) return [];
   if (item.origin === 'staged') return ['add'];
   return ['unstage'];
 };
 
-const BRANCH_REMOTE = ['pull', 'push'];
-
-const branchGitDisabled = (item) => {
-  const off = item && !item.current ? [] : ['rebase', 'drop'];
-  if (!item || !item.current) return [...off, ...BRANCH_REMOTE];
-  return off;
-};
+const branchGitDisabled = (item) =>
+  item && !item.current ? [] : ['rebase', 'drop'];
 
 const isFixupCommit = (item) =>
   `${item && item.subject ? item.subject : ''}`.startsWith('fixup!');
@@ -170,25 +251,43 @@ const commitWriteDisabled = (item) => {
   return ['amend', 'apply'];
 };
 
+const commitChord = (item) => {
+  if (!item || item.pending || !item.sha) return 'commit';
+  if (item.head) return 'amend';
+  return 'fixup';
+};
+
 const commitGitDisabled = (item) => {
   const off = [...commitWriteDisabled(item)];
   if (!isFixupCommit(item)) off.push('apply');
-  if (item && item.canCommit === true) return off;
-  return [...off, 'commit', 'fixup'];
+  const chord = commitChord(item);
+  const ready = item && item.canCommit === true;
+  if (chord === 'amend') return off;
+  if (!ready) off.push('commit');
+  return off;
 };
 
 const disabledActions = (pane, item) => {
   const onTodos = isTasksTarget(item);
-  if (pane === 'files') return onTodos ? FILES_TASKS_DISABLED : FILES_DISABLED;
-  if (pane === 'unit') return [...UNIT_DISABLED, ...diffGitDisabled(item)];
+  if (pane === 'dashboard' || pane === 'repos') return [];
+  if (pane === 'files') {
+    const base = onTodos ? FILES_TASKS_DISABLED : FILES_DISABLED;
+    if (onTodos) return base;
+    return withoutMoves(base, entryHasDiff(item));
+  }
+  if (pane === 'unit') {
+    const off = [...UNIT_DISABLED, ...diffGitDisabled(item)];
+    const onDiff = !item || item.lineDiff !== false;
+    return withoutMoves(off, onDiff);
+  }
   if (pane === 'branches') {
     return [...BRANCHES_DISABLED, ...branchGitDisabled(item)];
   }
   if (pane === 'commits') {
     return [...COMMITS_DISABLED, ...commitWriteDisabled(item)];
   }
-  if (pane === 'npm') return NPM_DISABLED;
-  if (onTodos) return TASKS_DISABLED;
+  if (pane === 'npm' || pane === 'packages') return NPM_DISABLED;
+  if (pane === 'tasks' || onTodos) return TASKS_DISABLED;
   return [...DIFF_DISABLED, ...diffGitDisabled(item)];
 };
 
@@ -223,25 +322,38 @@ const keysForActions = (actions) => {
 };
 
 const PANE_ONLY = ['branch', 'file', 'diff'];
-const FILES_KEYS = keysForActions({
-  branch: ACTIONS.branch,
-  pull: BRANCH_ACTIONS.pull,
-  push: BRANCH_ACTIONS.push,
-  npm: NPM_ACTIONS.npm,
-});
+const REVIEW_DROP = { d: 'revert' };
+const DIFF_KEYS = { ...REVIEW_DROP, q: 'feedback' };
 const BRANCH_KEYS = keysForActions(BRANCH_ACTIONS);
-const COMMIT_KEYS = keysForActions(COMMIT_ACTIONS);
+const COMMIT_KEYS = { ...keysForActions(COMMIT_ACTIONS), s: 'push' };
 const NPM_KEYS = {
   e: 'npmEdit',
-  n: 'npmNew',
-  d: 'npmDrop',
-  c: 'npmLogs',
+  insert: 'npmNew',
+  delete: 'npmDrop',
+  l: 'npmLogs',
 };
+const DASH_KEYS = keysForActions(DASH_ACTIONS);
+const SCREEN_KEYS = DASH_KEYS;
 const PANE_KEYS = {
-  files: FILES_KEYS,
+  dashboard: { ...DASH_KEYS, p: 'pull', s: 'push' },
+  files: REVIEW_DROP,
+  diff: DIFF_KEYS,
+  unit: DIFF_KEYS,
   branches: BRANCH_KEYS,
   commits: COMMIT_KEYS,
   npm: NPM_KEYS,
+  packages: keysForActions(PACKAGE_ACTIONS),
+  tasks: { delete: 'drop' },
+  repos: {
+    left: 'repoLeft',
+    right: 'repoRight',
+    up: 'repoUp',
+    down: 'repoDown',
+    k: 'repoUp',
+    j: 'repoDown',
+    p: 'repoLeft',
+    n: 'repoRight',
+  },
 };
 
 const KEY_TO_ACTION = {
@@ -254,16 +366,13 @@ const KEY_TO_ACTION = {
   ...HIDDEN_KEYS,
 };
 
-const actionFromKey = (key, pane, fileScope) => {
+const actionFromKey = (key, pane) => {
   if (LIST_PANES.includes(pane) && (key === 'left' || key === 'right')) {
     return null;
   }
   const paneKeys = PANE_KEYS[pane];
   if (paneKeys && paneKeys[key]) return paneKeys[key];
-  if (pane === 'files') {
-    if (key === 'f' && fileScope !== 'file') return 'file';
-    if (key === 'd' && fileScope === 'file') return 'diff';
-  }
+  if (pane && SCREEN_KEYS[key]) return SCREEN_KEYS[key];
   return KEY_TO_ACTION[key] ?? null;
 };
 
@@ -272,11 +381,11 @@ const actionKeys = (id) =>
   BRANCH_ACTIONS[id] ??
   COMMIT_ACTIONS[id] ??
   NPM_ACTIONS[id] ??
+  PACKAGE_ACTIONS[id] ??
+  DASH_ACTIONS[id] ??
   [];
 
-const actionHot = (id) => ACTION_HOT[id] ?? actionKeys(id)[0];
-
-const actionLetter = actionHot;
+const actionLetter = (id) => ACTION_HOT[id] ?? actionKeys(id)[0];
 
 const buttonWord = (id) => {
   const word = ACTION_LABEL[id] ?? ACTION_HOT[id] ?? id;
@@ -333,6 +442,22 @@ const CONFIRM = {
       escape: 'cancel',
     },
   },
+  confirmCommit: {
+    choices: [
+      { letter: 'esc', label: 'esc cancel', lead: '  ' },
+      { letter: 'c', label: 'commit', lead: '  ' },
+      { letter: 'a', label: 'amend', lead: '  ' },
+      { letter: 'f', label: 'fixup', lead: '  ' },
+    ],
+    prefix: ' what do you want to do?',
+    keys: {
+      esc: 'cancel',
+      escape: 'cancel',
+      c: 'commit',
+      a: 'amend',
+      f: 'fixup',
+    },
+  },
 };
 
 const CONFIRM_MODE = Object.keys(CONFIRM);
@@ -344,13 +469,6 @@ const confirmKey = (mode, key) => {
   return spec.keys[norm] ?? null;
 };
 
-const applyConfirm = (mode, key, handlers) => {
-  const action = confirmKey(mode, key);
-  if (!action) return;
-  const handler = handlers[action];
-  if (handler) handler();
-};
-
 const confirmPrefix = (spec, view) => {
   if (typeof spec.prefix === 'function') return spec.prefix(view);
   return spec.prefix ?? '';
@@ -361,6 +479,11 @@ const promptFromChoices = (choices) =>
 
 module.exports = {
   LIST_PANES,
+  DASH_IDS,
+  DASH_BLOCKS,
+  DASH_ALLOWED,
+  DASH_HIDDEN,
+  REPOS_ALLOWED,
   ACTIONS,
   ACTION_IDS,
   BRANCH_ACTIONS,
@@ -376,18 +499,19 @@ module.exports = {
   COMMITS_DISABLED,
   NPM_DISABLED,
   disabledActions,
+  entryHasDiff,
+  lineHasDiff,
+  withoutMoves,
   diffGitDisabled,
   branchGitDisabled,
   commitGitDisabled,
   isFixupCommit,
   actionFromKey,
-  actionHot,
   actionLetter,
   buttonWord,
   CONFIRM,
   CONFIRM_MODE,
   confirmKey,
-  applyConfirm,
   confirmPrefix,
   promptFromChoices,
 };