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

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

@@ -9,7 +9,6 @@ package com.margelo.nitro.cloudkitmodule
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.core.*
 
 
 /**
@@ -17,22 +16,32 @@ import com.margelo.nitro.core.*
  */
 @DoNotStrip
 @Keep
-data class SaveRecordParams
+data class SaveRecordParams(
   @DoNotStrip
   @Keep
-  constructor(
-    @DoNotStrip
-    @Keep
-    val recordType: String,
-    @DoNotStrip
-    @Keep
-    val recordID: String,
-    @DoNotStrip
-    @Keep
-    val data: String,
+  val recordType: String,
+  @DoNotStrip
+  @Keep
+  val recordID: String,
+  @DoNotStrip
+  @Keep
+  val data: String,
+  @DoNotStrip
+  @Keep
+  val meta: String
+) {
+  /* primary constructor */
+
+  private companion object {
+    /**
+     * Constructor called from C++
+     */
     @DoNotStrip
     @Keep
-    val meta: String
-  ) {
-  /* main constructor */
+    @Suppress("unused")
+    @JvmStatic
+    private fun fromCpp(recordType: String, recordID: String, data: String, meta: String): SaveRecordParams {
+      return SaveRecordParams(recordType, recordID, data, meta)
+    }
+  }
 }

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

@@ -9,7 +9,6 @@ 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 SaveRecordResult
+data class SaveRecordResult(
   @DoNotStrip
   @Keep
-  constructor(
-    @DoNotStrip
-    @Keep
-    val recordID: String,
+  val recordID: String,
+  @DoNotStrip
+  @Keep
+  val createdAt: Double
+) {
+  /* primary constructor */
+
+  private companion object {
+    /**
+     * Constructor called from C++
+     */
     @DoNotStrip
     @Keep
-    val createdAt: Double
-  ) {
-  /* main constructor */
+    @Suppress("unused")
+    @JvmStatic
+    private fun fromCpp(recordID: String, createdAt: Double): SaveRecordResult {
+      return SaveRecordResult(recordID, createdAt)
+    }
+  }
 }

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

@@ -0,0 +1,59 @@
+///
+/// Variant_NullType_RecordResult.kt
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+package com.margelo.nitro.cloudkitmodule
+
+import com.facebook.proguard.annotations.DoNotStrip
+import com.margelo.nitro.core.NullType
+
+/**
+ * Represents the TypeScript variant "NullType | RecordResult".
+ */
+@Suppress("ClassName")
+@DoNotStrip
+sealed class Variant_NullType_RecordResult {
+  @DoNotStrip
+  data class First(@DoNotStrip val value: NullType): Variant_NullType_RecordResult()
+  @DoNotStrip
+  data class Second(@DoNotStrip val value: RecordResult): Variant_NullType_RecordResult()
+
+  @Deprecated("getAs() is not type-safe. Use fold/asFirstOrNull/asSecondOrNull instead.", level = DeprecationLevel.ERROR)
+  inline fun <reified T> getAs(): T? = when (this) {
+    is First -> value as? T
+    is Second -> value as? T
+  }
+
+  val isFirst: Boolean
+    get() = this is First
+  val isSecond: Boolean
+    get() = this is Second
+
+  fun asFirstOrNull(): NullType? {
+    val value = (this as? First)?.value ?: return null
+    return value
+  }
+  fun asSecondOrNull(): RecordResult? {
+    val value = (this as? Second)?.value ?: return null
+    return value
+  }
+
+  inline fun <R> match(first: (NullType) -> R, second: (RecordResult) -> R): R {
+    return when (this) {
+      is First -> first(value)
+      is Second -> second(value)
+    }
+  }
+
+  companion object {
+    @JvmStatic
+    @DoNotStrip
+    fun create(value: NullType): Variant_NullType_RecordResult = First(value)
+    @JvmStatic
+    @DoNotStrip
+    fun create(value: RecordResult): Variant_NullType_RecordResult = Second(value)
+  }
+}

package/nitrogen/generated/ios/CloudKitModule-Swift-Cxx-Bridge.cpp

@@ -10,6 +10,7 @@
 // Include C++ implementation defined types
 #include "CloudKitModule-Swift-Cxx-Umbrella.hpp"
 #include "HybridCloudKitModuleSpecSwift.hpp"
+#include <NitroModules/NitroDefines.hpp>
 
 namespace margelo::nitro::cloudkitmodule::bridge::swift {
 
@@ -45,10 +46,10 @@ namespace margelo::nitro::cloudkitmodule::bridge::swift {
     };
   }
   
-  // pragma MARK: std::function<void(const std::optional<RecordResult>& /* result */)>
-  Func_void_std__optional_RecordResult_ create_Func_void_std__optional_RecordResult_(void* NON_NULL swiftClosureWrapper) noexcept {
-    auto swiftClosure = CloudKitModule::Func_void_std__optional_RecordResult_::fromUnsafe(swiftClosureWrapper);
-    return [swiftClosure = std::move(swiftClosure)](const std::optional<RecordResult>& result) mutable -> void {
+  // pragma MARK: std::function<void(const std::variant<nitro::NullType, RecordResult>& /* result */)>
+  Func_void_std__variant_nitro__NullType__RecordResult_ create_Func_void_std__variant_nitro__NullType__RecordResult_(void* NON_NULL swiftClosureWrapper) noexcept {
+    auto swiftClosure = CloudKitModule::Func_void_std__variant_nitro__NullType__RecordResult_::fromUnsafe(swiftClosureWrapper);
+    return [swiftClosure = std::move(swiftClosure)](const std::variant<nitro::NullType, RecordResult>& result) mutable -> void {
       swiftClosure.call(result);
     };
   }
@@ -74,7 +75,7 @@ namespace margelo::nitro::cloudkitmodule::bridge::swift {
     CloudKitModule::HybridCloudKitModuleSpec_cxx swiftPart = CloudKitModule::HybridCloudKitModuleSpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::cloudkitmodule::HybridCloudKitModuleSpecSwift>(swiftPart);
   }
-  void* NON_NULL get_std__shared_ptr_HybridCloudKitModuleSpec_(std__shared_ptr_HybridCloudKitModuleSpec_ cppType) noexcept {
+  void* NON_NULL get_std__shared_ptr_HybridCloudKitModuleSpec_(std__shared_ptr_HybridCloudKitModuleSpec_ cppType) {
     std::shared_ptr<margelo::nitro::cloudkitmodule::HybridCloudKitModuleSpecSwift> swiftWrapper = std::dynamic_pointer_cast<margelo::nitro::cloudkitmodule::HybridCloudKitModuleSpecSwift>(cppType);
     #ifdef NITRO_DEBUG
     if (swiftWrapper == nullptr) [[unlikely]] {

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

@@ -29,7 +29,7 @@ namespace CloudKitModule { class HybridCloudKitModuleSpec_cxx; }
 #include "QueryRecordsResult.hpp"
 #include "RecordResult.hpp"
 #include "SaveRecordResult.hpp"
-#include <NitroModules/FastVectorCopy.hpp>
+#include <NitroModules/Null.hpp>
 #include <NitroModules/Promise.hpp>
 #include <NitroModules/PromiseHolder.hpp>
 #include <NitroModules/Result.hpp>
@@ -38,6 +38,7 @@ namespace CloudKitModule { class HybridCloudKitModuleSpec_cxx; }
 #include <memory>
 #include <optional>
 #include <string>
+#include <variant>
 #include <vector>
 
 /**
@@ -185,53 +186,67 @@ namespace margelo::nitro::cloudkitmodule::bridge::swift {
     return Func_void_SaveRecordResult_Wrapper(std::move(value));
   }
   
-  // pragma MARK: std::optional<RecordResult>
+  // pragma MARK: std::variant<nitro::NullType, RecordResult>
   /**
-   * Specialized version of `std::optional<RecordResult>`.
+   * Wrapper struct for `std::variant<nitro::NullType, RecordResult>`.
+   * std::variant cannot be used in Swift because of a Swift bug.
+   * Not even specializing it works. So we create a wrapper struct.
    */
-  using std__optional_RecordResult_ = std::optional<RecordResult>;
-  inline std::optional<RecordResult> create_std__optional_RecordResult_(const RecordResult& value) noexcept {
-    return std::optional<RecordResult>(value);
-  }
-  inline bool has_value_std__optional_RecordResult_(const std::optional<RecordResult>& optional) noexcept {
-    return optional.has_value();
+  struct std__variant_nitro__NullType__RecordResult_ {
+    std::variant<nitro::NullType, RecordResult> variant;
+    std__variant_nitro__NullType__RecordResult_(std::variant<nitro::NullType, RecordResult> variant): variant(variant) { }
+    operator std::variant<nitro::NullType, RecordResult>() const noexcept {
+      return variant;
+    }
+    inline size_t index() const noexcept {
+      return variant.index();
+    }
+    inline nitro::NullType get_0() const noexcept {
+      return std::get<0>(variant);
+    }
+    inline RecordResult get_1() const noexcept {
+      return std::get<1>(variant);
+    }
+  };
+  inline std__variant_nitro__NullType__RecordResult_ create_std__variant_nitro__NullType__RecordResult_(nitro::NullType value) noexcept {
+    return std__variant_nitro__NullType__RecordResult_(value);
   }
-  inline RecordResult get_std__optional_RecordResult_(const std::optional<RecordResult>& optional) noexcept {
-    return *optional;
+  inline std__variant_nitro__NullType__RecordResult_ create_std__variant_nitro__NullType__RecordResult_(const RecordResult& value) noexcept {
+    return std__variant_nitro__NullType__RecordResult_(value);
   }
   
-  // pragma MARK: std::shared_ptr<Promise<std::optional<RecordResult>>>
+  // pragma MARK: std::shared_ptr<Promise<std::variant<nitro::NullType, RecordResult>>>
   /**
-   * Specialized version of `std::shared_ptr<Promise<std::optional<RecordResult>>>`.
+   * Specialized version of `std::shared_ptr<Promise<std::variant<nitro::NullType, RecordResult>>>`.
    */
-  using std__shared_ptr_Promise_std__optional_RecordResult___ = std::shared_ptr<Promise<std::optional<RecordResult>>>;
-  inline std::shared_ptr<Promise<std::optional<RecordResult>>> create_std__shared_ptr_Promise_std__optional_RecordResult___() noexcept {
-    return Promise<std::optional<RecordResult>>::create();
+  using std__shared_ptr_Promise_std__variant_nitro__NullType__RecordResult___ = std::shared_ptr<Promise<std::variant<nitro::NullType, RecordResult>>>;
+  inline std::shared_ptr<Promise<std::variant<nitro::NullType, RecordResult>>> create_std__shared_ptr_Promise_std__variant_nitro__NullType__RecordResult___() noexcept {
+    return Promise<std::variant<nitro::NullType, RecordResult>>::create();
   }
-  inline PromiseHolder<std::optional<RecordResult>> wrap_std__shared_ptr_Promise_std__optional_RecordResult___(std::shared_ptr<Promise<std::optional<RecordResult>>> promise) noexcept {
-    return PromiseHolder<std::optional<RecordResult>>(std::move(promise));
+  inline PromiseHolder<std::variant<nitro::NullType, RecordResult>> wrap_std__shared_ptr_Promise_std__variant_nitro__NullType__RecordResult___(std::shared_ptr<Promise<std::variant<nitro::NullType, RecordResult>>> promise) noexcept {
+    return PromiseHolder<std::variant<nitro::NullType, RecordResult>>(std::move(promise));
   }
   
-  // pragma MARK: std::function<void(const std::optional<RecordResult>& /* result */)>
+  // pragma MARK: std::function<void(const std::variant<nitro::NullType, RecordResult>& /* result */)>
   /**
-   * Specialized version of `std::function<void(const std::optional<RecordResult>&)>`.
+   * Specialized version of `std::function<void(const std::variant<nitro::NullType, RecordResult>&)>`.
    */
-  using Func_void_std__optional_RecordResult_ = std::function<void(const std::optional<RecordResult>& /* result */)>;
+  using Func_void_std__variant_nitro__NullType__RecordResult_ = std::function<void(const std::variant<nitro::NullType, RecordResult>& /* result */)>;
   /**
-   * Wrapper class for a `std::function<void(const std::optional<RecordResult>& / * result * /)>`, this can be used from Swift.
+   * Wrapper class for a `std::function<void(const std::variant<nitro::NullType, RecordResult>& / * result * /)>`, this can be used from Swift.
    */
-  class Func_void_std__optional_RecordResult__Wrapper final {
+  class Func_void_std__variant_nitro__NullType__RecordResult__Wrapper final {
   public:
-    explicit Func_void_std__optional_RecordResult__Wrapper(std::function<void(const std::optional<RecordResult>& /* result */)>&& func): _function(std::make_unique<std::function<void(const std::optional<RecordResult>& /* result */)>>(std::move(func))) {}
-    inline void call(std::optional<RecordResult> result) const noexcept {
+    explicit Func_void_std__variant_nitro__NullType__RecordResult__Wrapper(std::function<void(const std::variant<nitro::NullType, RecordResult>& /* result */)>&& func): _function(std::make_unique<std::function<void(const std::variant<nitro::NullType, RecordResult>& /* result */)>>(std::move(func))) {}
+    inline void call(std::variant<nitro::NullType, RecordResult> result) const noexcept {
       _function->operator()(result);
     }
   private:
-    std::unique_ptr<std::function<void(const std::optional<RecordResult>& /* result */)>> _function;
+    std::unique_ptr<std::function<void(const std::variant<nitro::NullType, RecordResult>& /* result */)>> _function;
   } SWIFT_NONCOPYABLE;
-  Func_void_std__optional_RecordResult_ create_Func_void_std__optional_RecordResult_(void* NON_NULL swiftClosureWrapper) noexcept;
-  inline Func_void_std__optional_RecordResult__Wrapper wrap_Func_void_std__optional_RecordResult_(Func_void_std__optional_RecordResult_ value) noexcept {
-    return Func_void_std__optional_RecordResult__Wrapper(std::move(value));
+  Func_void_std__variant_nitro__NullType__RecordResult_ create_Func_void_std__variant_nitro__NullType__RecordResult_(void* NON_NULL swiftClosureWrapper) noexcept;
+  inline Func_void_std__variant_nitro__NullType__RecordResult__Wrapper wrap_Func_void_std__variant_nitro__NullType__RecordResult_(Func_void_std__variant_nitro__NullType__RecordResult_ value) noexcept {
+    return Func_void_std__variant_nitro__NullType__RecordResult__Wrapper(std::move(value));
   }
   
   // pragma MARK: std::shared_ptr<Promise<void>>
@@ -273,11 +288,10 @@ namespace margelo::nitro::cloudkitmodule::bridge::swift {
    * Specialized version of `std::vector<RecordResult>`.
    */
   using std__vector_RecordResult_ = std::vector<RecordResult>;
-  inline std::vector<RecordResult> copy_std__vector_RecordResult_(const RecordResult* CONTIGUOUS_MEMORY NON_NULL data, size_t size) noexcept {
-    return margelo::nitro::FastVectorCopy<RecordResult>(data, size);
-  }
-  inline const RecordResult* CONTIGUOUS_MEMORY NON_NULL get_data_std__vector_RecordResult_(const std::vector<RecordResult>& vector) noexcept {
-    return vector.data();
+  inline std::vector<RecordResult> create_std__vector_RecordResult_(size_t size) noexcept {
+    std::vector<RecordResult> vector;
+    vector.reserve(size);
+    return vector;
   }
   
   // pragma MARK: std::shared_ptr<Promise<QueryRecordsResult>>
@@ -320,7 +334,7 @@ namespace margelo::nitro::cloudkitmodule::bridge::swift {
    */
   using std__shared_ptr_HybridCloudKitModuleSpec_ = std::shared_ptr<HybridCloudKitModuleSpec>;
   std::shared_ptr<HybridCloudKitModuleSpec> create_std__shared_ptr_HybridCloudKitModuleSpec_(void* NON_NULL swiftUnsafePointer) noexcept;
-  void* NON_NULL get_std__shared_ptr_HybridCloudKitModuleSpec_(std__shared_ptr_HybridCloudKitModuleSpec_ cppType) noexcept;
+  void* NON_NULL get_std__shared_ptr_HybridCloudKitModuleSpec_(std__shared_ptr_HybridCloudKitModuleSpec_ cppType);
   
   // pragma MARK: std::weak_ptr<HybridCloudKitModuleSpec>
   using std__weak_ptr_HybridCloudKitModuleSpec_ = std::weak_ptr<HybridCloudKitModuleSpec>;
@@ -353,13 +367,13 @@ namespace margelo::nitro::cloudkitmodule::bridge::swift {
     return Result<std::shared_ptr<Promise<SaveRecordResult>>>::withError(error);
   }
   
-  // pragma MARK: Result<std::shared_ptr<Promise<std::optional<RecordResult>>>>
-  using Result_std__shared_ptr_Promise_std__optional_RecordResult____ = Result<std::shared_ptr<Promise<std::optional<RecordResult>>>>;
-  inline Result_std__shared_ptr_Promise_std__optional_RecordResult____ create_Result_std__shared_ptr_Promise_std__optional_RecordResult____(const std::shared_ptr<Promise<std::optional<RecordResult>>>& value) noexcept {
-    return Result<std::shared_ptr<Promise<std::optional<RecordResult>>>>::withValue(value);
+  // pragma MARK: Result<std::shared_ptr<Promise<std::variant<nitro::NullType, RecordResult>>>>
+  using Result_std__shared_ptr_Promise_std__variant_nitro__NullType__RecordResult____ = Result<std::shared_ptr<Promise<std::variant<nitro::NullType, RecordResult>>>>;
+  inline Result_std__shared_ptr_Promise_std__variant_nitro__NullType__RecordResult____ create_Result_std__shared_ptr_Promise_std__variant_nitro__NullType__RecordResult____(const std::shared_ptr<Promise<std::variant<nitro::NullType, RecordResult>>>& value) noexcept {
+    return Result<std::shared_ptr<Promise<std::variant<nitro::NullType, RecordResult>>>>::withValue(value);
   }
-  inline Result_std__shared_ptr_Promise_std__optional_RecordResult____ create_Result_std__shared_ptr_Promise_std__optional_RecordResult____(const std::exception_ptr& error) noexcept {
-    return Result<std::shared_ptr<Promise<std::optional<RecordResult>>>>::withError(error);
+  inline Result_std__shared_ptr_Promise_std__variant_nitro__NullType__RecordResult____ create_Result_std__shared_ptr_Promise_std__variant_nitro__NullType__RecordResult____(const std::exception_ptr& error) noexcept {
+    return Result<std::shared_ptr<Promise<std::variant<nitro::NullType, RecordResult>>>>::withError(error);
   }
   
   // pragma MARK: Result<std::shared_ptr<Promise<void>>>

package/nitrogen/generated/ios/CloudKitModule-Swift-Cxx-Umbrella.hpp

@@ -40,12 +40,14 @@ namespace margelo::nitro::cloudkitmodule { struct SaveRecordResult; }
 #include "RecordResult.hpp"
 #include "SaveRecordParams.hpp"
 #include "SaveRecordResult.hpp"
+#include <NitroModules/Null.hpp>
 #include <NitroModules/Promise.hpp>
 #include <NitroModules/Result.hpp>
 #include <exception>
 #include <memory>
 #include <optional>
 #include <string>
+#include <variant>
 #include <vector>
 
 // C++ helpers for Swift

package/nitrogen/generated/ios/c++/HybridCloudKitModuleSpecSwift.hpp

@@ -37,7 +37,9 @@ namespace margelo::nitro::cloudkitmodule { struct QueryRecordsParams; }
 #include <optional>
 #include "SaveRecordResult.hpp"
 #include "SaveRecordParams.hpp"
+#include <NitroModules/Null.hpp>
 #include "RecordResult.hpp"
+#include <variant>
 #include "FetchRecordParams.hpp"
 #include "DeleteRecordParams.hpp"
 #include "RecordExistsParams.hpp"
@@ -79,6 +81,9 @@ namespace margelo::nitro::cloudkitmodule {
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
+    std::string toString() override {
+      return _swiftPart.toString();
+    }
 
   public:
     // Properties
@@ -110,7 +115,7 @@ namespace margelo::nitro::cloudkitmodule {
       auto __value = std::move(__result.value());
       return __value;
     }
-    inline std::shared_ptr<Promise<std::optional<RecordResult>>> fetchRecord(const FetchRecordParams& params) override {
+    inline std::shared_ptr<Promise<std::variant<nitro::NullType, RecordResult>>> fetchRecord(const FetchRecordParams& params) override {
       auto __result = _swiftPart.fetchRecord(std::forward<decltype(params)>(params));
       if (__result.hasError()) [[unlikely]] {
         std::rethrow_exception(__result.error());

package/nitrogen/generated/ios/swift/AccountInfoResult.swift

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

package/nitrogen/generated/ios/swift/DeleteRecordParams.swift

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

package/nitrogen/generated/ios/swift/FetchRecordParams.swift

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

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

@@ -5,9 +5,9 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
-
 /**
  * Wraps a Swift `() -> Void` as a class.
  * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.

package/nitrogen/generated/ios/swift/Func_void_AccountInfoResult.swift

@@ -5,9 +5,9 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
-
 /**
  * Wraps a Swift `(_ value: AccountInfoResult) -> Void` as a class.
  * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.

package/nitrogen/generated/ios/swift/Func_void_QueryRecordsResult.swift

@@ -5,9 +5,9 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
-
 /**
  * Wraps a Swift `(_ value: QueryRecordsResult) -> Void` as a class.
  * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.

package/nitrogen/generated/ios/swift/Func_void_SaveRecordResult.swift

@@ -5,9 +5,9 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
-
 /**
  * Wraps a Swift `(_ value: SaveRecordResult) -> Void` as a class.
  * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.

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

@@ -5,9 +5,9 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
-
 /**
  * Wraps a Swift `(_ value: Bool) -> Void` as a class.
  * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.

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

@@ -5,9 +5,9 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
-
 /**
  * Wraps a Swift `(_ error: Error) -> Void` as a class.
  * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.

package/nitrogen/generated/ios/swift/Func_void_std__variant_nitro__NullType__RecordResult_.swift

@@ -0,0 +1,59 @@
+///
+/// Func_void_std__variant_nitro__NullType__RecordResult_.swift
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+import Foundation
+import NitroModules
+
+/**
+ * Wraps a Swift `(_ value: Variant_NullType_RecordResult) -> Void` as a class.
+ * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.
+ */
+public final class Func_void_std__variant_nitro__NullType__RecordResult_ {
+  public typealias bridge = margelo.nitro.cloudkitmodule.bridge.swift
+
+  private let closure: (_ value: Variant_NullType_RecordResult) -> Void
+
+  public init(_ closure: @escaping (_ value: Variant_NullType_RecordResult) -> Void) {
+    self.closure = closure
+  }
+
+  @inline(__always)
+  public func call(value: bridge.std__variant_nitro__NullType__RecordResult_) -> Void {
+    self.closure({ () -> Variant_NullType_RecordResult in
+      let __variant = value
+      switch __variant.index() {
+        case 0:
+          let __actual = __variant.get_0()
+          return .first(NullType.null)
+        case 1:
+          let __actual = __variant.get_1()
+          return .second(__actual)
+        default:
+          fatalError("Variant can never have index \(__variant.index())!")
+      }
+    }())
+  }
+
+  /**
+   * Casts this instance to a retained unsafe raw pointer.
+   * This acquires one additional strong reference on the object!
+   */
+  @inline(__always)
+  public func toUnsafe() -> UnsafeMutableRawPointer {
+    return Unmanaged.passRetained(self).toOpaque()
+  }
+
+  /**
+   * Casts an unsafe pointer to a `Func_void_std__variant_nitro__NullType__RecordResult_`.
+   * The pointer has to be a retained opaque `Unmanaged<Func_void_std__variant_nitro__NullType__RecordResult_>`.
+   * This removes one strong reference from the object!
+   */
+  @inline(__always)
+  public static func fromUnsafe(_ pointer: UnsafeMutableRawPointer) -> Func_void_std__variant_nitro__NullType__RecordResult_ {
+    return Unmanaged<Func_void_std__variant_nitro__NullType__RecordResult_>.fromOpaque(pointer).takeRetainedValue()
+  }
+}

package/nitrogen/generated/ios/swift/HybridCloudKitModuleSpec.swift

@@ -17,12 +17,19 @@ public protocol HybridCloudKitModuleSpec_protocol: HybridObject {
   func isAvailable() throws -> Promise<Bool>
   func getAccountInfo() throws -> Promise<AccountInfoResult>
   func saveRecord(params: SaveRecordParams) throws -> Promise<SaveRecordResult>
-  func fetchRecord(params: FetchRecordParams) throws -> Promise<RecordResult?>
+  func fetchRecord(params: FetchRecordParams) throws -> Promise<Variant_NullType_RecordResult>
   func deleteRecord(params: DeleteRecordParams) throws -> Promise<Void>
   func recordExists(params: RecordExistsParams) throws -> Promise<Bool>
   func queryRecords(params: QueryRecordsParams) throws -> Promise<QueryRecordsResult>
 }
 
+public extension HybridCloudKitModuleSpec_protocol {
+  /// Default implementation of ``HybridObject.toString``
+  func toString() -> String {
+    return "[HybridObject CloudKitModule]"
+  }
+}
+
 /// See ``HybridCloudKitModuleSpec``
 open class HybridCloudKitModuleSpec_base {
   private weak var cxxWrapper: HybridCloudKitModuleSpec_cxx? = nil

package/nitrogen/generated/ios/swift/HybridCloudKitModuleSpec_cxx.swift

@@ -76,7 +76,7 @@ open class HybridCloudKitModuleSpec_cxx {
    */
   public func getCxxPart() -> bridge.std__shared_ptr_HybridCloudKitModuleSpec_ {
     let cachedCxxPart = self.__cxxPart.lock()
-    if cachedCxxPart.__convertToBool() {
+    if Bool(fromCxx: cachedCxxPart) {
       return cachedCxxPart
     } else {
       let newCxxPart = bridge.create_std__shared_ptr_HybridCloudKitModuleSpec_(self.toUnsafe())
@@ -105,6 +105,14 @@ open class HybridCloudKitModuleSpec_cxx {
     self.__implementation.dispose()
   }
 
+  /**
+   * Call toString() on the Swift class.
+   */
+  @inline(__always)
+  public func toString() -> String {
+    return self.__implementation.toString()
+  }
+
   // Properties
   
 
@@ -167,27 +175,28 @@ open class HybridCloudKitModuleSpec_cxx {
   }
   
   @inline(__always)
-  public final func fetchRecord(params: FetchRecordParams) -> bridge.Result_std__shared_ptr_Promise_std__optional_RecordResult____ {
+  public final func fetchRecord(params: FetchRecordParams) -> bridge.Result_std__shared_ptr_Promise_std__variant_nitro__NullType__RecordResult____ {
     do {
       let __result = try self.__implementation.fetchRecord(params: params)
-      let __resultCpp = { () -> bridge.std__shared_ptr_Promise_std__optional_RecordResult___ in
-        let __promise = bridge.create_std__shared_ptr_Promise_std__optional_RecordResult___()
-        let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_std__optional_RecordResult___(__promise)
+      let __resultCpp = { () -> bridge.std__shared_ptr_Promise_std__variant_nitro__NullType__RecordResult___ in
+        let __promise = bridge.create_std__shared_ptr_Promise_std__variant_nitro__NullType__RecordResult___()
+        let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_std__variant_nitro__NullType__RecordResult___(__promise)
         __result
-          .then({ __result in __promiseHolder.resolve({ () -> bridge.std__optional_RecordResult_ in
-              if let __unwrappedValue = __result {
-                return bridge.create_std__optional_RecordResult_(__unwrappedValue)
-              } else {
-                return .init()
+          .then({ __result in __promiseHolder.resolve({ () -> bridge.std__variant_nitro__NullType__RecordResult_ in
+              switch __result {
+                case .first(let __value):
+                  return bridge.create_std__variant_nitro__NullType__RecordResult_(margelo.nitro.NullType.null)
+                case .second(let __value):
+                  return bridge.create_std__variant_nitro__NullType__RecordResult_(__value)
               }
-            }()) })
+            }().variant) })
           .catch({ __error in __promiseHolder.reject(__error.toCpp()) })
         return __promise
       }()
-      return bridge.create_Result_std__shared_ptr_Promise_std__optional_RecordResult____(__resultCpp)
+      return bridge.create_Result_std__shared_ptr_Promise_std__variant_nitro__NullType__RecordResult____(__resultCpp)
     } catch (let __error) {
       let __exceptionPtr = __error.toCpp()
-      return bridge.create_Result_std__shared_ptr_Promise_std__optional_RecordResult____(__exceptionPtr)
+      return bridge.create_Result_std__shared_ptr_Promise_std__variant_nitro__NullType__RecordResult____(__exceptionPtr)
     }
   }
   

package/nitrogen/generated/ios/swift/QueryRecordsParams.swift

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