@thymian/plugin-reporter 0.1.11 → 0.1.12-canary.20260709-74e687c

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,14 +1,25 @@
1
- import type { Report, Severity } from '@thymian/core';
1
+ import { type Report, type Severity, type SeverityWarnLogger } from '@thymian/core';
2
+ /** Tallies of execution outcomes across a report. */
3
+ export type StatusCounts = Record<'passed' | 'failed' | 'skipped', number>;
2
4
  export type ThymianReportStatistics = {
3
5
  numberOfReports: number;
4
6
  numberOfRuns: number;
7
+ /** Number of detail findings (assertion/informational/rule-violation). */
5
8
  numberOfFindings: number;
9
+ /**
10
+ * Severity tallies. Counts each `failed` execution exactly once at its
11
+ * resolved severity; detail findings carry no severity and are not counted.
12
+ */
6
13
  severityCounts: Record<Severity, number>;
14
+ /** Number of executions per outcome (`passed`/`failed`/`skipped`). */
15
+ statusCounts: StatusCounts;
16
+ /** Number of detail findings per `kind`. */
17
+ kindCounts: Record<string, number>;
7
18
  };
8
19
  export type ReportAnalysis = {
9
20
  statistics: ThymianReportStatistics;
10
21
  };
11
- export declare function analyze(reports: Report[]): ReportAnalysis;
22
+ export declare function analyze(reports: Report[], logger?: SeverityWarnLogger): ReportAnalysis;
12
23
  export interface Formatter<Options = Record<PropertyKey, unknown>> {
13
24
  options: Options;
14
25
  init(options: Options): void | Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"formatter.d.ts","sourceRoot":"","sources":["../src/formatter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,MAAM,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAErE,MAAM,MAAM,uBAAuB,GAAG;IACpC,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,uBAAuB,CAAC;CACrC,CAAC;AAcF,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,cAAc,CA4BzD;AAED,MAAM,WAAW,SAAS,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC;IAC/D,OAAO,EAAE,OAAO,CAAC;IAEjB,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7C,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7C,KAAK,IAAI,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAC3D"}
1
+ {"version":3,"file":"formatter.d.ts","sourceRoot":"","sources":["../src/formatter.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,MAAM,EAEX,KAAK,QAAQ,EACb,KAAK,kBAAkB,EAGxB,MAAM,eAAe,CAAC;AAEvB,qDAAqD;AACrD,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,GAAG,QAAQ,GAAG,SAAS,EAAE,MAAM,CAAC,CAAC;AAE3E,MAAM,MAAM,uBAAuB,GAAG;IACpC,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,0EAA0E;IAC1E,gBAAgB,EAAE,MAAM,CAAC;IACzB;;;OAGG;IACH,cAAc,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACzC,sEAAsE;IACtE,YAAY,EAAE,YAAY,CAAC;IAC3B,4CAA4C;IAC5C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,uBAAuB,CAAC;CACrC,CAAC;AAEF,wBAAgB,OAAO,CACrB,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,CAAC,EAAE,kBAAkB,GAC1B,cAAc,CA6ChB;AAED,MAAM,WAAW,SAAS,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC;IAC/D,OAAO,EAAE,OAAO,CAAC;IAEjB,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7C,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7C,KAAK,IAAI,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAC3D"}
package/dist/formatter.js CHANGED
@@ -1,24 +1,30 @@
1
- function collectFindings(report) {
2
- const visit = (executions) => (executions ?? []).flatMap((execution) => [
3
- ...execution.findings,
4
- ...visit(execution.children),
5
- ]);
6
- return report.runs.flatMap((run) => visit(run.executions));
7
- }
8
- export function analyze(reports) {
1
+ import { buildRuleIndex, resolveExecutionSeverity, walkExecutions, walkFindings, } from '@thymian/core';
2
+ export function analyze(reports, logger) {
9
3
  const severityCounts = {
10
4
  error: 0,
11
5
  warn: 0,
12
6
  hint: 0,
13
7
  info: 0,
14
8
  };
9
+ const statusCounts = { passed: 0, failed: 0, skipped: 0 };
10
+ const kindCounts = {};
15
11
  let runCounter = 0;
16
12
  let findingsCounter = 0;
17
13
  for (const report of reports) {
18
14
  runCounter += report.runs.length;
19
- for (const finding of collectFindings(report)) {
20
- findingsCounter += 1;
21
- severityCounts[finding.severity] += 1;
15
+ for (const run of report.runs) {
16
+ const ruleIndex = buildRuleIndex(run.rules);
17
+ for (const { execution } of walkExecutions(run.executions)) {
18
+ statusCounts[execution.status.kind] += 1;
19
+ const severity = resolveExecutionSeverity(execution, ruleIndex, logger);
20
+ if (severity !== undefined) {
21
+ severityCounts[severity] += 1;
22
+ }
23
+ }
24
+ for (const { finding } of walkFindings(run.executions)) {
25
+ findingsCounter += 1;
26
+ kindCounts[finding.kind] = (kindCounts[finding.kind] ?? 0) + 1;
27
+ }
22
28
  }
23
29
  }
24
30
  return {
@@ -27,6 +33,8 @@ export function analyze(reports) {
27
33
  numberOfRuns: runCounter,
28
34
  numberOfFindings: findingsCounter,
29
35
  severityCounts,
36
+ statusCounts,
37
+ kindCounts,
30
38
  },
31
39
  };
32
40
  }
@@ -1 +1 @@
1
- {"version":3,"file":"formatter.js","sourceRoot":"","sources":["../src/formatter.ts"],"names":[],"mappings":"AAaA,SAAS,eAAe,CAAC,MAAc;IACrC,MAAM,KAAK,GAAG,CACZ,UAAgD,EAC/B,EAAE,CACnB,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC;QACxC,GAAG,SAAS,CAAC,QAAQ;QACrB,GAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC;KAC7B,CAAC,CAAC;IAEL,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,OAAiB;IACvC,MAAM,cAAc,GAA6B;QAC/C,KAAK,EAAE,CAAC;QACR,IAAI,EAAE,CAAC;QACP,IAAI,EAAE,CAAC;QACP,IAAI,EAAE,CAAC;KACR,CAAC;IAEF,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,eAAe,GAAG,CAAC,CAAC;IAExB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;QAEjC,KAAK,MAAM,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9C,eAAe,IAAI,CAAC,CAAC;YACrB,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED,OAAO;QACL,UAAU,EAAE;YACV,eAAe,EAAE,OAAO,CAAC,MAAM;YAC/B,YAAY,EAAE,UAAU;YACxB,gBAAgB,EAAE,eAAe;YACjC,cAAc;SACf;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"formatter.js","sourceRoot":"","sources":["../src/formatter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAEd,wBAAwB,EAGxB,cAAc,EACd,YAAY,GACb,MAAM,eAAe,CAAC;AAyBvB,MAAM,UAAU,OAAO,CACrB,OAAiB,EACjB,MAA2B;IAE3B,MAAM,cAAc,GAA6B;QAC/C,KAAK,EAAE,CAAC;QACR,IAAI,EAAE,CAAC;QACP,IAAI,EAAE,CAAC;QACP,IAAI,EAAE,CAAC;KACR,CAAC;IACF,MAAM,YAAY,GAAiB,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IACxE,MAAM,UAAU,GAA2B,EAAE,CAAC;IAE9C,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,eAAe,GAAG,CAAC,CAAC;IAExB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;QAEjC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAC9B,MAAM,SAAS,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAE5C,KAAK,MAAM,EAAE,SAAS,EAAE,IAAI,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC3D,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAEzC,MAAM,QAAQ,GAAG,wBAAwB,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;gBACxE,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;oBAC3B,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAChC,CAAC;YACH,CAAC;YAED,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBACvD,eAAe,IAAI,CAAC,CAAC;gBACrB,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO;QACL,UAAU,EAAE;YACV,eAAe,EAAE,OAAO,CAAC,MAAM;YAC/B,YAAY,EAAE,UAAU;YACxB,gBAAgB,EAAE,eAAe;YACjC,cAAc;YACd,YAAY;YACZ,UAAU;SACX;KACF,CAAC;AACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"csv.d.ts","sourceRoot":"","sources":["../../src/formatters/csv.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAqBF,qBAAa,YAAa,YAAW,SAAS,CAAC,mBAAmB,CAAC;IAKrD,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJnC,OAAO,CAAC,MAAM,CAAe;IAE7B,OAAO,EAAG,mBAAmB,CAAC;gBAED,MAAM,EAAE,MAAM;IAE3C,KAAK,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IASpC,IAAI,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBjD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAkBtC;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAczD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAYvD"}
1
+ {"version":3,"file":"csv.d.ts","sourceRoot":"","sources":["../../src/formatters/csv.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAa,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAU/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAKjD,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAYF,qBAAa,YAAa,YAAW,SAAS,CAAC,mBAAmB,CAAC;IAKrD,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJnC,OAAO,CAAC,MAAM,CAAe;IAE7B,OAAO,EAAG,mBAAmB,CAAC;gBAED,MAAM,EAAE,MAAM;IAE3C,KAAK,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAW9B,IAAI,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgCvD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAkBtC;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAkDzD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAYvD"}
@@ -1,17 +1,12 @@
1
1
  import { createWriteStream } from 'node:fs';
2
- function formatLocation(location) {
3
- switch (location.type) {
4
- case 'custom':
5
- return location.value;
6
- case 'file':
7
- return [location.path, location.line, location.column]
8
- .filter((part) => part !== undefined)
9
- .join(':');
10
- case 'url':
11
- return location.url;
12
- case 'thymianFormat':
13
- return `format:${location.elementId}${location.pointer ? `#${location.pointer}` : ''}`;
14
- }
2
+ import { mkdir } from 'node:fs/promises';
3
+ import { dirname } from 'node:path';
4
+ import { buildRuleIndex, createLocationResolver, findingDetails, resolveExecutionSeverity, walkExecutions, } from '@thymian/core';
5
+ const CSV_HEADER = 'run_id,run_type,tool,rule_id,location,row_type,status,severity,finding_kind,finding_id,title,message,detail\n';
6
+ function executionLabel(execution, resolveLocation, runVersion) {
7
+ return execution.kind === 'test'
8
+ ? execution.name
9
+ : resolveLocation(execution.location, runVersion);
15
10
  }
16
11
  export class CsvFormatter {
17
12
  logger;
@@ -21,22 +16,31 @@ export class CsvFormatter {
21
16
  this.logger = logger;
22
17
  }
23
18
  flush() {
24
- return new Promise((resolve) => {
19
+ return new Promise((resolve, reject) => {
20
+ this.stream.once('error', reject);
25
21
  this.stream.end(() => {
22
+ this.stream.removeListener('error', reject);
26
23
  this.logger.debug(`Wrote CSV report to ${this.options.path}`);
27
24
  resolve(undefined);
28
25
  });
29
26
  });
30
27
  }
31
- init(options) {
28
+ async init(options) {
32
29
  this.options = options;
30
+ await mkdir(dirname(options.path), { recursive: true });
33
31
  this.stream = createWriteStream(options.path, 'utf-8');
34
- this.stream.on('error', (err) => {
35
- this.logger.error(`Failed to write CSV report to ${this.options.path}: ${err.message}`);
36
- });
37
- return new Promise((resolve) => {
32
+ return new Promise((resolve, reject) => {
33
+ const onError = (err) => {
34
+ this.logger.error(`Failed to write CSV report to ${this.options.path}: ${err.message}`);
35
+ reject(err);
36
+ };
37
+ this.stream.once('error', onError);
38
38
  this.stream.on('ready', () => {
39
- this.stream.write('run_id,run_type,tool,execution_location,finding_kind,finding_id,severity,title,message,rule_id\n');
39
+ this.stream.removeListener('error', onError);
40
+ this.stream.on('error', (err) => {
41
+ this.logger.error(`Failed to write CSV report to ${this.options.path}: ${err.message}`);
42
+ });
43
+ this.stream.write(CSV_HEADER);
40
44
  resolve();
41
45
  });
42
46
  });
@@ -61,10 +65,36 @@ export class CsvFormatter {
61
65
  }
62
66
  export function reportToCsvLines(report) {
63
67
  const lines = [];
68
+ const resolveLocation = createLocationResolver(report);
64
69
  for (const run of report.runs) {
65
- for (const execution of run.executions ?? []) {
66
- for (const finding of execution.findings) {
67
- lines.push(`${csvSafe(run.runId)},${csvSafe(run.runType)},${csvSafe(run.tool.name)},${csvSafe(formatLocation(execution.location))},${csvSafe(finding.kind)},${csvSafe(finding.id)},${csvSafe(finding.severity)},${csvSafe(finding.title)},${csvSafe(finding.message?.text)},${csvSafe('ruleId' in finding ? finding.ruleId : undefined)}\n`);
70
+ const ruleIndex = buildRuleIndex(run.rules);
71
+ const runVersion = run.thymianFormatVersion;
72
+ for (const { execution } of walkExecutions(run.executions)) {
73
+ const ruleId = execution.ruleId ?? '';
74
+ const status = execution.status;
75
+ const severity = resolveExecutionSeverity(execution, ruleIndex);
76
+ const reason = status.kind === 'passed' ? '' : (status.reason ?? '');
77
+ const duration = status.kind !== 'skipped' && status.durationMilliseconds !== undefined
78
+ ? `duration=${status.durationMilliseconds}ms`
79
+ : '';
80
+ const label = executionLabel(execution, resolveLocation, runVersion);
81
+ // One row per execution so failed/skipped executions stay visible even
82
+ // when they carry no detail findings.
83
+ lines.push(`${csvSafe(run.runId)},${csvSafe(run.runType)},${csvSafe(run.tool.name)},${csvSafe(ruleId)},${csvSafe(label)},execution,${csvSafe(status.kind)},${csvSafe(severity)},,,,${csvSafe(reason)},${csvSafe(duration)}\n`);
84
+ const findingsWithLocation = execution.kind === 'test'
85
+ ? execution.steps.flatMap((step) => step.findings.map((finding) => ({
86
+ finding,
87
+ location: resolveLocation(step.location, runVersion),
88
+ })))
89
+ : execution.findings.map((finding) => ({
90
+ finding,
91
+ location: resolveLocation(execution.location, runVersion),
92
+ }));
93
+ for (const { finding, location } of findingsWithLocation) {
94
+ const detail = findingDetails(finding)
95
+ .map((d) => `${d.label}=${d.value}`)
96
+ .join('; ');
97
+ lines.push(`${csvSafe(run.runId)},${csvSafe(run.runType)},${csvSafe(run.tool.name)},${csvSafe(ruleId)},${csvSafe(location)},finding,,,${csvSafe(finding.kind)},${csvSafe(finding.id)},${csvSafe(finding.title)},${csvSafe(finding.message?.text)},${csvSafe(detail)}\n`);
68
98
  }
69
99
  }
70
100
  }
@@ -1 +1 @@
1
- {"version":3,"file":"csv.js","sourceRoot":"","sources":["../../src/formatters/csv.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"csv.js","sourceRoot":"","sources":["../../src/formatters/csv.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,5 @@
1
- import type { Logger, Report, Severity } from '@thymian/core';
1
+ import type { Logger, Report } from '@thymian/core';
2
2
  import { type Formatter } from '../formatter.js';
3
- export declare const details: (text: string) => string;
4
- export declare function mapSeverityToBadge(severity: Severity): string;
5
3
  export type MarkdownFormatterOptions = {
6
4
  path: string;
7
5
  };
@@ -1 +1 @@
1
- {"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../src/formatters/markdown.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAG9D,OAAO,EAAW,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG1D,eAAO,MAAM,OAAO,GAAI,MAAM,MAAM,KAAG,MAC8B,CAAC;AAEtE,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAW7D;AAqBD,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,qBAAa,iBAAkB,YAAW,SAAS,CAAC,wBAAwB,CAAC;IAK/D,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJnC,OAAO,EAAG,wBAAwB,CAAC;IAEnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;gBAEX,MAAM,EAAE,MAAM;IAE3C,IAAI,CAAC,OAAO,EAAE,wBAAwB,GAAG,IAAI;IAI7C,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAItB,KAAK,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CA0C3C"}
1
+ {"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../src/formatters/markdown.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAGV,MAAM,EACN,MAAM,EAIP,MAAM,eAAe,CAAC;AAWvB,OAAO,EAAW,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AA2V1D,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,qBAAa,iBAAkB,YAAW,SAAS,CAAC,wBAAwB,CAAC;IAK/D,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJnC,OAAO,EAAG,wBAAwB,CAAC;IAEnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;gBAEX,MAAM,EAAE,MAAM;IAE3C,IAAI,CAAC,OAAO,EAAE,wBAAwB,GAAG,IAAI;IAI7C,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAItB,KAAK,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAkD3C"}
@@ -1,33 +1,246 @@
1
1
  import * as path from 'node:path';
2
+ import { buildRuleIndex, findingDetails, httpStatusCodeToPhrase, isValidHttpStatusCode, resolveExecutionSeverity, walkExecutions, } from '@thymian/core';
2
3
  import { mkdir, writeFile } from 'fs/promises';
3
4
  import { analyze } from '../formatter.js';
4
- import { errorSymbol, hintSymbol, warnSymbol } from '../style.js';
5
- export const details = (text) => `\n<details>\n<summary>More details</summary>\n${text}\n</details>`;
6
- export function mapSeverityToBadge(severity) {
7
- if (severity === 'error') {
8
- return `${errorSymbol} error`;
5
+ import { colorSpan, errorSymbol, hintSymbol, infoSymbol, SEVERITY_COLORS, skippedSymbol, successSymbol, warnSymbol, } from '../style.js';
6
+ import { createLocationResolver, } from './resolve-location.js';
7
+ function escapeCell(text) {
8
+ return text.replaceAll('|', '\\|').replaceAll('\n', ' ');
9
+ }
10
+ /** Escapes text interpolated into raw HTML (e.g. inside `<details><summary>`). */
11
+ function escapeHtml(text) {
12
+ return text
13
+ .replaceAll('&', '&amp;')
14
+ .replaceAll('<', '&lt;')
15
+ .replaceAll('>', '&gt;');
16
+ }
17
+ function severityWord(severity) {
18
+ return severity === 'warn' ? 'warning' : severity;
19
+ }
20
+ function findingKindWord(kind) {
21
+ switch (kind) {
22
+ case 'assertion-success':
23
+ return 'passed';
24
+ case 'assertion-failure':
25
+ case 'rule-violation':
26
+ return 'failed';
27
+ case 'informational':
28
+ return 'info';
29
+ default:
30
+ return kind;
31
+ }
32
+ }
33
+ function pluralize(count, singular) {
34
+ return count === 1 ? singular : `${singular}s`;
35
+ }
36
+ /**
37
+ * Build the `— expected: …, actual: …` suffix for an `assertion-failure`
38
+ * finding from its {@link findingDetails}. Omits either half when the
39
+ * corresponding detail is absent, and returns `''` when neither is present.
40
+ */
41
+ function assertionFailureSuffix(finding) {
42
+ const detail = findingDetails(finding);
43
+ const expected = detail.find((d) => d.label === 'expected')?.value;
44
+ const actual = detail.find((d) => d.label === 'actual')?.value;
45
+ const parts = [];
46
+ if (expected !== undefined) {
47
+ parts.push(`expected: ${expected}`);
48
+ }
49
+ if (actual !== undefined) {
50
+ parts.push(`actual: ${actual}`);
51
+ }
52
+ return parts.length > 0 ? `— ${parts.join(', ')}` : '';
53
+ }
54
+ /** Deterministic `YYYY-MM-DD HH:mm` from the most recent report's ISO timestamp. */
55
+ function formatGeneratedDate(reports) {
56
+ const mostRecent = reports.reduce((latest, report) => (report.createdAt > latest ? report.createdAt : latest), '');
57
+ return `${mostRecent.slice(0, 10)} ${mostRecent.slice(11, 16)}`;
58
+ }
59
+ function buildRollupLine(reports, severityCounts, totalRuns) {
60
+ const { error, warn, hint, info } = severityCounts;
61
+ const parts = [
62
+ colorSpan(SEVERITY_COLORS.error, `${errorSymbol} ${error} ${pluralize(error, 'error')}`),
63
+ colorSpan(SEVERITY_COLORS.warn, `${warnSymbol} ${warn} ${pluralize(warn, 'warning')}`),
64
+ colorSpan(SEVERITY_COLORS.hint, `${hintSymbol} ${hint} ${pluralize(hint, 'hint')}`),
65
+ colorSpan(SEVERITY_COLORS.info, `${infoSymbol} ${info} info`),
66
+ ];
67
+ return `${parts.join(' · ')} — across ${totalRuns} runs · generated ${formatGeneratedDate(reports)}`;
68
+ }
69
+ function countOutcomes(executions) {
70
+ let failed = 0;
71
+ let skipped = 0;
72
+ let passed = 0;
73
+ for (const { execution } of walkExecutions(executions)) {
74
+ if (execution.status.kind === 'failed') {
75
+ failed += 1;
76
+ }
77
+ else if (execution.status.kind === 'skipped') {
78
+ skipped += 1;
79
+ }
80
+ else {
81
+ passed += 1;
82
+ }
83
+ }
84
+ return { failed, skipped, passed };
85
+ }
86
+ function buildOverviewRow(run) {
87
+ const { failed, skipped, passed } = countOutcomes(run.executions);
88
+ const outcome = `${errorSymbol} ${failed} failed · ${skippedSymbol} ${skipped} skipped · ${successSymbol} ${passed} passed`;
89
+ const duration = run.duration !== undefined ? `${(run.duration / 1000).toFixed(2)}s` : '';
90
+ return `| ${escapeCell(run.tool.name)} | ${run.runType} | ${outcome} | ${duration} |`;
91
+ }
92
+ /** Renders lint/analyze run bodies: location-grouped `Severity | Rule | Message` tables. */
93
+ function buildLintAnalyzeSection(run, resolveLocation, logger) {
94
+ const lines = [];
95
+ lines.push(`## ${run.tool.name} · ${run.runType}`);
96
+ lines.push('');
97
+ const ruleIndex = buildRuleIndex(run.rules);
98
+ const groups = new Map();
99
+ for (const { execution } of walkExecutions(run.executions)) {
100
+ if (execution.kind !== 'lint' && execution.kind !== 'analyze') {
101
+ continue;
102
+ }
103
+ const location = resolveLocation(execution.location, run.thymianFormatVersion);
104
+ const rows = groups.get(location) ?? [];
105
+ if (!groups.has(location)) {
106
+ groups.set(location, rows);
107
+ }
108
+ const rule = execution.ruleId ? ruleIndex.get(execution.ruleId) : undefined;
109
+ const ruleCell = execution.ruleId
110
+ ? `\`${execution.ruleId}\``
111
+ : 'unnamed check';
112
+ if (execution.status.kind === 'failed') {
113
+ const severity = resolveExecutionSeverity(execution, ruleIndex, logger) ?? 'error';
114
+ const message = execution.status.reason ??
115
+ rule?.summary?.text ??
116
+ rule?.description?.text ??
117
+ '';
118
+ rows.push(`| ${severityWord(severity)} | ${ruleCell} | ${escapeCell(message)} |`);
119
+ }
120
+ else if (execution.status.kind === 'skipped') {
121
+ const message = execution.status.reason ?? rule?.summary?.text ?? '';
122
+ rows.push(`| skipped | ${ruleCell} | ${escapeCell(message)} |`);
123
+ }
124
+ for (const finding of execution.findings) {
125
+ if (finding.kind === 'informational') {
126
+ rows.push(`| info | ${ruleCell} | ${escapeCell(finding.message?.text ?? finding.title)} |`);
127
+ }
128
+ else if (finding.kind === 'assertion-failure') {
129
+ const suffix = assertionFailureSuffix(finding);
130
+ const base = finding.message?.text ?? finding.title;
131
+ const message = suffix ? `${base} ${suffix}` : base;
132
+ rows.push(`| failed | ${ruleCell} | ${escapeCell(message)} |`);
133
+ }
134
+ }
135
+ }
136
+ for (const [location, rows] of groups) {
137
+ if (rows.length === 0) {
138
+ continue;
139
+ }
140
+ lines.push(`### ${location}`);
141
+ lines.push('');
142
+ lines.push('| Severity | Rule | Message |');
143
+ lines.push('| --- | --- | --- |');
144
+ lines.push(...rows);
145
+ lines.push('');
146
+ }
147
+ return lines;
148
+ }
149
+ function formatHttpTransaction(transaction) {
150
+ const lines = [];
151
+ const { request, response } = transaction;
152
+ lines.push(`${request.method} ${request.path} HTTP/1.1`);
153
+ for (const [name, value] of Object.entries(request.headers ?? {})) {
154
+ if (value !== undefined) {
155
+ lines.push(`${name}: ${Array.isArray(value) ? value.join(', ') : value}`);
156
+ }
9
157
  }
10
- if (severity === 'warn') {
11
- return `${warnSymbol} warning`;
158
+ lines.push('');
159
+ if (request.body) {
160
+ lines.push(request.body);
12
161
  }
13
- if (severity === 'hint') {
14
- return `${hintSymbol} hint`;
162
+ if (response) {
163
+ lines.push('');
164
+ const phrase = isValidHttpStatusCode(response.statusCode)
165
+ ? httpStatusCodeToPhrase[response.statusCode].replace(/\b\w/g, (c) => c.toUpperCase())
166
+ : '';
167
+ lines.push(`HTTP/1.1 ${response.statusCode}${phrase ? ` ${phrase}` : ''}`);
168
+ for (const [name, value] of Object.entries(response.headers ?? {})) {
169
+ if (value !== undefined) {
170
+ lines.push(`${name}: ${Array.isArray(value) ? value.join(', ') : value}`);
171
+ }
172
+ }
173
+ lines.push('');
174
+ if (response.body) {
175
+ lines.push(response.body);
176
+ }
15
177
  }
16
- return 'info';
178
+ return lines.join('\n').trimEnd();
17
179
  }
18
- function formatLocation(location) {
19
- switch (location.type) {
20
- case 'custom':
21
- return location.value;
22
- case 'file':
23
- return [location.path, location.line, location.column]
24
- .filter((part) => part !== undefined)
25
- .join(':');
26
- case 'url':
27
- return location.url;
28
- case 'thymianFormat':
29
- return `format:${location.elementId}${location.pointer ? `#${location.pointer}` : ''}`;
180
+ /** Renders test run bodies: per-test-case `<details>` narrative with per-finding step rows. */
181
+ function buildTestSection(run, resolveLocation, logger) {
182
+ const lines = [];
183
+ lines.push(`## ${run.tool.name} · test`);
184
+ lines.push('');
185
+ const ruleIndex = buildRuleIndex(run.rules);
186
+ for (const { execution } of walkExecutions(run.executions)) {
187
+ if (execution.kind !== 'test' || execution.status.kind === 'passed') {
188
+ continue;
189
+ }
190
+ const statusGlyph = execution.status.kind === 'failed' ? errorSymbol : skippedSymbol;
191
+ lines.push(`### ${execution.name} · _${statusGlyph} ${execution.status.kind}_`);
192
+ lines.push('');
193
+ const rule = execution.ruleId ? ruleIndex.get(execution.ruleId) : undefined;
194
+ const severity = resolveExecutionSeverity(execution, ruleIndex, logger);
195
+ const severityPrefix = severity ? `${severityWord(severity)} · ` : '';
196
+ const ruleCell = `<code>${escapeHtml(execution.ruleId ?? 'unnamed check')}</code>`;
197
+ const message = execution.status.kind === 'failed'
198
+ ? (execution.status.reason ??
199
+ rule?.summary?.text ??
200
+ rule?.description?.text ??
201
+ '')
202
+ : (execution.status.reason ?? rule?.summary?.text ?? '');
203
+ lines.push(`<details><summary>${severityPrefix}${ruleCell} · ${escapeHtml(message)}</summary>`);
204
+ lines.push('');
205
+ execution.steps.forEach((step, index) => {
206
+ const stepLocation = resolveLocation(step.location, run.thymianFormatVersion);
207
+ lines.push(`**Step ${index + 1}** · ${stepLocation}`);
208
+ lines.push('');
209
+ if (step.findings.length > 0) {
210
+ lines.push('| Kind | Title | Message |');
211
+ lines.push('| --- | --- | --- |');
212
+ for (const finding of step.findings) {
213
+ const kind = findingKindWord(finding.kind);
214
+ let message = finding.message?.text ?? '';
215
+ if (finding.kind === 'assertion-failure') {
216
+ const suffix = assertionFailureSuffix(finding);
217
+ message = suffix
218
+ ? message
219
+ ? `${message} ${suffix}`
220
+ : suffix
221
+ : message;
222
+ }
223
+ lines.push(`| ${kind} | ${escapeCell(finding.title)} | ${escapeCell(message)} |`);
224
+ }
225
+ lines.push('');
226
+ }
227
+ if (step.httpTransactions?.length) {
228
+ lines.push('<details><summary>HTTP transaction</summary>');
229
+ lines.push('');
230
+ for (const transaction of step.httpTransactions) {
231
+ lines.push('```http');
232
+ lines.push(formatHttpTransaction(transaction));
233
+ lines.push('```');
234
+ lines.push('');
235
+ }
236
+ lines.push('</details>');
237
+ lines.push('');
238
+ }
239
+ });
240
+ lines.push('</details>');
241
+ lines.push('');
30
242
  }
243
+ return lines;
31
244
  }
32
245
  export class MarkdownFormatter {
33
246
  logger;
@@ -46,32 +259,35 @@ export class MarkdownFormatter {
46
259
  if (this.reports.length === 0) {
47
260
  return undefined;
48
261
  }
49
- const analysis = analyze(this.reports);
262
+ const analysis = analyze(this.reports, this.logger);
50
263
  const lines = [];
51
264
  lines.push('# Thymian Report');
52
265
  lines.push('');
53
- lines.push(`Generated from ${analysis.statistics.numberOfReports} report(s), ${analysis.statistics.numberOfRuns} run(s), and ${analysis.statistics.numberOfFindings} finding(s).`);
266
+ lines.push(buildRollupLine(this.reports, analysis.statistics.severityCounts, analysis.statistics.numberOfRuns));
54
267
  lines.push('');
268
+ lines.push(`<sub>${errorSymbol} error · ${warnSymbol} warning · ${hintSymbol} hint · ${infoSymbol} info · ${successSymbol} passed · ${skippedSymbol} skipped</sub>`);
269
+ lines.push('');
270
+ lines.push('| Run | Type | Outcome | Duration |');
271
+ lines.push('| --- | --- | --- | --- |');
55
272
  for (const report of this.reports) {
56
- lines.push(`## Report ${report.reportId}`);
57
- lines.push('');
58
273
  for (const run of report.runs) {
59
- lines.push(`### ${run.tool.name} (${run.runType})`);
60
- lines.push('');
61
- lines.push('| Location | Severity | Kind | Title | Rule | Message |');
62
- lines.push('| --- | --- | --- | --- | --- | --- |');
63
- for (const execution of run.executions ?? []) {
64
- for (const finding of execution.findings) {
65
- lines.push(`| ${formatLocation(execution.location)} | ${mapSeverityToBadge(finding.severity)} | ${finding.kind} | ${finding.title} | ${'ruleId' in finding ? finding.ruleId : ''} | ${(finding.message?.text ?? '').replaceAll('|', '\\|')} |`);
66
- }
67
- }
68
- lines.push('');
274
+ lines.push(buildOverviewRow(run));
275
+ }
276
+ }
277
+ lines.push('');
278
+ for (const report of this.reports) {
279
+ const resolveLocation = createLocationResolver(report);
280
+ for (const run of report.runs) {
281
+ lines.push(...(run.runType === 'test'
282
+ ? buildTestSection(run, resolveLocation, this.logger)
283
+ : buildLintAnalyzeSection(run, resolveLocation, this.logger)));
69
284
  }
70
285
  }
286
+ const output = lines.join('\n');
71
287
  await mkdir(path.dirname(this.options.path), { recursive: true });
72
- await writeFile(this.options.path, lines.join('\n'), 'utf-8');
288
+ await writeFile(this.options.path, output, 'utf-8');
73
289
  this.logger.debug(`Wrote Markdown report to ${this.options.path}.`);
74
- return undefined;
290
+ return output;
75
291
  }
76
292
  }
77
293
  //# sourceMappingURL=markdown.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"markdown.js","sourceRoot":"","sources":["../../src/formatters/markdown.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"markdown.js","sourceRoot":"","sources":["../../src/formatters/markdown.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,11 @@
1
+ /**
2
+ * Location resolution used to be duplicated here, in
3
+ * `common-cli/src/cli-report-renderer.ts`, and (partially — it never resolved
4
+ * `thymianFormat` locations at all) in `csv.ts`, and the copies had already
5
+ * drifted from one another (BaggersIO PR-311 finding 5). The implementation
6
+ * now lives in `@thymian/core` (`report/location-format.ts`) as the single
7
+ * source of truth; this module re-exports it under its established local name
8
+ * so existing imports keep working.
9
+ */
10
+ export { createLocationResolver, type LocationResolver } from '@thymian/core';
11
+ //# sourceMappingURL=resolve-location.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resolve-location.d.ts","sourceRoot":"","sources":["../../src/formatters/resolve-location.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,sBAAsB,EAAE,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC"}
@@ -0,0 +1,11 @@
1
+ /**
2
+ * Location resolution used to be duplicated here, in
3
+ * `common-cli/src/cli-report-renderer.ts`, and (partially — it never resolved
4
+ * `thymianFormat` locations at all) in `csv.ts`, and the copies had already
5
+ * drifted from one another (BaggersIO PR-311 finding 5). The implementation
6
+ * now lives in `@thymian/core` (`report/location-format.ts`) as the single
7
+ * source of truth; this module re-exports it under its established local name
8
+ * so existing imports keep working.
9
+ */
10
+ export { createLocationResolver } from '@thymian/core';
11
+ //# sourceMappingURL=resolve-location.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resolve-location.js","sourceRoot":"","sources":["../../src/formatters/resolve-location.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,sBAAsB,EAAyB,MAAM,eAAe,CAAC"}
@@ -2,9 +2,7 @@ import { type Logger } from '@thymian/core';
2
2
  import type { Formatter } from './formatter.js';
3
3
  import { type CsvFormatterOptions } from './formatters/csv.js';
4
4
  import { type MarkdownFormatterOptions } from './formatters/markdown.js';
5
- import { type TextFormatterOptions } from './formatters/text.js';
6
5
  export type Formatters = {
7
- text: Partial<TextFormatterOptions>;
8
6
  markdown: Partial<MarkdownFormatterOptions>;
9
7
  csv: Partial<CsvFormatterOptions>;
10
8
  };
@@ -1 +1 @@
1
- {"version":3,"file":"get-formatters.d.ts","sourceRoot":"","sources":["../src/get-formatters.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAoB,MAAM,eAAe,CAAC;AAE9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAgB,KAAK,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAiB,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEhF,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACpC,QAAQ,EAAE,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC5C,GAAG,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,UAAU,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC;AAEvE,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,MAAM,UAAU,IAAI;IAC/D,OAAO,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,cAAc,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,EAChC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,EACtB,aAAa,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,KAC3C,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE;KAC9B,CAAC,IAAI,MAAM,UAAU,GAAG,sBAAsB,CAAC,CAAC,CAAC;CAoC1C,CAAC;AAEX,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,IAAI,MAAM,UAAU,CAEvE;AAED,wBAAsB,aAAa,CACjC,MAAM,EAAE,qBAAqB,CAAC,YAAY,CAAM,EAChD,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,SAAS,EAAE,CAAC,CA+BtB"}
1
+ {"version":3,"file":"get-formatters.d.ts","sourceRoot":"","sources":["../src/get-formatters.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAoB,MAAM,eAAe,CAAC;AAE9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAgB,KAAK,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,0BAA0B,CAAC;AAElC,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC5C,GAAG,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,UAAU,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC;AAEvE,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,MAAM,UAAU,IAAI;IAC/D,OAAO,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,cAAc,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,EAChC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,EACtB,aAAa,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,KAC3C,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE;KAC9B,CAAC,IAAI,MAAM,UAAU,GAAG,sBAAsB,CAAC,CAAC,CAAC;CA0B1C,CAAC;AAEX,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,IAAI,MAAM,UAAU,CAEvE;AAED,wBAAsB,aAAa,CACjC,MAAM,EAAE,qBAAqB,CAAC,YAAY,CAAM,EAChD,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,SAAS,EAAE,CAAC,CA+BtB"}
@@ -2,34 +2,23 @@ import { join } from 'node:path';
2
2
  import { ThymianBaseError } from '@thymian/core';
3
3
  import { CsvFormatter } from './formatters/csv.js';
4
4
  import { MarkdownFormatter, } from './formatters/markdown.js';
5
- import { TextFormatter } from './formatters/text.js';
6
5
  export const FORMATTER_REGISTRY = {
7
- text: {
8
- factory: () => new TextFormatter(),
9
- prepareOptions: (options, { cwd }) => ({
10
- summaryOnly: false,
11
- ...options,
12
- ...(typeof options.path === 'string'
13
- ? { path: join(cwd, options.path) }
14
- : {}),
15
- }),
16
- },
17
6
  markdown: {
18
7
  factory: (logger) => new MarkdownFormatter(logger),
19
8
  prepareOptions: (options, pluginOptions) => ({
9
+ ...options,
20
10
  path: join(pluginOptions.cwd, typeof options.path === 'string'
21
11
  ? options.path
22
12
  : '.thymian/reports/report.md'),
23
- ...options,
24
13
  }),
25
14
  },
26
15
  csv: {
27
16
  factory: (logger) => new CsvFormatter(logger),
28
17
  prepareOptions: (options, { cwd }) => ({
18
+ ...options,
29
19
  path: join(cwd, typeof options.path === 'string'
30
20
  ? options.path
31
21
  : '.thymian/reports/report.csv'),
32
- ...options,
33
22
  }),
34
23
  },
35
24
  };
@@ -1 +1 @@
1
- {"version":3,"file":"get-formatters.js","sourceRoot":"","sources":["../src/get-formatters.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get-formatters.js","sourceRoot":"","sources":["../src/get-formatters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAe,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAG9D,OAAO,EAAE,YAAY,EAA4B,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EACL,iBAAiB,GAElB,MAAM,0BAA0B,CAAC;AAqBlC,MAAM,CAAC,MAAM,kBAAkB,GAE3B;IACF,QAAQ,EAAE;QACR,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC;QAClD,cAAc,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;YAC3C,GAAG,OAAO;YACV,IAAI,EAAE,IAAI,CACR,aAAa,CAAC,GAAG,EACjB,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ;gBAC9B,CAAC,CAAC,OAAO,CAAC,IAAI;gBACd,CAAC,CAAC,4BAA4B,CACjC;SACF,CAAC;KACH;IACD,GAAG,EAAE;QACH,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC;QAC7C,cAAc,EAAE,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;YACrC,GAAG,OAAO;YACV,IAAI,EAAE,IAAI,CACR,GAAG,EACH,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ;gBAC9B,CAAC,CAAC,OAAO,CAAC,IAAI;gBACd,CAAC,CAAC,6BAA6B,CAClC;SACF,CAAC;KACH;CACO,CAAC;AAEX,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,OAAO,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,SAA8C,EAAE,EAChD,GAAW,EACX,MAAc;IAEd,OAAO,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;QACnD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,gBAAgB,CACxB,sBAAsB,IAAI,4BAA4B,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EACnG;gBACE,IAAI,EAAE,uBAAuB;gBAC7B,GAAG,EAAE,gEAAgE;gBACrE,WAAW,EAAE;oBACX,iIAAiI;iBAClI;aACF,CACF,CAAC;QACJ,CAAC;QAED,MAAM,eAAe,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAEjD,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAElD,MAAM,eAAe,GAAG,eAAe,CAAC,cAAc,CAAC,OAAO,EAAE;YAC9D,GAAG;YACH,MAAM;SACP,CAAC,CAAC;QAEH,iEAAiE;QACjE,MAAM,SAAS,CAAC,IAAI,CAAC,eAAwB,CAAC,CAAC;QAE/C,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AAEhE,OAAO,EAAE,KAAK,UAAU,EAAiB,MAAM,qBAAqB,CAAC;AAErE,MAAM,MAAM,qBAAqB,GAAG;IAClC,UAAU,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,aAAa,CAAC,qBAAqB,CAmG/D,CAAC;AAEF,eAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AAEhE,OAAO,EAAE,KAAK,UAAU,EAAiB,MAAM,qBAAqB,CAAC;AAErE,MAAM,MAAM,qBAAqB,GAAG;IAClC,UAAU,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,aAAa,CAAC,qBAAqB,CA8E/D,CAAC;AAEF,eAAe,cAAc,CAAC"}
package/dist/index.js CHANGED
@@ -11,24 +11,6 @@ export const reporterPlugin = {
11
11
  description: 'Configuration for different report formatters',
12
12
  type: 'object',
13
13
  properties: {
14
- text: {
15
- nullable: true,
16
- description: 'Configuration for the text formatter',
17
- type: 'object',
18
- properties: {
19
- summaryOnly: {
20
- description: 'When true, only shows the summary without detailed reports',
21
- type: 'boolean',
22
- nullable: true,
23
- },
24
- path: {
25
- description: 'File path where the plain text report will be saved',
26
- type: 'string',
27
- nullable: true,
28
- },
29
- },
30
- additionalProperties: false,
31
- },
32
14
  markdown: {
33
15
  description: 'Configuration for the Markdown formatter',
34
16
  nullable: true,
@@ -69,7 +51,6 @@ export const reporterPlugin = {
69
51
  },
70
52
  async plugin(emitter, logger, { formatters: userFormatters, cwd }) {
71
53
  const formatters = Object.fromEntries(Object.entries({
72
- text: {},
73
54
  ...(userFormatters ?? {}),
74
55
  }).filter(([, options]) => options != null));
75
56
  let hasFlushed = false;
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,MAAM,eAAe,CAAC;AAEhE,OAAO,EAAmB,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAMrE,MAAM,CAAC,MAAM,cAAc,GAAyC;IAClE,IAAI,EAAE,0BAA0B;IAChC,OAAO,EAAE;QACP,IAAI,EAAE,QAAQ;QACd,oBAAoB,EAAE,KAAK;QAC3B,UAAU,EAAE;YACV,UAAU,EAAE;gBACV,QAAQ,EAAE,IAAI;gBACd,WAAW,EAAE,+CAA+C;gBAC5D,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,QAAQ,EAAE;wBACR,WAAW,EAAE,0CAA0C;wBACvD,QAAQ,EAAE,IAAI;wBACd,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACV,IAAI,EAAE;gCACJ,WAAW,EACT,mDAAmD;gCACrD,IAAI,EAAE,QAAQ;gCACd,QAAQ,EAAE,IAAI;6BACf;yBACF;wBACD,oBAAoB,EAAE,KAAK;qBAC5B;oBACD,GAAG,EAAE;wBACH,WAAW,EAAE,qCAAqC;wBAClD,QAAQ,EAAE,IAAI;wBACd,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACV,IAAI,EAAE;gCACJ,WAAW,EAAE,8CAA8C;gCAC3D,IAAI,EAAE,QAAQ;gCACd,QAAQ,EAAE,IAAI;6BACf;yBACF;wBACD,oBAAoB,EAAE,KAAK;qBAC5B;iBACF;gBACD,oBAAoB,EAAE,KAAK;aAC5B;SACF;KACF;IACD,OAAO,EAAE,KAAK;IACd,MAAM,EAAE;QACN,SAAS,EAAE,CAAC,aAAa,CAAC;KAC3B;IACD,OAAO,EAAE;QACP,SAAS,EAAE,CAAC,YAAY,CAAC;KAC1B;IACD,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,EAAE;QAC/D,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CACnC,MAAM,CAAC,OAAO,CAAC;YACb,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC;SAC1B,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,IAAI,IAAI,CAAC,CAC9B,CAAC;QAEhB,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAE/D,MAAM,cAAc,GAAG,KAAK,IAAmB,EAAE;YAC/C,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO;YACT,CAAC;YAED,UAAU,GAAG,IAAI,CAAC;YAClB,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC;QAEF,OAAO,CAAC,EAAE,CAAC,aAAa,EAAE,KAAK,EAAE,MAAc,EAAE,EAAE;YACjD,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;YACnD,MAAM,cAAc,EAAE,CAAC;YACvB,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEF,eAAe,cAAc,CAAC"}
package/dist/style.d.ts CHANGED
@@ -1,5 +1,11 @@
1
+ import type { Severity } from '@thymian/core';
1
2
  export declare const errorSymbol = "\u2716";
2
3
  export declare const warnSymbol = "\u26A0";
3
- export declare const hintSymbol = "\u2139";
4
+ export declare const hintSymbol = "\u270E";
5
+ export declare const infoSymbol = "\u2139";
4
6
  export declare const successSymbol = "\u2713";
7
+ export declare const skippedSymbol = "\u23ED";
8
+ export declare const SEVERITY_COLORS: Record<Severity, string>;
9
+ /** Progressive-enhancement colored span; GitHub strips `style`, IDEs render it. */
10
+ export declare function colorSpan(hex: string, text: string): string;
5
11
  //# sourceMappingURL=style.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"style.d.ts","sourceRoot":"","sources":["../src/style.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,WAAM,CAAC;AAC/B,eAAO,MAAM,UAAU,WAAM,CAAC;AAC9B,eAAO,MAAM,UAAU,WAAM,CAAC;AAC9B,eAAO,MAAM,aAAa,WAAM,CAAC"}
1
+ {"version":3,"file":"style.d.ts","sourceRoot":"","sources":["../src/style.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C,eAAO,MAAM,WAAW,WAAM,CAAC;AAC/B,eAAO,MAAM,UAAU,WAAM,CAAC;AAC9B,eAAO,MAAM,UAAU,WAAM,CAAC;AAC9B,eAAO,MAAM,UAAU,WAAM,CAAC;AAC9B,eAAO,MAAM,aAAa,WAAM,CAAC;AACjC,eAAO,MAAM,aAAa,WAAM,CAAC;AAEjC,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAKpD,CAAC;AAEF,mFAAmF;AACnF,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3D"}
package/dist/style.js CHANGED
@@ -1,5 +1,17 @@
1
1
  export const errorSymbol = '✖';
2
2
  export const warnSymbol = '⚠';
3
- export const hintSymbol = '';
3
+ export const hintSymbol = '';
4
+ export const infoSymbol = 'ℹ';
4
5
  export const successSymbol = '✓';
6
+ export const skippedSymbol = '⏭';
7
+ export const SEVERITY_COLORS = {
8
+ error: '#d1242f',
9
+ warn: '#9a6700',
10
+ hint: '#0969da',
11
+ info: '#57606a',
12
+ };
13
+ /** Progressive-enhancement colored span; GitHub strips `style`, IDEs render it. */
14
+ export function colorSpan(hex, text) {
15
+ return `<span style="color:${hex}">${text}</span>`;
16
+ }
5
17
  //# sourceMappingURL=style.js.map
package/dist/style.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"style.js","sourceRoot":"","sources":["../src/style.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAC;AAC/B,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAC;AAC9B,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAC;AAC9B,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAC"}
1
+ {"version":3,"file":"style.js","sourceRoot":"","sources":["../src/style.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAC;AAC/B,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAC;AAC9B,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAC;AAC9B,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAC;AAC9B,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAC;AACjC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAC;AAEjC,MAAM,CAAC,MAAM,eAAe,GAA6B;IACvD,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,SAAS;CAChB,CAAC;AAEF,mFAAmF;AACnF,MAAM,UAAU,SAAS,CAAC,GAAW,EAAE,IAAY;IACjD,OAAO,sBAAsB,GAAG,KAAK,IAAI,SAAS,CAAC;AACrD,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@thymian/plugin-reporter",
3
- "version": "0.1.11",
3
+ "version": "0.1.12-canary.20260709-74e687c",
4
4
  "description": "Thymian plugin for formatting and outputting conformance analysis reports",
5
5
  "license": "AGPL-3.0-only",
6
6
  "bugs": {
@@ -40,8 +40,7 @@
40
40
  "!**/*.tsbuildinfo"
41
41
  ],
42
42
  "dependencies": {
43
- "chalk": "^4.1.2",
44
43
  "tslib": "^2.3.0",
45
- "@thymian/core": "0.1.11"
44
+ "@thymian/core": "0.1.12-canary.20260709-74e687c"
46
45
  }
47
46
  }
@@ -1,15 +0,0 @@
1
- import type { Report } from '@thymian/core';
2
- import { type Formatter } from '../formatter.js';
3
- export type TextFormatterOptions = {
4
- summaryOnly: boolean;
5
- path?: string;
6
- };
7
- export declare class TextFormatter implements Formatter<Partial<TextFormatterOptions>> {
8
- options: TextFormatterOptions;
9
- private readonly reports;
10
- init(options: Partial<TextFormatterOptions>): void;
11
- flush(): Promise<string | undefined>;
12
- report(report: Report): void;
13
- private ensurePlainTextForNonTty;
14
- }
15
- //# sourceMappingURL=text.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../src/formatters/text.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAiB,MAAM,EAAY,MAAM,eAAe,CAAC;AAIrE,OAAO,EAAW,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAsE1D,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,qBAAa,aAAc,YAAW,SAAS,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC5E,OAAO,EAAG,oBAAoB,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IAExC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,GAAG,IAAI;IAO5C,KAAK,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA6D1C,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI5B,OAAO,CAAC,wBAAwB;CAOjC"}
@@ -1,115 +0,0 @@
1
- import * as path from 'node:path';
2
- import { stripVTControlCharacters } from 'node:util';
3
- import chalk from 'chalk';
4
- import { mkdir, writeFile } from 'fs/promises';
5
- import { analyze } from '../formatter.js';
6
- import { errorSymbol, hintSymbol, successSymbol, warnSymbol, } from '../style.js';
7
- function severityPrefix(severity) {
8
- switch (severity) {
9
- case 'error':
10
- return chalk.red(`${errorSymbol} error`);
11
- case 'warn':
12
- return chalk.yellow(`${warnSymbol} warning`);
13
- case 'hint':
14
- return chalk.blue(`${hintSymbol} hint`);
15
- case 'info':
16
- return chalk.cyan(`${hintSymbol} info`);
17
- }
18
- }
19
- function renderFinding(finding, indent = ' ') {
20
- const lines = [
21
- `${indent}${severityPrefix(finding.severity)}: ${finding.title}`,
22
- ];
23
- if (finding.kind.startsWith('rule-') && 'ruleId' in finding) {
24
- lines.push(`${indent} rule: ${finding.ruleId}`);
25
- }
26
- if (finding.message?.text && finding.message.text !== finding.title) {
27
- lines.push(`${indent} ${finding.message.text}`);
28
- }
29
- if (finding.kind === 'assertion-failure') {
30
- const assertionFailure = finding;
31
- lines.push(`${indent} expected: ${JSON.stringify(assertionFailure.expected)}`);
32
- lines.push(`${indent} actual: ${JSON.stringify(assertionFailure.actual)}`);
33
- }
34
- if (finding.kind === 'test-case-skip') {
35
- const skipped = finding;
36
- lines.push(`${indent} reason: ${skipped.reason}`);
37
- }
38
- return lines;
39
- }
40
- function renderLocation(location) {
41
- switch (location.type) {
42
- case 'custom':
43
- return location.value;
44
- case 'file':
45
- return [location.path, location.line, location.column]
46
- .filter((part) => part !== undefined)
47
- .join(':');
48
- case 'url':
49
- return location.url;
50
- case 'thymianFormat':
51
- return `format:${location.elementId}${location.pointer ? `#${location.pointer}` : ''}`;
52
- }
53
- }
54
- export class TextFormatter {
55
- options;
56
- reports = [];
57
- init(options) {
58
- this.options = {
59
- summaryOnly: false,
60
- ...options,
61
- };
62
- }
63
- async flush() {
64
- if (this.reports.length === 0) {
65
- const message = `${chalk.green(successSymbol)} No problems found`;
66
- if (this.options.path) {
67
- await mkdir(path.dirname(this.options.path), { recursive: true });
68
- await writeFile(this.options.path, stripVTControlCharacters(message), 'utf-8');
69
- }
70
- return this.ensurePlainTextForNonTty(message);
71
- }
72
- const analysis = analyze(this.reports);
73
- const lines = [];
74
- if (!this.options.summaryOnly) {
75
- for (const report of this.reports) {
76
- lines.push(`Report ${report.reportId}`);
77
- lines.push('');
78
- for (const run of report.runs) {
79
- lines.push(`${run.tool.name} (${run.runType})`);
80
- for (const execution of run.executions ?? []) {
81
- lines.push(` ${chalk.bold(renderLocation(execution.location))}`);
82
- for (const finding of execution.findings) {
83
- lines.push(...renderFinding(finding));
84
- }
85
- for (const child of execution.children ?? []) {
86
- lines.push(` ${chalk.bold(renderLocation(child.location))}`);
87
- for (const finding of child.findings) {
88
- lines.push(...renderFinding(finding, ' '));
89
- }
90
- }
91
- }
92
- lines.push('');
93
- }
94
- }
95
- }
96
- const { error, warn, hint, info } = analysis.statistics.severityCounts;
97
- lines.push(`Summary: ${error} error(s), ${warn} warning(s), ${hint} hint(s), ${info} info finding(s) across ${analysis.statistics.numberOfRuns} run(s).`);
98
- const output = lines.join('\n');
99
- if (this.options.path) {
100
- await mkdir(path.dirname(this.options.path), { recursive: true });
101
- await writeFile(this.options.path, stripVTControlCharacters(output), 'utf-8');
102
- }
103
- return this.ensurePlainTextForNonTty(output);
104
- }
105
- report(report) {
106
- this.reports.push(report);
107
- }
108
- ensurePlainTextForNonTty(output) {
109
- if (!process.stdout.isTTY) {
110
- return stripVTControlCharacters(output);
111
- }
112
- return output;
113
- }
114
- }
115
- //# sourceMappingURL=text.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"text.js","sourceRoot":"","sources":["../../src/formatters/text.ts"],"names":[],"mappings":"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"}