react-native-nitro-sqlite 9.4.0 → 9.6.0

package/nitrogen/generated/android/RNNitroSQLiteOnLoad.cpp

@@ -22,33 +22,43 @@
 namespace margelo::nitro::rnnitrosqlite {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::margelo::nitro::rnnitrosqlite::registerAllNatives();
+  });
+}
+
+struct JHybridNitroSQLiteOnLoadSpecImpl: public jni::JavaClass<JHybridNitroSQLiteOnLoadSpecImpl, JHybridNitroSQLiteOnLoadSpec::JavaPart> {
+  static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rnnitrosqlite/HybridNitroSQLiteOnLoad;";
+  static std::shared_ptr<JHybridNitroSQLiteOnLoadSpec> create() {
+    static auto constructorFn = javaClassStatic()->getConstructor<JHybridNitroSQLiteOnLoadSpecImpl::javaobject()>();
+    jni::local_ref<JHybridNitroSQLiteOnLoadSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridNitroSQLiteOnLoadSpec();
+  }
+};
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace margelo::nitro::rnnitrosqlite;
-  using namespace facebook;
-
-  return facebook::jni::initialize(vm, [] {
-    // Register native JNI methods
-    margelo::nitro::rnnitrosqlite::JHybridNitroSQLiteOnLoadSpec::registerNatives();
-
-    // Register Nitro Hybrid Objects
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "NitroSQLite",
-      []() -> std::shared_ptr<HybridObject> {
-        static_assert(std::is_default_constructible_v<HybridNitroSQLite>,
-                      "The HybridObject \"HybridNitroSQLite\" is not default-constructible! "
-                      "Create a public constructor that takes zero arguments to be able to autolink this HybridObject.");
-        return std::make_shared<HybridNitroSQLite>();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "NitroSQLiteOnLoad",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridNitroSQLiteOnLoadSpec::javaobject> object("com/margelo/nitro/rnnitrosqlite/HybridNitroSQLiteOnLoad");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-  });
+
+  // Register native JNI methods
+  margelo::nitro::rnnitrosqlite::JHybridNitroSQLiteOnLoadSpec::CxxPart::registerNatives();
+
+  // Register Nitro Hybrid Objects
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "NitroSQLite",
+    []() -> std::shared_ptr<HybridObject> {
+      static_assert(std::is_default_constructible_v<HybridNitroSQLite>,
+                    "The HybridObject \"HybridNitroSQLite\" is not default-constructible! "
+                    "Create a public constructor that takes zero arguments to be able to autolink this HybridObject.");
+      return std::make_shared<HybridNitroSQLite>();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "NitroSQLiteOnLoad",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridNitroSQLiteOnLoadSpecImpl::create();
+    }
+  );
 }
 
 } // namespace margelo::nitro::rnnitrosqlite

package/nitrogen/generated/android/RNNitroSQLiteOnLoad.hpp

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

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

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

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

@@ -18,34 +18,33 @@ namespace margelo::nitro::rnnitrosqlite {
 
   using namespace facebook;
 
-  class JHybridNitroSQLiteOnLoadSpec: public jni::HybridClass<JHybridNitroSQLiteOnLoadSpec, JHybridObject>,
-                                      public virtual HybridNitroSQLiteOnLoadSpec {
+  class JHybridNitroSQLiteOnLoadSpec: public virtual HybridNitroSQLiteOnLoadSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rnnitrosqlite/HybridNitroSQLiteOnLoadSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridNitroSQLiteOnLoadSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridNitroSQLiteOnLoadSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rnnitrosqlite/HybridNitroSQLiteOnLoadSpec;";
+      std::shared_ptr<JHybridNitroSQLiteOnLoadSpec> getJHybridNitroSQLiteOnLoadSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rnnitrosqlite/HybridNitroSQLiteOnLoadSpec$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 JHybridNitroSQLiteOnLoadSpec(const jni::local_ref<JHybridNitroSQLiteOnLoadSpec::JavaPart>& javaPart):
+      HybridObject(HybridNitroSQLiteOnLoadSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridNitroSQLiteOnLoadSpec() 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<JHybridNitroSQLiteOnLoadSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridNitroSQLiteOnLoadSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -58,9 +57,7 @@ namespace margelo::nitro::rnnitrosqlite {
     void init() override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridNitroSQLiteOnLoadSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridNitroSQLiteOnLoadSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::rnnitrosqlite

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rnnitrosqlite/HybridNitroSQLiteOnLoadSpec.kt

@@ -24,32 +24,29 @@ import com.margelo.nitro.core.HybridObject
   "LocalVariableName", "PropertyName", "PrivatePropertyName", "FunctionName"
 )
 abstract class HybridNitroSQLiteOnLoadSpec: HybridObject() {
-  @DoNotStrip
-  private var mHybridData: HybridData = initHybrid()
-
-  init {
-    super.updateNative(mHybridData)
-  }
+  // Properties
+  
 
-  override fun updateNative(hybridData: HybridData) {
-    mHybridData = hybridData
-    super.updateNative(hybridData)
-  }
+  // Methods
+  @DoNotStrip
+  @Keep
+  abstract fun init(): Unit
 
   // Default implementation of `HybridObject.toString()`
   override fun toString(): String {
     return "[HybridObject NitroSQLiteOnLoad]"
   }
 
-  // Properties
-  
-
-  // Methods
+  // C++ backing class
   @DoNotStrip
   @Keep
-  abstract fun init(): Unit
-
-  private external fun initHybrid(): HybridData
+  protected open class CxxPart(javaPart: HybridNitroSQLiteOnLoadSpec): HybridObject.CxxPart(javaPart) {
+    // C++ JHybridNitroSQLiteOnLoadSpec::CxxPart::initHybrid(...)
+    external override fun initHybrid(): HybridData
+  }
+  override fun createCxxPart(): CxxPart {
+    return CxxPart(this)
+  }
 
   companion object {
     protected const val TAG = "HybridNitroSQLiteOnLoadSpec"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-sqlite",
-  "version": "9.4.0",
+  "version": "9.6.0",
   "description": "Fast SQLite library for React Native built using Nitro Modules",
   "main": "./lib/module/index",
   "module": "./lib/module/index",
@@ -70,16 +70,16 @@
   },
   "devDependencies": {
     "jest": "^30.2.0",
-    "nitrogen": "0.33.5",
-    "react": "19.1.1",
-    "react-native": "0.82.1",
+    "nitrogen": "0.35.0",
+    "react": "19.2.3",
+    "react-native": "0.85.0-rc.0",
     "react-native-builder-bob": "^0.31.0",
-    "react-native-nitro-modules": "0.33.5"
+    "react-native-nitro-modules": "0.35.0"
   },
   "peerDependencies": {
     "react": ">=17.0.0",
     "react-native": ">=0.75.0",
-    "react-native-nitro-modules": ">=0.32.0"
+    "react-native-nitro-modules": ">=0.35.0"
   },
   "resolutions": {
     "@types/react": "^18.2.44"
@@ -93,7 +93,10 @@
   },
   "release-it": {
     "npm": {
-      "publish": true
+      "publish": true,
+      "versionArgs": [
+        "--allow-same-version"
+      ]
     },
     "git": false,
     "github": {