react-native 0.69.1 → 0.70.0-rc.0

package/ReactCommon/jsi/React-jsi.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00-v2'
+folly_version = '2021.07.22.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|

package/ReactCommon/jsi/jsi/decorator.h

@@ -154,6 +154,9 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
   Runtime::PointerValue* cloneSymbol(const Runtime::PointerValue* pv) override {
     return plain_.cloneSymbol(pv);
   };
+  Runtime::PointerValue* cloneBigInt(const Runtime::PointerValue* pv) override {
+    return plain_.cloneBigInt(pv);
+  };
   Runtime::PointerValue* cloneString(const Runtime::PointerValue* pv) override {
     return plain_.cloneString(pv);
   };
@@ -315,6 +318,9 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
   bool strictEquals(const Symbol& a, const Symbol& b) const override {
     return plain_.strictEquals(a, b);
   };
+  bool strictEquals(const BigInt& a, const BigInt& b) const override {
+    return plain_.strictEquals(a, b);
+  };
   bool strictEquals(const String& a, const String& b) const override {
     return plain_.strictEquals(a, b);
   };

package/ReactCommon/jsi/jsi/jsi-inl.h

@@ -56,7 +56,12 @@ inline PropNameID&& toPropNameID(Runtime&, PropNameID&& name) {
   return std::move(name);
 }
 
-void throwJSError(Runtime&, const char* msg);
+/// Helper to throw while still compiling with exceptions turned off.
+template <typename E, typename... Args>
+[[noreturn]] inline void throwOrDie(Args&&... args) {
+  std::rethrow_exception(
+      std::make_exception_ptr(E{std::forward<Args>(args)...}));
+}
 
 } // namespace detail
 
