react-native-windows 0.81.1 → 0.82.0-preview.1

package/Microsoft.ReactNative.Cxx/JSI/instrumentation.h

@@ -137,6 +137,11 @@ class JSI_EXPORT Instrumentation {
   virtual void writeBasicBlockProfileTraceToFile(
       const std::string& fileName) const = 0;
 
+#if JSI_VERSION >= 21
+  /// Write the opcode stats to the given stream.
+  virtual void dumpOpcodeStats(std::ostream& os) const = 0;
+#endif
+
   /// Dump external profiler symbols to the given file name.
   virtual void dumpProfilerSymbolsToFile(const std::string& fileName) const = 0;
 };

package/Microsoft.ReactNative.Cxx/JSI/jsi-inl.h

@@ -121,6 +121,12 @@ inline Value Object::getProperty(Runtime& runtime, const PropNameID& name)
   return runtime.getProperty(*this, name);
 }
 
+#if JSI_VERSION >= 21
+inline Value Object::getProperty(Runtime& runtime, const Value& name) const {
+  return runtime.getProperty(*this, name);
+}
+#endif
+
 inline bool Object::hasProperty(Runtime& runtime, const char* name) const {
   return hasProperty(runtime, String::createFromAscii(runtime, name));
 }
@@ -134,6 +140,12 @@ inline bool Object::hasProperty(Runtime& runtime, const PropNameID& name)
   return runtime.hasProperty(*this, name);
 }
 
+#if JSI_VERSION >= 21
+inline bool Object::hasProperty(Runtime& runtime, const Value& name) const {
+  return runtime.hasProperty(*this, name);
+}
+#endif
+
 template <typename T>
 void Object::setProperty(Runtime& runtime, const char* name, T&& value)
     JSI_CONST_10 {
@@ -155,6 +167,31 @@ void Object::setProperty(Runtime& runtime, const PropNameID& name, T&& value)
       runtime, name, detail::toValue(runtime, std::forward<T>(value)));
 }
 
