react-native-windows 0.78.5 → 0.78.6

package/Microsoft.ReactNative.Cxx/JSValue.h

@@ -181,17 +181,25 @@ bool operator!=(JSValueArray const &left, JSValueArray const &right) noexcept;
 //! For copy operations the explicit Copy() method must be used.
 //! Note that the move operations are not thread safe.
 struct JSValue {
-  //! JSValue with JSValueType::Null.
+  //! JSValue with JSValueType::Null. - Maybe removed in future version - replaced with NullRef
   static JSValue const Null;
+  //! JSValue with JSValueType::Null.
+  static const JSValue &NullRef() noexcept;
 
-  //! JSValue with empty object.
+  //! JSValue with empty object. - Maybe removed in future version - replaced with EmptyObjectRef
   static JSValue const EmptyObject;
+  //! JSValue with empty object.
+  static const JSValue &EmptyObjectRef() noexcept;
 
-  //! JSValue with empty array.
+  //! JSValue with empty array. - Maybe removed in future version - replaced with EmptyArrayRef
   static JSValue const EmptyArray;
+  //! JSValue with empty array.
+  static const JSValue &EmptyArrayRef() noexcept;
 
-  //! JSValue with empty string.
+  //! JSValue with empty string. - Maybe removed in future version - replaced with EmptyStringRef
   static JSValue const EmptyString;
+  //! JSValue with empty string.
+  static const JSValue &EmptyStringRef() noexcept;
 
   //! Create a Null JSValue.
   JSValue() noexcept;
@@ -654,11 +662,11 @@ inline double const *JSValue::TryGetDouble() const noexcept {
 }
 
 inline JSValueObject const &JSValue::AsObject() const noexcept {
-  return (m_type == JSValueType::Object) ? m_object : EmptyObject.m_object;
+  return (m_type == JSValueType::Object) ? m_object : EmptyObjectRef().m_object;
 }
 
 inline JSValueArray const &JSValue::AsArray() const noexcept {
-  return (m_type == JSValueType::Array) ? m_array : EmptyArray.m_array;
+  return (m_type == JSValueType::Array) ? m_array : EmptyArrayRef().m_array;
 }
 
 inline int8_t JSValue::AsInt8() const noexcept {
@@ -860,7 +868,7 @@ inline const JSValueArray &JSValue::Array() const noexcept {
 }
 
 inline const std::string &JSValue::String() const noexcept {
-  return (m_type == JSValueType::String) ? m_string : EmptyString.m_string;
+  return (m_type == JSValueType::String) ? m_string : EmptyStringRef().m_string;
 }
 
 inline bool JSValue::Boolean() const noexcept {

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>83cfef428a97627c9185c73da097e42742de56eb</NodeApiJsiCommitHash>
+    <NodeApiJsiCommitHash>980cb60d7911237d0f647fc566543ef627adac70</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=11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>JSI_VERSION=19;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

package/Microsoft.ReactNative.Cxx/NativeModules.h

@@ -7,6 +7,7 @@
 #pragma once
 #include <winrt/Microsoft.ReactNative.h>
 #include <winrt/Windows.Foundation.h>
+#include "JSI/JsiApiContext.h"
 #include "JSValueReader.h"
 #include "JSValueWriter.h"
 #include "ModuleRegistration.h"
@@ -411,6 +412,26 @@ constexpr bool MatchInputArg<std::string, std::wstring>() noexcept {
   return true;
 }
 
+template <>
+constexpr bool MatchInputArg<std::string, winrt::hstring>() noexcept {
+  return true;
+}
+
+template <>
+constexpr bool MatchInputArg<winrt::hstring, std::string>() noexcept {
+  return true;
+}
+
+template <>
+constexpr bool MatchInputArg<std::wstring, winrt::hstring>() noexcept {
+  return true;
+}
+
+template <>
+constexpr bool MatchInputArg<winrt::hstring, std::wstring>() noexcept {
+  return true;
+}
+
 template <class TResult, class TInputArgs, class TOutputCallbacks, class TOutputPromises>
 struct MethodSignature {
   using Result = TResult;
@@ -480,6 +501,7 @@ template <class TModule>
 struct ModuleInitMethodInfo<void (TModule::*)(ReactContext const &) noexcept> {
   using ModuleType = TModule;
   using MethodType = void (TModule::*)(ReactContext const &) noexcept;
+  using JsiMethodType = void (TModule::*)(ReactContext const &, facebook::jsi::Runtime &) noexcept;
 
   static InitializerDelegate GetInitializer(void *module, MethodType method) noexcept {
     return [module = static_cast<ModuleType *>(module), method](ReactContext const &reactContext) noexcept {
@@ -488,6 +510,23 @@ struct ModuleInitMethodInfo<void (TModule::*)(ReactContext const &) noexcept> {
   }
 };
 
+template <class TMethod>
+struct ModuleJsiInitMethodInfo;
+
+template <class TModule>
+struct ModuleJsiInitMethodInfo<void (TModule::*)(ReactContext const &, facebook::jsi::Runtime &) noexcept> {
+  using ModuleType = TModule;
+  using MethodType = void (TModule::*)(ReactContext const &, facebook::jsi::Runtime &) noexcept;
+
+  static JsiInitializerDelegate GetJsiInitializer(void *module, MethodType method) noexcept {
+    return
+        [module = static_cast<ModuleType *>(module), method](
+            ReactContext const &reactContext, winrt::Windows::Foundation::IInspectable const &runtimeHandle) noexcept {
+          (module->*method)(reactContext, GetOrCreateContextRuntime(reactContext, runtimeHandle));
+        };
+  }
+};
+
 // ==== MakeCallbackSignatures =================================================
 
 template <class TResult, class TOutputCallbackTuple>
@@ -1021,6 +1060,9 @@ struct ReactModuleBuilder {
     for (auto &initializer : m_initializers) {
       m_moduleBuilder.AddInitializer(initializer);
     }
+    for (auto &initializer : m_jsiinitializers) {
+      m_moduleBuilder.AddJsiInitializer(initializer);
+    }
   }
 
   template <class TMember, class TAttribute, int I>
@@ -1049,8 +1091,14 @@ struct ReactModuleBuilder {
 
   template <class TMethod>
   void RegisterInitMethod(TMethod method) noexcept {
-    auto initializer = ModuleInitMethodInfo<TMethod>::GetInitializer(m_module, method);
-    m_initializers.push_back(std::move(initializer));
+    if constexpr (ModuleMethodInfo<TMethod>::ArgCount == 1) {
+      auto initializer = ModuleInitMethodInfo<TMethod>::GetInitializer(m_module, method);
+      m_initializers.push_back(std::move(initializer));
+    } else {
+      static_assert(ModuleMethodInfo<TMethod>::ArgCount == 2);
+      auto jsiinitializer = ModuleJsiInitMethodInfo<TMethod>::GetJsiInitializer(m_module, method);
+      m_jsiinitializers.push_back(std::move(jsiinitializer));
+    }
   }
 
   template <class TMethod>
@@ -1109,6 +1157,7 @@ struct ReactModuleBuilder {
   std::wstring_view m_moduleName{L""};
   std::wstring_view m_eventEmitterName{L""};
   std::vector<InitializerDelegate> m_initializers;
+  std::vector<JsiInitializerDelegate> m_jsiinitializers;
 };
 
 struct VerificationResult {
@@ -1457,6 +1506,15 @@ inline ReactModuleProvider MakeTurboModuleProvider() noexcept {
   return MakeModuleProvider<TModule>();
 }
 
+// Clang does not allow a virtual function address to be a constexpr statement
+#if !defined(CONSTEXPR_SUPPORTED_ON_VIRTUAL_FN_ADDRESS)
+#if defined(__clang__)
+#define CONSTEXPR_SUPPORTED_ON_VIRTUAL_FN_ADDRESS
+#else
+#define CONSTEXPR_SUPPORTED_ON_VIRTUAL_FN_ADDRESS constexpr
+#endif
+#endif
+
 } // namespace winrt::Microsoft::ReactNative
 
 namespace React {