refactor: Use null-safe Boolean filtering (#14039)

* refactor: Use null-safe Boolean filtering * Simplify and remove file
renovatebot · Feb 6, 2022 · cdd9b44 · cdd9b44
1 parent f0a1b64
commit cdd9b44
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 26 deletions.
diff --git 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
@@ -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
@@ -109,25 +109,17 @@ 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
   ): string | null {
     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;