+#if JSI_VERSION >= 21
+template <typename T>
+void Object::setProperty(Runtime& runtime, const Value& name, T&& value) const {
+  setPropertyValue(
+      runtime, name, detail::toValue(runtime, std::forward<T>(value)));
+}
+
+inline void Object::deleteProperty(Runtime& runtime, const char* name) const {
+  deleteProperty(runtime, String::createFromAscii(runtime, name));
+}
+
+inline void Object::deleteProperty(Runtime& runtime, const String& name) const {
+  runtime.deleteProperty(*this, name);
+}
+
+inline void Object::deleteProperty(Runtime& runtime, const PropNameID& name)
+    const {
+  runtime.deleteProperty(*this, name);
+}
+
+inline void Object::deleteProperty(Runtime& runtime, const Value& name) const {
+  runtime.deleteProperty(*this, name);
+}
+#endif
+
 inline Array Object::getArray(Runtime& runtime) const& {
   assert(runtime.isArray(*this));
   (void)runtime; // when assert is disabled we need to mark this as used

package/Microsoft.ReactNative.Cxx/JSI/jsi.cpp

@@ -358,6 +358,12 @@ Instrumentation& Runtime::instrumentation() {
       std::abort();
     }
 
+#if JSI_VERSION >= 21
+    void dumpOpcodeStats(std::ostream&) const override {
+      std::abort();
+    }
+#endif
+
     void dumpProfilerSymbolsToFile(const std::string&) const override {
       std::abort();
     }
@@ -465,6 +471,39 @@ Object Runtime::createObjectWithPrototype(const Value& prototype) {
 }
 #endif
 
+#if JSI_VERSION >= 21
+void Runtime::deleteProperty(const Object& object, const PropNameID& name) {
+  auto nameStr = String::createFromUtf16(*this, name.utf16(*this));
+  auto deleteFn = global()
+                      .getPropertyAsObject(*this, "Reflect")
+                      .getPropertyAsFunction(*this, "deleteProperty");
+  auto res = deleteFn.call(*this, object, nameStr).getBool();
+  if (!res) {
+    throw JSError(*this, "Failed to delete property");
+  }
+}
+
+void Runtime::deleteProperty(const Object& object, const String& name) {
+  auto deleteFn = global()
+                      .getPropertyAsObject(*this, "Reflect")
+                      .getPropertyAsFunction(*this, "deleteProperty");
+  auto res = deleteFn.call(*this, object, name).getBool();
+  if (!res) {
+    throw JSError(*this, "Failed to delete property");
+  }
+}
+
+void Runtime::deleteProperty(const Object& object, const Value& name) {
+  auto deleteFn = global()
+                      .getPropertyAsObject(*this, "Reflect")
+                      .getPropertyAsFunction(*this, "deleteProperty");
+  auto res = deleteFn.call(*this, object, name).getBool();
+  if (!res) {
+    throw JSError(*this, "Failed to delete property");
+  }
+}
+#endif
+
 #if JSI_VERSION >= 20
 void Runtime::setRuntimeDataImpl(
     const UUID& uuid,
@@ -523,6 +562,35 @@ const void* Runtime::getRuntimeDataImpl(const UUID& uuid) {
 }
 #endif
 
+#if JSI_VERSION >= 21
+Value Runtime::getProperty(const Object& object, const Value& name) {
+  auto getFn = global()
+                   .getPropertyAsObject(*this, "Reflect")
+                   .getPropertyAsFunction(*this, "get");
+  return getFn.call(*this, object, name);
+}
+
+bool Runtime::hasProperty(const Object& object, const Value& name) {
+  auto hasFn = global()
+                   .getPropertyAsObject(*this, "Reflect")
+                   .getPropertyAsFunction(*this, "has");
+  return hasFn.call(*this, object, name).getBool();
+}
+
+void Runtime::setPropertyValue(
+    const Object& object,
+    const Value& name,
+    const Value& value) {
+  auto setFn = global()
+                   .getPropertyAsObject(*this, "Reflect")
+                   .getPropertyAsFunction(*this, "set");
+  auto setResult = setFn.call(*this, object, name, value).getBool();
+  if (!setResult) {
+    throw JSError(*this, "Failed to set the property");
+  }
+}
+#endif
+
 Pointer& Pointer::operator=(Pointer&& other) JSI_NOEXCEPT_15 {
   if (ptr_) {
     ptr_->invalidate();

package/Microsoft.ReactNative.Cxx/JSI/jsi.h

@@ -28,7 +28,7 @@
 
 #ifndef JSI_VERSION
 // Use the latest version by default
-#define JSI_VERSION 20
+#define JSI_VERSION 21
 #endif
 
 #if JSI_VERSION >= 3
@@ -320,9 +320,9 @@ class JSI_EXPORT Runtime {
  public:
   virtual ~Runtime();
 
-  #if JSI_VERSION >= 20
+#if JSI_VERSION >= 20
   ICast* castInterface(const UUID& interfaceUUID) override;
-  #endif
+#endif
 
   /// Evaluates the given JavaScript \c buffer.  \c sourceURL is used
   /// to annotate the stack trace if there is an exception.  The
@@ -421,8 +421,8 @@ class JSI_EXPORT Runtime {
   /// implementation of this function returns an \c Instrumentation instance
   /// which returns no metrics.
   virtual Instrumentation& instrumentation();
-  
-  #if JSI_VERSION >= 20
+
+#if JSI_VERSION >= 20
   /// Stores the pointer \p data with the \p uuid in the runtime. This can be
   /// used to store some custom data within the runtime. When the runtime is
   /// destroyed, or if an entry at an existing key is overwritten, the runtime
@@ -432,7 +432,7 @@ class JSI_EXPORT Runtime {
   /// Returns the data associated with the \p uuid in the runtime. If there's no
   /// data associated with the uuid, return a null pointer.
   std::shared_ptr<void> getRuntimeData(const UUID& uuid);
-  #endif
+#endif
 
  protected:
   friend class Pointer;
@@ -450,8 +450,8 @@ class JSI_EXPORT Runtime {
   friend class Value;
   friend class Scope;
   friend class JSError;
-  
-  #if JSI_VERSION >= 20
+
+#if JSI_VERSION >= 20
   /// Stores the pointer \p data with the \p uuid in the runtime. This can be
   /// used to store some custom data within the runtime. When the runtime is
   /// destroyed, or if an entry at an existing key is overwritten, the runtime
@@ -464,7 +464,7 @@ class JSI_EXPORT Runtime {
   /// Returns the data associated with the \p uuid in the runtime. If there's no
   /// data associated with the uuid, return a null pointer.
   virtual const void* getRuntimeDataImpl(const UUID& uuid);
-  #endif
+#endif
 
   // Potential optimization: avoid the cloneFoo() virtual dispatch,
   // and instead just fix the number of fields, and copy them, since
@@ -553,8 +553,18 @@ class JSI_EXPORT Runtime {
 
   virtual Value getProperty(const Object&, const PropNameID& name) = 0;
   virtual Value getProperty(const Object&, const String& name) = 0;
+
+#if JSI_VERSION >= 21
+  virtual Value getProperty(const Object&, const Value& name);
+#endif
+
   virtual bool hasProperty(const Object&, const PropNameID& name) = 0;
   virtual bool hasProperty(const Object&, const String& name) = 0;
+
+#if JSI_VERSION >= 21
+  virtual bool hasProperty(const Object&, const Value& name);
+#endif
+
   virtual void setPropertyValue(
       JSI_CONST_10 Object&,
       const PropNameID& name,
@@ -564,6 +574,15 @@ class JSI_EXPORT Runtime {
       const String& name,
       const Value& value) = 0;
 
+#if JSI_VERSION >= 21
+  virtual void
+  setPropertyValue(const Object&, const Value& name, const Value& value);
+
+  virtual void deleteProperty(const Object&, const PropNameID& name);
+  virtual void deleteProperty(const Object&, const String& name);
+  virtual void deleteProperty(const Object&, const Value& name);
+#endif
+
   virtual bool isArray(const Object&) const = 0;
   virtual bool isArrayBuffer(const Object&) const = 0;
   virtual bool isFunction(const Object&) const = 0;
@@ -1014,7 +1033,7 @@ class JSI_EXPORT Object : public Pointer {
   Object& operator=(Object&& other) = default;
 
   /// Creates a new Object instance, like '{}' in JS.
-  Object(Runtime& runtime) : Object(runtime.createObject()) {}
+  explicit Object(Runtime& runtime) : Object(runtime.createObject()) {}
 
   static Object createFromHostObject(
       Runtime& runtime,
@@ -1066,6 +1085,14 @@ class JSI_EXPORT Object : public Pointer {
   /// undefined value.
   Value getProperty(Runtime& runtime, const PropNameID& name) const;
 
+#if JSI_VERSION >= 21
+  /// \return the Property of the object with the given JS Value name. If the
+  /// name isn't a property on the object, returns the undefined value.This
+  /// attempts to convert the JS Value to convert to a property key. If the
+  /// conversion fails, this method may throw.
+  Value getProperty(Runtime& runtime, const Value& name) const;
+#endif
+
   /// \return true if and only if the object has a property with the
   /// given ascii name.
   bool hasProperty(Runtime& runtime, const char* name) const;
@@ -1078,6 +1105,12 @@ class JSI_EXPORT Object : public Pointer {
   /// given PropNameID name.
   bool hasProperty(Runtime& runtime, const PropNameID& name) const;
 
+#if JSI_VERSION >= 21
+  /// \return true if and only if the object has a property with the given
+  /// JS Value name. This attempts to convert the JS Value to convert to a
+  /// property key. If the conversion fails, this method may throw.
+  bool hasProperty(Runtime& runtime, const Value& name) const;
+#endif
   /// Sets the property value from a Value or anything which can be
   /// used to make one: nullptr_t, bool, double, int, const char*,
   /// String, or Object.
@@ -1098,6 +1131,32 @@ class JSI_EXPORT Object : public Pointer {
   void setProperty(Runtime& runtime, const PropNameID& name, T&& value)
       JSI_CONST_10;
 
+#if JSI_VERSION >= 21
+  /// Sets the property value from a Value or anything which can be
+  /// used to make one: nullptr_t, bool, double, int, const char*,
+  /// String, or Object. This takes a JS Value as the property name, and
+  /// attempts to convert to a property key. If the conversion fails, this
+  /// method may throw.
+  template <typename T>
+  void setProperty(Runtime& runtime, const Value& name, T&& value) const;
+
+  /// Delete the property with the given ascii name. Throws if the deletion
+  /// failed.
+  void deleteProperty(Runtime& runtime, const char* name) const;
+
+  /// Delete the property with the given String name. Throws if the deletion
+  /// failed.
+  void deleteProperty(Runtime& runtime, const String& name) const;
+
+  /// Delete the property with the given PropNameID name. Throws if the deletion
+  /// failed.
+  void deleteProperty(Runtime& runtime, const PropNameID& name) const;
+
+  /// Delete the property with the given Value name. Throws if the deletion
+  /// failed.
+  void deleteProperty(Runtime& runtime, const Value& name) const;
+#endif
+
   /// \return true iff JS \c Array.isArray() would return \c true.  If
   /// so, then \c getArray() will succeed.
   bool isArray(Runtime& runtime) const {
@@ -1243,6 +1302,13 @@ class JSI_EXPORT Object : public Pointer {
     return runtime.setPropertyValue(*this, name, value);
   }
 
+#if JSI_VERSION >= 21
+  void setPropertyValue(Runtime& runtime, const Value& name, const Value& value)
+      const {
+    return runtime.setPropertyValue(*this, name, value);
+  }
+#endif
+
   friend class Runtime;
   friend class Value;
 };
@@ -1942,7 +2008,7 @@ U* castInterface(T* ptr) {
     return static_cast<U*>(ptr->castInterface(U::uuid));
   }
   return nullptr;
-};
+}
 
 /// Helper function to cast the object managed by the shared_ptr \p ptr into an
 /// interface specified by \c U. If the cast is successful, return a shared_ptr

package/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems

@@ -14,7 +14,7 @@
     <!-- If your project is using glog, then GLog_IncludeDir could be set to include the actual location of glog -->
     <GLog_IncludeDir Condition="'$(GLog_IncludeDir)' == '' AND Exists('$(MSBuildThisFileDirectory)stubs\glog\logging.h')">$(MSBuildThisFileDirectory)stubs</GLog_IncludeDir>
 
-    <NodeApiJsiCommitHash>21b47f08b762b21b1d4d970940ab23f59f43249c</NodeApiJsiCommitHash>
+    <NodeApiJsiCommitHash>4b8a4a59c4e1b7b988b809dedffd89a7662aa785</NodeApiJsiCommitHash>
     <NodeApiJsiLocal Condition="Exists('$(MSBuildThisFileDirectory)NodeApiJsiRuntime.cpp')">true</NodeApiJsiLocal>
     <NodeApiJsiDir Condition="'$(NodeApiJsiDir)' == '' AND '$(NodeApiJsiLocal)' == 'true'">$(MSBuildThisFileDirectory)</NodeApiJsiDir>
     <NodeApiJsiDir Condition="'$(NodeApiJsiDir)' == '' AND '$(ReactNativeDir)' != ''">$(ReactNativeDir)\..\..\node_modules\.node-api-jsi\node-api-jsi-$(NodeApiJsiCommitHash)\</NodeApiJsiDir>
@@ -35,7 +35,7 @@
         $(NodeApiJsiSrcDir);
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>JSI_VERSION=20;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>JSI_VERSION=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

package/Microsoft.ReactNative.Cxx/NamespaceRedirect.h

@@ -1,9 +1,4 @@
 #pragma once
 
-#ifndef USE_WINUI3
-#define XAML_NAMESPACE Windows.UI.Xaml
-#define COMP_NAMESPACE Windows.UI.Composition
-#else
 #define XAML_NAMESPACE Microsoft.UI.Xaml
 #define COMP_NAMESPACE Microsoft.UI.Composition
-#endif

package/Microsoft.ReactNative.Cxx/NodeApiJsiRuntime.cpp

@@ -269,9 +269,20 @@ class NodeApiJsiRuntime : public jsi::Runtime {
       override;
   jsi::Value getProperty(const jsi::Object &obj, const jsi::String &name)
       override;
+
+#if JSI_VERSION >= 21
+  jsi::Value getProperty(const jsi::Object &obj, const jsi::Value &name)
+      override;
+#endif
+
   bool hasProperty(const jsi::Object &obj, const jsi::PropNameID &name)
       override;
   bool hasProperty(const jsi::Object &obj, const jsi::String &name) override;
+
+#if JSI_VERSION >= 21
+  bool hasProperty(const jsi::Object &obj, const jsi::Value &name) override;
+#endif
+
   void setPropertyValue(
       JSI_CONST_10 jsi::Object &obj,
       const jsi::PropNameID &name,
@@ -281,6 +292,19 @@ class NodeApiJsiRuntime : public jsi::Runtime {
       const jsi::String &name,
       const jsi::Value &value) override;
 
+#if JSI_VERSION >= 21
+  void setPropertyValue(
+      const jsi::Object &obj,
+      const jsi::Value &name,
+      const jsi::Value &value) override;
+
+  void deleteProperty(const jsi::Object &obj, const jsi::PropNameID &name)
+      override;
+  void deleteProperty(const jsi::Object &obj, const jsi::String &name) override;
+
+  void deleteProperty(const jsi::Object &obj, const jsi::Value &name) override;
+#endif
+
   bool isArray(const jsi::Object &obj) const override;
   bool isArrayBuffer(const jsi::Object &obj) const override;
   bool isFunction(const jsi::Object &obj) const override;
@@ -921,6 +945,7 @@ class NodeApiJsiRuntime : public jsi::Runtime {
   napi_value getProperty(napi_value object, napi_value propertyId) const;
   void setProperty(napi_value object, napi_value propertyId, napi_value value)
       const;
+  bool deleteProperty(napi_value object, napi_value propertyId) const;
   void setProperty(
       napi_value object,
       napi_value propertyId,
@@ -1741,6 +1766,15 @@ jsi::Value NodeApiJsiRuntime::getProperty(
   return toJsiValue(getProperty(getNodeApiValue(obj), getNodeApiValue(name)));
 }
 
+#if JSI_VERSION >= 21
+jsi::Value NodeApiJsiRuntime::getProperty(
+    const jsi::Object &obj,
+    const jsi::Value &name) {
+  NodeApiScope scope{*this};
+  return toJsiValue(getProperty(getNodeApiValue(obj), getNodeApiValue(name)));
+}
+#endif
+
 bool NodeApiJsiRuntime::hasProperty(
     const jsi::Object &obj,
     const jsi::PropNameID &name) {
@@ -1755,6 +1789,15 @@ bool NodeApiJsiRuntime::hasProperty(
   return hasProperty(getNodeApiValue(obj), getNodeApiValue(name));
 }
 
+#if JSI_VERSION >= 21
+bool NodeApiJsiRuntime::hasProperty(
+    const jsi::Object &obj,
+    const jsi::Value &name) {
+  NodeApiScope scope{*this};
+  return hasProperty(getNodeApiValue(obj), getNodeApiValue(name));
+}
+#endif
+
 void NodeApiJsiRuntime::setPropertyValue(
     JSI_CONST_10 jsi::Object &obj,
     const jsi::PropNameID &name,
@@ -1773,6 +1816,47 @@ void NodeApiJsiRuntime::setPropertyValue(
       getNodeApiValue(obj), getNodeApiValue(name), getNodeApiValue(value));
 }
 
+#if JSI_VERSION >= 21
+void NodeApiJsiRuntime::setPropertyValue(
+    const jsi::Object &obj,
+    const jsi::Value &name,
+    const jsi::Value &value) {
+  NodeApiScope scope{*this};
+  setProperty(
+      getNodeApiValue(obj), getNodeApiValue(name), getNodeApiValue(value));
+}
+
+void NodeApiJsiRuntime::deleteProperty(
+    const jsi::Object &obj,
+    const jsi::PropNameID &name) {
+  NodeApiScope scope{*this};
+  bool res = deleteProperty(getNodeApiValue(obj), getNodeApiValue(name));
+  if (!res) {
+    throw jsi::JSError(*this, "Failed to delete property");
+  }
+}
+
+void NodeApiJsiRuntime::deleteProperty(
+    const jsi::Object &obj,
+    const jsi::String &name) {
+  NodeApiScope scope{*this};
+  bool res = deleteProperty(getNodeApiValue(obj), getNodeApiValue(name));
+  if (!res) {
+    throw jsi::JSError(*this, "Failed to delete property");
+  }
+}
+
+void NodeApiJsiRuntime::deleteProperty(
+    const jsi::Object &obj,
+    const jsi::Value &name) {
+  NodeApiScope scope{*this};
+  bool res = deleteProperty(getNodeApiValue(obj), getNodeApiValue(name));
+  if (!res) {
+    throw jsi::JSError(*this, "Failed to delete property");
+  }
+}
+#endif
+
 bool NodeApiJsiRuntime::isArray(const jsi::Object &obj) const {
   NodeApiScope scope{*this};
   return isArray(getNodeApiValue(obj));
@@ -2391,7 +2475,7 @@ NodeApiJsiRuntime::PropNameIDView::PropNameIDView(
     NodeApiJsiRuntime * /*runtime*/,
     napi_value propertyId) noexcept
     : propertyId_{make<jsi::PropNameID>(
-          new(std::addressof(pointerStore_)) NodeApiStackOnlyPointerValue(
+          new (std::addressof(pointerStore_)) NodeApiStackOnlyPointerValue(
               propertyId,
               NodeApiPointerValueKind::StringPropNameID))} {}
 
@@ -2862,6 +2946,14 @@ void NodeApiJsiRuntime::setProperty(
   CHECK_NAPI(jsrApi_->napi_set_property(env_, object, propertyId, value));
 }
 
+// Deletes object property value.
+bool NodeApiJsiRuntime::deleteProperty(napi_value object, napi_value propertyId)
+    const {
+  bool result{};
+  CHECK_NAPI(jsrApi_->napi_delete_property(env_, object, propertyId, &result));
+  return result;
+}
+
 // Sets object property value with the provided property accessibility
 // attributes.
 void NodeApiJsiRuntime::setProperty(

package/Microsoft.ReactNative.Cxx/ReactCommon/TurboModule.cpp

@@ -13,7 +13,7 @@ namespace facebook::react {
 TurboModuleMethodValueKind getTurboModuleMethodValueKind(
     jsi::Runtime& rt,
     const jsi::Value* value) {
-  if (!value || value->isUndefined() || value->isNull()) {
+  if ((value == nullptr) || value->isUndefined() || value->isNull()) {
     return VoidKind;
   } else if (value->isBool()) {
     return BooleanKind;
@@ -41,8 +41,9 @@ TurboModule::TurboModule(
 
 void TurboModule::emitDeviceEvent(
     const std::string& eventName,
-    ArgFactory argFactory) {
-  jsInvoker_->invokeAsync([eventName, argFactory](jsi::Runtime& rt) {
+    ArgFactory&& argFactory) {
+  jsInvoker_->invokeAsync([eventName, argFactory = std::move(argFactory)](
+                              jsi::Runtime& rt) {
     jsi::Value emitter = rt.global().getProperty(rt, "__rctDeviceEventEmitter");
     if (!emitter.isUndefined()) {
       jsi::Object emitterObject = emitter.asObject(rt);

package/Microsoft.ReactNative.Cxx/ReactCommon/TurboModule.h

@@ -114,14 +114,14 @@ class JSI_EXPORT TurboModule : public jsi::HostObject {
    */
   void emitDeviceEvent(
       const std::string& eventName,
-      ArgFactory argFactory = nullptr);
+      ArgFactory&& argFactory = nullptr);
 
   // Backwards compatibility version
   void emitDeviceEvent(
       jsi::Runtime& /*runtime*/,
 
       const std::string& eventName,
-      ArgFactory argFactory = nullptr) {
+      ArgFactory&& argFactory = nullptr) {
     emitDeviceEvent(eventName, std::move(argFactory));
   }
 

package/Microsoft.ReactNative.Cxx/ReactCommon/TurboModuleUtils.cpp

@@ -9,59 +9,6 @@
 
 namespace facebook::react {
 
-static jsi::Value deepCopyJSIValue(jsi::Runtime& rt, const jsi::Value& value) {
-  if (value.isNull()) {
-    return jsi::Value::null();
-  }
-
-  if (value.isBool()) {
-    return jsi::Value(value.getBool());
-  }
-
-  if (value.isNumber()) {
-    return jsi::Value(value.getNumber());
-  }
-
-  if (value.isString()) {
-    return value.getString(rt);
-  }
-
-  if (value.isObject()) {
-    jsi::Object o = value.getObject(rt);
-    if (o.isArray(rt)) {
-      return deepCopyJSIArray(rt, o.getArray(rt));
-    }
-    if (o.isFunction(rt)) {
-      return o.getFunction(rt);
-    }
-    return deepCopyJSIObject(rt, o);
-  }
-
-  return jsi::Value::undefined();
-}
-
-jsi::Object deepCopyJSIObject(jsi::Runtime& rt, const jsi::Object& obj) {
-  jsi::Object copy(rt);
-  jsi::Array propertyNames = obj.getPropertyNames(rt);
-  size_t size = propertyNames.size(rt);
-  for (size_t i = 0; i < size; i++) {
-    jsi::String name = propertyNames.getValueAtIndex(rt, i).getString(rt);
-    jsi::Value value = obj.getProperty(rt, name);
-    copy.setProperty(rt, name, deepCopyJSIValue(rt, value));
-  }
-  return copy;
-}
-
-jsi::Array deepCopyJSIArray(jsi::Runtime& rt, const jsi::Array& arr) {
-  size_t size = arr.size(rt);
-  jsi::Array copy(rt, size);
-  for (size_t i = 0; i < size; i++) {
-    copy.setValueAtIndex(
-        rt, i, deepCopyJSIValue(rt, arr.getValueAtIndex(rt, i)));
-  }
-  return copy;
-}
-
 Promise::Promise(jsi::Runtime& rt, jsi::Function resolve, jsi::Function reject)
     : LongLivedObject(rt),
       resolve_(std::move(resolve)),
@@ -88,9 +35,9 @@ jsi::Value createPromiseAsJSIValue(
       2,
       [func = std::move(func)](
           jsi::Runtime& rt2,
-          const jsi::Value& thisVal,
+          const jsi::Value& /*thisVal*/,
           const jsi::Value* args,
-          size_t count) {
+          size_t /*count*/) {
         jsi::Function resolve = args[0].getObject(rt2).getFunction(rt2);
         jsi::Function reject = args[1].getObject(rt2).getFunction(rt2);
         auto wrapper = std::make_shared<Promise>(

package/Microsoft.ReactNative.Cxx/ReactCommon/TurboModuleUtils.h

@@ -7,23 +7,19 @@
 
 #pragma once
 
-#include <cassert>
-#include <string>
-
 #include <jsi/jsi.h>
-#include <react/bridging/CallbackWrapper.h>
 #include <react/bridging/LongLivedObject.h>
+#include <cassert>
+#include <functional>
+#include <string>
 
 namespace facebook::react {
 
-jsi::Object deepCopyJSIObject(jsi::Runtime& rt, const jsi::Object& obj);
-jsi::Array deepCopyJSIArray(jsi::Runtime& rt, const jsi::Array& arr);
-
 struct Promise : public LongLivedObject {
   Promise(jsi::Runtime& rt, jsi::Function resolve, jsi::Function reject);
 
   void resolve(const jsi::Value& result);
-  void reject(const std::string& error);
+  void reject(const std::string& message);
 
   jsi::Function resolve_;
   jsi::Function reject_;

package/Microsoft.ReactNative.Cxx/ReactCommon/react/bridging/Class.h

@@ -27,6 +27,11 @@ JSReturnT callFromJs(
       sizeof...(ArgsT) == sizeof...(JSArgsT), "Incorrect arguments length");
   static_assert(
       (supportsFromJs<ArgsT, JSArgsT> && ...), "Incompatible arguments");
+  if constexpr (std::is_void_v<JSReturnT>) {
+    static_assert(
+        std::is_void_v<ReturnT>,
+        "Method must return void when JSReturnT is void");
+  }
 
   if constexpr (std::is_void_v<JSReturnT>) {
     (instance->*method)(