Refactor try/catch blocks to use unknown type annotations (#53938)

rubennorte · meta-codesync[bot] · commit 0be68b31ab6d · 2026-01-13T10:14:36.000-08:00
Summary: Pull Request resolved: #53938 Changelog: [internal] - Add `: unknown` annotations to all catch parameters in React Native JS files - Create toError utility for converting mixed values to Error instances - Create toExtendedError utility for LogBox-specific ExtendedError conversion - Fix Flow type compatibility issues with proper error handling - Resolve ESLint import order warnings Reviewed By: andrewdacenko Differential Revision: D82304028 fbshipit-source-id: 8b7be9a2416892fcf2f222e08d108a9ca09f3c1f
diff --git a/packages/react-native/Libraries/Animated/animations/Animation.js b/packages/react-native/Libraries/Animated/animations/Animation.js
@@ -168,7 +168,7 @@ export default class Animation {
       );
 
       return true;
-    } catch (e) {
+    } catch (e: unknown) {
       throw e;
     } finally {
       NativeAnimatedHelper.API.unsetWaitingForIdentifier(
diff --git a/packages/react-native/Libraries/BatchedBridge/MessageQueue.js b/packages/react-native/Libraries/BatchedBridge/MessageQueue.js
@@ -372,7 +372,7 @@ class MessageQueue {
     } else {
       try {
         fn();
-      } catch (error) {
+      } catch (error: unknown) {
         ErrorUtils.reportFatalError(error);
       }
     }
diff --git a/packages/react-native/Libraries/Core/Timers/JSTimers.js b/packages/react-native/Libraries/Core/Timers/JSTimers.js
@@ -11,6 +11,7 @@
 
 import NativeTiming from './NativeTiming';
 
+const toError = require('../../../src/private/utilities/toError').default;
 const BatchedBridge = require('../../BatchedBridge/BatchedBridge').default;
 const Systrace = require('../../Performance/Systrace');
 const invariant = require('invariant');
@@ -129,9 +130,9 @@ function _callTimer(timerID: number, frameTime: number, didTimeout: ?boolean) {
     } else {
       console.error('Tried to call a callback with invalid type: ' + type);
     }
-  } catch (e) {
+  } catch (e: unknown) {
     // Don't rethrow so that we can run all timers.
-    errors.push(e);
+    errors.push(toError(e));
   }
 
   if (__DEV__) {
diff --git a/packages/react-native/Libraries/Core/Timers/__tests__/JSTimers-test.js b/packages/react-native/Libraries/Core/Timers/__tests__/JSTimers-test.js
@@ -16,13 +16,10 @@ const NativeTiming = {
   setSendIdleEvents: jest.fn(),
 };
 
-jest
-  .enableAutomock()
-  .mock('../NativeTiming', () => ({
-    __esModule: true,
-    default: NativeTiming,
-  }))
-  .unmock('../JSTimers');
+jest.mock('../NativeTiming', () => ({
+  __esModule: true,
+  default: NativeTiming,
+}));
 
 const JSTimers = require('../JSTimers').default;
 
diff --git a/packages/react-native/Libraries/Core/setUpErrorHandling.js b/packages/react-native/Libraries/Core/setUpErrorHandling.js
@@ -16,15 +16,17 @@ if (global.RN$useAlwaysAvailableJSErrorHandling !== true) {
    * You can use this module directly, or just require InitializeCore.
    */
   const ExceptionsManager = require('./ExceptionsManager').default;
+  const toError = require('../../src/private/utilities/toError').default;
   ExceptionsManager.installConsoleErrorReporter();
 
   // Set up error handler
   if (!global.__fbDisableExceptionsManager) {
     const handleError = (e: unknown, isFatal: boolean) => {
       try {
         ExceptionsManager.handleException(e, isFatal);
-      } catch (ee) {
-        console.log('Failed to print error: ', ee.message);
+      } catch (ee: unknown) {
+        const error = toError(ee);
+        console.log('Failed to print error: ', error.message);
         throw e;
       }
     };
diff --git a/packages/react-native/Libraries/Core/setUpReactDevTools.js b/packages/react-native/Libraries/Core/setUpReactDevTools.js
@@ -49,7 +49,7 @@ if (__DEV__) {
     try {
       const parsedSettings = JSON.parse(serializedHookSettings);
       hookSettings = parsedSettings;
-    } catch {
+    } catch (e: unknown) {
       console.error(
         'Failed to parse persisted React DevTools hook settings. React DevTools will be initialized with default settings.',
       );
diff --git a/packages/react-native/Libraries/Interaction/InteractionManager.js b/packages/react-native/Libraries/Interaction/InteractionManager.js
@@ -10,6 +10,7 @@
 
 import type {EventSubscription} from '../vendor/emitter/EventEmitter';
 
+const toError = require('../../src/private/utilities/toError').default;
 const invariant = require('invariant');
 
 export type SimpleTask = {
@@ -113,8 +114,8 @@ const InteractionManagerStub = {
             try {
               task.run();
               resolve();
-            } catch (error) {
-              reject(error);
+            } catch (error: unknown) {
+              reject(toError(error));
             }
           } else {
             reject(new TypeError(`Task "${task.name}" missing gen or run.`));
@@ -123,8 +124,8 @@ const InteractionManagerStub = {
           try {
             task();
             resolve();
-          } catch (error) {
-            reject(error);
+          } catch (error: unknown) {
+            reject(toError(error));
           }
         } else {
           reject(new TypeError('Invalid task of type: ' + typeof task));
diff --git a/packages/react-native/Libraries/LogBox/Data/LogBoxData.js b/packages/react-native/Libraries/LogBox/Data/LogBoxData.js
@@ -19,6 +19,7 @@ import type {
 } from './parseLogBoxLog';
 
 import DebuggerSessionObserver from '../../../src/private/devsupport/rndevtools/FuseboxSessionObserver';
+import toExtendedError from '../../../src/private/utilities/toExtendedError';
 import parseErrorStack from '../../Core/Devtools/parseErrorStack';
 import NativeLogBox from '../../NativeModules/specs/NativeLogBox';
 import LogBoxLog from './LogBoxLog';
@@ -240,8 +241,8 @@ export function addLog(log: LogData): void {
           componentStackType: log.componentStackType || 'legacy',
         }),
       );
-    } catch (error) {
-      reportLogBoxError(error);
+    } catch (error: unknown) {
+      reportLogBoxError(toExtendedError(error));
     }
   });
 }
@@ -252,8 +253,8 @@ export function addException(error: ExtendedExceptionData): void {
   setImmediate(() => {
     try {
       appendNewLog(new LogBoxLog(parseLogBoxException(error)));
-    } catch (loggingError) {
-      reportLogBoxError(loggingError);
+    } catch (loggingError: unknown) {
+      reportLogBoxError(toExtendedError(loggingError));
     }
   });
 }
diff --git a/packages/react-native/Libraries/LogBox/LogBox.js b/packages/react-native/Libraries/LogBox/LogBox.js
@@ -11,6 +11,7 @@
 import type {IgnorePattern, LogData} from './Data/LogBoxData';
 import type {ExtendedExceptionData} from './Data/parseLogBoxLog';
 
+import toExtendedError from '../../src/private/utilities/toExtendedError';
 import Platform from '../Utilities/Platform';
 import RCTLog from '../Utilities/RCTLog';
 import * as React from 'react';
@@ -192,8 +193,8 @@ if (__DEV__) {
               componentStackType,
             });
           }
-        } catch (err) {
-          LogBoxData.reportLogBoxError(err);
+        } catch (err: unknown) {
+          LogBoxData.reportLogBoxError(toExtendedError(err));
         }
       }
     },
