reslop 0.2.1 → 0.2.3

package/lib/report-tools.js

@@ -0,0 +1,311 @@
+'use strict';
+
+const { parseAuditReport, parseOutdatedReport } = require('./deps.js');
+const model = require('./report-model.js');
+
+const { summary, problem, report, userTrace } = model;
+
+const place = (file, line, column, root) =>
+  userTrace(`${file}:${line}:${column}`, root);
+
+const parseEslintJson = (data, root) => {
+  const rows = Array.isArray(data) ? data : data && data.results;
+  if (!Array.isArray(rows) || !rows.length) return null;
+  if (!rows[0] || !Array.isArray(rows[0].messages)) return null;
+  const stats = summary();
+  let errors = 0;
+  let warnings = 0;
+  const problems = [];
+  for (const file of rows) {
+    const messages = file.messages || [];
+    for (const item of messages) {
+      const severity = item.severity === 1 ? 'warning' : 'error';
+      if (severity === 'warning') warnings += 1;
+      else errors += 1;
+      problems.push(
+        problem({
+          severity,
+          message: item.message || '',
+          code: item.ruleId || '',
+          trace: place(
+            file.filePath || '',
+            item.line || 0,
+            item.column || 0,
+            root,
+          ),
+        }),
+      );
+    }
+  }
+  stats.errors = errors;
+  stats.warnings = warnings;
+  return report('eslint', { summary: stats, problems });
+};
+
+const eslintLine = (line) => {
+  const match = /^\s*(\d+):(\d+)\s+(error|warning)\s+(.*)$/.exec(line);
+  if (!match) return null;
+  const rest = match[4];
+  const ruleAt = rest.lastIndexOf('  ');
+  const message = ruleAt < 0 ? rest : rest.slice(0, ruleAt);
+  const code = ruleAt < 0 ? '' : rest.slice(ruleAt + 2).trim();
+  return {
+    line: match[1],
+    column: match[2],
+    severity: match[3],
+    message: message.trim(),
+    code,
+  };
+};
+
+const isPathLine = (line) => {
+  const text = line.trim();
+  if (!text || text.startsWith('✖')) return false;
+  if (eslintLine(text)) return false;
+  return text.includes('/') || text.includes('\\') || /\.\w+$/.test(text);
+};
+
+const parseEslintStylish = (text, root) => {
+  const lines = `${text ?? ''}`.split(/\r?\n/);
+  const problems = [];
+  let file = '';
+  let errors = 0;
+  let warnings = 0;
+  let seen = false;
+  for (const line of lines) {
+    const item = eslintLine(line);
+    if (item) {
+      seen = true;
+      if (item.severity === 'warning') warnings += 1;
+      else errors += 1;
+      problems.push(
+        problem({
+          severity: item.severity,
+          message: item.message,
+          code: item.code,
+          trace: place(file, item.line, item.column, root),
+        }),
+      );
+      continue;
+    }
+    if (/✖\s+\d+\s+problems?\b/.test(line)) seen = true;
+    if (isPathLine(line)) file = line.trim();
+  }
+  if (!seen) return null;
+  const stats = summary();
+  stats.errors = errors;
+  stats.warnings = warnings;
+  return report('eslint', { summary: stats, problems });
+};
+
+const tscLine = (line) => {
+  const match = /^(.*)\((\d+),(\d+)\):\s+error\s+(TS\d+):\s+(.*)$/.exec(
+    line.trim(),
+  );
+  if (!match) return null;
+  return {
+    file: match[1],
+    line: match[2],
+    column: match[3],
+    code: match[4],
+    message: match[5],
+  };
+};
+
+const parseTsc = (text, root) => {
+  const problems = [];
+  for (const line of `${text ?? ''}`.split(/\r?\n/)) {
+    const item = tscLine(line);
+    if (!item) continue;
+    problems.push(
+      problem({
+        message: item.message,
+        code: item.code,
+        trace: place(item.file, item.line, item.column, root),
+      }),
+    );
+  }
+  if (!problems.length) return null;
+  const stats = summary();
+  stats.errors = problems.length;
+  return report('tsc', { summary: stats, problems });
+};
+
+const prettierFile = (line) => {
+  const warn = /^\[(?:warn|error)\]\s+(\S+)$/.exec(line.trim());
+  if (warn && !warn[1].startsWith('Code')) return warn[1];
+  return '';
+};
+
+const parsePrettier = (text, root) => {
+  const lines = `${text ?? ''}`.split(/\r?\n/);
+  const problems = [];
+  let seen = false;
+  for (const line of lines) {
+    if (line.includes('Code style issues')) seen = true;
+    if (line.includes('All matched files use Prettier')) seen = true;
+    const file = prettierFile(line);
+    if (!file) continue;
+    seen = true;
+    problems.push(
+      problem({
+        message: 'format',
+        trace: userTrace(file, root),
+      }),
+    );
+  }
+  if (!seen) return null;
+  const stats = summary();
+  stats.errors = problems.length;
+  return report('prettier', { summary: stats, problems });
+};
+
+const auditProblems = (text) => {
+  const audit = parseAuditReport(text);
+  const problems = [];
+  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,
+      }),
+    );
+  }
+  return problems;
+};
+
+const parseAudit = (text) => {
+  const problems = auditProblems(text);
+  if (!problems.length) return null;
+  const stats = summary();
+  stats.errors = problems.length;
+  return report('audit', { summary: stats, problems });
+};
+
+const behind = (item) => {
+  if (!item.current) return true;
+  if (item.wanted && item.wanted !== item.current) return true;
+  if (item.latest && item.latest !== item.current) return true;
+  return false;
+};
+
+const parseOutdated = (text) => {
+  const outdated = parseOutdatedReport(text);
+  const problems = [];
+  for (const [name, item] of outdated) {
+    if (!behind(item)) continue;
+    problems.push(
+      problem({
+        severity: 'warning',
+        name,
+        message: `${item.current} ${item.wanted} ${item.latest}`.trim(),
+        extra: [
+          ['current', item.current],
+          ['wanted', item.wanted],
+          ['latest', item.latest],
+        ],
+      }),
+    );
+  }
+  if (!problems.length) return null;
+  const stats = summary();
+  stats.warnings = problems.length;
+  return report('outdated', { summary: stats, problems });
+};
+
+const pushLs = (problems, text) => {
+  const message = `${text ?? ''}`.trim();
+  if (!message) return;
+  problems.push(problem({ message }));
+};
+
+const walkLs = (node, problems) => {
+  if (!node || typeof node !== 'object') return;
+  if (Array.isArray(node.problems)) {
+    for (const item of node.problems) pushLs(problems, item);
+  }
+  if (node.missing) {
+    pushLs(problems, `missing ${node.required || node.version || ''}`);
+  }
+  if (node.invalid) pushLs(problems, `invalid ${node.version || ''}`);
+  if (node.extraneous) pushLs(problems, `extraneous ${node.version || ''}`);
+  const deps = node.dependencies;
+  if (!deps || typeof deps !== 'object') return;
+  for (const name of Object.keys(deps)) walkLs(deps[name], problems);
+};
+
+const parseLs = (data) => {
+  if (!data || typeof data !== 'object' || Array.isArray(data)) return null;
+  if (!data.dependencies && !Array.isArray(data.problems)) return null;
+  const problems = [];
+  walkLs(data, problems);
+  if (!problems.length && !Array.isArray(data.problems)) return null;
+  const stats = summary();
+  stats.errors = problems.length;
+  return report('ls', { summary: stats, problems });
+};
+
+const parseToolJson = (data, root) => {
+  const eslint = parseEslintJson(data, root);
+  if (eslint) return [eslint];
+  const vulns = data && (data.vulnerabilities || data.advisories);
+  const audit = vulns ? parseAudit(JSON.stringify(data)) : null;
+  if (audit) return [audit];
+  const ls = parseLs(data);
+  if (ls) return [ls];
+  const outdated = parseOutdated(JSON.stringify(data));
+  if (outdated) return [outdated];
+  return null;
+};
+
+const parseAuditText = (text) => {
+  if (`${text ?? ''}`.trim().startsWith('{')) return null;
+  const lines = `${text ?? ''}`.split(/\r?\n/);
+  const problems = [];
+  for (let index = 0; index < lines.length; index++) {
+    const match = /^Severity:\s+(\w+)\s*$/.exec(lines[index].trim());
+    if (!match) continue;
+    const name = (lines[index - 1] || '').trim();
+    problems.push(
+      problem({
+        severity: match[1].toLowerCase(),
+        name,
+        message: name,
+      }),
+    );
+  }
+  if (!problems.length) return null;
+  const stats = summary();
+  stats.errors = problems.length;
+  return report('audit', { summary: stats, problems });
+};
+
+const parseToolText = (text, root) => {
+  const reports = [];
+  const eslint = parseEslintStylish(text, root);
+  if (eslint) reports.push(eslint);
+  const tsc = parseTsc(text, root);
+  if (tsc) reports.push(tsc);
+  const prettier = parsePrettier(text, root);
+  if (prettier) reports.push(prettier);
+  const audit = parseAuditText(text);
+  if (audit) reports.push(audit);
+  return reports;
+};
+
+module.exports = {
+  parseEslintJson,
+  parseEslintStylish,
+  parseTsc,
+  parsePrettier,
+  parseAudit,
+  parseOutdated,
+  parseLs,
+  parseToolJson,
+  parseToolText,
+};

