cve-lite-cli 1.7.0 → 1.7.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.
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { compareVersions, looksLikeVersion } from "../utils/version.js";
|
|
1
|
+
import { compareVersions, isPreReleaseVersion, looksLikeVersion } from "../utils/version.js";
|
|
2
2
|
const packumentCache = new Map();
|
|
3
3
|
const DEFAULT_NPM_REGISTRY_URL = "https://registry.npmjs.org";
|
|
4
4
|
export function clearPackumentCache() {
|
|
@@ -111,6 +111,7 @@ export async function resolveLowestKnownNonVulnerableVersion(packageName, instal
|
|
|
111
111
|
}
|
|
112
112
|
const candidates = Object.keys(packument.versions ?? {})
|
|
113
113
|
.filter(looksLikeVersion)
|
|
114
|
+
.filter(v => !isPreReleaseVersion(v))
|
|
114
115
|
.filter(version => compareVersions(version, installedVersion) > 0)
|
|
115
116
|
.sort(compareVersions);
|
|
116
117
|
if (candidates.length === 0) {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { compareVersions, looksLikeVersion } from "../utils/version.js";
|
|
1
|
+
import { compareVersions, isPreReleaseVersion, looksLikeVersion } from "../utils/version.js";
|
|
2
2
|
import { fetchPackument } from "./npm-registry.js";
|
|
3
3
|
export async function resolveRecommendedParentUpgrade(finding, packages) {
|
|
4
4
|
if (finding.relationship !== "transitive")
|
|
@@ -75,6 +75,7 @@ async function findUpgradeForExactDirectChild(args) {
|
|
|
75
75
|
const packument = await fetchPackument(args.directParentName);
|
|
76
76
|
const versions = Object.keys(packument?.versions ?? {})
|
|
77
77
|
.filter(looksLikeVersion)
|
|
78
|
+
.filter(v => !isPreReleaseVersion(v))
|
|
78
79
|
.filter(version => compareVersions(version, args.directParentVersion) > 0)
|
|
79
80
|
.sort(compareVersions);
|
|
80
81
|
for (const version of versions) {
|
|
@@ -108,6 +109,7 @@ async function findUpgradeForImmediateIntermediate(args) {
|
|
|
108
109
|
const packument = await fetchPackument(args.directParentName);
|
|
109
110
|
const versions = Object.keys(packument?.versions ?? {})
|
|
110
111
|
.filter(looksLikeVersion)
|
|
112
|
+
.filter(v => !isPreReleaseVersion(v))
|
|
111
113
|
.filter(version => compareVersions(version, args.directParentVersion) > 0)
|
|
112
114
|
.sort(compareVersions);
|
|
113
115
|
for (const version of versions) {
|
package/dist/scanner.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { chunk, unique } from "./utils/array.js";
|
|
2
|
-
import { compareVersions, looksLikeVersion } from "./utils/version.js";
|
|
2
|
+
import { compareVersions, isPreReleaseVersion, looksLikeVersion } from "./utils/version.js";
|
|
3
3
|
import { loadCache, saveCache } from "./osv/cache.js";
|
|
4
4
|
import { maxSeverity } from "./osv/severity.js";
|
|
5
5
|
import { createSpinner } from "./output/spinner.js";
|
|
@@ -271,7 +271,7 @@ function findFirstFixedVersion(vulns) {
|
|
|
271
271
|
for (const range of affected.ranges ?? []) {
|
|
272
272
|
for (const event of range.events ?? []) {
|
|
273
273
|
const fixed = event.fixed;
|
|
274
|
-
if (fixed && looksLikeVersion(fixed)) {
|
|
274
|
+
if (fixed && looksLikeVersion(fixed) && !isPreReleaseVersion(fixed)) {
|
|
275
275
|
fixedVersions.push(fixed);
|
|
276
276
|
}
|
|
277
277
|
}
|
package/dist/utils/version.js
CHANGED
|
@@ -32,6 +32,9 @@ export function isMajorVersionBump(from, to) {
|
|
|
32
32
|
const toMajor = Number(to.split(".")[0]);
|
|
33
33
|
return !Number.isNaN(fromMajor) && !Number.isNaN(toMajor) && toMajor > fromMajor;
|
|
34
34
|
}
|
|
35
|
+
export function isPreReleaseVersion(version) {
|
|
36
|
+
return /^\d+\.\d+\.\d+-[^\s]+$/.test(version);
|
|
37
|
+
}
|
|
35
38
|
export function normalizeRawVersion(value) {
|
|
36
39
|
if (typeof value !== "string")
|
|
37
40
|
return null;
|