reslop 0.2.5 → 0.2.7

package/lib/report-tools.js

@@ -6,41 +6,52 @@ const model = require('./report-model.js');
 
 const { summary, problem, report, userTrace } = model;
 
+const PRETTIER_SUMMARY = [
+  'Code style issues',
+  'All matched files use Prettier',
+];
+
 const place = (file, line, column, root) =>
   userTrace(`${file}:${line}:${column}`, root);
 
+const errorReport = (tool, problems) => {
+  const stats = summary();
+  stats.errors = problems.length;
+  return report(tool, { summary: stats, problems });
+};
+
+const eslintReport = (problems) => {
+  const stats = summary();
+  const isWarning = (item) => item.severity === 'warning';
+  stats.warnings = problems.filter(isWarning).length;
+  stats.errors = problems.length - stats.warnings;
+  return report('eslint', { summary: stats, problems });
+};
+
 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;
+    for (const item of file.messages || []) {
+      const trace = place(
+        file.filePath || '',
+        item.line || 0,
+        item.column || 0,
+        root,
+      );
       problems.push(
         problem({
-          severity,
+          severity: item.severity === 1 ? 'warning' : 'error',
           message: item.message || '',
           code: item.ruleId || '',
-          trace: place(
-            file.filePath || '',
-            item.line || 0,
-            item.column || 0,
-            root,
-          ),
+          trace,
         }),
       );
     }
   }
-  stats.errors = errors;
-  stats.warnings = warnings;
-  return report('eslint', { summary: stats, problems });
+  return eslintReport(problems);
 };
 
 const eslintLine = (line) => {
@@ -67,69 +78,35 @@ const isPathLine = (line) => {
 };
 
 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) {
+  for (const line of `${text ?? ''}`.split(/\r?\n/)) {
     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),
-        }),
-      );
+      const { severity, message, code } = item;
+      const trace = place(file, item.line, item.column, root);
+      problems.push(problem({ severity, message, code, trace }));
       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 });
+  return seen ? eslintReport(problems) : null;
 };
 
-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 TSC_LINE = /^(.*)\((\d+),(\d+)\):\s+error\s+(TS\d+):\s+(.*)$/;
 
 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),
-      }),
-    );
+    const match = TSC_LINE.exec(line.trim());
+    if (!match) continue;
+    const trace = place(match[1], match[2], match[3], root);
+    problems.push(problem({ message: match[5], code: match[4], trace }));
   }
-  if (!problems.length) return null;
-  const stats = summary();
-  stats.errors = problems.length;
-  return report('tsc', { summary: stats, problems });
+  return problems.length ? errorReport('tsc', problems) : null;
 };
 
 const prettierFile = (line) => {
@@ -138,76 +115,53 @@ const prettierFile = (line) => {
   return '';
 };
 
+const isPrettierSummary = (line) =>
+  PRETTIER_SUMMARY.some((text) => line.includes(text));
+
 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;
+  for (const line of `${text ?? ''}`.split(/\r?\n/)) {
+    if (isPrettierSummary(line)) seen = true;
     const file = prettierFile(line);
     if (!file) continue;
     seen = true;
-    problems.push(
-      problem({
-        message: 'format',
-        trace: userTrace(file, root),
-      }),
-    );
+    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 });
+  return seen ? errorReport('prettier', problems) : null;
 };
 
 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];
+  const extra = [];
+  if (item.range) extra.push(['range', item.range]);
+  if (item.fix) extra.push(['fix', item.fix]);
   return extra;
 };
 
-const auditProblems = (text) => {
-  const audit = parseAuditReport(text);
-  const problems = new Array(audit.size);
-  let index = 0;
-  for (const item of audit.values()) {
-    problems[index] = problem({
-      severity: item.severity || 'error',
-      name: item.name,
-      message: item.title || '',
-      extra: auditExtra(item),
-    });
-    index += 1;
-  }
-  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 problems = [];
+  for (const item of parseAuditReport(text).values()) {
+    problems.push(
+      problem({
+        severity: item.severity || 'error',
+        name: item.name,
+        message: item.title || '',
+        extra: auditExtra(item),
+      }),
+    );
+  }
+  return problems.length ? errorReport('audit', problems) : null;
 };
 
 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;
