reslop 0.2.1 → 0.2.4

package/lib/session/commit.js

@@ -1,10 +1,16 @@
 'use strict';
 
-const { stateView } = require('./accessors.js');
-
-const { isReadOnlyOrigin } = require('../files.js');
-const { isFixupCommit } = require('./actions.js');
-const { pickRepoWrite } = require('./ops.js');
+const accessors = require('./accessors.js');
+const { stateView } = accessors;
+
+const files = require('../files.js');
+const { isReadOnlyOrigin } = files;
+const actions = require('./actions.js');
+const { isFixupCommit } = actions;
+const ops = require('./ops.js');
+const { pickRepoWrite } = ops;
+const commits = require('../render/commits.js');
+const { commitLine, commitText, splitMessage } = commits;
 
 const COMMIT_STATUS = {
   commit: 'committed',
@@ -15,8 +21,37 @@ const COMMIT_STATUS = {
 
 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 = `${entry && entry.subject ? entry.subject : ''}`.trim();
+  const subject = commitLine(entry).trim();
   if (!subject) return 'fixup!';
   return `fixup! ${subject}`;
 };
@@ -47,11 +82,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);
 };
@@ -75,7 +110,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';
@@ -94,11 +128,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),
@@ -117,15 +148,13 @@ const startGitCommit = (api, kind) => {
     return;
   }
   let text = '';
