reslop 0.1.8 → 0.2.0

package/lib/session/dispatch.js

@@ -5,56 +5,88 @@ const { COMPOSE_LEAVE } = compose;
 const actions = require('./actions.js');
 const { CONFIRM_MODE, disabledActions, actionFromKey, applyConfirm } = actions;
 
-const createDispatcher = (options) => {
+const targetHasStaged = (session) => {
+  if (session.repo.hasStaged) return session.repo.hasStaged(session.top);
+  return session.items.some((item) => item.origin === 'staged');
+};
+
+const currentTarget = (ui) => {
+  if (ui.pane === 'files') return ui.fileCursorEntry();
+  if (ui.pane === 'branches') {
+    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 };
+  }
+  return ui.current();
+};
+
+const createDispatcher = (ui) => {
   const handlers = {
-    add: options.changeActions.onAdd,
-    unstage: options.changeActions.onUnstage,
-    revert: options.changeActions.onRevert,
-    next: options.onNext,
-    prev: options.onPrev,
-    layout: options.onLayout,
-    files: options.onFiles,
-    feedback: options.composer.onFeedback,
-    todo: options.composer.onTodo,
-    code: options.composer.onCode,
-    reload: options.onReload,
-    commit: options.commits.onCommit,
-    branch: options.gitBranches.onBranch,
-    pull: options.gitBranches.onPull,
-    push: options.gitBranches.onPush,
-    newBranch: options.gitBranches.onNewBranch,
-    rebase: options.gitBranches.onRebaseBranch,
-    drop: options.gitBranches.onDropBranch,
-    open: options.onOpenFile,
-    removeTodo: options.composer.removeFocusedTodo,
-    quit: options.onQuit,
-    scrollUp: () => options.onScroll(-1),
-    scrollDown: () => options.onScroll(1),
-    pageUp: () => options.onScroll(options.scrollStep(-1)),
-    pageDown: () => options.onScroll(options.scrollStep(1)),
-    halfUp: () => options.onScroll(options.scrollStep(-0.5)),
-    halfDown: () => options.onScroll(options.scrollStep(0.5)),
-    home: options.onHome,
-    end: options.onEnd,
+    add: ui.changeActions.onAdd,
+    unstage: ui.changeActions.onUnstage,
+    revert: ui.changeActions.onRevert,
+    next: ui.filesPane.onNext,
+    prev: ui.filesPane.onPrev,
+    layout: ui.filesPane.onLayout,
+    files: ui.filesPane.onFiles,
+    feedback: ui.composer.onFeedback,
+    todo: ui.composer.onTodo,
+    code: ui.composer.onCode,
+    reload: ui.lifecycle.onReload,
+    commit: ui.commits.onCommit,
+    amend: ui.commits.onAmend,
+    fixup: ui.commits.onFixup,
+    branch: ui.gitBranches.onBranch,
+    pull: ui.gitBranches.onPull,
+    push: ui.gitBranches.onPush,
+    newBranch: ui.gitBranches.onNewBranch,
+    rebase: ui.gitBranches.onRebaseBranch,
+    drop: () => {
+      if (ui.pane === 'commits') {
+        return void ui.commits.onDropCommit();
+      }
+      ui.gitBranches.onDropBranch();
+    },
+    open: ui.filesPane.onOpenFile,
+    file: ui.filesPane.onFileScope,
+    diff: ui.filesPane.onDiffScope,
+    removeTodo: ui.composer.removeFocusedTodo,
+    quit: () => ui.onQuit(),
+    scrollUp: () => ui.filesPane.onScroll(-1),
+    scrollDown: () => ui.filesPane.onScroll(1),
+    pageUp: () => ui.filesPane.onScroll(ui.filesPane.scrollStep(-1)),
+    pageDown: () => ui.filesPane.onScroll(ui.filesPane.scrollStep(1)),
+    halfUp: () => ui.filesPane.onScroll(ui.filesPane.scrollStep(-0.5)),
+    halfDown: () => ui.filesPane.onScroll(ui.filesPane.scrollStep(0.5)),
+    home: ui.filesPane.onHome,
+    end: ui.filesPane.onEnd,
   };
 
   const dispatch = (action) => {
-    if (CONFIRM_MODE.includes(options.getMode())) return;
-    if (options.getMode() === 'compose') {
+    if (CONFIRM_MODE.includes(ui.mode)) return;
+    if (ui.mode === 'compose') {
       if (!COMPOSE_LEAVE.includes(action)) return;
-      const result = options.composer.saveCompose();
+      const result = ui.composer.saveCompose();
       if (result && result.kind === 'error') return;
     }
-    const pane = options.getPane();
+    const pane = ui.pane;
     if (pane === 'files') {
-      if (action === 'next') return void options.onFileMove(1);
-      if (action === 'prev') return void options.onFileMove(-1);
+      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 options.onBranchMove(1);
-      if (action === 'prev') return void options.onBranchMove(-1);
+      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);
     }
-    const hidden = disabledActions(pane, options.currentTarget());
+    const hidden = disabledActions(pane, currentTarget(ui));
     if (hidden.includes(action)) return;
     const handler = handlers[action];
     if (!handler) return;
@@ -64,39 +96,61 @@ const createDispatcher = (options) => {
   return { dispatch, handlers };
 };
 
-const createInput = (options) => {
+const createInput = (ui) => {
   const confirmations = {
-    confirmQuit: options.quit,
-    confirmCommit: options.commit,
-    confirmUpdate: options.update,
-    confirmDrop: options.drop,
-    confirmPush: options.push,
+    confirmQuit: {
+      ready: () => ui.finishQuit('ready'),
+      editing: () => ui.finishQuit('editing'),
+      cancel: () => ui.cancelQuit(),
+    },
+    confirmUpdate: {
+      accept: ui.updater.accept,
+      decline: ui.updater.decline,
+    },
+    confirmDrop: {
+      confirm: () => {
+        if (ui.commits.dropName) {
+          return void ui.commits.confirmDropCommit();
+        }
+        ui.gitBranches.confirmDropBranch();
+      },
+      cancel: () => {
+        if (ui.commits.dropName) {
+          return void ui.commits.cancelDropCommit();
+        }
+        ui.gitBranches.cancelDropBranch();
+      },
+    },
+    confirmPush: {
+      force: ui.gitBranches.onForcePush,
+      cancel: ui.gitBranches.cancelPush,
+    },
   };
 
   const confirmChoice = (key) => {
-    const mode = options.getMode();
+    const mode = ui.mode;
     if (!CONFIRM_MODE.includes(mode)) return;
     applyConfirm(mode, key, confirmations[mode]);
   };
 
   const handleKey = (key) => {
-    const mode = options.getMode();
+    const mode = ui.mode;
     if (CONFIRM_MODE.includes(mode)) return void confirmChoice(key);
     if (mode === 'compose') {
-      if (key === 'ctrl-c') return void options.onQuit();
-      const command = options.composer.handleKey(key);
-      return void options.runComposeCommand(command);
+      if (key === 'ctrl-c') return void ui.onQuit();
+      const command = ui.composer.handleKey(key);
+      return void ui.runComposeCommand(command);
     }
-    if (key === 'escape') return void options.onEscape();
-    if (options.composer.typeIntoTodo(key)) return;
-    const action = actionFromKey(key, options.getPane());
-    if (action) options.dispatch(action);
+    if (key === 'escape') return void ui.filesPane.onEscape();
+    if (ui.composer.typeIntoTodo(key)) return;
+    const action = actionFromKey(key, ui.pane, ui.fileScope);
+    if (action) ui.dispatch(action);
   };
 
   const handleEvent = (event) => {
     if (event.type === 'key') return void handleKey(event.key);
     if (event.type !== 'mouse') return;
-    options.pointer.handle(event);
+    ui.pointer.handle(event);
   };
 
   return { handleEvent, confirmChoice };

package/lib/session/files-pane.js

@@ -2,146 +2,147 @@
 
 const files = require('../files.js');
 const { isTodosEntry, TODO_FILE } = files;
+const unit = require('./unit.js');
+const { setFileScope, openUnitFile, moveUnitBlock } = unit;
 
 const LAYOUTS = ['unified', 'mixed', 'side'];
 
-const current = (options) =>
-  options.nav.current(options.items(), options.todoItem());
+const current = (ui) => ui.nav.current(ui.items, ui.todoItem);
 
-const clampIndex = (options) => options.nav.clampIndex(options.items().length);
+const clampIndex = (ui) => ui.nav.clampIndex(ui.items.length);
 
-const syncReviewPath = (options) =>
-  options.nav.syncReviewPath(current(options));
+const syncReviewPath = (ui) => ui.nav.syncReviewPath(current(ui));
 
-const clampFileCursor = (options) =>
-  options.nav.clampFileCursor(options.fileList().length);
+const clampFileCursor = (ui) => ui.nav.clampFileCursor(ui.fileList().length);
 
-const followReviewPath = (options) =>
-  options.nav.followReviewPath(options.fileList(), current(options));
+const followReviewPath = (ui) =>
+  ui.nav.followReviewPath(ui.fileList(), current(ui));
 
-const syncFileCursor = (options) => {
-  if (options.nav.pane === 'files') {
-    clampFileCursor(options);
-    return;
-  }
-  followReviewPath(options);
+const syncFileCursor = (ui) => {
+  if (ui.nav.pane === 'files') return void clampFileCursor(ui);
+  followReviewPath(ui);
 };
 
-const showFiles = (options) => {
-  options.nav.pane = 'files';
-  options.nav.clearSelection();
-  followReviewPath(options);
-  options.nav.todoOpen = false;
+const showFiles = (ui) => {
+  ui.nav.pane = 'files';
+  ui.nav.clearSelection();
+  followReviewPath(ui);
+  ui.nav.todoOpen = false;
 };
 
-const onEscape = (options) => {
-  if (options.nav.pane === 'branches') {
-    showFiles(options);
-    return;
-  }
-  if (options.nav.pane === 'files') {
-    options.onQuit();
-    return;
+const onEscape = (ui) => {
+  if (ui.nav.pane === 'branches' || ui.nav.pane === 'commits') {
+    return void showFiles(ui);
   }
-  showFiles(options);
+  if (ui.nav.pane === 'files') return void ui.onQuit();
+  showFiles(ui);
 };
 
-const onFiles = (options) => {
-  if (options.nav.pane === 'files') {
-    if (!options.nav.reviewPath) return;
-    options.nav.pane = 'diff';
-    options.nav.clearSelection();
-    if (options.nav.reviewPath === TODO_FILE) options.composer.openTodoPage();
+const onFiles = (ui) => {
+  if (ui.nav.pane === 'files') {
+    if (!ui.nav.reviewPath) return;
+    if (ui.nav.fileScope === 'file') {
+      const list = ui.fileList();
+      const entry = list[ui.nav.fileCursor];
+      if (entry && !isTodosEntry(entry)) openUnitFile(ui, entry);
+      return;
+    }
+    ui.nav.pane = 'diff';
+    ui.nav.clearSelection();
+    if (ui.nav.reviewPath === TODO_FILE) ui.composer.openTodoPage();
     return;
   }
-  showFiles(options);
+  showFiles(ui);
 };
 
-const onOpenFile = (options) => {
-  if (options.nav.pane === 'branches') {
-    return void options.onCheckoutBranch();
+const onOpenFile = (ui) => {
+  if (ui.nav.pane === 'branches') {
+    return void ui.gitBranches.onCheckoutBranch();
   }
-  if (options.nav.pane !== 'files') {
-    if (options.nav.todoOpen) options.composer.editFocusedTodo();
+  if (ui.nav.pane === 'commits') return;
+  if (ui.nav.pane !== 'files') {
+    if (ui.nav.todoOpen) ui.composer.editFocusedTodo();
     return;
   }
-  const list = options.fileList();
-  const entry = list[options.nav.fileCursor];
+  const list = ui.fileList();
+  const entry = list[ui.nav.fileCursor];
   if (!entry) return;
   if (isTodosEntry(entry)) {
-    options.composer.openTodoPage();
-    options.setStatus('');
+    ui.composer.openTodoPage();
+    ui.status = '';
     return;
   }
-  options.nav.todoOpen = false;
-  options.nav.index = entry.openIndex ?? entry.firstIndex;
-  options.nav.pane = 'diff';
-  options.nav.scroll = 0;
-  options.setStatus('');
-  options.nav.clearSelection();
-  syncReviewPath(options);
+  ui.nav.todoOpen = false;
+  ui.nav.index = entry.openIndex ?? entry.firstIndex;
+  if (ui.nav.fileScope === 'file') {
+    return void openUnitFile(ui, entry);
+  }
+  ui.nav.pane = 'diff';
+  ui.nav.scroll = 0;
+  ui.status = '';
+  ui.nav.clearSelection();
+  syncReviewPath(ui);
 };
 
-const onFileMove = (options, delta) => {
-  const list = options.fileList();
+const onFileMove = (ui, delta) => {
+  const list = ui.fileList();
   if (!list.length) {
-    options.setStatus('nothing to review');
+    ui.status = 'nothing to review';
     return;
   }
   const last = list.length - 1;
-  const moved = options.nav.fileCursor + delta;
+  const moved = ui.nav.fileCursor + delta;
   const next = Math.min(last, Math.max(0, moved));
-  if (next === options.nav.fileCursor) return;
-  options.nav.fileCursor = next;
+  if (next === ui.nav.fileCursor) return;
+  ui.nav.fileCursor = next;
   const entry = list[next];
   if (isTodosEntry(entry)) {
-    options.nav.reviewPath = TODO_FILE;
+    ui.nav.reviewPath = TODO_FILE;
   } else {
-    options.nav.reviewPath = entry.path;
-    options.nav.index = entry.firstIndex;
+    ui.nav.reviewPath = entry.path;
+    ui.nav.index = entry.firstIndex;
   }
-  options.setStatus('');
+  ui.status = '';
 };
 
-const moveRemaining = (options, step) => {
-  const list = options.items();
+const moveRemaining = (ui, step) => {
+  const list = ui.items;
   if (!list.length) {
-    options.setStatus('nothing to review');
+    ui.status = 'nothing to review';
     return;
   }
-  const next = options.nav.index + step;
+  const next = ui.nav.index + step;
   if (next < 0 || next >= list.length) return;
-  options.nav.index = next;
-  options.nav.scroll = 0;
-  options.setStatus('');
-  options.nav.clearSelection();
-  syncReviewPath(options);
+  ui.nav.index = next;
+  ui.nav.scroll = 0;
+  ui.status = '';
+  ui.nav.clearSelection();
+  syncReviewPath(ui);
 };
 
-const onNext = (options) => {
-  if (options.nav.todoOpen) {
-    options.composer.closeTodoPage();
-    if (options.items().length) options.nav.index = 0;
-    options.nav.scroll = 0;
-    syncReviewPath(options);
-    syncFileCursor(options);
+const onNext = (ui) => {
+  if (ui.nav.pane === 'unit') return void moveUnitBlock(ui, 1);
+  if (ui.nav.todoOpen) {
+    ui.composer.closeTodoPage();
+    if (ui.items.length) ui.nav.index = 0;
+    ui.nav.scroll = 0;
+    syncReviewPath(ui);
+    syncFileCursor(ui);
     return;
   }
-  moveRemaining(options, 1);
+  moveRemaining(ui, 1);
 };
 
-const onPrev = (options) => {
-  if (options.nav.todoOpen) return;
-  if (options.nav.index <= 0) {
-    options.composer.openTodoPage();
-    return;
-  }
-  moveRemaining(options, -1);
+const onPrev = (ui) => {
+  if (ui.nav.pane === 'unit') return void moveUnitBlock(ui, -1);
+  if (ui.nav.todoOpen) return;
+  if (ui.nav.index <= 0) return void ui.composer.openTodoPage();
+  moveRemaining(ui, -1);
 };
 
-const scrollStep = (options, fraction) => {
-  const frame = options.lastFrame();
-  const size = options.getSize();
+const scrollStep = (ui, fraction) => {
+  const frame = ui.lastFrame;
+  const size = ui.lastSize ?? ui.getSize();
   const rows = size.height ?? 24;
   const fallback = Math.max(1, rows - 4);
   const bodyH = frame?.bodyH ?? fallback;
@@ -152,83 +153,85 @@ const scrollStep = (options, fraction) => {
   return n;
 };
 
-const onScroll = (options, delta) => {
-  if (options.nav.pane === 'files') return void onFileMove(options, delta);
-  if (options.nav.pane === 'branches') {
-    return void options.onBranchMove(delta);
+const onScroll = (ui, delta) => {
+  if (ui.nav.pane === 'files') return void onFileMove(ui, delta);
+  if (ui.nav.pane === 'branches') {
+    return void ui.gitBranches.onBranchMove(delta);
   }
-  if (options.nav.todoOpen && options.composer.todoRowCount() > 1) {
-    return void options.composer.moveTodoFocus(delta);
+  if (ui.nav.pane === 'commits') {
+    return void ui.commits.onCommitMove(delta);
   }
-  const frame = options.lastFrame();
+  if (ui.nav.todoOpen && ui.composer.todoRowCount() > 1) {
+    return void ui.composer.moveTodoFocus(delta);
+  }
+  const frame = ui.lastFrame;
   const max = frame ? frame.scrollMax : null;
-  const scroll = options.nav.scroll;
+  const scroll = ui.nav.scroll;
   const current = max === null ? scroll : Math.min(scroll, max);
   const moved = current + delta;
   const next = max === null ? moved : Math.min(max, moved);
-  options.nav.scroll = Math.max(0, next);
-  options.nav.clearSelection();
+  ui.nav.scroll = Math.max(0, next);
+  ui.nav.clearSelection();
 };
 
-const onJump = (options, toEnd) => {
-  if (options.nav.pane === 'files') {
-    const list = options.fileList();
+const onJump = (ui, toEnd) => {
+  if (ui.nav.pane === 'files') {
+    const list = ui.fileList();
     if (!list.length) {
-      options.setStatus('nothing to review');
+      ui.status = 'nothing to review';
       return;
     }
     const target = toEnd ? list.length - 1 : 0;
-    onFileMove(options, target - options.nav.fileCursor);
-    return;
+    return void onFileMove(ui, target - ui.nav.fileCursor);
   }
-  if (options.nav.pane === 'branches') {
+  if (ui.nav.pane === 'branches') {
     const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
-    options.onBranchMove(delta);
-    return;
+    return void ui.gitBranches.onBranchMove(delta);
+  }
+  if (ui.nav.pane === 'commits') {
+    const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
+    return void ui.commits.onCommitMove(delta);
   }
-  if (options.nav.todoOpen && options.composer.todoRowCount() > 0) {
-    const last = options.composer.todoRowCount() - 1;
+  if (ui.nav.todoOpen && ui.composer.todoRowCount() > 0) {
+    const last = ui.composer.todoRowCount() - 1;
     const target = toEnd ? last : 0;
-    const at = options.composer.clampedTodoFocus();
-    options.composer.moveTodoFocus(target - at);
-    return;
+    const at = ui.composer.clampedTodoFocus();
+    return void ui.composer.moveTodoFocus(target - at);
   }
-  const frame = options.lastFrame();
+  const frame = ui.lastFrame;
   const max = frame ? frame.scrollMax : 0;
-  options.nav.scroll = toEnd ? max : 0;
-  options.nav.clearSelection();
+  ui.nav.scroll = toEnd ? max : 0;
+  ui.nav.clearSelection();
 };
 
-const onLayout = (options) => {
-  const i = LAYOUTS.indexOf(options.layout());
+const onLayout = (ui) => {
+  const i = LAYOUTS.indexOf(ui.layout);
   const next = (i < 0 ? 0 : i + 1) % LAYOUTS.length;
-  options.setLayout(LAYOUTS[next]);
+  ui.layout = LAYOUTS[next];
   const name = LAYOUTS[next] === 'side' ? 'side-by-side' : LAYOUTS[next];
-  options.setStatus(name);
-  options.nav.scroll = 0;
-  options.nav.clearSelection();
+  ui.status = name;
+  ui.nav.scroll = 0;
+  ui.nav.clearSelection();
 };
 
-const createFilesPane = (options) => ({
-  current: () => current(options),
-  clampIndex: () => clampIndex(options),
-  syncReviewPath: () => syncReviewPath(options),
-  clampFileCursor: () => clampFileCursor(options),
-  followReviewPath: () => followReviewPath(options),
-  syncFileCursor: () => syncFileCursor(options),
-  showFiles: () => showFiles(options),
-  onEscape: () => onEscape(options),
-  onFiles: () => onFiles(options),
-  onOpenFile: () => onOpenFile(options),
-  onFileMove: (delta) => onFileMove(options, delta),
-  moveRemaining: (step) => moveRemaining(options, step),
-  onNext: () => onNext(options),
-  onPrev: () => onPrev(options),
-  scrollStep: (fraction) => scrollStep(options, fraction),
-  onScroll: (delta) => onScroll(options, delta),
-  onHome: () => onJump(options, false),
-  onEnd: () => onJump(options, true),
-  onLayout: () => onLayout(options),
+const createFilesPane = (ui) => ({
+  clampIndex: () => clampIndex(ui),
+  syncReviewPath: () => syncReviewPath(ui),
+  syncFileCursor: () => syncFileCursor(ui),
+  showFiles: () => showFiles(ui),
+  onEscape: () => onEscape(ui),
+  onFiles: () => onFiles(ui),
+  onOpenFile: () => onOpenFile(ui),
+  onFileMove: (delta) => onFileMove(ui, delta),
+  onNext: () => onNext(ui),
+  onPrev: () => onPrev(ui),
+  scrollStep: (fraction) => scrollStep(ui, fraction),
+  onScroll: (delta) => onScroll(ui, delta),
+  onHome: () => onJump(ui, false),
+  onEnd: () => onJump(ui, true),
+  onLayout: () => onLayout(ui),
+  onFileScope: () => setFileScope(ui, 'file'),
+  onDiffScope: () => setFileScope(ui, 'diff'),
 });
 
 module.exports = { LAYOUTS, createFilesPane };