@onekeyfe/react-native-cloud-kit-module 1.1.11 → 1.1.13

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

@@ -2,7 +2,7 @@
 /// JAccountInfoResult.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -51,7 +51,11 @@ namespace margelo::nitro::cloudkitmodule {
      */
     [[maybe_unused]]
     static jni::local_ref<JAccountInfoResult::javaobject> fromCpp(const AccountInfoResult& value) {
-      return newInstance(
+      using JSignature = JAccountInfoResult(double, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.status,
         jni::make_jstring(value.statusName),
         value.containerUserId.has_value() ? jni::make_jstring(value.containerUserId.value()) : nullptr

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

@@ -2,7 +2,7 @@
 /// JDeleteRecordParams.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -47,7 +47,11 @@ namespace margelo::nitro::cloudkitmodule {
      */
     [[maybe_unused]]
     static jni::local_ref<JDeleteRecordParams::javaobject> fromCpp(const DeleteRecordParams& value) {
-      return newInstance(
+      using JSignature = JDeleteRecordParams(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         jni::make_jstring(value.recordType),
         jni::make_jstring(value.recordID)
       );

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

@@ -2,7 +2,7 @@
 /// JFetchRecordParams.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -47,7 +47,11 @@ namespace margelo::nitro::cloudkitmodule {
      */
     [[maybe_unused]]
     static jni::local_ref<JFetchRecordParams::javaobject> fromCpp(const FetchRecordParams& value) {
-      return newInstance(
+      using JSignature = JFetchRecordParams(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         jni::make_jstring(value.recordType),
         jni::make_jstring(value.recordID)
       );

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

@@ -2,7 +2,7 @@
 /// JHybridCloudKitModuleSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #include "JHybridCloudKitModuleSpec.hpp"
@@ -34,7 +34,11 @@ namespace margelo::nitro::cloudkitmodule { struct QueryRecordsParams; }
 #include <optional>
 #include "SaveRecordResult.hpp"
 #include "JSaveRecordResult.hpp"
+#include <NitroModules/Null.hpp>
 #include "RecordResult.hpp"
+#include <variant>
+#include "JVariant_NullType_RecordResult.hpp"
+#include <NitroModules/JNull.hpp>
 #include "JRecordResult.hpp"
 #include "QueryRecordsResult.hpp"
 #include "JQueryRecordsResult.hpp"
@@ -72,6 +76,12 @@ namespace margelo::nitro::cloudkitmodule {
     method(_javaPart);
   }
 
+  std::string JHybridCloudKitModuleSpec::toString() {
+    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
+    auto javaString = method(_javaPart);
+    return javaString->toStdString();
+  }
+
   // Properties
   
 
@@ -124,14 +134,14 @@ namespace margelo::nitro::cloudkitmodule {
       return __promise;
     }();
   }
-  std::shared_ptr<Promise<std::optional<RecordResult>>> JHybridCloudKitModuleSpec::fetchRecord(const FetchRecordParams& params) {
+  std::shared_ptr<Promise<std::variant<nitro::NullType, RecordResult>>> JHybridCloudKitModuleSpec::fetchRecord(const FetchRecordParams& params) {
     static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JFetchRecordParams> /* params */)>("fetchRecord");
     auto __result = method(_javaPart, JFetchRecordParams::fromCpp(params));
     return [&]() {
-      auto __promise = Promise<std::optional<RecordResult>>::create();
+      auto __promise = Promise<std::variant<nitro::NullType, RecordResult>>::create();
       __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& __boxedResult) {
-        auto __result = jni::static_ref_cast<JRecordResult>(__boxedResult);
-        __promise->resolve(__result != nullptr ? std::make_optional(__result->toCpp()) : std::nullopt);
+        auto __result = jni::static_ref_cast<JVariant_NullType_RecordResult>(__boxedResult);
+        __promise->resolve(__result->toCpp());
       });
       __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JThrowable>& __throwable) {
         jni::JniException __jniError(__throwable);

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

@@ -2,7 +2,7 @@
 /// HybridCloudKitModuleSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,6 +41,7 @@ namespace margelo::nitro::cloudkitmodule {
   public:
     size_t getExternalMemorySize() noexcept override;
     void dispose() noexcept override;
+    std::string toString() override;
 
   public:
     inline const jni::global_ref<JHybridCloudKitModuleSpec::javaobject>& getJavaPart() const noexcept {
@@ -56,7 +57,7 @@ namespace margelo::nitro::cloudkitmodule {
     std::shared_ptr<Promise<bool>> isAvailable() override;
     std::shared_ptr<Promise<AccountInfoResult>> getAccountInfo() override;
     std::shared_ptr<Promise<SaveRecordResult>> saveRecord(const SaveRecordParams& params) override;
-    std::shared_ptr<Promise<std::optional<RecordResult>>> fetchRecord(const FetchRecordParams& params) override;
+    std::shared_ptr<Promise<std::variant<nitro::NullType, RecordResult>>> fetchRecord(const FetchRecordParams& params) override;
     std::shared_ptr<Promise<void>> deleteRecord(const DeleteRecordParams& params) override;
     std::shared_ptr<Promise<bool>> recordExists(const RecordExistsParams& params) override;
     std::shared_ptr<Promise<QueryRecordsResult>> queryRecords(const QueryRecordsParams& params) override;

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

@@ -2,7 +2,7 @@
 /// JQueryRecordsParams.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -44,7 +44,11 @@ namespace margelo::nitro::cloudkitmodule {
      */
     [[maybe_unused]]
     static jni::local_ref<JQueryRecordsParams::javaobject> fromCpp(const QueryRecordsParams& value) {
-      return newInstance(
+      using JSignature = JQueryRecordsParams(jni::alias_ref<jni::JString>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         jni::make_jstring(value.recordType)
       );
     }

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

@@ -2,7 +2,7 @@
 /// JQueryRecordsResult.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -56,13 +56,18 @@ namespace margelo::nitro::cloudkitmodule {
      */
     [[maybe_unused]]
     static jni::local_ref<JQueryRecordsResult::javaobject> fromCpp(const QueryRecordsResult& value) {
-      return newInstance(
+      using JSignature = JQueryRecordsResult(jni::alias_ref<jni::JArrayClass<JRecordResult>>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         [&]() {
           size_t __size = value.records.size();
           jni::local_ref<jni::JArrayClass<JRecordResult>> __array = jni::JArrayClass<JRecordResult>::newArray(__size);
           for (size_t __i = 0; __i < __size; __i++) {
             const auto& __element = value.records[__i];
-            __array->setElement(__i, *JRecordResult::fromCpp(__element));
+            auto __elementJni = JRecordResult::fromCpp(__element);
+            __array->setElement(__i, *__elementJni);
           }
           return __array;
         }()

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

@@ -2,7 +2,7 @@
 /// JRecordExistsParams.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -47,7 +47,11 @@ namespace margelo::nitro::cloudkitmodule {
      */
     [[maybe_unused]]
     static jni::local_ref<JRecordExistsParams::javaobject> fromCpp(const RecordExistsParams& value) {
-      return newInstance(
+      using JSignature = JRecordExistsParams(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         jni::make_jstring(value.recordType),
         jni::make_jstring(value.recordID)
       );

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

@@ -2,7 +2,7 @@
 /// JRecordResult.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -59,7 +59,11 @@ namespace margelo::nitro::cloudkitmodule {
      */
     [[maybe_unused]]
     static jni::local_ref<JRecordResult::javaobject> fromCpp(const RecordResult& value) {
-      return newInstance(
+      using JSignature = JRecordResult(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, double, double);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         jni::make_jstring(value.recordID),
         jni::make_jstring(value.recordType),
         jni::make_jstring(value.data),

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

@@ -2,7 +2,7 @@
 /// JSaveRecordParams.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -53,7 +53,11 @@ namespace margelo::nitro::cloudkitmodule {
      */
     [[maybe_unused]]
     static jni::local_ref<JSaveRecordParams::javaobject> fromCpp(const SaveRecordParams& value) {
-      return newInstance(
+      using JSignature = JSaveRecordParams(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         jni::make_jstring(value.recordType),
         jni::make_jstring(value.recordID),
         jni::make_jstring(value.data),

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

@@ -2,7 +2,7 @@
 /// JSaveRecordResult.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -47,7 +47,11 @@ namespace margelo::nitro::cloudkitmodule {
      */
     [[maybe_unused]]
     static jni::local_ref<JSaveRecordResult::javaobject> fromCpp(const SaveRecordResult& value) {
-      return newInstance(
+      using JSignature = JSaveRecordResult(jni::alias_ref<jni::JString>, double);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         jni::make_jstring(value.recordID),
         value.createdAt
       );

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

@@ -0,0 +1,26 @@
+///
+/// JVariant_NullType_RecordResult.cpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2026 Marc Rousavy @ Margelo
+///
+
+#include "JVariant_NullType_RecordResult.hpp"
+
+namespace margelo::nitro::cloudkitmodule {
+  /**
+   * Converts JVariant_NullType_RecordResult to std::variant<nitro::NullType, RecordResult>
+   */
+  std::variant<nitro::NullType, RecordResult> JVariant_NullType_RecordResult::toCpp() const {
+    if (isInstanceOf(JVariant_NullType_RecordResult_impl::First::javaClassStatic())) {
+      // It's a `nitro::NullType`
+      auto jniValue = static_cast<const JVariant_NullType_RecordResult_impl::First*>(this)->getValue();
+      return nitro::null;
+    } else if (isInstanceOf(JVariant_NullType_RecordResult_impl::Second::javaClassStatic())) {
+      // It's a `RecordResult`
+      auto jniValue = static_cast<const JVariant_NullType_RecordResult_impl::Second*>(this)->getValue();
+      return jniValue->toCpp();
+    }
+    throw std::invalid_argument("Variant is unknown Kotlin instance!");
+  }
+} // namespace margelo::nitro::cloudkitmodule

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

@@ -0,0 +1,72 @@
+///
+/// JVariant_NullType_RecordResult.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2026 Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <variant>
+
+#include <NitroModules/Null.hpp>
+#include "RecordResult.hpp"
+#include <variant>
+#include <NitroModules/JNull.hpp>
+#include "JRecordResult.hpp"
+#include <string>
+
+namespace margelo::nitro::cloudkitmodule {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ std::variant and the Java class "Variant_NullType_RecordResult".
+   */
+  class JVariant_NullType_RecordResult: public jni::JavaClass<JVariant_NullType_RecordResult> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/Variant_NullType_RecordResult;";
+
+    static jni::local_ref<JVariant_NullType_RecordResult> create_0(jni::alias_ref<JNull> value) {
+      static const auto method = javaClassStatic()->getStaticMethod<JVariant_NullType_RecordResult(jni::alias_ref<JNull>)>("create");
+      return method(javaClassStatic(), value);
+    }
+    static jni::local_ref<JVariant_NullType_RecordResult> create_1(jni::alias_ref<JRecordResult> value) {
+      static const auto method = javaClassStatic()->getStaticMethod<JVariant_NullType_RecordResult(jni::alias_ref<JRecordResult>)>("create");
+      return method(javaClassStatic(), value);
+    }
+
+    static jni::local_ref<JVariant_NullType_RecordResult> fromCpp(const std::variant<nitro::NullType, RecordResult>& variant) {
+      switch (variant.index()) {
+        case 0: return create_0(JNull::null());
+        case 1: return create_1(JRecordResult::fromCpp(std::get<1>(variant)));
+        default: throw std::invalid_argument("Variant holds unknown index! (" + std::to_string(variant.index()) + ")");
+      }
+    }
+
+    [[nodiscard]] std::variant<nitro::NullType, RecordResult> toCpp() const;
+  };
+
+  namespace JVariant_NullType_RecordResult_impl {
+    class First: public jni::JavaClass<First, JVariant_NullType_RecordResult> {
+    public:
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/Variant_NullType_RecordResult$First;";
+    
+      [[nodiscard]] jni::local_ref<JNull> getValue() const {
+        static const auto field = javaClassStatic()->getField<JNull>("value");
+        return getFieldValue(field);
+      }
+    };
+    
+    class Second: public jni::JavaClass<Second, JVariant_NullType_RecordResult> {
+    public:
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/Variant_NullType_RecordResult$Second;";
+    
+      [[nodiscard]] jni::local_ref<JRecordResult> getValue() const {
+        static const auto field = javaClassStatic()->getField<JRecordResult>("value");
+        return getFieldValue(field);
+      }
+    };
+  } // namespace JVariant_NullType_RecordResult_impl
+} // namespace margelo::nitro::cloudkitmodule

package/nitrogen/generated/android/cloudkitmodule+autolinking.cmake

@@ -2,7 +2,7 @@
 # cloudkitmodule+autolinking.cmake
 # This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 # https://github.com/mrousavy/nitro
-# Copyright © 2025 Marc Rousavy @ Margelo
+# Copyright © 2026 Marc Rousavy @ Margelo
 #
 
 # This is a CMake file that adds all files generated by Nitrogen
@@ -36,6 +36,7 @@ target_sources(
   ../nitrogen/generated/shared/c++/HybridCloudKitModuleSpec.cpp
   # Android-specific Nitrogen C++ sources
   ../nitrogen/generated/android/c++/JHybridCloudKitModuleSpec.cpp
+  ../nitrogen/generated/android/c++/JVariant_NullType_RecordResult.cpp
 )
 
 # From node_modules/react-native/ReactAndroid/cmake-utils/folly-flags.cmake

package/nitrogen/generated/android/cloudkitmodule+autolinking.gradle

@@ -2,7 +2,7 @@
 /// cloudkitmodule+autolinking.gradle
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 /// This is a Gradle file that adds all files generated by Nitrogen

package/nitrogen/generated/android/cloudkitmoduleOnLoad.cpp

@@ -2,7 +2,7 @@
 /// cloudkitmoduleOnLoad.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #ifndef BUILDING_CLOUDKITMODULE_WITH_GENERATED_CMAKE_PROJECT

package/nitrogen/generated/android/cloudkitmoduleOnLoad.hpp

@@ -2,7 +2,7 @@
 /// cloudkitmoduleOnLoad.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #include <jni.h>

package/nitrogen/generated/android/kotlin/com/margelo/nitro/cloudkitmodule/AccountInfoResult.kt

@@ -2,14 +2,13 @@
 /// AccountInfoResult.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.cloudkitmodule
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -17,19 +16,29 @@ import com.margelo.nitro.core.*
  */
 @DoNotStrip
 @Keep
-data class AccountInfoResult
+data class AccountInfoResult(
   @DoNotStrip
   @Keep
-  constructor(
-    @DoNotStrip
-    @Keep
-    val status: Double,
-    @DoNotStrip
-    @Keep
-    val statusName: String,
+  val status: Double,
+  @DoNotStrip
+  @Keep
+  val statusName: String,
+  @DoNotStrip
+  @Keep
+  val containerUserId: String?
+) {
+  /* primary constructor */
+
+  private companion object {
+    /**
+     * Constructor called from C++
+     */
     @DoNotStrip
     @Keep
-    val containerUserId: String?
-  ) {
-  /* main constructor */
+    @Suppress("unused")
+    @JvmStatic
+    private fun fromCpp(status: Double, statusName: String, containerUserId: String?): AccountInfoResult {
+      return AccountInfoResult(status, statusName, containerUserId)
+    }
+  }
 }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/cloudkitmodule/DeleteRecordParams.kt

@@ -2,14 +2,13 @@
 /// DeleteRecordParams.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.cloudkitmodule
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -17,16 +16,26 @@ import com.margelo.nitro.core.*
  */
 @DoNotStrip
 @Keep
-data class DeleteRecordParams
+data class DeleteRecordParams(
   @DoNotStrip
   @Keep
-  constructor(
-    @DoNotStrip
-    @Keep
-    val recordType: String,
+  val recordType: String,
+  @DoNotStrip
+  @Keep
+  val recordID: String
+) {
+  /* primary constructor */
+
+  private companion object {
+    /**
+     * Constructor called from C++
+     */
     @DoNotStrip
     @Keep
-    val recordID: String
-  ) {
-  /* main constructor */
+    @Suppress("unused")
+    @JvmStatic
+    private fun fromCpp(recordType: String, recordID: String): DeleteRecordParams {
+      return DeleteRecordParams(recordType, recordID)
+    }
+  }
 }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/cloudkitmodule/FetchRecordParams.kt

@@ -2,14 +2,13 @@
 /// FetchRecordParams.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.cloudkitmodule
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -17,16 +16,26 @@ import com.margelo.nitro.core.*
  */
 @DoNotStrip
 @Keep
-data class FetchRecordParams
+data class FetchRecordParams(
   @DoNotStrip
   @Keep
-  constructor(
-    @DoNotStrip
-    @Keep
-    val recordType: String,
+  val recordType: String,
+  @DoNotStrip
+  @Keep
+  val recordID: String
+) {
+  /* primary constructor */
+
+  private companion object {
+    /**
+     * Constructor called from C++
+     */
     @DoNotStrip
     @Keep
-    val recordID: String
-  ) {
-  /* main constructor */
+    @Suppress("unused")
+    @JvmStatic
+    private fun fromCpp(recordType: String, recordID: String): FetchRecordParams {
+      return FetchRecordParams(recordType, recordID)
+    }
+  }
 }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/cloudkitmodule/HybridCloudKitModuleSpec.kt

@@ -2,7 +2,7 @@
 /// HybridCloudKitModuleSpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.cloudkitmodule
@@ -10,7 +10,9 @@ package com.margelo.nitro.cloudkitmodule
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
+import com.margelo.nitro.core.Promise
+import com.margelo.nitro.core.NullType
+import com.margelo.nitro.core.HybridObject
 
 /**
  * A Kotlin class representing the CloudKitModule HybridObject.
@@ -36,6 +38,11 @@ abstract class HybridCloudKitModuleSpec: HybridObject() {
     super.updateNative(hybridData)
   }
 
+  // Default implementation of `HybridObject.toString()`
+  override fun toString(): String {
+    return "[HybridObject CloudKitModule]"
+  }
+
   // Properties
   
 
@@ -54,7 +61,7 @@ abstract class HybridCloudKitModuleSpec: HybridObject() {
   
   @DoNotStrip
   @Keep
-  abstract fun fetchRecord(params: FetchRecordParams): Promise<RecordResult?>
+  abstract fun fetchRecord(params: FetchRecordParams): Promise<Variant_NullType_RecordResult>
   
   @DoNotStrip
   @Keep
@@ -71,6 +78,6 @@ abstract class HybridCloudKitModuleSpec: HybridObject() {
   private external fun initHybrid(): HybridData
 
   companion object {
-    private const val TAG = "HybridCloudKitModuleSpec"
+    protected const val TAG = "HybridCloudKitModuleSpec"
   }
 }