@rive-app/react-native 0.2.7 → 0.3.0

package/nitrogen/generated/android/c++/JHybridRiveFileSpec.hpp

@@ -18,34 +18,33 @@ namespace margelo::nitro::rive {
 
   using namespace facebook;
 
-  class JHybridRiveFileSpec: public jni::HybridClass<JHybridRiveFileSpec, JHybridObject>,
-                             public virtual HybridRiveFileSpec {
+  class JHybridRiveFileSpec: public virtual HybridRiveFileSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFileSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridRiveFileSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridRiveFileSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFileSpec;";
+      std::shared_ptr<JHybridRiveFileSpec> getJHybridRiveFileSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFileSpec$CxxPart;";
+      static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
+      static void registerNatives();
+      using HybridBase::HybridBase;
+    protected:
+      std::shared_ptr<JHybridObject> createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) override;
+    };
 
   public:
+    explicit JHybridRiveFileSpec(const jni::local_ref<JHybridRiveFileSpec::JavaPart>& javaPart):
+      HybridObject(HybridRiveFileSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridRiveFileSpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    bool equals(const std::shared_ptr<HybridObject>& other) override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridRiveFileSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridRiveFileSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -64,9 +63,7 @@ namespace margelo::nitro::rive {
     std::shared_ptr<HybridBindableArtboardSpec> getBindableArtboard(const std::string& name) override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridRiveFileSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridRiveFileSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::rive

package/nitrogen/generated/android/c++/JHybridRiveFontConfigSpec.cpp

@@ -23,37 +23,31 @@ namespace margelo::nitro::rive { class HybridFallbackFontSpec; }
 
 namespace margelo::nitro::rive {
 
-  jni::local_ref<JHybridRiveFontConfigSpec::jhybriddata> JHybridRiveFontConfigSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridRiveFontConfigSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridRiveFontConfigSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridRiveFontConfigSpec> JHybridRiveFontConfigSpec::JavaPart::getJHybridRiveFontConfigSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridRiveFontConfigSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridRiveFontConfigSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridRiveFontConfigSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridRiveFontConfigSpec::CxxPart::jhybriddata> JHybridRiveFontConfigSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  bool JHybridRiveFontConfigSpec::equals(const std::shared_ptr<HybridObject>& other) {
-    if (auto otherCast = std::dynamic_pointer_cast<JHybridRiveFontConfigSpec>(other)) {
-      return _javaPart == otherCast->_javaPart;
+  std::shared_ptr<JHybridObject> JHybridRiveFontConfigSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridRiveFontConfigSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridRiveFontConfigSpec::JavaPart!");
     }
-    return false;
-  }
-
-  void JHybridRiveFontConfigSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+    return std::make_shared<JHybridRiveFontConfigSpec>(castJavaPart);
   }
 
-  std::string JHybridRiveFontConfigSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridRiveFontConfigSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridRiveFontConfigSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
@@ -61,13 +55,13 @@ namespace margelo::nitro::rive {
 
   // Methods
   std::shared_ptr<Promise<std::shared_ptr<HybridFallbackFontSpec>>> JHybridRiveFontConfigSpec::loadFontFromURL(const std::string& url) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* url */)>("loadFontFromURL");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* url */)>("loadFontFromURL");
     auto __result = method(_javaPart, jni::make_jstring(url));
     return [&]() {
       auto __promise = Promise<std::shared_ptr<HybridFallbackFontSpec>>::create();
       __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& __boxedResult) {
-        auto __result = jni::static_ref_cast<JHybridFallbackFontSpec::javaobject>(__boxedResult);
-        __promise->resolve(__result->cthis()->shared_cast<JHybridFallbackFontSpec>());
+        auto __result = jni::static_ref_cast<JHybridFallbackFontSpec::JavaPart>(__boxedResult);
+        __promise->resolve(__result->getJHybridFallbackFontSpec());
       });
       __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JThrowable>& __throwable) {
         jni::JniException __jniError(__throwable);
@@ -77,40 +71,40 @@ namespace margelo::nitro::rive {
     }();
   }
   std::shared_ptr<HybridFallbackFontSpec> JHybridRiveFontConfigSpec::loadFontFromResource(const std::string& resource) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JHybridFallbackFontSpec::javaobject>(jni::alias_ref<jni::JString> /* resource */)>("loadFontFromResource");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JHybridFallbackFontSpec::JavaPart>(jni::alias_ref<jni::JString> /* resource */)>("loadFontFromResource");
     auto __result = method(_javaPart, jni::make_jstring(resource));
