reslop 0.2.4 → 0.2.6

package/lib/render/primitives.js

@@ -2,67 +2,30 @@
 
 const ansi = require('../ansi.js');
 const actions = require('../session/actions.js');
-const { LIST_PANES } = actions;
 
-const { THEME, paint, visibleWidth, truncateVisible, seq, EL, RESET } = ansi;
+const { THEME, paint, visibleWidth, graphemes, graphemeWidth } = ansi;
+const { LIST_PANES } = actions;
 
 const GUTTER_W = 2;
 const FILE_MARK = '▶';
-const FILE_LIST_PAD = 1;
-const CHECK_DONE = 'xX';
-const CHECK_TOKEN = /\[([ xX])\]/;
-const CHECK_LEAD = /^\[[ xX]\] /;
+const MARK_W = visibleWidth(` ${FILE_MARK} `);
+const LIST_PAD = 1;
+const NO_EDITS = [];
 
 const fill = (width, fgRgb, bgRgb, color) =>
   paint(' '.repeat(Math.max(0, width)), fgRgb, bgRgb, color);
 
-const paintBar = (text, width, fgRgb, bgRgb, color) => {
-  const clipped = truncateVisible(text, width);
-  const pad = Math.max(0, width - visibleWidth(clipped));
-  const filled = clipped + ' '.repeat(pad);
-  if (!color) return filled;
-  return `${seq(fgRgb, bgRgb)}${EL}${filled}${RESET}`;
-};
+const markPrefix = (selected) => ` ${selected ? FILE_MARK : ' '} `;
 
-const splitCheck = (text) => {
-  const match = CHECK_TOKEN.exec(text);
-  if (!match) return null;
-  const start = match.index;
-  const token = match[0];
-  const before = text.slice(0, start);
-  const mark = match[1];
-  const after = text.slice(start + token.length);
-  return { before, mark, token, after };
-};
+const isListPane = (pane) => LIST_PANES.includes(pane) || pane === 'dashboard';
 
