Adds option for non-ABI TurboModule provider

change/react-native-windows-a51c7eb0-1683-4bda-b24f-f68d7a7c772a.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Adds option for non-ABI TurboModule provider",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

vnext/Microsoft.ReactNative.Cxx/IJsiNonAbiHostObject.h

@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "jsi/jsi.h"
+#include "winrt/Microsoft.ReactNative.h"
+
+namespace winrt::Microsoft::ReactNative::implementation {
+
+struct JsiNonAbiHostObject : winrt::implements<JsiNonAbiHostObject, IJsiNonAbiHostObject> {
+ public: // IReactNonAbiHostObject
+  JsiNonAbiHostObject(std::shared_ptr<facebook::jsi::HostObject> const &hostObject) noexcept
+      : m_hostObject{hostObject} {}
+
+  std::shared_ptr<facebook::jsi::HostObject> HostObject() const noexcept {
+    return m_hostObject;
+  }
+
+ private:
+  std::shared_ptr<facebook::jsi::HostObject> m_hostObject;
+};
+
+} // namespace winrt::Microsoft::ReactNative::implementation

vnext/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems

@@ -77,6 +77,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)NativeModules.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ReactDispatcher.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ReactNonAbiValue.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)IJsiNonAbiHostObject.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ReactNotificationService.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ReactPropertyBag.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ReactContext.h" />

vnext/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems.filters

@@ -47,6 +47,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)NativeModules.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ReactDispatcher.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ReactNonAbiValue.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)IJsiNonAbiHostObject.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ReactNotificationService.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ReactPropertyBag.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ReactContext.h" />

vnext/Microsoft.ReactNative/IJsiNonAbiHostObject.idl

@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "DocString.h"
+
+namespace Microsoft.ReactNative
+{
+  [webhosthidden]
+  [uuid("62bb563d-865a-4131-b576-f91c90c7b6f7")] // uuid needed for empty interfaces
+  [version(0)]
+  [experimental]
+  DOC_STRING(
+    "The @IJsiNonAbiHostObject helps register C++ TurboModules to JSI runtime instances "
+    "that bypass ABI via @ReactModuleProvider. Since React Native Windows already uses "
+    "@IReactNonAbiValue internally to represent attributed native modules, this wrapper "
+    "is needed to have an alternate interface to type check against.")
+  interface IJsiNonAbiHostObject {}
+} // namespace Microsoft.ReactNative

vnext/Microsoft.ReactNative/TurboModulesProvider.cpp

@@ -8,10 +8,12 @@
 #include "pch.h"
 #include "TurboModulesProvider.h"
 #include <ReactCommon/TurboModuleUtils.h>
+#include "IJsiNonAbiHostObject.h"
 #include "JSDispatcherWriter.h"
 #include "JsiApi.h"
 #include "JsiReader.h"
 #include "JsiWriter.h"
+#include "ReactNonAbiValue.h"
 #ifdef __APPLE__
 #include "Crash.h"
 #else
@@ -106,12 +108,18 @@ class TurboModuleImpl : public facebook::react::TurboModule {
         m_providedModule(reactModuleProvider(m_moduleBuilder.as<IReactModuleBuilder>())) {
     if (auto hostObject = m_providedModule.try_as<IJsiHostObject>()) {
       m_hostObjectWrapper = std::make_shared<implementation::HostObjectWrapper>(hostObject);
+    } else if (auto nonAbiHostObject = m_providedModule.try_as<IJsiNonAbiHostObject>()) {
+      const auto nonAbiHostObjectImpl =
+          winrt::get_self<winrt::Microsoft::ReactNative::implementation::JsiNonAbiHostObject>(nonAbiHostObject);
+      m_nonAbiHostObject = nonAbiHostObjectImpl->HostObject();
     }
   }
 
   std::vector<facebook::jsi::PropNameID> getPropertyNames(facebook::jsi::Runtime &rt) override {
     if (m_hostObjectWrapper) {
       return m_hostObjectWrapper->getPropertyNames(rt);
+    } else if (m_nonAbiHostObject) {
+      return m_nonAbiHostObject->getPropertyNames(rt);
     }
 
     std::vector<facebook::jsi::PropNameID> propertyNames;
@@ -137,6 +145,8 @@ class TurboModuleImpl : public facebook::react::TurboModule {
   facebook::jsi::Value get(facebook::jsi::Runtime &runtime, const facebook::jsi::PropNameID &propName) override {
     if (m_hostObjectWrapper) {
       return m_hostObjectWrapper->get(runtime, propName);
+    } else if (m_nonAbiHostObject) {
+      return m_nonAbiHostObject->get(runtime, propName);
     }
 
     // it is not safe to assume that "runtime" never changes, so members are not cached here
@@ -380,7 +390,11 @@ class TurboModuleImpl : public facebook::react::TurboModule {
   void set(facebook::jsi::Runtime &rt, const facebook::jsi::PropNameID &name, const facebook::jsi::Value &value)
       override {
     if (m_hostObjectWrapper) {
-      return m_hostObjectWrapper->set(rt, name, value);
+      m_hostObjectWrapper->set(rt, name, value);
+      return;
+    } else if (m_nonAbiHostObject) {
+      m_nonAbiHostObject->set(rt, name, value);
+      return;
     }
 
     facebook::react::TurboModule::set(rt, name, value);
@@ -409,6 +423,7 @@ class TurboModuleImpl : public facebook::react::TurboModule {
   winrt::com_ptr<TurboModuleBuilder> m_moduleBuilder;
   IInspectable m_providedModule;
   std::shared_ptr<implementation::HostObjectWrapper> m_hostObjectWrapper;
+  std::shared_ptr<facebook::jsi::HostObject> m_nonAbiHostObject;
   std::weak_ptr<facebook::react::LongLivedObjectCollection> m_longLivedObjectCollection;
 };
 

vnext/Shared/Shared.vcxitems

@@ -552,6 +552,7 @@
     <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactCoreInjection.idl" />
     <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactInstanceSettings.idl" />
     <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeHost.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IJsiNonAbiHostObject.idl" />
     <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\RedBoxHandler.idl" />
   </ItemGroup>
   <ItemGroup Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'">

vnext/Shared/Shared.vcxitems.filters

@@ -789,6 +789,7 @@
     <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactCoreInjection.idl" />
     <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactInstanceSettings.idl" />
     <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeHost.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IJsiNonAbiHostObject.idl" />
     <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\RedBoxHandler.idl" />
   </ItemGroup>
 </Project>