reslop 0.2.1 → 0.2.4

package/lib/session/view.js

@@ -3,7 +3,9 @@
 const path = require('node:path');
 
 const files = require('../files.js');
-const { fileEntries, REPO_TODOS_LABEL } = files;
+const commit = require('./commit.js');
+const { listedCommits } = commit;
+const { fileEntries, fileTotals, REPO_TODOS_LABEL } = files;
 const review = require('../review.js');
 const { noteCounts } = review;
 const diff = require('../diff/diff.js');
@@ -142,8 +144,32 @@ const unitBodyLines = (api) => {
   return unitLines(unitFileText(api), group);
 };
 
+const pendingLines = (items, rev, revShort) => {
+  if (rev || revShort) return null;
+  for (const item of items) {
+    if (item.origin === 'commit' || item.origin === 'pr') return null;
+  }
+  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;
+  rows[0] = {
+    ...rows[0],
+    added: lines.added,
+    removed: lines.removed,
+    stagedAdded: lines.stagedAdded,
+    unstagedAdded: lines.unstagedAdded,
+    stagedRemoved: lines.stagedRemoved,
+    unstagedRemoved: lines.unstagedRemoved,
+  };
+  return rows;
+};
+
 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 +195,20 @@ const view = (api) => {
     branch: ui.branch,
     branches: gitBranches.branches,
     branchCursor: nav.branchCursor,
-    commits: commits.commits,
+    commits: commitRows(api),
     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,
+    npmLogs: nav.pane === 'npm' ? npm.logLabel : '',
     repoName: repoNameOf(api),
+    rev: ui.rev || '',
     revShort: ui.revShort || '',
     sourceLabel: ui.sourceLabel || '',
     sourceKind,
@@ -186,7 +223,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,
   };
 };
 

package/lib/session.js

@@ -9,30 +9,50 @@ const { renderFrame } = render;
 const { decodeChunk } = keys;
 const { AUTOSAVE_MS, hasNotes } = review;
 const capabilities = require('./capabilities.js');
+const actions = require('./session/actions.js');
+const { LIST_PANES } = actions;
 const { sessionCapabilities } = capabilities;
-const { createTerminal, LEAVE_TERM } = require('./session/terminal.js');
-const { createLoadCoordinator } = require('./session/load.js');
+const terminal = require('./session/terminal.js');
+const { createTerminal, LEAVE_TERM } = terminal;
+const load = require('./session/load.js');
+const { createLoadCoordinator } = load;
 const items = require('./session/items.js');
 const { createItemCollection } = items;
-const { createNavigation } = require('./session/navigation.js');
-const { createReviewController } = require('./session/review.js');
-const { createUpdateCoordinator } = require('./session/update.js');
-const { createProgress } = require('./session/progress.js');
-const { createComposer } = require('./session/compose.js');
-const { createOpsRunner } = require('./session/ops.js');
-const { createChangeActions } = require('./session/change-actions.js');
-const { createCommitController } = require('./session/commit.js');
-const { createBranchController } = require('./session/branches.js');
+const navigation = require('./session/navigation.js');
+const { createNavigation } = navigation;
+const sessionReview = require('./session/review.js');
+const { createReviewController } = sessionReview;
+const update = require('./session/update.js');
+const { createUpdateCoordinator } = update;
+const progress = require('./session/progress.js');
+const { createProgress } = progress;
+const compose = require('./session/compose.js');
+const { createComposer } = compose;
+const ops = require('./session/ops.js');
+const { createOpsRunner } = ops;
+const changeActions = require('./session/change-actions.js');
+const { createChangeActions } = changeActions;
+const commit = require('./session/commit.js');
+const { createCommitController } = commit;
+const branches = require('./session/branches.js');
+const { createBranchController } = branches;
+const npm = require('./session/npm.js');
+const { createNpmController } = npm;
 const accessors = require('./session/accessors.js');
 const { bindAccessors, bindGetters, bindAlias } = accessors;
-const { createView } = require('./session/view.js');
-const { createFilesPane } = require('./session/files-pane.js');
-const { createLifecycle } = require('./session/lifecycle.js');
-const { createPointer } = require('./session/pointer.js');
-const { createDispatcher, createInput } = require('./session/dispatch.js');
+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 dispatch = require('./session/dispatch.js');
+const { createDispatcher, createInput } = dispatch;
 
 const CURSOR_BLINK_MS = 500;
