diff --git a/lib/datasource/maven/index.ts b/lib/datasource/maven/index.ts index db854ecbd30027a3b2d8a79971135a51ae9c7d37..916a55566b58642a1a7e4fceffccec74d6357cb9 100644 --- a/lib/datasource/maven/index.ts +++ b/lib/datasource/maven/index.ts @@ -292,12 +292,7 @@ async function addReleasesUsingHeadRequests( } function getReleasesFromMap(releaseMap: ReleaseMap): Release[] { - const releases: Release[] = []; - for (const release of Object.values(releaseMap)) { - if (release) { - releases.push(release); - } - } + const releases = Object.values(releaseMap).filter(is.truthy); if (releases.length) { return releases; } diff --git a/lib/util/host-rules.ts b/lib/util/host-rules.ts index 2d7ea8df87700b8a6316bc80af27f9bf08dcf7c2..875de740bad755d23e9f27406b43b57657e9f1a6 100644 --- a/lib/util/host-rules.ts +++ b/lib/util/host-rules.ts @@ -151,13 +151,10 @@ export function find(search: HostRuleSearch): HostRule { } export function hosts({ hostType }: { hostType: string }): string[] { - const result: string[] = []; - for (const rule of hostRules) { - if (rule.hostType === hostType && rule.resolvedHost) { - result.push(rule.resolvedHost); - } - } - return result; + return hostRules + .filter((rule) => rule.hostType === hostType) + .map((rule) => rule.resolvedHost) + .filter(is.truthy); } export function findAll({ hostType }: { hostType: string }): HostRule[] { diff --git a/lib/versioning/regex/index.ts b/lib/versioning/regex/index.ts index eba5c900edf312dda029e01d46545a0c43665d78..67ea4729f699c1c9bf92c29a88fd2c15a51eae58 100644 --- a/lib/versioning/regex/index.ts +++ b/lib/versioning/regex/index.ts @@ -109,17 +109,6 @@ export class RegExpVersioningApi extends GenericVersioningApi<RegExpVersion> { ); } - private _getSemverVersions(versions: string[]): string[] { - const parsedVersions: string[] = []; - versions.forEach((v) => { - const parsedVersion = this._parse(v); - if (parsedVersion) { - parsedVersions.push(asSemver(parsedVersion)); - } - }); - return parsedVersions; - } - override getSatisfyingVersion( versions: string[], range: string @@ -127,7 +116,10 @@ export class RegExpVersioningApi extends GenericVersioningApi<RegExpVersion> { const parsedRange = this._parse(range); return parsedRange ? semver.maxSatisfying( - this._getSemverVersions(versions), + versions + .map((v) => this._parse(v)) + .filter(is.truthy) + .map(asSemver), asSemver(parsedRange) ) : null; @@ -140,7 +132,10 @@ export class RegExpVersioningApi extends GenericVersioningApi<RegExpVersion> { const parsedRange = this._parse(range); return parsedRange ? semver.minSatisfying( - this._getSemverVersions(versions), + versions + .map((v) => this._parse(v)) + .filter(is.truthy) + .map(asSemver), asSemver(parsedRange) ) : null;