@rive-app/react-native 0.2.8 → 0.3.1

package/nitrogen/generated/android/riveOnLoad.cpp

@@ -48,91 +48,131 @@
 namespace margelo::nitro::rive {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::margelo::nitro::rive::registerAllNatives();
+  });
+}
+
+struct JHybridRiveFontConfigSpecImpl: public jni::JavaClass<JHybridRiveFontConfigSpecImpl, JHybridRiveFontConfigSpec::JavaPart> {
+  static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFontConfig;";
+  static std::shared_ptr<JHybridRiveFontConfigSpec> create() {
+    static auto constructorFn = javaClassStatic()->getConstructor<JHybridRiveFontConfigSpecImpl::javaobject()>();
+    jni::local_ref<JHybridRiveFontConfigSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridRiveFontConfigSpec();
+  }
+};
+struct JHybridRiveFileFactorySpecImpl: public jni::JavaClass<JHybridRiveFileFactorySpecImpl, JHybridRiveFileFactorySpec::JavaPart> {
+  static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFileFactory;";
+  static std::shared_ptr<JHybridRiveFileFactorySpec> create() {
+    static auto constructorFn = javaClassStatic()->getConstructor<JHybridRiveFileFactorySpecImpl::javaobject()>();
+    jni::local_ref<JHybridRiveFileFactorySpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridRiveFileFactorySpec();
+  }
+};
+struct JHybridRiveFileSpecImpl: public jni::JavaClass<JHybridRiveFileSpecImpl, JHybridRiveFileSpec::JavaPart> {
+  static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFile;";
+  static std::shared_ptr<JHybridRiveFileSpec> create() {
+    static auto constructorFn = javaClassStatic()->getConstructor<JHybridRiveFileSpecImpl::javaobject()>();
+    jni::local_ref<JHybridRiveFileSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridRiveFileSpec();
+  }
+};
+struct JHybridRiveViewSpecImpl: public jni::JavaClass<JHybridRiveViewSpecImpl, JHybridRiveViewSpec::JavaPart> {
+  static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveView;";
+  static std::shared_ptr<JHybridRiveViewSpec> create() {
+    static auto constructorFn = javaClassStatic()->getConstructor<JHybridRiveViewSpecImpl::javaobject()>();
+    jni::local_ref<JHybridRiveViewSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridRiveViewSpec();
+  }
+};
+struct JHybridRiveImageFactorySpecImpl: public jni::JavaClass<JHybridRiveImageFactorySpecImpl, JHybridRiveImageFactorySpec::JavaPart> {
+  static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageFactory;";
+  static std::shared_ptr<JHybridRiveImageFactorySpec> create() {
+    static auto constructorFn = javaClassStatic()->getConstructor<JHybridRiveImageFactorySpecImpl::javaobject()>();
+    jni::local_ref<JHybridRiveImageFactorySpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridRiveImageFactorySpec();
+  }
+};
+struct JHybridRiveRuntimeSpecImpl: public jni::JavaClass<JHybridRiveRuntimeSpecImpl, JHybridRiveRuntimeSpec::JavaPart> {
+  static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveRuntime;";
+  static std::shared_ptr<JHybridRiveRuntimeSpec> create() {
+    static auto constructorFn = javaClassStatic()->getConstructor<JHybridRiveRuntimeSpecImpl::javaobject()>();
+    jni::local_ref<JHybridRiveRuntimeSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridRiveRuntimeSpec();
+  }
+};
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace margelo::nitro::rive;
-  using namespace facebook;
 
