reslop 0.2.1 → 0.2.3

package/lib/session/compose.js

@@ -4,6 +4,8 @@ const wrap = require('../wrap.js');
 const { cursorInWrap, wrapDoc } = wrap;
 const render = require('../render/render.js');
 const { noteInnerWidth, codeInnerWidth, todoBodyWidth } = render;
+const { commitMessageWidth } = require('../render/commits.js');
+const { listedCommits } = require('./commit.js');
 const { Editor } = require('../editor.js');
 const files = require('../files.js');
 const { itemPath, isTodoItem, listPath, isReadOnlyOrigin } = files;
@@ -68,12 +70,21 @@ const KIND = {
     command: 'branch',
     view: 'note',
   },
+  npm: {
+    enter: 'save',
+    tab: 'insert-tab',
+    escape: 'cancel',
+    move: 'note',
+    command: 'npm',
+    view: 'note',
+  },
 };
 
 const initialState = () => ({
   editor: null,
   composeKind: null,
   commitKind: null,
+  commitBody: '',
   composeTodoId: null,
   composeBaseline: '',
   templateIndex: -1,
@@ -140,6 +151,7 @@ const closeCompose = (api) => {
   state.editor = null;
   state.composeKind = null;
   state.commitKind = null;
+  state.commitBody = '';
   state.composeTodoId = null;
   state.composeBaseline = '';
   state.fileOpened = '';
@@ -474,6 +486,22 @@ const moveNoteLine = (api, delta) => {
   api.state.editor.moveLine(delta, width);
 };
 
+const fullCommitEdit = (api) =>
+  api.state.composeKind === 'commit' && api.ui.commits.commitView === 'full';
+
+const editedCommitEntry = (api) => {
+  const kind = api.state.commitKind;
+  if (kind !== 'amend' && kind !== 'reword') return null;
+  const list = listedCommits(api.ui.commits.commits);
+  return list[api.nav.commitCursor] ?? null;
+};
+
+const moveCommitLine = (api, delta) => {
+  const size = viewSize(api);
+  const width = commitMessageWidth(editedCommitEntry(api), size.width);
+  api.state.editor.moveLine(delta, width);
+};
+
 const moveComposeLine = (api, delta) => {
   const spec = KIND[api.state.composeKind];
   const move = spec ? spec.move : 'note';
@@ -487,6 +515,7 @@ const moveComposeLine = (api, delta) => {
     const inner = codeInnerWidth(size.width, api.ui.layout);
     return void api.state.editor.moveLine(delta, inner);
   }
+  if (fullCommitEdit(api)) return void moveCommitLine(api, delta);
   moveNoteLine(api, delta);
 };
 
@@ -575,17 +604,31 @@ const onCode = (api) => {
   openCompose(api, 'code', text);
 };
 
+const insertNewline = (api) => {
+  api.state.editor.insert('\n');
+  resetBlink(api);
+  followFileEdit(api);
+  return null;
+};
+
+const onEmptyLastLine = (editor) => {
+  if (!editor) return false;
+  const text = editor.text;
+  const lastBreak = text.lastIndexOf('\n');
+  if (editor.cursor < lastBreak + 1) return false;
+  return text.slice(lastBreak + 1).trim() === '';
+};
+
 const enterCompose = (api) => {
   const { state } = api;
   if (state.templateFocus && state.composeKind === 'feedback') {
     return api.templates.selectTemplate(state.templateIndex);
   }
   const spec = KIND[state.composeKind];
-  if (spec && spec.enter === 'newline') {
-    state.editor.insert('\n');
-    resetBlink(api);
-    followFileEdit(api);
-    return null;
+  if (spec && spec.enter === 'newline') return insertNewline(api);
+  if (fullCommitEdit(api)) {
+    if (onEmptyLastLine(state.editor)) return saveCompose(api);
+    return insertNewline(api);
   }
   if (spec && spec.enter === 'edit-next') {
     return saveCompose(api, { editNext: true });

package/lib/session/dispatch.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const compose = require('./compose.js');
+const { listedCommits } = require('./commit.js');
 const { COMPOSE_LEAVE } = compose;
 const actions = require('./actions.js');
 const { CONFIRM_MODE, disabledActions, actionFromKey, applyConfirm } = actions;
@@ -16,7 +17,7 @@ const currentTarget = (ui) => {
     return ui.branches[ui.branchCursor];
   }
   if (ui.pane === 'commits') {
-    const entry = ui.commits.commits[ui.commitCursor];
+    const entry = listedCommits(ui.commits.commits)[ui.commitCursor];
     const staged = targetHasStaged(ui);
     if (!entry) return { canCommit: staged };
     return { ...entry, canCommit: staged };
@@ -43,6 +44,7 @@ const createDispatcher = (ui) => {
     reword: ui.commits.onReword,
     apply: ui.commits.onApply,
     fixup: ui.commits.onFixup,
+    view: () => ui.commits.onView(),
     branch: ui.gitBranches.onBranch,
     pull: ui.gitBranches.onPull,
     push: ui.gitBranches.onPush,
@@ -57,8 +59,16 @@ const createDispatcher = (ui) => {
     open: ui.filesPane.onOpenFile,
     file: ui.filesPane.onFileScope,
     diff: ui.filesPane.onDiffScope,
+    npm: ui.npm.open,
+    npmEdit: ui.npm.edit,
+    npmNew: ui.npm.create,
+    npmStop: () => ui.npm.closeView(),
+    npmRerun: () => ui.npm.rerun(),
     check: () => ui.composer.toggleFocusedTodo(),
-    removeTodo: ui.composer.removeFocusedTodo,
+    removeTodo: () => {
+      if (ui.pane === 'npm') return void ui.npm.askDrop();
+      ui.composer.removeFocusedTodo();
+    },
     quit: () => ui.onQuit(),
     scrollUp: () => ui.filesPane.onScroll(-1),
     scrollDown: () => ui.filesPane.onScroll(1),
@@ -90,6 +100,10 @@ const createDispatcher = (ui) => {
       if (action === 'next') return void ui.commits.onCommitMove(1);
       if (action === 'prev') return void ui.commits.onCommitMove(-1);
     }
+    if (pane === 'npm') {
+      if (action === 'next') return void ui.npm.move(1);
+      if (action === 'prev') return void ui.npm.move(-1);
+    }
     const hidden = disabledActions(pane, currentTarget(ui));
     if (hidden.includes(action)) return;
     const handler = handlers[action];
@@ -113,12 +127,14 @@ const createInput = (ui) => {
     },
     confirmDrop: {
       confirm: () => {
+        if (ui.npm.dropName) return void ui.npm.confirmDrop();
         if (ui.commits.dropName) {
           return void ui.commits.confirmDropCommit();
         }
         ui.gitBranches.confirmDropBranch();
       },
       cancel: () => {
+        if (ui.npm.dropName) return void ui.npm.cancelDrop();
         if (ui.commits.dropName) {
           return void ui.commits.cancelDropCommit();
         }
@@ -145,6 +161,18 @@ const createInput = (ui) => {
       const command = ui.composer.handleKey(key);
       return void ui.runComposeCommand(command);
     }
+    if (ui.pane === 'npm' && ui.npm.viewing) {
+      if (key === 'escape') return void ui.npm.closeView();
+      if (key === 'r') return void ui.npm.rerun();
+      if (key === 'e' || key === 'n') return;
+    }
+    if (ui.pane === 'npm' && key === 'ctrl-up') return void ui.npm.reorder(-1);
+    if (ui.pane === 'npm' && key === 'ctrl-down') {
+      return void ui.npm.reorder(1);
+    }
+    if (ui.pane === 'npm' && (key === 'up' || key === 'down')) {
+      return void ui.npm.move(key === 'up' ? -1 : 1);
+    }
     if (key === 'escape') return void ui.filesPane.onEscape();
     const toggle = key === 'x' || key === ' ';
     if (toggle && ui.composer.toggleFocusedTodo()) return;

package/lib/session/files-pane.js

@@ -4,6 +4,7 @@ const ansi = require('../ansi.js');
 const files = require('../files.js');
 const { THEME_NAMES, setTheme, themeName } = ansi;
 const { isTodosEntry, TODO_FILE } = files;
+const { logViewRows } = require('../render/npm.js');
 const unit = require('./unit.js');
 const { setFileScope, openUnitFile, moveUnitBlock } = unit;
 
@@ -28,7 +29,10 @@ const syncFileCursor = (ui) => {
 const showFiles = (ui) => {
   const nav = ui.nav;
   const held =
-    nav.todoOpen === true || nav.pane === 'branches' || nav.pane === 'commits';
+    nav.todoOpen === true ||
+    nav.pane === 'branches' ||
+    nav.pane === 'commits' ||
+    nav.pane === 'npm';
   nav.pane = 'files';
   nav.clearSelection();
   followReviewPath(ui);
@@ -37,7 +41,11 @@ const showFiles = (ui) => {
 };
 
 const onEscape = (ui) => {
-  if (ui.nav.pane === 'branches' || ui.nav.pane === 'commits') {
+  if (
+    ui.nav.pane === 'branches' ||
+    ui.nav.pane === 'commits' ||
+    ui.nav.pane === 'npm'
+  ) {
     return void showFiles(ui);
   }
   if (ui.nav.pane === 'files') return void ui.onQuit();
@@ -65,7 +73,8 @@ const onOpenFile = (ui) => {
   if (ui.nav.pane === 'branches') {
     return void ui.gitBranches.onCheckoutBranch();
   }
-  if (ui.nav.pane === 'commits') return;
+  if (ui.nav.pane === 'commits') return void ui.commits.onShowDiff();
+  if (ui.nav.pane === 'npm') return void ui.npm.run();
   if (ui.nav.pane !== 'files') {
     if (ui.nav.todoOpen) ui.composer.editFocusedTodo();
     return;
@@ -152,7 +161,9 @@ const scrollStep = (ui, fraction) => {
   const rows = size.height ?? 24;
   const fallback = Math.max(1, rows - 4);
   const bodyH = frame?.bodyH ?? fallback;
-  const height = Math.max(1, bodyH);
+  const viewing = ui.nav.pane === 'npm' && ui.npm && ui.npm.viewing;
+  const viewRows = viewing ? logViewRows(bodyH) : bodyH;
+  const height = Math.max(1, viewRows);
   const span = Math.floor(height * Math.abs(fraction));
   const n = Math.max(1, span);
   if (fraction < 0) return -n;
@@ -167,6 +178,7 @@ const onScroll = (ui, delta) => {
   if (ui.nav.pane === 'commits') {
     return void ui.commits.onCommitMove(delta);
   }
+  if (ui.nav.pane === 'npm') return void ui.npm.move(delta);
   if (ui.nav.todoOpen && ui.composer.todoRowCount() > 1) {
     return void ui.composer.moveTodoFocus(delta);
   }
@@ -198,6 +210,10 @@ const onJump = (ui, toEnd) => {
     const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
     return void ui.commits.onCommitMove(delta);
   }
+  if (ui.nav.pane === 'npm') {
+    const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
+    return void ui.npm.move(delta);
+  }
   if (ui.nav.todoOpen && ui.composer.todoRowCount() > 0) {
     const last = ui.composer.todoRowCount() - 1;
     const target = toEnd ? last : 0;

package/lib/session/lifecycle.js

@@ -485,7 +485,10 @@ const worktreeStamp = (api) => {
 };
 
 const watchesWorktree = (nav) =>
-  nav.todoOpen === true || nav.pane === 'branches' || nav.pane === 'commits';
+  nav.todoOpen === true ||
+  nav.pane === 'branches' ||
+  nav.pane === 'commits' ||
+  nav.pane === 'npm';
 
 const currentFileStamp = (api) => {
   const { nav } = api;

package/lib/session/navigation.js

@@ -9,6 +9,7 @@ const initialState = (options = {}) => ({
   fileCursor: 0,
   branchCursor: 0,
   commitCursor: 0,
+  npmCursor: 0,
   scroll: 0,
   listScroll: 0,
   reviewPath: null,

package/lib/session/npm.js

@@ -0,0 +1,335 @@
+'use strict';
+
+const commands = require('../npm-commands.js');
+const { logViewRows } = require('../render/npm.js');
+
+const { listCommands, reduceOutput, writeLog, parseScriptLine } = commands;
+const { scriptLine, saveScript, removeScript, reorderScript } = commands;
+const { startNpm } = commands;
+
+const selected = (api) => {
+  const cursor = api.ui.nav.npmCursor;
+  return api.state.commands[cursor];
+};
+
+const clampCursor = (api) => {
+  const last = api.state.commands.length - 1;
+  const nav = api.ui.nav;
+  if (nav.npmCursor > last) nav.npmCursor = Math.max(0, last);
+  if (nav.npmCursor < 0) nav.npmCursor = 0;
+};
+
+const refresh = (api) => {
+  api.state.commands = listCommands(api.ui.top);
+  clampCursor(api);
+};
+
+const canEdit = (ui) => {
+  if (ui.capabilities && ui.capabilities.changes === false) return false;
+  if (ui.readOnly) return false;
+  return true;
+};
+
+const open = (api) => {
+  if (api.ui.mode === 'compose') return;
+  refresh(api);
+  api.state.viewing = false;
+  api.state.output = '';
+  api.ui.nav.pane = 'npm';
+  api.ui.status = '';
+  api.ui.nav.clearSelection();
+};
+
+const scrollLog = (api, delta) => {
+  const lines = api.state.output.split('\n');
+  let count = lines.at(-1) === '' ? lines.length - 1 : lines.length;
+  if (api.state.running) count += 1;
+  const frame = api.ui.lastFrame;
+  const bodyH = frame && frame.bodyH ? frame.bodyH : 1;
+  const max = Math.max(0, count - logViewRows(bodyH));
+  let start = api.state.followEnd ? max : api.state.logScroll;
+  start = Math.min(max, Math.max(0, start + delta));
+  api.state.followEnd = start === max;
+  api.state.logScroll = start;
+};
+
+const move = (api, delta) => {
+  if (api.state.viewing) return void scrollLog(api, delta);
+  if (!api.state.commands.length) return;
+  const nav = api.ui.nav;
+  const last = api.state.commands.length - 1;
+  const next = Math.min(last, Math.max(0, nav.npmCursor + delta));
+  if (next === nav.npmCursor) return;
+  nav.npmCursor = next;
+  api.ui.status = '';
+};
+
+const stopRun = (api) => {
+  api.state.running = false;
+  api.state.child = null;
+  if (api.ui.progress) api.ui.progress.stop('npm');
+};
+
+const showOutput = (api, text) => {
+  if (!api.state.viewing || !api.state.running) return;
+  if (api.state.stopping) return;
+  api.state.output = text;
+  api.ui.paint();
+};
+
+const withNotice = (text, notice) => {
+  const body = `${text ?? ''}`;
+  if (body.endsWith(`${notice}\n`)) return body;
+  if (!body) return `${notice}\n`;
+  if (body.endsWith('\n')) return `${body}${notice}\n`;
+  return `${body}\n${notice}\n`;
+};
+
+const finishRun = (api, entry, result) => {
+  const stopped = api.state.stopping === true;
+  const reduced = stopped
+    ? withNotice(api.state.output, 'terminated')
+    : reduceOutput(result.text, api.ui.top, result.status);
+  api.state.output = reduced;
+  api.state.stopping = false;
+  stopRun(api);
+  try {
+    writeLog(api.ui.top, entry.name, reduced);
+  } catch (error) {
+    api.ui.status = error.message;
+    api.ui.paint();
+    return;
+  }
+  if (stopped && api.state.viewing) api.ui.status = 'terminated';
+  api.ui.paint();
+};
+
+const startRun = (api, entry) => {
+  api.state.output = '';
+  api.state.viewing = true;
+  api.state.followEnd = true;
+  api.state.logScroll = 0;
+  api.state.running = true;
+  api.state.stopping = false;
+  api.ui.status = '';
+  if (api.ui.progress) api.ui.progress.start('npm');
+  const runner = api.ui.repo && api.ui.repo.runNpmCommand;
+  const start = typeof runner === 'function' ? runner : startNpm;
+  api.state.child = start(
+    api.ui.top,
+    entry,
+    (text) => showOutput(api, reduceOutput(text, api.ui.top, '')),
+    (result) => finishRun(api, entry, result),
+  );
+  api.ui.paint();
+};
+
+const runSelected = (api) => {
+  if (api.state.viewing || api.state.child) return;
+  const entry = selected(api);
+  if (!entry) return;
+  startRun(api, entry);
+};
+
+const rerun = (api) => {
+  if (!api.state.viewing || api.state.running) return;
+  const entry = selected(api);
+  if (!entry) return;
+  startRun(api, entry);
+};
+
+const closeView = (api) => {
+  if (api.state.running) {
+    api.state.stopping = true;
+    if (api.state.child) api.state.child.kill();
+    if (!api.state.running) return;
+    api.state.output = withNotice(api.state.output, 'terminated');
+    stopRun(api);
+    api.ui.status = 'terminated';
+    api.ui.paint();
+    return;
+  }
+  api.state.viewing = false;
+  api.ui.status = '';
+  api.ui.paint();
+};
+
+const editSelected = (api) => {
+  if (api.state.viewing) return;
+  if (!canEdit(api.ui)) {
+    api.ui.status = 'read only';
+    return;
+  }
+  const entry = selected(api);
+  if (!entry || entry.kind !== 'script') {
+    api.ui.status = 'not a script';
+    return;
+  }
+  api.state.editName = entry.name;
+  api.ui.composer.openCompose('npm', scriptLine(entry));
+};
+
+const newCommand = (api) => {
+  if (api.state.viewing) return;
+  if (!canEdit(api.ui)) {
+    api.ui.status = 'read only';
+    return;
+  }
+  api.state.editName = '';
+  api.ui.composer.openCompose('npm', '');
+};
+
+const finishEdit = (api) => {
+  const editor = api.ui.composer.state.editor;
+  const text = editor ? editor.text : '';
+  const parsed = parseScriptLine(text);
+  if (!parsed) {
+    api.ui.status = 'name: command';
+    return;
+  }
+  try {
+    api.ui.ignoreWatch();
+    saveScript(api.ui.top, api.state.editName, parsed);
+  } catch (error) {
+    api.ui.status = error.message;
+    return;
+  }
+  api.ui.composer.closeCompose();
+  refresh(api);
+  const at = api.state.commands.findIndex(
+    (entry) => entry.name === parsed.name,
+  );
+  if (at >= 0) api.ui.nav.npmCursor = at;
+  api.ui.status = 'saved';
+};
+
+const askDrop = (api) => {
+  if (api.state.viewing) return;
+  if (!canEdit(api.ui)) {
+    api.ui.status = 'read only';
+    return;
+  }
+  const entry = selected(api);
+  if (!entry || entry.kind !== 'script') {
+    api.ui.status = 'not a script';
+    return;
+  }
+  api.state.dropName = entry.name;
+  api.ui.mode = 'confirmDrop';
+  api.ui.status = '';
+};
+
+const confirmDrop = (api) => {
+  const name = api.state.dropName;
+  api.state.dropName = '';
+  api.ui.mode = 'review';
+  if (!name) return;
+  try {
+    api.ui.ignoreWatch();
+    removeScript(api.ui.top, name);
+  } catch (error) {
+    api.ui.status = error.message;
+    return;
+  }
+  refresh(api);
+  api.ui.status = `dropped ${name}`;
+};
+
+const cancelDrop = (api) => {
+  api.state.dropName = '';
+  api.ui.mode = 'review';
+  api.ui.status = '';
+};
+
+const reorder = (api, delta) => {
+  if (api.state.viewing) return;
+  if (!canEdit(api.ui)) {
+    api.ui.status = 'read only';
+    return;
+  }
+  const entry = selected(api);
+  if (!entry || entry.kind !== 'script') {
+    api.ui.status = 'not a script';
+    return;
+  }
+  try {
+    api.ui.ignoreWatch();
+    if (!reorderScript(api.ui.top, entry.name, delta)) return;
+  } catch (error) {
+    api.ui.status = error.message;
+    return;
+  }
+  refresh(api);
+  const at = api.state.commands.findIndex((item) => item.name === entry.name);
+  if (at >= 0) api.ui.nav.npmCursor = at;
+  api.ui.status = '';
+};
+
+const createNpmController = (ui) => {
+  const state = {
+    commands: [],
+    viewing: false,
+    output: '',
+    followEnd: true,
+    logScroll: 0,
+    editName: '',
+    dropName: '',
+    running: false,
+    stopping: false,
+    child: null,
+  };
+  const api = { ui, state };
+  return {
+    state,
+    get commands() {
+      return state.commands;
+    },
+    get viewing() {
+      return state.viewing;
+    },
+    get output() {
+      return state.output;
+    },
+    get dropName() {
+      return state.dropName;
+    },
+    get followEnd() {
+      return state.followEnd;
+    },
+    get logScroll() {
+      return state.logScroll;
+    },
+    get editName() {
+      return state.editName;
+    },
+    get running() {
+      return state.running;
+    },
+    reset() {
+      if (state.child) state.child.kill();
+      stopRun(api);
+      state.commands = [];
+      state.viewing = false;
+      state.output = '';
+      state.followEnd = true;
+      state.logScroll = 0;
+      state.editName = '';
+      state.dropName = '';
+      state.stopping = false;
+    },
+    open: () => open(api),
+    move: (delta) => move(api, delta),
+    run: () => runSelected(api),
+    rerun: () => rerun(api),
+    closeView: () => closeView(api),
+    edit: () => editSelected(api),
+    create: () => newCommand(api),
+    finishEdit: () => finishEdit(api),
+    askDrop: () => askDrop(api),
+    confirmDrop: () => confirmDrop(api),
+    cancelDrop: () => cancelDrop(api),
+    reorder: (delta) => reorder(api, delta),
+  };
+};
+
+module.exports = { createNpmController };

package/lib/session/pointer.js

@@ -99,9 +99,17 @@ const RELEASE_TARGETS = [
     match: (ui) => ui.pane === 'commits',
     hits: 'fileHits',
     onHit: (ui, hit) => {
+      if (ui.mode === 'compose') return;
       ui.nav.commitCursor = hit.cursor;
     },
   },
+  {
+    match: (ui) => ui.pane === 'npm',
+    hits: 'fileHits',
+    onHit: (ui, hit) => {
+      ui.nav.npmCursor = hit.cursor;
+    },
+  },
   {
     match: (ui) => ui.pane === 'diff',
     hits: 'todoHits',

package/lib/session/view.js

@@ -3,6 +3,7 @@
 const path = require('node:path');
 
 const files = require('../files.js');
+const { listedCommits } = require('./commit.js');
 const { fileEntries, REPO_TODOS_LABEL } = files;
 const review = require('../review.js');
 const { noteCounts } = review;
@@ -143,7 +144,7 @@ const unitBodyLines = (api) => {
 };
 
 const view = (api) => {
-  const { composer, nav, ui, gitBranches, commits, updater } = api;
+  const { composer, nav, ui, gitBranches, commits, npm, updater } = api;
   const templates = composer.shownTemplates();
   const change = ui.change;
   const sourceKind = (change && change.source) || '';
@@ -169,9 +170,19 @@ const view = (api) => {
     branch: ui.branch,
     branches: gitBranches.branches,
     branchCursor: nav.branchCursor,
-    commits: commits.commits,
+    commits: listedCommits(commits.commits),
     commitCursor: nav.commitCursor,
+    commitView: commits.commitView,
+    npmCommands: npm.commands,
+    npmCursor: nav.npmCursor,
+    npmView: npm.viewing,
+    npmOutput: npm.output,
+    npmFollow: npm.followEnd,
+    npmScroll: npm.logScroll,
+    npmEditName: npm.editName,
+    npmRunning: npm.running,
     repoName: repoNameOf(api),
+    rev: ui.rev || '',
     revShort: ui.revShort || '',
     sourceLabel: ui.sourceLabel || '',
     sourceKind,
@@ -186,7 +197,7 @@ const view = (api) => {
     templateIndex: composer.clampedTemplateIndex(templates),
     updateFrom: updater.from,
     updateTo: updater.to,
-    dropName: gitBranches.dropName || commits.dropName,
+    dropName: gitBranches.dropName || commits.dropName || npm.dropName,
   };
 };