+  return !!item.latest && item.latest !== item.current;
 };
 
 const parseOutdated = (text) => {
-  const outdated = parseOutdatedReport(text);
   const problems = [];
-  for (const [name, item] of outdated) {
+  for (const [name, item] of parseOutdatedReport(text)) {
     if (!behind(item)) continue;
     problems.push(
       problem({
@@ -230,8 +184,7 @@ const parseOutdated = (text) => {
 
 const pushLs = (problems, text) => {
   const message = `${text ?? ''}`.trim();
-  if (!message) return;
-  problems.push(problem({ message }));
+  if (message) problems.push(problem({ message }));
 };
 
 const walkLs = (node, problems) => {
@@ -251,13 +204,12 @@ const walkLs = (node, problems) => {
 
 const parseLs = (data) => {
   if (!data || typeof data !== 'object' || Array.isArray(data)) return null;
-  if (!data.dependencies && !Array.isArray(data.problems)) return null;
+  const listed = Array.isArray(data.problems);
+  if (!data.dependencies && !listed) 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 });
+  if (!problems.length && !listed) return null;
+  return errorReport('ls', problems);
 };
 
 const parseToolJson = (data, root) => {
@@ -281,50 +233,40 @@ const parseAuditText = (text) => {
     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,
-      }),
-    );
+    const severity = match[1].toLowerCase();
+    problems.push(problem({ severity, name, message: name }));
   }
-  if (!problems.length) return null;
-  const stats = summary();
-  stats.errors = problems.length;
-  return report('audit', { summary: stats, problems });
+  return problems.length ? errorReport('audit', problems) : null;
 };
 
-const TOOL_SLOTS = 4;
-
 const parseToolText = (text, root) => {
-  const reports = new Array(TOOL_SLOTS);
-  let index = 0;
-  const eslint = parseEslintStylish(text, root);
-  if (eslint) {
-    reports[index] = eslint;
-    index += 1;
-  }
-  const tsc = parseTsc(text, root);
-  if (tsc) {
-    reports[index] = tsc;
-    index += 1;
-  }
-  const prettier = parsePrettier(text, root);
-  if (prettier) {
-    reports[index] = prettier;
-    index += 1;
-  }
-  const audit = parseAuditText(text);
-  if (audit) {
-    reports[index] = audit;
-    index += 1;
-  }
-  reports.length = index;
-  return reports;
+  const reports = [
+    parseEslintStylish(text, root),
+    parseTsc(text, root),
+    parsePrettier(text, root),
+    parseAuditText(text),
+  ];
+  return reports.filter(Boolean);
+};
+
+const isPrettierLine = (line) => {
+  const text = line.trim();
+  if (!text) return false;
+  if (prettierFile(text) || isPrettierSummary(text)) return true;
+  return text.startsWith('Checking formatting');
+};
+
+const stderrRest = (text, reports) => {
+  if (!reports.some((item) => item.tool === 'prettier')) return text;
+  const lines = `${text ?? ''}`.split(/\r?\n/);
+  return lines
+    .filter((line) => !isPrettierLine(line))
+    .join('\n')
+    .trim();
 };
 
 module.exports = {
   parseToolJson,
   parseToolText,
+  stderrRest,
 };

package/lib/review-merge.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const files = require('./files.js');
-const { TASKS_FILE } = files;
+const { TASKS_FILE, taskKind } = files;
 
 const flatText = (text) => `${text ?? ''}`.trim().replace(/\n/g, ' ');
 
@@ -9,21 +9,13 @@ const snapTodo = (todo) => ({
   file: todo.file ?? '',
   text: flatText(todo.text),
   done: todo.done === true,
+  kind: taskKind(todo),
 });
 
-const snapList = (todos) => {
-  const list = [];
-  for (const todo of todos ?? []) {
-    const snap = snapTodo(todo);
-    if (!snap.text) continue;
-    list.push(snap);
-  }
-  return list;
-};
+const snapList = (todos) => todos.map(snapTodo).filter((snap) => snap.text);
 
 const copyMap = (map) => {
   const next = new Map();
-  if (!map) return next;
   for (const [key, note] of map) next.set(key, { ...note });
   return next;
 };
@@ -58,27 +50,31 @@ const pickDone = (baseDone, ourDone, theirDone) => {
 
 const withDone = (todo, done) => {
   if (todo.done === done) return todo;
-  return { id: todo.id, file: todo.file, text: todo.text, done };
+  return { ...todo, done };
 };
 
 const liveText = (todo) => flatText(todo.text);
 
 const snapText = (snap) => snap.text;
 
+const liveKey = (todo) => `${taskKind(todo)}\0${liveText(todo)}`;
+
+const snapKey = (snap) => `${taskKind(snap)}\0${snapText(snap)}`;
+
 const flags = (n) => new Array(n).fill(false);
 
 const adoptTodo = (store, snap) => {
   const id = store.nextTaskId;
   store.nextTaskId += 1;
   const file = snap.file || TASKS_FILE;
-  return { id, file, text: snap.text, done: snap.done };
+  return { id, file, text: snap.text, done: snap.done, kind: taskKind(snap) };
 };
 
 const replaceTodo = (todo, snap) => ({
-  id: todo.id,
-  file: todo.file,
+  ...todo,
   text: snap.text,
   done: snap.done,
+  kind: taskKind(snap),
 });
 
 class TodoMerge {
@@ -94,23 +90,23 @@ class TodoMerge {
     this.alias = new Map();
   }
 
-  keepOurs(index, text) {
+  keepOurs(index) {
     this.kept[index] = true;
-    this.alias.set(text, this.ours[index]);
+    this.alias.set(liveKey(this.ours[index]), this.ours[index]);
   }
 
   mergeBase(base) {
     const { ours, theirs } = this;
-    const text = base.text;
-    const oi = claim(ours, this.usedOurs, text, liveText);
-    const ti = claim(theirs, this.usedTheirs, text, snapText);
+    const key = snapKey(base);
+    const oi = claim(ours, this.usedOurs, key, liveKey);
+    const ti = claim(theirs, this.usedTheirs, key, snapKey);
     if (oi >= 0 && ti >= 0) {
       const done = pickDone(base.done, ours[oi].done === true, theirs[ti].done);
       ours[oi] = withDone(ours[oi], done);
-      this.keepOurs(oi, text);
+      this.keepOurs(oi);
     } else if (oi >= 0) {
       if (ours[oi].done === base.done) this.dropped[oi] = true;
-      else this.keepOurs(oi, text);
+      else this.keepOurs(oi);
     } else if (ti >= 0 && theirs[ti].done !== base.done) {
       this.theirKeep[ti] = true;
     }
@@ -118,32 +114,33 @@ class TodoMerge {
 
   mergeFresh(index) {
     const { ours, theirs } = this;
-    const text = liveText(ours[index]);
-    const ti = claim(theirs, this.usedTheirs, text, snapText);
+    const key = liveKey(ours[index]);
+    const ti = claim(theirs, this.usedTheirs, key, snapKey);
     if (ti < 0) {
       this.kept[index] = true;
       return;
     }
     const done = ours[index].done === true || theirs[ti].done === true;
     ours[index] = withDone(ours[index], done);
-    this.keepOurs(index, text);
+    this.keepOurs(index);
   }
 
-  findMerged(merged, text) {
-    const linked = this.alias.get(text);
+  findMerged(merged, snap) {
+    const key = snapKey(snap);
+    const linked = this.alias.get(key);
     const at = linked ? merged.indexOf(linked) : -1;
     if (at >= 0) return at;
-    return merged.findIndex((todo) => liveText(todo) === text);
+    return merged.findIndex((todo) => liveKey(todo) === key);
   }
 
   theirPlace(merged, index) {
     const { theirs } = this;
     for (let j = index - 1; j >= 0; j--) {
-      const prev = this.findMerged(merged, theirs[j].text);
+      const prev = this.findMerged(merged, theirs[j]);
       if (prev >= 0) return prev + 1;
     }
     for (let j = index + 1; j < theirs.length; j++) {
-      const next = this.findMerged(merged, theirs[j].text);
+      const next = this.findMerged(merged, theirs[j]);
       if (next >= 0) return next;
     }
     return merged.length;
@@ -151,7 +148,7 @@ class TodoMerge {
 
   place(merged, at, index, item) {
     merged.splice(at, 0, item);
-    this.alias.set(this.theirs[index].text, item);
+    this.alias.set(snapKey(this.theirs[index]), item);
     this.theirKeep[index] = false;
   }
 
@@ -214,10 +211,7 @@ const pickNote = (ours, base, theirs) => {
 };
 
 const mergeMap = (ours, base, theirs) => {
-  const keys = new Set();
-  for (const key of ours.keys()) keys.add(key);
-  for (const key of base.keys()) keys.add(key);
-  for (const key of theirs.keys()) keys.add(key);
+  const keys = new Set([...ours.keys(), ...base.keys(), ...theirs.keys()]);
   for (const key of keys) {
     const next = pickNote(ours.get(key), base.get(key), theirs.get(key));
     if (!next) ours.delete(key);
@@ -227,13 +221,11 @@ const mergeMap = (ours, base, theirs) => {
 
 const mergeReview = (store, disk) => {
   const base = store.baseline;
-  const baseTodos = base?.tasks ?? base?.todos ?? [];
   const baseStatus = base ? base.status : store.status;
-  store.tasks = new TodoMerge(store, snapList(disk.tasks)).merge(baseTodos);
-  const feedback = base ? base.feedback : new Map();
-  const code = base ? base.code : new Map();
-  mergeMap(store.feedback, feedback, disk.feedback);
-  mergeMap(store.code, code, disk.code);
+  const theirs = snapList(disk.tasks);
+  store.tasks = new TodoMerge(store, theirs).merge(base?.tasks ?? []);
+  mergeMap(store.feedback, base?.feedback ?? new Map(), disk.feedback);
+  mergeMap(store.code, base?.code ?? new Map(), disk.code);
   if (store.status === baseStatus && disk.status) store.status = disk.status;
   store.baseline = snapshotSide(disk);
 };