-  return facebook::jni::initialize(vm, [] {
-    // Register native JNI methods
-    margelo::nitro::rive::JHybridBindableArtboardSpec::registerNatives();
-    margelo::nitro::rive::JHybridRiveFileSpec::registerNatives();
-    margelo::nitro::rive::JHybridRiveFileFactorySpec::registerNatives();
-    margelo::nitro::rive::JHybridFallbackFontSpec::registerNatives();
-    margelo::nitro::rive::JHybridRiveFontConfigSpec::registerNatives();
-    margelo::nitro::rive::JHybridRiveImageSpec::registerNatives();
-    margelo::nitro::rive::JHybridRiveImageFactorySpec::registerNatives();
-    margelo::nitro::rive::JHybridRiveRuntimeSpec::registerNatives();
-    margelo::nitro::rive::JHybridRiveViewSpec::registerNatives();
-    margelo::nitro::rive::JFunc_void_RiveError_cxx::registerNatives();
-    margelo::nitro::rive::JFunc_void_UnifiedRiveEvent_cxx::registerNatives();
-    margelo::nitro::rive::views::JHybridRiveViewStateUpdater::registerNatives();
-    margelo::nitro::rive::JHybridViewModelSpec::registerNatives();
-    margelo::nitro::rive::JHybridViewModelInstanceSpec::registerNatives();
-    margelo::nitro::rive::JHybridViewModelPropertySpec::registerNatives();
-    margelo::nitro::rive::JHybridViewModelNumberPropertySpec::registerNatives();
-    margelo::nitro::rive::JFunc_void_cxx::registerNatives();
-    margelo::nitro::rive::JFunc_void_double_cxx::registerNatives();
-    margelo::nitro::rive::JHybridViewModelStringPropertySpec::registerNatives();
-    margelo::nitro::rive::JFunc_void_std__string_cxx::registerNatives();
-    margelo::nitro::rive::JHybridViewModelBooleanPropertySpec::registerNatives();
-    margelo::nitro::rive::JFunc_void_bool_cxx::registerNatives();
-    margelo::nitro::rive::JHybridViewModelColorPropertySpec::registerNatives();
-    margelo::nitro::rive::JHybridViewModelEnumPropertySpec::registerNatives();
-    margelo::nitro::rive::JHybridViewModelTriggerPropertySpec::registerNatives();
-    margelo::nitro::rive::JHybridViewModelImagePropertySpec::registerNatives();
-    margelo::nitro::rive::JHybridViewModelListPropertySpec::registerNatives();
-    margelo::nitro::rive::JHybridViewModelArtboardPropertySpec::registerNatives();
+  // Register native JNI methods
+  margelo::nitro::rive::JHybridBindableArtboardSpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JHybridRiveFileSpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JHybridRiveFileFactorySpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JHybridFallbackFontSpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JHybridRiveFontConfigSpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JHybridRiveImageSpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JHybridRiveImageFactorySpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JHybridRiveRuntimeSpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JHybridRiveViewSpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JFunc_void_RiveError_cxx::registerNatives();
+  margelo::nitro::rive::JFunc_void_UnifiedRiveEvent_cxx::registerNatives();
+  margelo::nitro::rive::views::JHybridRiveViewStateUpdater::registerNatives();
+  margelo::nitro::rive::JHybridViewModelSpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JHybridViewModelInstanceSpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JHybridViewModelPropertySpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JHybridViewModelNumberPropertySpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JFunc_void_cxx::registerNatives();
+  margelo::nitro::rive::JFunc_void_double_cxx::registerNatives();
+  margelo::nitro::rive::JHybridViewModelStringPropertySpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JFunc_void_std__string_cxx::registerNatives();
+  margelo::nitro::rive::JHybridViewModelBooleanPropertySpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JFunc_void_bool_cxx::registerNatives();
+  margelo::nitro::rive::JHybridViewModelColorPropertySpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JHybridViewModelEnumPropertySpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JHybridViewModelTriggerPropertySpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JHybridViewModelImagePropertySpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JHybridViewModelListPropertySpec::CxxPart::registerNatives();
+  margelo::nitro::rive::JHybridViewModelArtboardPropertySpec::CxxPart::registerNatives();
 
-    // Register Nitro Hybrid Objects
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "RiveFontConfig",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridRiveFontConfigSpec::javaobject> object("com/margelo/nitro/rive/HybridRiveFontConfig");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "RiveFileFactory",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridRiveFileFactorySpec::javaobject> object("com/margelo/nitro/rive/HybridRiveFileFactory");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "RiveFile",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridRiveFileSpec::javaobject> object("com/margelo/nitro/rive/HybridRiveFile");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "RiveView",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridRiveViewSpec::javaobject> object("com/margelo/nitro/rive/HybridRiveView");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "RiveImageFactory",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridRiveImageFactorySpec::javaobject> object("com/margelo/nitro/rive/HybridRiveImageFactory");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "RiveRuntime",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridRiveRuntimeSpec::javaobject> object("com/margelo/nitro/rive/HybridRiveRuntime");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-  });
+  // Register Nitro Hybrid Objects
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "RiveFontConfig",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridRiveFontConfigSpecImpl::create();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "RiveFileFactory",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridRiveFileFactorySpecImpl::create();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "RiveFile",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridRiveFileSpecImpl::create();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "RiveView",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridRiveViewSpecImpl::create();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "RiveImageFactory",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridRiveImageFactorySpecImpl::create();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "RiveRuntime",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridRiveRuntimeSpecImpl::create();
+    }
+  );
 }
 
 } // namespace margelo::nitro::rive

