facebook · RSNara · Dec 20, 2024
diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api
@@ -2364,7 +2364,7 @@ public class com/facebook/react/devsupport/StackTraceHelper {
 	public static fun convertJsStackTrace (Lcom/facebook/react/bridge/ReadableArray;)[Lcom/facebook/react/devsupport/interfaces/StackFrame;
 	public static fun convertJsStackTrace (Ljava/lang/String;)[Lcom/facebook/react/devsupport/interfaces/StackFrame;
 	public static fun convertJsStackTrace (Lorg/json/JSONArray;)[Lcom/facebook/react/devsupport/interfaces/StackFrame;
-	public static fun convertParsedError (Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ParsedError;)Lcom/facebook/react/bridge/JavaOnlyMap;
+	public static fun convertProcessedError (Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ProcessedError;)Lcom/facebook/react/bridge/JavaOnlyMap;
 	public static fun formatFrameSource (Lcom/facebook/react/devsupport/interfaces/StackFrame;)Ljava/lang/String;
 	public static fun formatStackTrace (Ljava/lang/String;[Lcom/facebook/react/devsupport/interfaces/StackFrame;)Ljava/lang/String;
 }
@@ -2816,7 +2816,7 @@ public abstract interface class com/facebook/react/interfaces/TaskInterface {
 	public abstract fun waitForCompletion (JLjava/util/concurrent/TimeUnit;)Z
 }
 
-public abstract interface class com/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ParsedError {
+public abstract interface class com/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ProcessedError {
 	public abstract fun getComponentStack ()Ljava/lang/String;
 	public abstract fun getExtraData ()Lcom/facebook/react/bridge/ReadableMap;
 	public abstract fun getId ()I
@@ -2827,7 +2827,7 @@ public abstract interface class com/facebook/react/interfaces/exceptionmanager/R
 	public abstract fun isFatal ()Z
 }
 
-public abstract interface class com/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ParsedError$StackFrame {
+public abstract interface class com/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ProcessedError$StackFrame {
 	public abstract fun getColumn ()Ljava/lang/Integer;
 	public abstract fun getFile ()Ljava/lang/String;
 	public abstract fun getLineNumber ()Ljava/lang/Integer;

diff --git a/...act-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java b/...act-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java
@@ -15,7 +15,7 @@
 import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.devsupport.interfaces.StackFrame;
-import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler.ParsedError;
+import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler.ProcessedError;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -263,10 +263,10 @@ public static String formatStackTrace(String title, StackFrame[] stack) {
     return stackTrace.toString();
   }
 
-  public static JavaOnlyMap convertParsedError(ParsedError error) {
-    List<ParsedError.StackFrame> frames = error.getStack();
+  public static JavaOnlyMap convertProcessedError(ProcessedError error) {
+    List<ProcessedError.StackFrame> frames = error.getStack();
     List<ReadableMap> readableMapList = new ArrayList<>();
-    for (ParsedError.StackFrame frame : frames) {
+    for (ProcessedError.StackFrame frame : frames) {
       JavaOnlyMap map = new JavaOnlyMap();
       map.putDouble(COLUMN_KEY, frame.getColumn());
       map.putDouble(LINE_NUMBER_KEY, frame.getLineNumber());

diff --git a/...d/src/main/java/com/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler.kt b/...d/src/main/java/com/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler.kt
@@ -17,7 +17,7 @@ import java.util.ArrayList
 @UnstableReactNativeAPI
 public fun interface ReactJsExceptionHandler {
   @DoNotStripAny
-  public interface ParsedError {
+  public interface ProcessedError {
     @DoNotStripAny
     public interface StackFrame {
       public val file: String?
@@ -37,24 +37,24 @@ public fun interface ReactJsExceptionHandler {
   }
 
   @DoNotStripAny
-  private data class ParsedStackFrameImpl(
+  private data class ProcessedErrorStackFrameImpl(
       override val file: String?,
       override val methodName: String,
       override val lineNumber: Int?,
       override val column: Int?,
-  ) : ParsedError.StackFrame
+  ) : ProcessedError.StackFrame
 
   @DoNotStripAny
-  private data class ParsedErrorImpl(
+  private data class ProcessedErrorImpl(
       override val message: String,
       override val originalMessage: String?,
       override val name: String?,
       override val componentStack: String?,
-      override val stack: ArrayList<ParsedStackFrameImpl>,
+      override val stack: ArrayList<ProcessedErrorStackFrameImpl>,
       override val id: Int,
       override val isFatal: Boolean,
       override val extraData: ReadableNativeMap,
-  ) : ParsedError
+  ) : ProcessedError
 
-  public fun reportJsException(errorMap: ParsedError)
+  public fun reportJsException(errorMap: ProcessedError)
 }
diff --git a/...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.java b/...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.java
@@ -324,8 +324,8 @@ private class ReactJsExceptionHandlerImpl implements ReactJsExceptionHandler {
     }
 
     @Override
-    public void reportJsException(ParsedError error) {
-      JavaOnlyMap data = StackTraceHelper.convertParsedError(error);
+    public void reportJsException(ProcessedError error) {
+      JavaOnlyMap data = StackTraceHelper.convertProcessedError(error);
 
       try {
         NativeExceptionsManagerSpec exceptionsManager =

diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactExceptionManager.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactExceptionManager.cpp
@@ -16,20 +16,20 @@
 namespace facebook::react {
 
 namespace {
-class ParsedError : public facebook::jni::JavaClass<ParsedError> {
+class ProcessedError : public facebook::jni::JavaClass<ProcessedError> {
  public:
   static auto constexpr kJavaDescriptor =
-      "Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ParsedError;";
+      "Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ProcessedError;";
 };
 
-class ParsedStackFrameImpl
-    : public facebook::jni::JavaClass<ParsedStackFrameImpl> {
+class ProcessedErrorStackFrameImpl
+    : public facebook::jni::JavaClass<ProcessedErrorStackFrameImpl> {
  public:
   static auto constexpr kJavaDescriptor =
-      "Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ParsedStackFrameImpl;";
+      "Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ProcessedErrorStackFrameImpl;";
 
-  static facebook::jni::local_ref<ParsedStackFrameImpl> create(
-      const JsErrorHandler::ParsedError::StackFrame& frame) {
+  static facebook::jni::local_ref<ProcessedErrorStackFrameImpl> create(
+      const JsErrorHandler::ProcessedError::StackFrame& frame) {
     return newInstance(
         frame.file ? jni::make_jstring(*frame.file) : nullptr,
         frame.methodName,
@@ -38,18 +38,19 @@ class ParsedStackFrameImpl
   }
 };
 
-class ParsedErrorImpl
-    : public facebook::jni::JavaClass<ParsedErrorImpl, ParsedError> {
+class ProcessedErrorImpl
+    : public facebook::jni::JavaClass<ProcessedErrorImpl, ProcessedError> {
  public:
   static auto constexpr kJavaDescriptor =
-      "Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ParsedErrorImpl;";
+      "Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ProcessedErrorImpl;";
 
-  static facebook::jni::local_ref<ParsedErrorImpl> create(
+  static facebook::jni::local_ref<ProcessedErrorImpl> create(
       jsi::Runtime& runtime,
-      const JsErrorHandler::ParsedError& error) {
-    auto stack = facebook::jni::JArrayList<ParsedStackFrameImpl>::create();
+      const JsErrorHandler::ProcessedError& error) {
+    auto stack =
+        facebook::jni::JArrayList<ProcessedErrorStackFrameImpl>::create();
     for (const auto& frame : error.stack) {
-      stack->add(ParsedStackFrameImpl::create(frame));
+      stack->add(ProcessedErrorStackFrameImpl::create(frame));
     }
 
     auto extraDataDynamic =
@@ -75,12 +76,12 @@ class ParsedErrorImpl
 
 void JReactExceptionManager::reportJsException(
     jsi::Runtime& runtime,
-    const JsErrorHandler::ParsedError& error) {
+    const JsErrorHandler::ProcessedError& error) {
   static const auto method =
-      javaClassStatic()->getMethod<void(jni::alias_ref<ParsedError>)>(
+      javaClassStatic()->getMethod<void(jni::alias_ref<ProcessedError>)>(
           "reportJsException");
   if (self() != nullptr) {
-    method(self(), ParsedErrorImpl::create(runtime, error));
+    method(self(), ProcessedErrorImpl::create(runtime, error));
   }
 }
 

diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactExceptionManager.h b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactExceptionManager.h
@@ -21,7 +21,7 @@ class JReactExceptionManager
 
   void reportJsException(
       jsi::Runtime& runtime,
-      const JsErrorHandler::ParsedError& error);
+      const JsErrorHandler::ProcessedError& error);
 };
 
 } // namespace facebook::react
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.cpp
@@ -53,7 +53,7 @@ JReactInstance::JReactInstance(
   auto onJsError =
       [weakJReactExceptionManager = jni::make_weak(jReactExceptionManager)](
           jsi::Runtime& runtime,
-          const JsErrorHandler::ParsedError& error) mutable noexcept {
+          const JsErrorHandler::ProcessedError& error) mutable noexcept {
         if (auto jReactExceptionManager =
                 weakJReactExceptionManager.lockLocal()) {
           jReactExceptionManager->reportJsException(runtime, error);

diff --git a/...t-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.kt b/...t-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.kt
@@ -65,10 +65,10 @@ class StackTraceHelperTest {
   }
 
   @Test
-  fun testConvertParsedError() {
-    val error = getParsedErrorTestData()
+  fun testConvertProcessedError() {
+    val error = getProcessedErrorTestData()
 
-    val data = StackTraceHelper.convertParsedError(error)
+    val data = StackTraceHelper.convertProcessedError(error)
     assertThat(data.getString("message")).isEqualTo("error message")
     assertThat(data.getInt("id")).isEqualTo(123)
     assertThat(data.getBoolean("isFatal")).isEqualTo(true)
@@ -96,17 +96,17 @@ class StackTraceHelperTest {
     assertThat(map.getDouble("column").toInt()).isEqualTo(columnNumber)
   }
 
-  private fun getParsedErrorTestData(): ParsedError {
+  private fun getProcessedErrorTestData(): ProcessedError {
     val frame1 =
-        object : ParsedError.StackFrame {
+        object : ProcessedError.StackFrame {
           override val file = "file1"
           override val methodName = "method1"
           override val lineNumber = 1
           override val column = 10
         }
 
     val frame2 =
-        object : ParsedError.StackFrame {
+        object : ProcessedError.StackFrame {
           override val file = "file2"
           override val methodName = "method2"
           override val lineNumber = 2
@@ -115,7 +115,7 @@ class StackTraceHelperTest {
 
     val frames = listOf(frame1, frame2)
 
-    return object : ParsedError {
+    return object : ProcessedError {
       override val message = "error message"
       override val originalMessage = null
       override val name = null

diff --git a/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp b/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp
@@ -124,10 +124,10 @@ jsi::Value getBundleMetadata(jsi::Runtime& runtime, jsi::JSError& error) {
 namespace facebook::react {
 
 template <>
-struct Bridging<JsErrorHandler::ParsedError::StackFrame> {
+struct Bridging<JsErrorHandler::ProcessedError::StackFrame> {
   static jsi::Value toJs(
       jsi::Runtime& runtime,
-      const JsErrorHandler::ParsedError::StackFrame& frame) {
+      const JsErrorHandler::ProcessedError::StackFrame& frame) {
     auto stackFrame = jsi::Object(runtime);
     auto file = bridging::toJs(runtime, frame.file, nullptr);
     auto lineNumber = bridging::toJs(runtime, frame.lineNumber, nullptr);
@@ -142,10 +142,10 @@ struct Bridging<JsErrorHandler::ParsedError::StackFrame> {
 };
 
 template <>
-struct Bridging<JsErrorHandler::ParsedError> {
+struct Bridging<JsErrorHandler::ProcessedError> {
   static jsi::Value toJs(
       jsi::Runtime& runtime,
-      const JsErrorHandler::ParsedError& error) {
+      const JsErrorHandler::ProcessedError& error) {
     auto data = jsi::Object(runtime);
     data.setProperty(runtime, "message", error.message);
     data.setProperty(
@@ -175,7 +175,7 @@ struct Bridging<JsErrorHandler::ParsedError> {
 
 std::ostream& operator<<(
     std::ostream& os,
-    const JsErrorHandler::ParsedError::StackFrame& frame) {
+    const JsErrorHandler::ProcessedError::StackFrame& frame) {
   auto file = frame.file ? quote(*frame.file) : "nil";
   auto methodName = quote(frame.methodName);
   auto lineNumber =
@@ -188,7 +188,7 @@ std::ostream& operator<<(
 }
 std::ostream& operator<<(
     std::ostream& os,
-    const JsErrorHandler::ParsedError& error) {
+    const JsErrorHandler::ProcessedError& error) {
   auto message = quote(error.message);
   auto originalMessage =
       error.originalMessage ? quote(*error.originalMessage) : "nil";
@@ -199,7 +199,7 @@ std::ostream& operator<<(
   auto isFatal = std::to_string(static_cast<int>(error.isFatal));
   auto extraData = "jsi::Object{ <omitted> } ";
 
-  os << "ParsedError {\n"
+  os << "ProcessedError {\n"
      << "  .message = " << message << "\n"
      << "  .originalMessage = " << originalMessage << "\n"
      << "  .name = " << name << "\n"
@@ -329,7 +329,7 @@ void JsErrorHandler::handleErrorWithCppPipeline(
 
   auto id = nextExceptionId();
 
-  ParsedError parsedError = {
+  ProcessedError processedError = {
       .message =
           _isRuntimeReady ? message : ("[runtime not ready]: " + message),
       .originalMessage = originalMessage,
@@ -341,7 +341,7 @@ void JsErrorHandler::handleErrorWithCppPipeline(
       .extraData = std::move(extraData),
   };
 
-  auto data = bridging::toJs(runtime, parsedError).asObject(runtime);
+  auto data = bridging::toJs(runtime, processedError).asObject(runtime);
 
   auto isComponentError =
       isTruthy(runtime, errorObj.getProperty(runtime, "isComponentError"));
@@ -351,7 +351,7 @@ void JsErrorHandler::handleErrorWithCppPipeline(
     auto console = runtime.global().getPropertyAsObject(runtime, "console");
     auto errorFn = console.getPropertyAsFunction(runtime, "error");
     auto finalMessage =
-        jsi::String::createFromUtf8(runtime, parsedError.message);
+        jsi::String::createFromUtf8(runtime, processedError.message);
     errorFn.callWithThis(runtime, console, finalMessage);
   }
 
@@ -397,7 +397,7 @@ void JsErrorHandler::handleErrorWithCppPipeline(
       _hasHandledFatalError = true;
     }
 
-    _onJsError(runtime, parsedError);
+    _onJsError(runtime, processedError);
   }
 }
 

diff --git a/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.h b/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.h
@@ -15,7 +15,7 @@ namespace facebook::react {
 
 class JsErrorHandler {
  public:
-  struct ParsedError {
+  struct ProcessedError {
     struct StackFrame {
       std::optional<std::string> file;
       std::string methodName;
@@ -34,11 +34,13 @@ class JsErrorHandler {
     int id;
     bool isFatal;
     jsi::Object extraData;
-    friend std::ostream& operator<<(std::ostream& os, const ParsedError& error);
+    friend std::ostream& operator<<(
+        std::ostream& os,
+        const ProcessedError& error);
   };
 
   using OnJsError =
-      std::function<void(jsi::Runtime& runtime, const ParsedError& error)>;
+      std::function<void(jsi::Runtime& runtime, const ProcessedError& error)>;
 
   explicit JsErrorHandler(OnJsError onJsError);
   ~JsErrorHandler();