reslop 0.2.6 → 0.2.7

package/lib/session/dashboard.js

@@ -13,7 +13,7 @@ const { readGitSummary } = gitInfo;
 const npmInfo = require('../dashboard/npm.js');
 const { readNpmSummary } = npmInfo;
 const model = require('../dashboard/model.js');
-const { buildModel } = model;
+const { buildModel, minuteOf, MINUTE_MS, npmModel } = model;
 const filesPane = require('./files-pane.js');
 const watch = require('./watch.js');
 const { UNKNOWN_PATH, MODULES_STAMP } = watch;
@@ -21,8 +21,12 @@ const { UNKNOWN_PATH, MODULES_STAMP } = watch;
 const TICK_ID = 'dashboard';
 const HEAT_TIMER = 'dashboard-heat';
 const AGE_TIMER = 'dashboard-age';
-const SAMPLES = 40;
+const MINUTE_TIMER = 'dashboard-minute';
+const BLINK_TIMER = 'dashboard-blink';
+const BLINK_MS = 3000;
+const MINUTE_KEEP = 360;
 const SWITCHES = 4;
+const RUN_MARK = { failed: 'fail', passed: 'pass', aborted: 'abort' };
 const GIT_NAMES = new Set([
   'HEAD',
   'packed-refs',
@@ -124,7 +128,9 @@ class Dashboard {
     this.totals = null;
     this.totalsKey = '';
     this.diffDelta = null;
-    this.samples = [];
+    this.minutes = new Map();
+    this.activityAt = 0;
+    this.rebaseOn = false;
     this.switches = [];
     this.branchAt = new Map();
     this.branchSha = new Map();
@@ -177,6 +183,101 @@ class Dashboard {
     progress.stop(TICK_ID);
     term.cancel(HEAT_TIMER);
     term.cancel(AGE_TIMER);
+    term.cancel(MINUTE_TIMER);
+    term.cancel(BLINK_TIMER);
+  }
+
+  bucket(at) {
+    const minute = minuteOf(at);
+    let newest = minute;
+    for (const key of this.minutes.keys()) {
+      if (key > newest) newest = key;
+    }
+    if (minute < newest - MINUTE_KEEP) return null;
+    let row = this.minutes.get(minute);
+    if (!row) {
+      row = { level: 0, added: 0, removed: 0, marks: [] };
+      this.minutes.set(minute, row);
+    }
+    const oldest = newest - MINUTE_KEEP;
+    for (const key of this.minutes.keys()) {
+      if (key < oldest) this.minutes.delete(key);
+    }
+    return row;
+  }
+
+  touchActivity(at) {
+    if (at > this.activityAt) this.activityAt = at;
+  }
+
+  heat(at, added, removed = 0) {
+    const plus = Math.max(0, added || 0);
+    const minus = Math.max(0, removed || 0);
+    if (!at || plus + minus <= 0) return;
+    const row = this.bucket(at);
+    if (!row) return;
+    row.added += plus;
+    row.removed += minus;
+    row.level += plus + minus;
+    this.touchActivity(at);
+  }
+
+  mark(at, kind) {
+    if (!at || !kind) return;
+    const row = this.bucket(at);
+    if (!row || row.marks.includes(kind)) return;
+    row.marks.push(kind);
+    this.touchActivity(at);
+  }
+
+  noteCommits(next) {
+    const recent = next.commits.recent;
+    for (const entry of recent) this.mark(entry.at, 'commit');
+  }
+
+  noteRebase(next, now) {
+    const rebasing = Boolean(next.rebase);
+    if (rebasing && !this.rebaseOn) this.mark(now, 'rebase');
+    this.rebaseOn = rebasing;
+  }
+
+  noteRuns(runs) {
+    for (const run of runs) {
+      const kind = RUN_MARK[run.status];
+      if (kind) this.mark(run.endedAt || run.startedAt, kind);
+    }
+  }
+
+  isRunLive() {
+    for (const run of this.liveRuns()) {
+      if (run.status === 'running') return true;
+    }
+    const npm = this.ui.npm.lastRun;
+    return Boolean(npm && npm.running);
+  }
+
+  isBusy() {
+    if (this.git && this.git.rebase) return true;
+    return this.isRunLive();
+  }
+
+  liveActivity(now) {
+    if (this.isBusy()) return true;
+    return now - this.activityAt < BLINK_MS;
+  }
+
+  activityView(now) {
+    const minutes = [];
+    for (const [at, row] of this.minutes) {
+      minutes.push({
+        at,
+        level: row.level,
+        added: row.added,
+        removed: row.removed,
+        marks: row.marks.slice(),
+      });
+    }
+    return { minutes, live: this.liveActivity(now) };
   }
 
   afterDraw() {
@@ -184,17 +285,21 @@ class Dashboard {
     if (!this.visible()) return void this.cancelTimers();
     const { progress, term } = this.ui;
     const now = Date.now();
+    if (this.isBusy()) this.touchActivity(now);
     const until = this.hotUntil();
     const hot = now < until;
-    const runs = this.liveRuns();
-    const running = runs.some((run) => run.status === 'running');
-    if (running || hot) progress.start(TICK_ID);
+    const live = this.liveActivity(now);
+    if (live || hot) progress.start(TICK_ID);
     else progress.stop(TICK_ID);
     const repaint = () => this.paintIfVisible();
     if (hot) term.later(HEAT_TIMER, repaint, until - now + 20);
-    const at = this.youngest(runs);
+    const at = this.youngest(this.liveRuns());
     const delay = at ? ageDelay(now - at) : AGE_SLOW_MS;
     term.later(AGE_TIMER, repaint, delay);
+    const minuteLeft = MINUTE_MS - (now % MINUTE_MS) + 20;
+    term.later(MINUTE_TIMER, repaint, minuteLeft);
+    const blinkLeft = this.activityAt + BLINK_MS - now;
+    if (blinkLeft > 0) term.later(BLINK_TIMER, repaint, blinkLeft + 20);
   }
 
   async runFiles() {
@@ -209,7 +314,12 @@ class Dashboard {
     const after = index.summary().total;
     const lines = after.lines - before.lines;
     const bytes = after.bytes - before.bytes;
-    if (lines || bytes) this.fileDelta = { lines, at: Date.now() };
+    if (!lines && !bytes) return;
+    const at = Date.now();
+    this.fileDelta = { lines, at };
+    const plus = lines > 0 ? lines : 0;
+    const minus = lines < 0 ? -lines : 0;
+    this.heat(at, plus || (minus ? 0 : 1), minus);
   }
 
   noteShas(next, now) {
@@ -243,9 +353,12 @@ class Dashboard {
     const moved = this.noteShas(next, now);
     const switched = this.noteSwitch(next, now);
     if (moved || switched) this.marks.branches = now;
+    if (switched) this.mark(now, 'branch');
     const sha = next.commits.last ? next.commits.last.sha : '';
     if (this.lastSha && sha !== this.lastSha) this.marks.commit = now;
     this.lastSha = sha;
+    this.noteCommits(next);
+    this.noteRebase(next, now);
     this.git = next;
   }
 
@@ -259,12 +372,17 @@ class Dashboard {
       (prev.deps !== next.deps ||
         prev.dev !== next.dev ||
         prev.modules.stamp !== next.modules.stamp);
-    if (changed) this.marks.npm = Date.now();
+    if (changed) {
+      const now = Date.now();
+      this.marks.npm = now;
+      this.mark(now, 'npm');
+    }
     this.npm = next;
   }
 
   runRuns() {
     this.runs = readRuns(this.root());
+    this.noteRuns(this.runs);
   }
 
   noteLoaded() {
@@ -276,12 +394,14 @@ class Dashboard {
     if (prev) {
       const added = totals.added - prev.added;
       const removed = totals.removed - prev.removed;
-      this.diffDelta = { added, removed, at: Date.now() };
+      const at = Date.now();
+      this.diffDelta = { added, removed, at };
+      const plus = Math.max(0, added);
+      const minus = Math.max(0, removed);
+      this.heat(at, plus || (minus ? 0 : 1), minus);
     }
     this.totals = totals;
     this.totalsKey = key;
-    this.samples.push(totals.added + totals.removed);
-    if (this.samples.length > SAMPLES) this.samples.shift();
   }
 
   requestAll() {
@@ -325,17 +445,18 @@ class Dashboard {
 
   view() {
     const ui = this.ui;
+    const now = Date.now();
     const entries = fileEntries(ui.items);
     const store = ui.review.store;
     return buildModel({
-      now: Date.now(),
+      now,
       frame: ui.progressFrame,
       busy: ui.ops.busy,
       index: this.index,
       fileDelta: this.fileDelta,
       entries,
       totals: this.totals ?? fileTotals(entries),
-      samples: this.samples,
+      activity: this.activityView(now),
       diffDelta: this.diffDelta,
       git: this.git,
       switches: this.switches,
@@ -350,6 +471,30 @@ class Dashboard {
     });
   }
 
+  packagesView() {
+    return npmModel({
+      npm: this.npm,
+      npmExtras: this.ui.lifecycle.npmExtras(),
+      npmRun: this.ui.npm.lastRun,
+    });
+  }
+
+  packageCount() {
+    const data = this.packagesView();
+    if (!data.ready || !data.hasManifest) return 1;
+    const listed = data.modules && data.modules.packages;
+    return listed ? listed.length : 0;
+  }
+
+  openPackages() {
+    const ui = this.ui;
+    ui.nav.pane = 'packages';
+    ui.nav.packagesCursor = 0;
+    ui.nav.resetListScroll('packages');
+    ui.nav.clearSelection();
+    ui.status = '';
+  }
+
   showFiles(scope) {
     const ui = this.ui;
     ui.showFiles();
@@ -365,7 +510,7 @@ class Dashboard {
       diffs: () => this.showFiles('diff'),
       commits: () => ui.commits.onCommit(),
       branches: () => ui.gitBranches.onBranch(),
-      npm: () => ui.npm.open(),
+      npm: () => this.openPackages(),
       run: () => ui.npm.open(),
       tasks: () => ui.composer.tasks.openTasksPage(),
     };

package/lib/session/dispatch.js

@@ -6,12 +6,15 @@ const commit = require('./commit.js');
 const { hasStagedChanges, listedCommits } = commit;
 const actions = require('./actions.js');
 const { LIST_PANES, DASH_BLOCKS, DASH_ALLOWED, CONFIRM_MODE } = actions;
-const { disabledActions, actionFromKey, confirmKey } = actions;
+const { REPOS_ALLOWED } = actions;
+const { disabledActions, actionFromKey, confirmKey, lineHasDiff } = actions;
 const changeActions = require('./change-actions.js');
 const { onCommand } = changeActions;
 const filesPane = require('./files-pane.js');
 const pointer = require('./pointer.js');
 const { handlePointer } = pointer;
+const finder = require('./find.js');
+const { FIND_PANES, startFind, onFindKey } = finder;
 
 const currentTarget = (ui) => {
   if (ui.pane === 'files') return ui.fileCursorEntry();
@@ -22,7 +25,14 @@ const currentTarget = (ui) => {
     const unstagedCurrent = !ui.rev && !ui.revShort;
     return { ...entry, canCommit, unstagedCurrent };
   }
-  return ui.current();
+  if (ui.pane !== 'unit') return ui.current();
+  const item = ui.current();
+  const lines = ui.view().unitLines ?? [];
+  if (!lines.length) return item;
+  const line = lines[ui.nav.unitLine] ?? null;
+  const lineDiff = lineHasDiff(line);
+  if (!item) return { lineDiff };
+  return { ...item, lineDiff };
 };
 
 const scrollBy = (fraction) => (ui) =>
@@ -45,7 +55,10 @@ const HANDLERS = {
   layout: filesPane.onLayout,
   theme: filesPane.onTheme,
   files: filesPane.onFiles,
-  open: filesPane.onOpenFile,
+  open: (ui) => {
+    if (ui.pane === 'repos') return void ui.workspace.openSelected();
+    filesPane.onOpenFile(ui);
+  },
   file: filesPane.onFileScope,
   diff: filesPane.onDiffScope,
   back: filesPane.onEscape,
@@ -63,10 +76,12 @@ const HANDLERS = {
   check: (ui) => ui.composer.tasks.toggleFocusedTask(),
   removeTask: (ui) => {
     if (ui.pane === 'npm') return void ui.npm.askDrop();
+    if (ui.pane === 'packages') return;
     ui.composer.tasks.removeFocusedTask();
   },
   reload: (ui) => ui.lifecycle.onReload(),
   commit: (ui) => ui.commits.onCommit(),
+  newCommit: (ui) => ui.commits.onInsert(),
   amend: (ui) => ui.commits.onAmend(),
   reword: (ui) => ui.commits.onReword(),
   apply: (ui) => ui.commits.onApply(),
@@ -86,11 +101,19 @@ const HANDLERS = {
   npmEdit: (ui) => ui.npm.edit(),
   npmNew: (ui) => ui.npm.create(),
   npmDrop: (ui) => ui.npm.askDrop(),
+  packageNew: (ui) => ui.packages.create(),
+  packageDrop: (ui) => ui.packages.askDrop(),
+  packageWanted: (ui) => ui.packages.updateWanted(),
+  packageLatest: (ui) => ui.packages.updateLatest(),
   npmLogs: (ui) => ui.npm.askLogs(),
   npmStop: (ui) => ui.npm.closeView(),
   npmVerbose: (ui) => ui.npm.toggleVerbose(),
   npmRerun: (ui) => ui.npm.rerun(),
   quit: (ui) => ui.onQuit(),
+  repoLeft: (ui) => ui.workspace.move(-1, 0),
+  repoRight: (ui) => ui.workspace.move(1, 0),
+  repoUp: (ui) => ui.workspace.move(0, -1),
+  repoDown: (ui) => ui.workspace.move(0, 1),
   ...DASH_HANDLERS,
 };
 
@@ -102,6 +125,7 @@ const dispatchAction = (ui, action) => {
     if (result && result.kind === 'error') return;
   }
   const pane = ui.pane;
+  if (pane === 'repos' && !REPOS_ALLOWED.includes(action)) return;
   if (pane === 'dashboard' && !DASH_ALLOWED.includes(action)) return;
   if (LIST_PANES.includes(pane) && (action === 'next' || action === 'prev')) {
     return void filesPane.onScroll(ui, action === 'next' ? 1 : -1);
@@ -123,11 +147,13 @@ const CONFIRMATIONS = {
   },
   confirmDrop: {
     confirm: (ui) => {
+      if (ui.packages.dropName) return void ui.packages.confirmDrop();
       if (ui.npm.dropName) return void ui.npm.confirmDrop();
       if (ui.commits.dropName) return void ui.commits.confirmDropCommit();
       ui.gitBranches.confirmDropBranch();
     },
     cancel: (ui) => {
+      if (ui.packages.dropName) return void ui.packages.cancelDrop();
       if (ui.npm.dropName) return void ui.npm.cancelDrop();
       if (ui.commits.dropName) return void ui.commits.cancelDropCommit();
       ui.gitBranches.cancelDropBranch();
@@ -137,6 +163,12 @@ const CONFIRMATIONS = {
     force: (ui) => ui.gitBranches.onForcePush(),
     cancel: (ui) => ui.gitBranches.cancelPush(),
   },
+  confirmCommit: {
+    commit: (ui) => ui.commits.chooseCommit('commit'),
+    amend: (ui) => ui.commits.chooseCommit('amend'),
+    fixup: (ui) => ui.commits.chooseCommit('fixup'),
+    cancel: (ui) => ui.commits.cancelCommitChoice(),
+  },
 };
 
 const confirmChoice = (ui, key) => {
@@ -173,11 +205,13 @@ const handleKey = (ui, key) => {
   if (ui.mode === 'compose') {
     return void ui.runComposeCommand(ui.composer.handleKey(key));
   }
+  if (ui.mode === 'find') return void onFindKey(ui, key);
+  if (key === '/' && FIND_PANES.includes(ui.pane)) return void startFind(ui);
   const onNpmKey = npmKey(ui, key);
   if (onNpmKey) return void onNpmKey(ui);
   if (key === 'escape') return void filesPane.onEscape(ui);
   const tasks = ui.composer.tasks;
-  const toggle = key === 'x' || key === ' ';
+  const toggle = key === ' ';
   if (toggle && tasks.toggleFocusedTask()) return;
   if (tasks.typeIntoTask(key)) return;
   const action = actionFromKey(key, ui.pane, ui.fileScope);

package/lib/session/files-pane.js

@@ -35,7 +35,8 @@ const showFiles = (ui) => {
     nav.tasksOpen === true ||
     nav.pane === 'branches' ||
     nav.pane === 'commits' ||
-    nav.pane === 'npm';
+    nav.pane === 'npm' ||
+    nav.pane === 'packages';
   nav.pane = 'files';
   nav.resetListScroll('files');
   nav.clearSelection();
@@ -66,7 +67,7 @@ const showDashboard = (ui) => {
   ui.dashboard.enter();
 };
 
-const HOME_CHILDREN = ['files', 'branches', 'commits', 'npm'];
+const HOME_CHILDREN = ['files', 'branches', 'commits', 'npm', 'packages'];
 
 const returnsHome = (ui) => {
   if (!ui.dashboardHome) return false;
@@ -75,6 +76,10 @@ const returnsHome = (ui) => {
 };
 
 const onEscape = (ui) => {
+  if (ui.nav.pane === 'repos') return void ui.onQuit();
+  if (ui.nav.pane === 'dashboard' && ui.workspaceRoot) {
+    return void ui.workspace.show();
+  }
   if (ui.nav.pane === 'dashboard') return void ui.onQuit();
   const commitDiff = ui.nav.pane === 'diff' && viewingCommit(ui);
   if (returnsHome(ui) || (ui.dashboardHome && commitDiff)) {
@@ -101,6 +106,7 @@ const onFiles = (ui) => {
 };
 
 const onOpenFile = (ui) => {
+  if (ui.nav.pane === 'packages') return;
   if (ui.nav.pane === 'branches') {
     return void ui.gitBranches.onCheckoutBranch();
   }
@@ -203,6 +209,15 @@ const onScroll = (ui, delta) => {
     return void ui.commits.onCommitMove(delta);
   }
   if (ui.nav.pane === 'npm') return void ui.npm.move(delta);
+  if (ui.nav.pane === 'packages') {
+    const count = ui.dashboard.packageCount();
+    const nav = ui.nav;
+    const next = nav.packagesCursor + delta;
+    const last = Math.max(0, count - 1);
+    nav.packagesCursor = Math.max(0, Math.min(last, next));
+    ui.status = '';
+    return;
+  }
   if (ui.nav.tasksOpen && ui.composer.tasks.taskRowCount() > 1) {
     return void ui.composer.tasks.moveTaskFocus(delta);
   }

package/lib/session/find.js

@@ -0,0 +1,94 @@
+'use strict';
+
+const files = require('../files.js');
+const { isTasksEntry, TASKS_FILE } = files;
+const find = require('../find.js');
+const { fileMatches } = find;
+
+const FIND_PANES = ['files', 'diff'];
+
+const isTypeKey = (key) =>
+  Boolean(key) && key.length === 1 && key.charCodeAt(0) >= 32;
+
+const startFind = (ui) => {
+  if (ui.mode !== 'review') return;
+  if (!FIND_PANES.includes(ui.pane)) return;
+  ui.mode = 'find';
+  ui.nav.find = { query: '', at: 0 };
+  ui.status = '';
+};
+
+const stopFind = (ui) => {
+  ui.mode = 'review';
+  ui.nav.find = null;
+  ui.status = '';
+};
+
+const focusMatch = (ui, hit, jump) => {
+  const entry = ui.fileList()[hit.index];
+  if (!entry) return;
+  const moved = ui.nav.fileCursor !== hit.index;
+  ui.nav.fileCursor = hit.index;
+  if (isTasksEntry(entry)) {
+    ui.nav.reviewPath = TASKS_FILE;
+    return;
+  }
+  ui.nav.reviewPath = entry.path;
+  if (ui.nav.pane !== 'diff') {
+    ui.nav.index = entry.firstIndex;
+    return;
+  }
+  if (!moved && !jump) return;
+  ui.nav.index = entry.openIndex ?? entry.firstIndex;
+  ui.nav.scroll = 0;
+  ui.nav.clearSelection();
+};
+
+const showHit = (ui, jump) => {
+  const state = ui.nav.find;
+  if (!state) return;
+  const hits = fileMatches(ui.fileList(), state.query);
+  if (!hits.length) return;
+  const count = hits.length;
+  let at = state.at % count;
+  if (at < 0) at += count;
+  state.at = at;
+  focusMatch(ui, hits[at], jump);
+};
+
+const typeFind = (ui, key) => {
+  const state = ui.nav.find;
+  state.query += key;
+  state.at = 0;
+  showHit(ui, true);
+};
+
+const eraseFind = (ui) => {
+  const state = ui.nav.find;
+  if (!state.query) return void stopFind(ui);
+  state.query = state.query.slice(0, -1);
+  state.at = 0;
+  showHit(ui, true);
+};
+
+const moveFind = (ui, delta) => {
+  const state = ui.nav.find;
+  if (!state.query) return;
+  state.at += delta;
+  showHit(ui, false);
+};
+
+const onFindKey = (ui, key) => {
+  if (!ui.nav.find) {
+    ui.mode = 'review';
+    return;
+  }
+  if (key === 'ctrl-c') return void ui.onQuit();
+  if (key === 'escape' || key === 'enter') return void stopFind(ui);
+  if (key === 'backspace') return void eraseFind(ui);
+  if (key === 'up' || key === 'left') return void moveFind(ui, -1);
+  if (key === 'down' || key === 'right') return void moveFind(ui, 1);
+  if (isTypeKey(key)) typeFind(ui, key);
+};
+
+module.exports = { FIND_PANES, startFind, stopFind, onFindKey };

package/lib/session/lifecycle.js

@@ -163,6 +163,7 @@ class Lifecycle {
 
   applyLoaded(loaded) {
     const ui = this.ui;
+    if (ui.nav.pane === 'repos') return false;
     const { loader, collection, nav } = ui;
     if (loaded.generation !== undefined) {
       if (!loader.isCurrent(loaded.generation, ui.done)) return false;
@@ -325,6 +326,11 @@ class Lifecycle {
 
   openLoad() {
     const loader = this.ui.loader;
+    if (this.ui.nav.pane === 'repos') {
+      loader.didLoad = true;
+      loader.promise = Promise.resolve();
+      return loader.promise;
+    }
     if (loader.promise) return loader.promise;
     if (loader.didLoad && !loader.pendingExtras) {
       loader.promise = Promise.resolve();
@@ -335,6 +341,10 @@ class Lifecycle {
   }
 
   async loadReady() {
+    if (this.ui.nav.pane === 'repos') {
+      this.ui.loader.didLoad = true;
+      return;
+    }
     this.ui.ensureRepo();
     await this.openLoad();
     if (this.ui.loadError) throw this.ui.loadError;
@@ -407,6 +417,7 @@ class Lifecycle {
   }
 
   onDiskChange() {
+    if (this.ui.nav.pane === 'repos') return;
     if (Date.now() < this.ignoreWatchUntil) return;
     if (!this.shouldDeferWatch()) {
       return void this.refreshFromRepo({ keepView: true, quiet: true });
@@ -465,6 +476,22 @@ class Lifecycle {
 
   startWatch() {
     this.stopWatch();
+    const ui = this.ui;
+    if (ui.nav.pane === 'repos') {
+      const root = ui.workspaceRoot;
+      if (!root) return;
+      const info = ui.workspaceInfo;
+      const repos = info ? info.repos : [];
+      const paths = ['.'];
+      for (const repo of repos) paths.push(path.join(repo.name, '.git'));
+      this.diskWatcher = new DiskWatcher({
+        root,
+        paths,
+        matchReview: (rel) => rel.includes('/.review/'),
+        onPaths: (rels) => ui.workspace.notePaths(rels),
+      });
+      return;
+    }
     const root = this.root;
     if (!isWorktree(this.ui) || !root) return;
     this.diskWatcher = new DiskWatcher({

package/lib/session/navigation.js

@@ -20,6 +20,7 @@ class Navigation {
     this.branchCursor = 0;
     this.commitCursor = 0;
     this.npmCursor = 0;
+    this.packagesCursor = 0;
     this.scroll = 0;
     this.listScrollByPane = freshListScroll();
     this.reviewPath = null;
@@ -31,6 +32,7 @@ class Navigation {
     this.lastClick = null;
     this.tasksOpen = false;
     this.tasksFocus = 0;
+    this.find = null;
   }
 
   clampIndex(length) {