-const PROGRESS_MS = 80;
+const PROGRESS_MS = 160;
 
 const NAV_FIELDS = [
   'pane',
@@ -40,6 +60,7 @@ const NAV_FIELDS = [
   'fileCursor',
   'branchCursor',
   'commitCursor',
+  'npmCursor',
   'scroll',
   'listScroll',
   'reviewPath',
@@ -127,6 +148,7 @@ const assignControllers = (session) => {
   session.changeActions = createChangeActions(session);
   session.commits = createCommitController(session);
   session.gitBranches = createBranchController(session);
+  session.npm = createNpmController(session);
 };
 
 const bindSessionAccessors = (session) => {
@@ -185,6 +207,7 @@ const bindViewer = (session) => {
     review: session.review,
     gitBranches: session.gitBranches,
     commits: session.commits,
+    npm: session.npm,
     updater: session.updater,
     ui: session,
   });
@@ -242,6 +265,7 @@ class Session {
     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.top = this.cwd;
     this.branch = '';
     this.status = '';
@@ -309,13 +333,10 @@ class Session {
       height: size.height,
       color: this.color,
     });
-    if (
-      this.pane === 'files' ||
-      this.pane === 'branches' ||
-      this.pane === 'commits'
-    ) {
+    if (LIST_PANES.includes(this.pane)) {
       this.nav.listScroll = frame.listScroll;
     }
+    if (this.nav.todoOpen) this.nav.scroll = frame.scroll;
     const composing = this.mode === 'compose';
     const cursor = composing && this.blinkOn ? frame.cursor : null;
     this.term.paint(frame, size, cursor);
@@ -402,6 +423,7 @@ class Session {
     if (!result) return;
     if (result.kind === 'commit') this.commits.finishGitCommit();
     if (result.kind === 'branch') this.gitBranches.finishCreateBranch();
+    if (result.kind === 'npm') this.npm.finishEdit();
   }
 
   selectTemplate(index) {

package/lib/source.js

@@ -1,8 +1,11 @@
 'use strict';
 
-const { parseGithubPrUrl } = require('./github.js');
-const { parseGitlabMrUrl } = require('./gitlab.js');
-const { capabilitiesFor, attachCapabilities } = require('./capabilities.js');
+const github = require('./github.js');
+const { parseGithubPrUrl } = github;
+const gitlab = require('./gitlab.js');
+const { parseGitlabMrUrl } = gitlab;
+const capabilities = require('./capabilities.js');
+const { capabilitiesFor, attachCapabilities } = capabilities;
 
 const selectChangeSource = (paths) => {
   if (!paths.length) return { kind: 'local', paths };

package/lib/update.js

@@ -4,15 +4,11 @@ const fs = require('node:fs');
 const os = require('node:os');
 const path = require('node:path');
 
-const { jsonParse, isHashObject } = require('metautil');
-const {
-  parseVersion,
-  cmpVersion,
-  npmBin,
-  npmOpts,
-  runProc,
-  oneLine,
-} = require('./utilities.js');
+const metautil = require('metautil');
+const { jsonParse, isHashObject } = metautil;
+const utilities = require('./utilities.js');
+const { parseVersion, cmpVersion, npmBin } = utilities;
+const { npmOpts, runProc, oneLine } = utilities;
 
 const PKG = require('../package.json');
 

package/lib/utilities.js

@@ -1,7 +1,9 @@
 'use strict';
 
-const { spawn, spawnSync } = require('node:child_process');
-const { split } = require('metautil');
+const childProcess = require('node:child_process');
+const { spawn, spawnSync } = childProcess;
+const metautil = require('metautil');
+const { split } = metautil;
 
 const IS_WIN = process.platform === 'win32';
 const DEFAULT_ENCODING = 'utf8';

package/lib/wrap.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { graphemes, graphemeWidth, visibleWidth } = require('./ansi.js');
+const ansi = require('./ansi.js');
+const { graphemes, graphemeWidth, visibleWidth } = ansi;
 
 const wrapPlain = (text, width) => {
   if (width <= 0) return [''];
@@ -28,6 +29,7 @@ const wrapPlain = (text, width) => {
     if (col + w > width && col > 0) {
       if (lastBreak >= start) {
         flush(lastBreak + 1);
+        i = start;
         continue;
       }
       flush(i);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reslop",
-  "version": "0.2.1",
+  "version": "0.2.4",
   "description": "Interactive code review and repair planning for AI-assisted changes",
   "keywords": [
     "code-review",
@@ -46,14 +46,14 @@
     "CHANGELOG.md"
   ],
   "engines": {
-    "node": ">=18"
+    "node": ">=18.15.0"
   },
   "scripts": {
+    "test": "reslop t -- npm run -s lint && reslop t -- node --test",
+    "lint": "reslop t -- eslint . && reslop t -- prettier -c \"**/*.js\" \"**/*.json\" \"**/*.md\"",
+    "fix": "reslop t -- eslint . --fix && reslop t -- prettier --write \"**/*.js\" \"**/*.json\" \"**/*.md\"",
     "enable": "node scripts/enable.js",
-    "disable": "node scripts/disable.js",
-    "lint": "eslint . && prettier -c \"**/*.js\" \"**/*.json\" \"**/*.md\"",
-    "fix": "eslint . --fix && prettier --write \"**/*.js\" \"**/*.json\" \"**/*.md\"",
-    "test": "npm run -s lint && node --test"
+    "disable": "node scripts/disable.js"
   },
   "devDependencies": {
     "eslint": "^9.39.4",