From ef5f493ce489775fcfa7f8a862759fb0d6aa847c Mon Sep 17 00:00:00 2001
From: Jakub Butkiewicz <jakub.butkiewicz94@gmail.com>
Date: Wed, 3 Apr 2024 13:15:17 +0200
Subject: [PATCH] fix: typecheck

---
 .../awaitStagingDeploys/awaitStagingDeploys.ts       |  6 +++---
 .../getDeployPullRequestList.ts                      |  4 ++--
 .github/libs/promiseWhile.ts                         | 12 +++++++-----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.ts b/.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.ts
index 958a643d4287..1cf58dc03f8f 100644
--- a/.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.ts
+++ b/.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import lodashThrottle from 'lodash/throttle';
-import ActionUtils from '@github/libs/ActionUtils';
+import {getStringInput} from '@github/libs/ActionUtils';
 import CONST from '@github/libs/CONST';
 import GitHubUtils, {POLL_RATE} from '@github/libs/GithubUtils';
 import {promiseDoWhile} from '@github/libs/promiseWhile';
@@ -9,11 +9,11 @@ type CurrentStagingDeploys = Awaited<ReturnType<typeof GitHubUtils.octokit.actio
 
 function run() {
     console.info('[awaitStagingDeploys] run()');
-    console.info('[awaitStagingDeploys] ActionUtils', ActionUtils);
+    console.info('[awaitStagingDeploys] getStringInput', getStringInput);
     console.info('[awaitStagingDeploys] GitHubUtils', GitHubUtils);
     console.info('[awaitStagingDeploys] promiseDoWhile', promiseDoWhile);
 
-    const tag = ActionUtils.getStringInput('TAG', {required: false});
+    const tag = getStringInput('TAG', {required: false});
     console.info('[awaitStagingDeploys] run() tag', tag);
 
     let currentStagingDeploys: CurrentStagingDeploys = [];
diff --git a/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts b/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts
index 897faebda277..e814a10ca188 100644
--- a/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts
+++ b/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts
@@ -1,13 +1,13 @@
 import core from '@actions/core';
 import github from '@actions/github';
-import ActionUtils from '@github/libs/ActionUtils';
+import {getJSONInput} from '@github/libs/ActionUtils';
 import GithubUtils from '@github/libs/GithubUtils';
 import GitUtils from '@github/libs/GitUtils';
 
 async function run() {
     try {
         const inputTag = core.getInput('TAG', {required: true});
-        const isProductionDeploy = ActionUtils.getJSONInput('IS_PRODUCTION_DEPLOY', {required: false}, false);
+        const isProductionDeploy = getJSONInput('IS_PRODUCTION_DEPLOY', {required: false}, false);
         const deployEnv = isProductionDeploy ? 'production' : 'staging';
 
         console.log(`Looking for PRs deployed to ${deployEnv} in ${inputTag}...`);
diff --git a/.github/libs/promiseWhile.ts b/.github/libs/promiseWhile.ts
index 2fd6ac175a02..7e15b6d69009 100644
--- a/.github/libs/promiseWhile.ts
+++ b/.github/libs/promiseWhile.ts
@@ -1,7 +1,9 @@
+import type {DebouncedFunc} from 'lodash';
+
 /**
  * Simulates a while loop where the condition is determined by the result of a Promise.
  */
-function promiseWhile(condition: () => boolean, action: () => Promise<void>): Promise<void> {
+function promiseWhile(condition: () => boolean, action: (() => Promise<void>) | DebouncedFunc<() => Promise<void>> | undefined): Promise<void> {
     console.info('[promiseWhile] promiseWhile()');
 
     return new Promise((resolve, reject) => {
@@ -9,7 +11,7 @@ function promiseWhile(condition: () => boolean, action: () => Promise<void>): Pr
             if (!condition()) {
                 resolve();
             } else {
-                const actionResult = action();
+                const actionResult = action?.();
                 console.info('[promiseWhile] promiseWhile() actionResult', actionResult);
                 Promise.resolve(actionResult).then(loop).catch(reject);
             }
@@ -21,15 +23,15 @@ function promiseWhile(condition: () => boolean, action: () => Promise<void>): Pr
 /**
  * Simulates a do-while loop where the condition is determined by the result of a Promise.
  */
-function promiseDoWhile(condition: () => boolean, action: () => Promise<void>): Promise<void> {
+function promiseDoWhile(condition: () => boolean, action: (() => Promise<void>) | DebouncedFunc<() => Promise<void>> | undefined): Promise<void> {
     console.info('[promiseWhile] promiseDoWhile()');
 
     return new Promise((resolve, reject) => {
         console.info('[promiseWhile] promiseDoWhile() condition', condition);
-        const actionResult = action();
+        const actionResult = action?.();
         console.info('[promiseWhile] promiseDoWhile() actionResult', actionResult);
         actionResult
-            .then(() => promiseWhile(condition, action))
+            ?.then(() => promiseWhile(condition, action))
             .then(() => resolve())
             .catch(reject);
     });