reslop 0.2.3 → 0.2.5

package/lib/session/actions.js

@@ -1,16 +1,19 @@
 'use strict';
 
+const LIST_PANES = ['files', 'branches', 'commits', 'npm'];
+
 const ACTIONS = {
   add: ['a'],
   unstage: ['u'],
   revert: ['d'],
+  ignore: ['i'],
   commit: ['c'],
   prev: ['left', 'p', 'k'],
   next: ['right', 'n', 'j'],
   check: ['x', ' '],
   layout: ['m'],
   feedback: ['f'],
-  todo: ['t'],
+  tasks: ['t'],
   code: ['e'],
   branch: ['b'],
   file: ['f'],
@@ -42,7 +45,10 @@ const NPM_ACTIONS = {
   npm: ['n'],
   npmEdit: ['e'],
   npmNew: ['n'],
+  npmDrop: ['d'],
+  npmLogs: ['c'],
   npmStop: ['escape'],
+  npmVerbose: ['v'],
   npmRerun: ['r'],
 };
 
@@ -56,12 +62,16 @@ const ACTION_LABEL = {
   revert: 'drop',
   check: 'x',
   layout: 'mode',
+  tasks: 'tasks',
   view: 'view',
   code: 'edit',
   newBranch: 'new',
   npmEdit: 'edit',
   npmNew: 'new',
+  npmDrop: 'delete',
+  npmLogs: 'cleanup',
   npmStop: 'esc',
+  npmVerbose: 'verbose',
   npmRerun: 're-run',
   quit: 'q',
   prev: '←',
@@ -76,6 +86,7 @@ const DIFF_DISABLED = [
   'push',
   'file',
   'diff',
+  'ignore',
 ];
 const UNIT_DISABLED = [...DIFF_DISABLED, 'layout'];
 const FILES_DISABLED = ['layout', 'feedback', 'code'];
@@ -88,16 +99,17 @@ const FILES_HIDDEN = [
   'file',
   'diff',
 ];
-const FILES_GIT_DISABLED = ['add', 'unstage', 'revert'];
-const FILES_TODO_DISABLED = [...FILES_GIT_DISABLED, ...FILES_DISABLED];
-const TODO_DISABLED = [
+const FILES_GIT_DISABLED = ['add', 'unstage', 'revert', 'ignore'];
+const FILES_TASKS_DISABLED = [...FILES_GIT_DISABLED, ...FILES_DISABLED];
+const TASKS_DISABLED = [
   'add',
   'unstage',
   'revert',
+  'ignore',
   'commit',
   'layout',
   'feedback',
-  'todo',
+  'tasks',
   'code',
   'branch',
   'file',
@@ -109,10 +121,11 @@ const BRANCHES_DISABLED = [
   'add',
   'unstage',
   'revert',
+  'ignore',
   'commit',
   'layout',
   'feedback',
-  'todo',
+  'tasks',
   'code',
   'check',
   'branch',
@@ -121,45 +134,14 @@ const BRANCHES_DISABLED = [
   'prev',
   'next',
 ];
-const COMMITS_DISABLED = [
-  'add',
-  'unstage',
-  'revert',
-  'layout',
-  'feedback',
-  'todo',
-  'code',
-  'check',
-  'branch',
-  'file',
-  'diff',
-  'prev',
-  'next',
-];
-const NPM_DISABLED = [
-  'add',
-  'unstage',
-  'revert',
-  'commit',
-  'layout',
-  'feedback',
-  'todo',
-  'code',
-  'check',
-  'branch',
-  'file',
-  'diff',
-  'prev',
-  'next',
-  'pull',
-  'push',
-];
+const COMMITS_DISABLED = BRANCHES_DISABLED.filter((id) => id !== 'commit');
+const NPM_DISABLED = [...BRANCHES_DISABLED, 'pull', 'push'];
 
-const isTodosTarget = (item) =>
-  !!(item && (item.kind === 'todos' || item.origin === 'todo'));
+const isTasksTarget = (item) =>
+  !!(item && (item.kind === 'tasks' || item.origin === 'task'));
 
 const diffGitDisabled = (item) => {
-  if (!item || isTodosTarget(item)) return [];
+  if (!item || isTasksTarget(item)) return [];
   if (item.origin === 'staged') return ['add'];
   return ['unstage'];
 };
@@ -176,8 +158,16 @@ const isFixupCommit = (item) =>
   `${item && item.subject ? item.subject : ''}`.startsWith('fixup!');
 
 const commitWriteDisabled = (item) => {
-  if (!item || !item.sha) return ['amend', 'apply', 'reword', 'fixup', 'drop'];
-  return [];
+  const pending = Boolean(item && item.pending);
+  const unstaged = Boolean(item && item.unstagedCurrent);
+  if (!item || !item.sha) {
+    const off = ['reword', 'fixup', 'drop'];
+    if (pending) return off;
+    return ['amend', 'apply', ...off];
+  }
+  if (unstaged) return [];
+  if (isFixupCommit(item)) return ['amend'];
+  return ['amend', 'apply'];
 };
 
 const commitGitDisabled = (item) => {
@@ -188,8 +178,8 @@ const commitGitDisabled = (item) => {
 };
 
 const disabledActions = (pane, item) => {
-  const onTodos = isTodosTarget(item);
-  if (pane === 'files') return onTodos ? FILES_TODO_DISABLED : FILES_DISABLED;
+  const onTodos = isTasksTarget(item);
+  if (pane === 'files') return onTodos ? FILES_TASKS_DISABLED : FILES_DISABLED;
   if (pane === 'unit') return [...UNIT_DISABLED, ...diffGitDisabled(item)];
   if (pane === 'branches') {
     return [...BRANCHES_DISABLED, ...branchGitDisabled(item)];
@@ -198,7 +188,7 @@ const disabledActions = (pane, item) => {
     return [...COMMITS_DISABLED, ...commitWriteDisabled(item)];
   }
   if (pane === 'npm') return NPM_DISABLED;
-  if (onTodos) return TODO_DISABLED;
+  if (onTodos) return TASKS_DISABLED;
   return [...DIFF_DISABLED, ...diffGitDisabled(item)];
 };
 
@@ -220,30 +210,33 @@ const SCROLL = {
   home: 'home',
   end: 'end',
   enter: 'open',
-  backspace: 'removeTodo',
-  delete: 'removeTodo',
+  backspace: 'removeTask',
+  delete: 'removeTask',
+};
+
+const keysForActions = (actions) => {
+  const keys = {};
+  for (const [id, shortcuts] of Object.entries(actions)) {
+    for (const key of shortcuts) keys[key] = id;
+  }
+  return keys;
 };
 
-const KEY_TO_ACTION = {};
 const PANE_ONLY = ['branch', 'file', 'diff'];
-const FILES_KEYS = {};
-for (const key of ACTIONS.branch) FILES_KEYS[key] = 'branch';
-for (const id of BRANCH_REMOTE) {
-  for (const key of BRANCH_ACTIONS[id]) FILES_KEYS[key] = id;
-}
-const BRANCH_KEYS = {};
-for (const id of Object.keys(BRANCH_ACTIONS)) {
-  for (const key of BRANCH_ACTIONS[id]) BRANCH_KEYS[key] = id;
-}
-const COMMIT_KEYS = {};
-for (const id of Object.keys(COMMIT_ACTIONS)) {
-  for (const key of COMMIT_ACTIONS[id]) COMMIT_KEYS[key] = id;
-}
+const FILES_KEYS = keysForActions({
+  branch: ACTIONS.branch,
+  pull: BRANCH_ACTIONS.pull,
+  push: BRANCH_ACTIONS.push,
+  npm: NPM_ACTIONS.npm,
+});
+const BRANCH_KEYS = keysForActions(BRANCH_ACTIONS);
+const COMMIT_KEYS = keysForActions(COMMIT_ACTIONS);
 const NPM_KEYS = {
   e: 'npmEdit',
   n: 'npmNew',
+  d: 'npmDrop',
+  c: 'npmLogs',
 };
-FILES_KEYS.n = 'npm';
 const PANE_KEYS = {
   files: FILES_KEYS,
   branches: BRANCH_KEYS,
@@ -251,23 +244,20 @@ const PANE_KEYS = {
   npm: NPM_KEYS,
 };
 
-for (const id of ACTION_IDS) {
-  if (PANE_ONLY.includes(id)) continue;
-  for (const key of ACTIONS[id]) KEY_TO_ACTION[key] = id;
-}
-
-for (const key of Object.keys(SCROLL)) KEY_TO_ACTION[key] = SCROLL[key];
-for (const key of Object.keys(HIDDEN_KEYS)) {
-  KEY_TO_ACTION[key] = HIDDEN_KEYS[key];
-}
+const KEY_TO_ACTION = {
+  ...keysForActions(
+    Object.fromEntries(
+      Object.entries(ACTIONS).filter(([id]) => !PANE_ONLY.includes(id)),
+    ),
+  ),
+  ...SCROLL,
+  ...HIDDEN_KEYS,
+};
 
 const actionFromKey = (key, pane, fileScope) => {
-  const listPane =
-    pane === 'files' ||
-    pane === 'branches' ||
-    pane === 'commits' ||
-    pane === 'npm';
-  if (listPane && (key === 'left' || key === 'right')) return null;
+  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') {
@@ -370,32 +360,27 @@ const promptFromChoices = (choices) =>
   choices.map((choice) => `${choice.lead}${choice.label}`).join('');
 
 module.exports = {
+  LIST_PANES,
   ACTIONS,
   ACTION_IDS,
   BRANCH_ACTIONS,
   COMMIT_ACTIONS,
-  NPM_ACTIONS,
-  ACTION_HOT,
-  ACTION_LABEL,
   DIFF_DISABLED,
   UNIT_DISABLED,
   FILES_DISABLED,
   FILES_HIDDEN,
   FILES_GIT_DISABLED,
-  FILES_TODO_DISABLED,
-  TODO_DISABLED,
+  FILES_TASKS_DISABLED,
+  TASKS_DISABLED,
   BRANCHES_DISABLED,
   COMMITS_DISABLED,
   NPM_DISABLED,
-  SCROLL,
-  PANE_ONLY,
   disabledActions,
   diffGitDisabled,
   branchGitDisabled,
   commitGitDisabled,
   isFixupCommit,
   actionFromKey,
-  actionKeys,
   actionHot,
   actionLetter,
   buttonWord,

package/lib/session/branches.js

@@ -1,8 +1,10 @@
 'use strict';
 
-const { stateView } = require('./accessors.js');
+const accessors = require('./accessors.js');
+const { stateView } = accessors;
 
-const { pickRepoWrite } = require('./ops.js');
+const ops = require('./ops.js');
+const { pickRepoWrite } = ops;
 
 const selectedBranch = (api) => {
   const cursor = api.ui.nav.branchCursor;
@@ -45,10 +47,12 @@ const onBranch = (api) => {
     return;
   }
   const current = api.state.branches.findIndex((entry) => entry.current);
-  api.ui.nav.branchCursor = current < 0 ? 0 : current;
-  api.ui.nav.pane = 'branches';
+  const nav = api.ui.nav;
+  nav.branchCursor = current < 0 ? 0 : current;
+  nav.pane = 'branches';
+  nav.resetListScroll('branches');
   api.ui.status = '';
-  api.ui.nav.clearSelection();
+  nav.clearSelection();
 };
 
 const onBranchMove = (api, delta) => {
@@ -95,12 +99,6 @@ const onCheckoutBranch = (api) => {
   if (!api.ui.status) api.ui.status = done;
 };
 
-const rebaseAsync = (api, onto, done, write) => {
-  const run = (top) => write(top, onto);
-  const after = () => refreshAfterWrite(api, { doneStatus: done });
-  return void api.ui.ops.runBusy('rebasing', done, run, after);
-};
-
 const onRebaseBranch = (api) => {
   if (api.ui.nav.pane !== 'branches') return;
   if (!api.ui.commits.canCommit()) return;
@@ -108,17 +106,9 @@ const onRebaseBranch = (api) => {
   if (!entry || entry.current) return;
   const onto = entry.name;
   const done = `rebased onto ${onto}`;
-  const uiOpen = api.ui.uiOpen;
-  const picked = pickRepoWrite(api.ui.repo, 'rebase', uiOpen);
-  if (picked.async) {
-    return void rebaseAsync(api, onto, done, picked.write);
-  }
-  const ok = api.ui.ops.runRepo(done, (top) => {
-    api.ui.repo.rebase(top, onto);
-  });
-  if (!ok) return;
-  refreshAfterWrite(api);
-  if (!api.ui.status) api.ui.status = done;
+  api.ui.ops.runWrite('rebase', [onto], 'rebasing', done, (extra) =>
+    refreshAfterWrite(api, extra),
+  );
 };
 
 const onDropBranch = (api) => {
@@ -137,29 +127,15 @@ const cancelDropBranch = (api) => {
   api.ui.status = '';
 };
 
-const dropAsync = (api, name, done, write) => {
-  const run = (top) => write(top, name);
-  const after = () => refreshAfterWrite(api, { doneStatus: done });
-  return void api.ui.ops.runBusy('dropping', done, run, after);
-};
-
 const confirmDropBranch = (api) => {
   const name = api.state.dropName;
   api.ui.mode = 'review';
   api.state.dropName = '';
   if (!name) return;
   const done = `dropped ${name}`;
-  const uiOpen = api.ui.uiOpen;
-  const picked = pickRepoWrite(api.ui.repo, 'drop', uiOpen);
-  if (picked.async) {
-    return void dropAsync(api, name, done, picked.write);
-  }
-  const ok = api.ui.ops.runRepo(done, (top) => {
-    api.ui.repo.drop(top, name);
-  });
-  if (!ok) return;
-  refreshAfterWrite(api);
-  if (!api.ui.status) api.ui.status = done;
+  api.ui.ops.runWrite('drop', [name], 'dropping', done, (extra) =>
+    refreshAfterWrite(api, extra),
+  );
 };
 
 const onNewBranch = (api) => {
@@ -201,19 +177,9 @@ const finishCreateBranch = (api) => {
 
 const onPull = (api) => {
   if (!api.ui.commits.canCommit()) return;
-  const repo = api.ui.repo;
-  const picked = pickRepoWrite(repo, 'pull', api.ui.uiOpen);
-  if (picked.async) {
-    const after = () => refreshAfterWrite(api);
-    const write = (top) => picked.write(top);
-    return void api.ui.ops.runBusy('pulling', 'pulled', write, after);
-  }
-  const ok = api.ui.ops.runRepo('pulled', (top) => {
-    repo.pull(top);
-  });
-  if (!ok) return;
-  refreshAfterWrite(api);
-  if (!api.ui.status) api.ui.status = 'pulled';
+  api.ui.ops.runWrite('pull', [], 'pulling', 'pulled', (extra) =>
+    refreshAfterWrite(api, extra),
+  );
 };
 
 const startPush = (api, force) => {