react-native-nitro-modules 0.0.8 → 0.1.4

package/cpp/jsi/JSIConverter+Variant.hpp

@@ -0,0 +1,97 @@
+//
+// Created by Marc Rousavy on 21.02.24.
+//
+
+#pragma once
+
+// Forward declare a few of the common types that might have cyclic includes.
+namespace margelo::nitro {
+struct AnyValue;
+class AnyMap;
+
+template <typename T, typename Enable>
+struct JSIConverter;
+} // namespace margelo::nitro
+
+#include "JSIConverter.hpp"
+#include "JSIConverter+Vector.hpp"
+#include "JSIConverter+UnorderedMap.hpp"
+
+#include "AnyMap.hpp"
+#include "IsInPack.hpp"
+#include "TypeInfo.hpp"
+#include <jsi/jsi.h>
+#include <memory>
+#include <variant>
+
+namespace margelo::nitro {
+
+using namespace facebook;
+
+// std::variant<A, B, C> <> A | B | C
+template <typename... Types>
+struct JSIConverter<std::variant<Types...>> {
+  static inline std::variant<Types...> fromJSI(jsi::Runtime& runtime, const jsi::Value& value) {
+    if (value.isNull()) {
+      if constexpr (is_in_pack_v<std::monostate, Types...>) {
+        return std::monostate();
+      } else {
+        throw typeNotSupportedError("null");
+      }
+    } else if (value.isBool()) {
+      if constexpr (is_in_pack_v<bool, Types...>) {
+        return JSIConverter<bool>::fromJSI(runtime, value);
+      } else {
+        throw typeNotSupportedError("boolean");
+      }
+    } else if (value.isNumber()) {
+      if constexpr (is_in_pack_v<double, Types...>) {
+        return JSIConverter<double>::fromJSI(runtime, value);
+      } else {
+        throw typeNotSupportedError("number");
+      }
+    } else if (value.isString()) {
+      if constexpr (is_in_pack_v<std::string, Types...>) {
+        return JSIConverter<std::string>::fromJSI(runtime, value);
+      } else {
+        throw typeNotSupportedError("string");
+      }
+    } else if (value.isBigInt()) {
+      if constexpr (is_in_pack_v<int64_t, Types...>) {
+        return JSIConverter<int64_t>::fromJSI(runtime, value);
+      } else {
+        throw typeNotSupportedError("bigint");
+      }
+    } else if (value.isObject()) {
+      jsi::Object valueObj = value.getObject(runtime);
+      if (valueObj.isArray(runtime)) {
+        if constexpr (is_in_pack_v<std::vector<AnyValue>, Types...>) {
+          return JSIConverter<std::vector<AnyValue>>::fromJSI(runtime, value);
+        } else {
+          throw typeNotSupportedError("array[]");
+        }
+      } else {
+        if constexpr (is_in_pack_v<std::unordered_map<std::string, AnyValue>, Types...>) {
+          return JSIConverter<std::unordered_map<std::string, AnyValue>>::fromJSI(runtime, value);
+        } else {
+          throw typeNotSupportedError("object{}");
+        }
+      }
+    } else {
+      std::string stringRepresentation = value.toString(runtime).utf8(runtime);
+      throw std::runtime_error("Cannot convert \"" + stringRepresentation + "\" to std::variant<...>!");
+    }
+  }
+
+  static inline jsi::Value toJSI(jsi::Runtime& runtime, const std::variant<Types...>& variant) {
+    return std::visit([&runtime](const auto& val) { return JSIConverter<std::decay_t<decltype(val)>>::toJSI(runtime, val); }, variant);
+  }
+
+private:
+  static inline std::runtime_error typeNotSupportedError(const std::string& type) {
+    std::string types = TypeInfo::getFriendlyTypenames<Types...>();
+    return std::runtime_error(type + " is not supported in variant<" + types + ">!");
+  }
+};
+
+} // namespace margelo::nitro