package/lib/session/actions.js

@@ -33,21 +33,36 @@ const COMMIT_ACTIONS = {
   reword: ['r'],
   fixup: ['f'],
   drop: ['d'],
+  view: ['v'],
   pull: ['p'],
   push: ['s'],
 };
 
+const NPM_ACTIONS = {
+  npm: ['n'],
+  npmEdit: ['e'],
+  npmNew: ['n'],
+  npmStop: ['escape'],
+  npmRerun: ['r'],
+};
+
 const ACTION_HOT = {
   prev: '←',
   next: '→',
+  npmStop: 'esc',
 };
 
 const ACTION_LABEL = {
   revert: 'drop',
   check: 'x',
   layout: 'mode',
+  view: 'view',
   code: 'edit',
   newBranch: 'new',
+  npmEdit: 'edit',
+  npmNew: 'new',
+  npmStop: 'esc',
+  npmRerun: 're-run',
   quit: 'q',
   prev: '←',
   next: '→',
@@ -121,6 +136,24 @@ const COMMITS_DISABLED = [
   'prev',
   'next',
 ];
+const NPM_DISABLED = [
+  'add',
+  'unstage',
+  'revert',
+  'commit',
+  'layout',
+  'feedback',
+  'todo',
+  'code',
+  'check',
+  'branch',
+  'file',
+  'diff',
+  'prev',
+  'next',
+  'pull',
+  'push',
+];
 
 const isTodosTarget = (item) =>
   !!(item && (item.kind === 'todos' || item.origin === 'todo'));
@@ -164,6 +197,7 @@ const disabledActions = (pane, item) => {
   if (pane === 'commits') {
     return [...COMMITS_DISABLED, ...commitWriteDisabled(item)];
   }
+  if (pane === 'npm') return NPM_DISABLED;
   if (onTodos) return TODO_DISABLED;
   return [...DIFF_DISABLED, ...diffGitDisabled(item)];
 };
@@ -205,10 +239,16 @@ const COMMIT_KEYS = {};
 for (const id of Object.keys(COMMIT_ACTIONS)) {
   for (const key of COMMIT_ACTIONS[id]) COMMIT_KEYS[key] = id;
 }
+const NPM_KEYS = {
+  e: 'npmEdit',
+  n: 'npmNew',
+};
+FILES_KEYS.n = 'npm';
 const PANE_KEYS = {
   files: FILES_KEYS,
   branches: BRANCH_KEYS,
   commits: COMMIT_KEYS,
+  npm: NPM_KEYS,
 };
 
 for (const id of ACTION_IDS) {
@@ -223,7 +263,10 @@ for (const key of Object.keys(HIDDEN_KEYS)) {
 
 const actionFromKey = (key, pane, fileScope) => {
   const listPane =
-    pane === 'files' || pane === 'branches' || pane === 'commits';
+    pane === 'files' ||
+    pane === 'branches' ||
+    pane === 'commits' ||
+    pane === 'npm';
   if (listPane && (key === 'left' || key === 'right')) return null;
   const paneKeys = PANE_KEYS[pane];
   if (paneKeys && paneKeys[key]) return paneKeys[key];
@@ -235,7 +278,11 @@ const actionFromKey = (key, pane, fileScope) => {
 };
 
 const actionKeys = (id) =>
-  ACTIONS[id] ?? BRANCH_ACTIONS[id] ?? COMMIT_ACTIONS[id] ?? [];
+  ACTIONS[id] ??
+  BRANCH_ACTIONS[id] ??
+  COMMIT_ACTIONS[id] ??
+  NPM_ACTIONS[id] ??
+  [];
 
 const actionHot = (id) => ACTION_HOT[id] ?? actionKeys(id)[0];
 
@@ -327,6 +374,7 @@ module.exports = {
   ACTION_IDS,
   BRANCH_ACTIONS,
   COMMIT_ACTIONS,
+  NPM_ACTIONS,
   ACTION_HOT,
   ACTION_LABEL,
   DIFF_DISABLED,
@@ -338,6 +386,7 @@ module.exports = {
   TODO_DISABLED,
   BRANCHES_DISABLED,
   COMMITS_DISABLED,
+  NPM_DISABLED,
   SCROLL,
   PANE_ONLY,
   disabledActions,

package/lib/session/commit.js

@@ -5,6 +5,11 @@ const { stateView } = require('./accessors.js');
 const { isReadOnlyOrigin } = require('../files.js');
 const { isFixupCommit } = require('./actions.js');
 const { pickRepoWrite } = require('./ops.js');
+const {
+  commitLine,
+  commitText,
+  splitMessage,
+} = require('../render/commits.js');
 
 const COMMIT_STATUS = {
   commit: 'committed',
@@ -15,8 +20,37 @@ const COMMIT_STATUS = {
 
 const isInPlaceCommit = (kind) => kind === 'amend' || kind === 'reword';
 
+const PENDING_COMMIT = {
+  pending: true,
+  subject: 'uncommitted changes',
+  sha: '',
+  shortSha: '',
+  author: '',
+  email: '',
+  date: '',
+  when: '',
+  refs: '',
+  body: '',
+  head: false,
+};
+
+const listedCommits = (commits) => [PENDING_COMMIT].concat(commits ?? []);
+
+const isPending = (entry) => Boolean(entry && entry.pending);
+
+const briefCommit = (ui) => ui.commits.commitView !== 'full';
+
+const joinMessage = (line, rest) => (rest ? `${line}\n${rest}` : line);
+
+const keepBriefBody = (ui, text) => {
+  if (!briefCommit(ui)) return text;
+  const parts = splitMessage(text);
+  ui.composer.state.commitBody = parts.rest;
+  return parts.line;
+};
+
 const fixupMessage = (entry) => {
-  const subject = `${entry && entry.subject ? entry.subject : ''}`.trim();
+  const subject = commitLine(entry).trim();
   if (!subject) return 'fixup!';
   return `fixup! ${subject}`;
 };
@@ -47,11 +81,11 @@ const hasStagedChanges = (ui) => {
 
 const selectedCommit = (api) => {
   const cursor = api.ui.nav.commitCursor;
-  return api.state.commits[cursor] ?? null;
+  return listedCommits(api.state.commits)[cursor] ?? null;
 };
 
 const clampCommitCursor = (api) => {
-  const last = api.state.commits.length - 1;
+  const last = listedCommits(api.state.commits).length - 1;
   const nav = api.ui.nav;
   if (nav.commitCursor > last) nav.commitCursor = Math.max(0, last);
 };
@@ -75,7 +109,6 @@ const refreshAfterWrite = (api, extra = {}) => {
 
 const showCommits = (api) => {
   if (api.ui.mode === 'compose') return;
-  if (!canCommit(api.ui)) return;
   const repo = api.ui.repo;
   if (!repo.listCommits) {
     api.ui.status = 'read only';
@@ -94,11 +127,8 @@ const showCommits = (api) => {
 };
 
 const onCommitMove = (api, delta) => {
-  const commits = api.state.commits;
-  if (!commits.length) {
-    api.ui.status = 'nothing to review';
-    return;
-  }
+  if (api.ui.mode === 'compose') return;
+  const commits = listedCommits(api.state.commits);
   const next = Math.min(
     commits.length - 1,
     Math.max(0, api.ui.nav.commitCursor + delta),
@@ -117,15 +147,13 @@ const startGitCommit = (api, kind) => {
     return;
   }
   let text = '';
-  if (kind === 'fixup') {
-    text = fixupMessage(selectedCommit(api));
-  }
+  if (kind === 'fixup') text = fixupMessage(selectedCommit(api));
+  if (kind === 'commit') api.ui.nav.commitCursor = 0;
   if (kind === 'amend') {
     const headAt = api.state.commits.findIndex((entry) => entry.head);
-    api.ui.nav.commitCursor = headAt < 0 ? 0 : headAt;
-    if (ui.repo.lastMessage) {
-      text = ui.repo.lastMessage(ui.top) ?? '';
-    }
+    const at = headAt < 0 ? 0 : headAt;
+    api.ui.nav.commitCursor = api.state.commits.length ? at + 1 : 0;
+    if (ui.repo.lastMessage) text = ui.repo.lastMessage(ui.top) ?? '';
   }
   if (kind === 'reword') {
     const entry = selectedCommit(api);
@@ -133,19 +161,50 @@ const startGitCommit = (api, kind) => {
     if (typeof ui.repo.commitMessage === 'function') {
       text = ui.repo.commitMessage(ui.top, entry.sha) ?? '';
     } else {
-      text = `${entry.subject ?? ''}`;
+      text = commitText(entry);
     }
   }
+  ui.composer.state.commitBody = '';
+  if (isInPlaceCommit(kind)) text = keepBriefBody(ui, text);
   ui.composer.state.commitKind = kind;
   ui.composer.openCompose('commit', text);
+  const editor = ui.composer.state.editor;
+  if (!editor) return;
+  const lineEnd = editor.text.indexOf('\n');
+  editor.cursor = lineEnd < 0 ? editor.text.length : lineEnd;
 };
 
 const onCommit = (api) => {
   if (api.ui.nav.pane !== 'commits') return void showCommits(api);
   if (!canCommit(api.ui)) return;
+  api.ui.nav.commitCursor = 0;
   startGitCommit(api, 'commit');
 };
 
+const showSelectedDiff = (api) => {
+  if (api.ui.mode === 'compose') return;
+  const entry = selectedCommit(api);
+  if (!entry) return;
+  const ui = api.ui;
+  if (isPending(entry) || !entry.sha) {
+    ui.rev = '';
+    ui.revShort = '';
+  } else {
+    ui.rev = entry.sha;
+    ui.revShort = entry.shortSha || '';
+  }
+  const openDiff = () => {
+    ui.nav.todoOpen = false;
+    ui.nav.scroll = 0;
+    ui.nav.index = 0;
+    ui.nav.pane = ui.items.length ? 'diff' : 'files';
+    ui.syncReviewPath();
+    ui.syncFileCursor();
+    ui.status = '';
+  };
+  ui.refreshFromRepo({ keepEmpty: true, afterLoad: openDiff });
+};
+
 const onAmend = (api) => {
   if (api.ui.nav.pane !== 'commits') return;
   if (!canCommit(api.ui)) return;
@@ -260,7 +319,10 @@ const finishGitCommit = (api) => {
   const ui = api.ui;
   const kind = ui.composer.state.commitKind;
   const editor = ui.composer.state.editor;
-  const message = editor ? editor.text : '';
+  let message = editor ? editor.text : '';
+  if (isInPlaceCommit(kind) && briefCommit(ui)) {
+    message = joinMessage(message, ui.composer.state.commitBody);
+  }
   if (!message.trim()) {
     ui.status = 'empty commit message';
     return;
@@ -330,10 +392,19 @@ const confirmDropCommit = (api) => {
   if (!api.ui.status) api.ui.status = done;
 };
 
+const onView = (api) => {
+  if (api.ui.nav.pane !== 'commits') return;
+  const next = api.state.commitView === 'full' ? 'brief' : 'full';
+  api.state.commitView = next;
+  api.ui.nav.listScroll = 0;
+  api.ui.status = next;
+};
+
 const reset = (state) => {
   state.commits = [];
   state.dropName = '';
   state.dropSha = '';
+  state.commitView = 'brief';
 };
 
 const createCommitController = (ui) => {
@@ -341,6 +412,7 @@ const createCommitController = (ui) => {
     commits: [],
     dropName: '',
     dropSha: '',
+    commitView: 'brief',
   };
   const api = { ui, state };
   return stateView(
@@ -354,6 +426,8 @@ const createCommitController = (ui) => {
       onApply: () => onApply(api),
       onFixup: () => onFixup(api),
       onCommitMove: (delta) => onCommitMove(api, delta),
+      onShowDiff: () => showSelectedDiff(api),
+      onView: () => onView(api),
       cancelCommit: () => cancelCommit(api),
       startGitCommit: (kind) => startGitCommit(api, kind),
       finishGitCommit: () => finishGitCommit(api),
@@ -362,11 +436,12 @@ const createCommitController = (ui) => {
       cancelDropCommit: () => cancelDropCommit(api),
       confirmDropCommit: () => confirmDropCommit(api),
     },
-    ['commits', 'dropName'],
+    ['commits', 'dropName', 'commitView'],
   );
 };
 
 module.exports = {
   COMMIT_STATUS,
   createCommitController,
+  listedCommits,
 };