reslop 0.2.3 → 0.2.4

package/lib/render/notes.js

@@ -7,7 +7,7 @@ const primitives = require('./primitives.js');
 
 const { REPO_TODOS_LABEL } = files;
 const { wrapMultiline, cursorInWrap } = wrap;
-const { THEME, visibleWidth, truncateVisible, seq, EL, RESET, BOLD } = ansi;
+const { THEME, truncateVisible } = ansi;
 const { paintBar, paintCheckBar, windowRows } = primitives;
 const { LIST_PANES, CHECK_LEAD, paneResult } = primitives;
 
@@ -73,6 +73,7 @@ const paintTodoList = (texts, focus, width, color, edit) => {
         fgRgb,
         bgRgb,
         color,
+        true,
       );
       rows.push(painted);
       owners.push(i);
@@ -168,16 +169,8 @@ const paintNotePanel = (view, width, color, cap) => {
   return paintIdleNote(view, width, color);
 };
 
-const paintTodoCaption = (width, color) => {
-  const text = ` ${REPO_TODOS_LABEL}`;
-  const clipped = truncateVisible(text, width);
-  const pad = Math.max(0, width - visibleWidth(clipped));
-  const filled = clipped + ' '.repeat(pad);
-  if (!color) return filled;
-  const fgRgb = THEME.buttonHotFg;
-  const bgRgb = THEME.ctxBg;
-  return `${BOLD}${seq(fgRgb, bgRgb)}${EL}${filled}${RESET}`;
-};
+const paintTodoCaption = (width, color) =>
+  paintBar(` ${REPO_TODOS_LABEL}`, width, THEME.mutedFg, THEME.ctxBg, color);
 
 const paintBodyTodo = (view, width, color) => {
   const texts = view.todos ?? [];

package/lib/render/npm.js

@@ -78,7 +78,7 @@ const paintNpmList = (view, width, color, bodyH, headerLines) => {
     const at = view.npmEditName ? 'replace' : 'end';
     extra = { row: painted.row, cursor: painted.cursor, at, index: cursor };
   }
-  const painted = paintCursorList(
+  return paintCursorList(
     commands,
     cursor,
     width,
@@ -89,14 +89,6 @@ const paintNpmList = (view, width, color, bodyH, headerLines) => {
     extra,
     view.listScroll,
   );
-  return paneResult({
-    body: painted.body,
-    fileHits: painted.fileHits,
-    todoOwners: [],
-    cursor: painted.cursor,
-    splitBody: false,
-    listScroll: painted.offset,
-  });
 };
 
 const logStart = (view, count, rows) => {
@@ -213,10 +205,6 @@ const paintNpmLog = (view, width, color, bodyH) => {
   for (let i = 0; i < padY - top; i++) body.push(blank);
   return paneResult({
     body,
-    fileHits: [],
-    todoOwners: [],
-    cursor: null,
-    splitBody: false,
   });
 };
 

package/lib/render/present.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { ESC } = require('../ansi.js');
+const ansi = require('../ansi.js');
+const { ESC } = ansi;
 
 const presentCursor = (cursor) => {
   if (!cursor || cursor.x <= 0 || cursor.y <= 0) return `${ESC}[?25l`;

package/lib/render/primitives.js

@@ -1,6 +1,8 @@
 'use strict';
 
 const ansi = require('../ansi.js');
+const actions = require('../session/actions.js');
+const { LIST_PANES } = actions;
 
 const { THEME, paint, visibleWidth, truncateVisible, seq, EL, RESET } = ansi;
 
@@ -8,7 +10,6 @@ const GUTTER_W = 2;
 const FILE_MARK = '▶';
 const FILE_LIST_PAD = 1;
 const CHECK_DONE = 'xX';
-const LIST_PANES = ['files', 'branches', 'commits', 'npm'];
 const CHECK_TOKEN = /\[([ xX])\]/;
 const CHECK_LEAD = /^\[[ xX]\] /;
 
@@ -34,14 +35,21 @@ const splitCheck = (text) => {
   return { before, mark, token, after };
 };
 
-const paintCheckBar = (text, width, fgRgb, bgRgb, color) => {
+const paintCheckBar = (text, width, fgRgb, bgRgb, color, plain = false) => {
   const clipped = truncateVisible(text, width);
   const parts = color ? splitCheck(clipped) : null;
   if (!parts) return paintBar(text, width, fgRgb, bgRgb, color);
   const pad = Math.max(0, width - visibleWidth(clipped));
   const done = CHECK_DONE.includes(parts.mark);
-  const chipFg = done ? THEME.checkDoneFg : THEME.checkFg;
-  const chipBg = done ? THEME.checkDoneBg : THEME.checkBg;
+  let chipFg = THEME.checkFg;
+  let chipBg = THEME.checkBg;
+  if (plain) {
+    chipFg = fgRgb;
+    chipBg = bgRgb;
+  } else if (done) {
+    chipFg = THEME.checkDoneFg;
+    chipBg = THEME.checkDoneBg;
+  }
   const after = `${parts.after}${' '.repeat(pad)}`;
   let out = `${seq(fgRgb, bgRgb)}${EL}`;
   if (parts.before) out += paint(parts.before, fgRgb, bgRgb, color);
@@ -111,6 +119,16 @@ const extraIdx = (extraRow, cursor, count) => {
   return count;
 };
 
+const paneResult = (fields = {}) => ({
+  body: fields.body ?? [],
+  fileHits: fields.fileHits ?? [],
+  todoOwners: fields.todoOwners ?? [],
+  todoChecks: fields.todoChecks ?? [],
+  cursor: fields.cursor ?? null,
+  splitBody: fields.splitBody === true,
+  listScroll: fields.listScroll ?? 0,
+});
+
 const paintCursorList = (
   items,
   cursor,
@@ -153,7 +171,12 @@ const paintCursorList = (
     fileHits.push({ y, cursor: itemIdx });
   }
   if (pad) body.push(blank);
-  return { body, fileHits, cursor: textCursor, offset: start };
+  return paneResult({
+    body,
+    fileHits,
+    cursor: textCursor,
+    listScroll: start,
+  });
 };
 
 const branchLabel = (name) => `${name ?? ''}`.trim();
@@ -183,16 +206,6 @@ const paintListEdit = (compose, width, color, edgeW = 0) => {
   return { row, cursor: { x: prefixW + col + 1 } };
 };
 
-const paneResult = (fields) => ({
-  body: fields.body,
-  fileHits: fields.fileHits,
-  todoOwners: fields.todoOwners,
-  todoChecks: fields.todoChecks ?? [],
-  cursor: fields.cursor ?? null,
-  splitBody: fields.splitBody === true,
-  listScroll: fields.listScroll ?? 0,
-});
-
 const measureColumns = (entries, rowFields, align) => {
   const keys = Object.keys(align);
   const widths = Object.fromEntries(keys.map((key) => [key, 0]));

package/lib/render/render.js

@@ -4,7 +4,8 @@ const chrome = require('./chrome.js');
 const notes = require('./notes.js');
 const diff = require('./diff.js');
 const present = require('./present.js');
-const { renderFrame } = require('./frame.js');
+const frame = require('./frame.js');
+const { renderFrame } = frame;
 
 const { QUIT_PROMPT, PUSH_PROMPT } = chrome;
 const { updatePrompt, dropPrompt } = chrome;

package/lib/render/unit.js

@@ -1,23 +1,29 @@
 'use strict';
 
-const { detectLang } = require('../detect.js');
+const detect = require('../detect.js');
+const { detectLang } = detect;
 const primitives = require('./primitives.js');
 const diff = require('./diff.js');
 
 const { paneResult } = primitives;
-const { paintDiffLine, codeCursorInRows } = diff;
-const { sameHunk } = require('../diff/diff.js');
+const { paintDiffLine, codeCursorInRows, expandSoftRows } = diff;
+const diffLib = require('../diff/diff.js');
+const { sameHunk } = diffLib;
 
 const paintBodyUnit = (view, width, color) => {
   const lines = view.unitLines ?? [];
   const item = view.item;
   const lang = detectLang(view.reviewPath ?? '');
   const overlay = view.codeOverlay;
-  const editing = view.mode === 'compose' && overlay;
-  const { length } = lines;
+  const editing =
+    view.mode === 'compose' && overlay && typeof overlay.cursor === 'number';
+  const picked = editing ? overlay.scrollCol : 0;
+  const scrollCol = picked ?? 0;
+  const source = editing ? lines : expandSoftRows(lines, width, false, true);
+  const { length } = source;
   const body = new Array(length);
   for (let i = 0; i < length; i++) {
-    const line = lines[i];
+    const line = source[i];
     const isBlock = item && sameHunk(line.item, item);
     const row = { ...line };
     if (editing) {
@@ -25,16 +31,13 @@ const paintBodyUnit = (view, width, color) => {
     } else if ((row.type === 'add' || row.type === 'del') && !isBlock) {
       row.mark = ' ';
     }
-    body[i] = paintDiffLine(row, width, color, row.origin, lang);
+    body[i] = paintDiffLine(row, width, color, row.origin, lang, scrollCol);
   }
   const edit = overlay ? overlay.cursor : null;
-  const cursor = codeCursorInRows(lines, false, width, edit);
+  const cursor = codeCursorInRows(source, false, width, edit, scrollCol);
   return paneResult({
     body,
-    fileHits: [],
-    todoOwners: [],
     cursor,
-    splitBody: false,
   });
 };
 

package/lib/report-model.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { stripAnsi } = require('./ansi.js');
+const ansi = require('./ansi.js');
+const { stripAnsi } = ansi;
 const commands = require('./npm-commands.js');
 
 const { withoutNodeFrame, indentStack, relativize } = commands;
@@ -108,9 +109,10 @@ const shortTail = (text) => {
 const envelope = (reports, exit, stderr) => {
   const status = exit === null || exit === undefined ? 1 : exit;
   const ok = status === 0;
-  const items = [];
-  for (const item of reports) {
-    items.push(report(item.tool, { ...item, ok }));
+  const items = new Array(reports.length);
+  for (let i = 0; i < reports.length; i++) {
+    const item = reports[i];
+    items[i] = report(item.tool, { ...item, ok });
   }
   return { ok, exit: status, reports: items, stderr: stderr || '' };
 };

package/lib/report-parse.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { stripAnsi } = require('./ansi.js');
+const ansi = require('./ansi.js');
+const { stripAnsi } = ansi;
 const model = require('./report-model.js');
 const testParse = require('./report-test.js');
 const toolParse = require('./report-tools.js');
@@ -10,15 +11,7 @@ const { reduceStderr, shortTail, envelope } = model;
 const { parseTap, parseNodeJsonl, parseTestJson, parseSpec } = testParse;
 const { parseToolJson, parseToolText } = toolParse;
 
-const KNOWN = new Set([
-  'test',
-  'tsc',
-  'eslint',
-  'prettier',
-  'audit',
-  'outdated',
-  'ls',
-]);
+const KNOWN = ['test', 'tsc', 'eslint', 'prettier', 'audit', 'outdated', 'ls'];
 
 const toolHint = (program, args) => {
   const name = `${program ?? ''}`.split(/[/\\]/).pop();
@@ -75,15 +68,17 @@ const parseReports = (text, root) => {
 
 const withHint = (reports, text, exit, hint) => {
   if (reports.length || !`${text ?? ''}`.trim() || exit === 0) return reports;
-  const tool = KNOWN.has(hint) ? hint : 'test';
+  const tool = KNOWN.includes(hint) ? hint : 'test';
   return [report(tool, { problems: [problem({ message: shortTail(text) })] })];
 };
 
 const buildDocument = (stdout, stderr, root, exit, hint) => {
   const text = stripAnsi(stdout);
   const reports = withHint(parseReports(text, root), text, exit, hint);
-  const grouped = [];
-  for (const item of reports) grouped.push(groupReport(item));
+  const grouped = new Array(reports.length);
+  for (let i = 0; i < reports.length; i++) {
+    grouped[i] = groupReport(reports[i]);
+  }
   return envelope(grouped, exit, reduceStderr(stderr, root));
 };
 

package/lib/report-render.js

@@ -10,34 +10,51 @@ const NOTICE = [
   'rerun the same command with RESLOP_OUTPUT=raw.',
 ].join('\n');
 
-const addRow = (rows, key, value) => {
-  if (value === null || value === undefined || value === '') return;
-  rows.push([key, `${value}`]);
+const SUMMARY_ROWS = 6;
+const PROBLEM_FIELDS = 7;
+
+const writeRow = (rows, index, key, value) => {
+  if (value === null || value === undefined || value === '') return index;
+  rows[index] = [key, `${value}`];
+  return index + 1;
 };
 
 const summaryRows = (stats) => {
-  const rows = [];
-  addRow(rows, 'passed', stats.passed);
-  addRow(rows, 'failed', stats.failed);
-  addRow(rows, 'skipped', stats.skipped);
-  addRow(rows, 'errors', stats.errors);
-  addRow(rows, 'warnings', stats.warnings);
-  addRow(rows, 'duration', stats.duration);
+  const rows = new Array(SUMMARY_ROWS);
+  let index = 0;
+  index = writeRow(rows, index, 'passed', stats.passed);
+  index = writeRow(rows, index, 'failed', stats.failed);
+  index = writeRow(rows, index, 'skipped', stats.skipped);
+  index = writeRow(rows, index, 'errors', stats.errors);
+  index = writeRow(rows, index, 'warnings', stats.warnings);
+  index = writeRow(rows, index, 'duration', stats.duration);
+  rows.length = index;
   return rows;
 };
 
 const problemRows = (item) => {
-  const rows = [];
-  addRow(rows, 'severity', item.severity);
-  addRow(rows, 'duration', item.duration);
-  addRow(rows, 'code', item.code);
-  addRow(rows, 'operator', item.operator);
-  addRow(rows, 'expected', item.expected);
-  addRow(rows, 'actual', item.actual);
-  addRow(rows, 'message', item.message);
-  for (const extra of item.extra) addRow(rows, extra[0], extra[1]);
-  if (item.count > 1) addRow(rows, 'count', item.count);
-  if (item.omitted > 0) addRow(rows, 'omitted', item.omitted);
+  const extra = item.extra;
+  let size = PROBLEM_FIELDS + extra.length;
+  if (item.count > 1) size += 1;
+  if (item.omitted > 0) size += 1;
+  const rows = new Array(size);
+  let index = 0;
+  index = writeRow(rows, index, 'severity', item.severity);
+  index = writeRow(rows, index, 'duration', item.duration);
+  index = writeRow(rows, index, 'code', item.code);
+  index = writeRow(rows, index, 'operator', item.operator);
+  index = writeRow(rows, index, 'expected', item.expected);
+  index = writeRow(rows, index, 'actual', item.actual);
+  index = writeRow(rows, index, 'message', item.message);
+  for (let i = 0; i < extra.length; i++) {
+    const pair = extra[i];
+    index = writeRow(rows, index, pair[0], pair[1]);
+  }
+  if (item.count > 1) index = writeRow(rows, index, 'count', item.count);
+  if (item.omitted > 0) {
+    index = writeRow(rows, index, 'omitted', item.omitted);
+  }
+  rows.length = index;
   return rows;
 };
 

package/lib/report-run.js

@@ -1,12 +1,17 @@
 'use strict';
 
 const path = require('node:path');
-const { spawn } = require('node:child_process');
+const childProcess = require('node:child_process');
+const { spawn } = childProcess;
 
-const { spawnBase } = require('./utilities.js');
-const { writeLog } = require('./npm-commands.js');
-const { toolHint, buildDocument } = require('./report-parse.js');
-const { renderDocument } = require('./report-render.js');
+const utilities = require('./utilities.js');
+const { spawnBase } = utilities;
+const npmCommands = require('./npm-commands.js');
+const { writeLog } = npmCommands;
+const reportParse = require('./report-parse.js');
+const { toolHint, buildDocument } = reportParse;
+const reportRender = require('./report-render.js');
+const { renderDocument } = reportRender;
 
 const OUTPUTS = new Set(['md', 'raw']);
 
@@ -31,11 +36,8 @@ const winCommand = (program, args) => {
 };
 
 const spawnCommand = (program, args, options) => {
-  const base = {
-    cwd: options.cwd,
-    env: options.env,
-    stdio: options.stdio,
-  };
+  const { cwd, env, stdio } = options;
+  const base = { cwd, env, stdio };
   if (process.platform !== 'win32') {
     return spawn(program, args, spawnBase(base));
   }

package/lib/report-test.js

@@ -1,11 +1,12 @@
 'use strict';
 
 const model = require('./report-model.js');
-const { isPassingTest } = require('./npm-commands.js');
+const npmCommands = require('./npm-commands.js');
+const { isPassingTest } = npmCommands;
 
 const { summary, problem, report, userTrace } = model;
 
-const KNOWN = new Set([
+const KNOWN = [
   'message',
   'error',
   'code',
@@ -19,7 +20,7 @@ const KNOWN = new Set([
   'location',
   'severity',
   'type',
-]);
+];
 
 const show = (value) => {
   if (value === null || value === undefined) return '';
@@ -33,7 +34,7 @@ const show = (value) => {
 const extraFrom = (fields) => {
   const extra = [];
   for (const field of fields) {
-    if (KNOWN.has(field[0])) continue;
+    if (KNOWN.includes(field[0])) continue;
     const value = show(field[1]);
     if (!value) continue;
     const shown = value.length > 500 ? `${value.slice(0, 500)}…` : value;

package/lib/report-tools.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { parseAuditReport, parseOutdatedReport } = require('./deps.js');
+const deps = require('./deps.js');
+const { parseAuditReport, parseOutdatedReport } = deps;
 const model = require('./report-model.js');
 
 const { summary, problem, report, userTrace } = model;
@@ -160,21 +161,30 @@ const parsePrettier = (text, root) => {
   return report('prettier', { summary: stats, problems });
 };
 
+const auditExtra = (item) => {
+  const size = (item.range ? 1 : 0) + (item.fix ? 1 : 0);
+  const extra = new Array(size);
+  let index = 0;
+  if (item.range) {
+    extra[index] = ['range', item.range];
+    index += 1;
+  }
+  if (item.fix) extra[index] = ['fix', item.fix];
+  return extra;
+};
+
 const auditProblems = (text) => {
   const audit = parseAuditReport(text);
-  const problems = [];
+  const problems = new Array(audit.size);
+  let index = 0;
   for (const item of audit.values()) {
-    const extra = [];
-    if (item.range) extra.push(['range', item.range]);
-    if (item.fix) extra.push(['fix', item.fix]);
-    problems.push(
-      problem({
-        severity: item.severity || 'error',
-        name: item.name,
-        message: item.title || '',
-        extra,
-      }),
-    );
+    problems[index] = problem({
+      severity: item.severity || 'error',
+      name: item.name,
+      message: item.title || '',
+      extra: auditExtra(item),
+    });
+    index += 1;
   }
   return problems;
 };
@@ -285,16 +295,32 @@ const parseAuditText = (text) => {
   return report('audit', { summary: stats, problems });
 };
 
+const TOOL_SLOTS = 4;
+
 const parseToolText = (text, root) => {
-  const reports = [];
+  const reports = new Array(TOOL_SLOTS);
+  let index = 0;
   const eslint = parseEslintStylish(text, root);
-  if (eslint) reports.push(eslint);
+  if (eslint) {
+    reports[index] = eslint;
+    index += 1;
+  }
   const tsc = parseTsc(text, root);
-  if (tsc) reports.push(tsc);
+  if (tsc) {
+    reports[index] = tsc;
+    index += 1;
+  }
   const prettier = parsePrettier(text, root);
-  if (prettier) reports.push(prettier);
+  if (prettier) {
+    reports[index] = prettier;
+    index += 1;
+  }
   const audit = parseAuditText(text);
-  if (audit) reports.push(audit);
+  if (audit) {
+    reports[index] = audit;
+    index += 1;
+  }
+  reports.length = index;
   return reports;
 };
 

package/lib/review-merge.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { TODO_FILE } = require('./files.js');
+const files = require('./files.js');
+const { TODO_FILE } = files;
 
 const flatText = (text) => `${text ?? ''}`.trim().replace(/\n/g, ' ');
 

package/lib/review.js

@@ -3,8 +3,10 @@
 const fs = require('node:fs');
 const path = require('node:path');
 
-const { TODO_FILE, REVIEW_DIR } = require('./files.js');
-const { captureBaseline, mergeReview } = require('./review-merge.js');
+const files = require('./files.js');
+const { TODO_FILE, REVIEW_DIR } = files;
+const reviewMerge = require('./review-merge.js');
+const { captureBaseline, mergeReview } = reviewMerge;
 
 const createStore = (reviewPath, templates = []) => ({
   reviewPath,
@@ -240,6 +242,8 @@ const AGENT_INSTRUCTIONS = [
   '- If not `editing`, set `status` to `partial` if some remain, ' +
     'or `done` if all are `[x]`',
   '- Do not redo items already marked `[x]`',
+  '- Run the full check with `npm t`',
+  '- Run specific test files with `reslop t -- node --test <files>`',
 ].join('\n');
 
 const toInt = (text) => parseInt(text, 10);