reslop 0.1.9 → 0.2.1

package/lib/session/files-pane.js

@@ -1,148 +1,154 @@
 'use strict';
 
+const ansi = require('../ansi.js');
 const files = require('../files.js');
+const { THEME_NAMES, setTheme, themeName } = ansi;
 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) => {
+  const nav = ui.nav;
+  const held =
+    nav.todoOpen === true || nav.pane === 'branches' || nav.pane === 'commits';
+  nav.pane = 'files';
+  nav.clearSelection();
+  followReviewPath(ui);
+  nav.todoOpen = false;
+  if (held) ui.lifecycle.catchUpWatch();
 };
 
-const onEscape = (options) => {
-  if (options.nav.pane === 'branches' || options.nav.pane === 'commits') {
-    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 === 'commits') return;
-  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;
@@ -153,91 +159,93 @@ 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.pane === 'commits') {
-    return void options.onCommitMove(delta);
+  if (ui.nav.pane === 'commits') {
+    return void ui.commits.onCommitMove(delta);
   }
-  if (options.nav.todoOpen && options.composer.todoRowCount() > 1) {
-    return void options.composer.moveTodoFocus(delta);
+  if (ui.nav.todoOpen && ui.composer.todoRowCount() > 1) {
+    return void ui.composer.moveTodoFocus(delta);
   }
-  const frame = options.lastFrame();
+  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 (options.nav.pane === 'commits') {
+  if (ui.nav.pane === 'commits') {
     const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
-    options.onCommitMove(delta);
-    return;
+    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 onTheme = (ui) => {
+  const i = THEME_NAMES.indexOf(themeName());
+  const next = THEME_NAMES[(i + 1) % THEME_NAMES.length];
+  setTheme(next);
+  ui.status = next;
 };
 
-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),
+  onTheme: () => onTheme(ui),
+  onFileScope: () => setFileScope(ui, 'file'),
+  onDiffScope: () => setFileScope(ui, 'diff'),
 });
 
 module.exports = { LAYOUTS, createFilesPane };

package/lib/session/items.js

@@ -1,9 +1,11 @@
 'use strict';
 
+const { stateView } = require('./accessors.js');
+
 const files = require('../files.js');
 const { itemPath, TODO_FILE, isTodoItem } = files;
 const { feedbackKey } = require('../review.js');
-const { refreshIndexPatches } = require('../diff.js');
+const { refreshIndexPatches } = require('../diff/diff.js');
 
 const depChangeKey = (item) => {
   const change = item.dep && item.dep.change;
@@ -74,12 +76,10 @@ const takeBucket = (map, key, used) => {
   return null;
 };
 
-const pathOf = (item) => itemPath(item) || '';
-
 const groupByPath = (items) => {
   const groups = new Map();
   for (const item of items) {
-    const rel = pathOf(item);
+    const rel = itemPath(item) || '';
     const list = groups.get(rel) ?? [];
     list.push(item);
     groups.set(rel, list);
@@ -225,18 +225,15 @@ const createItemCollection = () => {
     state.dismissed.clear();
   };
 
-  const findIndexByKey = (key) => {
-    if (!key) return -1;
-    return state.items.findIndex((item) => itemKey(item) === key);
-  };
-
   const findRestoredIndex = (item) => restoredIndex(state.items, item);
 
   const keepOrigin = (item, origin) => {
     const next = { ...item, origin };
-    const replaced = [];
-    for (const entry of state.items) {
-      replaced.push(sameBlock(entry, item) ? next : entry);
+    const { length } = state.items;
+    const replaced = new Array(length);
+    for (let i = 0; i < length; i++) {
+      const entry = state.items[i];
+      replaced[i] = sameBlock(entry, item) ? next : entry;
     }
     if (next.dep) {
       state.items = replaced;
@@ -245,25 +242,20 @@ const createItemCollection = () => {
     state.items = refreshIndexPatches(replaced, next);
   };
 
-  return {
-    get items() {
-      return state.items;
+  return stateView(
+    state,
+    {
+      reset,
+      replace,
+      dismiss,
+      clearDismissed,
+      isDismissed,
+      findRestoredIndex,
+      keepOrigin,
     },
-    set items(value) {
-      state.items = value;
-    },
-    get dismissed() {
-      return state.dismissed;
-    },
-    reset,
-    replace,
-    dismiss,
-    clearDismissed,
-    isDismissed,
-    findIndexByKey,
-    findRestoredIndex,
-    keepOrigin,
-  };
+    ['items'],
+    ['dismissed'],
+  );
 };
 
 module.exports = {