reslop 0.2.3 → 0.2.5

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,20 +68,21 @@ 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));
 };
 
 module.exports = {
   toolHint,
-  parseReports,
   buildDocument,
 };

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));
   }
@@ -158,7 +160,6 @@ const runCapture = async (proc, deps = {}) => {
 };
 
 module.exports = {
-  outputMode,
   winCommand,
   runCapture,
 };

package/lib/report-test.js

@@ -1,11 +1,14 @@
 'use strict';
 
 const model = require('./report-model.js');
-const { isPassingTest } = require('./npm-commands.js');
+const npmCommands = require('./npm-commands.js');
+const { isPassingTest } = npmCommands;
+const utilities = require('./utilities.js');
+const { unquote } = utilities;
 
 const { summary, problem, report, userTrace } = model;
 
-const KNOWN = new Set([
+const KNOWN = [
   'message',
   'error',
   'code',
@@ -19,7 +22,7 @@ const KNOWN = new Set([
   'location',
   'severity',
   'type',
-]);
+];
 
 const show = (value) => {
   if (value === null || value === undefined) return '';
@@ -33,7 +36,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;
@@ -68,17 +71,6 @@ const problemFromFields = (name, fields, root) => {
   });
 };
 
-const yamlValue = (raw) => {
-  const text = `${raw ?? ''}`.trim();
-  if (text.length < 2) return text;
-  const open = text[0];
-  const close = text[text.length - 1];
-  const code = open.charCodeAt(0);
-  const quoted = open === close && (code === 34 || code === 39);
-  if (quoted) return text.slice(1, -1);
-  return text;
-};
-
 const yamlFields = (lines) => {
   const fields = [];
   let index = 0;
@@ -92,7 +84,7 @@ const yamlFields = (lines) => {
     const value = match[3].trim().replace(/,$/, '');
     const block = value === '|-' || value === '|' || value === '>';
     if (!block) {
-      fields.push([key, yamlValue(value)]);
+      fields.push([key, unquote(value)]);
       index += 1;
       continue;
     }
@@ -123,16 +115,23 @@ const tapName = (line) => {
   return match[1].trim();
 };
 
+const STAT_FIELD = {
+  tests: 'tests',
+  pass: 'passed',
+  fail: 'failed',
+  skipped: 'skipped',
+  skip: 'skipped',
+};
+
+const applyStat = (stats, key, value) => {
+  if (key === 'duration_ms') stats.duration = value;
+  const field = Object.hasOwn(STAT_FIELD, key) ? STAT_FIELD[key] : '';
+  if (field) stats[field] = Number(value);
+};
+
 const applyTapComment = (stats, line) => {
   const match = /^#\s+(\w+)\s+(.+)$/.exec(line.trim());
-  if (!match) return;
-  const key = match[1];
-  const value = match[2].trim();
-  if (key === 'tests') stats.tests = Number(value);
-  if (key === 'pass') stats.passed = Number(value);
-  if (key === 'fail') stats.failed = Number(value);
-  if (key === 'skipped' || key === 'skip') stats.skipped = Number(value);
-  if (key === 'duration_ms') stats.duration = value;
+  if (match) applyStat(stats, match[1], match[2].trim());
 };
 
 const isTapLine = (line) => {
@@ -258,6 +257,8 @@ const jestTrace = (text, file, root) => {
   return userTrace(file, root);
 };
 
+const durationText = (value) => (value === undefined ? '' : `${value}`);
+
 const jestProblem = (item, file, root) => {
   const messages = item.failureMessages || [];
   const text = messages.join('\n');
@@ -269,7 +270,7 @@ const jestProblem = (item, file, root) => {
     trace: jestTrace(text, file, root),
     expected: expected ? expected[1] : '',
     actual: received ? received[1] : '',
-    duration: item.duration === undefined ? '' : `${item.duration}`,
+    duration: durationText(item.duration),
   });
 };
 
@@ -297,29 +298,27 @@ const parseJest = (data, root) => {
   return report('test', { summary: stats, problems });
 };
 
+const PLAYWRIGHT_FAILED = ['failed', 'timedOut'];
+
+const playwrightProblem = (spec, result, root) => {
+  const error = result.error || {};
+  return problem({
+    name: spec.title || '',
+    message: error.message || result.status,
+    trace: userTrace(error.stack || '', root),
+    duration: durationText(result.duration),
+  });
+};
+
 const walkPlaywright = (suite, problems, root) => {
-  const specs = suite.specs || [];
-  for (const spec of specs) {
-    const tests = spec.tests || [];
-    for (const item of tests) {
-      const results = item.results || [];
-      for (const result of results) {
-        const status = result.status;
-        if (status !== 'failed' && status !== 'timedOut') continue;
-        const error = result.error || {};
-        problems.push(
-          problem({
-            name: spec.title || '',
-            message: error.message || status,
-            trace: userTrace(error.stack || '', root),
-            duration: result.duration === undefined ? '' : `${result.duration}`,
-          }),
-        );
-      }
+  for (const spec of suite.specs || []) {
+    const results = (spec.tests || []).flatMap((item) => item.results || []);
+    for (const result of results) {
+      if (!PLAYWRIGHT_FAILED.includes(result.status)) continue;
+      problems.push(playwrightProblem(spec, result, root));
     }
   }
-  const children = suite.suites || [];
-  for (const child of children) walkPlaywright(child, problems, root);
+  for (const child of suite.suites || []) walkPlaywright(child, problems, root);
 };
 
 const parsePlaywright = (data, root) => {
@@ -348,12 +347,7 @@ const specStats = (stats, line) => {
   const match = /^[ℹi]\s+(\w+)\s+(.+)$/.exec(line.trim());
   if (!match) return false;
   const key = match[1];
-  const value = match[2].trim();
-  if (key === 'tests') stats.tests = Number(value);
-  if (key === 'pass') stats.passed = Number(value);
-  if (key === 'fail') stats.failed = Number(value);
-  if (key === 'skipped') stats.skipped = Number(value);
-  if (key === 'duration_ms') stats.duration = value;
+  applyStat(stats, key, match[2].trim());
   return key === 'tests' || key === 'pass' || key === 'fail';
 };
 

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,27 +295,36 @@ 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;
 };
 
 module.exports = {
-  parseEslintJson,
-  parseEslintStylish,
-  parseTsc,
-  parsePrettier,
-  parseAudit,
-  parseOutdated,
-  parseLs,
   parseToolJson,
   parseToolText,
 };