reslop 0.2.4 → 0.2.6

package/lib/session.js

@@ -1,57 +1,52 @@
 'use strict';
 
 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 { renderFrame } = render;
+const keys = require('./keys.js');
 const { decodeChunk } = keys;
+const review = require('./review.js');
 const { AUTOSAVE_MS, hasNotes } = review;
+const files = require('./files.js');
+const { makeTaskItem } = files;
 const capabilities = require('./capabilities.js');
+const { sessionCapabilities } = capabilities;
 const actions = require('./session/actions.js');
 const { LIST_PANES } = actions;
-const { sessionCapabilities } = capabilities;
 const terminal = require('./session/terminal.js');
-const { createTerminal, LEAVE_TERM } = terminal;
+const { Terminal, LEAVE_TERM } = terminal;
 const load = require('./session/load.js');
-const { createLoadCoordinator } = load;
+const { LoadCoordinator } = load;
 const items = require('./session/items.js');
-const { createItemCollection } = items;
+const { ItemCollection } = items;
 const navigation = require('./session/navigation.js');
-const { createNavigation } = navigation;
+const { Navigation } = navigation;
 const sessionReview = require('./session/review.js');
-const { createReviewController } = sessionReview;
+const { ReviewController } = sessionReview;
 const update = require('./session/update.js');
-const { createUpdateCoordinator } = update;
+const { UpdateCoordinator } = update;
 const progress = require('./session/progress.js');
-const { createProgress } = progress;
+const { Progress } = progress;
 const compose = require('./session/compose.js');
-const { createComposer } = compose;
+const { Composer } = compose;
 const ops = require('./session/ops.js');
-const { createOpsRunner } = ops;
-const changeActions = require('./session/change-actions.js');
-const { createChangeActions } = changeActions;
+const { OpsRunner } = ops;
 const commit = require('./session/commit.js');
-const { createCommitController } = commit;
+const { CommitController } = commit;
 const branches = require('./session/branches.js');
-const { createBranchController } = branches;
+const { BranchController } = branches;
 const npm = require('./session/npm.js');
-const { createNpmController } = npm;
+const { NpmController } = npm;
 const accessors = require('./session/accessors.js');
-const { bindAccessors, bindGetters, bindAlias } = accessors;
+const { bindAccessors, bindGetters } = accessors;
 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 { Lifecycle } = lifecycle;
 const dispatch = require('./session/dispatch.js');
-const { createDispatcher, createInput } = dispatch;
+const { dispatchAction, confirmChoice, handleEvent } = dispatch;
+const dashboard = require('./session/dashboard.js');
+const { Dashboard } = dashboard;
 
