reslop 0.1.2 → 0.1.4

package/lib/keys.js

@@ -4,8 +4,8 @@ const ACTIONS = {
   add: { keys: ['a'], label: 'Add' },
   unstage: { keys: ['u'], label: 'Unstage' },
   revert: { keys: ['r'], label: 'Revert' },
-  prev: { keys: ['left', 'p'], hot: '←', label: 'Prev' },
-  next: { keys: ['right', 'n'], hot: '→', label: 'Next' },
+  prev: { keys: ['left', 'p', 'k'], hot: '←', label: 'Prev' },
+  next: { keys: ['right', 'n', 'j'], hot: '→', label: 'Next' },
   layout: { keys: ['m'], label: 'Mode' },
   files: { keys: ['l'], label: 'Files' },
   feedback: { keys: ['f'], label: 'Feedback' },
@@ -19,6 +19,12 @@ const FILES_DISABLED = ['layout', 'feedback'];
 const SCROLL = {
   up: 'scrollUp',
   down: 'scrollDown',
+  'ctrl-y': 'scrollUp',
+  'ctrl-e': 'scrollDown',
+  'ctrl-b': 'pageUp',
+  'ctrl-f': 'pageDown',
+  'ctrl-u': 'halfUp',
+  'ctrl-d': 'halfDown',
   enter: 'open',
   backspace: 'removeTodo',
   delete: 'removeTodo',

package/lib/render.js

@@ -103,6 +103,16 @@ const FILE_STATUS_FG = {
   partial: THEME.warnFg,
 };
 
+const FILE_COL_KEYS = ['add', 'del', 'status', 'n', 'm'];
+
+const FILE_COL_ALIGN = {
+  add: 'start',
+  del: 'start',
+  status: 'start',
+  n: 'start',
+  m: 'end',
+};
+
 const INFO_STATUS = [
   'copied',
   'staged',
@@ -504,12 +514,15 @@ const paintButtons = (layout, width, color) => {
   return out;
 };
 
+const remoteCounts = (kind, { counts, notes, sourceLabel }) => {
+  const n = counts.pr ?? 0;
+  const label = sourceLabel || kind;
+  return ` ${kind} ${label}  ${n}  ${notes}`;
+};
+
 const COUNTS_KIND = {
-  pr: ({ counts, notes, sourceLabel }) => {
-    const n = counts.pr ?? 0;
-    const label = sourceLabel || 'pr';
-    return ` pr ${label}  ${n}  ${notes}`;
-  },
+  pr: (args) => remoteCounts('pr', args),
+  mr: (args) => remoteCounts('mr', args),
   commit: ({ counts, notes, revShort }) => {
     const n = counts.commit ?? 0;
     return ` commit ${revShort}  ${n}  ${notes}`;
@@ -525,7 +538,7 @@ const COUNTS_KIND = {
 };
 
 const countsKind = (sourceKind, revShort) => {
-  if (sourceKind === 'pr') return 'pr';
+  if (sourceKind === 'pr' || sourceKind === 'mr') return sourceKind;
   if (revShort) return 'commit';
   return 'worktree';
 };
@@ -575,23 +588,36 @@ const paintStatusLine = (view, status, width, color) => {
   );
 };
 
+const signedCount = (sign, n) => `${sign}${n ?? 0}`;
+
+const fileRowFields = (entry) => {
+  const { added, removed, staged, remaining } = entry;
+  const add = signedCount('+', added);
+  const del = signedCount('-', removed);
+  const status = entry.status ?? '';
+  const n = `${staged ?? 0}`;
+  const m = `${remaining ?? 0}`;
+  return { add, del, status, n, m };
+};
+
 const fileColumns = (files) => {
-  let statusW = 0;
-  let countW = 0;
+  const widths = {};
+  for (const key of FILE_COL_KEYS) widths[key] = 0;
   for (const entry of files) {
-    const status = entry.status ?? '';
-    const count = `${entry.remaining ?? 0}`;
-    const sw = visibleWidth(status);
-    const cw = visibleWidth(count);
-    if (sw > statusW) statusW = sw;
-    if (cw > countW) countW = cw;
+    const fields = fileRowFields(entry);
+    for (const key of FILE_COL_KEYS) {
+      const w = visibleWidth(fields[key]);
+      if (w > widths[key]) widths[key] = w;
+    }
   }
-  return { statusW, countW };
+  return widths;
 };
 
-const padStartVisible = (text, width) => {
+const padVisible = (text, width, align) => {
   const n = Math.max(0, width - visibleWidth(text));
-  return `${' '.repeat(n)}${text}`;
+  const gap = ' '.repeat(n);
+  if (align === 'end') return `${text}${gap}`;
+  return `${gap}${text}`;
 };
 
 const fileRowFg = (status, selected) => {
@@ -601,25 +627,55 @@ const fileRowFg = (status, selected) => {
   return THEME.mutedFg;
 };
 
+const fileRowParts = (entry, cols) => {
+  const fields = fileRowFields(entry);
+  const parts = {};
+  for (const key of FILE_COL_KEYS) {
+    const width = cols?.[key] ?? visibleWidth(fields[key]);
+    const align = FILE_COL_ALIGN[key];
+    parts[key] = padVisible(fields[key], width, align);
+  }
+  return parts;
+};
+
+const joinFileSuffix = (parts) => {
+  const { add, del, status, n, m } = parts;
+  return `  ${add}  ${del}  ${status}  ${n}/${m}`;
+};
+
+const paintFileSuffix = (parts, fgRgb, bgRgb, color) => {
+  const { add, del, status, n, m } = parts;
+  const gap = paint('  ', fgRgb, bgRgb, color);
+  const addText = paint(add, THEME.addLineFg, bgRgb, color);
+  const delText = paint(del, THEME.delLineFg, bgRgb, color);
+  const statusText = paint(status, fgRgb, bgRgb, color);
+  const nText = paint(n, fgRgb, bgRgb, color);
+  const slash = paint('/', fgRgb, bgRgb, color);
+  const mText = paint(m, fgRgb, bgRgb, color);
+  const counts = addText + gap + delText;
+  const meta = statusText + gap + nText + slash + mText;
+  return gap + counts + gap + meta;
+};
+
 const paintFileRow = (entry, width, color, selected, cols) => {
   const inner = Math.max(1, width - 1);
   const mark = selected ? FILE_MARK : ' ';
   const prefix = ` ${mark} `;
-  const status = entry.status ?? '';
-  const count = `${entry.remaining ?? 0}`;
-  const statusW = cols?.statusW ?? visibleWidth(status);
-  const countW = cols?.countW ?? visibleWidth(count);
-  const statusCol = padStartVisible(status, statusW);
-  const countCol = padStartVisible(count, countW);
-  const suffix = `  ${statusCol}  ${countCol}`;
+  const parts = fileRowParts(entry, cols);
+  const suffix = joinFileSuffix(parts);
   const pathW = Math.max(1, inner - visibleWidth(prefix + suffix));
-  const clipped = truncateVisible(entry.path, pathW);
+  const { path, status } = entry;
+  const clipped = truncateVisible(path, pathW);
   const pad = Math.max(0, pathW - visibleWidth(clipped));
-  const line = `${prefix}${clipped}${' '.repeat(pad)}${suffix}`;
+  const left = `${prefix}${clipped}${' '.repeat(pad)}`;
   const fgRgb = fileRowFg(status, selected);
   const bgRgb = selected ? THEME.buttonBg : THEME.ctxBg;
-  const row = paintBar(line, inner, fgRgb, bgRgb, color);
-  return row + fill(1, fgRgb, bgRgb, color);
+  const edge = fill(1, fgRgb, bgRgb, color);
+  if (!color) return `${left}${suffix}${edge}`;
+  let out = `${seq(fgRgb, bgRgb)}${EL}`;
+  out += paint(left, fgRgb, bgRgb, color);
+  out += paintFileSuffix(parts, fgRgb, bgRgb, color);
+  return out + edge;
 };
 
 const todoInnerWidth = (width) => Math.max(1, width - 2);
@@ -950,7 +1006,7 @@ const stackFrame = (view, width, color, rows, layout, windowed, notes) => {
   return overlayRows(rows, view.selection);
 };
 
-const frameResult = (text, painted, layout, windowed, hits) => {
+const frameResult = (text, painted, layout, windowed, hits, bodyH) => {
   const fileHits = windowed.fileHits;
   const todoHits = windowed.todoHits;
   const templateHits = hits.templateHits;
@@ -968,6 +1024,7 @@ const frameResult = (text, painted, layout, windowed, hits) => {
     height: painted.length,
     scroll,
     cursor,
+    bodyH,
   };
 };
 
@@ -999,7 +1056,7 @@ const renderFrame = (view, options = {}) => {
     notes.noteCursor,
     bodyH,
   );
-  return frameResult(text, painted, layout, windowed, hits);
+  return frameResult(text, painted, layout, windowed, hits, bodyH);
 };
 
 const presentCursor = (cursor) => {

package/lib/session.js

@@ -9,6 +9,7 @@ const review = require('./review.js');
 const wrap = require('./wrap.js');
 const { extractText, isRange } = require('./select.js');
 const { copyText } = require('./clipboard.js');
+const { watchResize } = require('./sys.js');
 const { fileEntries, itemPath } = require('./files.js');
 const { Editor } = require('./editor.js');
 const { refreshIndexPatches } = require('./diff.js');
@@ -29,6 +30,10 @@ const { prefixTemplates, TEMPLATE_SHOW, rememberTemplate } = review;
 
 const LAYOUTS = ['unified', 'mixed', 'side'];
 const READ_ONLY_ORIGINS = ['commit', 'pr'];
+const SOURCE_KIND = {
+  'github-pr': 'pr',
+  'gitlab-mr': 'mr',
+};
 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';
@@ -82,6 +87,8 @@ const itemFeedKey = (item) => {
   return feedbackKey({ file, oldStart, newStart, blockId });
 };
 
+const isAbortError = (error) => !!(error && error.code === 'ABORT');
+
 const sameCursor = (a, b) => {
   if (!a && !b) return true;
   if (!a || !b) return false;
@@ -128,6 +135,10 @@ const HANDLERS = {
   quit: (session) => session.onQuit(),
   scrollUp: (session) => session.onScroll(-1),
   scrollDown: (session) => session.onScroll(1),
+  pageUp: (session) => session.onScroll(session.scrollStep(-1)),
+  pageDown: (session) => session.onScroll(session.scrollStep(1)),
+  halfUp: (session) => session.onScroll(session.scrollStep(-0.5)),
+  halfDown: (session) => session.onScroll(session.scrollStep(0.5)),
 };
 
 const KEY_MODE = {
@@ -191,6 +202,7 @@ class Session {
     this.mkdirSync = options.mkdirSync ?? fs.mkdirSync;
     this.now = options.now ?? systemNow;
     this.forceNewReview = options.newReview === true;
+    this.readOnly = options.readOnly === true;
     this.audit = options.audit === true;
     this.outdatedMap = options.outdatedMap;
     this.auditMap = options.auditMap;
@@ -233,6 +245,16 @@ class Session {
     this.saveTimer = null;
     this.blinkTimer = null;
     this.blinkOn = true;
+    this.loadGen = 0;
+    this.loadAbort = null;
+    this.loadPromise = null;
+    this.busy = '';
+    this.emptyReview = false;
+    this.loadError = null;
+    this.didLoad = false;
+    this.pendingExtras = false;
+    this.uiOpen = false;
+    this.finishReadLoop = null;
   }
 
   constructor(options) {
@@ -240,14 +262,35 @@ class Session {
     this.resetState();
   }
 
-  load() {
-    const here = itemKey(this.items[this.index]);
+  loadOptions(extra = {}) {
     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);
+    return { commit, audit, outdatedMap, auditMap, ...extra };
+  }
+
+  shouldDeferExtras() {
+    if (!this.audit) return false;
+    if (this.outdatedMap !== undefined && this.auditMap !== undefined) {
+      return false;
+    }
+    return true;
+  }
+
+  bumpLoad() {
+    this.loadGen += 1;
+    if (this.loadAbort) this.loadAbort.abort();
+    this.loadAbort = new AbortController();
+  }
+
+  ensureRepo() {
+    if (!this.repo.toplevel) return;
+    this.top = this.repo.toplevel(this.cwd);
+  }
+
+  applyLoaded(loaded) {
+    const here = itemKey(this.items[this.index]);
     this.top = loaded.top ?? this.cwd;
     const items = loaded.items;
     this.items = items.filter((item) => !this.dismissed.has(itemKey(item)));
@@ -277,6 +320,121 @@ class Session {
     this.clampIndex();
     this.syncReviewPath();
     this.syncFileCursor();
+    this.didLoad = true;
+    this.pendingExtras = loaded.pending === true;
+  }
+
+  load() {
+    const loaded = this.repo.load(this.cwd, this.paths, this.loadOptions());
+    this.applyLoaded(loaded);
+  }
+
+  paint() {
+    if (!this.uiOpen) return;
+    this.draw();
+  }
+
+  viewStatus() {
+    if (this.status) return this.status;
+    return this.busy;
+  }
+
+  finishIfEmpty(kind) {
+    if (this.items.length) return;
+    if (this.notes && hasNotes(this.notes)) this.flushReview();
+    this.done = true;
+    this.exitCode = 0;
+    this.status = 'nothing to review';
+    this.emptyReview = kind === 'open';
+    if (this.finishReadLoop) this.finishReadLoop();
+  }
+
+  failOpen(error) {
+    if (isAbortError(error)) return;
+    this.loadError = error;
+    this.done = true;
+    this.exitCode = 1;
+    this.busy = '';
+    if (this.finishReadLoop) this.finishReadLoop();
+  }
+
+  async followExtras(loaded, gen, kind) {
+    if (!this.repo.loadExtras) {
+      this.busy = '';
+      this.pendingExtras = false;
+      this.paint();
+      this.finishIfEmpty(kind);
+      return;
+    }
+    const signal = this.loadAbort ? this.loadAbort.signal : undefined;
+    const extra = this.loadOptions({
+      paths: this.paths,
+      signal,
+    });
+    let next;
+    try {
+      next = await this.repo.loadExtras(loaded, extra);
+    } catch (error) {
+      if (gen !== this.loadGen) return;
+      this.failOpen(error);
+      return;
+    }
+    if (gen !== this.loadGen || this.done) return;
+    this.applyLoaded(next);
+    this.busy = '';
+    this.paint();
+    this.finishIfEmpty(kind);
+  }
+
+  openLoad() {
+    if (this.loadPromise) return this.loadPromise;
+    if (this.didLoad && !this.pendingExtras) {
+      this.loadPromise = Promise.resolve();
+      return this.loadPromise;
+    }
+    this.bumpLoad();
+    this.loadPromise = this.runOpenLoad();
+    return this.loadPromise;
+  }
+
+  async runOpenLoad() {
+    const gen = this.loadGen;
+    const signal = this.loadAbort.signal;
+    const options = this.loadOptions({
+      deferExtras: this.shouldDeferExtras(),
+      signal,
+    });
+    this.busy = 'loading';
+    this.paint();
+    let loaded;
+    try {
+      if (this.repo.loadAsync) {
+        loaded = await this.repo.loadAsync(this.cwd, this.paths, options);
+      } else {
+        loaded = this.repo.load(this.cwd, this.paths, options);
+      }
+    } catch (error) {
+      if (gen !== this.loadGen) return;
+      this.failOpen(error);
+      return;
+    }
+    if (gen !== this.loadGen || this.done) return;
+    this.applyLoaded(loaded);
+    if (loaded.pending) {
+      this.busy = 'checking npm';
+      this.paint();
+      await this.followExtras(loaded, gen, 'open');
+      return;
+    }
+    this.busy = '';
+    this.paint();
+    this.finishIfEmpty('open');
+  }
+
+  async loadReady() {
+    this.ensureRepo();
+    await this.openLoad();
+    if (this.loadError) throw this.loadError;
   }
 
   initReview() {
@@ -386,14 +544,14 @@ class Session {
   view() {
     const templates = this.shownTemplates();
     const change = this.change;
-    const isGithubPr = change && change.source === 'github-pr';
+    const sourceKind = (change && SOURCE_KIND[change.source]) || '';
     const repoName = this.repoName || path.basename(this.top || this.cwd || '');
     return {
       item: this.current(),
       index: this.index,
       total: this.items.length,
       scroll: this.scroll,
-      status: this.status,
+      status: this.viewStatus(),
       layout: this.layout,
       counts: this.counts(),
       selection: this.selection,
@@ -404,7 +562,7 @@ class Session {
       repoName,
       revShort: this.revShort || '',
       sourceLabel: this.sourceLabel || '',
-      sourceKind: isGithubPr ? 'pr' : '',
+      sourceKind,
       mode: this.mode,
       compose: this.composeView(),
       noteText: this.idleNoteText(),
@@ -466,20 +624,25 @@ class Session {
 
   reloadAfterChange() {
     const here = this.index;
-    this.load();
-    if (!this.items.length) {
-      if (hasNotes(this.notes)) this.flushReview();
-      this.done = true;
-      this.exitCode = 0;
-      this.status = 'nothing to review';
-      return;
-    }
+    this.loadPromise = null;
+    this.bumpLoad();
+    const options = this.loadOptions({
+      deferExtras: this.shouldDeferExtras(),
+    });
+    const loaded = this.repo.load(this.cwd, this.paths, options);
+    this.applyLoaded(loaded);
     this.index = here;
     this.clampIndex();
     this.syncReviewPath();
     this.syncFileCursor();
     this.scroll = 0;
     this.clearSelection();
+    if (loaded.pending) {
+      this.busy = 'checking npm';
+      this.followExtras(loaded, this.loadGen, 'reload');
+      return;
+    }
+    this.finishIfEmpty('reload');
   }
 
   clearSelection() {
@@ -535,16 +698,20 @@ class Session {
     return items;
   }
 
-  guardFileGit(items) {
-    if (!items.length) return false;
-    const first = items[0];
-    if (isReadOnlyOrigin(first.origin)) {
+  guardWritable(item) {
+    if (!item) return false;
+    if (this.readOnly || isReadOnlyOrigin(item.origin)) {
       this.status = 'read only';
       return false;
     }
     return true;
   }
 
+  guardFileGit(items) {
+    if (!items.length) return false;
+    return this.guardWritable(items[0]);
+  }
+
   applyFileGit(items, label, write, afterItem) {
     try {
       for (const item of items) {
@@ -578,12 +745,13 @@ class Session {
   onFileAdd() {
     const items = this.fileActionItems();
     if (!this.guardFileGit(items)) return;
+    const rel = itemPath(items[0]);
     const targets = items.filter((item) => item.origin !== 'staged');
     if (!targets.length) {
       this.status = 'already staged';
+      this.selectNextFileAfter(rel);
       return;
     }
-    const rel = itemPath(targets[0]);
     const proposed = targets.some((item) => needsReload(item));
     const ok = this.applyFileGit(
       targets,
@@ -598,12 +766,13 @@ class Session {
   onFileUnstage() {
     const items = this.fileActionItems();
     if (!this.guardFileGit(items)) return;
+    const rel = itemPath(items[0]);
     const targets = items.filter((item) => item.origin === 'staged');
     if (!targets.length) {
       this.status = 'not staged';
+      this.selectNextFileAfter(rel);
       return;
     }
-    const rel = itemPath(targets[0]);
     const ok = this.applyFileGit(
       targets,
       'unstaged',
@@ -638,11 +807,7 @@ class Session {
   onAdd() {
     if (this.pane === 'files') return void this.onFileAdd();
     const item = this.activeDiffItem();
-    if (!item) return;
-    if (isReadOnlyOrigin(item.origin)) {
-      this.status = 'read only';
-      return;
-    }
+    if (!this.guardWritable(item)) return;
     if (item.origin === 'staged') {
       this.status = 'already staged';
       return;
@@ -664,11 +829,7 @@ class Session {
   onUnstage() {
     if (this.pane === 'files') return void this.onFileUnstage();
     const item = this.activeDiffItem();
-    if (!item) return;
-    if (isReadOnlyOrigin(item.origin)) {
-      this.status = 'read only';
-      return;
-    }
+    if (!this.guardWritable(item)) return;
     if (item.origin !== 'staged') {
       this.status = 'not staged';
       return;
@@ -685,11 +846,7 @@ class Session {
   onRevert() {
     if (this.pane === 'files') return void this.onFileRevert();
     const item = this.activeDiffItem();
-    if (!item) return;
-    if (isReadOnlyOrigin(item.origin)) {
-      this.status = 'read only';
-      return;
-    }
+    if (!this.guardWritable(item)) return;
     this.applyGit(
       item,
       'reverted',
@@ -1267,13 +1424,12 @@ class Session {
       this.status = 'nothing to review';
       return;
     }
-    const next = this.fileCursor + delta;
-    if (next < 0) {
-      this.status = 'first file';
-      return;
-    }
-    if (next >= files.length) {
-      this.status = 'last file';
+    const next = Math.min(
+      files.length - 1,
+      Math.max(0, this.fileCursor + delta),
+    );
+    if (next === this.fileCursor) {
+      this.status = next <= 0 ? 'first file' : 'last file';
       return;
     }
     this.fileCursor = next;
@@ -1283,6 +1439,16 @@ class Session {
     this.status = '';
   }
 
+  scrollStep(fraction) {
+    const bodyH = this.lastFrame?.bodyH;
+    const size = this.lastSize ?? this.getSize();
+    const fallback = Math.max(1, (size.height ?? 24) - 4);
+    const height = Math.max(1, bodyH ?? fallback);
+    const n = Math.max(1, Math.floor(height * Math.abs(fraction)));
+    if (fraction < 0) return -n;
+    return n;
+  }
+
   onScroll(delta) {
     if (this.pane === 'files') {
       this.onFileMove(delta);
@@ -1428,12 +1594,20 @@ class Session {
   }
 
   async startUi() {
+    if (this.didLoad && !this.items.length) {
+      this.emptyReview = true;
+      return 0;
+    }
+    this.uiOpen = true;
     this.enterTerm();
     try {
+      this.openLoad();
       this.draw();
       await this.readLoop();
     } finally {
+      this.uiOpen = false;
       this.leaveTerm();
+      if (this.loadAbort) this.loadAbort.abort();
     }
     return this.exitCode;
   }
@@ -1442,7 +1616,10 @@ class Session {
     return new Promise((resolve) => {
       this.abortController = new AbortController();
       const { signal } = this.abortController;
+      let settled = false;
       const finish = () => {
+        if (settled) return;
+        settled = true;
         if (this.saveTimer !== null) {
           this.clearInterval(this.saveTimer);
           this.saveTimer = null;
@@ -1452,8 +1629,14 @@ class Session {
           this.blinkTimer = null;
         }
         this.abortController.abort();
+        this.finishReadLoop = null;
         resolve();
       };
+      this.finishReadLoop = finish;
+      if (this.done) {
+        finish();
+        return;
+      }
       const onData = (chunk) => {
         this.pushInput(chunk.toString('utf8'));
         if (this.done) {
@@ -1468,7 +1651,7 @@ class Session {
         CURSOR_BLINK_MS,
       );
       this.stdin.on('data', (chunk) => onData(chunk), { signal });
-      process.on('SIGWINCH', () => this.draw(), { signal });
+      watchResize(this.stdout, process, () => this.draw(), signal);
     });
   }
 }

package/lib/source.js

@@ -1,13 +1,16 @@
 'use strict';
 
 const { parseGithubPrUrl } = require('./github.js');
+const { parseGitlabMrUrl } = require('./gitlab.js');
 
 const selectChangeSource = (paths) => {
   if (!paths.length) return { kind: 'local', paths };
   const first = paths[0];
   const pr = parseGithubPrUrl(first);
-  if (!pr) return { kind: 'local', paths };
-  return { kind: 'github-pr', pr, paths: paths.slice(1) };
+  if (pr) return { kind: 'github-pr', pr, paths: paths.slice(1) };
+  const mr = parseGitlabMrUrl(first);
+  if (mr) return { kind: 'gitlab-mr', mr, paths: paths.slice(1) };
+  return { kind: 'local', paths };
 };
 
 const nop = () => {};