chore: migrate to JSBigString from BigStringBuffer

Author: tjzel

packages/react-native/React/Base/RCTBundleProvider.h

@@ -6,7 +6,10 @@
  */
 
 #import <Foundation/Foundation.h>
+
+#ifdef __cplusplus
 #import <jsireact/JSIExecutor.h>
+#endif // __cplusplus
 
 @class NSBundleWrapper;
 
@@ -15,7 +18,11 @@
  */
 @interface RCTBundleProvider : NSObject
 
-- (std::shared_ptr<const facebook::react::BigStringBuffer>)getBundle;
+#ifdef __cplusplus
+
+- (std::shared_ptr<const facebook::react::JSBigString>)getBundle;
 - (NSString *)getSourceURL;
 
+#endif // __cplusplus
+
 @end

packages/react-native/React/Base/RCTBundleProvider.mm

@@ -10,16 +10,16 @@
 using namespace facebook::react;
 
 @implementation RCTBundleProvider{
-  std::shared_ptr<const BigStringBuffer> _bundleBuffer;
+  std::shared_ptr<const JSBigString> _bundle;
   NSString *_sourceURL;
 }
 
-- (std::shared_ptr<const BigStringBuffer>)getBundle {
-  return _bundleBuffer;
+- (std::shared_ptr<const JSBigString>)getBundle {
+  return _bundle;
 }
 
-- (void)setBundle:(std::shared_ptr<const BigStringBuffer>)bundle {
-  _bundleBuffer = bundle;
+- (void)setBundle:(std::shared_ptr<const JSBigString>)bundle {
+  _bundle = bundle;
 }
 
 - (NSString *)getSourceURL {

packages/react-native/ReactAndroid/src/main/jni/react/fabric/BundleWrapper.cpp

@@ -18,8 +18,7 @@ jni::local_ref<BundleWrapper::jhybriddata> BundleWrapper::initHybridFromFile(
   std::unique_ptr<const JSBigFileString> script;
   RecoverableError::runRethrowingAsRecoverable<std::system_error>(
       [&fileName, &script]() { script = JSBigFileString::fromPath(fileName); });
-  auto bundle = std::make_shared<BigStringBuffer>(std::move(script));
-  return makeCxxInstance(bundle);
+  return makeCxxInstance(std::move(script));
 }
 
 jni::local_ref<BundleWrapper::jhybriddata> BundleWrapper::initHybridFromAssets(
@@ -28,15 +27,14 @@ jni::local_ref<BundleWrapper::jhybriddata> BundleWrapper::initHybridFromAssets(
     const std::string& sourceURL) {
   auto manager = extractAssetManager(assetManager);
   auto script = loadScriptFromAssets(manager, sourceURL);
-  auto bundle = std::make_shared<BigStringBuffer>(std::move(script));
-  return makeCxxInstance(bundle);
+  return makeCxxInstance(std::move(script));
 }
 
 BundleWrapper::BundleWrapper(
-    const std::shared_ptr<const BigStringBuffer>& bundle)
+    const std::shared_ptr<const JSBigString>& bundle)
     : bundle_(bundle) {}
 
-const std::shared_ptr<const BigStringBuffer> BundleWrapper::getBundle() const {
+std::shared_ptr<const JSBigString> BundleWrapper::getBundle() const {
   return bundle_;
 }
 

packages/react-native/ReactAndroid/src/main/jni/react/fabric/BundleWrapper.h

@@ -23,7 +23,7 @@ class BundleWrapper : public jni::HybridClass<BundleWrapper> {
 
   static void registerNatives();
 
-  [[nodiscard]] const std::shared_ptr<const BigStringBuffer> getBundle() const;
+  [[nodiscard]] std::shared_ptr<const JSBigString> getBundle() const;
 
  private:
   static jni::local_ref<BundleWrapper::jhybriddata> initHybridFromFile(
@@ -37,9 +37,9 @@ class BundleWrapper : public jni::HybridClass<BundleWrapper> {
 
   friend HybridBase;
 
-  explicit BundleWrapper(const std::shared_ptr<const BigStringBuffer>& bundle);
+  explicit BundleWrapper(const std::shared_ptr<const JSBigString>& bundle);
 
-  const std::shared_ptr<const BigStringBuffer> bundle_;
+  const std::shared_ptr<const JSBigString> bundle_;
 };
 
 } // namespace facebook::react

packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp

@@ -228,7 +228,7 @@ std::string simpleBasename(const std::string& path) {
  * JSThread, preferably via the runtimeExecutor_.
  */
 void ReactInstance::loadScript(
-    const std::shared_ptr<const BigStringBuffer>& script,
+    const std::shared_ptr<const JSBigString>& script,
     const std::string& sourceURL,
     std::function<void(jsi::Runtime& runtime)>&& beforeLoad,
     std::function<void(jsi::Runtime& runtime)>&& afterLoad) {

packages/react-native/ReactCommon/react/runtime/ReactInstance.h

@@ -50,7 +50,7 @@ class ReactInstance final : private jsinspector_modern::InstanceTargetDelegate {
   void initializeRuntime(JSRuntimeFlags options, BindingsInstallFunc bindingsInstallFunc) noexcept;
 
   void loadScript(
-      const std::shared_ptr<const BigStringBuffer>& script,
+      const std::shared_ptr<const JSBigString>& script,
       const std::string& sourceURL,
       std::function<void(jsi::Runtime& runtime)>&& beforeLoad = nullptr,
       std::function<void(jsi::Runtime& runtime)>&& afterLoad = nullptr);

packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.h

@@ -79,6 +79,7 @@ RCT_EXTERN void RCTInstanceSetRuntimeDiagnosticFlags(NSString *_Nullable flags);
 - (instancetype)initWithDelegate:(id<RCTInstanceDelegate>)delegate
                 jsRuntimeFactory:(std::shared_ptr<facebook::react::JSRuntimeFactory>)jsRuntimeFactory
                    bundleManager:(RCTBundleManager *)bundleManager
+                  bundleProvider:(RCTBundleProvider *)bundleProvider
       turboModuleManagerDelegate:(id<RCTTurboModuleManagerDelegate>)turboModuleManagerDelegate
                   moduleRegistry:(RCTModuleRegistry *)moduleRegistry
            parentInspectorTarget:(facebook::react::jsinspector_modern::HostTarget *)parentInspectorTarget

packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm

@@ -73,7 +73,7 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
 }
 
 @interface RCTBundleProvider : NSObject
-- (void)setBundle:(std::shared_ptr<const BigStringBuffer>)bundleBuffer;
+- (void)setBundle:(std::shared_ptr<const JSBigString>)bundleBuffer;
 - (void)setSourceURL:(NSString *)sourceURL;
 @end
 
@@ -146,6 +146,7 @@ - (instancetype)initWithDelegate:(id<RCTInstanceDelegate>)delegate
   return [self initWithDelegate:delegate
                 jsRuntimeFactory:jsRuntimeFactory
                    bundleManager:bundleManager
+                  bundleProvider:bundleProvider
       turboModuleManagerDelegate:tmmDelegate
                   moduleRegistry:moduleRegistry
            parentInspectorTarget:parentInspectorTarget
@@ -156,6 +157,7 @@ - (instancetype)initWithDelegate:(id<RCTInstanceDelegate>)delegate
 - (instancetype)initWithDelegate:(id<RCTInstanceDelegate>)delegate
                 jsRuntimeFactory:(std::shared_ptr<facebook::react::JSRuntimeFactory>)jsRuntimeFactory
                    bundleManager:(RCTBundleManager *)bundleManager
+                  bundleProvider:(RCTBundleProvider *)bundleProvider
       turboModuleManagerDelegate:(id<RCTTurboModuleManagerDelegate>)tmmDelegate
                   moduleRegistry:(RCTModuleRegistry *)moduleRegistry
            parentInspectorTarget:(jsinspector_modern::HostTarget *)parentInspectorTarget
@@ -610,11 +612,10 @@ - (void)_loadScriptFromSource:(RCTSource *)source
     return;
   }
 
-  auto script = std::make_unique<NSDataBigString>(source.data);
-  const auto scriptBuffer = std::make_shared<const BigStringBuffer>(std::move(script));
+  auto script = std::make_shared<NSDataBigString>(source.data);
   const auto *url = deriveSourceURL(source.url).UTF8String;
 
-  [_bundleProvider setBundle:scriptBuffer];
+  [_bundleProvider setBundle:script];
   [_bundleProvider setSourceURL:@(url)];
 
   auto beforeLoad = [waitUntilModuleSetupComplete = self->_waitUntilModuleSetupComplete](jsi::Runtime &_) {
@@ -625,7 +626,7 @@ - (void)_loadScriptFromSource:(RCTSource *)source
   auto afterLoad = [](jsi::Runtime &_) {
     [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTInstanceDidLoadBundle" object:nil];
   };
-  _reactInstance->loadScript(scriptBuffer, url, beforeLoad, afterLoad);
+  _reactInstance->loadScript(script, url, beforeLoad, afterLoad);
 }
 
 - (void)_handleJSError:(const JsErrorHandler::ProcessedError &)error withRuntime:(jsi::Runtime &)runtime