package/cpp/jsi/JSIConverter+Vector.hpp

@@ -0,0 +1,48 @@
+//
+// Created by Marc Rousavy on 21.02.24.
+//
+
+#pragma once
+
+// Forward declare a few of the common types that might have cyclic includes.
+namespace margelo::nitro {
+template <typename T, typename Enable>
+struct JSIConverter;
+} // namespace margelo::nitro
+
+#include "JSIConverter.hpp"
+
+#include "AnyMap.hpp"
+#include <jsi/jsi.h>
+#include <vector>
+
+namespace margelo::nitro {
+
+using namespace facebook;
+
+// std::vector<T> <> T[]
+template <typename ElementType>
+struct JSIConverter<std::vector<ElementType>> {
+  static inline std::vector<ElementType> fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+    jsi::Array array = arg.asObject(runtime).asArray(runtime);
+    size_t length = array.size(runtime);
+
+    std::vector<ElementType> vector;
+    vector.reserve(length);
+    for (size_t i = 0; i < length; ++i) {
+      jsi::Value elementValue = array.getValueAtIndex(runtime, i);
+      vector.emplace_back(JSIConverter<ElementType>::fromJSI(runtime, elementValue));
+    }
+    return vector;
+  }
+  static inline jsi::Value toJSI(jsi::Runtime& runtime, const std::vector<ElementType>& vector) {
+    jsi::Array array(runtime, vector.size());
+    for (size_t i = 0; i < vector.size(); i++) {
+      jsi::Value value = JSIConverter<ElementType>::toJSI(runtime, vector[i]);
+      array.setValueAtIndex(runtime, i, std::move(value));
+    }
+    return array;
+  }
+};
+
+} // namespace margelo::nitro

package/cpp/jsi/JSIConverter.hpp

@@ -4,46 +4,27 @@
 
 #pragma once
 
+// Forward declare a few of the common types that might have cyclic includes.
 namespace margelo::nitro {
-class HybridObject;
-}
+template <typename T, typename Enable>
+struct JSIConverter;
+} // namespace margelo::nitro
 
-#include "AnyMap.hpp"
-#include "ArrayBuffer.hpp"
-#include "Dispatcher.hpp"
-#include "FutureType.hpp"
-#include "HybridObject.hpp"
-#include "IsHostObject.hpp"
-#include "IsInPack.hpp"
-#include "IsNativeState.hpp"
-#include "JSICache.hpp"
-#include "NitroHash.hpp"
-#include "Promise.hpp"
-#include "TypeInfo.hpp"
-#include <array>
-#include <future>
 #include <jsi/jsi.h>
-#include <memory>
-#include <tuple>
 #include <type_traits>
-#include <unordered_map>
 #include <variant>
 
