reslop 0.2.1 → 0.2.4

package/lib/session/files-pane.js

@@ -4,7 +4,11 @@ const ansi = require('../ansi.js');
 const files = require('../files.js');
 const { THEME_NAMES, setTheme, themeName } = ansi;
 const { isTodosEntry, TODO_FILE } = files;
+const npm = require('../render/npm.js');
+const { logViewRows } = npm;
 const unit = require('./unit.js');
+const actions = require('./actions.js');
+const { LIST_PANES } = actions;
 const { setFileScope, openUnitFile, moveUnitBlock } = unit;
 
 const LAYOUTS = ['unified', 'mixed', 'side'];
@@ -28,7 +32,10 @@ const syncFileCursor = (ui) => {
 const showFiles = (ui) => {
   const nav = ui.nav;
   const held =
-    nav.todoOpen === true || nav.pane === 'branches' || nav.pane === 'commits';
+    nav.todoOpen === true ||
+    nav.pane === 'branches' ||
+    nav.pane === 'commits' ||
+    nav.pane === 'npm';
   nav.pane = 'files';
   nav.clearSelection();
   followReviewPath(ui);
@@ -37,9 +44,6 @@ const showFiles = (ui) => {
 };
 
 const onEscape = (ui) => {
-  if (ui.nav.pane === 'branches' || ui.nav.pane === 'commits') {
-    return void showFiles(ui);
-  }
   if (ui.nav.pane === 'files') return void ui.onQuit();
   showFiles(ui);
 };
@@ -65,7 +69,8 @@ const onOpenFile = (ui) => {
   if (ui.nav.pane === 'branches') {
     return void ui.gitBranches.onCheckoutBranch();
   }
-  if (ui.nav.pane === 'commits') return;
+  if (ui.nav.pane === 'commits') return void ui.commits.onShowDiff();
+  if (ui.nav.pane === 'npm') return void ui.npm.run();
   if (ui.nav.pane !== 'files') {
     if (ui.nav.todoOpen) ui.composer.editFocusedTodo();
     return;
@@ -152,7 +157,9 @@ const scrollStep = (ui, fraction) => {
   const rows = size.height ?? 24;
   const fallback = Math.max(1, rows - 4);
   const bodyH = frame?.bodyH ?? fallback;
-  const height = Math.max(1, bodyH);
+  const viewing = ui.nav.pane === 'npm' && ui.npm && ui.npm.viewing;
+  const viewRows = viewing ? logViewRows(bodyH) : bodyH;
+  const height = Math.max(1, viewRows);
   const span = Math.floor(height * Math.abs(fraction));
   const n = Math.max(1, span);
   if (fraction < 0) return -n;
@@ -167,6 +174,7 @@ const onScroll = (ui, delta) => {
   if (ui.nav.pane === 'commits') {
     return void ui.commits.onCommitMove(delta);
   }
+  if (ui.nav.pane === 'npm') return void ui.npm.move(delta);
   if (ui.nav.todoOpen && ui.composer.todoRowCount() > 1) {
     return void ui.composer.moveTodoFocus(delta);
   }
@@ -181,22 +189,9 @@ const onScroll = (ui, delta) => {
 };
 
 const onJump = (ui, toEnd) => {
-  if (ui.nav.pane === 'files') {
-    const list = ui.fileList();
-    if (!list.length) {
-      ui.status = 'nothing to review';
-      return;
-    }
-    const target = toEnd ? list.length - 1 : 0;
-    return void onFileMove(ui, target - ui.nav.fileCursor);
-  }
-  if (ui.nav.pane === 'branches') {
+  if (LIST_PANES.includes(ui.nav.pane)) {
     const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
-    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);
+    return void onScroll(ui, delta);
   }
   if (ui.nav.todoOpen && ui.composer.todoRowCount() > 0) {
     const last = ui.composer.todoRowCount() - 1;

package/lib/session/items.js

@@ -1,11 +1,14 @@
 'use strict';
 
-const { stateView } = require('./accessors.js');
+const accessors = require('./accessors.js');
+const { stateView } = accessors;
 
 const files = require('../files.js');
 const { itemPath, TODO_FILE, isTodoItem } = files;
-const { feedbackKey } = require('../review.js');
-const { refreshIndexPatches } = require('../diff/diff.js');
+const review = require('../review.js');
+const { feedbackKey } = review;
+const diff = require('../diff/diff.js');
+const { refreshIndexPatches } = diff;
 
 const depChangeKey = (item) => {
   const change = item.dep && item.dep.change;

package/lib/session/lifecycle.js

@@ -3,14 +3,18 @@
 const fs = require('node:fs');
 const path = require('node:path');
 
-const { isAbortError } = require('./load.js');
-const { createDiskWatcher, POLL_MS, DEBOUNCE_MS } = require('./watch.js');
+const sessionLoad = require('./load.js');
+const { isAbortError } = sessionLoad;
+const watch = require('./watch.js');
+const { createDiskWatcher, POLL_MS, DEBOUNCE_MS } = watch;
 const files = require('../files.js');
 const { itemPath, relativeAge, TODO_FILE } = files;
-const { MANIFEST, LOCKFILE, depFileMeta } = require('../deps.js');
+const deps = require('../deps.js');
+const { MANIFEST, LOCKFILE, depFileMeta } = deps;
 const review = require('../review.js');
 const { hasNotes, loadReview } = review;
-const { mergeReview } = require('../review-merge.js');
+const reviewMerge = require('../review-merge.js');
+const { mergeReview } = reviewMerge;
 
 const loadOptions = (api, extra = {}) => {
   const { loadConfig, ui } = api;
@@ -485,7 +489,10 @@ const worktreeStamp = (api) => {
 };
 
 const watchesWorktree = (nav) =>
-  nav.todoOpen === true || nav.pane === 'branches' || nav.pane === 'commits';
+  nav.todoOpen === true ||
+  nav.pane === 'branches' ||
+  nav.pane === 'commits' ||
+  nav.pane === 'npm';
 
 const currentFileStamp = (api) => {
   const { nav } = api;

package/lib/session/load.js

@@ -1,8 +1,10 @@
 'use strict';
 
-const { stateView } = require('./accessors.js');
+const accessors = require('./accessors.js');
+const { stateView } = accessors;
 
-const isAbortError = (error) => !!(error && error.code === 'ABORT');
+const utilities = require('../utilities.js');
+const { isAbort: isAbortError } = utilities;
 
 const createLoadCoordinator = () => {
   const state = {

package/lib/session/navigation.js

@@ -9,6 +9,7 @@ const initialState = (options = {}) => ({
   fileCursor: 0,
   branchCursor: 0,
   commitCursor: 0,
+  npmCursor: 0,
   scroll: 0,
   listScroll: 0,
   reviewPath: null,
@@ -17,6 +18,7 @@ const initialState = (options = {}) => ({
   selection: null,
   mouseAnchor: null,
   pendingClick: null,
+  lastClick: null,
   todoOpen: false,
   todoFocus: 0,
 });

package/lib/session/npm.js

@@ -0,0 +1,388 @@
+'use strict';
+
+const commands = require('../npm-commands.js');
+const npm = require('../render/npm.js');
+const { logViewRows } = npm;
+
+const { listCommands, reduceOutput, writeLog, parseScriptLine } = commands;
+const { staleLogFiles, removeStaleLogs, formatSize } = commands;
+const { scriptLine, saveScript, removeScript, reorderScript } = commands;
+const { startNpm } = commands;
+
+const selected = (api) => {
+  const cursor = api.ui.nav.npmCursor;
+  return api.state.commands[cursor];
+};
+
+const clampCursor = (api) => {
+  const last = api.state.commands.length - 1;
+  const nav = api.ui.nav;
+  if (nav.npmCursor > last) nav.npmCursor = Math.max(0, last);
+  if (nav.npmCursor < 0) nav.npmCursor = 0;
+};
+
+const refresh = (api) => {
+  api.state.commands = listCommands(api.ui.top);
+  clampCursor(api);
+};
+
+const canEdit = (ui) => {
+  if (ui.capabilities && ui.capabilities.changes === false) return false;
+  if (ui.readOnly) return false;
+  return true;
+};
+
+const refreshLogs = (api) => {
+  try {
+    const found = staleLogFiles(api.ui.top);
+    api.state.logBytes = found.bytes;
+  } catch (error) {
+    api.state.logBytes = 0;
+    api.ui.status = error.message;
+  }
+};
+
+const open = (api) => {
+  if (api.ui.mode === 'compose') return;
+  refresh(api);
+  refreshLogs(api);
+  api.state.viewing = false;
+  api.state.output = '';
+  api.ui.nav.pane = 'npm';
+  api.ui.status = '';
+  api.ui.nav.clearSelection();
+};
+
+const scrollLog = (api, delta) => {
+  const lines = api.state.output.split('\n');
+  let count = lines.at(-1) === '' ? lines.length - 1 : lines.length;
+  if (api.state.running) count += 1;
+  const frame = api.ui.lastFrame;
+  const bodyH = frame && frame.bodyH ? frame.bodyH : 1;
+  const max = Math.max(0, count - logViewRows(bodyH));
+  let start = api.state.followEnd ? max : api.state.logScroll;
+  start = Math.min(max, Math.max(0, start + delta));
+  api.state.followEnd = start === max;
+  api.state.logScroll = start;
+};
+
+const move = (api, delta) => {
+  if (api.state.viewing) return void scrollLog(api, delta);
+  if (!api.state.commands.length) return;
+  const nav = api.ui.nav;
+  const last = api.state.commands.length - 1;
+  const next = Math.min(last, Math.max(0, nav.npmCursor + delta));
+  if (next === nav.npmCursor) return;
+  nav.npmCursor = next;
+  api.ui.status = '';
+};
+
+const stopRun = (api) => {
+  api.state.running = false;
+  api.state.child = null;
+  if (api.ui.progress) api.ui.progress.stop('npm');
+};
+
+const showOutput = (api, text) => {
+  if (!api.state.viewing || !api.state.running) return;
+  if (api.state.stopping) return;
+  api.state.output = text;
+  api.ui.paint();
+};
+
+const withNotice = (text, notice) => {
+  const body = `${text ?? ''}`;
+  if (body.endsWith(`${notice}\n`)) return body;
+  if (!body) return `${notice}\n`;
+  if (body.endsWith('\n')) return `${body}${notice}\n`;
+  return `${body}\n${notice}\n`;
+};
+
+const finishRun = (api, entry, result) => {
+  const stopped = api.state.stopping === true;
+  const reduced = stopped
+    ? withNotice(api.state.output, 'terminated')
+    : reduceOutput(result.text, api.ui.top, result.status);
+  api.state.output = reduced;
+  api.state.stopping = false;
+  stopRun(api);
+  try {
+    writeLog(api.ui.top, entry.name, reduced);
+  } catch (error) {
+    api.ui.status = error.message;
+    api.ui.paint();
+    return;
+  }
+  if (stopped && api.state.viewing) api.ui.status = 'terminated';
+  api.ui.paint();
+};
+
+const startRun = (api, entry) => {
+  api.state.output = '';
+  api.state.viewing = true;
+  api.state.followEnd = true;
+  api.state.logScroll = 0;
+  api.state.running = true;
+  api.state.stopping = false;
+  api.ui.status = '';
+  if (api.ui.progress) api.ui.progress.start('npm');
+  const runner = api.ui.repo && api.ui.repo.runNpmCommand;
+  const start = typeof runner === 'function' ? runner : startNpm;
+  api.state.child = start(
+    api.ui.top,
+    entry,
+    (text) => showOutput(api, reduceOutput(text, api.ui.top, '')),
+    (result) => finishRun(api, entry, result),
+  );
+  api.ui.paint();
+};
+
+const runSelected = (api) => {
+  if (api.state.viewing || api.state.child) return;
+  const entry = selected(api);
+  if (!entry) return;
+  startRun(api, entry);
+};
+
+const rerun = (api) => {
+  if (!api.state.viewing || api.state.running) return;
+  const entry = selected(api);
+  if (!entry) return;
+  startRun(api, entry);
+};
+
+const closeView = (api) => {
+  if (api.state.running) {
+    api.state.stopping = true;
+    if (api.state.child) api.state.child.kill();
+    if (!api.state.running) return;
+    api.state.output = withNotice(api.state.output, 'terminated');
+    stopRun(api);
+    api.ui.status = 'terminated';
+    api.ui.paint();
+    return;
+  }
+  api.state.viewing = false;
+  api.ui.status = '';
+  api.ui.paint();
+};
+
+const editSelected = (api) => {
+  if (api.state.viewing) return;
+  if (!canEdit(api.ui)) {
+    api.ui.status = 'read only';
+    return;
+  }
+  const entry = selected(api);
+  if (!entry || entry.kind !== 'script') {
+    api.ui.status = 'not a script';
+    return;
+  }
+  api.state.editName = entry.name;
+  api.ui.composer.openCompose('npm', scriptLine(entry));
+};
+
+const newCommand = (api) => {
+  if (api.state.viewing) return;
+  if (!canEdit(api.ui)) {
+    api.ui.status = 'read only';
+    return;
+  }
+  api.state.editName = '';
+  api.ui.composer.openCompose('npm', '');
+};
+
+const finishEdit = (api) => {
+  const editor = api.ui.composer.state.editor;
+  const text = editor ? editor.text : '';
+  const parsed = parseScriptLine(text);
+  if (!parsed) {
+    api.ui.status = 'name: command';
+    return;
+  }
+  try {
+    api.ui.ignoreWatch();
+    saveScript(api.ui.top, api.state.editName, parsed);
+  } catch (error) {
+    api.ui.status = error.message;
+    return;
+  }
+  api.ui.composer.closeCompose();
+  refresh(api);
+  const at = api.state.commands.findIndex(
+    (entry) => entry.name === parsed.name,
+  );
+  if (at >= 0) api.ui.nav.npmCursor = at;
+  api.ui.status = 'saved';
+};
+
+const askDrop = (api) => {
+  if (api.state.viewing) return;
+  if (!canEdit(api.ui)) {
+    api.ui.status = 'read only';
+    return;
+  }
+  const entry = selected(api);
+  if (!entry || entry.kind !== 'script') {
+    api.ui.status = 'not a script';
+    return;
+  }
+  api.state.dropKind = 'script';
+  api.state.dropName = entry.name;
+  api.ui.mode = 'confirmDrop';
+  api.ui.status = '';
+};
+
+const askLogs = (api) => {
+  if (api.state.viewing) return;
+  if (!canEdit(api.ui)) {
+    api.ui.status = 'read only';
+    return;
+  }
+  refreshLogs(api);
+  if (!api.state.logBytes) return;
+  api.state.dropKind = 'logs';
+  const size = formatSize(api.state.logBytes);
+  api.state.dropName = `logs older than 5 days (${size})`;
+  api.ui.mode = 'confirmDrop';
+  api.ui.status = '';
+};
+
+const confirmDrop = (api) => {
+  const kind = api.state.dropKind;
+  const name = api.state.dropName;
+  api.state.dropName = '';
+  api.state.dropKind = '';
+  api.ui.mode = 'review';
+  if (kind === 'logs') {
+    try {
+      removeStaleLogs(api.ui.top);
+    } catch (error) {
+      api.ui.status = error.message;
+      refreshLogs(api);
+      return;
+    }
+    refreshLogs(api);
+    api.ui.status = 'dropped logs';
+    return;
+  }
+  if (!name) return;
+  try {
+    api.ui.ignoreWatch();
+    removeScript(api.ui.top, name);
+  } catch (error) {
+    api.ui.status = error.message;
+    return;
+  }
+  refresh(api);
+  api.ui.status = `dropped ${name}`;
+};
+
+const cancelDrop = (api) => {
+  api.state.dropName = '';
+  api.state.dropKind = '';
+  api.ui.mode = 'review';
+  api.ui.status = '';
+};
+
+const reorder = (api, delta) => {
+  if (api.state.viewing) return;
+  if (!canEdit(api.ui)) {
+    api.ui.status = 'read only';
+    return;
+  }
+  const entry = selected(api);
+  if (!entry || entry.kind !== 'script') {
+    api.ui.status = 'not a script';
+    return;
+  }
+  try {
+    api.ui.ignoreWatch();
+    if (!reorderScript(api.ui.top, entry.name, delta)) return;
+  } catch (error) {
+    api.ui.status = error.message;
+    return;
+  }
+  refresh(api);
+  const at = api.state.commands.findIndex((item) => item.name === entry.name);
+  if (at >= 0) api.ui.nav.npmCursor = at;
+  api.ui.status = '';
+};
+
+const createNpmController = (ui) => {
+  const state = {
+    commands: [],
+    viewing: false,
+    output: '',
+    followEnd: true,
+    logScroll: 0,
+    editName: '',
+    dropName: '',
+    dropKind: '',
+    logBytes: 0,
+    running: false,
+    stopping: false,
+    child: null,
+  };
+  const api = { ui, state };
+  return {
+    state,
+    get commands() {
+      return state.commands;
+    },
+    get viewing() {
+      return state.viewing;
+    },
+    get output() {
+      return state.output;
+    },
+    get dropName() {
+      return state.dropName;
+    },
+    get logLabel() {
+      if (!state.logBytes) return '';
+      return `old logs ${formatSize(state.logBytes)}`;
+    },
+    get followEnd() {
+      return state.followEnd;
+    },
+    get logScroll() {
+      return state.logScroll;
+    },
+    get editName() {
+      return state.editName;
+    },
+    get running() {
+      return state.running;
+    },
+    reset() {
+      if (state.child) state.child.kill();
+      stopRun(api);
+      state.commands = [];
+      state.viewing = false;
+      state.output = '';
+      state.followEnd = true;
+      state.logScroll = 0;
+      state.editName = '';
+      state.dropName = '';
+      state.dropKind = '';
+      state.logBytes = 0;
+      state.stopping = false;
+    },
+    open: () => open(api),
+    move: (delta) => move(api, delta),
+    run: () => runSelected(api),
+    rerun: () => rerun(api),
+    closeView: () => closeView(api),
+    edit: () => editSelected(api),
+    create: () => newCommand(api),
+    finishEdit: () => finishEdit(api),
+    askDrop: () => askDrop(api),
+    askLogs: () => askLogs(api),
+    confirmDrop: () => confirmDrop(api),
+    cancelDrop: () => cancelDrop(api),
+    reorder: (delta) => reorder(api, delta),
+  };
+};
+
+module.exports = { createNpmController };

package/lib/session/ops.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { stateView } = require('./accessors.js');
+const accessors = require('./accessors.js');
+const { stateView } = accessors;
 
 const ASYNC_WITHOUT_UI = ['pull', 'push'];
 
@@ -81,6 +82,18 @@ const createOpsRunner = (ui) => {
     finishBusy(done, after);
   };
 
+  const runWrite = (name, args, kind, done, after) => {
+    const picked = pickRepoWrite(ui.repo, name, ui.uiOpen);
+    const write = (top) => picked.write(top, ...args);
+    if (picked.async) {
+      const refresh = () => after({ doneStatus: done });
+      return void runBusy(kind, done, write, refresh);
+    }
+    if (!runRepo(done, write)) return;
+    after({});
+    if (!ui.status) ui.status = done;
+  };
+
   return stateView(
     state,
     {
@@ -88,6 +101,7 @@ const createOpsRunner = (ui) => {
       setBusy,
       clearBusy,
       runRepo,
+      runWrite,
       runBusy,
     },
     ['gitBusy', 'busy'],

package/lib/session/pointer.js

@@ -1,8 +1,11 @@
 'use strict';
 
-const { extractText, isRange } = require('../select.js');
-const { hitAction } = require('../keys.js');
-const { copyText } = require('../clipboard.js');
+const select = require('../select.js');
+const { extractText, isRange } = select;
+const keys = require('../keys.js');
+const { hitAction } = keys;
+const clipboard = require('../clipboard.js');
+const { copyText } = clipboard;
 
 const mouseCell = (ui, event) => {
   const size = ui.lastSize ?? ui.getSize();
@@ -45,6 +48,20 @@ const clickButton = (ui, cell, clickId) => {
   return true;
 };
 
+const DOUBLE_CLICK_MS = 500;
+
+const armDoubleClick = (nav, pane, cursor) => {
+  const now = Date.now();
+  const prev = nav.lastClick;
+  const again =
+    prev !== null &&
+    prev.pane === pane &&
+    prev.cursor === cursor &&
+    now - prev.at <= DOUBLE_CLICK_MS;
+  nav.lastClick = { pane, cursor, at: now };
+  return again;
+};
+
 const clickHit = (ui, hits, cell, onHit) => {
   const nav = ui.nav;
   if (!hits || isRange(nav.selection)) return false;
@@ -99,9 +116,19 @@ const RELEASE_TARGETS = [
     match: (ui) => ui.pane === 'commits',
     hits: 'fileHits',
     onHit: (ui, hit) => {
+      if (ui.mode === 'compose') return;
       ui.nav.commitCursor = hit.cursor;
     },
   },
+  {
+    match: (ui) => ui.pane === 'npm',
+    hits: 'fileHits',
+    onHit: (ui, hit) => {
+      const again = armDoubleClick(ui.nav, 'npm', hit.cursor);
+      ui.nav.npmCursor = hit.cursor;
+      if (again && ui.mode === 'review') ui.npm.run();
+    },
+  },
   {
     match: (ui) => ui.pane === 'diff',
     hits: 'todoHits',

package/lib/session/review.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { stateView } = require('./accessors.js');
+const accessors = require('./accessors.js');
+const { stateView } = accessors;
 
 const review = require('../review.js');
 const { createStore, applyImportedNotes, setStatus } = review;

package/lib/session/terminal.js

@@ -1,7 +1,9 @@
 'use strict';
 
-const { presentRows, presentCursor } = require('../render/render.js');
-const { listen, watchResize } = require('../utilities.js');
+const render = require('../render/render.js');
+const { presentRows, presentCursor } = render;
+const utilities = require('../utilities.js');
+const { listen, watchResize } = utilities;
 
 const ENTER_TERM = '\x1b[?1049h\x1b[?25l\x1b[?7l\x1b[?1002h\x1b[?1006h';
 const LEAVE_TERM =

package/lib/session/update.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { stateView } = require('./accessors.js');
+const accessors = require('./accessors.js');
+const { stateView } = accessors;
 
 const update = require('../update.js');
 const { checkUpdate, installUpdate, markSkipped } = update;