@@ -184,7 +189,8 @@ inline std::shared_ptr<T> Object::getHostObject(Runtime& runtime) const {
 template <typename T>
 inline std::shared_ptr<T> Object::asHostObject(Runtime& runtime) const {
   if (!isHostObject<T>(runtime)) {
-    detail::throwJSError(runtime, "Object is not a HostObject of desired type");
+    detail::throwOrDie<JSINativeException>(
+        "Object is not a HostObject of desired type");
   }
   return std::static_pointer_cast<T>(runtime.getHostObject(*this));
 }

package/ReactCommon/jsi/jsi/jsi.cpp

@@ -32,6 +32,8 @@ std::string kindToString(const Value& v, Runtime* rt = nullptr) {
     return "a string";
   } else if (v.isSymbol()) {
     return "a symbol";
+  } else if (v.isBigInt()) {
+    return "a bigint";
   } else {
     assert(v.isObject() && "Expecting object.");
     return rt != nullptr && v.getObject(*rt).isFunction(*rt) ? "a function"
@@ -62,14 +64,6 @@ Value callGlobalFunction(Runtime& runtime, const char* name, const Value& arg) {
 
 } // namespace
 
-namespace detail {
-
-void throwJSError(Runtime& rt, const char* msg) {
-  throw JSError(rt, msg);
-}
-
-} // namespace detail
-
 Buffer::~Buffer() = default;
 
 PreparedJavaScript::~PreparedJavaScript() = default;
@@ -242,6 +236,8 @@ Value::Value(Runtime& runtime, const Value& other) : Value(other.kind_) {
     data_.number = other.data_.number;
   } else if (kind_ == SymbolKind) {
     new (&data_.pointer) Pointer(runtime.cloneSymbol(other.data_.pointer.ptr_));
+  } else if (kind_ == BigIntKind) {
+    new (&data_.pointer) Pointer(runtime.cloneBigInt(other.data_.pointer.ptr_));
   } else if (kind_ == StringKind) {
     new (&data_.pointer) Pointer(runtime.cloneString(other.data_.pointer.ptr_));
   } else if (kind_ >= ObjectKind) {
@@ -271,6 +267,10 @@ bool Value::strictEquals(Runtime& runtime, const Value& a, const Value& b) {
       return runtime.strictEquals(
           static_cast<const Symbol&>(a.data_.pointer),
           static_cast<const Symbol&>(b.data_.pointer));
+    case BigIntKind:
+      return runtime.strictEquals(
+          static_cast<const BigInt&>(a.data_.pointer),
+          static_cast<const BigInt&>(b.data_.pointer));
     case StringKind:
       return runtime.strictEquals(
           static_cast<const String&>(a.data_.pointer),
@@ -338,6 +338,24 @@ Symbol Value::asSymbol(Runtime& rt) && {
   return std::move(*this).getSymbol(rt);
 }
 
+BigInt Value::asBigInt(Runtime& rt) const& {
+  if (!isBigInt()) {
+    throw JSError(
+        rt, "Value is " + kindToString(*this, &rt) + ", expected a BigInt");
+  }
+
+  return getBigInt(rt);
+}
+
+BigInt Value::asBigInt(Runtime& rt) && {
+  if (!isBigInt()) {
+    throw JSError(
+        rt, "Value is " + kindToString(*this, &rt) + ", expected a BigInt");
+  }
+
+  return std::move(*this).getBigInt(rt);
+}
+
 String Value::asString(Runtime& rt) const& {
   if (!isString()) {
     throw JSError(

package/ReactCommon/jsi/jsi/jsi.h

@@ -68,6 +68,7 @@ class Runtime;
 class Pointer;
 class PropNameID;
 class Symbol;
+class BigInt;
 class String;
 class Object;
 class WeakObject;
@@ -240,6 +241,7 @@ class JSI_EXPORT Runtime {
   friend class Pointer;
   friend class PropNameID;
   friend class Symbol;
+  friend class BigInt;
   friend class String;
   friend class Object;
   friend class WeakObject;
@@ -263,6 +265,7 @@ class JSI_EXPORT Runtime {
   };
 
   virtual PointerValue* cloneSymbol(const Runtime::PointerValue* pv) = 0;
+  virtual PointerValue* cloneBigInt(const Runtime::PointerValue* pv) = 0;
   virtual PointerValue* cloneString(const Runtime::PointerValue* pv) = 0;
   virtual PointerValue* cloneObject(const Runtime::PointerValue* pv) = 0;
   virtual PointerValue* clonePropNameID(const Runtime::PointerValue* pv) = 0;
@@ -337,6 +340,7 @@ class JSI_EXPORT Runtime {
   virtual void popScope(ScopeState*);
 
   virtual bool strictEquals(const Symbol& a, const Symbol& b) const = 0;
+  virtual bool strictEquals(const BigInt& a, const BigInt& b) const = 0;
   virtual bool strictEquals(const String& a, const String& b) const = 0;
   virtual bool strictEquals(const Object& a, const Object& b) const = 0;
 
@@ -482,6 +486,18 @@ class JSI_EXPORT Symbol : public Pointer {
   friend class Value;
 };
 
+/// Represents a JS BigInt.  Movable, not copyable.
+class JSI_EXPORT BigInt : public Pointer {
+ public:
+  using Pointer::Pointer;
+
+  BigInt(BigInt&& other) = default;
+  BigInt& operator=(BigInt&& other) = default;
+
+  friend class Runtime;
+  friend class Value;
+};
+
 /// Represents a JS String.  Movable, not copyable.
 class JSI_EXPORT String : public Pointer {
  public:
@@ -973,6 +989,7 @@ class JSI_EXPORT Value {
   /* implicit */ Value(T&& other) : Value(kindOf(other)) {
     static_assert(
         std::is_base_of<Symbol, T>::value ||
+            std::is_base_of<BigInt, T>::value ||
             std::is_base_of<String, T>::value ||
             std::is_base_of<Object, T>::value,
         "Value cannot be implicitly move-constructed from this type");
@@ -995,6 +1012,11 @@ class JSI_EXPORT Value {
     new (&data_.pointer) Symbol(runtime.cloneSymbol(sym.ptr_));
   }
 
+  /// Copies a BigInt lvalue into a new JS value.
+  Value(Runtime& runtime, const BigInt& bigint) : Value(BigIntKind) {
+    new (&data_.pointer) BigInt(runtime.cloneBigInt(bigint.ptr_));
+  }
+
   /// Copies a String lvalue into a new JS value.
   Value(Runtime& runtime, const String& str) : Value(StringKind) {
     new (&data_.pointer) String(runtime.cloneString(str.ptr_));
@@ -1064,6 +1086,10 @@ class JSI_EXPORT Value {
     return kind_ == StringKind;
   }
 
+  bool isBigInt() const {
+    return kind_ == BigIntKind;
+  }
+
   bool isSymbol() const {
     return kind_ == SymbolKind;
   }
@@ -1112,6 +1138,26 @@ class JSI_EXPORT Value {
   Symbol asSymbol(Runtime& runtime) const&;
   Symbol asSymbol(Runtime& runtime) &&;
 
+  /// \return the BigInt value, or asserts if not a bigint.
+  BigInt getBigInt(Runtime& runtime) const& {
+    assert(isBigInt());
+    return BigInt(runtime.cloneBigInt(data_.pointer.ptr_));
+  }
+
+  /// \return the BigInt value, or asserts if not a bigint.
+  /// Can be used on rvalue references to avoid cloning more bigints.
+  BigInt getBigInt(Runtime&) && {
+    assert(isBigInt());
+    auto ptr = data_.pointer.ptr_;
+    data_.pointer.ptr_ = nullptr;
+    return static_cast<BigInt>(ptr);
+  }
+
+  /// \return the BigInt value, or throws JSIException if not a
+  /// bigint
+  BigInt asBigInt(Runtime& runtime) const&;
+  BigInt asBigInt(Runtime& runtime) &&;
+
   /// \return the String value, or asserts if not a string.
   String getString(Runtime& runtime) const& {
     assert(isString());
@@ -1164,6 +1210,7 @@ class JSI_EXPORT Value {
     BooleanKind,
     NumberKind,
     SymbolKind,
+    BigIntKind,
     StringKind,
     ObjectKind,
     PointerKind = SymbolKind,
@@ -1190,6 +1237,9 @@ class JSI_EXPORT Value {
   constexpr static ValueKind kindOf(const Symbol&) {
     return SymbolKind;
   }
+  constexpr static ValueKind kindOf(const BigInt&) {
+    return BigIntKind;
+  }
   constexpr static ValueKind kindOf(const String&) {
     return StringKind;
   }

package/ReactCommon/jsiexecutor/React-jsiexecutor.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00-v2'
+folly_version = '2021.07.22.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|

package/ReactCommon/jsinspector/BUCK

@@ -1,6 +1,6 @@
 load("@fbsource//tools/build_defs:glob_defs.bzl", "subdir_glob")
 load("@fbsource//tools/build_defs:platform_defs.bzl", "ANDROID", "APPLE", "CXX", "FBCODE", "WINDOWS")
-load("//tools/build_defs/oss:rn_defs.bzl", "rn_xplat_cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "get_hermes_shared_library_preprocessor_flags", "rn_xplat_cxx_library")
 
 EXPORTED_HEADERS = [
     "InspectorInterfaces.h",
@@ -32,6 +32,7 @@ rn_xplat_cxx_library(
         "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
+    preprocessor_flags = get_hermes_shared_library_preprocessor_flags(),
     visibility = [
         "PUBLIC",
     ],

package/ReactCommon/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK

@@ -4,6 +4,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_ja
 rn_android_library(
     name = "powermock2",
     autoglob = False,
+    language = "JAVA",
     visibility = ["PUBLIC"],
     exported_deps = [
         ":javassist-prebuilt",
@@ -22,6 +23,7 @@ rn_android_library(
 rn_android_library(
     name = "powermock-reflect",
     autoglob = False,
+    language = "JAVA",
     visibility = ["PUBLIC"],
     exported_deps = [
         ":byte-buddy",

package/ReactCommon/logger/React-logger.podspec

@@ -18,7 +18,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00-v2'
+folly_version = '2021.07.22.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|

package/ReactCommon/react/bridging/BUCK

@@ -15,7 +15,7 @@ rn_xplat_cxx_library(
     tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
     ],
     exported_deps = [
         react_native_xplat_target("butter:butter"),

package/ReactCommon/react/bridging/Class.h

@@ -50,6 +50,27 @@ T callFromJs(
             rt, fromJs<Args>(rt, std::forward<JSArgs>(args), jsInvoker)...),
         jsInvoker);
 
+  } else if constexpr (is_optional_v<T>) {
+    static_assert(
+        is_optional_v<R>
+            ? supportsToJs<typename R::value_type, typename T::value_type>
+            : supportsToJs<R, typename T::value_type>,
+        "Incompatible return type");
+
+    auto result = toJs(
+        rt,
+        (instance->*method)(
+            rt, fromJs<Args>(rt, std::forward<JSArgs>(args), jsInvoker)...),
+        jsInvoker);
+
+    if constexpr (std::is_same_v<decltype(result), jsi::Value>) {
+      if (result.isNull() || result.isUndefined()) {
+        return std::nullopt;
+      }
+    }
+
+    return convert(rt, std::move(result));
+
   } else {
     static_assert(std::is_convertible_v<R, T>, "Incompatible return type");
 

package/ReactCommon/react/bridging/Convert.h

@@ -24,6 +24,15 @@ inline constexpr bool is_jsi_v =
     std::is_same_v<jsi::String, remove_cvref_t<T>> ||
     std::is_base_of_v<jsi::Object, remove_cvref_t<T>>;
 
+template <typename>
+struct is_optional : std::false_type {};
+
+template <typename T>
+struct is_optional<std::optional<T>> : std::true_type {};
+
+template <typename T>
+inline constexpr bool is_optional_v = is_optional<T>::value;
+
 template <typename T>
 struct Converter;
 

package/ReactCommon/react/bridging/tests/BridgingTest.h

@@ -38,7 +38,7 @@ class BridgingTest : public ::testing::Test {
         runtime(hermes::makeHermesRuntime(
             ::hermes::vm::RuntimeConfig::Builder()
                 // Make promises work with Hermes microtasks.
-                .withVMExperimentFlags(1 << 14 /* JobQueue */)
+                .withMicrotaskQueue(true)
                 .build())),
         rt(*runtime) {}
 

package/ReactCommon/react/config/BUCK

@@ -38,7 +38,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
     ],

package/ReactCommon/react/debug/BUCK

@@ -56,7 +56,7 @@ rn_xplat_cxx_library(
     visibility = ["PUBLIC"],
     deps = [
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
     ],

package/ReactCommon/react/nativemodule/core/BUCK

@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "FBJNI_TARGET", "get_objc_arc_preprocessor_flags", "get_preprocessor_flags_for_build_mode", "get_static_library_ios_flags", "react_native_target", "react_native_xplat_shared_library_target", "react_native_xplat_target", "rn_xplat_cxx_library", "subdir_glob")
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "CXX", "FBJNI_TARGET", "get_objc_arc_preprocessor_flags", "get_preprocessor_flags_for_build_mode", "get_static_library_ios_flags", "react_native_target", "react_native_xplat_shared_library_target", "react_native_xplat_target", "rn_xplat_cxx_library", "subdir_glob")
 
 rn_xplat_cxx_library(
     name = "core",
@@ -59,7 +59,7 @@ rn_xplat_cxx_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
         "supermodule:xplat/default/public.react_native.infra",
     ],
-    platforms = (ANDROID, APPLE),
+    platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
@@ -70,7 +70,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         "//xplat/jsi:JSIDynamic",

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.cpp

@@ -60,7 +60,7 @@ CxxModule::Callback makeTurboCxxModuleCallback(
 TurboCxxModule::TurboCxxModule(
     std::unique_ptr<CxxModule> cxxModule,
     std::shared_ptr<CallInvoker> jsInvoker)
-    : TurboModule(cxxModule->getName(), jsInvoker),
+    : TurboModule(cxxModule->getName(), std::move(jsInvoker)),
       cxxMethods_(cxxModule->getMethods()),
       cxxModule_(std::move(cxxModule)) {}
 
@@ -69,10 +69,12 @@ jsi::Value TurboCxxModule::get(
     const jsi::PropNameID &propName) {
   std::string propNameUtf8 = propName.utf8(runtime);
 
+  auto result = jsi::Value::undefined();
+
   if (propNameUtf8 == "getConstants") {
     // This is special cased because `getConstants()` is already a part of
     // CxxModule.
-    return jsi::Function::createFromHostFunction(
+    result = jsi::Function::createFromHostFunction(
         runtime,
         propName,
         0,
@@ -89,30 +91,45 @@ jsi::Value TurboCxxModule::get(
           }
           return result;
         });
+  } else {
+    for (auto &method : cxxMethods_) {
+      if (method.name == propNameUtf8) {
+        result = jsi::Function::createFromHostFunction(
+            runtime,
+            propName,
+            0,
+            [this, propNameUtf8](
+                jsi::Runtime &rt,
+                const jsi::Value &thisVal,
+                const jsi::Value *args,
+                size_t count) {
+              return invokeMethod(rt, propNameUtf8, args, count);
+            });
+      }
+    }
   }
 
-  for (auto &method : cxxMethods_) {
-    if (method.name == propNameUtf8) {
-      return jsi::Function::createFromHostFunction(
-          runtime,
-          propName,
-          0,
-          [this, propNameUtf8](
-              jsi::Runtime &rt,
-              const jsi::Value &thisVal,
-              const jsi::Value *args,
-              size_t count) {
-            return invokeMethod(rt, VoidKind, propNameUtf8, args, count);
-          });
-    }
+  // If we have a JS wrapper, cache the result of this lookup
+  if (jsRepresentation_) {
+    jsRepresentation_->setProperty(runtime, propName, result);
   }
 
-  return jsi::Value::undefined();
+  return result;
+}
+
+std::vector<jsi::PropNameID> TurboCxxModule::getPropertyNames(
+    jsi::Runtime &runtime) {
+  std::vector<jsi::PropNameID> result;
+  result.reserve(cxxMethods_.size() + 1);
+  result.push_back(jsi::PropNameID::forUtf8(runtime, "getConstants"));
+  for (auto it = cxxMethods_.begin(); it != cxxMethods_.end(); it++) {
+    result.push_back(jsi::PropNameID::forUtf8(runtime, it->name));
+  }
+  return result;
 }
 
 jsi::Value TurboCxxModule::invokeMethod(
     jsi::Runtime &runtime,
-    TurboModuleMethodValueKind valueKind,
     const std::string &methodName,
     const jsi::Value *args,
     size_t count) {

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.h

@@ -29,13 +29,15 @@ class JSI_EXPORT TurboCxxModule : public TurboModule {
       std::unique_ptr<facebook::xplat::module::CxxModule> cxxModule,
       std::shared_ptr<CallInvoker> jsInvoker);
 
-  virtual facebook::jsi::Value get(
+  facebook::jsi::Value get(
       facebook::jsi::Runtime &runtime,
       const facebook::jsi::PropNameID &propName) override;
 
+  std::vector<facebook::jsi::PropNameID> getPropertyNames(
+      facebook::jsi::Runtime &runtime) override;
+
   jsi::Value invokeMethod(
       jsi::Runtime &runtime,
-      TurboModuleMethodValueKind valueKind,
       const std::string &methodName,
       const jsi::Value *args,
       size_t count);

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.cpp

@@ -7,15 +7,34 @@
 
 #include "TurboModule.h"
 
-using namespace facebook;
-
 namespace facebook {
 namespace react {
 
 TurboModule::TurboModule(
-    const std::string &name,
+    std::string name,
     std::shared_ptr<CallInvoker> jsInvoker)
-    : name_(name), jsInvoker_(jsInvoker) {}
+    : name_(std::move(name)), jsInvoker_(std::move(jsInvoker)) {}
+
+jsi::Value TurboModule::get(
+    jsi::Runtime &runtime,
+    const jsi::PropNameID &propName,
+    const MethodMetadata &meta) {
+  auto result = jsi::Function::createFromHostFunction(
+      runtime,
+      propName,
+      static_cast<unsigned int>(meta.argCount),
+      [this, meta](
+          jsi::Runtime &rt,
+          const jsi::Value &thisVal,
+          const jsi::Value *args,
+          size_t count) { return meta.invoker(rt, *this, args, count); });
+  // If we have a JS wrapper, cache the result of this lookup
+  // We don't cache misses, to allow for methodMap_ to dynamically be extended
+  if (jsRepresentation_) {
+    jsRepresentation_->setProperty(runtime, propName, result);
+  }
+  return result;
+}
 
 } // namespace react
 } // namespace facebook

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h

@@ -32,38 +32,47 @@ enum TurboModuleMethodValueKind {
   PromiseKind,
 };
 
+class TurboCxxModule;
+class TurboModuleBinding;
+
 /**
  * Base HostObject class for every module to be exposed to JS
  */
 class JSI_EXPORT TurboModule : public facebook::jsi::HostObject {
  public:
-  TurboModule(const std::string &name, std::shared_ptr<CallInvoker> jsInvoker);
+  TurboModule(std::string name, std::shared_ptr<CallInvoker> jsInvoker);
 
-  virtual facebook::jsi::Value get(
+  // Note: keep this method declared inline to avoid conflicts
+  // between RTTI and non-RTTI compilation units
+  facebook::jsi::Value get(
       facebook::jsi::Runtime &runtime,
       const facebook::jsi::PropNameID &propName) override {
-    std::string propNameUtf8 = propName.utf8(runtime);
-    auto p = methodMap_.find(propNameUtf8);
-    if (p == methodMap_.end()) {
-      // Method was not found, let JS decide what to do.
-      return jsi::Value::undefined();
+    {
+      std::string propNameUtf8 = propName.utf8(runtime);
+      auto p = methodMap_.find(propNameUtf8);
+      if (p == methodMap_.end()) {
+        // Method was not found, let JS decide what to do.
+        return facebook::jsi::Value::undefined();
+      } else {
+        return get(runtime, propName, p->second);
+      }
     }
-    MethodMetadata meta = p->second;
-    return jsi::Function::createFromHostFunction(
-        runtime,
-        propName,
-        static_cast<unsigned int>(meta.argCount),
-        [this, meta](
-            facebook::jsi::Runtime &rt,
-            const facebook::jsi::Value &thisVal,
-            const facebook::jsi::Value *args,
-            size_t count) { return meta.invoker(rt, *this, args, count); });
   }
 
+  std::vector<facebook::jsi::PropNameID> getPropertyNames(
+      facebook::jsi::Runtime &runtime) override {
+    std::vector<jsi::PropNameID> result;
+    result.reserve(methodMap_.size());
+    for (auto it = methodMap_.cbegin(); it != methodMap_.cend(); ++it) {
+      result.push_back(jsi::PropNameID::forUtf8(runtime, it->first));
+    }
+    return result;
+  }
+
+ protected:
   const std::string name_;
   std::shared_ptr<CallInvoker> jsInvoker_;
 
- protected:
   struct MethodMetadata {
     size_t argCount;
     facebook::jsi::Value (*invoker)(
@@ -72,8 +81,17 @@ class JSI_EXPORT TurboModule : public facebook::jsi::HostObject {
         const facebook::jsi::Value *args,
         size_t count);
   };
-
   std::unordered_map<std::string, MethodMetadata> methodMap_;
+
+ private:
+  friend class TurboCxxModule;
+  friend class TurboModuleBinding;
+  std::unique_ptr<jsi::Object> jsRepresentation_;
+
+  facebook::jsi::Value get(
+      facebook::jsi::Runtime &runtime,
+      const facebook::jsi::PropNameID &propName,
+      const MethodMetadata &meta);
 };
 
 /**