-const CURSOR_BLINK_MS = 500;
 const PROGRESS_MS = 160;
 
 const NAV_FIELDS = [
@@ -69,19 +64,17 @@ const NAV_FIELDS = [
   'selection',
   'mouseAnchor',
   'pendingClick',
-  'todoOpen',
-  'todoFocus',
+  'tasksOpen',
+  'tasksFocus',
 ];
 
 const COMPOSER_FIELDS = [
   'editor',
   'composeKind',
   'commitKind',
-  'composeTodoId',
-  'composeBaseline',
+  'composeTaskId',
   'templateIndex',
   'templateFocus',
-  'blinkOn',
 ];
 
 const assignOptions = (session, options) => {
@@ -92,11 +85,6 @@ const assignOptions = (session, options) => {
   session.stdout = options.stdout;
   session.proc = options.proc ?? process;
   session.color = options.color ?? true;
-  session.getSize = () => {
-    const width = session.stdout.columns ?? 80;
-    const height = session.stdout.rows ?? 24;
-    return { width, height };
-  };
   session.rev = options.rev ?? null;
   session.revShort = '';
   session.sourceLabel = options.sourceLabel ?? '';
@@ -109,163 +97,69 @@ const assignOptions = (session, options) => {
   session.outdatedMap = options.outdatedMap;
   session.auditMap = options.auditMap;
   session.updateOpts = options.update;
-  session.term = createTerminal({
-    stdin: session.stdin,
-    stdout: session.stdout,
-    proc: session.proc,
-  });
-  session.loader = createLoadCoordinator();
-  session.collection = createItemCollection();
-  session.nav = createNavigation({
-    startPane: options.startPane ?? 'files',
-  });
-  session.review = createReviewController();
-  session.progress = createProgress(
-    session.term,
-    () => session.tickProgress(),
-    PROGRESS_MS,
-  );
-};
-
-const assignComposer = (session) => {
-  session.composer = createComposer({
-    nav: session.nav,
-    review: session.review,
-    ui: session,
-    restartBlink: () => {
-      if (!session.term.hasTimer('blink')) return;
-      session.term.restartTimer(
-        'blink',
-        () => session.tickBlink(),
-        CURSOR_BLINK_MS,
-      );
-    },
-  });
+  session.dashboardHome = options.startPane === 'dashboard';
 };
 
-const assignControllers = (session) => {
-  session.ops = createOpsRunner(session);
-  session.changeActions = createChangeActions(session);
-  session.commits = createCommitController(session);
-  session.gitBranches = createBranchController(session);
-  session.npm = createNpmController(session);
+const assignParts = (session, options) => {
+  const { stdin, stdout, proc } = session;
+  session.term = new Terminal({ stdin, stdout, proc });
+  session.loader = new LoadCoordinator();
+  session.collection = new ItemCollection();
+  session.nav = new Navigation({ startPane: options.startPane ?? 'files' });
+  session.review = new ReviewController();
+  const tick = () => session.tickProgress();
+  session.progress = new Progress(session.term, tick, PROGRESS_MS);
+  session.updater = new UpdateCoordinator(session);
+  session.composer = new Composer(session);
+  session.ops = new OpsRunner(session);
+  session.commits = new CommitController(session);
+  session.gitBranches = new BranchController(session);
+  session.npm = new NpmController(session);
+  session.dashboard = new Dashboard(session);
+  session.lifecycle = new Lifecycle(session);
 };
 
-const bindSessionAccessors = (session) => {
+const bindFields = (session) => {
   bindAccessors(session, session.nav, NAV_FIELDS);
-  bindAccessors(session, session.composer.state, COMPOSER_FIELDS);
+  bindAccessors(session, session.composer, 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) => {
-  session.viewer = createView({
-    nav: session.nav,
-    composer: session.composer,
-    collection: session.collection,
-    review: session.review,
-    gitBranches: session.gitBranches,
-    commits: session.commits,
-    npm: session.npm,
-    updater: session.updater,
-    ui: session,
-  });
-};
-
-const bindLifecycle = (session) => {
-  session.lifecycle = createLifecycle({
-    loader: session.loader,
-    collection: session.collection,
-    review: session.review,
-    nav: session.nav,
-    ops: session.ops,
-    updater: session.updater,
-    loadConfig: {
-      repo: session.repo,
-      cwd: session.cwd,
-      paths: session.paths,
-      audit: session.audit,
-      outdatedMap: session.outdatedMap,
-      auditMap: session.auditMap,
-    },
-    ui: session,
-  });
-};
-
-const bindDispatch = (session) => {
-  session.dispatcher = createDispatcher(session);
-  session.pointer = createPointer(session);
-  session.input = createInput(session);
-};
-
-const composeSession = (session, options) => {
-  assignOptions(session, options);
-  session.updater = createUpdateCoordinator(session);
-  assignComposer(session);
-  assignControllers(session);
-  bindSessionAccessors(session);
-  bindViewer(session);
-  session.filesPane = createFilesPane(session);
-  bindLifecycle(session);
-  bindDispatch(session);
 };
 
 class Session {
   constructor(options) {
-    composeSession(this, options);
+    assignOptions(this, options);
+    assignParts(this, options);
+    bindFields(this);
     this.resetState();
   }
 
+  get notes() {
+    return this.review.store;
+  }
+
+  getSize() {
+    const width = this.stdout.columns ?? 80;
+    const height = this.stdout.rows ?? 24;
+    return { width, height };
+  }
+
   resetState() {
-    if (this.collection) this.collection.reset();
-    if (this.nav) this.nav.reset();
-    if (this.review) this.review.reset();
-    if (this.composer) this.composer.reset();
-    if (this.ops) this.ops.reset();
-    if (this.gitBranches) this.gitBranches.reset();
-    if (this.commits) this.commits.reset();
-    if (this.npm) this.npm.reset();
+    this.collection.reset();
+    this.nav.reset();
+    this.review.reset();
+    this.composer.reset();
+    this.ops.reset();
+    this.gitBranches.reset();
+    this.commits.reset();
+    this.npm.reset();
+    this.dashboard.reset();
     this.top = this.cwd;
     this.branch = '';
     this.status = '';
@@ -273,18 +167,18 @@ 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;
     this.uiOpen = false;
     this.finishReadLoop = null;
-    if (this.lifecycle) this.lifecycle.stopWatch();
-    if (this.lifecycle) this.lifecycle.clearNpmExtras();
-    if (this.term) this.term.resetCache();
-    if (this.loader) this.loader.reset();
-    if (this.updater) this.updater.reset();
-    if (this.progress) this.progress.clear();
+    this.lifecycle.stopWatch();
+    this.lifecycle.clearNpmExtras();
+    this.term.resetCache();
+    this.loader.reset();
+    this.updater.reset();
+    this.progress.clear();
   }
 
   ensureRepo() {
@@ -316,13 +210,8 @@ class Session {
     this.lifecycle.ignoreWatch(ms);
   }
 
-  applyLoaded(loaded) {
-    return this.lifecycle.applyLoaded(loaded);
-  }
-
   paint() {
-    if (!this.uiOpen) return;
-    this.draw();
+    if (this.uiOpen) this.draw();
   }
 
   draw() {
@@ -336,58 +225,66 @@ class Session {
     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();
+    this.dashboard.afterDraw();
   }
 
-  view() {
-    return this.viewer.view();
+  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);
   }
 
-  fileList() {
-    return this.viewer.fileList();
-  }
-
-  counts() {
-    return this.viewer.counts();
+  view() {
+    return view.view(this);
   }
 
-  viewStatus() {
-    return this.viewer.viewStatus();
+  fileList() {
+    return view.fileList(this);
   }
 
   current() {
-    return this.nav.current(this.items, this.todoItem);
+    return this.nav.current(this.items, this.tasksItem);
   }
 
   fileCursorEntry() {
-    return this.changeActions.fileCursorEntry();
+    return filesPane.fileCursorEntry(this);
   }
 
   clampIndex() {
-    this.filesPane.clampIndex();
+    filesPane.clampIndex(this);
   }
 
   syncReviewPath() {
-    this.filesPane.syncReviewPath();
+    filesPane.syncReviewPath(this);
   }
 
   syncFileCursor() {
-    this.filesPane.syncFileCursor();
+    filesPane.syncFileCursor(this);
   }
 
   showFiles() {
-    this.filesPane.showFiles();
+    filesPane.showFiles(this);
   }
 
   dispatch(action) {
-    this.dispatcher.dispatch(action);
+    dispatchAction(this, action);
+  }
+
+  confirmChoice(key) {
+    confirmChoice(this, key);
   }
 
   handleEvent(event) {
-    this.input.handleEvent(event);
+    handleEvent(this, event);
   }
 
   pushInput(text) {
@@ -415,7 +312,7 @@ class Session {
       this.status = result.error.message;
       return false;
     }
-    if (this.lifecycle) this.lifecycle.noteReviewStamp();
+    this.lifecycle.noteReviewStamp();
     return result.wrote;
   }
 
@@ -427,23 +324,7 @@ class Session {
   }
 
   selectTemplate(index) {
-    this.runComposeCommand(this.composer.selectTemplate(index));
-  }
-
-  idleNoteText() {
-    return this.composer.idleNoteText();
-  }
-
-  shownTemplates() {
-    return this.composer.shownTemplates();
-  }
-
-  startDraftCompose() {
-    this.composer.startDraftCompose();
-  }
-
-  tickBlink() {
-    this.composer.tickBlink();
+    this.runComposeCommand(this.composer.templates.selectTemplate(index));
   }
 
   autosave() {
@@ -530,6 +411,7 @@ class Session {
         if (settled) return;
         settled = true;
         this.lifecycle.stopWatch();
+        this.dashboard.stop();
         this.term.stopListening();
         this.progress.clear();
         this.term.clearTimers();
@@ -546,18 +428,11 @@ class Session {
         if (this.done) return void finish();
         this.draw();
       };
-      this.term.startListening({
-        onData,
-        onResize: () => this.draw(),
-      });
-      this.term.startTimer('save', () => this.autosave(), AUTOSAVE_MS);
-      this.term.startTimer('blink', () => this.tickBlink(), CURSOR_BLINK_MS);
+      this.term.startListening({ onData, onResize: () => this.draw() });
       this.lifecycle.startWatch();
+      if (this.dashboardHome) this.dashboard.start();
     });
   }
 }
 
-module.exports = {
-  LEAVE_TERM,
-  Session,
-};
+module.exports = { LEAVE_TERM, Session };