-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);
-  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);
-  out += paint(parts.token, chipFg, chipBg, color);
-  if (after) out += paint(after, fgRgb, bgRgb, color);
-  return out;
-};
+const isTaskView = (view) => view.item?.origin === 'task';
+
+const branchLabel = (name) => `${name ?? ''}`.trim();
 
 const padVisible = (text, width, align) => {
-  const n = Math.max(0, width - visibleWidth(text));
-  const gap = ' '.repeat(n);
-  if (align === 'end') return `${text}${gap}`;
-  return `${gap}${text}`;
+  const gap = ' '.repeat(Math.max(0, width - visibleWidth(text)));
+  return align === 'end' ? `${text}${gap}` : `${gap}${text}`;
 };
 
 const splitWidths = (width) => {
@@ -74,136 +37,132 @@ const splitWidths = (width) => {
 const paintSplitRule = (color) =>
   fill(1, THEME.splitGutterFg, THEME.splitGutterBg, color);
 
-const paintSplitBlank = (width, color) => {
+const paintBodyFill = (width, color, kind) => {
+  const ctx = (n) => fill(n, THEME.ctxFg, THEME.ctxBg, color);
+  if (kind === 'files') return ctx(Math.max(1, width - 1)) + ctx(1);
+  if (kind !== 'split') return ctx(width);
   const { leftW, rightW } = splitWidths(width);
-  return (
-    fill(leftW, THEME.ctxFg, THEME.ctxBg, color) +
-    paintSplitRule(color) +
-    fill(rightW, THEME.ctxFg, THEME.ctxBg, color)
-  );
+  return ctx(leftW) + paintSplitRule(color) + ctx(rightW);
 };
 
-const paintBodyFill = (width, color, kind) => {
-  if (kind === 'files') {
-    const inner = Math.max(1, width - 1);
-    const main = fill(inner, THEME.ctxFg, THEME.ctxBg, color);
-    const edge = fill(1, THEME.ctxFg, THEME.ctxBg, color);
-    return main + edge;
-  }
-  if (kind === 'split') return paintSplitBlank(width, color);
-  return fill(width, THEME.ctxFg, THEME.ctxBg, color);
-};
+const paneResult = (fields = {}) => ({
+  body: fields.body ?? [],
+  fileHits: fields.fileHits ?? [],
+  taskOwners: fields.taskOwners ?? [],
+  taskChecks: fields.taskChecks ?? [],
+  cursor: fields.cursor ?? null,
+  splitBody: fields.splitBody === true,
+  listScroll: fields.listScroll ?? 0,
+  editHits: fields.editHits ?? [],
+});
 
-const windowRows = (rows, focus, cap) => {
-  if (rows.length <= cap) return { rows, offset: 0 };
-  let start = focus - cap + 1;
-  if (start < 0) start = 0;
-  if (start + cap > rows.length) start = rows.length - cap;
-  return { rows: rows.slice(start, start + cap), offset: start };
-};
+const editSpan = (x0, textX, x1, start, text) => ({
+  x0,
+  textX,
+  x1,
+  start,
+  text,
+  limit: start + text.length,
+  live: true,
+});
+
+const listLine = (row, index, cursor = null, edits = NO_EDITS) => ({
+  row,
+  index,
+  hit: index >= 0,
+  cursor,
+  edits,
+});
 
 const listWindowStart = (focus, offset, listH, count) => {
   let start = offset ?? 0;
   if (focus < start) start = focus;
   if (focus >= start + listH) start = focus - listH + 1;
-  const maxStart = Math.max(0, count - listH);
-  if (start > maxStart) start = maxStart;
-  if (start < 0) start = 0;
-  return start;
+  return Math.max(0, Math.min(start, count - listH));
 };
 
-const extraIdx = (extraRow, cursor, count) => {
-  if (!extraRow) return -1;
-  if (extraRow.at === 'start') return 0;
-  if (extraRow.at === 'replace') return extraRow.index ?? cursor;
-  return count;
+const rowCursor = (cursor, row) => {
+  const out = { x: cursor.x, row };
+  if (typeof cursor.scroll === 'number') out.scroll = cursor.scroll;
+  return out;
 };
 
-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,
-  width,
-  color,
-  bodyH,
-  headerLines,
-  paintRow,
-  extraRow,
-  offset = 0,
-) => {
-  const pad = bodyH >= FILE_LIST_PAD * 2 + 1 ? FILE_LIST_PAD : 0;
+const paintListWindow = (count, focus, pane, lineAt) => {
+  const { width, color, bodyH, headerLines, offset } = pane;
+  const pad = bodyH >= LIST_PAD * 2 + 1 ? LIST_PAD : 0;
   const listH = bodyH - pad * 2;
-  const inserting = extraRow && extraRow.at === 'start';
-  const extra = extraRow && extraRow.at !== 'replace' ? 1 : 0;
-  const count = items.length + extra;
-  const extraAt = extraIdx(extraRow, cursor, items.length);
-  const focus = extraRow ? extraAt : cursor;
   const start = listWindowStart(focus, offset, listH, count);
   const blank = paintBodyFill(width, color, 'files');
-  const body = [];
+  const body = pad ? [blank] : [];
   const fileHits = [];
-  let textCursor = null;
-  if (pad) body.push(blank);
+  const editHits = [];
+  let cursor = null;
   for (let i = 0; i < listH; i++) {
-    const idx = start + i;
-    if (extraRow && idx === extraAt) {
-      body.push(extraRow.row);
-      if (extraRow.cursor) {
-        textCursor = { x: extraRow.cursor.x, row: body.length - 1 };
-      }
-      continue;
+    const line = lineAt(start + i);
+    if (!line) break;
+    const row = body.push(line.row) - 1;
+    if (line.cursor) cursor = rowCursor(line.cursor, row);
+    for (const edit of line.edits) editHits.push({ ...edit, row });
+    if (line.hit) {
+      fileHits.push({ y: headerLines + pad + i + 1, cursor: line.index });
     }
-    const itemIdx = inserting ? idx - 1 : idx;
-    const entry = items[itemIdx];
-    if (!entry) break;
-    const selected = extraRow ? false : itemIdx === cursor;
-    body.push(paintRow(entry, width, color, selected));
-    const y = headerLines + pad + i + 1;
-    fileHits.push({ y, cursor: itemIdx });
   }
   if (pad) body.push(blank);
-  return paneResult({
-    body,
-    fileHits,
-    cursor: textCursor,
-    listScroll: start,
-  });
+  return paneResult({ body, fileHits, editHits, cursor, listScroll: start });
+};
+
+const paintCursorList = (items, cursor, pane, paintRow, extra = null) => {
+  const lineAt = (index) => {
+    const entry = items[index];
+    if (!entry) return null;
+    return listLine(paintRow(entry, !extra && index === cursor), index);
+  };
+  if (!extra) return paintListWindow(items.length, cursor, pane, lineAt);
+  const edit = listLine(extra.row, -1, extra.cursor, extra.edits);
+  if (extra.at === 'replace') {
+    const at = extra.index;
+    const replaced = (i) => (i === at ? edit : lineAt(i));
+    return paintListWindow(items.length, at, pane, replaced);
+  }
+  const first = extra.at === 'start';
+  const at = first ? 0 : items.length;
+  const shift = first ? 1 : 0;
+  const inserted = (i) => (i === at ? edit : lineAt(i - shift));
+  return paintListWindow(items.length + 1, at, pane, inserted);
+};
+
+const sliceVisible = (text, skip, width) => {
+  if (width <= 0) return '';
+  const parts = graphemes(text);
+  let used = 0;
+  let i = 0;
+  const drop = Math.max(0, skip);
+  while (i < parts.length) {
+    const w = graphemeWidth(parts[i], used);
+    if (used + w > drop) break;
+    used += w;
+    i += 1;
+  }
+  let out = '';
+  let taken = 0;
+  for (; i < parts.length; i++) {
+    const w = graphemeWidth(parts[i], drop + taken);
+    if (taken + w > width) break;
+    out += parts[i];
+    taken += w;
+  }
+  return out;
 };
 
-const branchLabel = (name) => `${name ?? ''}`.trim();
-
-const paintListEdit = (compose, width, color, edgeW = 0) => {
-  const inner = Math.max(1, width - edgeW);
-  const prefix = ` ${FILE_MARK} `;
-  const prefixW = visibleWidth(prefix);
-  const rest = Math.max(1, inner - prefixW);
-  const text = `${compose.text ?? ''}`.replaceAll('\n', ' ');
-  const clipped = truncateVisible(text, rest);
-  const pad = Math.max(0, rest - visibleWidth(clipped));
-  const left = `${prefix}${clipped}${' '.repeat(pad)}`;
-  const fgRgb = THEME.chromeFg;
-  const bgRgb = THEME.buttonBg;
-  const edge = fill(edgeW, fgRgb, THEME.ctxBg, color);
-  let row = `${left}${edge}`;
-  if (color) {
-    const gap = ' '.repeat(pad);
-    row = `${seq(fgRgb, bgRgb)}${EL}`;
-    row += paint(prefix, fgRgb, bgRgb, color);
-    row += paint(clipped, THEME.buttonHotFg, bgRgb, color);
-    row += paint(gap, fgRgb, bgRgb, color);
-    row += edge;
-  }
-  const col = Math.min(compose.cursor ?? 0, visibleWidth(clipped));
-  return { row, cursor: { x: prefixW + col + 1 } };
+const fieldWindow = (text, cursor, scroll, width) => {
+  if (width <= 0) return { text: '', col: 0, scroll: 0 };
+  const at = Math.max(0, Math.min(cursor ?? 0, text.length));
+  const col = visibleWidth(text.slice(0, at));
+  let next = Math.max(0, scroll ?? 0);
+  if (col < next) next = col;
+  if (col >= next + width) next = col - width + 1;
+  const shown = sliceVisible(text, next, width);
+  return { text: shown, col: col - next, scroll: next };
 };
 
 const measureColumns = (entries, rowFields, align) => {
@@ -221,7 +180,7 @@ const measureColumns = (entries, rowFields, align) => {
 const padColumns = (fields, widths, align) => {
   const parts = {};
   for (const key of Object.keys(align)) {
-    const width = widths?.[key] ?? visibleWidth(fields[key]);
+    const width = widths[key] ?? visibleWidth(fields[key]);
     parts[key] = padVisible(fields[key], width, align[key]);
   }
   return parts;
@@ -248,25 +207,27 @@ const paintColumns = (parts, widths, fgRgb, bgRgb, color, tones) => {
 };
 
 module.exports = {
-  measureColumns,
-  padColumns,
-  joinColumns,
-  paintColumns,
   GUTTER_W,
   FILE_MARK,
-  LIST_PANES,
-  CHECK_LEAD,
+  MARK_W,
   fill,
-  paintBar,
-  paintCheckBar,
+  markPrefix,
+  isListPane,
+  isTaskView,
+  branchLabel,
   padVisible,
   splitWidths,
   paintSplitRule,
   paintBodyFill,
-  windowRows,
-  listWindowStart,
-  paintCursorList,
-  paintListEdit,
-  branchLabel,
   paneResult,
+  editSpan,
+  listLine,
+  paintListWindow,
+  paintCursorList,
+  sliceVisible,
+  fieldWindow,
+  measureColumns,
+  padColumns,
+  joinColumns,
+  paintColumns,
 };

package/lib/render/render.js

@@ -5,30 +5,21 @@ const notes = require('./notes.js');
 const diff = require('./diff.js');
 const present = require('./present.js');
 const frame = require('./frame.js');
-const { renderFrame } = frame;
 
-const { QUIT_PROMPT, PUSH_PROMPT } = chrome;
-const { updatePrompt, dropPrompt } = chrome;
 const { formatBusyStatus, headerText, layoutButtons } = chrome;
-const { delCharBg, addCharBg, paintDiffLine, codeInnerWidth } = diff;
-const { todoInnerWidth, todoBodyWidth, noteInnerWidth } = notes;
+const { todoBodyWidth, noteInnerWidth } = notes;
+const { paintDiffLine, codeInnerWidth } = diff;
 const { presentCursor, presentRows } = present;
+const { renderFrame } = frame;
 
 module.exports = {
-  QUIT_PROMPT,
-  PUSH_PROMPT,
-  updatePrompt,
-  dropPrompt,
-  delCharBg,
-  addCharBg,
-  paintDiffLine,
+  formatBusyStatus,
   headerText,
   layoutButtons,
-  todoInnerWidth,
   todoBodyWidth,
   noteInnerWidth,
+  paintDiffLine,
   codeInnerWidth,
-  formatBusyStatus,
   renderFrame,
   presentCursor,
   presentRows,

package/lib/render/report.js

@@ -0,0 +1,43 @@
+'use strict';
+
+const commands = require('../npm-commands.js');
+const { formatTable } = commands;
+const reportRender = require('../report-render.js');
+const { summaryRows, problemRows, displayMessage, quoteLines } = reportRender;
+
+const reportProblem = (item) => {
+  const title = item.name || item.message || item.code || 'problem';
+  const mark = item.severity === 'warning' ? '△' : '✖';
+  const count = item.count > 1 ? `  × ${item.count}` : '';
+  const lines = ['', `${mark} ${title.split('\n')[0]}${count}`, ''];
+  lines.push(...formatTable(problemRows(item)));
+  const message = displayMessage(item);
+  if (message) lines.push('', ...quoteLines(message));
+  if (item.trace) {
+    lines.push('', 'Stack');
+    for (const row of item.trace.split(/\r?\n/)) {
+      const frame = row.trim().replace(/^at\s+/, '');
+      if (frame) lines.push(`  at ${frame}`);
+    }
+  }
+  if (item.related.length) {
+    lines.push('', 'Related failures');
+    for (const row of item.related) lines.push(`  ↳ ${row}`);
+  }
+  return lines;
+};
+
+const renderReport = (doc) => {
+  const lines = [];
+  for (const item of doc.reports) {
+    if (lines.length) lines.push('');
+    const mark = item.ok ? '✔' : '✖';
+    lines.push(`${mark} ${item.tool}  ·  exit ${doc.exit}`, '');
+    lines.push(...formatTable(summaryRows(item.summary)));
+    for (const entry of item.problems) lines.push(...reportProblem(entry));
+  }
+  if (doc.stderr) lines.push('', 'Stderr', doc.stderr);
+  return `${lines.join('\n')}\n`;
+};
+
+module.exports = { renderReport };