RCTTurboModule nits (facebook#54692)

Summary:
Pull Request resolved: facebook#54692

Lazily create error strings and use jsi::JSError for more user-friendly error messages

Changelog: [Internal]

Reviewed By: cipolleschi

Differential Revision: D87868701

fbshipit-source-id: a38be93511520329a3c703b1b27dbb456da30be2

Author: javache

packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTInteropTurboModule.mm

@@ -600,10 +600,6 @@ T RCTConvertTo(SEL selector, id json)
     TurboModuleMethodValueKind returnType,
     id result)
 {
-  std::string methodJsSignature = name_ + "." + methodNameCStr + "()";
-  std::string errorPrefix =
-      methodJsSignature + ": Error while converting return Objective C value to JavaScript type. ";
-
   if (returnType == VoidKind) {
     return jsi::Value::undefined();
   }
@@ -617,6 +613,7 @@ T RCTConvertTo(SEL selector, id json)
     return returnValue;
   }
 
+  std::string methodJsSignature = name_ + "." + methodNameCStr + "()";
   throw jsi::JSError(runtime, methodJsSignature + "Objective C type was unsupported.");
 }
 

packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.mm

@@ -199,7 +199,7 @@ id convertJSIValueToObjCObject(
     return convertJSIObjectToNSDictionary(runtime, o, jsInvoker, useNSNull);
   }
 
-  throw std::runtime_error("Unsupported jsi::Value kind");
+  throw jsi::JSError(runtime, "Unsupported jsi::Value kind");
 }
 
 static jsi::Value createJSRuntimeError(jsi::Runtime &runtime, const std::string &message)
@@ -268,24 +268,17 @@ id convertJSIValueToObjCObject(
           jsi::PropNameID::forAscii(runtime, "fn"),
           2,
           [invokeCopy, jsInvoker = jsInvoker_, moduleName = name_, methodName](
-              jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args, size_t count) {
-            // FIXME: do not allocate this upfront
-            std::string moduleMethod = moduleName + "." + methodName + "()";
-
+              jsi::Runtime &rt, const jsi::Value &, const jsi::Value *args, size_t count) {
             if (count != 2) {
-              throw std::invalid_argument(
-                  moduleMethod + ": Promise must pass constructor function two args. Passed " + std::to_string(count) +
-                  " args.");
-            }
-            if (!invokeCopy) {
-              return jsi::Value::undefined();
+              throw jsi::JSError(
+                  rt,
+                  moduleName + "." + methodName + "(): Promise must pass constructor function two args. Passed " +
+                      std::to_string(count) + " args.");
             }
 
             __block BOOL resolveWasCalled = NO;
-            __block std::optional<AsyncCallback<>> resolve(
-                {rt, args[0].getObject(rt).getFunction(rt), std::move(jsInvoker)});
-            __block std::optional<AsyncCallback<>> reject(
-                {rt, args[1].getObject(rt).getFunction(rt), std::move(jsInvoker)});
+            __block std::optional<AsyncCallback<>> resolve({rt, args[0].getObject(rt).getFunction(rt), jsInvoker});
+            __block std::optional<AsyncCallback<>> reject({rt, args[1].getObject(rt).getFunction(rt), jsInvoker});
             __block std::shared_ptr<std::mutex> mutex = std::make_shared<std::mutex>();
 
             RCTPromiseResolveBlock resolveBlock = ^(id result) {
@@ -306,12 +299,14 @@ id convertJSIValueToObjCObject(
               }
 
               if (alreadyResolved) {
-                RCTLogError(@"%s: Tried to resolve a promise more than once.", moduleMethod.c_str());
+                RCTLogError(
+                    @"%s.%s(): Tried to resolve a promise more than once.", moduleName.c_str(), methodName.c_str());
                 return;
-              }
-
-              if (alreadyRejected) {
-                RCTLogError(@"%s: Tried to resolve a promise after it's already been rejected.", moduleMethod.c_str());
+              } else if (alreadyRejected) {
+                RCTLogError(
+                    @"%s.%s(): Tried to resolve a promise after it's already been rejected.",
+                    moduleName.c_str(),
+                    methodName.c_str());
                 return;
               }
 
@@ -339,16 +334,16 @@ id convertJSIValueToObjCObject(
 
               if (alreadyResolved) {
                 RCTLogError(
-                    @"%s: Tried to reject a promise after it's already been resolved. Message: %s",
-                    moduleMethod.c_str(),
+                    @"%s.%s() Tried to reject a promise after it's already been resolved. Message: %s",
+                    moduleName.c_str(),
+                    methodName.c_str(),
                     message.UTF8String);
                 return;
-              }
-
-              if (alreadyRejected) {
+              } else if (alreadyRejected) {
                 RCTLogError(
-                    @"%s: Tried to reject a promise more than once. Message: %s",
-                    moduleMethod.c_str(),
+                    @"%s.%s() Tried to reject a promise more than once. Message: %s",
+                    moduleName.c_str(),
+                    methodName.c_str(),
                     message.UTF8String);
                 return;
               }
@@ -527,9 +522,9 @@ TraceSection s(
       break;
     }
     case FunctionKind:
-      throw std::runtime_error("convertReturnIdToJSIValue: FunctionKind is not supported yet.");
+      throw jsi::JSError(runtime, "convertReturnIdToJSIValue: FunctionKind is not supported yet.");
     case PromiseKind:
-      throw std::runtime_error("convertReturnIdToJSIValue: PromiseKind wasn't handled properly.");
+      throw jsi::JSError(runtime, "convertReturnIdToJSIValue: PromiseKind wasn't handled properly.");
   }
 
   return returnValue;
@@ -711,14 +706,13 @@ TraceSection s(
     NSMutableArray *retainedObjectsForInvocation)
 {
   const char *moduleName = name_.c_str();
-  const NSObject<RCTBridgeModule> *module = instance_;
-
   if (isSync) {
     TurboModulePerfLogger::syncMethodCallArgConversionStart(moduleName, methodName);
   } else {
     TurboModulePerfLogger::asyncMethodCallArgConversionStart(moduleName, methodName);
   }
 
+  const NSObject<RCTBridgeModule> *module = instance_;
   NSMethodSignature *methodSignature = [module methodSignatureForSelector:selector];
   if (count > methodSignature.numberOfArguments - 2) {
     throw jsi::JSError(
@@ -751,7 +745,7 @@ TraceSection s(
     return true;
   }
 
-  return !(returnType == VoidKind || returnType == PromiseKind);
+  return returnType != VoidKind && returnType != PromiseKind;
 }
 
 ObjCTurboModule::ObjCTurboModule(const InitParams &params)