Skip to content

Commit fa457df

Browse files
coadofacebook-github-bot
coado
authored and
facebook-github-bot
committed
Make TurboModule host integration headers for-frameworks
Summary: Move the following `react/nativemodule/core` headers from the public tier to the for-frameworks tier: - `TurboModuleBinding.h` - not called by native module authors, - `JavaInteropTurboModule.h` (Android) and `RCTInteropTurboModule.h` (iOS) - legacy The C++ API snapshots are regenerated: these symbols are removed from the Debug, Release and Newarch snapshots and stay in the Frameworks snapshots. Changelog: [Internal] Differential Revision: D124104733
1 parent 64c50ca commit fa457df

14 files changed

Lines changed: 7 additions & 150 deletions

File tree

‎packages/react-native/ReactCommon/react/nativemodule/core/React/NativeModuleCore.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,11 @@
3333

3434
#include <ReactCommon/CxxTurboModuleUtils.h>
3535
#include <ReactCommon/TurboModule.h>
36-
#include <ReactCommon/TurboModuleBinding.h>
3736
#include <ReactCommon/TurboModulePerfLogger.h>
3837
#include <ReactCommon/TurboModuleUtils.h>
3938
#include <ReactCommon/TurboModuleWithJSIBindings.h>
4039

4140
#ifdef ANDROID
42-
#include <ReactCommon/JavaInteropTurboModule.h>
4341
#include <ReactCommon/JavaTurboModule.h>
4442
#endif
4543

‎packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77

88
#pragma once
99

10-
#include <react/cxxstableapi/UmbrellaGuard.h>
10+
#include <react/cxxstableapi/FrameworksGuard.h>
1111

1212
#include <string>
1313

1414
#include <React/Bridging.h>
15+
#include <React/NativeModuleCore.h>
1516
#include <jsi/jsi.h>
1617

