reslop 0.2.0 → 0.2.3

package/lib/session/actions.js

@@ -7,6 +7,7 @@ const ACTIONS = {
   commit: ['c'],
   prev: ['left', 'p', 'k'],
   next: ['right', 'n', 'j'],
+  check: ['x', ' '],
   layout: ['m'],
   feedback: ['f'],
   todo: ['t'],
@@ -28,32 +29,59 @@ const BRANCH_ACTIONS = {
 
 const COMMIT_ACTIONS = {
   amend: ['a'],
+  apply: ['a'],
+  reword: ['r'],
   fixup: ['f'],
   drop: ['d'],
+  view: ['v'],
   pull: ['p'],
   push: ['s'],
 };
 
+const NPM_ACTIONS = {
+  npm: ['n'],
+  npmEdit: ['e'],
+  npmNew: ['n'],
+  npmStop: ['escape'],
+  npmRerun: ['r'],
+};
+
 const ACTION_HOT = {
   prev: '←',
   next: '→',
+  npmStop: 'esc',
 };
 
 const ACTION_LABEL = {
   revert: 'drop',
+  check: 'x',
   layout: 'mode',
+  view: 'view',
   code: 'edit',
   newBranch: 'new',
+  npmEdit: 'edit',
+  npmNew: 'new',
+  npmStop: 'esc',
+  npmRerun: 're-run',
   quit: 'q',
   prev: '←',
   next: '→',
 };
 
-const DIFF_DISABLED = ['commit', 'branch', 'pull', 'push', 'file', 'diff'];
+const DIFF_DISABLED = [
+  'check',
+  'commit',
+  'branch',
+  'pull',
+  'push',
+  'file',
+  'diff',
+];
 const UNIT_DISABLED = [...DIFF_DISABLED, 'layout'];
 const FILES_DISABLED = ['layout', 'feedback', 'code'];
 const FILES_HIDDEN = [
   ...FILES_DISABLED,
+  'check',
   'prev',
   'next',
   'commit',
@@ -86,6 +114,7 @@ const BRANCHES_DISABLED = [
   'feedback',
   'todo',
   'code',
+  'check',
   'branch',
   'file',
   'diff',
@@ -100,11 +129,30 @@ const COMMITS_DISABLED = [
   '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 isTodosTarget = (item) =>
@@ -124,13 +172,17 @@ const branchGitDisabled = (item) => {
   return off;
 };
 
+const isFixupCommit = (item) =>
+  `${item && item.subject ? item.subject : ''}`.startsWith('fixup!');
+
 const commitWriteDisabled = (item) => {
-  if (!item || !item.sha) return ['amend', 'fixup', 'drop'];
+  if (!item || !item.sha) return ['amend', 'apply', 'reword', 'fixup', 'drop'];
   return [];
 };
 
 const commitGitDisabled = (item) => {
-  const off = commitWriteDisabled(item);
+  const off = [...commitWriteDisabled(item)];
+  if (!isFixupCommit(item)) off.push('apply');
   if (item && item.canCommit === true) return off;
   return [...off, 'commit', 'fixup'];
 };
@@ -145,10 +197,15 @@ const disabledActions = (pane, item) => {
   if (pane === 'commits') {
     return [...COMMITS_DISABLED, ...commitWriteDisabled(item)];
   }
+  if (pane === 'npm') return NPM_DISABLED;
   if (onTodos) return TODO_DISABLED;
   return [...DIFF_DISABLED, ...diffGitDisabled(item)];
 };
 
+const HIDDEN_KEYS = {
+  l: 'theme',
+};
+
 const SCROLL = {
   up: 'scrollUp',
   down: 'scrollDown',
@@ -182,10 +239,16 @@ const COMMIT_KEYS = {};
 for (const id of Object.keys(COMMIT_ACTIONS)) {
   for (const key of COMMIT_ACTIONS[id]) COMMIT_KEYS[key] = id;
 }
+const NPM_KEYS = {
+  e: 'npmEdit',
+  n: 'npmNew',
+};
+FILES_KEYS.n = 'npm';
 const PANE_KEYS = {
   files: FILES_KEYS,
   branches: BRANCH_KEYS,
   commits: COMMIT_KEYS,
+  npm: NPM_KEYS,
 };
 
 for (const id of ACTION_IDS) {
@@ -194,10 +257,16 @@ for (const id of ACTION_IDS) {
 }
 
 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 actionFromKey = (key, pane, fileScope) => {
   const listPane =
-    pane === 'files' || pane === 'branches' || pane === 'commits';
+    pane === 'files' ||
+    pane === 'branches' ||
+    pane === 'commits' ||
+    pane === 'npm';
   if (listPane && (key === 'left' || key === 'right')) return null;
   const paneKeys = PANE_KEYS[pane];
   if (paneKeys && paneKeys[key]) return paneKeys[key];
@@ -209,7 +278,11 @@ const actionFromKey = (key, pane, fileScope) => {
 };
 
 const actionKeys = (id) =>
-  ACTIONS[id] ?? BRANCH_ACTIONS[id] ?? COMMIT_ACTIONS[id] ?? [];
+  ACTIONS[id] ??
+  BRANCH_ACTIONS[id] ??
+  COMMIT_ACTIONS[id] ??
+  NPM_ACTIONS[id] ??
+  [];
 
 const actionHot = (id) => ACTION_HOT[id] ?? actionKeys(id)[0];
 
@@ -301,6 +374,7 @@ module.exports = {
   ACTION_IDS,
   BRANCH_ACTIONS,
   COMMIT_ACTIONS,
+  NPM_ACTIONS,
   ACTION_HOT,
   ACTION_LABEL,
   DIFF_DISABLED,
@@ -312,12 +386,14 @@ module.exports = {
   TODO_DISABLED,
   BRANCHES_DISABLED,
   COMMITS_DISABLED,
+  NPM_DISABLED,
   SCROLL,
   PANE_ONLY,
   disabledActions,
   diffGitDisabled,
   branchGitDisabled,
   commitGitDisabled,
+  isFixupCommit,
   actionFromKey,
   actionKeys,
   actionHot,

package/lib/session/commit.js

@@ -3,12 +3,56 @@
 const { stateView } = require('./accessors.js');
 
 const { isReadOnlyOrigin } = require('../files.js');
+const { isFixupCommit } = require('./actions.js');
 const { pickRepoWrite } = require('./ops.js');
+const {
+  commitLine,
+  commitText,
+  splitMessage,
+} = require('../render/commits.js');
 
 const COMMIT_STATUS = {
   commit: 'committed',
   amend: 'amended',
   fixup: 'fixup',
+  reword: 'reworded',
+};
+
+const isInPlaceCommit = (kind) => kind === 'amend' || kind === 'reword';
+
+const PENDING_COMMIT = {
+  pending: true,
+  subject: 'uncommitted changes',
+  sha: '',
+  shortSha: '',
+  author: '',
+  email: '',
+  date: '',
+  when: '',
+  refs: '',
+  body: '',
+  head: false,
+};
+
+const listedCommits = (commits) => [PENDING_COMMIT].concat(commits ?? []);
+
+const isPending = (entry) => Boolean(entry && entry.pending);
+
+const briefCommit = (ui) => ui.commits.commitView !== 'full';
+
+const joinMessage = (line, rest) => (rest ? `${line}\n${rest}` : line);
+
+const keepBriefBody = (ui, text) => {
+  if (!briefCommit(ui)) return text;
+  const parts = splitMessage(text);
+  ui.composer.state.commitBody = parts.rest;
+  return parts.line;
+};
+
+const fixupMessage = (entry) => {
+  const subject = commitLine(entry).trim();
+  if (!subject) return 'fixup!';
+  return `fixup! ${subject}`;
 };
 
 const canCommit = (ui) => {
@@ -37,11 +81,11 @@ const hasStagedChanges = (ui) => {
 
 const selectedCommit = (api) => {
   const cursor = api.ui.nav.commitCursor;
-  return api.state.commits[cursor] ?? null;
+  return listedCommits(api.state.commits)[cursor] ?? null;
 };
 
 const clampCommitCursor = (api) => {
-  const last = api.state.commits.length - 1;
+  const last = listedCommits(api.state.commits).length - 1;
   const nav = api.ui.nav;
   if (nav.commitCursor > last) nav.commitCursor = Math.max(0, last);
 };
@@ -65,7 +109,6 @@ const refreshAfterWrite = (api, extra = {}) => {
 
 const showCommits = (api) => {
   if (api.ui.mode === 'compose') return;
-  if (!canCommit(api.ui)) return;
   const repo = api.ui.repo;
   if (!repo.listCommits) {
     api.ui.status = 'read only';
@@ -84,11 +127,8 @@ const showCommits = (api) => {
 };
 
 const onCommitMove = (api, delta) => {
-  const commits = api.state.commits;
-  if (!commits.length) {
-    api.ui.status = 'nothing to review';
-    return;
-  }
+  if (api.ui.mode === 'compose') return;
+  const commits = listedCommits(api.state.commits);
   const next = Math.min(
     commits.length - 1,
     Math.max(0, api.ui.nav.commitCursor + delta),
@@ -100,36 +140,114 @@ const onCommitMove = (api, delta) => {
 
 const startGitCommit = (api, kind) => {
   const ui = api.ui;
-  if (kind !== 'amend' && !hasStagedChanges(ui)) {
+  if (!isInPlaceCommit(kind) && !hasStagedChanges(ui)) {
     ui.mode = 'review';
     ui.composer.state.commitKind = null;
     ui.status = 'nothing to commit';
     return;
   }
-  ui.composer.state.commitKind = kind;
   let text = '';
-  if (kind === 'fixup') {
-    const entry = selectedCommit(api);
-    text = entry ? entry.shortSha || entry.sha : 'HEAD';
+  if (kind === 'fixup') text = fixupMessage(selectedCommit(api));
+  if (kind === 'commit') api.ui.nav.commitCursor = 0;
+  if (kind === 'amend') {
+    const headAt = api.state.commits.findIndex((entry) => entry.head);
+    const at = headAt < 0 ? 0 : headAt;
+    api.ui.nav.commitCursor = api.state.commits.length ? at + 1 : 0;
+    if (ui.repo.lastMessage) text = ui.repo.lastMessage(ui.top) ?? '';
   }
-  if (kind === 'amend' && ui.repo.lastMessage) {
-    text = ui.repo.lastMessage(ui.top) ?? '';
+  if (kind === 'reword') {
+    const entry = selectedCommit(api);
+    if (!entry || !entry.sha) return;
+    if (typeof ui.repo.commitMessage === 'function') {
+      text = ui.repo.commitMessage(ui.top, entry.sha) ?? '';
+    } else {
+      text = commitText(entry);
+    }
   }
+  ui.composer.state.commitBody = '';
+  if (isInPlaceCommit(kind)) text = keepBriefBody(ui, text);
+  ui.composer.state.commitKind = kind;
   ui.composer.openCompose('commit', text);
+  const editor = ui.composer.state.editor;
+  if (!editor) return;
+  const lineEnd = editor.text.indexOf('\n');
+  editor.cursor = lineEnd < 0 ? editor.text.length : lineEnd;
 };
 
 const onCommit = (api) => {
   if (api.ui.nav.pane !== 'commits') return void showCommits(api);
   if (!canCommit(api.ui)) return;
+  api.ui.nav.commitCursor = 0;
   startGitCommit(api, 'commit');
 };
 
+const showSelectedDiff = (api) => {
+  if (api.ui.mode === 'compose') return;
+  const entry = selectedCommit(api);
+  if (!entry) return;
+  const ui = api.ui;
+  if (isPending(entry) || !entry.sha) {
+    ui.rev = '';
+    ui.revShort = '';
+  } else {
+    ui.rev = entry.sha;
+    ui.revShort = entry.shortSha || '';
+  }
+  const openDiff = () => {
+    ui.nav.todoOpen = false;
+    ui.nav.scroll = 0;
+    ui.nav.index = 0;
+    ui.nav.pane = ui.items.length ? 'diff' : 'files';
+    ui.syncReviewPath();
+    ui.syncFileCursor();
+    ui.status = '';
+  };
+  ui.refreshFromRepo({ keepEmpty: true, afterLoad: openDiff });
+};
+
 const onAmend = (api) => {
   if (api.ui.nav.pane !== 'commits') return;
   if (!canCommit(api.ui)) return;
   startGitCommit(api, 'amend');
 };
 
+const onReword = (api) => {
+  if (api.ui.nav.pane !== 'commits') return;
+  if (!canCommit(api.ui)) return;
+  startGitCommit(api, 'reword');
+};
+
+const applyFixupNow = (api) => {
+  const entry = selectedCommit(api);
+  if (!entry || !entry.sha) return;
+  const done = 'applied';
+  const repo = api.ui.repo;
+  if (!repo.applyFixup) {
+    api.ui.status = 'read only';
+    return;
+  }
+  const picked = pickRepoWrite(repo, 'applyFixup', api.ui.uiOpen);
+  if (picked.async) {
+    const run = (top) => picked.write(top, entry.sha);
+    const after = () => refreshAfterWrite(api, { doneStatus: done });
+    return void api.ui.ops.runBusy('applying', done, run, after);
+  }
+  const ok = api.ui.ops.runRepo(done, (top) => {
+    repo.applyFixup(top, entry.sha);
+  });
+  if (!ok) return;
+  refreshAfterWrite(api);
+  if (!api.ui.status) api.ui.status = done;
+};
+
+const onApply = (api) => {
+  if (api.ui.nav.pane !== 'commits') return;
+  if (!canCommit(api.ui)) return;
+  const entry = selectedCommit(api);
+  if (isFixupCommit(entry)) return void applyFixupNow(api);
+  startGitCommit(api, 'amend');
+};
+
 const onFixup = (api) => {
   if (api.ui.nav.pane !== 'commits') return;
   if (!canCommit(api.ui)) return;
@@ -166,20 +284,55 @@ const finishSyncCommit = (api, kind, message, done) => {
   }
 };
 
+const finishReword = (api, message) => {
+  const ui = api.ui;
+  const entry = selectedCommit(api);
+  if (!entry || !entry.sha) {
+    ui.status = 'read only';
+    return;
+  }
+  const done = COMMIT_STATUS.reword;
+  const repo = ui.repo;
+  if (!repo.reword) {
+    ui.status = 'read only';
+    return;
+  }
+  const picked = pickRepoWrite(repo, 'reword', ui.uiOpen);
+  if (picked.async) {
+    ui.composer.closeCompose();
+    const run = (top) => picked.write(top, entry.sha, message);
+    const after = () => refreshAfterWrite(api, { doneStatus: done });
+    return void ui.ops.runBusy('rewording', done, run, after);
+  }
+  try {
+    repo.reword(ui.top, entry.sha, message);
+  } catch (error) {
+    ui.status = error.message;
+    return;
+  }
+  ui.composer.closeCompose();
+  refreshAfterWrite(api);
+  if (!ui.status) ui.status = done;
+};
+
 const finishGitCommit = (api) => {
   const ui = api.ui;
   const kind = ui.composer.state.commitKind;
   const editor = ui.composer.state.editor;
-  const message = editor ? editor.text : '';
-  if (kind !== 'fixup' && !message.trim()) {
+  let message = editor ? editor.text : '';
+  if (isInPlaceCommit(kind) && briefCommit(ui)) {
+    message = joinMessage(message, ui.composer.state.commitBody);
+  }
+  if (!message.trim()) {
     ui.status = 'empty commit message';
     return;
   }
-  if (kind !== 'amend' && !hasStagedChanges(ui)) {
+  if (!isInPlaceCommit(kind) && !hasStagedChanges(ui)) {
     ui.composer.closeCompose();
     ui.status = 'nothing to commit';
     return;
   }
+  if (kind === 'reword') return void finishReword(api, message);
   const done = COMMIT_STATUS[kind] ?? 'committed';
   const uiOpen = ui.uiOpen;
   const picked = pickRepoWrite(ui.repo, 'commit', uiOpen);
@@ -239,10 +392,19 @@ const confirmDropCommit = (api) => {
   if (!api.ui.status) api.ui.status = done;
 };
 
+const onView = (api) => {
+  if (api.ui.nav.pane !== 'commits') return;
+  const next = api.state.commitView === 'full' ? 'brief' : 'full';
+  api.state.commitView = next;
+  api.ui.nav.listScroll = 0;
+  api.ui.status = next;
+};
+
 const reset = (state) => {
   state.commits = [];
   state.dropName = '';
   state.dropSha = '';
+  state.commitView = 'brief';
 };
 
 const createCommitController = (ui) => {
@@ -250,6 +412,7 @@ const createCommitController = (ui) => {
     commits: [],
     dropName: '',
     dropSha: '',
+    commitView: 'brief',
   };
   const api = { ui, state };
   return stateView(
@@ -259,8 +422,12 @@ const createCommitController = (ui) => {
       canCommit: () => canCommit(ui),
       onCommit: () => onCommit(api),
       onAmend: () => onAmend(api),
+      onReword: () => onReword(api),
+      onApply: () => onApply(api),
       onFixup: () => onFixup(api),
       onCommitMove: (delta) => onCommitMove(api, delta),
+      onShowDiff: () => showSelectedDiff(api),
+      onView: () => onView(api),
       cancelCommit: () => cancelCommit(api),
       startGitCommit: (kind) => startGitCommit(api, kind),
       finishGitCommit: () => finishGitCommit(api),
@@ -269,11 +436,12 @@ const createCommitController = (ui) => {
       cancelDropCommit: () => cancelDropCommit(api),
       confirmDropCommit: () => confirmDropCommit(api),
     },
-    ['commits', 'dropName'],
+    ['commits', 'dropName', 'commitView'],
   );
 };
 
 module.exports = {
   COMMIT_STATUS,
   createCommitController,
+  listedCommits,
 };