-  if (kind === 'fixup') {
-    text = fixupMessage(selectedCommit(api));
-  }
+  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);
-    api.ui.nav.commitCursor = headAt < 0 ? 0 : headAt;
-    if (ui.repo.lastMessage) {
-      text = ui.repo.lastMessage(ui.top) ?? '';
-    }
+    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 === 'reword') {
     const entry = selectedCommit(api);
@@ -133,19 +162,56 @@ const startGitCommit = (api, kind) => {
     if (typeof ui.repo.commitMessage === 'function') {
       text = ui.repo.commitMessage(ui.top, entry.sha) ?? '';
     } else {
-      text = `${entry.subject ?? ''}`;
+      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 openLoadedDiff = (ui) => {
+  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 = '';
+};
+
+const showSelectedDiff = (api) => {
+  if (api.ui.mode === 'compose') return;
+  const entry = selectedCommit(api);
+  if (!entry) return;
+  const ui = api.ui;
+  const viewingCommit = Boolean(ui.rev || ui.revShort);
+  if (isPending(entry) && !viewingCommit) return void onCommit(api);
+  if (isPending(entry) || !entry.sha) {
+    ui.rev = '';
+    ui.revShort = '';
+  } else {
+    ui.rev = entry.sha;
+    ui.revShort = entry.shortSha || '';
+  }
+  ui.refreshFromRepo({
+    keepEmpty: true,
+    afterLoad: () => openLoadedDiff(ui),
+  });
+};
+
 const onAmend = (api) => {
   if (api.ui.nav.pane !== 'commits') return;
   if (!canCommit(api.ui)) return;
@@ -167,18 +233,9 @@ const applyFixupNow = (api) => {
     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;
+  api.ui.ops.runWrite('applyFixup', [entry.sha], 'applying', done, (extra) =>
+    refreshAfterWrite(api, extra),
+  );
 };
 
 const onApply = (api) => {
@@ -260,7 +317,10 @@ const finishGitCommit = (api) => {
   const ui = api.ui;
   const kind = ui.composer.state.commitKind;
   const editor = ui.composer.state.editor;
-  const message = editor ? editor.text : '';
+  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;
@@ -298,12 +358,6 @@ const cancelDropCommit = (api) => {
   api.ui.status = '';
 };
 
-const dropAsync = (api, sha, done, write) => {
-  const run = (top) => write(top, sha);
-  const after = () => refreshAfterWrite(api, { doneStatus: done });
-  return void api.ui.ops.runBusy('dropping', done, run, after);
-};
-
 const confirmDropCommit = (api) => {
   const sha = api.state.dropSha;
   const name = api.state.dropName;
@@ -317,23 +371,24 @@ const confirmDropCommit = (api) => {
     api.ui.status = 'read only';
     return;
   }
-  const uiOpen = api.ui.uiOpen;
-  const picked = pickRepoWrite(repo, 'dropCommit', uiOpen);
-  if (picked.async) {
-    return void dropAsync(api, sha, done, picked.write);
-  }
-  const ok = api.ui.ops.runRepo(done, (top) => {
-    repo.dropCommit(top, sha);
-  });
-  if (!ok) return;
-  refreshAfterWrite(api);
-  if (!api.ui.status) api.ui.status = done;
+  api.ui.ops.runWrite('dropCommit', [sha], 'dropping', done, (extra) =>
+    refreshAfterWrite(api, extra),
+  );
+};
+
+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) => {
@@ -341,6 +396,7 @@ const createCommitController = (ui) => {
     commits: [],
     dropName: '',
     dropSha: '',
+    commitView: 'brief',
   };
   const api = { ui, state };
   return stateView(
@@ -354,6 +410,8 @@ const createCommitController = (ui) => {
       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),
@@ -362,11 +420,13 @@ const createCommitController = (ui) => {
       cancelDropCommit: () => cancelDropCommit(api),
       confirmDropCommit: () => confirmDropCommit(api),
     },
-    ['commits', 'dropName'],
+    ['commits', 'dropName', 'commitView'],
   );
 };
 
 module.exports = {
   COMMIT_STATUS,
+  hasStagedChanges,
   createCommitController,
+  listedCommits,
 };

package/lib/session/compose.js

@@ -4,16 +4,24 @@ const wrap = require('../wrap.js');
 const { cursorInWrap, wrapDoc } = wrap;
 const render = require('../render/render.js');
 const { noteInnerWidth, codeInnerWidth, todoBodyWidth } = render;
-const { Editor } = require('../editor.js');
+const commits = require('../render/commits.js');
+const { commitMessageWidth } = commits;
+const commit = require('./commit.js');
+const { listedCommits } = commit;
+const editor = require('../editor.js');
+const { Editor } = editor;
 const files = require('../files.js');
 const { itemPath, isTodoItem, listPath, isReadOnlyOrigin } = files;
-const { blockAddText } = require('../diff/diff.js');
+const diff = require('../diff/diff.js');
+const { blockAddText } = diff;
 const items = require('./items.js');
 const { itemFeedKey, canEditCode } = items;
 const review = require('../review.js');
 const { setFeedback, setCode, checkLabel, rememberTemplate } = review;
-const { createTemplatePick } = require('./templates.js');
-const { createTodoCompose } = require('./todos.js');
+const templates = require('./templates.js');
+const { createTemplatePick } = templates;
+const todos = require('./todos.js');
+const { createTodoCompose } = todos;
 const unit = require('./unit.js');
 
 const COMPOSE_EDITS = ['backspace', 'delete', 'ctrl-z', 'ctrl-y'];
@@ -68,12 +76,21 @@ const KIND = {
     command: 'branch',
     view: 'note',
   },
+  npm: {
+    enter: 'save',
+    tab: 'insert-tab',
+    escape: 'cancel',
+    move: 'note',
+    command: 'npm',
+    view: 'note',
+  },
 };
 
 const initialState = () => ({
   editor: null,
   composeKind: null,
   commitKind: null,
+  commitBody: '',
   composeTodoId: null,
   composeBaseline: '',
   templateIndex: -1,
@@ -101,6 +118,16 @@ const tickBlink = (api) => {
 
 const viewSize = (api) => api.ui.lastSize ?? api.ui.getSize();
 
+const syncCodeScroll = (api) => {
+  const kind = api.state.composeKind;
+  if (kind !== 'code' && kind !== 'file') return;
+  const ed = api.state.editor;
+  if (!ed) return;
+  const size = viewSize(api);
+  const inner = codeInnerWidth(size.width, api.ui.layout);
+  ed.reveal(inner);
+};
+
 const followFileEdit = (api) => {
   if (api.state.composeKind !== 'file') return;
   const text = api.state.editor ? api.state.editor.text : null;
@@ -140,6 +167,7 @@ const closeCompose = (api) => {
   state.editor = null;
   state.composeKind = null;
   state.commitKind = null;
+  state.commitBody = '';
   state.composeTodoId = null;
   state.composeBaseline = '';
   state.fileOpened = '';
@@ -414,7 +442,9 @@ const codeOverlayView = (api) => {
     api.state.composeKind === 'code' || api.state.composeKind === 'file';
   const editor = api.state.editor;
   const cursor = editing && editor ? editor.cursor : null;
-  return { text, keepEmpty: editing, cursor };
+  const picked = editing && editor ? editor.scrollCol : 0;
+  const scrollCol = picked ?? 0;
+  return { text, keepEmpty: editing, cursor, scrollCol };
 };
 
 const idleNoteText = (api) => {
@@ -474,6 +504,22 @@ const moveNoteLine = (api, delta) => {
   api.state.editor.moveLine(delta, width);
 };
 
+const fullCommitEdit = (api) =>
+  api.state.composeKind === 'commit' && api.ui.commits.commitView === 'full';
+
+const editedCommitEntry = (api) => {
+  const kind = api.state.commitKind;
+  if (kind !== 'amend' && kind !== 'reword') return null;
+  const list = listedCommits(api.ui.commits.commits);
+  return list[api.nav.commitCursor] ?? null;
+};
+
+const moveCommitLine = (api, delta) => {
+  const size = viewSize(api);
+  const width = commitMessageWidth(editedCommitEntry(api), size.width);
+  api.state.editor.moveLine(delta, width);
+};
+
 const moveComposeLine = (api, delta) => {
   const spec = KIND[api.state.composeKind];
   const move = spec ? spec.move : 'note';
@@ -483,10 +529,10 @@ const moveComposeLine = (api, delta) => {
     return void api.todos.moveTodoCompose(delta, inner);
   }
   if (move === 'code') {
-    const size = viewSize(api);
-    const inner = codeInnerWidth(size.width, api.ui.layout);
-    return void api.state.editor.moveLine(delta, inner);
+    api.state.editor.moveLine(delta);
+    return void syncCodeScroll(api);
   }
+  if (fullCommitEdit(api)) return void moveCommitLine(api, delta);
   moveNoteLine(api, delta);
 };
 
@@ -552,6 +598,7 @@ const onUnitEdit = (api) => {
   openCompose(api, 'file', at.text);
   api.state.fileEditRows = at.rows ?? null;
   api.state.editor.cursor = Math.min(at.cursor, at.text.length);
+  syncCodeScroll(api);
   followFileEdit(api);
 };
 
@@ -573,6 +620,22 @@ const onCode = (api) => {
     : notes.code.get(itemFeedKey(item));
   const text = prev ? prev.text : original;
   openCompose(api, 'code', text);
+  syncCodeScroll(api);
+};
+
+const insertNewline = (api) => {
+  api.state.editor.insert('\n');
+  resetBlink(api);
+  followFileEdit(api);
+  return null;
+};
+
+const onEmptyLastLine = (editor) => {
+  if (!editor) return false;
+  const text = editor.text;
+  const lastBreak = text.lastIndexOf('\n');
+  if (editor.cursor < lastBreak + 1) return false;
+  return text.slice(lastBreak + 1).trim() === '';
 };
 
 const enterCompose = (api) => {
@@ -581,11 +644,10 @@ const enterCompose = (api) => {
     return api.templates.selectTemplate(state.templateIndex);
   }
   const spec = KIND[state.composeKind];
-  if (spec && spec.enter === 'newline') {
-    state.editor.insert('\n');
-    resetBlink(api);
-    followFileEdit(api);
-    return null;
+  if (spec && spec.enter === 'newline') return insertNewline(api);
+  if (fullCommitEdit(api)) {
+    if (onEmptyLastLine(state.editor)) return saveCompose(api);
+    return insertNewline(api);
   }
   if (spec && spec.enter === 'edit-next') {
     return saveCompose(api, { editNext: true });
@@ -624,7 +686,11 @@ const COMPOSE_SPECIAL = {
 };
 
 const handleKey = (api, key) => {
-  if (key === 'enter') return enterCompose(api);
+  if (key === 'enter') {
+    const result = enterCompose(api);
+    syncCodeScroll(api);
+    return result;
+  }
   if (key === 'escape' || key === 'ctrl-s') return leaveCompose(api, key);
   const special = COMPOSE_SPECIAL[key];
   if (special) {
@@ -632,6 +698,7 @@ const handleKey = (api, key) => {
     if (COMPOSE_EDITS.includes(key)) api.templates.clearTemplatePick();
     resetBlink(api);
     followFileEdit(api);
+    syncCodeScroll(api);
     return result ?? null;
   }
   if (!key.length) return null;
@@ -641,6 +708,7 @@ const handleKey = (api, key) => {
     api.state.editor.insert(key);
     resetBlink(api);
     followFileEdit(api);
+    syncCodeScroll(api);
   }
   return null;
 };
@@ -653,6 +721,7 @@ const applyDiskText = (api, text) => {
   api.state.editor.cursor = Math.min(cursor, text.length);
   api.state.composeBaseline = text;
   api.state.fileEditRows = unit.linesFor(api.ui, api.nav.reviewPath, null);
+  syncCodeScroll(api);
   followFileEdit(api);
 };
 

package/lib/session/dispatch.js

@@ -1,14 +1,17 @@
 'use strict';
 
 const compose = require('./compose.js');
+const commit = require('./commit.js');
+const { hasStagedChanges, listedCommits } = commit;
 const { COMPOSE_LEAVE } = compose;
 const actions = require('./actions.js');
-const { CONFIRM_MODE, disabledActions, actionFromKey, applyConfirm } = actions;
-
-const targetHasStaged = (session) => {
-  if (session.repo.hasStaged) return session.repo.hasStaged(session.top);
-  return session.items.some((item) => item.origin === 'staged');
-};
+const {
+  LIST_PANES,
+  CONFIRM_MODE,
+  disabledActions,
+  actionFromKey,
+  applyConfirm,
+} = actions;
 
 const currentTarget = (ui) => {
   if (ui.pane === 'files') return ui.fileCursorEntry();
@@ -16,10 +19,10 @@ const currentTarget = (ui) => {
     return ui.branches[ui.branchCursor];
   }
   if (ui.pane === 'commits') {
-    const entry = ui.commits.commits[ui.commitCursor];
-    const staged = targetHasStaged(ui);
-    if (!entry) return { canCommit: staged };
-    return { ...entry, canCommit: staged };
+    const entry = listedCommits(ui.commits.commits)[ui.commitCursor];
+    const staged = hasStagedChanges(ui);
+    const unstagedCurrent = !ui.rev && !ui.revShort;
+    return { ...entry, canCommit: staged, unstagedCurrent };
   }
   return ui.current();
 };
@@ -43,6 +46,7 @@ const createDispatcher = (ui) => {
     reword: ui.commits.onReword,
     apply: ui.commits.onApply,
     fixup: ui.commits.onFixup,
+    view: () => ui.commits.onView(),
     branch: ui.gitBranches.onBranch,
     pull: ui.gitBranches.onPull,
     push: ui.gitBranches.onPush,
@@ -57,8 +61,18 @@ const createDispatcher = (ui) => {
     open: ui.filesPane.onOpenFile,
     file: ui.filesPane.onFileScope,
     diff: ui.filesPane.onDiffScope,
+    npm: ui.npm.open,
+    npmEdit: ui.npm.edit,
+    npmNew: ui.npm.create,
+    npmDrop: () => ui.npm.askDrop(),
+    npmLogs: () => ui.npm.askLogs(),
+    npmStop: () => ui.npm.closeView(),
+    npmRerun: () => ui.npm.rerun(),
     check: () => ui.composer.toggleFocusedTodo(),
-    removeTodo: ui.composer.removeFocusedTodo,
+    removeTodo: () => {
+      if (ui.pane === 'npm') return void ui.npm.askDrop();
+      ui.composer.removeFocusedTodo();
+    },
     quit: () => ui.onQuit(),
     scrollUp: () => ui.filesPane.onScroll(-1),
     scrollDown: () => ui.filesPane.onScroll(1),
@@ -78,17 +92,9 @@ const createDispatcher = (ui) => {
       if (result && result.kind === 'error') return;
     }
     const pane = ui.pane;
-    if (pane === 'files') {
-      if (action === 'next') return void ui.filesPane.onFileMove(1);
-      if (action === 'prev') return void ui.filesPane.onFileMove(-1);
-    }
-    if (pane === 'branches') {
-      if (action === 'next') return void ui.gitBranches.onBranchMove(1);
-      if (action === 'prev') return void ui.gitBranches.onBranchMove(-1);
-    }
-    if (pane === 'commits') {
-      if (action === 'next') return void ui.commits.onCommitMove(1);
-      if (action === 'prev') return void ui.commits.onCommitMove(-1);
+    if (LIST_PANES.includes(pane) && (action === 'next' || action === 'prev')) {
+      ui.filesPane.onScroll(action === 'next' ? 1 : -1);
+      return;
     }
     const hidden = disabledActions(pane, currentTarget(ui));
     if (hidden.includes(action)) return;
@@ -113,12 +119,14 @@ const createInput = (ui) => {
     },
     confirmDrop: {
       confirm: () => {
+        if (ui.npm.dropName) return void ui.npm.confirmDrop();
         if (ui.commits.dropName) {
           return void ui.commits.confirmDropCommit();
         }
         ui.gitBranches.confirmDropBranch();
       },
       cancel: () => {
+        if (ui.npm.dropName) return void ui.npm.cancelDrop();
         if (ui.commits.dropName) {
           return void ui.commits.cancelDropCommit();
         }
@@ -145,6 +153,18 @@ const createInput = (ui) => {
       const command = ui.composer.handleKey(key);
       return void ui.runComposeCommand(command);
     }
+    if (ui.pane === 'npm' && ui.npm.viewing) {
+      if (key === 'escape') return void ui.npm.closeView();
+      if (key === 'r') return void ui.npm.rerun();
+      if (key === 'e' || key === 'n') return;
+    }
+    if (ui.pane === 'npm' && key === 'ctrl-up') return void ui.npm.reorder(-1);
+    if (ui.pane === 'npm' && key === 'ctrl-down') {
+      return void ui.npm.reorder(1);
+    }
+    if (ui.pane === 'npm' && (key === 'up' || key === 'down')) {
+      return void ui.npm.move(key === 'up' ? -1 : 1);
+    }
     if (key === 'escape') return void ui.filesPane.onEscape();
     const toggle = key === 'x' || key === ' ';
     if (toggle && ui.composer.toggleFocusedTodo()) return;