17-
#include <ReactCommon/TurboModule.h>
18-
1918
namespace facebook::react {
2019

2120
class BridgelessNativeModuleProxy;

‎packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaInteropTurboModule.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,17 @@
77

88
#pragma once
99

10-
#include <react/cxxstableapi/UmbrellaGuard.h>
10+
#include <react/cxxstableapi/FrameworksGuard.h>
1111

1212
#ifndef RCT_REMOVE_LEGACY_MODULE_INTEROP
1313

1414
#include <string>
1515
#include <vector>
1616

17-
#include <ReactCommon/TurboModule.h>
17+
#include <React/NativeModuleCore.h>
1818
#include <fbjni/fbjni.h>
1919
#include <jsi/jsi.h>
2020

21-
#include "JavaTurboModule.h"
22-
2321
namespace facebook::react {
2422

2523
class JSI_EXPORT JavaInteropTurboModule : public JavaTurboModule {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
#pragma once
99

10+
#include <react/cxxstableapi/FrameworksGuard.h>
11+
1012
#ifndef RCT_REMOVE_LEGACY_MODULE_INTEROP
1113

1214
#import <string>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#import <React/RCTUtils.h>
2929
#import <ReactCommon/CxxTurboModuleUtils.h>
3030
#import <ReactCommon/RCTTurboModuleWithJSIBindings.h>
31+
#import <ReactCommon/TurboModuleBinding.h>
3132
#import <ReactCommon/TurboModulePerfLogger.h>
3233

3334
using namespace facebook;

‎scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1687,19 +1687,6 @@ class facebook::react::JWritableMapBuffer : public facebook::jni::JavaClass<face
16871687
public static constexpr auto kJavaDescriptor;
16881688
}
16891689

1690-
class facebook::react::JavaInteropTurboModule : public facebook::react::JavaTurboModule {
1691-
protected virtual facebook::jsi::Value create(facebook::jsi::Runtime& runtime, const facebook::jsi::PropNameID& propName) override;
1692-
public JavaInteropTurboModule(const facebook::react::JavaTurboModule::InitParams& params, const std::vector<facebook::react::JavaInteropTurboModule::MethodDescriptor>& methodDescriptors);
1693-
public virtual std::vector<facebook::jsi::PropNameID> getPropertyNames(facebook::jsi::Runtime& runtime) override;
1694-
}
1695-
1696-
struct facebook::react::JavaInteropTurboModule::MethodDescriptor {
1697-
public facebook::react::TurboModuleMethodValueKind jsiReturnKind;
1698-
public int jsArgCount;
1699-
public std::string jniSignature;
1700-
public std::string methodName;
1701-
}
1702-
17031690
class facebook::react::JavaMessageQueueThread : public facebook::jni::JavaClass<facebook::react::JavaMessageQueueThread> {
17041691
public static constexpr auto kJavaDescriptor;
17051692
}
@@ -2488,12 +2475,6 @@ struct facebook::react::TurboModule::MethodMetadata {
24882475
public size_t argCount;
24892476
}
24902477

2491-
class facebook::react::TurboModuleBinding {
2492-
public static void install(facebook::jsi::Runtime& runtime, TurboModuleProviderFunctionType&& moduleProvider, TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr, std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
2493-
public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
2494-
public ~TurboModuleBinding();
2495-
}
2496-
24972478
class facebook::react::TurboModuleManager : public jni::HybridClass<facebook::react::TurboModuleManager> {
24982479
public static constexpr auto kJavaDescriptor;
24992480
public static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>, jni::alias_ref<CallInvokerHolder::javaobject> jsCallInvokerHolder, jni::alias_ref<NativeMethodCallInvokerHolder::javaobject> nativeMethodCallInvokerHolder, jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate);

‎scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,19 +1686,6 @@ class facebook::react::JWritableMapBuffer : public facebook::jni::JavaClass<face
16861686
public static constexpr auto kJavaDescriptor;
16871687
}
16881688

1689-
class facebook::react::JavaInteropTurboModule : public facebook::react::JavaTurboModule {
1690-
protected virtual facebook::jsi::Value create(facebook::jsi::Runtime& runtime, const facebook::jsi::PropNameID& propName) override;
1691-
public JavaInteropTurboModule(const facebook::react::JavaTurboModule::InitParams& params, const std::vector<facebook::react::JavaInteropTurboModule::MethodDescriptor>& methodDescriptors);
1692-
public virtual std::vector<facebook::jsi::PropNameID> getPropertyNames(facebook::jsi::Runtime& runtime) override;
1693-
}
1694-
1695-
struct facebook::react::JavaInteropTurboModule::MethodDescriptor {
1696-
public facebook::react::TurboModuleMethodValueKind jsiReturnKind;
1697-
public int jsArgCount;
1698-
public std::string jniSignature;
1699-
public std::string methodName;
1700-
}
1701-
17021689
class facebook::react::JavaMessageQueueThread : public facebook::jni::JavaClass<facebook::react::JavaMessageQueueThread> {
17031690
public static constexpr auto kJavaDescriptor;
17041691
}
@@ -2481,12 +2468,6 @@ struct facebook::react::TurboModule::MethodMetadata {
24812468
public size_t argCount;
24822469
}
24832470

2484-
class facebook::react::TurboModuleBinding {
2485-
public static void install(facebook::jsi::Runtime& runtime, TurboModuleProviderFunctionType&& moduleProvider, TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr, std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
2486-
public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
2487-
public ~TurboModuleBinding();
2488-
}
2489-
24902471
class facebook::react::TurboModuleManager : public jni::HybridClass<facebook::react::TurboModuleManager> {
24912472
public static constexpr auto kJavaDescriptor;
24922473
public static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>, jni::alias_ref<CallInvokerHolder::javaobject> jsCallInvokerHolder, jni::alias_ref<NativeMethodCallInvokerHolder::javaobject> nativeMethodCallInvokerHolder, jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate);

‎scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,19 +1686,6 @@ class facebook::react::JWritableMapBuffer : public facebook::jni::JavaClass<face
16861686
public static constexpr auto kJavaDescriptor;
16871687
}
16881688

1689-
class facebook::react::JavaInteropTurboModule : public facebook::react::JavaTurboModule {
1690-
protected virtual facebook::jsi::Value create(facebook::jsi::Runtime& runtime, const facebook::jsi::PropNameID& propName) override;
1691-
public JavaInteropTurboModule(const facebook::react::JavaTurboModule::InitParams& params, const std::vector<facebook::react::JavaInteropTurboModule::MethodDescriptor>& methodDescriptors);
1692-
public virtual std::vector<facebook::jsi::PropNameID> getPropertyNames(facebook::jsi::Runtime& runtime) override;
1693-
}
1694-
1695-
struct facebook::react::JavaInteropTurboModule::MethodDescriptor {
1696-
public facebook::react::TurboModuleMethodValueKind jsiReturnKind;
1697-
public int jsArgCount;
1698-
public std::string jniSignature;
1699-
public std::string methodName;
1700-
}
1701-
17021689
class facebook::react::JavaMessageQueueThread : public facebook::jni::JavaClass<facebook::react::JavaMessageQueueThread> {
17031690
public static constexpr auto kJavaDescriptor;
17041691
}
@@ -2481,12 +2468,6 @@ struct facebook::react::TurboModule::MethodMetadata {
24812468
public size_t argCount;
24822469
}
24832470

2484-
class facebook::react::TurboModuleBinding {
2485-
public static void install(facebook::jsi::Runtime& runtime, TurboModuleProviderFunctionType&& moduleProvider, TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr, std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
2486-
public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
2487-
public ~TurboModuleBinding();
2488-
}
2489-
24902471
class facebook::react::TurboModuleManager : public jni::HybridClass<facebook::react::TurboModuleManager> {
24912472
public static constexpr auto kJavaDescriptor;
24922473
public static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>, jni::alias_ref<CallInvokerHolder::javaobject> jsCallInvokerHolder, jni::alias_ref<NativeMethodCallInvokerHolder::javaobject> nativeMethodCallInvokerHolder, jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate);

‎scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4379,22 +4379,6 @@ class facebook::react::NativeWebSocketModuleSpecJSI : public facebook::react::Ob
43794379
public NativeWebSocketModuleSpecJSI(const facebook::react::ObjCTurboModule::InitParams& params);
43804380
}
43814381

4382-
class facebook::react::ObjCInteropTurboModule : public facebook::react::ObjCTurboModule {
4383-
protected virtual NSString* getArgumentTypeName(facebook::jsi::Runtime& runtime, NSString* methodName, int argIndex) override;
4384-
protected virtual facebook::jsi::Value convertReturnIdToJSIValue(facebook::jsi::Runtime& runtime, const char* methodName, facebook::react::TurboModuleMethodValueKind returnType, id result) override;
4385-
protected virtual facebook::jsi::Value create(facebook::jsi::Runtime& runtime, const facebook::jsi::PropNameID& propName) override;
4386-
protected virtual void setInvocationArg(facebook::jsi::Runtime& runtime, const char* methodName, const std::string& objCArgType, const facebook::jsi::Value& arg, size_t i, NSInvocation* inv, NSMutableArray* retainedObjectsForInvocation, bool mustCopyBytes) override;
4387-
public ObjCInteropTurboModule(const facebook::react::ObjCTurboModule::InitParams& params);
4388-
public virtual std::vector<facebook::jsi::PropNameID> getPropertyNames(facebook::jsi::Runtime& runtime) override;
4389-
}
4390-
4391-
struct facebook::react::ObjCInteropTurboModule::MethodDescriptor {
4392-
public SEL selector;
4393-
public facebook::react::TurboModuleMethodValueKind jsReturnKind;
4394-
public size_t jsArgCount;
4395-
public std::string methodName;
4396-
}
4397-
43984382
class facebook::react::ObjCTurboModule : public facebook::react::TurboModule {
43994383
protected virtual NSString* getArgumentTypeName(facebook::jsi::Runtime& runtime, NSString* methodName, int argIndex);
44004384
protected virtual facebook::jsi::Value convertReturnIdToJSIValue(facebook::jsi::Runtime& runtime, const char* methodName, facebook::react::TurboModuleMethodValueKind returnType, id result);
@@ -4738,12 +4722,6 @@ struct facebook::react::TurboModule::MethodMetadata {
47384722
public size_t argCount;
47394723
}
47404724

4741-
class facebook::react::TurboModuleBinding {
4742-
public static void install(facebook::jsi::Runtime& runtime, TurboModuleProviderFunctionType&& moduleProvider, TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr, std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
4743-
public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
4744-
public ~TurboModuleBinding();
4745-
}
4746-
47474725
class facebook::react::TurboModuleWithJSIBindings {
47484726
public static void installJSIBindings(const std::shared_ptr<facebook::react::TurboModule>& cxxModule, facebook::jsi::Runtime& runtime);
47494727
public virtual ~TurboModuleWithJSIBindings() = default;

‎scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4370,22 +4370,6 @@ class facebook::react::NativeWebSocketModuleSpecJSI : public facebook::react::Ob
43704370
public NativeWebSocketModuleSpecJSI(const facebook::react::ObjCTurboModule::InitParams& params);
43714371
}
43724372

4373-
class facebook::react::ObjCInteropTurboModule : public facebook::react::ObjCTurboModule {
4374-
protected virtual NSString* getArgumentTypeName(facebook::jsi::Runtime& runtime, NSString* methodName, int argIndex) override;
4375-
protected virtual facebook::jsi::Value convertReturnIdToJSIValue(facebook::jsi::Runtime& runtime, const char* methodName, facebook::react::TurboModuleMethodValueKind returnType, id result) override;
4376-
protected virtual facebook::jsi::Value create(facebook::jsi::Runtime& runtime, const facebook::jsi::PropNameID& propName) override;
4377-
protected virtual void setInvocationArg(facebook::jsi::Runtime& runtime, const char* methodName, const std::string& objCArgType, const facebook::jsi::Value& arg, size_t i, NSInvocation* inv, NSMutableArray* retainedObjectsForInvocation, bool mustCopyBytes) override;
4378-
public ObjCInteropTurboModule(const facebook::react::ObjCTurboModule::InitParams& params);
4379-
public virtual std::vector<facebook::jsi::PropNameID> getPropertyNames(facebook::jsi::Runtime& runtime) override;
4380-
}
4381-
4382-
struct facebook::react::ObjCInteropTurboModule::MethodDescriptor {
4383-
public SEL selector;
4384-
public facebook::react::TurboModuleMethodValueKind jsReturnKind;
4385-
public size_t jsArgCount;
4386-
public std::string methodName;
4387-
}
4388-
43894373
class facebook::react::ObjCTurboModule : public facebook::react::TurboModule {
43904374
protected virtual NSString* getArgumentTypeName(facebook::jsi::Runtime& runtime, NSString* methodName, int argIndex);
43914375
protected virtual facebook::jsi::Value convertReturnIdToJSIValue(facebook::jsi::Runtime& runtime, const char* methodName, facebook::react::TurboModuleMethodValueKind returnType, id result);
@@ -4723,12 +4707,6 @@ struct facebook::react::TurboModule::MethodMetadata {
47234707
public size_t argCount;
47244708
}
47254709

4726-
class facebook::react::TurboModuleBinding {
4727-
public static void install(facebook::jsi::Runtime& runtime, TurboModuleProviderFunctionType&& moduleProvider, TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr, std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
4728-
public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
4729-
public ~TurboModuleBinding();
4730-
}
4731-
47324710
class facebook::react::TurboModuleWithJSIBindings {
47334711
public static void installJSIBindings(const std::shared_ptr<facebook::react::TurboModule>& cxxModule, facebook::jsi::Runtime& runtime);
47344712
public virtual ~TurboModuleWithJSIBindings() = default;

0 commit comments

Comments
 (0)