Continue fixing useUnknownInCatchVariables (#2054)

.eslintrc

@@ -22,7 +22,6 @@
     "unicorn/no-await-expression-member": "warn", // Annoying sometimes, let's try it
 
     "@typescript-eslint/consistent-type-assertions": "warn",
-    "@typescript-eslint/no-implicit-any-catch": "warn",
 
     "jsx-a11y/click-events-have-key-events": "warn",
     "jsx-a11y/no-static-element-interactions": "warn",

src/Globals.d.ts

@@ -53,3 +53,18 @@ interface HTMLDialogElement extends HTMLElement {
 declare const jsdom: {
   reconfigure: (options: { url: string }) => void;
 };
+
+// `useUnknownInCatchVariables` for .catch method https://github.com/microsoft/TypeScript/issues/45602
+interface Promise<T> {
+  /**
+   * Attaches a callback for only the rejection of the Promise.
+   * @param onrejected The callback to execute when the Promise is rejected.
+   * @returns A Promise for the completion of the callback.
+   */
+  catch<TResult = never>(
+    onrejected?:
+      | ((reason: unknown) => TResult | PromiseLike<TResult>)
+      | undefined
+      | null
+  ): Promise<T | TResult>;
+}

src/actionPanel/native.tsx

@@ -126,7 +126,7 @@ export function showActionPanel(callbacks = extensionCallbacks): string {
   for (const callback of callbacks) {
     try {
       callback();
-    } catch (error: unknown) {
+    } catch (error) {
       // The callbacks should each have their own error handling. But wrap in a try-catch to ensure running
       // the callbacks does not interfere prevent showing the sidebar
       reportError(error);

src/actionPanel/protocol.tsx

@@ -74,7 +74,7 @@ function runListeners<Method extends keyof StoreListener>(
       // @ts-expect-error `data` is a intersection type instead of an union. TODO: Fix or rewrite
       // eslint-disable-next-line security/detect-object-injection -- method is keyof StoreListener
       listener[method](data);
-    } catch (error: unknown) {
+    } catch (error) {
       reportError(error);
     }
   }

src/background/__mocks__/protocol.ts

@@ -54,7 +54,7 @@ export function liftBackground<
 
       try {
         handlerResult = await method(...args);
-      } catch (error: unknown) {
+      } catch (error) {
         console.log("Error running method", error);
         handlerResult = toErrorResponse(fullType, error);
       }

src/background/auth.ts

@@ -307,7 +307,7 @@ async function codeGrantFlow(
         "Content-Type": "application/x-www-form-urlencoded",
       },
     });
-  } catch (error: unknown) {
+  } catch (error) {
     console.error(error);
     throw new Error(`Error getting OAuth2 token: ${getErrorMessage(error)}`);
   }

src/background/browserAction.ts

@@ -54,7 +54,7 @@ async function handleBrowserAction(tab: Tabs.Tab): Promise<void> {
       tabId: tab.id,
       frameId: TOP_LEVEL_FRAME_ID,
     });