package/nitrogen/generated/android/riveOnLoad.hpp

@@ -6,20 +6,29 @@
 ///
 
 #include <jni.h>
+#include <functional>
 #include <NitroModules/NitroDefines.hpp>
 
 namespace margelo::nitro::rive {
 
+  [[deprecated("Use registerNatives() instead.")]]
+  int initialize(JavaVM* vm);
+
   /**
-   * Initializes the native (C++) part of rive, and autolinks all Hybrid Objects.
-   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`).
+   * Register the native (C++) part of rive, and autolinks all Hybrid Objects.
+   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`),
+   * inside a `facebook::jni::initialize(vm, ...)` call.
    * Example:
    * ```cpp (cpp-adapter.cpp)
    * JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-   *   return margelo::nitro::rive::initialize(vm);
+   *   return facebook::jni::initialize(vm, []() {
+   *     // register all rive HybridObjects
+   *     margelo::nitro::rive::registerNatives();
+   *     // any other custom registrations go here.
+   *   });
    * }
    * ```
    */
-  int initialize(JavaVM* vm);
+  void registerAllNatives();
 
 } // namespace margelo::nitro::rive

package/nitrogen/generated/ios/RNRive-Swift-Cxx-Bridge.hpp

@@ -195,7 +195,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline double get_std__optional_double_(const std::optional<double>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelSpec>
@@ -222,7 +222,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::shared_ptr<HybridViewModelSpec> get_std__optional_std__shared_ptr_HybridViewModelSpec__(const std::optional<std::shared_ptr<HybridViewModelSpec>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<std::string>
@@ -237,7 +237,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::string get_std__optional_std__string_(const std::optional<std::string>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<ArtboardBy>
@@ -252,7 +252,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline ArtboardBy get_std__optional_ArtboardBy_(const std::optional<ArtboardBy>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<HybridRiveImageSpec>
@@ -279,7 +279,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::shared_ptr<HybridRiveImageSpec> get_std__optional_std__shared_ptr_HybridRiveImageSpec__(const std::optional<std::shared_ptr<HybridRiveImageSpec>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::unordered_map<std::string, ResolvedReferencedAsset>
@@ -319,7 +319,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::unordered_map<std::string, ResolvedReferencedAsset> get_std__optional_std__unordered_map_std__string__ResolvedReferencedAsset__(const std::optional<std::unordered_map<std::string, ResolvedReferencedAsset>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::vector<std::string>
@@ -440,7 +440,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline ReferencedAssetsType get_std__optional_ReferencedAssetsType_(const std::optional<ReferencedAssetsType>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<HybridRiveFileFactorySpec>
@@ -673,7 +673,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline bool get_std__optional_bool_(const std::optional<bool>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<Alignment>
@@ -688,7 +688,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline Alignment get_std__optional_Alignment_(const std::optional<Alignment>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<Fit>
@@ -703,7 +703,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline Fit get_std__optional_Fit_(const std::optional<Fit>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelInstanceSpec>
@@ -765,7 +765,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::variant<std::shared_ptr<HybridViewModelInstanceSpec>, DataBindMode, DataBindByName> get_std__optional_std__variant_std__shared_ptr_HybridViewModelInstanceSpec___DataBindMode__DataBindByName__(const std::optional<std::variant<std::shared_ptr<HybridViewModelInstanceSpec>, DataBindMode, DataBindByName>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::function<void(const RiveError& /* error */)>
@@ -836,7 +836,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::shared_ptr<HybridViewModelInstanceSpec> get_std__optional_std__shared_ptr_HybridViewModelInstanceSpec__(const std::optional<std::shared_ptr<HybridViewModelInstanceSpec>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::variant<bool, std::string, double>
@@ -911,7 +911,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::unordered_map<std::string, std::variant<bool, std::string, double>> get_std__optional_std__unordered_map_std__string__std__variant_bool__std__string__double___(const std::optional<std::unordered_map<std::string, std::variant<bool, std::string, double>>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::function<void(const UnifiedRiveEvent& /* event */)>
@@ -1032,7 +1032,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::shared_ptr<HybridViewModelNumberPropertySpec> get_std__optional_std__shared_ptr_HybridViewModelNumberPropertySpec__(const std::optional<std::shared_ptr<HybridViewModelNumberPropertySpec>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelStringPropertySpec>
@@ -1062,7 +1062,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::shared_ptr<HybridViewModelStringPropertySpec> get_std__optional_std__shared_ptr_HybridViewModelStringPropertySpec__(const std::optional<std::shared_ptr<HybridViewModelStringPropertySpec>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelBooleanPropertySpec>
@@ -1092,7 +1092,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::shared_ptr<HybridViewModelBooleanPropertySpec> get_std__optional_std__shared_ptr_HybridViewModelBooleanPropertySpec__(const std::optional<std::shared_ptr<HybridViewModelBooleanPropertySpec>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelColorPropertySpec>
@@ -1122,7 +1122,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::shared_ptr<HybridViewModelColorPropertySpec> get_std__optional_std__shared_ptr_HybridViewModelColorPropertySpec__(const std::optional<std::shared_ptr<HybridViewModelColorPropertySpec>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelEnumPropertySpec>
@@ -1152,7 +1152,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::shared_ptr<HybridViewModelEnumPropertySpec> get_std__optional_std__shared_ptr_HybridViewModelEnumPropertySpec__(const std::optional<std::shared_ptr<HybridViewModelEnumPropertySpec>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelTriggerPropertySpec>
@@ -1182,7 +1182,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::shared_ptr<HybridViewModelTriggerPropertySpec> get_std__optional_std__shared_ptr_HybridViewModelTriggerPropertySpec__(const std::optional<std::shared_ptr<HybridViewModelTriggerPropertySpec>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelImagePropertySpec>
@@ -1212,7 +1212,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::shared_ptr<HybridViewModelImagePropertySpec> get_std__optional_std__shared_ptr_HybridViewModelImagePropertySpec__(const std::optional<std::shared_ptr<HybridViewModelImagePropertySpec>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelListPropertySpec>
@@ -1242,7 +1242,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::shared_ptr<HybridViewModelListPropertySpec> get_std__optional_std__shared_ptr_HybridViewModelListPropertySpec__(const std::optional<std::shared_ptr<HybridViewModelListPropertySpec>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelArtboardPropertySpec>
@@ -1272,7 +1272,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::shared_ptr<HybridViewModelArtboardPropertySpec> get_std__optional_std__shared_ptr_HybridViewModelArtboardPropertySpec__(const std::optional<std::shared_ptr<HybridViewModelArtboardPropertySpec>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: Result<std::optional<std::shared_ptr<HybridViewModelNumberPropertySpec>>>
@@ -1421,7 +1421,7 @@ namespace margelo::nitro::rive::bridge::swift {
     return optional.has_value();
   }
   inline std::shared_ptr<HybridBindableArtboardSpec> get_std__optional_std__shared_ptr_HybridBindableArtboardSpec__(const std::optional<std::shared_ptr<HybridBindableArtboardSpec>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
 
 } // namespace margelo::nitro::rive::bridge::swift

package/nitrogen/generated/ios/swift/ArtboardBy.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**
@@ -42,7 +41,14 @@ public extension ArtboardBy {
   
   @inline(__always)
   var index: Double? {
-    return self.__index.value
+    return { () -> Double? in
+      if bridge.has_value_std__optional_double_(self.__index) {
+        let __unwrapped = bridge.get_std__optional_double_(self.__index)
+        return __unwrapped
+      } else {
+        return nil
+      }
+    }()
   }
   
   @inline(__always)

package/nitrogen/generated/ios/swift/DataBindByName.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_RiveError.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_UnifiedRiveEvent.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_bool.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_double.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_std__exception_ptr.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_HybridFallbackFontSpec_.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_HybridRiveFileSpec_.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_HybridRiveImageSpec_.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_std__string.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/HybridBindableArtboardSpec.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /// See ``HybridBindableArtboardSpec``

package/nitrogen/generated/ios/swift/HybridBindableArtboardSpec_cxx.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/HybridFallbackFontSpec.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /// See ``HybridFallbackFontSpec``

package/nitrogen/generated/ios/swift/HybridFallbackFontSpec_cxx.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/HybridRiveFileFactorySpec.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /// See ``HybridRiveFileFactorySpec``

package/nitrogen/generated/ios/swift/HybridRiveFileFactorySpec_cxx.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/HybridRiveFileSpec.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /// See ``HybridRiveFileSpec``

package/nitrogen/generated/ios/swift/HybridRiveFileSpec_cxx.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**