Rename to .hpp

example/ios/NitroExample.xcodeproj/project.pbxproj

@@ -608,6 +608,7 @@
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native";
 				SDKROOT = iphoneos;
+				SWIFT_OBJC_INTEROP_MODE = objcxx;
 				USE_HERMES = true;
 			};
 			name = Debug;
@@ -683,6 +684,7 @@
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native";
 				SDKROOT = iphoneos;
+				SWIFT_OBJC_INTEROP_MODE = objcxx;
 				USE_HERMES = true;
 				VALIDATE_PRODUCT = YES;
 			};

example/ios/Podfile.lock

@@ -1440,7 +1440,7 @@ SPEC CHECKSUMS:
   React-jsitracing: 0fa7f78d8fdda794667cb2e6f19c874c1cf31d7e
   React-logger: 29fa3e048f5f67fe396bc08af7606426d9bd7b5d
   React-Mapbuffer: bf56147c9775491e53122a94c423ac201417e326
-  react-native-nitro-modules: 7ce374898fa9867e18014b6960457c9da17096d2
+  react-native-nitro-modules: 9f30e849db461f046b881701efcebd3c2d44f6aa
   React-nativeconfig: 9f223cd321823afdecf59ed00861ab2d69ee0fc1
   React-NativeModulesApple: ff7efaff7098639db5631236cfd91d60abff04c0
   React-perflogger: 32ed45d9cee02cf6639acae34251590dccd30994

packages/react-native-nitro-modules/android/cpp-adapter.cpp

@@ -1,5 +1,5 @@
 #include <jni.h>
-#include "react-native-nitro.h"
+#include "react-native-nitro.hpp"
 
 extern "C"
 JNIEXPORT jdouble JNICALL

packages/react-native-nitro-modules/cpp/core/HybridObject.cpp

@@ -2,9 +2,9 @@
 // Created by Marc Rousavy on 21.02.24.
 //
 
