@mitre/hdf-diff 3.8.0-next.42532249979.1 → 3.8.0-next.42541677296.1
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/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +39 -0
- package/dist/index.js.map +1 -1
- package/package.json +8 -3
package/dist/index.d.ts
CHANGED
|
@@ -115,6 +115,8 @@ interface RequirementDiff {
|
|
|
115
115
|
after: Record<string, unknown> | null;
|
|
116
116
|
/** The requirement title (from whichever evaluation has it) */
|
|
117
117
|
title?: string;
|
|
118
|
+
/** Name of the owning baseline; '(multiple)' when the id appears in more than one */
|
|
119
|
+
baseline?: string;
|
|
118
120
|
/** Effective status in the old evaluation (undefined if new) */
|
|
119
121
|
oldEffectiveStatus?: string;
|
|
120
122
|
/** Effective status in the new evaluation (undefined if absent) */
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","names":["_$__sbom_js0.PackageDiff","Doc"],"sources":["../src/sbom.ts","../src/types.ts","../src/diff.ts","../src/status.ts","../src/effective-checksum.ts","../src/change-event.ts","../src/apply-events.ts","../src/fold-events.ts","../src/summary.ts","../src/normalize.ts","../src/matching/types.ts","../src/matching/exact-id.ts","../src/matching/mapped-id.ts","../src/matching/cci-match.ts","../src/matching/fuzzy-match.ts","../src/matching/srg-deterministic.ts","../src/matching/srg-cci-tiebreak.ts","../src/matching/vendor-fuzzy-title.ts","../src/matching/index.ts","../src/validate.ts","../src/exit-codes.ts","../src/renderers/types.ts","../src/renderers/json.ts","../src/renderers/markdown.ts","../src/renderers/terminal.ts","../src/renderers/csv.ts","../src/renderers/index.ts"],"mappings":";;;;;;;;;;;;;UAciB;EACf;EACA;EACA;EACA;EACA;EACA;;;;;UAMe;EACf,cAAc;EACd;EACA;EACA;EACA;;;;;;;;;;;wBAsBc,UAAU,iBAAiB,kBAAkB;;;;;;;;;;;;;;;;;;KCpCjD;;;;;;;;;;;;;;;KA8BA;;;;UAcK;;EAEf;;;;;;;;;;EAUA;;EAEA;;EAEA;;;;;;EAMA;;;;;UAwBe;;EAEf;;EAEA,OAAO;;EAEP,eAAe;;EAGf,QAAQ;;EAER,OAAO;;EAGP;;EAEA;;EAEA;;EAEA;;EAEA;;EAGA,cAAc;;EAGd;;EAEA;;EAGA;;;;;UAMe;;EAEf;;EAEA;;EAEA;;EAEA;;EAEA;;EAEA;;EAEA;;EAEA;;EAEA;;EAEA;;;;;;UAOe;;EAEf;;EAEA;;EAEA,QAAQ;;EAER,OAAO;;EAEP,cAAc;;;;;UAMC;;EAEf;;EAEA;;EAEA;;EAEA;;;;;UAMe;;EAEf;;EAEA;;EAEA;;EAEA;;EAEA;;;;;UAMe;;EAEf;;EAEA;;EAEA;;;;;UAMe;;EAEf;;EAEA;;EAEA;;EAEA,SAAS;;EAET,WAAW;;EAEX,SAAS;;EAET,eAAe;;EAEf,kBAAkB;;;EAGlB,iBAAiB;;;;;EAKjB,eALiBA;;EAOjB;;EAEA,QAAQ;;EAER,cAAc,eAAe;;EAE7B;IAAe,cAAc;;;;;;UAMd;;EAEf;;EAEA;;;KAOU,aAAa;;KAGb,cAAc;;KAGd,gBAAgB;;KAGhB,UAAU;;;;
|
|
1
|
+
{"version":3,"file":"index.d.ts","names":["_$__sbom_js0.PackageDiff","Doc"],"sources":["../src/sbom.ts","../src/types.ts","../src/diff.ts","../src/status.ts","../src/effective-checksum.ts","../src/change-event.ts","../src/apply-events.ts","../src/fold-events.ts","../src/summary.ts","../src/normalize.ts","../src/matching/types.ts","../src/matching/exact-id.ts","../src/matching/mapped-id.ts","../src/matching/cci-match.ts","../src/matching/fuzzy-match.ts","../src/matching/srg-deterministic.ts","../src/matching/srg-cci-tiebreak.ts","../src/matching/vendor-fuzzy-title.ts","../src/matching/index.ts","../src/validate.ts","../src/exit-codes.ts","../src/renderers/types.ts","../src/renderers/json.ts","../src/renderers/markdown.ts","../src/renderers/terminal.ts","../src/renderers/csv.ts","../src/renderers/index.ts"],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -1380,6 +1380,27 @@ function diffFleet(referenceDoc, newResults, trackedFields, matchOpts) {
|
|
|
1380
1380
|
function extractDrift(requirementDiffs) {
|
|
1381
1381
|
return requirementDiffs.filter((r) => r.state === "unchanged" && r.changeReasons.length > 0).map((r) => ({ ...r }));
|
|
1382
1382
|
}
|
|
1383
|
+
/** An id that sits in more than one baseline; parity: Go baselineMultiple. */
|
|
1384
|
+
const BASELINE_MULTIPLE = "(multiple)";
|
|
1385
|
+
/** Shared batch/fold attribution: differing baseline names are ambiguous. */
|
|
1386
|
+
function recordRequirementBaseline(map, id, name) {
|
|
1387
|
+
const existing = map.get(id);
|
|
1388
|
+
if (existing === void 0) map.set(id, name);
|
|
1389
|
+
else if (existing !== name && existing !== BASELINE_MULTIPLE) map.set(id, BASELINE_MULTIPLE);
|
|
1390
|
+
}
|
|
1391
|
+
function requirementBaselineMap(baselines) {
|
|
1392
|
+
const map = /* @__PURE__ */ new Map();
|
|
1393
|
+
for (const baseline of baselines) for (const req of baseline.requirements) {
|
|
1394
|
+
const id = req["id"];
|
|
1395
|
+
if (typeof id !== "string") continue;
|
|
1396
|
+
recordRequirementBaseline(map, id, baseline.name);
|
|
1397
|
+
}
|
|
1398
|
+
return map;
|
|
1399
|
+
}
|
|
1400
|
+
/** The new document's baseline for the id, else the old one's; undefined if neither. */
|
|
1401
|
+
function resolveBaseline(id, newMap, oldMap) {
|
|
1402
|
+
return newMap.get(id) ?? oldMap.get(id);
|
|
1403
|
+
}
|
|
1383
1404
|
/**
|
|
1384
1405
|
* Core pairwise comparison between two normalized HDF documents.
|
|
1385
1406
|
* Returns baseline diffs and requirement diffs without sorting or wrapping.
|
|
@@ -1417,6 +1438,8 @@ function comparePair(oldNormalized, newNormalized, oldTimestamp, newTimestamp, t
|
|
|
1417
1438
|
state: "new"
|
|
1418
1439
|
});
|
|
1419
1440
|
}
|
|
1441
|
+
const oldReqBaseline = requirementBaselineMap(oldBaselines);
|
|
1442
|
+
const newReqBaseline = requirementBaselineMap(newBaselines);
|
|
1420
1443
|
const oldReqs = [];
|
|
1421
1444
|
for (const baseline of oldBaselines) for (const req of baseline.requirements) oldReqs.push(req);
|
|
1422
1445
|
const newReqs = [];
|
|
@@ -1436,6 +1459,7 @@ function comparePair(oldNormalized, newNormalized, oldTimestamp, newTimestamp, t
|
|
|
1436
1459
|
requirementDiffs.push({
|
|
1437
1460
|
id,
|
|
1438
1461
|
title: newReq.title ?? oldReq.title,
|
|
1462
|
+
baseline: resolveBaseline(id, newReqBaseline, oldReqBaseline),
|
|
1439
1463
|
state: diffState,
|
|
1440
1464
|
oldEffectiveStatus: oldStatus,
|
|
1441
1465
|
newEffectiveStatus: newStatus,
|
|
@@ -1456,6 +1480,7 @@ function comparePair(oldNormalized, newNormalized, oldTimestamp, newTimestamp, t
|
|
|
1456
1480
|
requirementDiffs.push({
|
|
1457
1481
|
id,
|
|
1458
1482
|
title: oldReq.title,
|
|
1483
|
+
baseline: resolveBaseline(id, newReqBaseline, oldReqBaseline),
|
|
1459
1484
|
state: "absent",
|
|
1460
1485
|
oldEffectiveStatus: oldStatus,
|
|
1461
1486
|
changeReasons: [],
|
|
@@ -1472,6 +1497,7 @@ function comparePair(oldNormalized, newNormalized, oldTimestamp, newTimestamp, t
|
|
|
1472
1497
|
requirementDiffs.push({
|
|
1473
1498
|
id,
|
|
1474
1499
|
title: newReq.title,
|
|
1500
|
+
baseline: resolveBaseline(id, newReqBaseline, oldReqBaseline),
|
|
1475
1501
|
state: "new",
|
|
1476
1502
|
newEffectiveStatus: newStatus,
|
|
1477
1503
|
changeReasons: [],
|
|
@@ -2642,6 +2668,16 @@ async function foldChangeEventsIntoComparison(seedJson, events) {
|
|
|
2642
2668
|
let maxOccurredMs = Number.NEGATIVE_INFINITY;
|
|
2643
2669
|
let asOfFromEvents = "";
|
|
2644
2670
|
let systemRef = "";
|
|
2671
|
+
let firstBaselineName = "";
|
|
2672
|
+
const baselineByReq = /* @__PURE__ */ new Map();
|
|
2673
|
+
for (const [i, baseline] of (doc["baselines"] ?? []).entries()) {
|
|
2674
|
+
const name = baseline["name"] ?? "";
|
|
2675
|
+
if (i === 0) firstBaselineName = name;
|
|
2676
|
+
for (const req of baseline["requirements"] ?? []) {
|
|
2677
|
+
const id = req["id"];
|
|
2678
|
+
if (typeof id === "string") recordRequirementBaseline(baselineByReq, id, name);
|
|
2679
|
+
}
|
|
2680
|
+
}
|
|
2645
2681
|
for (const id of keys) {
|
|
2646
2682
|
const chain = byKey.get(id) ?? [];
|
|
2647
2683
|
const winner = chain[chain.length - 1];
|
|
@@ -2675,6 +2711,7 @@ async function foldChangeEventsIntoComparison(seedJson, events) {
|
|
|
2675
2711
|
diffs.push({
|
|
2676
2712
|
id,
|
|
2677
2713
|
title: seedReq["title"],
|
|
2714
|
+
baseline: baselineByReq.get(id),
|
|
2678
2715
|
state: "absent",
|
|
2679
2716
|
oldEffectiveStatus: computeEffectiveStatus(seedReq, seedRef),
|
|
2680
2717
|
changeReasons: [],
|
|
@@ -2696,6 +2733,7 @@ async function foldChangeEventsIntoComparison(seedJson, events) {
|
|
|
2696
2733
|
diffs.push({
|
|
2697
2734
|
id,
|
|
2698
2735
|
title: after["title"],
|
|
2736
|
+
baseline: firstBaselineName || void 0,
|
|
2699
2737
|
state: "new",
|
|
2700
2738
|
newEffectiveStatus: newStatus,
|
|
2701
2739
|
changeReasons: [],
|
|
@@ -2709,6 +2747,7 @@ async function foldChangeEventsIntoComparison(seedJson, events) {
|
|
|
2709
2747
|
diffs.push({
|
|
2710
2748
|
id,
|
|
2711
2749
|
title: after["title"] ?? seedReq["title"],
|
|
2750
|
+
baseline: baselineByReq.get(id),
|
|
2712
2751
|
state: winner["state"],
|
|
2713
2752
|
oldEffectiveStatus: computeEffectiveStatus(seedReq, seedRef),
|
|
2714
2753
|
newEffectiveStatus: newStatus,
|