reslop 0.1.1 → 0.1.2

package/lib/session.js

@@ -16,7 +16,7 @@ const { refreshIndexPatches } = require('./diff.js');
 const { renderFrame, presentRows, presentCursor } = render;
 const { noteInnerWidth, todoInnerWidth } = render;
 const { QUIT_FINISH, QUIT_CONTINUE } = render;
-const { actionFromKey, hitAction, decodeChunk, mouseKind } = keys;
+const { actionFromKey, hitAction, decodeChunk } = keys;
 const { FILES_DISABLED } = keys;
 const { cursorInWrap, wrapDoc, wrapMove } = wrap;
 const { AUTOSAVE_MS, listReviewNames, loadTemplates } = review;
@@ -28,20 +28,13 @@ const { feedbackKey, checkLabel, rankedTemplates } = review;
 const { prefixTemplates, TEMPLATE_SHOW, rememberTemplate } = review;
 
 const LAYOUTS = ['unified', 'mixed', 'side'];
-const FILES_MOVE = {
-  next: 1,
-  prev: -1,
-};
-const ADD_STATUS = {
-  staged: 'already staged',
-};
 const READ_ONLY_ORIGINS = ['commit', 'pr'];
 const ENTER_TERM = '\x1b[?1049h\x1b[?25l\x1b[?7l\x1b[?1002h\x1b[?1006h';
 const LEAVE_TERM =
   '\x1b[?1006l\x1b[?1002l\x1b[?7h\x1b[0 q\x1b[?12l\x1b[?25h\x1b[?1049l';
 const CURSOR_BLINK_MS = 500;
 
-const layoutStatus = (id) => (id === 'side' ? 'side-by-side' : id);
+const systemNow = () => new Date();
 
 const isReadOnlyOrigin = (origin) => READ_ONLY_ORIGINS.includes(origin);
 
@@ -53,11 +46,21 @@ const relabelStatus = (entries, from, to) => {
   });
 };
 