-#include "HybridObject.h"
-#include "JSIConverter.h"
-#include "Logger.h"
+#include "HybridObject.hpp"
+#include "JSIConverter.hpp"
+#include "Logger.hpp"
 
 namespace margelo {
 

packages/react-native-nitro-modules/cpp/core/HybridObject.h → packages/react-native-nitro-modules/cpp/core/HybridObject.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "JSIConverter.h"
-#include "Logger.h"
+#include "JSIConverter.hpp"
+#include "NitroLogger.hpp"
 #include <functional>
 #include <jsi/jsi.h>
 #include <memory>

packages/react-native-nitro-modules/cpp/core/JSIConverter.h → packages/react-native-nitro-modules/cpp/core/JSIConverter.hpp

@@ -4,12 +4,11 @@
 
 #pragma once
 
-#include "EnumMapper.h"
-#include "HybridObject.h"
-#include "Promise.h"
-#include "PromiseFactory.h"
-#include "WorkletRuntimeRegistry.h"
-#include "threading/Dispatcher.h"
+#include "EnumMapper.hpp"
+#include "HybridObject.hpp"
+#include "Promise.hpp"
+#include "PromiseFactory.hpp"
+#include "Dispatcher.hpp"
 #include <array>
 #include <future>
 #include <jsi/jsi.h>
@@ -201,7 +200,8 @@ template <typename ReturnType, typename... Args> struct JSIConverter<std::functi
   static std::function<ReturnType(Args...)> fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
     jsi::Function function = arg.getObject(runtime).getFunction(runtime);
 
-    std::shared_ptr<jsi::Function> sharedFunction = JSIHelper::createSharedJsiFunction(runtime, std::move(function));
+    // TODO: Weakify this using a RuntimeWatch so it is safely managed by the Runtime, not by us.
+    auto sharedFunction = std::make_shared<jsi::Function>(std::move(function));
     return [&runtime, sharedFunction](Args... args) -> ReturnType {
       jsi::Value result = sharedFunction->call(runtime, JSIConverter<std::decay_t<Args>>::toJSI(runtime, args)...);
       if constexpr (std::is_same_v<ReturnType, void>) {

packages/react-native-nitro-modules/cpp/core/PointerHolder.h → packages/react-native-nitro-modules/cpp/core/PointerHolder.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "HybridObject.h"
-#include "Logger.h"
+#include "HybridObject.hpp"
+#include "NitroLogger.hpp"
 #include <memory>
 #include <mutex>
 

packages/react-native-nitro-modules/cpp/core/Promise.cpp

@@ -1,4 +1,4 @@
-#include "Promise.h"
+#include "Promise.hpp"
 #include <future>
 #include <jsi/jsi.h>
 #include <utility>

packages/react-native-nitro-modules/cpp/core/PromiseFactory.cpp

@@ -5,9 +5,9 @@
 //  Created by Marc Rousavy on 11.03.24.
 //
 
-#include "PromiseFactory.h"
-#include "Logger.h"
-#include "threading/Dispatcher.h"
+#include "PromiseFactory.hpp"
+#include "Logger.hpp"
+#include "threading/Dispatcher.hpp"
 
 namespace margelo {
 

packages/react-native-nitro-modules/cpp/core/PromiseFactory.h → packages/react-native-nitro-modules/cpp/core/PromiseFactory.hpp

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "Promise.h"
-#include "threading/Dispatcher.h"
+#include "Promise.hpp"
+#include "Dispatcher.hpp"
 #include <jsi/jsi.h>
 #include <memory>
 

packages/react-native-nitro-modules/cpp/react-native-nitro.cpp

@@ -1,7 +1,10 @@
-#include "react-native-nitro.h"
+#include "react-native-nitro.hpp"
+
+#include <react-native-nitro-modules/react-native-nitro-modules-umbrella.h>
 
 namespace nitro {
 	double multiply(double a, double b) {
+
 		return a * b;
 	}
 }

packages/react-native-nitro-modules/cpp/threading/CallInvokerDispatcher.h → packages/react-native-nitro-modules/cpp/threading/CallInvokerDispatcher.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Dispatcher.h"
+#include "Dispatcher.hpp"
 #include <ReactCommon/CallInvoker.h>
 
 namespace margelo {

packages/react-native-nitro-modules/cpp/threading/Dispatcher.cpp

@@ -1,5 +1,5 @@
-#include "Dispatcher.h"
-#include "Logger.h"
+#include "Dispatcher.hpp"
+#include "Logger.hpp"
 
 namespace margelo {
 

packages/react-native-nitro-modules/cpp/utils/NitroLogger.hpp

@@ -0,0 +1,28 @@
+//
+// Created by Marc Rousavy on 05.03.24.
+//
+
+#pragma once
+
+#include <iostream>
+#include <string>
+#include <format>
+
+namespace margelo {
+
+class Logger {
+private:
+  Logger() = delete;
+
+public:
+  template <typename... Args> inline static void log(const std::string& tag, const std::string& message, Args&&... args) {
+    try {
+      std::string formattedMessage = std::format(message, std::forward<decltype(args)>(args)...);
+      std::cout << "[" << tag << "] " << formattedMessage << std::endl;
+    } catch (const std::format_error& e) {
+      std::cerr << "Formatting error: " << e.what() << std::endl;
+    }
+  }
+};
+
+} // namespace margelo

packages/react-native-nitro-modules/react-native-nitro-modules.podspec

@@ -18,7 +18,8 @@ Pod::Spec.new do |s|
   s.subspec 'C++-Bindings' do |ss|
     # VisionCamera Core C++ bindings
     ss.source_files = [
-      "cpp/**/*.{h,c,cpp}"
+      "cpp/**/*.{h,c}",
+      "cpp/**/*.{hpp,cpp}"
     ]
     ss.public_header_files = [
       "cpp/**/*.h"