reslop 0.2.5 → 0.2.7

package/lib/session/ops.js

@@ -6,17 +6,8 @@ const QUIET_KIND = new Set(['staged', 'unstaged']);
 const pickRepoWrite = (repo, name, uiOpen) => {
   const asyncFn = repo[`${name}Async`];
   const allowAsync = uiOpen === true || ASYNC_WITHOUT_UI.includes(name);
-  if (allowAsync && typeof asyncFn === 'function') {
-    return {
-      async: true,
-      write: (top, ...args) => asyncFn(top, ...args),
-    };
-  }
-  const syncFn = repo[name];
-  return {
-    async: false,
-    write: (top, ...args) => syncFn(top, ...args),
-  };
+  const isAsync = allowAsync && typeof asyncFn === 'function';
+  return { async: isAsync, write: isAsync ? asyncFn : repo[name] };
 };
 
 const showsBusy = (kind) => Boolean(kind) && !QUIET_KIND.has(kind);
@@ -86,7 +77,6 @@ class ChangeQueue {
 
   startReload() {
     const { ui } = this;
-    if (typeof ui.reloadAfterChange !== 'function') return void ui.paint();
     this.reloading = true;
     ui.reloadAfterChange(() => {
       this.reloading = false;
@@ -231,15 +221,17 @@ class OpsRunner {
     this.finishBusy(done, after);
   }
 
-  runWrite(name, args, kind, done, after) {
+  runWrite(name, args, kind, done, after, leave = null) {
     const { ui } = this;
     const picked = pickRepoWrite(ui.repo, name, ui.uiOpen);
     const write = (top) => picked.write(top, ...args);
     if (picked.async) {
+      if (leave) leave();
       const refresh = () => after({ doneStatus: done });
       return void this.runBusy(kind, done, write, refresh);
     }
     if (!this.runRepo(done, write)) return;
+    if (leave) leave();
     after({});
     if (!ui.status) ui.status = done;
   }

package/lib/session/packages.js

@@ -0,0 +1,143 @@
+'use strict';
+
+const utilities = require('../utilities.js');
+const { IS_WIN, npmBin, oneLine, runProc } = utilities;
+
+const INSTALL_MS = 120000;
+
+class PackageController {
+  constructor(ui) {
+    this.ui = ui;
+    this.dropName = '';
+    this.addDev = false;
+    this.running = false;
+    this.job = null;
+  }
+
+  rows() {
+    const data = this.ui.dashboard.packagesView();
+    const modules = data.modules;
+    return modules && modules.packages ? modules.packages : [];
+  }
+
+  selected() {
+    return this.rows()[this.ui.nav.packagesCursor] ?? null;
+  }
+
+  canWrite() {
+    if (this.running) return false;
+    const ui = this.ui;
+    const caps = ui.capabilities;
+    if (!ui.readOnly && (!caps || caps.changes !== false)) return true;
+    ui.status = 'read only';
+    return false;
+  }
+
+  need() {
+    if (!this.canWrite()) return null;
+    const pkg = this.selected();
+    if (pkg) return pkg;
+    this.ui.status = 'not a package';
+    return null;
+  }
+
+  create() {
+    if (!this.canWrite()) return;
+    const pkg = this.selected();
+    if (pkg && pkg.transitive) {
+      this.ui.status = 'transitive';
+      return;
+    }
+    this.addDev = Boolean(pkg && pkg.dev);
+    this.ui.composer.openCompose('package', '');
+  }
+
+  finishAdd() {
+    const editor = this.ui.composer.editor;
+    if (!editor) return;
+    const name = editor.text.trim();
+    if (!name || /\s/.test(name) || name.startsWith('-')) {
+      this.ui.status = 'name';
+      return;
+    }
+    const args = ['install', name];
+    if (this.addDev) args.push('--save-dev');
+    this.ui.composer.closeCompose();
+    this.job = this.exec(args, 'npm i', `installed ${name}`);
+  }
+
+  askDrop() {
+    const pkg = this.need();
+    if (!pkg) return;
+    if (pkg.transitive) {
+      this.ui.status = 'transitive';
+      return;
+    }
+    this.dropName = pkg.name;
+    this.ui.mode = 'confirmDrop';
+    this.ui.status = '';
+  }
+
+  cancelDrop() {
+    this.dropName = '';
+    this.ui.mode = 'review';
+    this.ui.status = '';
+  }
+
+  confirmDrop() {
+    const name = this.dropName;
+    this.dropName = '';
+    this.ui.mode = 'review';
+    if (!name) return;
+    const done = `dropped ${name}`;
+    this.job = this.exec(['uninstall', name], 'npm uninstall', done);
+  }
+
+  updateWanted() {
+    const pkg = this.need();
+    if (!pkg) return;
+    const done = `updated ${pkg.name}`;
+    this.job = this.exec(['update', pkg.name], 'npm i', done);
+  }
+
+  updateLatest() {
+    const pkg = this.need();
+    if (!pkg) return;
+    const args = ['install', `${pkg.name}@latest`];
+    if (pkg.dev) args.push('--save-dev');
+    this.job = this.exec(args, 'npm i', `updated ${pkg.name}`);
+  }
+
+  async exec(args, busy, done) {
+    const ui = this.ui;
+    this.running = true;
+    ui.status = '';
+    ui.ops.setBusy(busy);
+    ui.ignoreWatch(INSTALL_MS);
+    ui.paint();
+    let result;
+    try {
+      const hook = ui.repo && ui.repo.runPackage;
+      const options = { cwd: ui.top, shell: IS_WIN };
+      result = hook
+        ? await hook(ui.top, args)
+        : await runProc(npmBin(), args, options);
+    } catch (error) {
+      result = { error, status: 1, stderr: '' };
+    }
+    this.running = false;
+    ui.ops.clearBusy();
+    const failed = !result || result.error || result.status;
+    if (failed) {
+      const message = result && result.error ? result.error.message : '';
+      const stderr = result ? result.stderr : '';
+      ui.status = oneLine(stderr, message || 'npm failed');
+    } else {
+      ui.status = done;
+      ui.dashboard.tasks.npm.request();
+    }
+    ui.paint();
+  }
+}
+
+module.exports = { PackageController };

package/lib/session/pointer.js

@@ -2,6 +2,7 @@
 
 const select = require('../select.js');
 const editClick = require('./edit-click.js');
+const filesPane = require('./files-pane.js');
 const { extractText, isRange } = select;
 const keys = require('../keys.js');
 const { hitAction } = keys;
@@ -94,7 +95,19 @@ const RELEASE_TARGETS = [
     hits: 'statusHits',
     onHit: (ui, hit) => {
       if (hit.id === 'branch') return void ui.gitBranches.onBranch();
-      ui.input.confirmChoice(hit.id);
+      ui.confirmChoice(hit.id);
+    },
+  },
+  {
+    match: (ui) => ui.pane === 'dashboard',
+    hits: 'fileHits',
+    onHit: (ui, hit) => ui.dashboard.open(hit.cursor),
+  },
+  {
+    match: (ui) => ui.pane === 'repos',
+    hits: 'fileHits',
+    onHit: (ui, hit) => {
+      void ui.workspace.openAt(hit.cursor);
     },
   },
   {
@@ -103,7 +116,7 @@ const RELEASE_TARGETS = [
     onHit: (ui, hit) => {
       const again = armDoubleClick(ui.nav, 'files', hit.cursor);
       ui.nav.fileCursor = hit.cursor;
-      if (again) ui.filesPane.onOpenFile();
+      if (again) filesPane.onOpenFile(ui);
     },
   },
   {
@@ -122,7 +135,14 @@ const RELEASE_TARGETS = [
       if (ui.mode === 'compose') return;
       const again = armDoubleClick(ui.nav, 'commits', hit.cursor);
       ui.nav.commitCursor = hit.cursor;
-      if (again) ui.filesPane.onOpenFile();
+      if (again) filesPane.onOpenFile(ui);
+    },
+  },
+  {
+    match: (ui) => ui.pane === 'packages',
+    hits: 'fileHits',
+    onHit: (ui, hit) => {
+      ui.nav.packagesCursor = hit.cursor;
     },
   },
   {
@@ -135,11 +155,11 @@ const RELEASE_TARGETS = [
     },
   },
   {
-    match: (ui) => ui.pane === 'diff',
+    match: (ui) => ui.pane === 'tasks',
     hits: 'taskHits',
     onHit: (ui, hit) => {
-      if (hit.check) return void ui.composer.onTaskCheck(hit.cursor);
-      ui.composer.onTaskHit(hit.cursor);
+      if (hit.check) return void ui.composer.tasks.onTaskCheck(hit.cursor);
+      ui.composer.tasks.onTaskHit(hit.cursor);
     },
   },
   {
@@ -171,14 +191,14 @@ const onRelease = (ui, event) => {
 };
 
 const POINTER_HANDLERS = {
-  wheelUp: (ui) => ui.filesPane.onScroll(-1),
-  wheelDown: (ui) => ui.filesPane.onScroll(1),
+  wheelUp: (ui) => filesPane.onScroll(ui, -1),
+  wheelDown: (ui) => filesPane.onScroll(ui, 1),
   press: onPress,
   drag: onDrag,
   release: onRelease,
 };
 
-const handle = (ui, event) => {
+const handlePointer = (ui, event) => {
   const kind = event.kind;
   const handler = POINTER_HANDLERS[kind];
   if (!handler) return;
@@ -187,8 +207,4 @@ const handle = (ui, event) => {
   handler(ui, event);
 };
 
-const createPointer = (ui) => ({
-  handle: (event) => handle(ui, event),
-});
-
-module.exports = { createPointer };
+module.exports = { handlePointer };

package/lib/session/progress.js

@@ -1,32 +1,41 @@
 'use strict';
 
-const createProgress = (term, onTick, intervalMs) => {
-  const active = new Set();
-
-  const tick = () => {
-    if (!active.size) return;
-    onTick();
-    term.later('progress', tick, intervalMs);
-  };
-
-  const start = (id) => {
-    active.add(id);
-    term.later('progress', tick, intervalMs);
-  };
-
-  const stop = (id) => {
-    active.delete(id);
-    if (active.size === 0) term.cancel('progress');
-  };
-
-  const clear = () => {
-    active.clear();
-    term.cancel('progress');
-  };
-
-  const size = () => active.size;
-
-  return { start, stop, clear, size };
-};
-
-module.exports = { createProgress };
+class Progress {
+  constructor(term, onTick, intervalMs) {
+    this.term = term;
+    this.onTick = onTick;
+    this.intervalMs = intervalMs;
+    this.active = new Set();
+  }
+
+  tick() {
+    if (!this.active.size) return;
+    this.onTick();
+    this.schedule();
+  }
+
+  schedule() {
+    this.term.later('progress', () => this.tick(), this.intervalMs);
+  }
+
+  start(id) {
+    this.active.add(id);
+    this.schedule();
+  }
+
+  stop(id) {
+    this.active.delete(id);
+    if (!this.active.size) this.term.cancel('progress');
+  }
+
+  clear() {
+    this.active.clear();
+    this.term.cancel('progress');
+  }
+
+  size() {
+    return this.active.size;
+  }
+}
+
+module.exports = { Progress };

package/lib/session/review.js

@@ -7,9 +7,7 @@ const { loadReview, flushReview } = review;
 
 class ReviewController {
   constructor() {
-    this.store = null;
-    this.didResume = false;
-    this.importedRemote = false;
+    this.reset();
   }
 
   reset() {