-    return __result->cthis()->shared_cast<JHybridFallbackFontSpec>();
+    return __result->getJHybridFallbackFontSpec();
   }
   std::shared_ptr<HybridFallbackFontSpec> JHybridRiveFontConfigSpec::loadFontFromBytes(const std::shared_ptr<ArrayBuffer>& bytes) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JHybridFallbackFontSpec::javaobject>(jni::alias_ref<JArrayBuffer::javaobject> /* bytes */)>("loadFontFromBytes");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JHybridFallbackFontSpec::JavaPart>(jni::alias_ref<JArrayBuffer::javaobject> /* bytes */)>("loadFontFromBytes");
     auto __result = method(_javaPart, JArrayBuffer::wrap(bytes));
-    return __result->cthis()->shared_cast<JHybridFallbackFontSpec>();
+    return __result->getJHybridFallbackFontSpec();
   }
   std::shared_ptr<HybridFallbackFontSpec> JHybridRiveFontConfigSpec::loadFontByName(const std::string& name) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JHybridFallbackFontSpec::javaobject>(jni::alias_ref<jni::JString> /* name */)>("loadFontByName");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JHybridFallbackFontSpec::JavaPart>(jni::alias_ref<jni::JString> /* name */)>("loadFontByName");
     auto __result = method(_javaPart, jni::make_jstring(name));
-    return __result->cthis()->shared_cast<JHybridFallbackFontSpec>();
+    return __result->getJHybridFallbackFontSpec();
   }
   std::shared_ptr<HybridFallbackFontSpec> JHybridRiveFontConfigSpec::getSystemDefaultFont() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JHybridFallbackFontSpec::javaobject>()>("getSystemDefaultFont");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JHybridFallbackFontSpec::JavaPart>()>("getSystemDefaultFont");
     auto __result = method(_javaPart);
-    return __result->cthis()->shared_cast<JHybridFallbackFontSpec>();
+    return __result->getJHybridFallbackFontSpec();
   }
   void JHybridRiveFontConfigSpec::setFontsForWeight(double weight, const std::vector<std::shared_ptr<HybridFallbackFontSpec>>& fonts) {
-    static const auto method = javaClassStatic()->getMethod<void(double /* weight */, jni::alias_ref<jni::JArrayClass<JHybridFallbackFontSpec::javaobject>> /* fonts */)>("setFontsForWeight");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(double /* weight */, jni::alias_ref<jni::JArrayClass<JHybridFallbackFontSpec::JavaPart>> /* fonts */)>("setFontsForWeight");
     method(_javaPart, weight, [&]() {
       size_t __size = fonts.size();
-      jni::local_ref<jni::JArrayClass<JHybridFallbackFontSpec::javaobject>> __array = jni::JArrayClass<JHybridFallbackFontSpec::javaobject>::newArray(__size);
+      jni::local_ref<jni::JArrayClass<JHybridFallbackFontSpec::JavaPart>> __array = jni::JArrayClass<JHybridFallbackFontSpec::JavaPart>::newArray(__size);
       for (size_t __i = 0; __i < __size; __i++) {
         const auto& __element = fonts[__i];
         auto __elementJni = std::dynamic_pointer_cast<JHybridFallbackFontSpec>(__element)->getJavaPart();
-        __array->setElement(__i, __elementJni.get());
+        __array->setElement(__i, *__elementJni);
       }
       return __array;
     }());
   }
   std::shared_ptr<Promise<void>> JHybridRiveFontConfigSpec::applyFallbackFonts() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("applyFallbackFonts");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("applyFallbackFonts");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<void>::create();
@@ -125,7 +119,7 @@ namespace margelo::nitro::rive {
     }();
   }
   std::shared_ptr<Promise<void>> JHybridRiveFontConfigSpec::clearFallbackFonts() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("clearFallbackFonts");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("clearFallbackFonts");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<void>::create();

package/nitrogen/generated/android/c++/JHybridRiveFontConfigSpec.hpp

@@ -18,34 +18,33 @@ namespace margelo::nitro::rive {
 
   using namespace facebook;
 
-  class JHybridRiveFontConfigSpec: public jni::HybridClass<JHybridRiveFontConfigSpec, JHybridObject>,
-                                   public virtual HybridRiveFontConfigSpec {
+  class JHybridRiveFontConfigSpec: public virtual HybridRiveFontConfigSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFontConfigSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridRiveFontConfigSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridRiveFontConfigSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFontConfigSpec;";
+      std::shared_ptr<JHybridRiveFontConfigSpec> getJHybridRiveFontConfigSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFontConfigSpec$CxxPart;";
+      static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
+      static void registerNatives();
+      using HybridBase::HybridBase;
+    protected:
+      std::shared_ptr<JHybridObject> createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) override;
+    };
 
   public:
