Move RCTExceptionsManager to CoreModules and make it conform to spec

Summary: `NativeExceptionsManager.js` contains the JS spec for this native module. This diff moves the objc code to CoreModules (since it's the only directory that supports TM at the moment) and makes it conform to the spec. NOTE: I will update podfiles after this diff is reviewed, before I land. Adding those generated changes makes it really hard to review. Reviewed By: RSNara Differential Revision: D16812212 fbshipit-source-id: 38b6e9a20ce15e7e9995df34493b37ed7adb2911
facebook · Aug 16, 2019 · 6991e28 · 6991e28
1 parent 111cb32
commit 6991e28
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 15 deletions.
diff --git a/React/CoreModules/BUCK b/React/CoreModules/BUCK
@@ -38,6 +38,10 @@ rn_apple_library(
         ["-D PIC_MODIFIER=@PLT"],
     )],
     plugins = react_module_plugin_providers(
+                name = "ExceptionsManager",
+                native_class_func = "RCTExceptionsManagerCls",
+              ) +
+              react_module_plugin_providers(
                   name = "ImageLoader",
                   native_class_func = "RCTImageLoaderCls",
               ) +

diff --git a/React/CoreModules/CoreModulesPlugins.h b/React/CoreModules/CoreModulesPlugins.h
@@ -29,6 +29,7 @@ extern "C" {
 Class RCTCoreModulesClassProvider(const char *name);
 
 // Lookup functions
+Class RCTExceptionsManagerCls(void);
 Class RCTImageLoaderCls(void);
 Class RCTPlatformCls(void);
 

diff --git a/React/CoreModules/CoreModulesPlugins.mm b/React/CoreModules/CoreModulesPlugins.mm
@@ -17,7 +17,8 @@
 #import <unordered_map>
 
 static std::unordered_map<std::string, Class (*)(void)> sCoreModuleClassMap = {
-  {"ImageLoader", RCTImageLoaderCls},
+  {"ExceptionsManager", RCTExceptionsManagerCls},
+{"ImageLoader", RCTImageLoaderCls},
 {"PlatformConstants", RCTPlatformCls},
 };
 

diff --git a/React/Modules/RCTExceptionsManager.h → React/CoreModules/RCTExceptionsManager.h b/React/Modules/RCTExceptionsManager.h → React/CoreModules/RCTExceptionsManager.h
@@ -25,8 +25,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)initWithDelegate:(id<RCTExceptionsManagerDelegate>)delegate;
 
-- (void)reportSoftException:(nullable NSString *)message stack:(nullable NSArray<NSDictionary *> *)stack exceptionId:(NSNumber *)exceptionId;
-- (void)reportFatalException:(nullable NSString *)message stack:(nullable NSArray<NSDictionary *> *)stack exceptionId:(NSNumber *)exceptionId;
+- (void)reportSoftException:(nullable NSString *)message stack:(nullable NSArray<NSDictionary *> *)stack exceptionId:(double)exceptionId;
+- (void)reportFatalException:(nullable NSString *)message stack:(nullable NSArray<NSDictionary *> *)stack exceptionId:(double)exceptionId;
 
 @property (nonatomic, weak) id<RCTExceptionsManagerDelegate> delegate;
 

diff --git a/React/Modules/RCTExceptionsManager.m → React/CoreModules/RCTExceptionsManager.mm b/React/Modules/RCTExceptionsManager.m → React/CoreModules/RCTExceptionsManager.mm
@@ -7,11 +7,18 @@
 
 #import "RCTExceptionsManager.h"
 
-#import "RCTConvert.h"
-#import "RCTDefines.h"
-#import "RCTLog.h"
-#import "RCTRedBox.h"
-#import "RCTRootView.h"
+#import <FBReactNativeSpec/FBReactNativeSpec.h>
+#import <React/RCTConvert.h>
+#import <React/RCTDefines.h>
+#import <React/RCTLog.h>
+#import <React/RCTRedBox.h>
+#import <React/RCTRootView.h>
+
+#import "CoreModulesPlugins.h"
+
+@interface RCTExceptionsManager() <NativeExceptionsManagerSpec>
+
+@end
 
 @implementation RCTExceptionsManager
 
@@ -29,23 +36,23 @@ - (instancetype)initWithDelegate:(id<RCTExceptionsManagerDelegate>)delegate
 
 RCT_EXPORT_METHOD(reportSoftException:(NSString *)message
                   stack:(NSArray<NSDictionary *> *)stack
-                  exceptionId:(nonnull NSNumber *)exceptionId)
+                  exceptionId:(double)exceptionId)
 {
   [_bridge.redBox showErrorMessage:message withStack:stack];
 
   if (_delegate) {
-    [_delegate handleSoftJSExceptionWithMessage:message stack:stack exceptionId:exceptionId];
+    [_delegate handleSoftJSExceptionWithMessage:message stack:stack exceptionId:[NSNumber numberWithDouble:exceptionId]];
   }
 }
 
 RCT_EXPORT_METHOD(reportFatalException:(NSString *)message
                   stack:(NSArray<NSDictionary *> *)stack
-                  exceptionId:(nonnull NSNumber *)exceptionId)
+                  exceptionId:(double) exceptionId)
 {
   [_bridge.redBox showErrorMessage:message withStack:stack];
 
   if (_delegate) {
-    [_delegate handleFatalJSExceptionWithMessage:message stack:stack exceptionId:exceptionId];
+    [_delegate handleFatalJSExceptionWithMessage:message stack:stack exceptionId:[NSNumber numberWithDouble:exceptionId]];
   }
 
   static NSUInteger reloadRetries = 0;
@@ -61,20 +68,41 @@ - (instancetype)initWithDelegate:(id<RCTExceptionsManagerDelegate>)delegate
 
 RCT_EXPORT_METHOD(updateExceptionMessage:(NSString *)message
                   stack:(NSArray<NSDictionary *> *)stack
-                  exceptionId:(nonnull NSNumber *)exceptionId)
+                  exceptionId:(double)exceptionId)
 {
   [_bridge.redBox updateErrorMessage:message withStack:stack];
 
   if (_delegate && [_delegate respondsToSelector:@selector(updateJSExceptionWithMessage:stack:exceptionId:)]) {
-    [_delegate updateJSExceptionWithMessage:message stack:stack exceptionId:exceptionId];
+    [_delegate updateJSExceptionWithMessage:message stack:stack exceptionId:[NSNumber numberWithDouble:exceptionId]];
   }
 }
 
 // Deprecated.  Use reportFatalException directly instead.
 RCT_EXPORT_METHOD(reportUnhandledException:(NSString *)message
                   stack:(NSArray<NSDictionary *> *)stack)
 {
-  [self reportFatalException:message stack:stack exceptionId:@-1];
+  [self reportFatalException:message stack:stack exceptionId:-1];
+}
+
+RCT_EXPORT_METHOD(dismissRedbox)
+{
+
+}
+
+RCT_EXPORT_METHOD(reportException:(JS::NativeExceptionsManager::ExceptionData &)data)
+{
+
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModuleWithJsInvoker:
+(std::shared_ptr<facebook::react::JSCallInvoker>)jsInvoker
+{
+  return std::make_shared<facebook::react::NativeExceptionsManagerSpecJSI>(self, jsInvoker);
 }
 
 @end
+
+Class RCTExceptionsManagerCls(void)
+{
+  return RCTExceptionsManager.class;
+}