@mitre/hdf-diff 3.8.0-next.43519923983.1 → 3.8.0-next.43908964592.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/README.md +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +20 -10
- package/dist/index.js.map +1 -1
- package/package.json +4 -4
package/README.md
CHANGED
|
@@ -53,7 +53,7 @@ const json = render(comparison, 'json');
|
|
|
53
53
|
|
|
54
54
|
// Check exit codes for CI
|
|
55
55
|
import { computeExitCode, EXIT_IDENTICAL } from '@mitre/hdf-diff';
|
|
56
|
-
const code = computeExitCode(comparison);
|
|
56
|
+
const code = computeExitCode(comparison.summary);
|
|
57
57
|
if (code !== EXIT_IDENTICAL) process.exit(code);
|
|
58
58
|
```
|
|
59
59
|
|
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":";;;;;;;;;;;;;
|
|
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
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { computeEffectiveStatus as computeEffectiveStatus$1, formatTimestamp, governingOverrideIndex, parseCvssVector, parseTimestamp, sha256 } from "@mitre/hdf-utilities";
|
|
1
|
+
import { compareCodePoint, computeEffectiveStatus as computeEffectiveStatus$1, formatTimestamp, governingOverrideIndex, parseCvssVector, parseTimestamp, sha256 } from "@mitre/hdf-utilities";
|
|
2
2
|
import { validateComparison as validateComparison$1 } from "@mitre/hdf-validators";
|
|
3
3
|
// src/status.ts
|
|
4
4
|
/** Statuses that count as "passing" for fixed/regressed classification */
|
|
@@ -1253,7 +1253,7 @@ function diffHdf(oldResults, newResults, options) {
|
|
|
1253
1253
|
const newTimestamp = newNormalized["timestamp"];
|
|
1254
1254
|
const sources = buildSources(comparisonMode, oldResults, newDoc, oldTimestamp, newTimestamp);
|
|
1255
1255
|
const { baselineDiffs, requirementDiffs } = comparePair(oldNormalized, newNormalized, oldTimestamp, newTimestamp, trackedFields, matchOpts);
|
|
1256
|
-
requirementDiffs.sort((a, b) => a.id
|
|
1256
|
+
requirementDiffs.sort((a, b) => compareCodePoint(a.id, b.id));
|
|
1257
1257
|
const drift = extractDrift(requirementDiffs);
|
|
1258
1258
|
const comparison = {
|
|
1259
1259
|
formatVersion: "1.0.0",
|
|
@@ -1348,7 +1348,7 @@ function diffFleet(referenceDoc, newResults, trackedFields, matchOpts) {
|
|
|
1348
1348
|
}
|
|
1349
1349
|
}
|
|
1350
1350
|
allRequirementDiffs.sort((a, b) => {
|
|
1351
|
-
const idCmp = a.id
|
|
1351
|
+
const idCmp = compareCodePoint(a.id, b.id);
|
|
1352
1352
|
if (idCmp !== 0) return idCmp;
|
|
1353
1353
|
/* c8 ignore next -- sourceIndex is always set in fleet mode; ?? 0 is defensive typing */
|
|
1354
1354
|
return (a.sourceIndex ?? 0) - (b.sourceIndex ?? 0);
|
|
@@ -1996,7 +1996,7 @@ function diffBaselines(oldBaseline, newBaseline, options) {
|
|
|
1996
1996
|
after: newReq
|
|
1997
1997
|
});
|
|
1998
1998
|
}
|
|
1999
|
-
requirementDiffs.sort((a, b) => a.id
|
|
1999
|
+
requirementDiffs.sort((a, b) => compareCodePoint(a.id, b.id));
|
|
2000
2000
|
const oldName = oldBaseline["name"] ?? "";
|
|
2001
2001
|
const newName = newBaseline["name"] ?? "";
|
|
2002
2002
|
const oldVersion = oldBaseline["version"];
|
|
@@ -2093,7 +2093,7 @@ function diffSystems(oldSystem, newSystem, options) {
|
|
|
2093
2093
|
after: newComp,
|
|
2094
2094
|
fieldChanges: []
|
|
2095
2095
|
});
|
|
2096
|
-
componentDiffs.sort((a, b) => a.name
|
|
2096
|
+
componentDiffs.sort((a, b) => compareCodePoint(a.name, b.name));
|
|
2097
2097
|
const systemFieldChanges = computeComponentFieldChanges(oldSystem, newSystem, SYSTEM_TOP_LEVEL_FIELDS);
|
|
2098
2098
|
const counts = {
|
|
2099
2099
|
new: 0,
|
|
@@ -2472,12 +2472,12 @@ function groupEventChains(events) {
|
|
|
2472
2472
|
chain.push(ev);
|
|
2473
2473
|
byKey.set(id, chain);
|
|
2474
2474
|
}
|
|
2475
|
-
const keys = [...byKey.keys()].sort();
|
|
2475
|
+
const keys = [...byKey.keys()].sort(compareCodePoint);
|
|
2476
2476
|
for (const [, chain] of byKey) chain.sort((a, b) => {
|
|
2477
2477
|
const seqA = a["sequence"];
|
|
2478
2478
|
const seqB = b["sequence"];
|
|
2479
2479
|
if (seqA !== seqB) return seqA - seqB;
|
|
2480
|
-
return String(a["eventId"])
|
|
2480
|
+
return compareCodePoint(String(a["eventId"]), String(b["eventId"]));
|
|
2481
2481
|
});
|
|
2482
2482
|
return {
|
|
2483
2483
|
byKey,
|
|
@@ -2593,7 +2593,7 @@ async function applyChangeEvents(seedJson, events, inputs) {
|
|
|
2593
2593
|
payload: structuredClone(payload)
|
|
2594
2594
|
});
|
|
2595
2595
|
}
|
|
2596
|
-
insertions.sort((a, b) => a.sequence !== b.sequence ? a.sequence - b.sequence : a.id
|
|
2596
|
+
insertions.sort((a, b) => a.sequence !== b.sequence ? a.sequence - b.sequence : compareCodePoint(a.id, b.id));
|
|
2597
2597
|
if (insertions.length > 0) {
|
|
2598
2598
|
const baselines = doc["baselines"] ?? [];
|
|
2599
2599
|
const firstBaseline = baselines[0];
|
|
@@ -2757,7 +2757,7 @@ async function foldChangeEventsIntoComparison(seedJson, events) {
|
|
|
2757
2757
|
after
|
|
2758
2758
|
});
|
|
2759
2759
|
}
|
|
2760
|
-
diffs.sort((a, b) => a.id
|
|
2760
|
+
diffs.sort((a, b) => compareCodePoint(a.id, b.id));
|
|
2761
2761
|
const asOf = asOfFromEvents !== "" ? asOfFromEvents : docTimestamp;
|
|
2762
2762
|
if (asOf === "") throw new Error("cannot derive a comparison timestamp: no events supplied and the seed document has no timestamp");
|
|
2763
2763
|
return {
|
|
@@ -3239,6 +3239,16 @@ function render(comparison, format, options) {
|
|
|
3239
3239
|
}
|
|
3240
3240
|
// src/sbom.ts
|
|
3241
3241
|
/**
|
|
3242
|
+
* SBOM comparison for the HDF diff engine.
|
|
3243
|
+
*
|
|
3244
|
+
* Compares two SBOM documents (CycloneDX or SPDX JSON) and produces
|
|
3245
|
+
* package-level diffs: added, removed, updated, unchanged packages.
|
|
3246
|
+
*
|
|
3247
|
+
* Format auto-detection:
|
|
3248
|
+
* - CycloneDX: has `bomFormat: "CycloneDX"`, packages in `components[]`
|
|
3249
|
+
* - SPDX: has `spdxVersion`, packages in `packages[]`
|
|
3250
|
+
*/
|
|
3251
|
+
/**
|
|
3242
3252
|
* Compare two SBOM documents (CycloneDX or SPDX JSON strings) and return
|
|
3243
3253
|
* package-level diffs.
|
|
3244
3254
|
*
|
|
@@ -3287,7 +3297,7 @@ function diffSboms(oldJson, newJson) {
|
|
|
3287
3297
|
newVersion: newPkg.version,
|
|
3288
3298
|
licenses: newPkg.licenses.length > 0 ? newPkg.licenses : void 0
|
|
3289
3299
|
});
|
|
3290
|
-
diffs.sort((a, b) => a.name
|
|
3300
|
+
diffs.sort((a, b) => compareCodePoint(a.name, b.name));
|
|
3291
3301
|
let added = 0;
|
|
3292
3302
|
let removed = 0;
|
|
3293
3303
|
let updated = 0;
|