-  } catch (error: unknown) {
+  } catch (error) {
     await showErrorInOptions("ERR_BROWSER_ACTION_TOGGLE", tab.index);
     console.error(error);
     reportError(error);

src/background/contextMenus.ts

@@ -72,7 +72,7 @@ async function dispatchMenu(
 
   try {
     reportEvent("ContextMenuClick", { extensionId: info.menuItemId });
-  } catch (error: unknown) {
+  } catch (error) {
     console.warn("Error reporting ContextMenuClick event", { error });
   }
 
@@ -96,7 +96,7 @@ async function dispatchMenu(
       message: "Ran content menu item action",
       className: "success",
     });
-  } catch (error: unknown) {
+  } catch (error) {
     if (hasCancelRootCause(error)) {
       void showNotification(target, {
         message: "The action was cancelled",
@@ -145,7 +145,7 @@ export async function uninstallContextMenu({
 
     console.debug(`Uninstalled context menu ${extensionId}`);
     return true;
-  } catch (error: unknown) {
+  } catch (error) {
     // Will throw if extensionId doesn't refer to a context menu. The callers don't have an easy way to check the type
     // without having to resolve the extensionPointId. So instead we'll just expect some of the calls to fail.
     console.debug("Could not uninstall context menu %s", extensionId, {
@@ -193,7 +193,7 @@ export async function ensureContextMenu({
       try {
         await browser.contextMenus.update(menuId, updateProperties);
         return;
-      } catch (error: unknown) {
+      } catch (error) {
         console.debug("Cannot update context menu", { error });
       }
     } else {
@@ -225,7 +225,7 @@ export async function ensureContextMenu({
     });
 
     extensionMenuItems.set(extensionId, menuId);
-  } catch (error: unknown) {
+  } catch (error) {
     if (
       getErrorMessage(error).includes("Cannot create item with duplicate id")
     ) {

src/background/deployment.ts

@@ -197,7 +197,7 @@ async function updateDeployments() {
   // Fetch the current brick definitions, which will have the current permissions and extensionVersion requirements
   try {
     await refreshRegistries();
-  } catch (error: unknown) {
+  } catch (error) {
     reportError(error);
     await browser.runtime.openOptionsPage();
     // Bail and open the main options page, which 1) fetches the latest bricks, and 2) will prompt the user the to
@@ -237,7 +237,7 @@ async function updateDeployments() {
       console.info(
         `Applied automatic updates for ${automatic.length} deployment(s)`
       );
-    } catch (error: unknown) {
+    } catch (error) {
       reportError(error);
       automaticError = error;
     }

src/background/devtools/external.ts

@@ -100,7 +100,7 @@ export async function callBackground(
   if (isNotification(options)) {
     try {
       port.postMessage(message);
-    } catch (error: unknown) {
+    } catch (error) {
       throw new Error(
         `Error sending devtools notification: ${getErrorMessage(error)}`
       );
@@ -110,7 +110,7 @@ export async function callBackground(
       devtoolsHandlers.set(nonce, [resolve, reject]);
       try {
         port.postMessage(message);
-      } catch (error: unknown) {
+      } catch (error) {
         reject(
           new Error(`Error sending devtools message: ${getErrorMessage(error)}`)
         );

src/background/devtools/internal.ts

@@ -87,7 +87,7 @@ function backgroundMessageListener(
     let responded = false;
 
     if (notification) {
-      handlerPromise.catch((error: unknown) => {
+      handlerPromise.catch((error) => {
         console.warn(
           `An error occurred when handling notification ${type} (nonce: ${meta?.nonce})`,
           error
@@ -185,7 +185,7 @@ export function liftBackground<
 async function resetTab(tabId: number): Promise<void> {
   try {
     await clearDynamicElements({ tabId, frameId: TOP_LEVEL_FRAME_ID }, {});
-  } catch (error: unknown) {
+  } catch (error) {
     console.warn("Error clearing dynamic elements for tab: %d", tabId, {
       error,
     });
@@ -280,7 +280,7 @@ async function attemptTemporaryAccess({
 
   try {
     await ensureContentScript({ tabId, frameId });
-  } catch (error: unknown) {
+  } catch (error) {
     if (isPrivatePageError(error)) {
       return;
     }

src/background/executor.ts

@@ -338,7 +338,7 @@ async function retrySend<T extends (...args: unknown[]) => Promise<unknown>>(
     try {
       // eslint-disable-next-line no-await-in-loop -- retry loop
       return await send();
-    } catch (error: unknown) {
+    } catch (error) {
       const message = getErrorMessage(error);
 
       if (NOT_READY_PARTIAL_MESSAGES.some((query) => message.includes(query))) {

src/background/protocol.ts

@@ -71,7 +71,7 @@ async function handleRequest(
       `Handler FULFILLED action ${type} (nonce: ${meta?.nonce}, tab: ${sender.tab?.id}, frame: ${sender.frameId})`
     );
     return value;
-  } catch (error: unknown) {
+  } catch (error) {
     if (isNotification(options)) {
       console.warn(
         `An error occurred when handling notification ${type} (nonce: ${meta?.nonce}, tab: ${sender.tab?.id}, frame: ${sender.frameId})`,
@@ -114,7 +114,7 @@ async function callBackground(
     console.debug(`Sending background notification ${type} (nonce: ${nonce})`, {
       extensionId,
     });
-    sendMessage(extensionId, message, {}).catch((error: unknown) => {
+    sendMessage(extensionId, message, {}).catch((error) => {
       console.warn(
         `An error occurred processing background notification ${type} (nonce: ${nonce})`,
         error
@@ -127,7 +127,7 @@ async function callBackground(
     let response;
     try {
       response = await sendMessage(extensionId, message, {});
-    } catch (error: unknown) {
+    } catch (error) {
       console.debug(
         `Error sending background action ${type} (nonce: ${nonce})`,
         { extensionId, error }

src/background/proxyService.test.ts

@@ -117,7 +117,7 @@ describe("unauthenticated direct requests", () => {
     try {
       await proxyService(null, requestConfig);
       fail("Expected proxyService to throw a RemoteServiceError error");
-    } catch (error: unknown) {
+    } catch (error) {
       expect(error).toBeInstanceOf(RemoteServiceError);
       const { status } = (error as RemoteServiceError).response;
       expect(status).toEqual(500);
@@ -149,7 +149,7 @@ describe("authenticated direct requests", () => {
     try {
       await proxyService(directServiceConfig, requestConfig);
       fail("Expected proxyService to throw an error");
-    } catch (error: unknown) {
+    } catch (error) {
       expect(error).toBeInstanceOf(ContextError);
       const { status } = ((error as ContextError).cause as AxiosError).response;
       expect(status).toEqual(403);
@@ -191,7 +191,7 @@ describe("proxy service requests", () => {
         try {
           await proxyService(proxiedServiceConfig, requestConfig);
           fail("Expected proxyService to throw an error");
-        } catch (error: unknown) {
+        } catch (error) {
           expect(error).toBeInstanceOf(ContextError);
           const { status, statusText } = ((error as ContextError)
             .cause as AxiosError).response;
@@ -208,7 +208,7 @@ describe("proxy service requests", () => {
     try {
       await proxyService(proxiedServiceConfig, requestConfig);
       fail("Expected proxyService to throw an error");
-    } catch (error: unknown) {
+    } catch (error) {
       expect(error).toBeInstanceOf(Error);
       expect((error as Error).message).toEqual(
         "API proxy error: Request failed with status code 500"

src/background/requests.ts

@@ -109,7 +109,7 @@ const backgroundRequest = liftBackground(
   async (config: AxiosRequestConfig) => {
     try {
       return cleanResponse(await axios(config));
-    } catch (error: unknown) {
+    } catch (error) {
       if (isAxiosError(error)) {
         // Axios offers its own serialization method, but it doesn't include the response.
         // By deleting toJSON, the serialize-error library will use its default serialization
@@ -212,7 +212,7 @@ async function proxyRequest<T>(
     proxyResponse = (await backgroundRequest(
       authenticatedRequestConfig
     )) as SanitizedResponse<ProxyResponseData>;
-  } catch (error: unknown) {
+  } catch (error) {
     // If there's a server error with the proxy server itself, we'll also see it in the Rollbar logs for the server.
     throw new Error(`API proxy error: ${getErrorMessage(error)}`);
   }
@@ -254,7 +254,7 @@ const _proxyService = liftBackground(
       return await backgroundRequest(
         await authenticate(serviceConfig, requestConfig)
       );
-    } catch (error: unknown) {
+    } catch (error) {
       // Try again - have the user login again, or automatically try to get a new token
       if (
         isAxiosError(error) &&
@@ -309,7 +309,7 @@ export async function proxyService<TData>(
       return (await backgroundRequest(
         requestConfig
       )) as SanitizedResponse<TData>;
-    } catch (error: unknown) {
+    } catch (error) {
       if (!isAxiosError(error)) {
         throw error;
       }
@@ -331,7 +331,7 @@ export async function proxyService<TData>(
       serviceConfig,
       requestConfig
     )) as RemoteResponse<TData>;
-  } catch (error: unknown) {
+  } catch (error) {
     throw new ContextError(selectError(error) as Error, {
       serviceId: serviceConfig.serviceId,
       authId: serviceConfig.id,

src/background/telemetry.ts

@@ -131,7 +131,7 @@ async function userSummary() {
       .length;
     numActiveExtensionPoints = uniq(extensions.map((x) => x.extensionPointId))
       .length;
-  } catch (error: unknown) {
+  } catch (error) {
     console.warn("Cannot get number of extensions", { error });
   }
 

src/baseRegistry.ts

@@ -144,7 +144,7 @@ export class Registry<
   private parse(raw: unknown): Item | undefined {
     try {
       return this.deserialize(raw);
-    } catch (error: unknown) {
+    } catch (error) {
       console.warn(
         "Error de-serializing item: %s",
         getErrorMessage(error),

src/blocks/effects/wait.ts

@@ -108,7 +108,7 @@ export class WaitElementEffect extends Effect {
       const [promise, cancel] = awaitElementOnce(selector);
       try {
         await runInMillis(async () => promise, maxWaitMillis);
-      } catch (error: unknown) {
+      } catch (error) {
         cancel();
 
         if (error instanceof TimeoutError) {

src/blocks/renderers/common.ts

@@ -57,7 +57,7 @@ export async function errorBoundary(
 
     // TODO: validate the shape of the value returned
     return value;
-  } catch (error: unknown) {
+  } catch (error) {
     logger.error(error);
     const escapedMessage = escape(getErrorMessage(error));
     return sanitize(`<div>An error occurred: ${escapedMessage}</div>`);

src/blocks/renderers/customForm.tsx

@@ -104,7 +104,7 @@ export class CustomFormRenderer extends Renderer {
                 className: "success",
               },
             });
-          } catch (error: unknown) {
+          } catch (error) {
             reportError(error);
             notifyResult(logger.context.extensionId, {
               message: "Error saving record",

src/blocks/transformers/ephemeralForm/formTransformer.ts

@@ -34,7 +34,6 @@ import {
   hideActionPanelForm,
 } from "@/actionPanel/native";
 import { showModal } from "@/blocks/transformers/ephemeralForm/modalUtils";
-import { unary } from "lodash";
 import { reportError } from "@/telemetry/logging";
 import pDefer from "p-defer";
 
@@ -160,7 +159,7 @@ export class FormTransformer extends Transformer {
         // In the future we might creating/sending a closeIfEmpty message to the sidebar, so that it would close
         // if this form was the only entry in the panel
         hideActionPanelForm(nonce);
-        void cancelForm(nonce).catch(unary(reportError));
+        void cancelForm(nonce).catch(reportError);
       });
     } else {
       showModal(frameSrc, controller.signal);

src/blocks/transformers/jq.ts

@@ -69,7 +69,7 @@ export class JQTransformer extends Transformer {
     try {
       // eslint-disable-next-line @typescript-eslint/return-await -- Type is `any`, it throws the rule off
       return await jq.promised.json(input, filter);
-    } catch (error: unknown) {
+    } catch (error) {
       if (!isErrorObject(error) || !error.message.includes("compile error")) {
         throw error;
       }

src/components/AsyncIcon.tsx

@@ -9,7 +9,7 @@ async function handleIconImport(
   try {
     const { definition } = await moduleImport;
     return definition;
-  } catch (error: unknown) {
+  } catch (error) {
     console.warn("Error importing FontAwesome icon library module", { error });
     throw error;
   }

src/components/ellipsisMenu/EllipsisMenu.tsx

@@ -57,7 +57,7 @@ const EllipsisMenu: React.FunctionComponent<{
         // hence no other element knows that the click happened.
         // Simulating the click on the body will let other menus know user clicked somewhere.
         document.body.click();
-      } catch (error: unknown) {
+      } catch (error) {
         console.debug(
           "EllipsisMenu. Failed to trigger closing other menus",
           error