@@ -237,8 +238,8 @@ if (__DEV__) {
           });
         }
       }
-    } catch (err) {
-      LogBoxData.reportLogBoxError(err);
+    } catch (err: unknown) {
+      LogBoxData.reportLogBoxError(toExtendedError(err));
     }
   };
 } else {
diff --git a/packages/react-native/Libraries/Network/XMLHttpRequest.js b/packages/react-native/Libraries/Network/XMLHttpRequest.js
@@ -284,7 +284,7 @@ class XMLHttpRequest extends EventTarget {
       case 'json':
         try {
           this._cachedResponse = JSON.parse(this._response);
-        } catch (_) {
+        } catch (_: unknown) {
           this._cachedResponse = null;
         }
         break;
diff --git a/packages/react-native/src/private/utilities/toError.js b/packages/react-native/src/private/utilities/toError.js
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+/**
+ * Converts an unknown value to an Error instance.
+ * If the value is already an Error, returns it as-is.
+ * Otherwise, creates a new Error with the stringified value as the message.
+ *
+ * This is particularly useful in catch blocks where the caught value
+ * is annotated as `unknown` but needs to be treated as an Error.
+ *
+ * @param value - The unknown value to convert to an Error
+ * @returns An Error instance
+ */
+export default function toError(value: unknown): Error {
+  if (value instanceof Error) {
+    return value;
+  }
+  return new Error(String(value));
+}
diff --git a/packages/react-native/src/private/utilities/toExtendedError.js b/packages/react-native/src/private/utilities/toExtendedError.js
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+import type {ExtendedError} from '../../../Libraries/Core/ExtendedError';
+
+import toError from './toError';
+
+/**
+ * Converts an unknown value to an ExtendedError instance suitable for LogBox.
+ * Uses the standard toError utility internally and then casts to ExtendedError.
+ *
+ * This is specifically designed for LogBox error reporting which requires
+ * ExtendedError type compatibility.
+ *
+ * @param value - The unknown value to convert to an ExtendedError
+ * @returns An ExtendedError instance
+ */
+export default function toExtendedError(value: unknown): ExtendedError {
+  const error = toError(value);
+  // ExtendedError extends Error, so this cast is safe for the LogBox system
+  // $FlowFixMe[incompatible-type] ExtendedError extends Error, this cast is safe
+  return (error: ExtendedError);
+}

Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ class MessageQueue {`
`372`	`372`	`} else {`
`373`	`373`	`try {`
`374`	`374`	`fn();`
`375`		`- } catch (error) {`
	`375`	`+ } catch (error: unknown) {`
`376`	`376`	`ErrorUtils.reportFatalError(error);`
`377`	`377`	`}`
`378`	`378`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`import type {IgnorePattern, LogData} from './Data/LogBoxData';`
`12`	`12`	`import type {ExtendedExceptionData} from './Data/parseLogBoxLog';`
`13`	`13`
	`14`	`+import toExtendedError from '../../src/private/utilities/toExtendedError';`
`14`	`15`	`import Platform from '../Utilities/Platform';`
`15`	`16`	`import RCTLog from '../Utilities/RCTLog';`
`16`	`17`	`import * as React from 'react';`
`@@ -192,8 +193,8 @@ if (__DEV__) {`
`192`	`193`	`componentStackType,`
`193`	`194`	`});`
`194`	`195`	`}`
`195`		`- } catch (err) {`
`196`		`- LogBoxData.reportLogBoxError(err);`
	`196`	`+ } catch (err: unknown) {`
	`197`	`+ LogBoxData.reportLogBoxError(toExtendedError(err));`
`197`	`198`	`}`
`198`	`199`	`}`
`199`	`200`	`},`
`@@ -237,8 +238,8 @@ if (__DEV__) {`
`237`	`238`	`});`
`238`	`239`	`}`
`239`	`240`	`}`
`240`		`- } catch (err) {`
`241`		`- LogBoxData.reportLogBoxError(err);`
	`241`	`+ } catch (err: unknown) {`
	`242`	`+ LogBoxData.reportLogBoxError(toExtendedError(err));`
`242`	`243`	`}`
`243`	`244`	`};`
`244`	`245`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ class XMLHttpRequest extends EventTarget {`
`284`	`284`	`case 'json':`
`285`	`285`	`try {`
`286`	`286`	`this._cachedResponse = JSON.parse(this._response);`
`287`		`- } catch (_) {`
	`287`	`+ } catch (_: unknown) {`
`288`	`288`	`this._cachedResponse = null;`
`289`	`289`	`}`
`290`	`290`	`break;`