reslop 0.2.5 → 0.2.7

package/lib/session/terminal.js

@@ -10,152 +10,105 @@ const LEAVE_TERM =
   '\x1b[?1006l\x1b[?1002l\x1b[?7h\x1b[0 q\x1b[?12l\x1b[?25h\x1b[?1049l';
 
 const sameCursor = (a, b) => {
-  if (!a && !b) return true;
-  if (!a || !b) return false;
+  if (!a || !b) return !a && !b;
   return a.x === b.x && a.y === b.y;
 };
 
-const hasTimer = (api, name) => api.timers.has(name);
+const sameSize = (a, b) =>
+  a !== null && a.width === b.width && a.height === b.height;
+
+class Terminal {
+  constructor({ stdin = null, stdout, proc = process }) {
+    this.stdin = stdin;
+    this.stdout = stdout;
+    this.proc = proc;
+    this.timers = new Map();
+    this.disposers = [];
+    this.open = false;
+    this.disposed = false;
+    this.resetCache();
+  }
 
-const cancel = (api, name) => {
-  const id = api.timers.get(name);
-  if (id === undefined) return;
-  clearTimeout(id);
-  api.timers.delete(name);
-};
+  resetCache() {
+    this.carry = '';
+    this.lastFrame = null;
+    this.lastCursor = null;
+    this.lastSize = null;
+  }
 
-const later = (api, name, fn, ms) => {
-  if (api.state.disposed || api.timers.has(name)) return;
-  const id = setTimeout(() => {
-    api.timers.delete(name);
-    fn();
-  }, ms);
-  if (typeof id.unref === 'function') id.unref();
-  api.timers.set(name, id);
-};
+  hasTimer(name) {
+    return this.timers.has(name);
+  }
 
-const clearTimers = (api) => {
-  for (const name of [...api.timers.keys()]) cancel(api, name);
-};
+  cancel(name) {
+    const id = this.timers.get(name);
+    if (id === undefined) return;
+    clearTimeout(id);
+    this.timers.delete(name);
+  }
 
-const stopListening = (api) => {
-  while (api.disposers.length) {
-    const stop = api.disposers.pop();
-    stop();
+  later(name, fn, ms) {
+    if (this.disposed || this.timers.has(name)) return;
+    const id = setTimeout(() => {
+      this.timers.delete(name);
+      fn();
+    }, ms);
+    id.unref();
+    this.timers.set(name, id);
   }
-};
 
-const enter = (api) => {
-  if (api.state.disposed) return;
-  const { stdin, stdout, state } = api;
-  if (stdin && stdin.setRawMode) stdin.setRawMode(true);
-  if (stdin && typeof stdin.resume === 'function') stdin.resume();
-  stdout.write(ENTER_TERM);
-  state.open = true;
-};
+  clearTimers() {
+    for (const id of this.timers.values()) clearTimeout(id);
+    this.timers.clear();
+  }
 
-const leave = (api) => {
-  if (!api.state.open) return;
-  api.stdout.write(LEAVE_TERM);
-  if (api.stdin && api.stdin.setRawMode) api.stdin.setRawMode(false);
-  api.state.open = false;
-};
+  enter() {
+    if (this.disposed) return;
+    const stdin = this.stdin;
+    if (stdin && stdin.setRawMode) stdin.setRawMode(true);
+    if (stdin && stdin.resume) stdin.resume();
+    this.stdout.write(ENTER_TERM);
+    this.open = true;
+  }
 
-const resetCache = (api) => {
-  api.state.carry = '';
-  api.state.lastFrame = null;
-  api.state.lastPresentedCursor = null;
-  api.state.lastSize = null;
-};
+  leave() {
+    if (!this.open) return;
+    this.stdout.write(LEAVE_TERM);
+    if (this.stdin && this.stdin.setRawMode) this.stdin.setRawMode(false);
+    this.open = false;
+  }
 
-const close = (api) => {
-  stopListening(api);
-  clearTimers(api);
-  leave(api);
-  api.state.disposed = true;
-};
+  close() {
+    this.stopListening();
+    this.clearTimers();
+    this.leave();
+    this.disposed = true;
+  }
 
-const startListening = (api, handlers) => {
-  if (api.state.disposed) return;
-  const onData = (chunk) => handlers.onData(chunk);
-  const onResize = () => handlers.onResize();
-  api.disposers.push(listen(api.stdin, 'data', onData));
-  api.disposers.push(watchResize(api.stdout, api.proc, onResize));
-};
+  startListening({ onData, onResize }) {
+    if (this.disposed) return;
+    this.disposers.push(listen(this.stdin, 'data', onData));
+    this.disposers.push(watchResize(this.stdout, this.proc, onResize));
+  }
 
-const paint = (api, frame, size, cursor) => {
-  if (api.state.disposed) return;
-  const lastSize = api.state.lastSize;
-  const resized =
-    !lastSize ||
-    lastSize.width !== size.width ||
-    lastSize.height !== size.height;
-  if (
-    !resized &&
-    api.state.lastFrame &&
-    api.state.lastFrame.text === frame.text
-  ) {
-    api.state.lastFrame = frame;
-    if (sameCursor(api.state.lastPresentedCursor, cursor)) return;
-    api.state.lastPresentedCursor = cursor;
-    api.stdout.write(presentCursor(cursor));
-    return;
+  stopListening() {
+    while (this.disposers.length) this.disposers.pop()();
   }
-  api.state.lastSize = size;
-  api.state.lastFrame = frame;
-  api.state.lastPresentedCursor = cursor;
-  api.stdout.write(presentRows(frame.rows, { clear: resized, cursor }));
-};
 
-const createTerminal = (options) => {
-  const state = {
-    open: false,
-    disposed: false,
-    carry: '',
-    lastFrame: null,
-    lastPresentedCursor: null,
-    lastSize: null,
-  };
-  const api = {
-    stdin: options.stdin ?? null,
-    stdout: options.stdout,
-    proc: options.proc ?? process,
-    timers: new Map(),
-    disposers: [],
-    state,
-  };
-  return {
-    get lastFrame() {
-      return state.lastFrame;
-    },
-    get lastSize() {
-      return state.lastSize;
-    },
-    get carry() {
-      return state.carry;
-    },
-    set carry(value) {
-      state.carry = value;
-    },
-    get disposed() {
-      return state.disposed;
-    },
-    enter: () => enter(api),
-    leave: () => leave(api),
-    close: () => close(api),
-    paint: (frame, size, cursor) => paint(api, frame, size, cursor),
-    startListening: (handlers) => startListening(api, handlers),
-    stopListening: () => stopListening(api),
-    later: (name, fn, ms) => later(api, name, fn, ms),
-    cancel: (name) => cancel(api, name),
-    clearTimers: () => clearTimers(api),
-    hasTimer: (name) => hasTimer(api, name),
-    resetCache: () => resetCache(api),
-  };
-};
+  paint(frame, size, cursor) {
+    if (this.disposed) return;
+    const resized = !sameSize(this.lastSize, size);
+    const last = this.lastFrame;
+    this.lastFrame = frame;
+    if (!resized && last && last.text === frame.text) {
+      if (sameCursor(this.lastCursor, cursor)) return;
+      this.lastCursor = cursor;
+      return void this.stdout.write(presentCursor(cursor));
+    }
+    this.lastSize = size;
+    this.lastCursor = cursor;
+    this.stdout.write(presentRows(frame.rows, { clear: resized, cursor }));
+  }
+}
 
-module.exports = {
-  ENTER_TERM,
-  LEAVE_TERM,
-  createTerminal,
-};
+module.exports = { ENTER_TERM, LEAVE_TERM, Terminal };

package/lib/session/view.js

@@ -5,11 +5,12 @@ const path = require('node:path');
 const files = require('../files.js');
 const commit = require('./commit.js');
 const { listedCommits } = commit;
-const { fileEntries, fileTotals, REPO_TASKS_LABEL } = files;
+const { fileEntries, fileTotals } = files;
 const review = require('../review.js');
 const { noteCounts } = review;
 const diff = require('../diff/diff.js');
 const { unitLines, itemsForPath, splitEditor, mergeEditRows } = diff;
+const unit = require('./unit.js');
 
 const relabelStatus = (entries, from, to) => {
   if (!to) return entries;
@@ -19,29 +20,11 @@ const relabelStatus = (entries, from, to) => {
   });
 };
 
-const repoNameOf = (api) => {
-  const { ui } = api;
+const repoNameOf = (ui) => {
   if (ui.repoName) return ui.repoName;
   return path.basename(ui.top || ui.cwd || '');
 };
 
-const tasksEntry = (counts) => ({
-  path: REPO_TASKS_LABEL,
-  kind: 'tasks',
-  status: 'tasks',
-  remaining: counts.tasks,
-  staged: counts.tasksDone,
-  firstIndex: 0,
-  openIndex: 0,
-  added: 0,
-  removed: 0,
-  stagedAdded: 0,
-  stagedRemoved: 0,
-  unstagedAdded: 0,
-  unstagedRemoved: 0,
-  unstaged: 0,
-});
-
 const blankEntry = (rel) => ({
   path: rel,
   origins: [],
@@ -60,12 +43,12 @@ const blankEntry = (rel) => ({
   status: '',
 });
 
-const listedNames = (api) => {
-  const repo = api.ui.repo;
-  if (!repo || typeof repo.listFiles !== 'function') return [];
+const listedNames = (ui) => {
+  const repo = ui.repo;
+  if (!repo.listFiles) return [];
   try {
-    return repo.listFiles(api.ui.top || api.ui.cwd, api.ui.paths ?? [], {
-      commit: api.ui.rev,
+    return repo.listFiles(ui.top || ui.cwd, ui.paths ?? [], {
+      commit: ui.rev,
     });
   } catch {
     return [];
@@ -85,20 +68,18 @@ const mergeUnitFiles = (entries, names) => {
   return merged;
 };
 
-const fileList = (api, notes = noteCounts(api.review.store)) => {
-  const entries = fileEntries(api.collection.items);
-  const sourceLabel = api.ui.sourceLabel;
+const fileList = (ui) => {
+  const entries = fileEntries(ui.collection.items);
+  const sourceLabel = ui.sourceLabel;
   const from = sourceLabel ? 'pr' : 'commit';
-  const to = sourceLabel || api.ui.revShort;
+  const to = sourceLabel || ui.revShort;
   const labeled = relabelStatus(entries, from, to);
-  const names = listedNames(api);
-  const scoped =
-    api.nav.fileScope === 'file' ? mergeUnitFiles(labeled, names) : labeled;
-  scoped.unshift(tasksEntry(notes));
-  return scoped;
+  const names = listedNames(ui);
+  if (ui.nav.fileScope === 'file') return mergeUnitFiles(labeled, names);
+  return labeled;
 };
 
-const counts = (api, notes = noteCounts(api.review.store)) => {
+const counts = (ui, notes = noteCounts(ui.review.store)) => {
   const next = {
     staged: 0,
     unstaged: 0,
@@ -106,42 +87,37 @@ const counts = (api, notes = noteCounts(api.review.store)) => {
     commit: 0,
     pr: 0,
     tasks: 0,
+    tasksDone: 0,
     feedback: 0,
     code: 0,
   };
-  for (const item of api.collection.items) {
+  for (const item of ui.collection.items) {
     if (!Object.hasOwn(next, item.origin)) continue;
     next[item.origin] += 1;
   }
   next.feedback = notes.feedback;
   next.tasks = notes.tasks;
+  next.tasksDone = notes.tasksDone;
   next.code = notes.code;
   return next;
 };
 
-const viewStatus = (api) => api.ui.status || api.ui.busy;
-
-const unitFileText = (api) => {
-  const rel = api.nav.reviewPath;
-  if (!rel) return '';
-  const repo = api.ui.repo;
-  if (repo && typeof repo.fileText === 'function') {
-    return repo.fileText(api.ui.top, rel, api.ui.rev);
-  }
+const viewStatus = (ui) => {
+  if (ui.status || ui.busy) return ui.status || ui.busy;
   return '';
 };
 
-const unitBodyLines = (api) => {
-  if (api.nav.pane !== 'unit') return [];
-  const rel = api.nav.reviewPath;
-  const group = itemsForPath(api.collection.items, rel);
-  const live = api.composer.liveFileText();
+const unitBodyLines = (ui) => {
+  if (ui.nav.pane !== 'unit') return [];
+  const rel = ui.nav.reviewPath;
+  const group = itemsForPath(ui.collection.items, rel);
+  const live = ui.composer.liveFileText();
   if (live !== null) {
-    const base = api.composer.fileEditRows();
+    const base = ui.composer.fileEditRows;
     if (base && base.length) return mergeEditRows(base, splitEditor(live));
     return mergeEditRows(unitLines(live, group), splitEditor(live));
   }
-  return unitLines(unitFileText(api), group);
+  return unitLines(unit.fileText(ui, rel), group);
 };
 
 const pendingLines = (items, rev, revShort) => {
@@ -152,10 +128,10 @@ const pendingLines = (items, rev, revShort) => {
   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;
+const commitRows = (ui) => {
+  const rows = listedCommits(ui.commits.commits);
+  const lines = pendingLines(ui.collection.items, ui.rev, ui.revShort);
+  if (!lines) return rows;
   rows[0] = {
     ...rows[0],
     added: lines.added,
@@ -168,34 +144,35 @@ const commitRows = (api) => {
   return rows;
 };
 
-const view = (api) => {
-  const { composer, nav, ui, gitBranches, commits, npm, updater } = api;
-  const templates = composer.shownTemplates();
+const view = (ui) => {
+  const { composer, nav, gitBranches, commits, npm, updater } = ui;
+  const templates = composer.templates.shownTemplates();
   const change = ui.change;
   const sourceKind = (change && change.source) || '';
-  const notes = noteCounts(api.review.store);
+  const notes = noteCounts(ui.review.store);
   return {
     item: ui.current(),
     index: nav.index,
-    total: api.collection.items.length,
+    total: ui.collection.items.length,
     scroll: nav.scroll,
     listScroll: nav.listScroll,
-    status: viewStatus(api),
+    status: viewStatus(ui),
     progressFrame: ui.progressFrame,
     layout: ui.layout,
-    counts: counts(api, notes),
+    counts: counts(ui, notes),
     selection: nav.selection,
     pane: nav.pane,
     fileScope: nav.fileScope,
-    files: fileList(api, notes),
+    files: fileList(ui),
     fileCursor: nav.fileCursor,
+    find: nav.find,
     reviewPath: nav.reviewPath,
     unitLine: nav.unitLine,
-    unitLines: unitBodyLines(api),
+    unitLines: unitBodyLines(ui),
     branch: ui.branch,
     branches: gitBranches.branches,
     branchCursor: nav.branchCursor,
-    commits: commitRows(api),
+    commits: commitRows(ui),
     commitCursor: nav.commitCursor,
     commitView: commits.commitView,
     npmCommands: npm.commands,
@@ -210,7 +187,7 @@ const view = (api) => {
     npmDraftCommand: npm.draftCommand,
     npmRunning: npm.running,
     npmLogs: nav.pane === 'npm' ? npm.logLabel : '',
-    repoName: repoNameOf(api),
+    repoName: repoNameOf(ui),
     rev: ui.rev || '',
     revShort: ui.revShort || '',
     sourceLabel: ui.sourceLabel || '',
@@ -218,23 +195,25 @@ const view = (api) => {
     mode: ui.mode,
     compose: composer.composeView(),
     noteText: composer.idleNoteText(),
-    tasks: composer.taskTexts(),
-    tasksFocus: composer.clampedTaskFocus(),
-    taskEdit: composer.taskEditView(),
+    tasks: composer.tasks.taskTexts(),
+    taskSections: composer.tasks.taskSections(),
+    tasksFocus: composer.tasks.clampedTaskFocus(),
+    taskEdit: composer.tasks.taskEditView(),
     codeOverlay: composer.codeOverlayView(),
     templates,
-    templateIndex: composer.clampedTemplateIndex(templates),
+    templateIndex: composer.templates.clampedTemplateIndex(templates),
     updateFrom: updater.from,
     updateTo: updater.to,
-    dropName: gitBranches.dropName || commits.dropName || npm.dropName,
+    dropName:
+      ui.packages.dropName ||
+      gitBranches.dropName ||
+      commits.dropName ||
+      npm.dropName,
+    dashboard: nav.pane === 'dashboard' ? ui.dashboard.view() : null,
+    packages: nav.pane === 'packages' ? ui.dashboard.packagesView() : null,
+    packagesCursor: nav.packagesCursor,
+    repos: nav.pane === 'repos' ? ui.workspace.view() : null,
   };
 };
 
-const createView = (api) => ({
-  fileList: () => fileList(api),
-  counts: () => counts(api),
-  viewStatus: () => viewStatus(api),
-  view: () => view(api),
-});
-
-module.exports = { createView };
+module.exports = { fileList, counts, viewStatus, view };