chore: some from mapped Promises

forcedotcom · Feb 12, 2024 · c0e8bcb · c0e8bcb
1 parent 4a98c4f
commit c0e8bcb
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 19 deletions.
diff --git a/.github/actions/validate-issue/lib/index.js b/.github/actions/validate-issue/lib/index.js
diff --git a/.github/actions/validate-issue/lib/index.js.map b/.github/actions/validate-issue/lib/index.js.map
diff --git a/.github/actions/validate-issue/lib/nodeVersions.d.ts b/.github/actions/validate-issue/lib/nodeVersions.d.ts
diff --git a/.github/actions/validate-issue/lib/nodeVersions.js b/.github/actions/validate-issue/lib/nodeVersions.js
diff --git a/.github/actions/validate-issue/lib/nodeVersions.js.map b/.github/actions/validate-issue/lib/nodeVersions.js.map
diff --git a/.github/actions/validate-issue/src/index.ts b/.github/actions/validate-issue/src/index.ts
@@ -11,7 +11,7 @@ import { execSync } from "child_process";
 import * as semver from "semver";
 import { readFileSync } from "fs";
 import * as path from "path";
-import { isValidVersion } from "./nodeVersions";
+import { isAnyVersionValid } from "./nodeVersions";
 
 async function run() {
   try {
@@ -138,7 +138,7 @@ async function run() {
         valid = false;
       }
       if (nodeVersions.length > 0) {
-        if (!nodeVersions.some(await isValidVersion(new Date()))) {
+        if (!(await isAnyVersionValid(new Date())(nodeVersions))) {
           const nodeVersionMessage = getFile(
             "../messages/unsupported-node.md",
             {

diff --git a/.github/actions/validate-issue/src/nodeVersions.ts b/.github/actions/validate-issue/src/nodeVersions.ts
@@ -3,18 +3,21 @@ type VersionInfo = {
   end: Date;
 };
 
-export const isValidVersion = (currentDate: Date) => async (
-  version: string
+export const isAnyVersionValid = (currentDate: Date) => async (
+  versions: string[]
 ): Promise<boolean> => {
-  const formattedVersion = `v${version}`;
   const resp = (await ((
     await fetch(
       "https://raw.githubusercontent.com/nodejs/Release/main/schedule.json"
     )
   ).json() as unknown)) as Record<string, VersionInfo>;
-  return (
-    formattedVersion in resp &&
-    currentDate >= new Date(resp[formattedVersion].start) &&
-    currentDate <= new Date(resp[formattedVersion].end)
-  );
+
+  return versions
+    .map((version) => `v${version}`)
+    .some(
+      (formattedVersion) =>
+        formattedVersion in resp &&
+        currentDate >= new Date(resp[formattedVersion].start) &&
+        currentDate <= new Date(resp[formattedVersion].end)
+    );
 };