@overkill-dev/reporter-line 0.0.27 → 0.0.28
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.
- package/package.json +2 -2
- package/reporters/line-failure-rendering.js +8 -8
- package/reporters/line-failure-rendering.js.map +1 -1
- package/reporters/line-reporter.js +58 -56
- package/reporters/line-reporter.js.map +1 -1
- package/sbom.cdx.json +9 -9
- package/reporters/source-location-rendering.js +0 -33
- package/reporters/source-location-rendering.js.map +0 -1
package/package.json
CHANGED
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"license": "MIT",
|
|
29
29
|
"name": "@overkill-dev/reporter-line",
|
|
30
30
|
"peerDependencies": {
|
|
31
|
-
"@overkill-dev/engine": "0.0.
|
|
31
|
+
"@overkill-dev/engine": "0.0.27"
|
|
32
32
|
},
|
|
33
33
|
"repository": {
|
|
34
34
|
"type": "git",
|
|
@@ -38,5 +38,5 @@
|
|
|
38
38
|
"./reporters/line-reporter.js"
|
|
39
39
|
],
|
|
40
40
|
"type": "module",
|
|
41
|
-
"version": "0.0.
|
|
41
|
+
"version": "0.0.28"
|
|
42
42
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import colors from 'yoctocolors';
|
|
2
|
+
import { formatAssertionSourceLocations } from "@overkill-dev/engine";
|
|
2
3
|
import { formatSerializedValue, keyText } from "./serialized-value-rendering.js";
|
|
3
|
-
import { formatSourceLocations } from "./source-location-rendering.js";
|
|
4
4
|
const blockLineLimit = 100;
|
|
5
5
|
const bytesPerKilobyte = 1024;
|
|
6
6
|
const valueKilobytes = 8;
|
|
@@ -165,15 +165,15 @@ function failedCheckDetailLines(check) {
|
|
|
165
165
|
]
|
|
166
166
|
: formatDiff(check.diff);
|
|
167
167
|
}
|
|
168
|
-
function formatFailedCheck(check) {
|
|
168
|
+
function formatFailedCheck(check, context) {
|
|
169
169
|
const path = formatPath(check.path);
|
|
170
|
-
const sourceLocations =
|
|
170
|
+
const sourceLocations = formatAssertionSourceLocations(check.sourceLocations, context);
|
|
171
171
|
const detailLines = failedCheckDetailLines(check);
|
|
172
172
|
const childLines = check.kind === 'composite'
|
|
173
173
|
? check.children.flatMap(function formatChild(child, index) {
|
|
174
174
|
return [
|
|
175
175
|
`child check ${index + 1}`,
|
|
176
|
-
...formatFailedCheck(child).map(function indentChild(line) {
|
|
176
|
+
...formatFailedCheck(child, context).map(function indentChild(line) {
|
|
177
177
|
return ` ${line}`;
|
|
178
178
|
})
|
|
179
179
|
];
|
|
@@ -208,10 +208,10 @@ function formatBodyErrorFailure(failure) {
|
|
|
208
208
|
...stackLines
|
|
209
209
|
];
|
|
210
210
|
}
|
|
211
|
-
function formatAssertionFailure(failure) {
|
|
211
|
+
function formatAssertionFailure(failure, context) {
|
|
212
212
|
return failure.checks.flatMap(function formatCheck(check, index) {
|
|
213
213
|
const prefix = failure.checks.length === 1 ? [] : [`check ${index + 1}`];
|
|
214
|
-
return [...prefix, ...formatFailedCheck(check)];
|
|
214
|
+
return [...prefix, ...formatFailedCheck(check, context)];
|
|
215
215
|
});
|
|
216
216
|
}
|
|
217
217
|
function formatTimeoutFailure(failure) {
|
|
@@ -220,9 +220,9 @@ function formatTimeoutFailure(failure) {
|
|
|
220
220
|
`elapsed: ${failure.elapsedMilliseconds} ms`
|
|
221
221
|
];
|
|
222
222
|
}
|
|
223
|
-
export function formatFailure(failure) {
|
|
223
|
+
export function formatFailure(failure, context) {
|
|
224
224
|
if (failure.kind === 'assertion') {
|
|
225
|
-
return formatAssertionFailure(failure);
|
|
225
|
+
return formatAssertionFailure(failure, context);
|
|
226
226
|
}
|
|
227
227
|
if (failure.kind === 'body-error') {
|
|
228
228
|
return formatBodyErrorFailure(failure);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line-failure-rendering.js","sourceRoot":"","sources":["../../../../source/reporters/line-failure-rendering.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"line-failure-rendering.js","sourceRoot":"","sources":["../../../../source/reporters/line-failure-rendering.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import figures from 'figures';
|
|
2
2
|
import colors from 'yoctocolors';
|
|
3
3
|
import { defineReporter } from "@overkill-dev/engine";
|
|
4
|
+
import { formatDefinitionLocations } from "@overkill-dev/engine";
|
|
4
5
|
import { formatFailure } from "./line-failure-rendering.js";
|
|
5
|
-
import { formatDefinitionLocations } from "./source-location-rendering.js";
|
|
6
6
|
import { createTerminalLineLogger } from "./terminal.js";
|
|
7
7
|
const successSymbol = colors.green(figures.tick);
|
|
8
8
|
const errorSymbol = colors.red(figures.cross);
|
|
@@ -47,8 +47,8 @@ function formatTerminalTestResult(id, verdict, wallTimeMs) {
|
|
|
47
47
|
function formatSuiteName(event) {
|
|
48
48
|
return event.suitePath.at(-1)?.title ?? '';
|
|
49
49
|
}
|
|
50
|
-
function formatOrphanLines(orphan) {
|
|
51
|
-
const sourceLocations = formatDefinitionLocations(orphan.definitionLocations);
|
|
50
|
+
function formatOrphanLines(orphan, context) {
|
|
51
|
+
const sourceLocations = formatDefinitionLocations(orphan.definitionLocations, context);
|
|
52
52
|
const location = sourceLocations.primary === null ? '' : ` (${sourceLocations.primary})`;
|
|
53
53
|
return [
|
|
54
54
|
`${orphan.kind}: ${orphan.title} (${orphan.file ?? '<unknown>'})${location}`,
|
|
@@ -57,9 +57,9 @@ function formatOrphanLines(orphan) {
|
|
|
57
57
|
})
|
|
58
58
|
];
|
|
59
59
|
}
|
|
60
|
-
function logFailures(terminal, suiteDepth, outcome) {
|
|
60
|
+
function logFailures(terminal, suiteDepth, outcome, context) {
|
|
61
61
|
for (const failure of outcome.failures) {
|
|
62
|
-
for (const line of formatFailure(failure)) {
|
|
62
|
+
for (const line of formatFailure(failure, context)) {
|
|
63
63
|
terminal.line(`${indent(suiteDepth + 1)}${line}`);
|
|
64
64
|
}
|
|
65
65
|
}
|
|
@@ -81,12 +81,12 @@ function logSummary(terminal, result) {
|
|
|
81
81
|
const countSummary = `${summary.discovered} discovered, ${summary.planned} planned, ${executed} executed`;
|
|
82
82
|
terminal.line(infoSymbol, `${countSummary} (${outcomes})${orphanSummary} in ${formatDuration(result.wallTimeMs)}`);
|
|
83
83
|
}
|
|
84
|
-
function logOrphans(terminal, orphans) {
|
|
84
|
+
function logOrphans(terminal, orphans, context) {
|
|
85
85
|
if (orphans.length === 0) {
|
|
86
86
|
return;
|
|
87
87
|
}
|
|
88
88
|
for (const orphan of orphans) {
|
|
89
|
-
const [firstLine, ...detailLines] = formatOrphanLines(orphan);
|
|
89
|
+
const [firstLine, ...detailLines] = formatOrphanLines(orphan, context);
|
|
90
90
|
terminal.line(infoSymbol, firstLine ?? '');
|
|
91
91
|
for (const detailLine of detailLines) {
|
|
92
92
|
terminal.line(detailLine);
|
|
@@ -95,58 +95,60 @@ function logOrphans(terminal, orphans) {
|
|
|
95
95
|
}
|
|
96
96
|
export function createLineReporter(dependencies) {
|
|
97
97
|
const { stdoutConsole } = dependencies;
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
for (const detailLine of definitionLocations.details) {
|
|
105
|
-
terminal.line(`${indent(suiteDepth + 1)}${detailLine}`);
|
|
106
|
-
}
|
|
107
|
-
logFailures(terminal, suiteDepth, event.outcome);
|
|
108
|
-
}
|
|
109
|
-
function logTestEnd(event) {
|
|
110
|
-
const [symbol, message] = event.outcome === null
|
|
111
|
-
? formatTerminalTestResult(event.case, event.verdict, event.wallTimeMs)
|
|
112
|
-
: formatTestResult(event.case, event.outcome, event.wallTimeMs);
|
|
113
|
-
const definitionLocations = formatDefinitionLocations(event.definitionLocations);
|
|
114
|
-
const location = event.outcome?.kind === 'fail' && definitionLocations.primary !== null
|
|
115
|
-
? ` (${definitionLocations.primary})`
|
|
116
|
-
: '';
|
|
117
|
-
terminal.line(symbol, `${indent(suiteDepth)}${message}${location}`);
|
|
118
|
-
logFailureDetails(event, definitionLocations);
|
|
119
|
-
}
|
|
120
|
-
function logSuiteStart(event) {
|
|
121
|
-
terminal.line(infoSymbol, `${indent(suiteDepth)}${formatSuiteName(event)}`);
|
|
122
|
-
suiteDepth += 1;
|
|
123
|
-
}
|
|
124
|
-
return defineReporter({
|
|
125
|
-
dispose: null,
|
|
126
|
-
kind: 'real-time',
|
|
127
|
-
name: 'line',
|
|
128
|
-
sinks: [{ kind: 'stdout-raw' }],
|
|
129
|
-
async onEvent(event) {
|
|
130
|
-
if (event.kind === 'run-start') {
|
|
131
|
-
terminal.line(infoSymbol, `Test run started: ${event.root.title}`);
|
|
132
|
-
}
|
|
133
|
-
else if (event.kind === 'suite-start') {
|
|
134
|
-
logSuiteStart(event);
|
|
98
|
+
return defineReporter(function createLineRuntimeReporter(context) {
|
|
99
|
+
const terminal = createTerminalLineLogger({ stdoutConsole });
|
|
100
|
+
let suiteDepth = 0;
|
|
101
|
+
function logFailureDetails(event, definitionLocations) {
|
|
102
|
+
if (event.outcome?.kind !== 'fail') {
|
|
103
|
+
return;
|
|
135
104
|
}
|
|
136
|
-
|
|
137
|
-
|
|
105
|
+
for (const detailLine of definitionLocations.details) {
|
|
106
|
+
terminal.line(`${indent(suiteDepth + 1)}${detailLine}`);
|
|
138
107
|
}
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
108
|
+
logFailures(terminal, suiteDepth, event.outcome, context);
|
|
109
|
+
}
|
|
110
|
+
function logTestEnd(event) {
|
|
111
|
+
const [symbol, message] = event.outcome === null
|
|
112
|
+
? formatTerminalTestResult(event.case, event.verdict, event.wallTimeMs)
|
|
113
|
+
: formatTestResult(event.case, event.outcome, event.wallTimeMs);
|
|
114
|
+
const definitionLocations = formatDefinitionLocations(event.definitionLocations, context);
|
|
115
|
+
const location = event.outcome?.kind === 'fail' && definitionLocations.primary !== null
|
|
116
|
+
? ` (${definitionLocations.primary})`
|
|
117
|
+
: '';
|
|
118
|
+
terminal.line(symbol, `${indent(suiteDepth)}${message}${location}`);
|
|
119
|
+
logFailureDetails(event, definitionLocations);
|
|
149
120
|
}
|
|
121
|
+
function logSuiteStart(event) {
|
|
122
|
+
terminal.line(infoSymbol, `${indent(suiteDepth)}${formatSuiteName(event)}`);
|
|
123
|
+
suiteDepth += 1;
|
|
124
|
+
}
|
|
125
|
+
return {
|
|
126
|
+
dispose: null,
|
|
127
|
+
kind: 'real-time',
|
|
128
|
+
name: 'line',
|
|
129
|
+
sinks: [{ kind: 'stdout-raw' }],
|
|
130
|
+
async onEvent(event) {
|
|
131
|
+
if (event.kind === 'run-start') {
|
|
132
|
+
terminal.line(infoSymbol, `Test run started: ${event.root.title}`);
|
|
133
|
+
}
|
|
134
|
+
else if (event.kind === 'suite-start') {
|
|
135
|
+
logSuiteStart(event);
|
|
136
|
+
}
|
|
137
|
+
else if (event.kind === 'suite-end') {
|
|
138
|
+
suiteDepth = Math.max(0, suiteDepth - 1);
|
|
139
|
+
}
|
|
140
|
+
else if (event.kind === 'test-end') {
|
|
141
|
+
logTestEnd(event);
|
|
142
|
+
}
|
|
143
|
+
else if (event.kind === 'runner-error') {
|
|
144
|
+
terminal.line(errorSymbol, `Runner error: ${event.error.message}`);
|
|
145
|
+
}
|
|
146
|
+
},
|
|
147
|
+
async onFinish(finalResult) {
|
|
148
|
+
logSummary(terminal, finalResult);
|
|
149
|
+
logOrphans(terminal, finalResult.orphans, context);
|
|
150
|
+
}
|
|
151
|
+
};
|
|
150
152
|
});
|
|
151
153
|
}
|
|
152
154
|
//# sourceMappingURL=line-reporter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line-reporter.js","sourceRoot":"","sources":["../../../../source/reporters/line-reporter.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,cAAc,EAAmE,MAAM,sBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"line-reporter.js","sourceRoot":"","sources":["../../../../source/reporters/line-reporter.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,cAAc,EAAmE,MAAM,sBAAuB,CAAC;AACxH,OAAO,EACH,yBAAyB,EAG5B,MAAM,sBAAgC,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,wBAAwB,EAA2B,MAAM,eAAe,CAAC;AAElF,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACjD,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAM7C,SAAS,MAAM,CAAC,KAAa;IACzB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,eAAe,CAAC,EAAU;IAC/B,IAAI,EAAE,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;QACrB,OAAO,EAAE,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,OAAO,GAAG,EAAE,CAAC,KAAK,KAAK,EAAE,CAAC,MAAM,GAAG,CAAC;AACxC,CAAC;AAED,SAAS,aAAa,CAAC,OAAoB;IACvC,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;QAC7D,OAAO,OAAO,CAAC,MAAM,CAAC;IAC1B,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,cAAc,CAAC,UAAkB;IACtC,OAAO,GAAG,UAAU,KAAK,CAAC;AAC9B,CAAC;AAED,SAAS,gBAAgB,CAAC,EAAU,EAAE,OAAoB,EAAE,UAAkB;IAC1E,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC;IACpD,MAAM,OAAO,GAAG,GAAG,eAAe,CAAC,EAAE,CAAC,GAAG,MAAM,KAAK,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC;IAElF,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC1B,OAAO,CAAE,WAAW,EAAE,OAAO,CAAE,CAAC;IACpC,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC1B,OAAO,CAAE,aAAa,EAAE,OAAO,CAAE,CAAC;IACtC,CAAC;IAED,OAAO,CAAE,UAAU,EAAE,OAAO,CAAE,CAAC;AACnC,CAAC;AAED,SAAS,wBAAwB,CAAC,EAAU,EAAE,OAAoB,EAAE,UAAkB;IAClF,MAAM,OAAO,GAAG,GAAG,eAAe,CAAC,EAAE,CAAC,KAAK,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC;IAEzE,IAAI,OAAO,KAAK,oBAAoB,EAAE,CAAC;QACnC,OAAO,CAAE,WAAW,EAAE,GAAG,OAAO,sBAAsB,CAAE,CAAC;IAC7D,CAAC;IAED,OAAO,CAAE,WAAW,EAAE,GAAG,OAAO,WAAW,CAAE,CAAC;AAClD,CAAC;AAED,SAAS,eAAe,CAAC,KAAgE;IACrF,OAAO,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;AAC/C,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAoB,EAAE,OAAyB;IACtE,MAAM,eAAe,GAAG,yBAAyB,CAAC,MAAM,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IACvF,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,eAAe,CAAC,OAAO,GAAG,CAAC;IAEzF,OAAO;QACH,GAAG,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,KAAK,KAAK,MAAM,CAAC,IAAI,IAAI,WAAW,IAAI,QAAQ,EAAE;QAC5E,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,YAAY,CAAC,MAAM;YACvD,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,CAAC;QACnC,CAAC,CAAC;KACL,CAAC;AACN,CAAC;AAED,SAAS,WAAW,CAChB,QAA4B,EAC5B,UAAkB,EAClB,OAAoB,EACpB,OAAyB;IAEzB,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrC,KAAK,MAAM,IAAI,IAAI,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;YACjD,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;QACtD,CAAC;IACL,CAAC;AACL,CAAC;AAED,SAAS,UAAU,CAAC,QAA4B,EAAE,MAAiB;IAC/D,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,YAAY;QACrF,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAChD,MAAM,QAAQ,GAAG;QACb,GAAG,OAAO,CAAC,MAAM,OAAO;QACxB,GAAG,OAAO,CAAC,MAAM,OAAO;QACxB,GAAG,OAAO,CAAC,OAAO,OAAO;QACzB,GAAG,OAAO,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,GAAG,OAAO,CAAC,YAAY,eAAe,CAAE;QAC/E,GAAG,OAAO,CAAC,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,GAAG,OAAO,CAAC,iBAAiB,qBAAqB,CAAE;QAC/F,GAAG,OAAO,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,GAAG,OAAO,CAAC,OAAO,QAAQ,CAAE;KACjE;SACI,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,OAAO,CAAC,MAAM,WAAW,CAAC;IAC/F,MAAM,YAAY,GAAG,GAAG,OAAO,CAAC,UAAU,gBAAgB,OAAO,CAAC,OAAO,aAAa,QAAQ,WAAW,CAAC;IAE1G,QAAQ,CAAC,IAAI,CACT,UAAU,EACV,GAAG,YAAY,KAAK,QAAQ,IAAI,aAAa,OAAO,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAC1F,CAAC;AACN,CAAC;AAED,SAAS,UAAU,CACf,QAA4B,EAC5B,OAAgC,EAChC,OAAyB;IAEzB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO;IACX,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,CAAE,SAAS,EAAE,GAAG,WAAW,CAAE,GAAG,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACzE,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC;QAC3C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACnC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC9B,CAAC;IACL,CAAC;AACL,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,YAAsC;IACrE,MAAM,EAAE,aAAa,EAAE,GAAG,YAAY,CAAC;IACvC,OAAO,cAAc,CAAC,SAAS,yBAAyB,CAAC,OAAO;QAC5D,MAAM,QAAQ,GAAG,wBAAwB,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC;QAC7D,IAAI,UAAU,GAAG,CAAC,CAAC;QAEnB,SAAS,iBAAiB,CACtB,KAA6D,EAC7D,mBAA4C;YAE5C,IAAI,KAAK,CAAC,OAAO,EAAE,IAAI,KAAK,MAAM,EAAE,CAAC;gBACjC,OAAO;YACX,CAAC;YAED,KAAK,MAAM,UAAU,IAAI,mBAAmB,CAAC,OAAO,EAAE,CAAC;gBACnD,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,UAAU,EAAE,CAAC,CAAC;YAC5D,CAAC;YACD,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9D,CAAC;QAED,SAAS,UAAU,CAAC,KAA6D;YAC7E,MAAM,CAAE,MAAM,EAAE,OAAO,CAAE,GAAG,KAAK,CAAC,OAAO,KAAK,IAAI;gBAC9C,CAAC,CAAC,wBAAwB,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC;gBACvE,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;YACpE,MAAM,mBAAmB,GAAG,yBAAyB,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;YAC1F,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,KAAK,MAAM,IAAI,mBAAmB,CAAC,OAAO,KAAK,IAAI;gBACnF,CAAC,CAAC,KAAK,mBAAmB,CAAC,OAAO,GAAG;gBACrC,CAAC,CAAC,EAAE,CAAC;YAET,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,OAAO,GAAG,QAAQ,EAAE,CAAC,CAAC;YACpE,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC;QAClD,CAAC;QAED,SAAS,aAAa,CAAC,KAAgE;YACnF,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC5E,UAAU,IAAI,CAAC,CAAC;QACpB,CAAC;QAED,OAAO;YACH,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,CAAE,EAAE,IAAI,EAAE,YAAY,EAAE,CAAE;YAEjC,KAAK,CAAC,OAAO,CAAC,KAAK;gBACf,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBAC7B,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,qBAAqB,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;gBACvE,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;oBACtC,aAAa,CAAC,KAAK,CAAC,CAAC;gBACzB,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBACpC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;gBAC7C,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBACnC,UAAU,CAAC,KAAK,CAAC,CAAC;gBACtB,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;oBACvC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,iBAAiB,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBACvE,CAAC;YACL,CAAC;YAED,KAAK,CAAC,QAAQ,CAAC,WAAW;gBACtB,UAAU,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAClC,UAAU,CAAC,QAAQ,EAAE,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACvD,CAAC;SACJ,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC"}
|
package/sbom.cdx.json
CHANGED
|
@@ -16,24 +16,24 @@
|
|
|
16
16
|
"component": {
|
|
17
17
|
"type": "library",
|
|
18
18
|
"name": "@overkill-dev/reporter-line",
|
|
19
|
-
"version": "0.0.
|
|
20
|
-
"bom-ref": "pkg:npm/@overkill-dev/reporter-line@0.0.
|
|
21
|
-
"purl": "pkg:npm/@overkill-dev/reporter-line@0.0.
|
|
19
|
+
"version": "0.0.28",
|
|
20
|
+
"bom-ref": "pkg:npm/@overkill-dev/reporter-line@0.0.28",
|
|
21
|
+
"purl": "pkg:npm/@overkill-dev/reporter-line@0.0.28"
|
|
22
22
|
}
|
|
23
23
|
},
|
|
24
24
|
"components": [
|
|
25
25
|
{
|
|
26
26
|
"type": "library",
|
|
27
27
|
"name": "@overkill-dev/engine",
|
|
28
|
-
"version": "0.0.
|
|
29
|
-
"bom-ref": "pkg:npm/@overkill-dev/engine@0.0.
|
|
28
|
+
"version": "0.0.27",
|
|
29
|
+
"bom-ref": "pkg:npm/@overkill-dev/engine@0.0.27",
|
|
30
30
|
"scope": "optional",
|
|
31
31
|
"licenses": [
|
|
32
32
|
{
|
|
33
33
|
"expression": "MIT"
|
|
34
34
|
}
|
|
35
35
|
],
|
|
36
|
-
"purl": "pkg:npm/@overkill-dev/engine@0.0.
|
|
36
|
+
"purl": "pkg:npm/@overkill-dev/engine@0.0.27"
|
|
37
37
|
},
|
|
38
38
|
{
|
|
39
39
|
"type": "library",
|
|
@@ -90,12 +90,12 @@
|
|
|
90
90
|
],
|
|
91
91
|
"dependencies": [
|
|
92
92
|
{
|
|
93
|
-
"ref": "pkg:npm/@overkill-dev/engine@0.0.
|
|
93
|
+
"ref": "pkg:npm/@overkill-dev/engine@0.0.27"
|
|
94
94
|
},
|
|
95
95
|
{
|
|
96
|
-
"ref": "pkg:npm/@overkill-dev/reporter-line@0.0.
|
|
96
|
+
"ref": "pkg:npm/@overkill-dev/reporter-line@0.0.28",
|
|
97
97
|
"dependsOn": [
|
|
98
|
-
"pkg:npm/@overkill-dev/engine@0.0.
|
|
98
|
+
"pkg:npm/@overkill-dev/engine@0.0.27",
|
|
99
99
|
"pkg:npm/ansi-escapes@7.3.0",
|
|
100
100
|
"pkg:npm/figures@6.1.0",
|
|
101
101
|
"pkg:npm/string-width@8.2.2",
|
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
const secondToLastOffset = 2;
|
|
2
|
-
export function formatSourceLocation(location) {
|
|
3
|
-
if (location.file.length === 0) {
|
|
4
|
-
return null;
|
|
5
|
-
}
|
|
6
|
-
if (location.line === null) {
|
|
7
|
-
return location.file;
|
|
8
|
-
}
|
|
9
|
-
if (location.column === null) {
|
|
10
|
-
return `${location.file}:${location.line}`;
|
|
11
|
-
}
|
|
12
|
-
return `${location.file}:${location.line}:${location.column}`;
|
|
13
|
-
}
|
|
14
|
-
function formatLocationChain(locations, labels) {
|
|
15
|
-
const primaryLocation = locations[0];
|
|
16
|
-
const primary = primaryLocation === undefined ? null : formatSourceLocation(primaryLocation);
|
|
17
|
-
const details = locations.slice(1).flatMap(function renderSourceLocation(location, index) {
|
|
18
|
-
const renderedLocation = formatSourceLocation(location);
|
|
19
|
-
if (renderedLocation === null) {
|
|
20
|
-
return [];
|
|
21
|
-
}
|
|
22
|
-
const label = index === locations.length - secondToLastOffset ? labels.final : labels.intermediate;
|
|
23
|
-
return [`${label} ${renderedLocation}`];
|
|
24
|
-
});
|
|
25
|
-
return { details, primary };
|
|
26
|
-
}
|
|
27
|
-
export function formatDefinitionLocations(locations) {
|
|
28
|
-
return formatLocationChain(locations, { final: 'constructed at', intermediate: 'expanded at' });
|
|
29
|
-
}
|
|
30
|
-
export function formatSourceLocations(locations) {
|
|
31
|
-
return formatLocationChain(locations, { final: 'asserted at', intermediate: 'forwarded through' });
|
|
32
|
-
}
|
|
33
|
-
//# sourceMappingURL=source-location-rendering.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"source-location-rendering.js","sourceRoot":"","sources":["../../../../source/reporters/source-location-rendering.ts"],"names":[],"mappings":"AAYA,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAE7B,MAAM,UAAU,oBAAoB,CAAC,QAAwB;IACzD,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QACzB,OAAO,QAAQ,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;QAC3B,OAAO,GAAG,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC/C,CAAC;IAED,OAAO,GAAG,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;AAClE,CAAC;AAED,SAAS,mBAAmB,CACxB,SAAoC,EACpC,MAA4B;IAE5B,MAAM,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;IACrC,MAAM,OAAO,GAAG,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;IAC7F,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,oBAAoB,CAAC,QAAQ,EAAE,KAAK;QACpF,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAExD,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;YAC5B,OAAO,EAAE,CAAC;QACd,CAAC;QAED,MAAM,KAAK,GAAG,KAAK,KAAK,SAAS,CAAC,MAAM,GAAG,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;QAEnG,OAAO,CAAE,GAAG,KAAK,IAAI,gBAAgB,EAAE,CAAE,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,SAAoC;IAC1E,OAAO,mBAAmB,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC;AACpG,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,SAAoC;IACtE,OAAO,mBAAmB,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,mBAAmB,EAAE,CAAC,CAAC;AACvG,CAAC"}
|