reslop 0.2.4 → 0.2.6

package/lib/session/unit.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const files = require('../files.js');
-const { listPath, isTodosEntry } = files;
+const { listPath, isTasksEntry } = files;
 const diff = require('../diff/diff.js');
 const { unitLines, itemsForPath, blockLineIndex } = diff;
 const { hunkLineRange, sameHunk, hunkKey } = diff;
@@ -150,10 +150,10 @@ const moveUnitBlock = (ui, step) => {
 };
 
 const openUnitFile = (ui, entry) => {
-  if (!entry || isTodosEntry(entry)) return;
+  if (!entry || isTasksEntry(entry)) return;
   const nav = ui.nav;
   nav.reviewPath = entry.path;
-  nav.todoOpen = false;
+  nav.tasksOpen = false;
   nav.pane = 'unit';
   nav.scroll = 0;
   nav.unitLine = 0;
@@ -203,6 +203,5 @@ module.exports = {
   openUnitFile,
   setFileScope,
   editCursor,
-  ensureVisible,
   followFileCursor,
 };

package/lib/session/update.js

@@ -1,113 +1,92 @@
 'use strict';
 
-const accessors = require('./accessors.js');
-const { stateView } = accessors;
-
 const update = require('../update.js');
 const { checkUpdate, installUpdate, markSkipped } = update;
 
-const optsOf = (api) => {
-  const value = api.ui.updateOpts;
-  if (!value || value === true) return {};
-  return value;
-};
-
-const reset = (state) => {
-  state.offer = false;
-  state.from = '';
-  state.to = '';
-  state.checkPromise = null;
-  state.installPromise = null;
-};
+class UpdateCoordinator {
+  constructor(ui) {
+    this.ui = ui;
+    this.reset();
+  }
 
-const maybePrompt = (api) => {
-  if (!api.state.offer) return;
-  if (!api.ui.loader.didLoad) return;
-  if (api.ui.mode !== 'review') return;
-  api.ui.mode = 'confirmUpdate';
-};
+  get opts() {
+    const value = this.ui.updateOpts;
+    if (!value || value === true) return {};
+    return value;
+  }
 
-const runInstall = async (api, version) => {
-  api.ui.status = 'updating reslop';
-  api.ui.progressFrame = 0;
-  api.ui.progress.start('install');
-  api.ui.paint();
-  let ok = false;
-  try {
-    await installUpdate(version, optsOf(api));
-    ok = true;
-  } catch {
-    // ignore install errors
+  reset() {
+    this.offer = false;
+    this.from = '';
+    this.to = '';
+    this.checkPromise = null;
+    this.installPromise = null;
   }
-  api.ui.progress.stop('install');
-  if (api.ui.done || !api.ui.uiOpen) return;
-  api.ui.status = ok ? 'updated' : 'update failed';
-  api.ui.paint();
-};
 
-const acceptUpdate = (api) => {
-  api.ui.mode = 'review';
-  api.state.offer = false;
-  const version = api.state.to;
-  api.state.installPromise = runInstall(api, version);
-};
+  maybePrompt() {
+    const { ui } = this;
+    if (!this.offer || !ui.loader.didLoad) return;
+    if (ui.mode === 'review') ui.mode = 'confirmUpdate';
+  }
 
-const declineUpdate = (api) => {
-  api.ui.mode = 'review';
-  api.state.offer = false;
-  api.ui.status = '';
-  markSkipped(api.state.to, optsOf(api));
-};
+  async install(version) {
+    const { ui } = this;
+    ui.status = 'updating reslop';
+    ui.progressFrame = 0;
+    ui.progress.start('install');
+    ui.paint();
+    let ok = false;
+    try {
+      await installUpdate(version, this.opts);
+      ok = true;
+    } catch {
+      // ignore install errors
+    }
+    ui.progress.stop('install');
+    if (ui.done || !ui.uiOpen) return;
+    ui.status = ok ? 'updated' : 'update failed';
+    ui.paint();
+  }
 
-const runOpenUpdate = async (api) => {
-  let plan;
-  try {
-    plan = await checkUpdate(optsOf(api));
-  } catch {
-    return;
+  accept() {
+    this.ui.mode = 'review';
+    this.offer = false;
+    this.installPromise = this.install(this.to);
   }
-  if (api.ui.done) return;
-  if (plan.action === 'install') {
-    api.state.installPromise = runInstall(api, plan.latest);
-    await api.state.installPromise;
-    return;
+
+  decline() {
+    this.ui.mode = 'review';
+    this.offer = false;
+    this.ui.status = '';
+    markSkipped(this.to, this.opts);
   }
-  if (plan.action !== 'confirm') return;
-  api.state.from = plan.current;
-  api.state.to = plan.latest;
-  api.state.offer = true;
-  maybePrompt(api);
-  api.ui.paint();
-};
 
-const openUpdate = (api) => {
-  if (api.ui.updateOpts === false) return Promise.resolve();
-  if (api.state.checkPromise) return api.state.checkPromise;
-  api.state.checkPromise = runOpenUpdate(api);
-  return api.state.checkPromise;
-};
+  async check() {
+    let plan;
+    try {
+      plan = await checkUpdate(this.opts);
+    } catch {
+      return;
+    }
+    if (this.ui.done) return;
+    if (plan.action === 'install') {
+      this.installPromise = this.install(plan.latest);
+      await this.installPromise;
+      return;
+    }
+    if (plan.action !== 'confirm') return;
+    this.from = plan.current;
+    this.to = plan.latest;
+    this.offer = true;
+    this.maybePrompt();
+    this.ui.paint();
+  }
 
-const createUpdateCoordinator = (ui) => {
-  const state = {
-    offer: false,
-    from: '',
-    to: '',
-    checkPromise: null,
-    installPromise: null,
-  };
-  const api = { ui, state };
-  return stateView(
-    state,
-    {
-      reset: () => reset(state),
-      maybePrompt: () => maybePrompt(api),
-      accept: () => acceptUpdate(api),
-      decline: () => declineUpdate(api),
-      open: () => openUpdate(api),
-    },
-    ['offer', 'installPromise'],
-    ['from', 'to', 'checkPromise'],
-  );
-};
+  open() {
+    if (this.ui.updateOpts === false) return Promise.resolve();
+    if (!this.checkPromise) this.checkPromise = this.check();
+    return this.checkPromise;
+  }
+}
 
-module.exports = { createUpdateCoordinator };
+module.exports = { UpdateCoordinator };

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_TODOS_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 todosEntry = (counts) => ({
-  path: REPO_TODOS_LABEL,
-  kind: 'todos',
-  status: 'todos',
-  remaining: counts.todo,
-  staged: counts.todoDone,
-  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,63 +68,51 @@ 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(todosEntry(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,
     untracked: 0,
     commit: 0,
     pr: 0,
-    todo: 0,
+    tasks: 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.todo = notes.todo;
+  next.tasks = notes.tasks;
   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);
-  }
-  return '';
-};
+const viewStatus = (ui) => ui.status || ui.busy;
 
-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 +123,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 +139,34 @@ 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,
     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,
@@ -205,9 +176,12 @@ 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),
+    repoName: repoNameOf(ui),
     rev: ui.rev || '',
     revShort: ui.revShort || '',
     sourceLabel: ui.sourceLabel || '',
@@ -215,23 +189,18 @@ const view = (api) => {
     mode: ui.mode,
     compose: composer.composeView(),
     noteText: composer.idleNoteText(),
-    todos: composer.todoTexts(),
-    todoFocus: composer.clampedTodoFocus(),
-    todoEdit: composer.todoEditView(),
+    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,
+    dashboard: nav.pane === 'dashboard' ? ui.dashboard.view() : null,
   };
 };
 
-const createView = (api) => ({
-  fileList: () => fileList(api),
-  counts: () => counts(api),
-  viewStatus: () => viewStatus(api),
-  view: () => view(api),
-});
-
-module.exports = { relabelStatus, createView };
+module.exports = { fileList, counts, viewStatus, view };