+const depChangeKey = (item) => {
+  const change = item.dep && item.dep.change;
+  if (!change) return '';
+  return `${change.section}/${change.name}`;
+};
+
+const needsReload = (item) => item.reload === true;
+
 const itemKey = (item) => {
   if (!item || !item.file) return '';
   const rel = itemPath(item);
   if (item.origin === 'todo') return `todo:${rel}`;
   const origin = item.origin ?? '';
+  const depId = depChangeKey(item);
+  if (depId) return `${origin}:${rel}:dep:${depId}`;
   if (!item.hunk) {
     const block = item.blockId ?? '-';
     return `${origin}:${rel}:file:${block}`;
@@ -71,12 +74,12 @@ const itemKey = (item) => {
 const itemFeedKey = (item) => {
   if (!item || !item.file || item.origin === 'todo') return '';
   const hunk = item.hunk;
-  return feedbackKey({
-    file: itemPath(item),
-    oldStart: hunk ? hunk.oldStart : 0,
-    newStart: hunk ? hunk.newStart : 0,
-    blockId: item.blockId ?? 0,
-  });
+  const depId = depChangeKey(item);
+  const file = depId ? `${itemPath(item)}#${depId}` : itemPath(item);
+  const oldStart = hunk ? hunk.oldStart : 0;
+  const newStart = hunk ? hunk.newStart : 0;
+  const blockId = item.blockId ?? 0;
+  return feedbackKey({ file, oldStart, newStart, blockId });
 };
 
 const sameCursor = (a, b) => {
@@ -114,7 +117,6 @@ const HANDLERS = {
   add: (session) => session.onAdd(),
   unstage: (session) => session.onUnstage(),
   revert: (session) => session.onRevert(),
-  skip: (session) => session.onSkip(),
   next: (session) => session.onNext(),
   prev: (session) => session.onPrev(),
   layout: (session) => session.onLayout(),
@@ -126,7 +128,6 @@ const HANDLERS = {
   quit: (session) => session.onQuit(),
   scrollUp: (session) => session.onScroll(-1),
   scrollDown: (session) => session.onScroll(1),
-  help: (session) => session.onHelp(),
 };
 
 const KEY_MODE = {
@@ -172,15 +173,15 @@ class Session {
     this.stdout = options.stdout;
     this.color = options.color ?? true;
     this.copyText = options.copyText ?? copyText;
-    this.getSize =
-      options.getSize ??
-      (() => ({
-        width: this.stdout.columns ?? 80,
-        height: this.stdout.rows ?? 24,
-      }));
+    const termSize = () => {
+      const width = this.stdout.columns ?? 80;
+      const height = this.stdout.rows ?? 24;
+      return { width, height };
+    };
+    this.getSize = options.getSize ?? termSize;
     this.pane = options.startPane ?? 'files';
     this.rev = options.rev ?? null;
-    this.revShort = options.revShort ?? '';
+    this.revShort = '';
     this.sourceLabel = options.sourceLabel ?? '';
     this.repoName = options.repoName ?? '';
     this.change = options.change ?? null;
@@ -188,22 +189,24 @@ class Session {
     this.readFileSync = options.readFileSync ?? fs.readFileSync;
     this.writeFileSync = options.writeFileSync ?? fs.writeFileSync;
     this.mkdirSync = options.mkdirSync ?? fs.mkdirSync;
-    this.now = options.now ?? (() => new Date());
+    this.now = options.now ?? systemNow;
     this.forceNewReview = options.newReview === true;
+    this.audit = options.audit === true;
+    this.outdatedMap = options.outdatedMap;
+    this.auditMap = options.auditMap;
     this.setInterval = options.setInterval ?? setInterval;
     this.clearInterval = options.clearInterval ?? clearInterval;
   }
 
   resetState() {
     this.items = [];
+    this.dismissed = new Set();
     this.top = this.cwd;
     this.index = 0;
-    this.skipped = new Set();
     this.fileCursor = 0;
     this.reviewPath = null;
     this.scroll = 0;
     this.status = '';
-    this.help = false;
     this.layout = 'unified';
     this.done = false;
     this.exitCode = 0;
@@ -213,7 +216,6 @@ class Session {
     this.lastSize = null;
     this.selection = null;
     this.mouseAnchor = null;
-    this.dragging = false;
     this.pendingClick = null;
     this.abortController = null;
     this.notes = null;
@@ -240,11 +242,15 @@ class Session {
 
   load() {
     const here = itemKey(this.items[this.index]);
-    const loaded = this.repo.load(this.cwd, this.paths, {
-      commit: this.rev,
-    });
+    const commit = this.rev;
+    const audit = this.audit;
+    const outdatedMap = this.outdatedMap;
+    const auditMap = this.auditMap;
+    const options = { commit, audit, outdatedMap, auditMap };
+    const loaded = this.repo.load(this.cwd, this.paths, options);
     this.top = loaded.top ?? this.cwd;
-    this.items = loaded.items;
+    const items = loaded.items;
+    this.items = items.filter((item) => !this.dismissed.has(itemKey(item)));
     if (loaded.rev) {
       this.rev = loaded.rev;
     }
@@ -268,13 +274,7 @@ class Session {
       const idx = this.items.findIndex((item) => itemKey(item) === here);
       if (idx >= 0) this.index = idx;
     }
-    this.pruneSkipped();
-    if (this.index >= this.items.length) {
-      this.index = Math.max(0, this.items.length - 1);
-    }
-    if (!this.isRemaining(this.items[this.index])) {
-      this.focusRemaining(this.index, 1);
-    }
+    this.clampIndex();
     this.syncReviewPath();
     this.syncFileCursor();
   }
@@ -304,57 +304,19 @@ class Session {
     this.items = mergeTodos(this.items, todos, extra);
   }
 
-  pruneSkipped() {
-    const live = new Set();
-    for (const item of this.items) live.add(itemKey(item));
-    for (const key of [...this.skipped]) {
-      if (!live.has(key)) this.skipped.delete(key);
-    }
-  }
-
-  isRemaining(item) {
-    if (!item) return false;
-    return !this.skipped.has(itemKey(item));
-  }
-
-  remainingIndices() {
-    const indices = [];
-    for (let i = 0; i < this.items.length; i++) {
-      if (this.isRemaining(this.items[i])) indices.push(i);
-    }
-    return indices;
-  }
-
-  focusRemaining(from, direction) {
-    const remaining = this.remainingIndices();
-    if (!remaining.length) {
+  clampIndex() {
+    if (!this.items.length) {
       this.index = 0;
-      return false;
-    }
-    if (direction >= 0) {
-      for (const i of remaining) {
-        if (i >= from) {
-          this.index = i;
-          return true;
-        }
-      }
-      this.index = remaining[remaining.length - 1];
-      return true;
+      return;
     }
-    for (let k = remaining.length - 1; k >= 0; k--) {
-      const i = remaining[k];
-      if (i <= from) {
-        this.index = i;
-        return true;
-      }
+    if (this.index < 0) this.index = 0;
+    if (this.index >= this.items.length) {
+      this.index = this.items.length - 1;
     }
-    this.index = remaining[0];
-    return true;
   }
 
   fileList() {
-    const remaining = new Set(this.remainingIndices());
-    const entries = fileEntries(this.items, remaining);
+    const entries = fileEntries(this.items);
     if (this.sourceLabel) {
       return relabelStatus(entries, 'pr', this.sourceLabel);
     }
@@ -408,15 +370,10 @@ class Session {
       untracked: 0,
       commit: 0,
       pr: 0,
-      skipped: 0,
       todo: 0,
       feedback: 0,
     };
     for (const item of this.items) {
-      if (!this.isRemaining(item)) {
-        counts.skipped += 1;
-        continue;
-      }
       if (!Object.hasOwn(counts, item.origin)) continue;
       counts[item.origin] += 1;
     }
@@ -427,19 +384,16 @@ class Session {
   }
 
   view() {
-    const remaining = this.remainingIndices();
-    const pos = remaining.indexOf(this.index);
     const templates = this.shownTemplates();
     const change = this.change;
     const isGithubPr = change && change.source === 'github-pr';
     const repoName = this.repoName || path.basename(this.top || this.cwd || '');
     return {
       item: this.current(),
-      index: pos < 0 ? 0 : pos,
-      total: remaining.length,
+      index: this.index,
+      total: this.items.length,
       scroll: this.scroll,
       status: this.status,
-      help: this.help,
       layout: this.layout,
       counts: this.counts(),
       selection: this.selection,
@@ -454,7 +408,6 @@ class Session {
       mode: this.mode,
       compose: this.composeView(),
       noteText: this.idleNoteText(),
-      noteKind: this.idleNoteKind(),
       todos: this.todoTexts(),
       todoFocus: this.clampedTodoFocus(),
       todoEdit: this.todoEditView(),
@@ -498,11 +451,8 @@ class Session {
       this.closeCompose();
     }
     if (this.pane === 'files') {
-      const delta = FILES_MOVE[action];
-      if (delta) {
-        this.onFileMove(delta);
-        return;
-      }
+      if (action === 'next') return void this.onFileMove(1);
+      if (action === 'prev') return void this.onFileMove(-1);
       if (FILES_DISABLED.includes(action)) return;
     }
     const handler = HANDLERS[action];
@@ -511,9 +461,7 @@ class Session {
   }
 
   current() {
-    const item = this.items[this.index] ?? null;
-    if (!this.isRemaining(item)) return null;
-    return item;
+    return this.items[this.index] ?? null;
   }
 
   reloadAfterChange() {
@@ -526,7 +474,8 @@ class Session {
       this.status = 'nothing to review';
       return;
     }
-    this.focusRemaining(here, 1);
+    this.index = here;
+    this.clampIndex();
     this.syncReviewPath();
     this.syncFileCursor();
     this.scroll = 0;
@@ -552,7 +501,7 @@ class Session {
 
   keepOrigin(item, origin) {
     item.origin = origin;
-    refreshIndexPatches(this.items, item);
+    if (!item.dep) refreshIndexPatches(this.items, item);
     this.clearSelection();
     this.syncReviewPath();
     this.syncFileCursor();
@@ -578,8 +527,7 @@ class Session {
     if (!entry) return [];
     const rel = entry.path;
     const items = [];
-    for (const index of this.remainingIndices()) {
-      const item = this.items[index];
+    for (const item of this.items) {
       if (item.origin === 'todo') continue;
       if (itemPath(item) !== rel) continue;
       items.push(item);
@@ -636,12 +584,14 @@ class Session {
       return;
     }
     const rel = itemPath(targets[0]);
+    const proposed = targets.some((item) => needsReload(item));
     const ok = this.applyFileGit(
       targets,
       'staged',
       (top, current) => this.repo.add(top, current),
       (item) => this.keepOrigin(item, 'staged'),
     );
+    if (ok && proposed) this.reloadAfterChange();
     if (ok) this.selectNextFileAfter(rel);
   }
 
@@ -670,13 +620,12 @@ class Session {
     const items = this.fileActionItems();
     if (!this.guardFileGit(items)) return;
     const rel = itemPath(items[0]);
+    for (const item of items) {
+      if (needsReload(item)) this.dismissed.add(itemKey(item));
+    }
     let ok = false;
     try {
-      if (this.repo.revertFile) {
-        this.repo.revertFile(this.top, rel, items);
-      } else {
-        for (const item of items) this.repo.revert(this.top, item);
-      }
+      this.repo.revertFile(this.top, rel, items);
       this.status = 'reverted';
       ok = true;
     } catch (error) {
@@ -694,16 +643,21 @@ class Session {
       this.status = 'read only';
       return;
     }
-    const blocked = ADD_STATUS[item.origin];
-    if (blocked) {
-      this.status = blocked;
+    if (item.origin === 'staged') {
+      this.status = 'already staged';
       return;
     }
     this.applyGit(
       item,
       'staged',
       (top, current) => this.repo.add(top, current),
-      () => this.keepOrigin(item, 'staged'),
+      () => {
+        if (needsReload(item)) {
+          this.reloadAfterChange();
+          return;
+        }
+        this.keepOrigin(item, 'staged');
+      },
     );
   }
 
@@ -740,51 +694,28 @@ class Session {
       item,
       'reverted',
       (top, current) => this.repo.revert(top, current),
-      () => this.reloadAfterChange(),
+      () => {
+        if (needsReload(item)) this.dismissed.add(itemKey(item));
+        this.reloadAfterChange();
+      },
     );
   }
 
-  onSkip() {
-    const item = this.items[this.index];
-    if (!this.isRemaining(item)) return;
-    this.skipped.add(itemKey(item));
-    this.scroll = 0;
-    this.clearSelection();
-    const remaining = this.remainingIndices();
-    if (!remaining.length) {
-      this.status = 'all skipped';
-      return;
-    }
-    this.focusRemaining(this.index + 1, 1);
-    this.syncReviewPath();
-    this.status = 'skipped';
-  }
-
   moveRemaining(step) {
-    const remaining = this.remainingIndices();
-    if (!remaining.length) {
-      this.status = 'all skipped';
-      return;
-    }
-    const pos = remaining.indexOf(this.index);
-    if (pos < 0) {
-      this.focusRemaining(this.index, step);
-      this.scroll = 0;
-      this.status = '';
-      this.clearSelection();
-      this.syncReviewPath();
+    if (!this.items.length) {
+      this.status = 'nothing to review';
       return;
     }
-    const next = pos + step;
+    const next = this.index + step;
     if (next < 0) {
       this.status = 'first block';
       return;
     }
-    if (next >= remaining.length) {
+    if (next >= this.items.length) {
       this.status = 'last block';
       return;
     }
-    this.index = remaining[next];
+    this.index = next;
     this.scroll = 0;
     this.status = '';
     this.clearSelection();
@@ -792,18 +723,10 @@ class Session {
   }
 
   onNext() {
-    if (this.mode === 'compose') {
-      this.commitCompose();
-      this.closeCompose();
-    }
     this.moveRemaining(1);
   }
 
   onPrev() {
-    if (this.mode === 'compose') {
-      this.commitCompose();
-      this.closeCompose();
-    }
     this.moveRemaining(-1);
   }
 
@@ -852,7 +775,6 @@ class Session {
       this.status = 'not a diff block';
       return;
     }
-    this.help = false;
     const prev = this.notes.feedback.get(itemFeedKey(item));
     const text = prev ? prev.text : '';
     this.openCompose('feedback', text);
@@ -939,9 +861,7 @@ class Session {
     this.injectTodos();
     const left = this.fileTodos(file);
     if (!left.length) {
-      if (!this.isRemaining(this.items[this.index])) {
-        this.focusRemaining(this.index, 1);
-      }
+      this.clampIndex();
     } else if (this.todoFocus >= left.length) {
       this.todoFocus = left.length - 1;
     }
@@ -970,7 +890,6 @@ class Session {
   createTodo(file) {
     if (!file) return;
     this.pane = 'diff';
-    this.help = false;
     this.scroll = 0;
     this.clearSelection();
     this.startDraftCompose(file);
@@ -1012,8 +931,8 @@ class Session {
 
   commitTodo(text) {
     const id = this.composeTodoId;
-    const prev =
-      id === null ? null : this.notes.todos.find((entry) => entry.id === id);
+    const todos = this.notes.todos;
+    const prev = id === null ? null : todos.find((entry) => entry.id === id);
     const current = this.current();
     const file = prev ? prev.file : itemPath(current) || this.todoDraftFile;
     if (prev) {
@@ -1044,9 +963,7 @@ class Session {
     this.templateFocus = false;
     this.todoDraftFile = null;
     this.injectTodos();
-    if (!this.isRemaining(this.items[this.index])) {
-      this.focusRemaining(this.index, 1);
-    }
+    this.clampIndex();
     this.syncReviewPath();
     this.syncFileCursor();
   }
@@ -1101,11 +1018,10 @@ class Session {
   composeView() {
     if (this.mode !== 'compose' || !this.editor) return null;
     if (this.composeKind !== 'feedback') return null;
-    return {
-      kind: 'feedback',
-      text: this.editor.text,
-      cursor: this.editor.cursor,
-    };
+    const kind = this.composeKind;
+    const text = this.editor.text;
+    const cursor = this.editor.cursor;
+    return { kind, text, cursor };
   }
 
   todoEditView() {
@@ -1116,8 +1032,6 @@ class Session {
 
   fileTodos(rel) {
     if (!this.notes || !rel) return [];
-    const page = { origin: 'todo', file: { newPath: rel, oldPath: rel } };
-    if (!this.isRemaining(page)) return [];
     const todos = [];
     for (const todo of this.notes.todos) {
       if (todo.file !== rel) continue;
@@ -1130,10 +1044,8 @@ class Session {
     const item = this.current();
     if (!item || item.origin !== 'todo') return [];
     const texts = [];
-    const editingId =
-      this.mode === 'compose' && this.composeKind === 'todo'
-        ? this.composeTodoId
-        : null;
+    const editingTodo = this.mode === 'compose' && this.composeKind === 'todo';
+    const editingId = editingTodo ? this.composeTodoId : null;
     for (const todo of this.fileTodos(itemPath(item))) {
       const live = editingId === todo.id && this.editor;
       const text = live ? this.editor.text : todo.text;
@@ -1152,7 +1064,7 @@ class Session {
   }
 
   clampedTodoFocus() {
-    const last = Math.max(0, this.todoTexts().length - 1);
+    const last = Math.max(0, this.todoRowCount() - 1);
     if (this.todoFocus < 0) return 0;
     if (this.todoFocus > last) return last;
     return this.todoFocus;
@@ -1175,12 +1087,6 @@ class Session {
     else this.todoFocus = next;
   }
 
-  idleNoteKind() {
-    const item = this.current();
-    if (!item || item.origin === 'todo') return '';
-    return 'feedback';
-  }
-
   idleNoteText() {
     if (!this.notes) return '';
     if (this.mode === 'compose') return '';
@@ -1194,11 +1100,10 @@ class Session {
   flushReview(force) {
     if (!this.notes) return false;
     try {
-      return flushReview(this.notes, {
-        writeFileSync: this.writeFileSync,
-        mkdirSync: this.mkdirSync,
-        force: force === true,
-      });
+      const writeFileSync = this.writeFileSync;
+      const mkdirSync = this.mkdirSync;
+      const io = { writeFileSync, mkdirSync, force: force === true };
+      return flushReview(this.notes, io);
     } catch (error) {
       this.status = error.message;
       return false;
@@ -1317,7 +1222,6 @@ class Session {
 
   showFiles() {
     this.pane = 'files';
-    this.help = false;
     this.clearSelection();
     this.followReviewPath();
   }
@@ -1334,7 +1238,6 @@ class Session {
     if (this.pane === 'files') {
       if (!this.reviewPath) return;
       this.pane = 'diff';
-      this.help = false;
       this.clearSelection();
       return;
     }
@@ -1354,7 +1257,6 @@ class Session {
     this.pane = 'diff';
     this.scroll = 0;
     this.status = '';
-    this.help = false;
     this.clearSelection();
     this.syncReviewPath();
   }
@@ -1362,7 +1264,7 @@ class Session {
   onFileMove(delta) {
     const files = this.fileList();
     if (!files.length) {
-      this.status = 'all skipped';
+      this.status = 'nothing to review';
       return;
     }
     const next = this.fileCursor + delta;
@@ -1395,16 +1297,11 @@ class Session {
     this.clearSelection();
   }
 
-  onHelp() {
-    this.help = !this.help;
-    this.clearSelection();
-  }
-
   onLayout() {
     const i = LAYOUTS.indexOf(this.layout);
     const next = (i < 0 ? 0 : i + 1) % LAYOUTS.length;
     this.layout = LAYOUTS[next];
-    this.status = layoutStatus(this.layout);
+    this.status = this.layout === 'side' ? 'side-by-side' : this.layout;
     this.scroll = 0;
     this.clearSelection();
   }
@@ -1419,7 +1316,6 @@ class Session {
   onMousePress(event) {
     const cell = this.mouseCell(event);
     this.mouseAnchor = cell;
-    this.dragging = false;
     this.pendingClick = null;
     this.selection = null;
     if (this.lastFrame && cell.y === this.lastFrame.height) {
@@ -1429,7 +1325,6 @@ class Session {
 
   onMouseDrag(event) {
     if (!this.mouseAnchor) return;
-    this.dragging = true;
     this.pendingClick = null;
     this.selection = {
       start: this.mouseAnchor,
@@ -1472,7 +1367,6 @@ class Session {
     const clickId = this.pendingClick;
     this.pendingClick = null;
     this.mouseAnchor = null;
-    this.dragging = false;
     if (this.clickButton(cell, clickId)) return;
     const frame = this.lastFrame;
     for (const target of RELEASE_HITS) {
@@ -1502,7 +1396,7 @@ class Session {
       return;
     }
     if (event.type !== 'mouse') return;
-    const kind = mouseKind(event);
+    const kind = event.kind;
     const wheel = kind === 'wheelUp' || kind === 'wheelDown';
     if (!wheel && event.btn !== 0 && event.btn !== undefined) return;
     const handler = MOUSE_KIND[kind];
@@ -1580,11 +1474,6 @@ class Session {
 }
 
 module.exports = {
-  LAYOUTS,
-  ENTER_TERM,
   LEAVE_TERM,
-  CURSOR_BLINK_MS,
-  HANDLERS,
-  itemKey,
   Session,
 };