reslop 0.2.6 → 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,20 +10,20 @@ 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'],
+  newBranch: ['insert'],
   rebase: ['e'],
   drop: ['delete'],
   pull: ['p'],
@@ -31,18 +31,24 @@ const BRANCH_ACTIONS = {
 };
 
 const COMMIT_ACTIONS = {
-  amend: ['a'],
+  newCommit: ['insert'],
   apply: ['p'],
   reword: ['e'],
-  fixup: ['x'],
   drop: ['delete'],
   view: ['v'],
 };
 
+const PACKAGE_ACTIONS = {
+  packageNew: ['insert'],
+  packageDrop: ['delete'],
+  packageWanted: ['w'],
+  packageLatest: ['l'],
+};
+
 const NPM_ACTIONS = {
   npm: ['n'],
   npmEdit: ['e'],
-  npmNew: ['i'],
+  npmNew: ['insert'],
   npmDrop: ['delete'],
   npmLogs: ['l'],
   npmStop: ['escape'],
@@ -69,32 +75,56 @@ const DASH_BLOCKS = {
   dashRun: 'run',
   dashTasks: 'tasks',
 };
-const DASH_ALLOWED = [...DASH_IDS, 'quit', 'theme'];
+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',
   reword: 'edit',
   drop: 'delete',
-  newBranch: 'new',
+  newBranch: 'insert',
+  newCommit: 'insert',
+  feedback: 'quote',
   npmEdit: 'edit',
   npmNew: 'insert',
   npmDrop: 'delete',
   npmLogs: 'cleanup',
+  packageNew: 'insert',
+  packageDrop: 'delete',
+  packageWanted: 'wanted',
+  packageLatest: 'latest',
   npmStop: 'esc',
   npmVerbose: 'verbose',
   npmRerun: 're-run',
@@ -113,7 +143,7 @@ const DIFF_DISABLED = [
   'diff',
 ];
 const UNIT_DISABLED = [...DIFF_DISABLED, 'layout', 'ignore'];
-const FILES_DISABLED = ['layout', 'feedback', 'code'];
+const FILES_DISABLED = ['layout', 'feedback'];
 const FILES_HIDDEN = [
   ...FILES_DISABLED,
   'check',
@@ -126,7 +156,7 @@ const FILES_HIDDEN = [
   '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',
@@ -166,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!');
@@ -196,24 +251,42 @@ 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 (pane === 'npm' || pane === 'packages') return NPM_DISABLED;
   if (pane === 'tasks' || onTodos) return TASKS_DISABLED;
   return [...DIFF_DISABLED, ...diffGitDisabled(item)];
 };
@@ -250,25 +323,37 @@ const keysForActions = (actions) => {
 
 const PANE_ONLY = ['branch', 'file', 'diff'];
 const REVIEW_DROP = { d: 'revert' };
+const DIFF_KEYS = { ...REVIEW_DROP, q: 'feedback' };
 const BRANCH_KEYS = keysForActions(BRANCH_ACTIONS);
-const COMMIT_KEYS = { ...keysForActions(COMMIT_ACTIONS), c: 'commit' };
+const COMMIT_KEYS = { ...keysForActions(COMMIT_ACTIONS), s: 'push' };
 const NPM_KEYS = {
   e: 'npmEdit',
-  i: 'npmNew',
+  insert: 'npmNew',
   delete: 'npmDrop',
   l: 'npmLogs',
 };
 const DASH_KEYS = keysForActions(DASH_ACTIONS);
 const SCREEN_KEYS = DASH_KEYS;
 const PANE_KEYS = {
-  dashboard: DASH_KEYS,
+  dashboard: { ...DASH_KEYS, p: 'pull', s: 'push' },
   files: REVIEW_DROP,
-  diff: REVIEW_DROP,
-  unit: 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 = {
@@ -296,6 +381,7 @@ const actionKeys = (id) =>
   BRANCH_ACTIONS[id] ??
   COMMIT_ACTIONS[id] ??
   NPM_ACTIONS[id] ??
+  PACKAGE_ACTIONS[id] ??
   DASH_ACTIONS[id] ??
   [];
 
@@ -356,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);
@@ -381,6 +483,7 @@ module.exports = {
   DASH_BLOCKS,
   DASH_ALLOWED,
   DASH_HIDDEN,
+  REPOS_ALLOWED,
   ACTIONS,
   ACTION_IDS,
   BRANCH_ACTIONS,
@@ -396,6 +499,9 @@ module.exports = {
   COMMITS_DISABLED,
   NPM_DISABLED,
   disabledActions,
+  entryHasDiff,
+  lineHasDiff,
+  withoutMoves,
   diffGitDisabled,
   branchGitDisabled,
   commitGitDisabled,

package/lib/session/branches.js

@@ -83,13 +83,11 @@ class BranchController {
     const ui = this.ui;
     if (!ui.commits.canCommit()) return;
     const entry = this.selected();
-    if (!entry) return;
-    if (entry.current) return void ui.showFiles();
+    if (!entry || entry.current) return;
     const name = entry.name;
-    const after = (extra) => ui.refreshFromRepo({ keepEmpty: true, ...extra });
-    const leave = () => ui.showFiles();
+    const after = (extra) => this.refreshAfterWrite(extra);
     const done = `checked out ${name}`;
-    ui.ops.runWrite('checkout', [name], 'checking out', done, after, leave);
+    ui.ops.runWrite('checkout', [name], 'checking out', done, after);
   }
 
   finishCreateBranch() {

package/lib/session/commit.js

@@ -200,19 +200,46 @@ class CommitController {
     editor.cursor = lineEnd < 0 ? editor.text.length : lineEnd;
   }
 
-  onCommit() {
-    if (this.ui.nav.pane !== 'commits') return void this.show();
-    if (!this.canCommit()) return;
+  onInsert() {
+    const entry = this.selected();
+    if (!entry || entry.pending || !entry.sha) {
+      if (this.canCommit()) this.start('commit');
+      return;
+    }
+    if (!this.canWrite()) return;
+    this.ui.status = '';
+    this.ui.mode = 'confirmCommit';
+  }
+
+  chooseCommit(kind) {
+    this.ui.mode = 'review';
+    if (kind === 'amend') {
+      this.onAmend();
+      return;
+    }
+    if (kind === 'fixup') {
+      this.onFixup();
+      return;
+    }
     this.start('commit');
   }
 
+  cancelCommitChoice() {
+    this.ui.mode = 'review';
+  }
+
+  onCommit() {
+    if (this.ui.nav.pane === 'commits') return;
+    this.show();
+  }
+
   onShowDiff() {
     const ui = this.ui;
     if (ui.mode === 'compose') return;
     const entry = this.selected();
     if (!entry) return;
     const viewingCommit = Boolean(ui.rev || ui.revShort);
-    if (entry.pending && !viewingCommit) return void this.onCommit();
+    if (entry.pending && !viewingCommit) return void this.onInsert();
     const sha = entry.pending ? '' : entry.sha || '';
     ui.rev = sha;
     ui.revShort = sha ? entry.shortSha || '' : '';

package/lib/session/compose.js

@@ -11,7 +11,8 @@ const { listedCommits } = commit;
 const editor = require('../editor.js');
 const { Editor } = editor;
 const files = require('../files.js');
-const { itemPath, isTaskItem, listPath, isReadOnlyOrigin } = files;
+const { itemPath, isTaskItem, isTasksEntry, listPath } = files;
+const { isReadOnlyOrigin } = files;
 const diff = require('../diff/diff.js');
 const { blockAddText } = diff;
 const items = require('./items.js');
@@ -37,10 +38,11 @@ const KIND = {
   commit: { enter: 'save', tab: 'template', escape: 'cancel', move: 'note' },
   branch: { enter: 'save', tab: 'template', escape: 'cancel', move: 'note' },
   npm: { enter: 'save', tab: 'insert-tab', escape: 'cancel', move: 'note' },
+  package: { enter: 'save', tab: 'insert-tab', escape: 'cancel', move: 'note' },
 };
 
-const COMMAND_KINDS = ['commit', 'branch', 'npm'];
-const NOTE_VIEWS = ['feedback', 'commit', 'branch', 'npm'];
+const COMMAND_KINDS = ['commit', 'branch', 'npm', 'package'];
+const NOTE_VIEWS = ['feedback', 'commit', 'branch', 'npm', 'package'];
 
 const itemNote = (item, text) => {
   const hunk = item.hunk;
@@ -544,8 +546,21 @@ class Composer {
     this.followFileEdit();
   }
 
+  onFileEdit() {
+    const ui = this.ui;
+    const list = ui.fileList();
+    const entry = list[ui.nav.fileCursor];
+    if (!entry || isTasksEntry(entry)) {
+      ui.status = 'not a diff block';
+      return;
+    }
+    unit.openUnitFile(ui, entry);
+    this.onUnitEdit();
+  }
+
   onCode() {
     const ui = this.ui;
+    if (ui.nav.pane === 'files') return void this.onFileEdit();
     if (ui.nav.pane === 'unit') return void this.onUnitEdit();
     const item = ui.current();
     if (ui.nav.pane === 'files' || !canEditCode(item)) {
@@ -634,7 +649,7 @@ class Composer {
     if (!key.length || key.startsWith('ctrl-') || key.startsWith('alt-')) {
       return null;
     }
-    if (key.charCodeAt(0) >= 32) {
+    if (key.length === 1 && key.charCodeAt(0) >= 32) {
       this.templates.clearTemplatePick();
       this.editor.insert(key);
       this.afterEdit();