renma 0.1.1 → 0.3.0
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/README.md +99 -3
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +81 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/ci-report.d.ts +26 -0
- package/dist/commands/ci-report.d.ts.map +1 -0
- package/dist/commands/ci-report.js +162 -0
- package/dist/commands/ci-report.js.map +1 -0
- package/dist/commands/diff.d.ts +112 -0
- package/dist/commands/diff.d.ts.map +1 -0
- package/dist/commands/diff.js +411 -0
- package/dist/commands/diff.js.map +1 -0
- package/dist/commands/readiness.js +41 -1
- package/dist/commands/readiness.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +119 -0
- package/dist/config.js.map +1 -1
- package/dist/repeated-context.d.ts +6 -0
- package/dist/repeated-context.d.ts.map +1 -0
- package/dist/repeated-context.js +412 -0
- package/dist/repeated-context.js.map +1 -0
- package/dist/scanner.d.ts.map +1 -1
- package/dist/scanner.js +4 -0
- package/dist/scanner.js.map +1 -1
- package/dist/security-diagnostics.d.ts +7 -0
- package/dist/security-diagnostics.d.ts.map +1 -0
- package/dist/security-diagnostics.js +1263 -0
- package/dist/security-diagnostics.js.map +1 -0
- package/dist/types.d.ts +20 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
import { type GraphReport } from "./graph.js";
|
|
2
|
+
import { type ReadinessReport } from "./readiness.js";
|
|
3
|
+
import type { ConfigOverrides } from "../config.js";
|
|
4
|
+
export type DiffFormat = "json" | "markdown";
|
|
5
|
+
export interface DiffReport {
|
|
6
|
+
root: string;
|
|
7
|
+
from: DiffEndpoint;
|
|
8
|
+
to: DiffEndpoint;
|
|
9
|
+
summary: {
|
|
10
|
+
readinessScoreDelta: number;
|
|
11
|
+
readinessLevelChanged: boolean;
|
|
12
|
+
totalAssetsDelta: number;
|
|
13
|
+
ownershipCoverageDelta: number;
|
|
14
|
+
graphResolutionDelta: number;
|
|
15
|
+
findingsDelta: number;
|
|
16
|
+
highOrCriticalFindingsDelta: number;
|
|
17
|
+
};
|
|
18
|
+
catalog: {
|
|
19
|
+
addedAssets: AssetDelta[];
|
|
20
|
+
removedAssets: AssetDelta[];
|
|
21
|
+
changedAssets: AssetChange[];
|
|
22
|
+
};
|
|
23
|
+
graph: {
|
|
24
|
+
addedEdges: EdgeDelta[];
|
|
25
|
+
removedEdges: EdgeDelta[];
|
|
26
|
+
newUnresolvedEdges: EdgeDelta[];
|
|
27
|
+
resolvedEdges: EdgeDelta[];
|
|
28
|
+
};
|
|
29
|
+
readiness: {
|
|
30
|
+
checkChanges: ReadinessCheckChange[];
|
|
31
|
+
};
|
|
32
|
+
findings: {
|
|
33
|
+
added: FindingDelta[];
|
|
34
|
+
removed: FindingDelta[];
|
|
35
|
+
countById: Array<{
|
|
36
|
+
id: string;
|
|
37
|
+
from: number;
|
|
38
|
+
to: number;
|
|
39
|
+
delta: number;
|
|
40
|
+
}>;
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
interface DiffEndpoint {
|
|
44
|
+
ref: string;
|
|
45
|
+
scannedFileCount: number;
|
|
46
|
+
totalAssets: number;
|
|
47
|
+
readinessScore: number;
|
|
48
|
+
readinessLevel: string;
|
|
49
|
+
}
|
|
50
|
+
interface AssetDelta {
|
|
51
|
+
id: string;
|
|
52
|
+
path?: string | undefined;
|
|
53
|
+
kind?: string | undefined;
|
|
54
|
+
owner?: string | undefined;
|
|
55
|
+
status?: string | undefined;
|
|
56
|
+
}
|
|
57
|
+
interface AssetChange {
|
|
58
|
+
id: string;
|
|
59
|
+
path?: string | undefined;
|
|
60
|
+
changedFields: string[];
|
|
61
|
+
from: AssetDelta;
|
|
62
|
+
to: AssetDelta;
|
|
63
|
+
}
|
|
64
|
+
interface EdgeDelta {
|
|
65
|
+
source: string;
|
|
66
|
+
target: string;
|
|
67
|
+
kind: string;
|
|
68
|
+
resolved: boolean;
|
|
69
|
+
evidence?: EvidenceDelta | undefined;
|
|
70
|
+
}
|
|
71
|
+
interface ReadinessCheckChange {
|
|
72
|
+
id: string;
|
|
73
|
+
title: string;
|
|
74
|
+
fromStatus: string;
|
|
75
|
+
toStatus: string;
|
|
76
|
+
fromSeverity: string;
|
|
77
|
+
toSeverity: string;
|
|
78
|
+
summaryChanged: boolean;
|
|
79
|
+
}
|
|
80
|
+
interface FindingDelta {
|
|
81
|
+
id: string;
|
|
82
|
+
severity: string;
|
|
83
|
+
title: string;
|
|
84
|
+
evidence?: EvidenceDelta | undefined;
|
|
85
|
+
}
|
|
86
|
+
interface EvidenceDelta {
|
|
87
|
+
path?: string | undefined;
|
|
88
|
+
startLine?: number | undefined;
|
|
89
|
+
endLine?: number | undefined;
|
|
90
|
+
snippet?: string | undefined;
|
|
91
|
+
}
|
|
92
|
+
interface Snapshot {
|
|
93
|
+
ref: string;
|
|
94
|
+
root: string;
|
|
95
|
+
readiness: ReadinessReport;
|
|
96
|
+
graph: GraphReport;
|
|
97
|
+
}
|
|
98
|
+
export declare function runDiffCommand(targetPath: string, options: {
|
|
99
|
+
fromRef: string;
|
|
100
|
+
toRef: string;
|
|
101
|
+
format: DiffFormat;
|
|
102
|
+
overrides?: ConfigOverrides;
|
|
103
|
+
}): Promise<number>;
|
|
104
|
+
export declare function diff(targetPath: string, options: {
|
|
105
|
+
fromRef: string;
|
|
106
|
+
toRef: string;
|
|
107
|
+
overrides?: ConfigOverrides;
|
|
108
|
+
}): Promise<DiffReport>;
|
|
109
|
+
export declare function buildDiffReport(root: string, fromSnapshot: Snapshot, toSnapshot: Snapshot): DiffReport;
|
|
110
|
+
export declare function formatDiff(report: DiffReport, format: DiffFormat): string;
|
|
111
|
+
export {};
|
|
112
|
+
//# sourceMappingURL=diff.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../src/commands/diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,411 @@
|
|
|
1
|
+
import { mkdir, mkdtemp, realpath, rm } from "node:fs/promises";
|
|
2
|
+
import { tmpdir } from "node:os";
|
|
3
|
+
import { isAbsolute, join, relative, resolve } from "node:path";
|
|
4
|
+
import { promisify } from "node:util";
|
|
5
|
+
import { execFile as execFileCallback } from "node:child_process";
|
|
6
|
+
import { graph } from "./graph.js";
|
|
7
|
+
import { readiness } from "./readiness.js";
|
|
8
|
+
const execFile = promisify(execFileCallback);
|
|
9
|
+
export async function runDiffCommand(targetPath, options) {
|
|
10
|
+
const report = await diff(targetPath, options);
|
|
11
|
+
process.stdout.write(formatDiff(report, options.format));
|
|
12
|
+
return 0;
|
|
13
|
+
}
|
|
14
|
+
export async function diff(targetPath, options) {
|
|
15
|
+
const absoluteTarget = await realpath(resolve(process.cwd(), targetPath));
|
|
16
|
+
const repoRoot = await realpath(await gitOutput(absoluteTarget, ["rev-parse", "--show-toplevel"]));
|
|
17
|
+
const relativeTarget = pathWithinRepo(repoRoot, absoluteTarget);
|
|
18
|
+
const tempRoot = await mkdtemp(join(tmpdir(), "renma-diff-"));
|
|
19
|
+
try {
|
|
20
|
+
const [fromSnapshot, toSnapshot] = await Promise.all([
|
|
21
|
+
snapshot(repoRoot, relativeTarget, options.fromRef, tempRoot, "from", options.overrides),
|
|
22
|
+
snapshot(repoRoot, relativeTarget, options.toRef, tempRoot, "to", options.overrides),
|
|
23
|
+
]);
|
|
24
|
+
return buildDiffReport(repoRoot, fromSnapshot, toSnapshot);
|
|
25
|
+
}
|
|
26
|
+
finally {
|
|
27
|
+
await rm(tempRoot, { force: true, recursive: true });
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
export function buildDiffReport(root, fromSnapshot, toSnapshot) {
|
|
31
|
+
const fromReadiness = fromSnapshot.readiness;
|
|
32
|
+
const toReadiness = toSnapshot.readiness;
|
|
33
|
+
const fromFindings = findingMap(fromReadiness.findings ?? []);
|
|
34
|
+
const toFindings = findingMap(toReadiness.findings ?? []);
|
|
35
|
+
const fromAssets = assetMap(fromSnapshot.graph.nodes);
|
|
36
|
+
const toAssets = assetMap(toSnapshot.graph.nodes);
|
|
37
|
+
const fromEdges = edgeMap(fromSnapshot.graph.edges);
|
|
38
|
+
const toEdges = edgeMap(toSnapshot.graph.edges);
|
|
39
|
+
return {
|
|
40
|
+
root,
|
|
41
|
+
from: endpoint(fromSnapshot),
|
|
42
|
+
to: endpoint(toSnapshot),
|
|
43
|
+
summary: {
|
|
44
|
+
readinessScoreDelta: delta(toReadiness.score, fromReadiness.score),
|
|
45
|
+
readinessLevelChanged: fromReadiness.level !== toReadiness.level,
|
|
46
|
+
totalAssetsDelta: delta(toReadiness.summary.totalAssets, fromReadiness.summary.totalAssets),
|
|
47
|
+
ownershipCoverageDelta: delta(toReadiness.summary.ownershipCoveragePercent, fromReadiness.summary.ownershipCoveragePercent),
|
|
48
|
+
graphResolutionDelta: delta(toReadiness.summary.graphResolutionPercent, fromReadiness.summary.graphResolutionPercent),
|
|
49
|
+
findingsDelta: delta(toFindings.size, fromFindings.size),
|
|
50
|
+
highOrCriticalFindingsDelta: delta(highOrCriticalCount([...toFindings.values()]), highOrCriticalCount([...fromFindings.values()])),
|
|
51
|
+
},
|
|
52
|
+
catalog: {
|
|
53
|
+
addedAssets: [...toAssets]
|
|
54
|
+
.filter(([key]) => !fromAssets.has(key))
|
|
55
|
+
.map(([, asset]) => asset),
|
|
56
|
+
removedAssets: [...fromAssets]
|
|
57
|
+
.filter(([key]) => !toAssets.has(key))
|
|
58
|
+
.map(([, asset]) => asset),
|
|
59
|
+
changedAssets: changedAssets(fromAssets, toAssets),
|
|
60
|
+
},
|
|
61
|
+
graph: {
|
|
62
|
+
addedEdges: [...toEdges]
|
|
63
|
+
.filter(([key]) => !fromEdges.has(key))
|
|
64
|
+
.map(([, edge]) => edge),
|
|
65
|
+
removedEdges: [...fromEdges]
|
|
66
|
+
.filter(([key]) => !toEdges.has(key))
|
|
67
|
+
.map(([, edge]) => edge),
|
|
68
|
+
newUnresolvedEdges: [...toEdges]
|
|
69
|
+
.filter(([key, edge]) => {
|
|
70
|
+
const previous = fromEdges.get(key);
|
|
71
|
+
return !edge.resolved && (!previous || previous.resolved);
|
|
72
|
+
})
|
|
73
|
+
.map(([, edge]) => edge),
|
|
74
|
+
resolvedEdges: [...toEdges]
|
|
75
|
+
.filter(([key, edge]) => {
|
|
76
|
+
const previous = fromEdges.get(key);
|
|
77
|
+
return previous ? !previous.resolved && edge.resolved : false;
|
|
78
|
+
})
|
|
79
|
+
.map(([, edge]) => edge),
|
|
80
|
+
},
|
|
81
|
+
readiness: {
|
|
82
|
+
checkChanges: checkChanges(fromReadiness.checks, toReadiness.checks),
|
|
83
|
+
},
|
|
84
|
+
findings: {
|
|
85
|
+
added: [...toFindings]
|
|
86
|
+
.filter(([key]) => !fromFindings.has(key))
|
|
87
|
+
.map(([, finding]) => finding),
|
|
88
|
+
removed: [...fromFindings]
|
|
89
|
+
.filter(([key]) => !toFindings.has(key))
|
|
90
|
+
.map(([, finding]) => finding),
|
|
91
|
+
countById: countById(fromReadiness.findings ?? [], toReadiness.findings ?? []),
|
|
92
|
+
},
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
export function formatDiff(report, format) {
|
|
96
|
+
if (format === "json") {
|
|
97
|
+
return `${JSON.stringify(report, null, 2)}\n`;
|
|
98
|
+
}
|
|
99
|
+
return formatDiffMarkdown(report);
|
|
100
|
+
}
|
|
101
|
+
function formatDiffMarkdown(report) {
|
|
102
|
+
const lines = [
|
|
103
|
+
`# Renma semantic diff`,
|
|
104
|
+
"",
|
|
105
|
+
`Root: \`${report.root}\``,
|
|
106
|
+
`Refs: \`${report.from.ref}\` -> \`${report.to.ref}\``,
|
|
107
|
+
"",
|
|
108
|
+
"## Summary",
|
|
109
|
+
"",
|
|
110
|
+
`- Readiness score: ${report.to.readinessScore} (${signed(report.summary.readinessScoreDelta)})`,
|
|
111
|
+
`- Readiness level changed: ${report.summary.readinessLevelChanged ? "yes" : "no"}`,
|
|
112
|
+
`- Scanned files: ${report.to.scannedFileCount} (${signed(report.to.scannedFileCount - report.from.scannedFileCount)})`,
|
|
113
|
+
`- Total assets: ${report.to.totalAssets} (${signed(report.summary.totalAssetsDelta)})`,
|
|
114
|
+
`- Ownership coverage: ${signed(report.summary.ownershipCoverageDelta)}`,
|
|
115
|
+
`- Graph resolution: ${signed(report.summary.graphResolutionDelta)}`,
|
|
116
|
+
`- Findings: ${signed(report.summary.findingsDelta)}`,
|
|
117
|
+
`- High/critical findings: ${signed(report.summary.highOrCriticalFindingsDelta)}`,
|
|
118
|
+
"",
|
|
119
|
+
"## Catalog",
|
|
120
|
+
"",
|
|
121
|
+
`- Added assets: ${report.catalog.addedAssets.length}`,
|
|
122
|
+
`- Removed assets: ${report.catalog.removedAssets.length}`,
|
|
123
|
+
`- Changed assets: ${report.catalog.changedAssets.length}`,
|
|
124
|
+
"",
|
|
125
|
+
"## Graph",
|
|
126
|
+
"",
|
|
127
|
+
`- Added edges: ${report.graph.addedEdges.length}`,
|
|
128
|
+
`- Removed edges: ${report.graph.removedEdges.length}`,
|
|
129
|
+
`- New unresolved edges: ${report.graph.newUnresolvedEdges.length}`,
|
|
130
|
+
`- Resolved edges: ${report.graph.resolvedEdges.length}`,
|
|
131
|
+
"",
|
|
132
|
+
"## Readiness checks",
|
|
133
|
+
"",
|
|
134
|
+
...markdownList(report.readiness.checkChanges, (check) => `${check.id}: ${check.fromStatus}/${check.fromSeverity} -> ${check.toStatus}/${check.toSeverity}`),
|
|
135
|
+
"",
|
|
136
|
+
"## Findings",
|
|
137
|
+
"",
|
|
138
|
+
`- Added findings: ${report.findings.added.length}`,
|
|
139
|
+
`- Removed findings: ${report.findings.removed.length}`,
|
|
140
|
+
];
|
|
141
|
+
if (report.graph.newUnresolvedEdges.length > 0) {
|
|
142
|
+
lines.push("", "### New unresolved edges", "");
|
|
143
|
+
lines.push(...markdownList(report.graph.newUnresolvedEdges, (edge) => `${edge.source} --${edge.kind}--> ${edge.target}`));
|
|
144
|
+
}
|
|
145
|
+
if (report.findings.added.length > 0) {
|
|
146
|
+
lines.push("", "### Added findings", "");
|
|
147
|
+
lines.push(...markdownList(report.findings.added, (finding) => `${finding.id} (${finding.severity})${finding.evidence?.path ? ` at ${finding.evidence.path}` : ""}`));
|
|
148
|
+
}
|
|
149
|
+
return `${lines.join("\n")}\n`;
|
|
150
|
+
}
|
|
151
|
+
async function snapshot(repoRoot, relativeTarget, ref, tempRoot, label, overrides = {}) {
|
|
152
|
+
const root = join(tempRoot, label);
|
|
153
|
+
const archivePath = join(tempRoot, `${label}.tar`);
|
|
154
|
+
await mkdir(root, { recursive: true });
|
|
155
|
+
await gitOutput(repoRoot, [
|
|
156
|
+
"archive",
|
|
157
|
+
"--format=tar",
|
|
158
|
+
"--output",
|
|
159
|
+
archivePath,
|
|
160
|
+
ref,
|
|
161
|
+
]);
|
|
162
|
+
await execFile("tar", ["-xf", archivePath, "-C", root]);
|
|
163
|
+
const target = relativeTarget === "." ? root : join(root, relativeTarget);
|
|
164
|
+
const [readinessReport, graphReport] = await Promise.all([
|
|
165
|
+
readiness(target, snapshotOverrides(repoRoot, root, overrides)),
|
|
166
|
+
graph(target, snapshotOverrides(repoRoot, root, overrides)),
|
|
167
|
+
]);
|
|
168
|
+
return {
|
|
169
|
+
ref,
|
|
170
|
+
root: target,
|
|
171
|
+
readiness: readinessReport,
|
|
172
|
+
graph: graphReport,
|
|
173
|
+
};
|
|
174
|
+
}
|
|
175
|
+
function endpoint(snapshot) {
|
|
176
|
+
return {
|
|
177
|
+
ref: snapshot.ref,
|
|
178
|
+
scannedFileCount: snapshot.readiness.scannedFileCount,
|
|
179
|
+
totalAssets: snapshot.readiness.summary.totalAssets,
|
|
180
|
+
readinessScore: snapshot.readiness.score,
|
|
181
|
+
readinessLevel: snapshot.readiness.level,
|
|
182
|
+
};
|
|
183
|
+
}
|
|
184
|
+
function changedAssets(fromAssets, toAssets) {
|
|
185
|
+
return [...toAssets]
|
|
186
|
+
.flatMap(([key, toAsset]) => {
|
|
187
|
+
const fromAsset = fromAssets.get(key);
|
|
188
|
+
if (!fromAsset)
|
|
189
|
+
return [];
|
|
190
|
+
const changedFields = ["path", "kind", "owner", "status"].filter((field) => fromAsset[field] !==
|
|
191
|
+
toAsset[field]);
|
|
192
|
+
return changedFields.length === 0
|
|
193
|
+
? []
|
|
194
|
+
: [
|
|
195
|
+
{
|
|
196
|
+
id: toAsset.id,
|
|
197
|
+
path: toAsset.path,
|
|
198
|
+
changedFields,
|
|
199
|
+
from: fromAsset,
|
|
200
|
+
to: toAsset,
|
|
201
|
+
},
|
|
202
|
+
];
|
|
203
|
+
})
|
|
204
|
+
.sort(compareBy((change) => change.id));
|
|
205
|
+
}
|
|
206
|
+
function checkChanges(fromChecks, toChecks) {
|
|
207
|
+
const fromById = new Map(fromChecks.map((check) => [stringField(check, "id"), check]));
|
|
208
|
+
return toChecks
|
|
209
|
+
.flatMap((check) => {
|
|
210
|
+
const id = stringField(check, "id");
|
|
211
|
+
const previous = fromById.get(id);
|
|
212
|
+
if (!previous)
|
|
213
|
+
return [];
|
|
214
|
+
const change = {
|
|
215
|
+
id,
|
|
216
|
+
title: stringField(check, "title"),
|
|
217
|
+
fromStatus: stringField(previous, "status"),
|
|
218
|
+
toStatus: stringField(check, "status"),
|
|
219
|
+
fromSeverity: stringField(previous, "severity"),
|
|
220
|
+
toSeverity: stringField(check, "severity"),
|
|
221
|
+
summaryChanged: stringField(previous, "summary") !== stringField(check, "summary"),
|
|
222
|
+
};
|
|
223
|
+
return change.fromStatus === change.toStatus &&
|
|
224
|
+
change.fromSeverity === change.toSeverity &&
|
|
225
|
+
!change.summaryChanged
|
|
226
|
+
? []
|
|
227
|
+
: [change];
|
|
228
|
+
})
|
|
229
|
+
.sort(compareBy((change) => change.id));
|
|
230
|
+
}
|
|
231
|
+
function assetMap(nodes) {
|
|
232
|
+
return stableMap(nodes.map((node) => {
|
|
233
|
+
const asset = {
|
|
234
|
+
id: firstString(node, ["id", "path", "sourcePath"]),
|
|
235
|
+
path: firstOptionalString(node, ["sourcePath", "path"]),
|
|
236
|
+
kind: firstOptionalString(node, ["kind"]),
|
|
237
|
+
owner: firstOptionalString(node, ["owner"]),
|
|
238
|
+
status: firstOptionalString(node, ["status"]),
|
|
239
|
+
};
|
|
240
|
+
return [asset.id, asset];
|
|
241
|
+
}));
|
|
242
|
+
}
|
|
243
|
+
function edgeMap(edges) {
|
|
244
|
+
return stableMap(edges.map((edge) => {
|
|
245
|
+
const normalized = {
|
|
246
|
+
source: firstString(edge, ["source", "sourceId", "sourcePath", "from"]),
|
|
247
|
+
target: firstString(edge, ["target", "targetId", "targetPath", "to"]),
|
|
248
|
+
kind: firstString(edge, ["kind", "type"]),
|
|
249
|
+
resolved: booleanField(edge, "resolved"),
|
|
250
|
+
evidence: evidenceDelta(objectField(edge, "evidence")),
|
|
251
|
+
};
|
|
252
|
+
return [
|
|
253
|
+
`${normalized.source}\0${normalized.kind}\0${normalized.target}`,
|
|
254
|
+
normalized,
|
|
255
|
+
];
|
|
256
|
+
}));
|
|
257
|
+
}
|
|
258
|
+
function findingMap(findings) {
|
|
259
|
+
return stableMap(findings.map((finding) => {
|
|
260
|
+
const evidence = evidenceDelta(objectField(finding, "evidence"));
|
|
261
|
+
const deltaFinding = {
|
|
262
|
+
id: stringField(finding, "id"),
|
|
263
|
+
severity: stringField(finding, "severity"),
|
|
264
|
+
title: stringField(finding, "title"),
|
|
265
|
+
evidence,
|
|
266
|
+
};
|
|
267
|
+
return [
|
|
268
|
+
[
|
|
269
|
+
deltaFinding.id,
|
|
270
|
+
evidence?.path ?? "",
|
|
271
|
+
evidence?.startLine ?? "",
|
|
272
|
+
evidence?.endLine ?? "",
|
|
273
|
+
evidence?.snippet ?? "",
|
|
274
|
+
].join("\0"),
|
|
275
|
+
deltaFinding,
|
|
276
|
+
];
|
|
277
|
+
}));
|
|
278
|
+
}
|
|
279
|
+
function countById(fromFindings, toFindings) {
|
|
280
|
+
const fromCounts = counts(fromFindings.map((finding) => stringField(finding, "id")));
|
|
281
|
+
const toCounts = counts(toFindings.map((finding) => stringField(finding, "id")));
|
|
282
|
+
return [...new Set([...fromCounts.keys(), ...toCounts.keys()])]
|
|
283
|
+
.map((id) => ({
|
|
284
|
+
id,
|
|
285
|
+
from: fromCounts.get(id) ?? 0,
|
|
286
|
+
to: toCounts.get(id) ?? 0,
|
|
287
|
+
delta: delta(toCounts.get(id) ?? 0, fromCounts.get(id) ?? 0),
|
|
288
|
+
}))
|
|
289
|
+
.filter((item) => item.delta !== 0)
|
|
290
|
+
.sort(compareBy((item) => item.id));
|
|
291
|
+
}
|
|
292
|
+
function evidenceDelta(evidence) {
|
|
293
|
+
if (!evidence || typeof evidence !== "object")
|
|
294
|
+
return undefined;
|
|
295
|
+
const record = evidence;
|
|
296
|
+
return {
|
|
297
|
+
path: optionalStringField(record, "path"),
|
|
298
|
+
startLine: optionalNumberField(record, "startLine"),
|
|
299
|
+
endLine: optionalNumberField(record, "endLine"),
|
|
300
|
+
snippet: optionalStringField(record, "snippet"),
|
|
301
|
+
};
|
|
302
|
+
}
|
|
303
|
+
function highOrCriticalCount(findings) {
|
|
304
|
+
return findings.filter((finding) => finding.severity === "high" || finding.severity === "critical").length;
|
|
305
|
+
}
|
|
306
|
+
function pathWithinRepo(repoRoot, absoluteTarget) {
|
|
307
|
+
const relativeTarget = relative(repoRoot, absoluteTarget);
|
|
308
|
+
if (relativeTarget === "" ||
|
|
309
|
+
relativeTarget === "." ||
|
|
310
|
+
(!relativeTarget.startsWith("..") && !isAbsolute(relativeTarget))) {
|
|
311
|
+
return relativeTarget === "" ? "." : relativeTarget;
|
|
312
|
+
}
|
|
313
|
+
throw new Error(`Diff target must be inside the git repository: ${absoluteTarget}`);
|
|
314
|
+
}
|
|
315
|
+
function snapshotOverrides(repoRoot, snapshotRoot, overrides) {
|
|
316
|
+
if (!overrides.configPath)
|
|
317
|
+
return overrides;
|
|
318
|
+
try {
|
|
319
|
+
const configPath = pathWithinRepo(repoRoot, resolve(process.cwd(), overrides.configPath));
|
|
320
|
+
return {
|
|
321
|
+
...overrides,
|
|
322
|
+
configPath: join(snapshotRoot, configPath),
|
|
323
|
+
};
|
|
324
|
+
}
|
|
325
|
+
catch {
|
|
326
|
+
return overrides;
|
|
327
|
+
}
|
|
328
|
+
}
|
|
329
|
+
async function gitOutput(cwd, args) {
|
|
330
|
+
try {
|
|
331
|
+
const { stdout } = await execFile("git", ["-C", cwd, ...args], {
|
|
332
|
+
maxBuffer: 1024 * 1024 * 20,
|
|
333
|
+
});
|
|
334
|
+
return stdout.trim();
|
|
335
|
+
}
|
|
336
|
+
catch (error) {
|
|
337
|
+
if (error instanceof Error) {
|
|
338
|
+
const output = [
|
|
339
|
+
error.message,
|
|
340
|
+
stringErrorField(error, "stderr"),
|
|
341
|
+
stringErrorField(error, "stdout"),
|
|
342
|
+
]
|
|
343
|
+
.map((item) => item.trim())
|
|
344
|
+
.filter(Boolean)
|
|
345
|
+
.join("\n");
|
|
346
|
+
throw new Error(`git ${args.join(" ")} failed: ${output}`, {
|
|
347
|
+
cause: error,
|
|
348
|
+
});
|
|
349
|
+
}
|
|
350
|
+
throw error;
|
|
351
|
+
}
|
|
352
|
+
}
|
|
353
|
+
function stringErrorField(error, field) {
|
|
354
|
+
const value = error[field];
|
|
355
|
+
return typeof value === "string" ? value : "";
|
|
356
|
+
}
|
|
357
|
+
function stableMap(entries) {
|
|
358
|
+
return new Map(entries.sort(([left], [right]) => left.localeCompare(right)));
|
|
359
|
+
}
|
|
360
|
+
function counts(values) {
|
|
361
|
+
const result = new Map();
|
|
362
|
+
for (const value of values) {
|
|
363
|
+
result.set(value, (result.get(value) ?? 0) + 1);
|
|
364
|
+
}
|
|
365
|
+
return result;
|
|
366
|
+
}
|
|
367
|
+
function delta(to, from) {
|
|
368
|
+
return Number((to - from).toFixed(2));
|
|
369
|
+
}
|
|
370
|
+
function signed(value) {
|
|
371
|
+
return value > 0 ? `+${value}` : String(value);
|
|
372
|
+
}
|
|
373
|
+
function markdownList(items, render) {
|
|
374
|
+
return items.length === 0
|
|
375
|
+
? ["- (none)"]
|
|
376
|
+
: items.map((item) => `- ${render(item)}`);
|
|
377
|
+
}
|
|
378
|
+
function compareBy(selector) {
|
|
379
|
+
return (left, right) => selector(left).localeCompare(selector(right));
|
|
380
|
+
}
|
|
381
|
+
function firstString(value, fields) {
|
|
382
|
+
return firstOptionalString(value, fields) ?? "";
|
|
383
|
+
}
|
|
384
|
+
function firstOptionalString(value, fields) {
|
|
385
|
+
for (const field of fields) {
|
|
386
|
+
const candidate = optionalStringField(value, field);
|
|
387
|
+
if (candidate !== undefined)
|
|
388
|
+
return candidate;
|
|
389
|
+
}
|
|
390
|
+
return undefined;
|
|
391
|
+
}
|
|
392
|
+
function stringField(value, field) {
|
|
393
|
+
return optionalStringField(value, field) ?? "";
|
|
394
|
+
}
|
|
395
|
+
function optionalStringField(value, field) {
|
|
396
|
+
const candidate = objectField(value, field);
|
|
397
|
+
return typeof candidate === "string" ? candidate : undefined;
|
|
398
|
+
}
|
|
399
|
+
function optionalNumberField(value, field) {
|
|
400
|
+
const candidate = objectField(value, field);
|
|
401
|
+
return typeof candidate === "number" ? candidate : undefined;
|
|
402
|
+
}
|
|
403
|
+
function booleanField(value, field) {
|
|
404
|
+
return objectField(value, field) === true;
|
|
405
|
+
}
|
|
406
|
+
function objectField(value, field) {
|
|
407
|
+
if (!value || typeof value !== "object")
|
|
408
|
+
return undefined;
|
|
409
|
+
return value[field];
|
|
410
|
+
}
|
|
411
|
+
//# sourceMappingURL=diff.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/commands/diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -185,7 +185,7 @@ export function formatReadinessMarkdown(report) {
|
|
|
185
185
|
}
|
|
186
186
|
if (report.findings?.length) {
|
|
187
187
|
lines.push("", "## Findings", "");
|
|
188
|
-
const displayedFindings = report.findings
|
|
188
|
+
const displayedFindings = selectMarkdownFindings(report.findings);
|
|
189
189
|
for (const finding of displayedFindings) {
|
|
190
190
|
lines.push(`- ${formatMarkdownFinding(finding)}`);
|
|
191
191
|
lines.push(` - Remediation: ${finding.remediation}`);
|
|
@@ -204,6 +204,46 @@ export function formatReadiness(report, format) {
|
|
|
204
204
|
? formatReadinessJson(report)
|
|
205
205
|
: formatReadinessMarkdown(report);
|
|
206
206
|
}
|
|
207
|
+
function selectMarkdownFindings(findings) {
|
|
208
|
+
if (findings.length <= MARKDOWN_FINDINGS_LIMIT)
|
|
209
|
+
return findings;
|
|
210
|
+
const selected = [];
|
|
211
|
+
const selectedKeys = new Set();
|
|
212
|
+
const repeatedBuckets = new Map();
|
|
213
|
+
for (const finding of findings) {
|
|
214
|
+
if (!finding.id.startsWith("MAINT-REPEATED-"))
|
|
215
|
+
continue;
|
|
216
|
+
const bucket = repeatedBuckets.get(finding.id) ?? [];
|
|
217
|
+
bucket.push(finding);
|
|
218
|
+
repeatedBuckets.set(finding.id, bucket);
|
|
219
|
+
}
|
|
220
|
+
while (selected.length < MARKDOWN_FINDINGS_LIMIT &&
|
|
221
|
+
[...repeatedBuckets.values()].some((bucket) => bucket.length > 0)) {
|
|
222
|
+
for (const id of [...repeatedBuckets.keys()].sort()) {
|
|
223
|
+
const bucket = repeatedBuckets.get(id);
|
|
224
|
+
const finding = bucket?.shift();
|
|
225
|
+
if (!finding)
|
|
226
|
+
continue;
|
|
227
|
+
selected.push(finding);
|
|
228
|
+
selectedKeys.add(findingKey(finding));
|
|
229
|
+
if (selected.length >= MARKDOWN_FINDINGS_LIMIT)
|
|
230
|
+
break;
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
for (const finding of findings) {
|
|
234
|
+
if (selected.length >= MARKDOWN_FINDINGS_LIMIT)
|
|
235
|
+
break;
|
|
236
|
+
const key = findingKey(finding);
|
|
237
|
+
if (selectedKeys.has(key))
|
|
238
|
+
continue;
|
|
239
|
+
selected.push(finding);
|
|
240
|
+
selectedKeys.add(key);
|
|
241
|
+
}
|
|
242
|
+
return selected;
|
|
243
|
+
}
|
|
244
|
+
function findingKey(finding) {
|
|
245
|
+
return `${finding.id}:${finding.evidence.path}:${finding.evidence.startLine}:${finding.evidence.endLine}`;
|
|
246
|
+
}
|
|
207
247
|
function formatMarkdownFinding(finding) {
|
|
208
248
|
const { path, startLine, endLine } = finding.evidence;
|
|
209
249
|
const location = startLine === endLine
|