+    explicit JHybridRiveFontConfigSpec(const jni::local_ref<JHybridRiveFontConfigSpec::JavaPart>& javaPart):
+      HybridObject(HybridRiveFontConfigSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridRiveFontConfigSpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    bool equals(const std::shared_ptr<HybridObject>& other) override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridRiveFontConfigSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridRiveFontConfigSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -65,9 +64,7 @@ namespace margelo::nitro::rive {
     std::shared_ptr<Promise<void>> clearFallbackFonts() override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridRiveFontConfigSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridRiveFontConfigSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::rive

package/nitrogen/generated/android/c++/JHybridRiveImageFactorySpec.cpp

@@ -21,37 +21,31 @@ namespace margelo::nitro::rive { class HybridRiveImageSpec; }
 
 namespace margelo::nitro::rive {
 
-  jni::local_ref<JHybridRiveImageFactorySpec::jhybriddata> JHybridRiveImageFactorySpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridRiveImageFactorySpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridRiveImageFactorySpec::initHybrid),
-    });
+  std::shared_ptr<JHybridRiveImageFactorySpec> JHybridRiveImageFactorySpec::JavaPart::getJHybridRiveImageFactorySpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridRiveImageFactorySpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridRiveImageFactorySpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridRiveImageFactorySpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridRiveImageFactorySpec::CxxPart::jhybriddata> JHybridRiveImageFactorySpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  bool JHybridRiveImageFactorySpec::equals(const std::shared_ptr<HybridObject>& other) {
-    if (auto otherCast = std::dynamic_pointer_cast<JHybridRiveImageFactorySpec>(other)) {
-      return _javaPart == otherCast->_javaPart;
+  std::shared_ptr<JHybridObject> JHybridRiveImageFactorySpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridRiveImageFactorySpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridRiveImageFactorySpec::JavaPart!");
     }
-    return false;
-  }
-
-  void JHybridRiveImageFactorySpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+    return std::make_shared<JHybridRiveImageFactorySpec>(castJavaPart);
   }
 
-  std::string JHybridRiveImageFactorySpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridRiveImageFactorySpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridRiveImageFactorySpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
@@ -59,13 +53,13 @@ namespace margelo::nitro::rive {
 
   // Methods
   std::shared_ptr<Promise<std::shared_ptr<HybridRiveImageSpec>>> JHybridRiveImageFactorySpec::loadFromURLAsync(const std::string& url) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* url */)>("loadFromURLAsync");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* url */)>("loadFromURLAsync");
     auto __result = method(_javaPart, jni::make_jstring(url));
     return [&]() {
       auto __promise = Promise<std::shared_ptr<HybridRiveImageSpec>>::create();
       __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& __boxedResult) {
-        auto __result = jni::static_ref_cast<JHybridRiveImageSpec::javaobject>(__boxedResult);
-        __promise->resolve(__result->cthis()->shared_cast<JHybridRiveImageSpec>());
+        auto __result = jni::static_ref_cast<JHybridRiveImageSpec::JavaPart>(__boxedResult);
+        __promise->resolve(__result->getJHybridRiveImageSpec());
       });
       __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JThrowable>& __throwable) {
         jni::JniException __jniError(__throwable);
@@ -75,13 +69,13 @@ namespace margelo::nitro::rive {
     }();
   }
   std::shared_ptr<Promise<std::shared_ptr<HybridRiveImageSpec>>> JHybridRiveImageFactorySpec::loadFromResourceAsync(const std::string& resource) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* resource */)>("loadFromResourceAsync");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* resource */)>("loadFromResourceAsync");
     auto __result = method(_javaPart, jni::make_jstring(resource));
     return [&]() {
       auto __promise = Promise<std::shared_ptr<HybridRiveImageSpec>>::create();
       __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& __boxedResult) {
-        auto __result = jni::static_ref_cast<JHybridRiveImageSpec::javaobject>(__boxedResult);
-        __promise->resolve(__result->cthis()->shared_cast<JHybridRiveImageSpec>());
+        auto __result = jni::static_ref_cast<JHybridRiveImageSpec::JavaPart>(__boxedResult);
+        __promise->resolve(__result->getJHybridRiveImageSpec());
       });
       __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JThrowable>& __throwable) {
         jni::JniException __jniError(__throwable);
@@ -91,13 +85,13 @@ namespace margelo::nitro::rive {
     }();
   }
   std::shared_ptr<Promise<std::shared_ptr<HybridRiveImageSpec>>> JHybridRiveImageFactorySpec::loadFromBytesAsync(const std::shared_ptr<ArrayBuffer>& bytes) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JArrayBuffer::javaobject> /* bytes */)>("loadFromBytesAsync");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JArrayBuffer::javaobject> /* bytes */)>("loadFromBytesAsync");
     auto __result = method(_javaPart, JArrayBuffer::wrap(bytes));
     return [&]() {
       auto __promise = Promise<std::shared_ptr<HybridRiveImageSpec>>::create();
       __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& __boxedResult) {
-        auto __result = jni::static_ref_cast<JHybridRiveImageSpec::javaobject>(__boxedResult);
-        __promise->resolve(__result->cthis()->shared_cast<JHybridRiveImageSpec>());
+        auto __result = jni::static_ref_cast<JHybridRiveImageSpec::JavaPart>(__boxedResult);
+        __promise->resolve(__result->getJHybridRiveImageSpec());
       });
       __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JThrowable>& __throwable) {
         jni::JniException __jniError(__throwable);

package/nitrogen/generated/android/c++/JHybridRiveImageFactorySpec.hpp

@@ -18,34 +18,33 @@ namespace margelo::nitro::rive {
 
   using namespace facebook;
 
-  class JHybridRiveImageFactorySpec: public jni::HybridClass<JHybridRiveImageFactorySpec, JHybridObject>,
-                                     public virtual HybridRiveImageFactorySpec {
+  class JHybridRiveImageFactorySpec: public virtual HybridRiveImageFactorySpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageFactorySpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridRiveImageFactorySpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridRiveImageFactorySpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageFactorySpec;";
+      std::shared_ptr<JHybridRiveImageFactorySpec> getJHybridRiveImageFactorySpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageFactorySpec$CxxPart;";
+      static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
+      static void registerNatives();
+      using HybridBase::HybridBase;
+    protected:
+      std::shared_ptr<JHybridObject> createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) override;
+    };
 
   public:
+    explicit JHybridRiveImageFactorySpec(const jni::local_ref<JHybridRiveImageFactorySpec::JavaPart>& javaPart):
+      HybridObject(HybridRiveImageFactorySpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridRiveImageFactorySpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    bool equals(const std::shared_ptr<HybridObject>& other) override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridRiveImageFactorySpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridRiveImageFactorySpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -60,9 +59,7 @@ namespace margelo::nitro::rive {
     std::shared_ptr<Promise<std::shared_ptr<HybridRiveImageSpec>>> loadFromBytesAsync(const std::shared_ptr<ArrayBuffer>& bytes) override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridRiveImageFactorySpec::javaobject> _javaPart;
+    jni::global_ref<JHybridRiveImageFactorySpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::rive

package/nitrogen/generated/android/c++/JHybridRiveImageSpec.cpp

@@ -13,42 +13,36 @@
 
 namespace margelo::nitro::rive {
 
-  jni::local_ref<JHybridRiveImageSpec::jhybriddata> JHybridRiveImageSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridRiveImageSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridRiveImageSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridRiveImageSpec> JHybridRiveImageSpec::JavaPart::getJHybridRiveImageSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridRiveImageSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridRiveImageSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridRiveImageSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridRiveImageSpec::CxxPart::jhybriddata> JHybridRiveImageSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  bool JHybridRiveImageSpec::equals(const std::shared_ptr<HybridObject>& other) {
-    if (auto otherCast = std::dynamic_pointer_cast<JHybridRiveImageSpec>(other)) {
-      return _javaPart == otherCast->_javaPart;
+  std::shared_ptr<JHybridObject> JHybridRiveImageSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridRiveImageSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridRiveImageSpec::JavaPart!");
     }
-    return false;
-  }
-
-  void JHybridRiveImageSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+    return std::make_shared<JHybridRiveImageSpec>(castJavaPart);
   }
 
-  std::string JHybridRiveImageSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridRiveImageSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridRiveImageSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
   double JHybridRiveImageSpec::getByteSize() {
-    static const auto method = javaClassStatic()->getMethod<double()>("getByteSize");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<double()>("getByteSize");
     auto __result = method(_javaPart);
     return __result;
   }

package/nitrogen/generated/android/c++/JHybridRiveImageSpec.hpp

@@ -18,34 +18,33 @@ namespace margelo::nitro::rive {
 
   using namespace facebook;
 
-  class JHybridRiveImageSpec: public jni::HybridClass<JHybridRiveImageSpec, JHybridObject>,
-                              public virtual HybridRiveImageSpec {
+  class JHybridRiveImageSpec: public virtual HybridRiveImageSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridRiveImageSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridRiveImageSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageSpec;";
+      std::shared_ptr<JHybridRiveImageSpec> getJHybridRiveImageSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageSpec$CxxPart;";
+      static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
+      static void registerNatives();
+      using HybridBase::HybridBase;
+    protected:
+      std::shared_ptr<JHybridObject> createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) override;
+    };
 
   public:
+    explicit JHybridRiveImageSpec(const jni::local_ref<JHybridRiveImageSpec::JavaPart>& javaPart):
+      HybridObject(HybridRiveImageSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridRiveImageSpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    bool equals(const std::shared_ptr<HybridObject>& other) override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridRiveImageSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridRiveImageSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -58,9 +57,7 @@ namespace margelo::nitro::rive {
     
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridRiveImageSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridRiveImageSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::rive