-#define DO_NULL_CHECKS true
-
 namespace margelo::nitro {
 
-/**
- The JSIConverter<T> class can convert any type from and to a jsi::Value.
- It uses templates to statically create fromJSI/toJSI methods, and will throw compile-time errors
- if a given type is not convertable.
- Value types, custom types (HostObjects), and even functions with any number of arguments/types are supported.
- This type can be extended by just creating a new template for JSIConverter in a header.
- */
-
 using namespace facebook;
 
-// Unknown type (error)
+/**
+ * The JSIConverter<T> class can convert any type from and to a jsi::Value.
+ * It uses templates to statically create fromJSI/toJSI methods, and will throw compile-time errors
+ * if a given type is not convertable.
+ * Value types, custom types (HostObjects), and even functions with any number of arguments/types are supported.
+ * This type can be extended by just creating a new template for JSIConverter in a header.
+ */
 template <typename ArgType, typename Enable = void>
 struct JSIConverter final {
   JSIConverter() = delete;
@@ -150,472 +131,15 @@ struct JSIConverter<std::string> {
   }
 };
 
-// std::optional<T> <> T | undefined
-template <typename TInner>
-struct JSIConverter<std::optional<TInner>> {
-  static inline std::optional<TInner> fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
-    if (arg.isUndefined() || arg.isNull()) {
-      return std::nullopt;
-    } else {
-      return JSIConverter<TInner>::fromJSI(runtime, arg);
-    }
-  }
-  static inline jsi::Value toJSI(jsi::Runtime& runtime, const std::optional<TInner>& arg) {
-    if (arg == std::nullopt) {
-      return jsi::Value::undefined();
-    } else {
-      return JSIConverter<TInner>::toJSI(runtime, arg.value());
-    }
-  }
-};
-
-// std::future<T> <> Promise<T>
-template <typename TResult>
-struct JSIConverter<std::future<TResult>> {
-  static inline std::future<TResult> fromJSI(jsi::Runtime&, const jsi::Value&) {
-    throw std::runtime_error("Promise cannot be converted to a native type - it needs to be awaited first!");
-  }
-  static inline jsi::Value toJSI(jsi::Runtime& runtime, std::future<TResult>&& arg) {
-    auto sharedFuture = std::make_shared<std::future<TResult>>(std::move(arg));
-    std::shared_ptr<Dispatcher> strongDispatcher = Dispatcher::getRuntimeGlobalDispatcher(runtime);
-    std::weak_ptr<Dispatcher> weakDispatcher = strongDispatcher;
-
-    return Promise::createPromise(runtime, [sharedFuture, weakDispatcher](jsi::Runtime& runtime, std::shared_ptr<Promise> promise) {
-      // Spawn new async thread to synchronously wait for the `future<T>` to complete
-      std::thread waiterThread([promise, &runtime, weakDispatcher, sharedFuture]() {
-        // synchronously wait until the `future<T>` completes. we are running on a background task here.
-        sharedFuture->wait();
-
-        // the async function completed successfully, get a JS Dispatcher so we can resolve on JS Thread
-        std::shared_ptr<Dispatcher> dispatcher = weakDispatcher.lock();
-        if (!dispatcher) {
-          Logger::log("JSIConverter", "Tried resolving Promise on JS Thread, but the `Dispatcher` has already been destroyed.");
-          return;
-        }
-
-        dispatcher->runAsync([&runtime, promise, sharedFuture]() mutable {
-          try {
-            if constexpr (std::is_void_v<TResult>) {
-              // it's returning void, just return undefined to JS
-              sharedFuture->get();
-              promise->resolve(runtime, jsi::Value::undefined());
-            } else {
-              // it's returning a custom type, convert it to a jsi::Value
-              TResult result = sharedFuture->get();
-              jsi::Value jsResult = JSIConverter<TResult>::toJSI(runtime, result);
-              promise->resolve(runtime, std::move(jsResult));
-            }
-          } catch (const std::exception& exception) {
-            // the async function threw an error, reject the promise on JS Thread
-            std::string what = exception.what();
-            promise->reject(runtime, what);
-          } catch (...) {
-            // the async function threw a non-std error, try getting it
-            std::string name = TypeInfo::getCurrentExceptionName();
-            promise->reject(runtime, "Unknown non-std exception: " + name);
-          }
-
-          // This lambda owns the promise shared pointer, and we need to call its
-          // destructor on the correct thread here - otherwise it might be called
-          // from the waiterThread.
-          promise = nullptr;
-        });
-      });
-      waiterThread.detach();
-    });
-  }
-};
-
-// [](Args...) -> T {} <> (Args...) => T
-template <typename ReturnType, typename... Args>
-struct JSIConverter<std::function<ReturnType(Args...)>> {
-  // std::future<T> -> T
-  using ResultingType = future_type_v<ReturnType>;
-
-  static inline ResultingType callJSFunction(jsi::Runtime& runtime, const OwningReference<jsi::Function>& function, const Args&... args) {
-    // Throw a lock on the OwningReference<T> so we can guarantee safe access (Hermes GC cannot delete it while `lock` is alive)
-    OwningLock<jsi::Function> lock = function.lock();
-
-    if (!function) {
-      if constexpr (std::is_void_v<ResultingType>) {
-        // runtime has already been deleted. since this returns void, we can just ignore it being deleted.
-        Logger::log("JSIConverter", "Tried calling void(..) function, but it has already been deleted by JS!");
-        return;
-      } else {
-        // runtime has already been deleted, but we are expecting a return value - throw an error in this case.
-        throw std::runtime_error("Cannot call the given Function - the JS Dispatcher has already been destroyed by the JS Runtime!");
-      }
-    }
-
-    if constexpr (std::is_void_v<ResultingType>) {
-      // It returns void. Just call the function
-      function->call(runtime, JSIConverter<std::decay_t<Args>>::toJSI(runtime, args)...);
-    } else {
-      // It returns some kind of value - call the function, and convert the return value.
-      jsi::Value result = function->call(runtime, JSIConverter<std::decay_t<Args>>::toJSI(runtime, args)...);
-      return JSIConverter<ResultingType>::fromJSI(runtime, std::move(result));
-    }
-  }
-
-  static inline std::function<ReturnType(Args...)> fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
-    // Make function global - it'll be managed by the Runtime's memory, and we only have a weak_ref to it.
-    auto cache = JSICache<jsi::Function>::getOrCreateCache(runtime);
-    jsi::Function function = arg.asObject(runtime).asFunction(runtime);
-    OwningReference<jsi::Function> sharedFunction = cache.makeGlobal(std::move(function));
-
-    std::shared_ptr<Dispatcher> strongDispatcher = Dispatcher::getRuntimeGlobalDispatcher(runtime);
-    std::weak_ptr<Dispatcher> weakDispatcher = strongDispatcher;
-
-    // Create a C++ function that can be called by the consumer.
-    // This will call the jsi::Function if it is still alive.
-    return [&runtime, weakDispatcher, sharedFunction = std::move(sharedFunction)](Args... args) -> ReturnType {
-      // Try to get the JS Dispatcher if the Runtime is still alive
-      std::shared_ptr<Dispatcher> dispatcher = weakDispatcher.lock();
-      if (!dispatcher) {
-        if constexpr (std::is_void_v<ResultingType>) {
-          Logger::log("JSIConverter", "Tried calling void(..) function, but the JS Dispatcher has already been deleted by JS!");
-          return;
-        } else {
-          throw std::runtime_error("Cannot call the given Function - the JS Dispatcher has already been destroyed by the JS Runtime!");
-        }
-      }
-
-      if constexpr (std::is_void_v<ResultingType>) {
-        dispatcher->runAsync([&runtime, sharedFunction = std::move(sharedFunction), ... args = std::move(args)]() {
-          callJSFunction(runtime, sharedFunction, args...);
-        });
-      } else {
-        return dispatcher->runAsyncAwaitable<ResultingType>(
-            [&runtime, sharedFunction = std::move(sharedFunction), ... args = std::move(args)]() -> ResultingType {
-              return callJSFunction(runtime, sharedFunction, args...);
-            });
-      }
-    };
-  }
-
-  template <size_t... Is>
-  static inline jsi::Value callHybridFunction(const std::function<ReturnType(Args...)>& function, jsi::Runtime& runtime,
-                                              const jsi::Value* args, std::index_sequence<Is...>) {
-    if constexpr (std::is_void_v<ReturnType>) {
-      // it is a void function (will return undefined in JS)
-      function(JSIConverter<std::decay_t<Args>>::fromJSI(runtime, args[Is])...);
-      return jsi::Value::undefined();
-    } else {
-      // it is a custom type, parse it to a JS value
-      ReturnType result = function(JSIConverter<std::decay_t<Args>>::fromJSI(runtime, args[Is])...);
-      return JSIConverter<ReturnType>::toJSI(runtime, result);
-    }
-  }
-  static inline jsi::Value toJSI(jsi::Runtime& runtime, std::function<ReturnType(Args...)>&& function) {
-    jsi::HostFunctionType jsFunction = [function = std::move(function)](jsi::Runtime& runtime, const jsi::Value& thisValue,
-                                                                        const jsi::Value* args, size_t count) -> jsi::Value {
-      if (count != sizeof...(Args)) [[unlikely]] {
-        throw jsi::JSError(runtime, "Function expected " + std::to_string(sizeof...(Args)) + " arguments, but received " +
-                                        std::to_string(count) + "!");
-      }
-      return callHybridFunction(function, runtime, args, std::index_sequence_for<Args...>{});
-    };
-    return jsi::Function::createFromHostFunction(runtime, jsi::PropNameID::forUtf8(runtime, "hostFunction"), sizeof...(Args), jsFunction);
-  }
-};
-
-// std::vector<T> <> T[]
-template <typename ElementType>
-struct JSIConverter<std::vector<ElementType>> {
-  static inline std::vector<ElementType> fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
-    jsi::Array array = arg.asObject(runtime).asArray(runtime);
-    size_t length = array.size(runtime);
-
-    std::vector<ElementType> vector;
-    vector.reserve(length);
-    for (size_t i = 0; i < length; ++i) {
-      jsi::Value elementValue = array.getValueAtIndex(runtime, i);
-      vector.emplace_back(JSIConverter<ElementType>::fromJSI(runtime, elementValue));
-    }
-    return vector;
-  }
-  static inline jsi::Value toJSI(jsi::Runtime& runtime, const std::vector<ElementType>& vector) {
-    jsi::Array array(runtime, vector.size());
-    for (size_t i = 0; i < vector.size(); i++) {
-      jsi::Value value = JSIConverter<ElementType>::toJSI(runtime, vector[i]);
-      array.setValueAtIndex(runtime, i, std::move(value));
-    }
-    return array;
-  }
-};
-
-// std::unordered_map<std::string, T> <> Record<string, T>
-template <typename ValueType>
-struct JSIConverter<std::unordered_map<std::string, ValueType>> {
-  static inline std::unordered_map<std::string, ValueType> fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
-    jsi::Object object = arg.asObject(runtime);
-    jsi::Array propertyNames = object.getPropertyNames(runtime);
-    size_t length = propertyNames.size(runtime);
-
-    std::unordered_map<std::string, ValueType> map;
-    map.reserve(length);
-    for (size_t i = 0; i < length; ++i) {
-      std::string key = propertyNames.getValueAtIndex(runtime, i).asString(runtime).utf8(runtime);
-      jsi::Value value = object.getProperty(runtime, key.c_str());
-      map.emplace(key, JSIConverter<ValueType>::fromJSI(runtime, value));
-    }
-    return map;
-  }
-  static inline jsi::Value toJSI(jsi::Runtime& runtime, const std::unordered_map<std::string, ValueType>& map) {
-    jsi::Object object(runtime);
-    for (const auto& pair : map) {
-      jsi::Value value = JSIConverter<ValueType>::toJSI(runtime, pair.second);
-      object.setProperty(runtime, pair.first.c_str(), std::move(value));
-    }
-    return object;
-  }
-};
-
-// std::tuple<A, B, C> <> [A, B, C]
-template <typename... Types>
-struct JSIConverter<std::tuple<Types...>> {
-  static inline std::tuple<Types...> fromJSI(jsi::Runtime& runtime, const jsi::Value& value) {
-    jsi::Object object = value.asObject(runtime);
-    jsi::Array array = object.asArray(runtime);
-    if (array.size(runtime) != sizeof...(Types)) [[unlikely]] {
-      std::string types = TypeInfo::getFriendlyTypenames<Types...>();
-      throw std::runtime_error("The given JS Array has " + std::to_string(array.size(runtime)) + " items, but std::tuple<" + types +
-                               "> expects " + std::to_string(sizeof...(Types)) + " items.");
-    }
-
-    return copyArrayItemsToTuple(runtime, array, std::index_sequence_for<Types...>{});
-  }
-
-  static inline jsi::Value toJSI(jsi::Runtime& runtime, const std::tuple<Types...>& tuple) {
-    jsi::Array array(runtime, sizeof...(Types));
-    copyTupleItemsToArray(runtime, array, tuple, std::index_sequence_for<Types...>{});
-    return array;
-  }
-
-private:
-  template <std::size_t... Is>
-  static inline std::tuple<Types...> copyArrayItemsToTuple(jsi::Runtime& runtime, const jsi::Array& array, std::index_sequence<Is...>) {
-    return std::make_tuple(JSIConverter<Types>::fromJSI(runtime, array.getValueAtIndex(runtime, Is))...);
-  }
-
-  template <std::size_t... Is>
-  static inline void copyTupleItemsToArray(jsi::Runtime& runtime, jsi::Array& array, const std::tuple<Types...>& tuple,
-                                           std::index_sequence<Is...>) {
-    ((array.setValueAtIndex(runtime, Is,
-                            JSIConverter<std::tuple_element_t<Is, std::tuple<Types...>>>::toJSI(runtime, std::get<Is>(tuple)))),
-     ...);
-  }
-};
-
-// std::variant<A, B, C> <> A | B | C
-template <typename... Types>
-struct JSIConverter<std::variant<Types...>> {
-  static inline std::variant<Types...> fromJSI(jsi::Runtime& runtime, const jsi::Value& value) {
-    if (value.isNull()) {
-      if constexpr (is_in_pack_v<std::monostate, Types...>) {
-        return std::monostate();
-      } else {
-        throw typeNotSupportedError("null");
-      }
-    } else if (value.isBool()) {
-      if constexpr (is_in_pack_v<bool, Types...>) {
-        return JSIConverter<bool>::fromJSI(runtime, value);
-      } else {
-        throw typeNotSupportedError("boolean");
-      }
-    } else if (value.isNumber()) {
-      if constexpr (is_in_pack_v<double, Types...>) {
-        return JSIConverter<double>::fromJSI(runtime, value);
-      } else {
-        throw typeNotSupportedError("number");
-      }
-    } else if (value.isString()) {
-      if constexpr (is_in_pack_v<std::string, Types...>) {
-        return JSIConverter<std::string>::fromJSI(runtime, value);
-      } else {
-        throw typeNotSupportedError("string");
-      }
-    } else if (value.isBigInt()) {
-      if constexpr (is_in_pack_v<int64_t, Types...>) {
-        return JSIConverter<int64_t>::fromJSI(runtime, value);
-      } else {
-        throw typeNotSupportedError("bigint");
-      }
-    } else if (value.isObject()) {
-      jsi::Object valueObj = value.getObject(runtime);
-      if (valueObj.isArray(runtime)) {
-        if constexpr (is_in_pack_v<std::vector<AnyValue>, Types...>) {
-          return JSIConverter<std::vector<AnyValue>>::fromJSI(runtime, value);
-        } else {
-          throw typeNotSupportedError("array[]");
-        }
-      } else {
-        if constexpr (is_in_pack_v<std::unordered_map<std::string, AnyValue>, Types...>) {
-          return JSIConverter<std::unordered_map<std::string, AnyValue>>::fromJSI(runtime, value);
-        } else {
-          throw typeNotSupportedError("object{}");
-        }
-      }
-    } else {
-      std::string stringRepresentation = value.toString(runtime).utf8(runtime);
-      throw std::runtime_error("Cannot convert \"" + stringRepresentation + "\" to std::variant<...>!");
-    }
-  }
-
-  static inline jsi::Value toJSI(jsi::Runtime& runtime, const std::variant<Types...>& variant) {
-    return std::visit([&runtime](const auto& val) { return JSIConverter<std::decay_t<decltype(val)>>::toJSI(runtime, val); }, variant);
-  }
-
-private:
-  static inline std::runtime_error typeNotSupportedError(const std::string& type) {
-    std::string types = TypeInfo::getFriendlyTypenames<Types...>();
-    return std::runtime_error(type + " is not supported in variant<" + types + ">!");
-  }
-};
-
-// AnyValue <> Record<K, V>
-template <>
-struct JSIConverter<AnyValue> {
-  static inline AnyValue fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
-    return JSIConverter<AnyValue::variant>::fromJSI(runtime, arg);
-  }
-  static inline jsi::Value toJSI(jsi::Runtime& runtime, const AnyValue& value) {
-    return JSIConverter<std::variant<AnyValue::variant>>::toJSI(runtime, value);
-  }
-};
-
-// AnyMap <> Record<K, V>
-template <>
-struct JSIConverter<std::shared_ptr<AnyMap>> {
-  static inline std::shared_ptr<AnyMap> fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
-    jsi::Object object = arg.asObject(runtime);
-    jsi::Array propNames = object.getPropertyNames(runtime);
-    size_t size = propNames.size(runtime);
-    std::shared_ptr<AnyMap> map = AnyMap::make();
-    for (size_t i = 0; i < size; i++) {
-      jsi::String jsKey = propNames.getValueAtIndex(runtime, i).getString(runtime);
-      jsi::Value jsValue = object.getProperty(runtime, jsKey);
-      map->setAny(jsKey.utf8(runtime), JSIConverter<AnyValue>::fromJSI(runtime, jsValue));
-    }
-    return map;
-  }
-  static inline jsi::Value toJSI(jsi::Runtime& runtime, std::shared_ptr<AnyMap> map) {
-    jsi::Object object(runtime);
-    for (const auto& item : map->getMap()) {
-      jsi::String key = jsi::String::createFromUtf8(runtime, item.first);
-      jsi::Value value = JSIConverter<AnyValue>::toJSI(runtime, item.second);
-      object.setProperty(runtime, std::move(key), std::move(value));
-    }
-    return object;
-  }
-};
-
-// MutableBuffer <> ArrayBuffer
-template <>
-struct JSIConverter<std::shared_ptr<jsi::MutableBuffer>> {
-  static inline std::shared_ptr<ArrayBuffer> fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
-    jsi::Object object = arg.asObject(runtime);
-    if (!object.isArrayBuffer(runtime)) [[unlikely]] {
-      throw std::runtime_error("Object \"" + arg.toString(runtime).utf8(runtime) + "\" is not an ArrayBuffer!");
-    }
-    jsi::ArrayBuffer arrayBuffer = object.getArrayBuffer(runtime);
-    return std::make_shared<ArrayBuffer>(arrayBuffer.data(runtime), arrayBuffer.size(runtime), false);
-  }
-  static inline jsi::Value toJSI(jsi::Runtime& runtime, std::shared_ptr<jsi::MutableBuffer> buffer) {
-    return jsi::ArrayBuffer(runtime, buffer);
-  }
-};
-
-// HybridObject <> {}
-template <typename T>
-struct JSIConverter<T, std::enable_if_t<is_shared_ptr_to_host_object_v<T>>> {
-  using TPointee = typename T::element_type;
-
-  static inline T fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
-#if DO_NULL_CHECKS
-    if (arg.isUndefined()) [[unlikely]] {
-      throw jsi::JSError(runtime, invalidTypeErrorMessage("undefined", "It is undefined!"));
-    }
-    if (!arg.isObject()) [[unlikely]] {
-      std::string stringRepresentation = arg.toString(runtime).utf8(runtime);
-      throw jsi::JSError(runtime, invalidTypeErrorMessage(stringRepresentation, "It is not an object!"));
-    }
-#endif
-    jsi::Object object = arg.asObject(runtime);
-#if DO_NULL_CHECKS
-    if (!object.isHostObject<TPointee>(runtime)) [[unlikely]] {
-      std::string stringRepresentation = arg.toString(runtime).utf8(runtime);
-      throw jsi::JSError(runtime, invalidTypeErrorMessage(stringRepresentation, "It is a different HostObject<T>!"));
-    }
-#endif
-    return object.asHostObject<TPointee>(runtime);
-  }
-
-  static inline jsi::Value toJSI(jsi::Runtime& runtime, const T& arg) {
-#if DO_NULL_CHECKS
-    if (arg == nullptr) [[unlikely]] {
-      std::string typeName = TypeInfo::getFriendlyTypename<TPointee>();
-      throw jsi::JSError(runtime, "Cannot convert nullptr to HostObject<" + typeName + ">!");
-    }
-#endif
-    if constexpr (std::is_base_of_v<HybridObject, TPointee>) {
-      // It's a HybridObject - use it's internal constructor which caches jsi::Objects for proper memory management!
-      return arg->toObject(runtime);
-    } else {
-      // It's any other kind of jsi::HostObject - just create it as normal.
-      return jsi::Object::createFromHostObject(runtime, arg);
-    }
-  }
-
-private:
-  static inline std::string invalidTypeErrorMessage(const std::string& typeDescription, const std::string& reason) {
-    std::string typeName = TypeInfo::getFriendlyTypename<TPointee>();
-    return "Cannot convert \"" + typeDescription + "\" to HostObject<" + typeName + ">! " + reason;
-  }
-};
-
-// NativeState <> {}
-template <typename T>
-struct JSIConverter<T, std::enable_if_t<is_shared_ptr_to_native_state_v<T>>> {
-  using TPointee = typename T::element_type;
-
-  static inline T fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
-#if DO_NULL_CHECKS
-    if (arg.isUndefined()) [[unlikely]] {
-      throw jsi::JSError(runtime, invalidTypeErrorMessage("undefined", "It is undefined!"));
-    }
-    if (!arg.isObject()) [[unlikely]] {
-      std::string stringRepresentation = arg.toString(runtime).utf8(runtime);
-      throw jsi::JSError(runtime, invalidTypeErrorMessage(stringRepresentation, "It is not an object!"));
-    }
-#endif
-    jsi::Object object = arg.asObject(runtime);
-#if DO_NULL_CHECKS
-    if (!object.hasNativeState<TPointee>(runtime)) [[unlikely]] {
-      std::string stringRepresentation = arg.toString(runtime).utf8(runtime);
-      throw jsi::JSError(runtime, invalidTypeErrorMessage(stringRepresentation, "It is a different NativeState<T>!"));
-    }
-#endif
-    return object.getNativeState<TPointee>(runtime);
-  }
-
-  static inline jsi::Value toJSI(jsi::Runtime& runtime, const T& arg) {
-#if DO_NULL_CHECKS
-    if (arg == nullptr) [[unlikely]] {
-      std::string typeName = TypeInfo::getFriendlyTypename<TPointee>();
-      throw jsi::JSError(runtime, "Cannot convert nullptr to NativeState<" + typeName + ">!");
-    }
-#endif
-    jsi::Object object(runtime);
-    object.setNativeState(runtime, arg);
-    return object;
-  }
-
-private:
-  static inline std::string invalidTypeErrorMessage(const std::string& typeDescription, const std::string& reason) {
-    std::string typeName = TypeInfo::getFriendlyTypename<TPointee>();
-    return "Cannot convert \"" + typeDescription + "\" to NativeState<" + typeName + ">! " + reason;
-  }
-};
-
 } // namespace margelo::nitro
+
+#include "JSIConverter+AnyMap.hpp"
+#include "JSIConverter+ArrayBuffer.hpp"
+#include "JSIConverter+Function.hpp"
+#include "JSIConverter+HybridObject.hpp"
+#include "JSIConverter+Optional.hpp"
+#include "JSIConverter+Promise.hpp"
+#include "JSIConverter+Tuple.hpp"
+#include "JSIConverter+UnorderedMap.hpp"
+#include "JSIConverter+Variant.hpp"
+#include "JSIConverter+Vector.hpp"