reslop 0.2.3 → 0.2.5

package/lib/session/view.js

@@ -3,8 +3,9 @@
 const path = require('node:path');
 
 const files = require('../files.js');
-const { listedCommits } = require('./commit.js');
-const { fileEntries, REPO_TODOS_LABEL } = files;
+const commit = require('./commit.js');
+const { listedCommits } = commit;
+const { fileEntries, fileTotals, REPO_TASKS_LABEL } = files;
 const review = require('../review.js');
 const { noteCounts } = review;
 const diff = require('../diff/diff.js');
@@ -24,12 +25,12 @@ const repoNameOf = (api) => {
   return path.basename(ui.top || ui.cwd || '');
 };
 
-const todosEntry = (counts) => ({
-  path: REPO_TODOS_LABEL,
-  kind: 'todos',
-  status: 'todos',
-  remaining: counts.todo,
-  staged: counts.todoDone,
+const tasksEntry = (counts) => ({
+  path: REPO_TASKS_LABEL,
+  kind: 'tasks',
+  status: 'tasks',
+  remaining: counts.tasks,
+  staged: counts.tasksDone,
   firstIndex: 0,
   openIndex: 0,
   added: 0,
@@ -93,7 +94,7 @@ const fileList = (api, notes = noteCounts(api.review.store)) => {
   const names = listedNames(api);
   const scoped =
     api.nav.fileScope === 'file' ? mergeUnitFiles(labeled, names) : labeled;
-  scoped.unshift(todosEntry(notes));
+  scoped.unshift(tasksEntry(notes));
   return scoped;
 };
 
@@ -104,7 +105,7 @@ const counts = (api, notes = noteCounts(api.review.store)) => {
     untracked: 0,
     commit: 0,
     pr: 0,
-    todo: 0,
+    tasks: 0,
     feedback: 0,
     code: 0,
   };
@@ -113,7 +114,7 @@ const counts = (api, notes = noteCounts(api.review.store)) => {
     next[item.origin] += 1;
   }
   next.feedback = notes.feedback;
-  next.todo = notes.todo;
+  next.tasks = notes.tasks;
   next.code = notes.code;
   return next;
 };
@@ -143,6 +144,30 @@ const unitBodyLines = (api) => {
   return unitLines(unitFileText(api), group);
 };
 
+const pendingLines = (items, rev, revShort) => {
+  if (rev || revShort) return null;
+  for (const item of items) {
+    if (item.origin === 'commit' || item.origin === 'pr') return null;
+  }
+  return fileTotals(fileEntries(items));
+};
+
+const commitRows = (api) => {
+  const rows = listedCommits(api.commits.commits);
+  const lines = pendingLines(api.collection.items, api.ui.rev, api.ui.revShort);
+  if (!lines || !rows[0]) return rows;
+  rows[0] = {
+    ...rows[0],
+    added: lines.added,
+    removed: lines.removed,
+    stagedAdded: lines.stagedAdded,
+    unstagedAdded: lines.unstagedAdded,
+    stagedRemoved: lines.stagedRemoved,
+    unstagedRemoved: lines.unstagedRemoved,
+  };
+  return rows;
+};
+
 const view = (api) => {
   const { composer, nav, ui, gitBranches, commits, npm, updater } = api;
   const templates = composer.shownTemplates();
@@ -170,7 +195,7 @@ const view = (api) => {
     branch: ui.branch,
     branches: gitBranches.branches,
     branchCursor: nav.branchCursor,
-    commits: listedCommits(commits.commits),
+    commits: commitRows(api),
     commitCursor: nav.commitCursor,
     commitView: commits.commitView,
     npmCommands: npm.commands,
@@ -180,7 +205,11 @@ const view = (api) => {
     npmFollow: npm.followEnd,
     npmScroll: npm.logScroll,
     npmEditName: npm.editName,
+    npmEditField: npm.editField,
+    npmDraftName: npm.draftName,
+    npmDraftCommand: npm.draftCommand,
     npmRunning: npm.running,
+    npmLogs: nav.pane === 'npm' ? npm.logLabel : '',
     repoName: repoNameOf(api),
     rev: ui.rev || '',
     revShort: ui.revShort || '',
@@ -189,9 +218,9 @@ const view = (api) => {
     mode: ui.mode,
     compose: composer.composeView(),
     noteText: composer.idleNoteText(),
-    todos: composer.todoTexts(),
-    todoFocus: composer.clampedTodoFocus(),
-    todoEdit: composer.todoEditView(),
+    tasks: composer.taskTexts(),
+    tasksFocus: composer.clampedTaskFocus(),
+    taskEdit: composer.taskEditView(),
     codeOverlay: composer.codeOverlayView(),
     templates,
     templateIndex: composer.clampedTemplateIndex(templates),
@@ -208,4 +237,4 @@ const createView = (api) => ({
   view: () => view(api),
 });
 
-module.exports = { relabelStatus, createView };
+module.exports = { createView };

package/lib/session/watch.js

@@ -4,7 +4,6 @@ const fs = require('node:fs');
 const path = require('node:path');
 
 const DEBOUNCE_MS = 200;
-const POLL_MS = 250;
 
 const SKIP_DIRS = ['node_modules', '.review', 'coverage', 'dist', '.cache'];
 
@@ -45,14 +44,17 @@ const ignoredName = (name) => {
 };
 
 const ignoredGitRel = (parts) => {
+  if (parts[1] === 'logs' && parts[2] === 'HEAD') return false;
   const name = parts[1] ?? '';
   if (!name) return false;
   if (GIT_WATCH_NAMES.includes(name)) return false;
   return true;
 };
 
+const slashRel = (rel) => `${rel}`.replaceAll('\\', '/');
+
 const ignoredRel = (rel) => {
-  const norm = `${rel}`.replaceAll('\\', '/');
+  const norm = slashRel(rel);
   if (!norm || norm === '.') return false;
   const parts = norm.split('/');
   for (const part of parts) {
@@ -95,7 +97,7 @@ const hasFile = (full) => {
 };
 
 const isBareReviewName = (root, dir, rel) => {
-  if (!rel || rel.includes('/') || !rel.endsWith('.md')) return false;
+  if (!rel || rel.includes('/')) return false;
   const base = path.basename(rel);
   if (hasFile(path.join(dir, base))) return false;
   return hasFile(path.join(root, '.review', base));
@@ -133,6 +135,15 @@ const isOwnDirEvent = (dir, name) => {
   }
 };
 
+const unchangedSince = (full, since) => {
+  try {
+    const stat = fs.statSync(full);
+    return Math.max(stat.mtimeMs, stat.ctimeMs) < since;
+  } catch {
+    return false;
+  }
+};
+
 const schedule = (state, timerKey, fire) => {
   if (state.closed || !fire) return;
   if (state[timerKey] !== null) clearTimeout(state[timerKey]);
@@ -154,9 +165,10 @@ const reviewBurst = (state) => {
   return Date.now() - seen < hold;
 };
 
-const scheduleChange = (state) => {
+const scheduleChange = (state, loose = false) => {
+  state.looseChange = loose && (state.timer === null || state.looseChange);
   schedule(state, 'timer', () => {
-    if (reviewBurst(state)) return;
+    if (state.looseChange && reviewBurst(state)) return;
     if (state.onChange) state.onChange();
   });
 };
@@ -164,34 +176,39 @@ const scheduleChange = (state) => {
 const scheduleUnnamed = (state) => {
   if (reviewBurst(state)) return;
   schedule(state, 'looseTimer', () => {
-    if (reviewBurst(state)) return;
-    scheduleChange(state);
+    if (!reviewBurst(state)) scheduleChange(state, true);
   });
 };
 
-const dropChange = (state) => {
-  if (state.timer !== null) clearTimeout(state.timer);
-  if (state.looseTimer !== null) clearTimeout(state.looseTimer);
-  state.timer = null;
-  state.looseTimer = null;
+const clearTimer = (state, timerKey) => {
+  if (state[timerKey] !== null) clearTimeout(state[timerKey]);
+  state[timerKey] = null;
+};
+
+const dropLooseChange = (state) => {
+  clearTimer(state, 'looseTimer');
+  if (state.looseChange) clearTimer(state, 'timer');
 };
 
 const handleWatchEvent = (state, dir, eventType, filename) => {
   if (state.closed) return;
   const name = filename ? `${filename}` : '';
-  const rel = name ? path.relative(state.root, path.join(dir, name)) : '';
+  const rel = name
+    ? slashRel(path.relative(state.root, path.join(dir, name)))
+    : '';
+  const wanted = state.files.has(rel);
   if (isReviewEvent(state.root, dir, name)) {
     state.reviewSeenAt = Date.now();
-    dropChange(state);
-    return void schedule(state, 'reviewTimer', state.onReview);
+    dropLooseChange(state);
+    schedule(state, 'reviewTimer', state.onReview);
+    if (!wanted) return;
   }
-  if (rel && ignoredRel(rel)) return;
-  if (reviewBurst(state)) return;
   if (!name) return void scheduleUnnamed(state);
+  if (!wanted && ignoredRel(rel)) return;
   if (isOwnDirEvent(dir, name)) return;
-  if (eventType === 'rename' && name) {
-    state.watchNewDir(path.join(dir, name));
-  }
+  const full = path.join(dir, name);
+  if (unchangedSince(full, state.startedAt)) return;
+  if (eventType === 'rename') state.watchNewDir(full);
   scheduleChange(state);
 };
 
@@ -263,24 +280,24 @@ const watchGit = (state) => {
   const gitDir = path.resolve(state.root, '.git');
   watchOne(state, gitDir);
   watchOne(state, path.resolve(gitDir, 'refs'));
+  watchOne(state, path.resolve(gitDir, 'logs'));
 };
 
 const stopState = (state) => {
   state.closed = true;
-  if (state.timer !== null) clearTimeout(state.timer);
-  if (state.reviewTimer !== null) clearTimeout(state.reviewTimer);
-  if (state.looseTimer !== null) clearTimeout(state.looseTimer);
-  state.timer = null;
-  state.reviewTimer = null;
-  state.looseTimer = null;
+  clearTimer(state, 'timer');
+  clearTimer(state, 'reviewTimer');
+  clearTimer(state, 'looseTimer');
   while (state.watchers.length) closeWatcher(state.watchers.pop());
   state.watched.clear();
 };
 
 const watchFiles = (state, rels) => {
+  state.files = new Set();
   for (const rel of rels) {
     if (!rel) continue;
     const full = path.resolve(state.root, rel);
+    state.files.add(slashRel(path.relative(state.root, full)));
     watchOne(state, path.dirname(full));
   }
 };
@@ -295,11 +312,14 @@ const createDiskWatcher = (options) => {
     dirWatchOpts: recursive ? { recursive: true } : {},
     watchers: [],
     watched: new Set(),
+    files: new Set(),
     onReview: options.onReview,
     timer: null,
     reviewTimer: null,
     looseTimer: null,
+    looseChange: false,
     reviewSeenAt: 0,
+    startedAt: Date.now(),
     closed: false,
     watchNewDir: (full) => maybeWatchNewDir(state, full),
   };
@@ -315,9 +335,9 @@ const createDiskWatcher = (options) => {
 
 module.exports = {
   DEBOUNCE_MS,
-  POLL_MS,
   canWatchRecursive,
   ignoredRel,
   isOwnDirEvent,
+  unchangedSince,
   createDiskWatcher,
 };

package/lib/session.js

@@ -4,35 +4,53 @@ const render = require('./render/render.js');
 const keys = require('./keys.js');
 const review = require('./review.js');
 const files = require('./files.js');
-const { makeTodoItem } = files;
+const { makeTaskItem } = files;
 const { renderFrame } = render;
 const { decodeChunk } = keys;
 const { AUTOSAVE_MS, hasNotes } = review;
 const capabilities = require('./capabilities.js');
+const actions = require('./session/actions.js');
+const { LIST_PANES } = actions;
 const { sessionCapabilities } = capabilities;
-const { createTerminal, LEAVE_TERM } = require('./session/terminal.js');
-const { createLoadCoordinator } = require('./session/load.js');
+const terminal = require('./session/terminal.js');
+const { createTerminal, LEAVE_TERM } = terminal;
+const load = require('./session/load.js');
+const { LoadCoordinator } = load;
 const items = require('./session/items.js');
-const { createItemCollection } = items;
-const { createNavigation } = require('./session/navigation.js');
-const { createReviewController } = require('./session/review.js');
-const { createUpdateCoordinator } = require('./session/update.js');
-const { createProgress } = require('./session/progress.js');
-const { createComposer } = require('./session/compose.js');
-const { createOpsRunner } = require('./session/ops.js');
-const { createChangeActions } = require('./session/change-actions.js');
-const { createCommitController } = require('./session/commit.js');
-const { createBranchController } = require('./session/branches.js');
-const { createNpmController } = require('./session/npm.js');
+const { ItemCollection } = items;
+const navigation = require('./session/navigation.js');
+const { Navigation } = navigation;
+const sessionReview = require('./session/review.js');
+const { ReviewController } = sessionReview;
+const update = require('./session/update.js');
+const { UpdateCoordinator } = update;
+const progress = require('./session/progress.js');
+const { createProgress } = progress;
+const compose = require('./session/compose.js');
+const { createComposer } = compose;
+const ops = require('./session/ops.js');
+const { OpsRunner } = ops;
+const changeActions = require('./session/change-actions.js');
+const { createChangeActions } = changeActions;
+const commit = require('./session/commit.js');
+const { createCommitController } = commit;
+const branches = require('./session/branches.js');
+const { createBranchController } = branches;
+const npm = require('./session/npm.js');
+const { createNpmController } = npm;
 const accessors = require('./session/accessors.js');
 const { bindAccessors, bindGetters, bindAlias } = accessors;
-const { createView } = require('./session/view.js');
-const { createFilesPane } = require('./session/files-pane.js');
-const { createLifecycle } = require('./session/lifecycle.js');
-const { createPointer } = require('./session/pointer.js');
-const { createDispatcher, createInput } = require('./session/dispatch.js');
+const view = require('./session/view.js');
+const { createView } = view;
+const filesPane = require('./session/files-pane.js');
+const { createFilesPane } = filesPane;
+const lifecycle = require('./session/lifecycle.js');
+const { createLifecycle } = lifecycle;
+const pointer = require('./session/pointer.js');
+const { createPointer } = pointer;
+const dispatch = require('./session/dispatch.js');
+const { createDispatcher, createInput } = dispatch;
 
-const CURSOR_BLINK_MS = 500;
 const PROGRESS_MS = 160;
 
 const NAV_FIELDS = [
@@ -50,19 +68,18 @@ const NAV_FIELDS = [
   'selection',
   'mouseAnchor',
   'pendingClick',
-  'todoOpen',
-  'todoFocus',
+  'tasksOpen',
+  'tasksFocus',
 ];
 
 const COMPOSER_FIELDS = [
   'editor',
   'composeKind',
   'commitKind',
-  'composeTodoId',
+  'composeTaskId',
   'composeBaseline',
   'templateIndex',
   'templateFocus',
-  'blinkOn',
 ];
 
 const assignOptions = (session, options) => {
@@ -95,12 +112,10 @@ const assignOptions = (session, options) => {
     stdout: session.stdout,
     proc: session.proc,
   });
-  session.loader = createLoadCoordinator();
-  session.collection = createItemCollection();
-  session.nav = createNavigation({
-    startPane: options.startPane ?? 'files',
-  });
-  session.review = createReviewController();
+  session.loader = new LoadCoordinator();
+  session.collection = new ItemCollection();
+  session.nav = new Navigation({ startPane: options.startPane ?? 'files' });
+  session.review = new ReviewController();
   session.progress = createProgress(
     session.term,
     () => session.tickProgress(),
@@ -113,19 +128,11 @@ const assignComposer = (session) => {
     nav: session.nav,
     review: session.review,
     ui: session,
-    restartBlink: () => {
-      if (!session.term.hasTimer('blink')) return;
-      session.term.restartTimer(
-        'blink',
-        () => session.tickBlink(),
-        CURSOR_BLINK_MS,
-      );
-    },
   });
 };
 
 const assignControllers = (session) => {
-  session.ops = createOpsRunner(session);
+  session.ops = new OpsRunner(session);
   session.changeActions = createChangeActions(session);
   session.commits = createCommitController(session);
   session.gitBranches = createBranchController(session);
@@ -136,48 +143,14 @@ const bindSessionAccessors = (session) => {
   bindAccessors(session, session.nav, NAV_FIELDS);
   bindAccessors(session, session.composer.state, COMPOSER_FIELDS);
   bindAccessors(session, session.loader, ['pendingExtras']);
-  bindAlias(
-    session,
-    'loadPromise',
-    () => session.loader.promise,
-    (value) => {
-      session.loader.promise = value;
-    },
-  );
+  bindGetters(session, session.loader, ['didLoad']);
   bindAccessors(session, session.collection, ['items']);
   bindGetters(session, session.collection, ['dismissed']);
-  bindAccessors(session, session.updater, ['installPromise']);
+  bindGetters(session, session.updater, ['installPromise']);
   bindAccessors(session, session.ops, ['gitBusy', 'busy']);
   bindAccessors(session, session.gitBranches, ['branches', 'dropName']);
   bindGetters(session, session.term, ['lastFrame', 'lastSize']);
-  bindAlias(session, 'loadGen', () => session.loader.gen);
-  bindAlias(
-    session,
-    'didLoad',
-    () => session.loader.didLoad,
-    (value) => {
-      session.loader.didLoad = value;
-      if (value) session.updater.maybePrompt();
-    },
-  );
   bindAlias(session, 'notes', () => session.review.store);
-  bindAlias(session, 'didResumeReview', () => session.review.didResume);
-  bindAlias(
-    session,
-    'importedRemoteNotes',
-    () => session.review.importedRemote,
-  );
-  bindAlias(
-    session,
-    'updateOffer',
-    () => session.updater.offer,
-    (value) => {
-      session.updater.offer = value;
-    },
-  );
-  bindAlias(session, 'updateFrom', () => session.updater.from);
-  bindAlias(session, 'updateTo', () => session.updater.to);
-  bindAlias(session, 'updatePromise', () => session.updater.checkPromise);
 };
 
 const bindViewer = (session) => {
@@ -222,7 +195,7 @@ const bindDispatch = (session) => {
 
 const composeSession = (session, options) => {
   assignOptions(session, options);
-  session.updater = createUpdateCoordinator(session);
+  session.updater = new UpdateCoordinator(session);
   assignComposer(session);
   assignControllers(session);
   bindSessionAccessors(session);
@@ -254,7 +227,7 @@ class Session {
     this.done = false;
     this.exitCode = 0;
     this.mode = 'review';
-    this.todoItem = makeTodoItem();
+    this.tasksItem = makeTaskItem();
     this.progressFrame = 0;
     this.emptyReview = false;
     this.loadError = null;
@@ -297,10 +270,6 @@ class Session {
     this.lifecycle.ignoreWatch(ms);
   }
 
-  applyLoaded(loaded) {
-    return this.lifecycle.applyLoaded(loaded);
-  }
-
   paint() {
     if (!this.uiOpen) return;
     this.draw();
@@ -314,18 +283,24 @@ class Session {
       height: size.height,
       color: this.color,
     });
-    if (
-      this.pane === 'files' ||
-      this.pane === 'branches' ||
-      this.pane === 'commits' ||
-      this.pane === 'npm'
-    ) {
+    if (LIST_PANES.includes(this.pane)) {
       this.nav.listScroll = frame.listScroll;
     }
-    if (this.nav.todoOpen) this.nav.scroll = frame.scroll;
+    if (this.nav.tasksOpen) this.nav.scroll = frame.scroll;
+    const editScroll = frame.cursor && frame.cursor.scroll;
+    if (this.editor && typeof editScroll === 'number') {
+      this.editor.scrollCol = editScroll;
+    }
     const composing = this.mode === 'compose';
-    const cursor = composing && this.blinkOn ? frame.cursor : null;
-    this.term.paint(frame, size, cursor);
+    this.term.paint(frame, size, composing ? frame.cursor : null);
+    this.scheduleAutosave();
+  }
+
+  scheduleAutosave() {
+    if (!this.finishReadLoop) return;
+    const dirty = this.notes && this.notes.dirty;
+    if (!dirty && this.composeKind === null) return;
+    this.term.later('save', () => this.autosave(), AUTOSAVE_MS);
   }
 
   view() {
@@ -345,7 +320,7 @@ class Session {
   }
 
   current() {
-    return this.nav.current(this.items, this.todoItem);
+    return this.nav.current(this.items, this.tasksItem);
   }
 
   fileCursorEntry() {
@@ -428,10 +403,6 @@ class Session {
     this.composer.startDraftCompose();
   }
 
-  tickBlink() {
-    this.composer.tickBlink();
-  }
-
   autosave() {
     this.composer.autosave();
   }
@@ -536,8 +507,6 @@ class Session {
         onData,
         onResize: () => this.draw(),
       });
-      this.term.startTimer('save', () => this.autosave(), AUTOSAVE_MS);
-      this.term.startTimer('blink', () => this.tickBlink(), CURSOR_BLINK_MS);
       this.lifecycle.startWatch();
     });
   }

package/lib/source.js

@@ -1,8 +1,11 @@
 'use strict';
 
-const { parseGithubPrUrl } = require('./github.js');
-const { parseGitlabMrUrl } = require('./gitlab.js');
-const { capabilitiesFor, attachCapabilities } = require('./capabilities.js');
+const github = require('./github.js');
+const { parseGithubPrUrl } = github;
+const gitlab = require('./gitlab.js');
+const { parseGitlabMrUrl } = gitlab;
+const capabilities = require('./capabilities.js');
+const { capabilitiesFor, attachCapabilities } = capabilities;
 
 const selectChangeSource = (paths) => {
   if (!paths.length) return { kind: 'local', paths };

package/lib/update.js

@@ -4,15 +4,11 @@ const fs = require('node:fs');
 const os = require('node:os');
 const path = require('node:path');
 
-const { jsonParse, isHashObject } = require('metautil');
-const {
-  parseVersion,
-  cmpVersion,
-  npmBin,
-  npmOpts,
-  runProc,
-  oneLine,
-} = require('./utilities.js');
+const metautil = require('metautil');
+const { jsonParse, isHashObject } = metautil;
+const utilities = require('./utilities.js');
+const { parseVersion, cmpVersion, npmBin } = utilities;
+const { npmOpts, runProc, oneLine, asText } = utilities;
 
 const PKG = require('../package.json');
 
@@ -32,8 +28,6 @@ const emptyCache = () => ({
   skipped: '',
 });
 
-const asText = (value) => (typeof value === 'string' ? value : '');
-
 const toInt = (text) => parseInt(text, 10);
 
 const isNpmInstall = (pkgDir) => {
@@ -251,8 +245,6 @@ const checkUpdate = async (options = {}) => {
 
 module.exports = {
   CHECK_INTERVAL_MS,
-  PKG_NAME,
-  PKG_VERSION,
   parseVersion,
   cmpVersion,
   isNpmInstall,

package/lib/utilities.js

@@ -1,7 +1,9 @@
 'use strict';
 
-const { spawn, spawnSync } = require('node:child_process');
-const { split } = require('metautil');
+const childProcess = require('node:child_process');
+const { spawn, spawnSync } = childProcess;
+const metautil = require('metautil');
+const { split } = metautil;
 
 const IS_WIN = process.platform === 'win32';
 const DEFAULT_ENCODING = 'utf8';
@@ -28,6 +30,23 @@ const cmpVersion = (left, right) =>
 const oneLine = (text, fallback = '') =>
   split(`${text ?? ''}`.trim(), '\n')[0] || fallback;
 
+const asText = (value) => (typeof value === 'string' ? value : '');
+
+const unquote = (value) => {
+  const text = `${value ?? ''}`;
+  if (text.length < 2) return text;
+  const open = text[0];
+  const quoted = open === text.at(-1) && (open === '"' || open === '\x27');
+  return quoted ? text.slice(1, -1) : text;
+};
+
+const pad2 = (n) => `${n}`.padStart(2, '0');
+
+const dateStamp = (date) => {
+  const month = pad2(date.getMonth() + 1);
+  return `${date.getFullYear()}-${month}-${pad2(date.getDate())}`;
+};
+
 const npmBin = (platform = process.platform) =>
   platform === 'win32' ? 'npm.cmd' : 'npm';
 
@@ -212,6 +231,10 @@ module.exports = {
   parseVersion,
   cmpVersion,
   oneLine,
+  asText,
+  unquote,
+  pad2,
+  dateStamp,
   npmBin,
   spawnBase,
   npmOpts,
@@ -220,7 +243,6 @@ module.exports = {
   watchResize,
   abortError,
   isAbort,
-  procResult,
   runProcSync,
   runProc,
 };