react-native-unistyles 3.0.0-alpha.21 → 3.0.0-alpha.22

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

@@ -60,53 +60,53 @@ namespace margelo::nitro::unistyles {
   // Methods
   Insets JHybridNativePlatformSpec::getInsets() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JInsets>()>("getInsets");
-    auto result = method(_javaPart);
-    return result->toCpp();
+    auto __result = method(_javaPart);
+    return __result->toCpp();
   }
   ColorScheme JHybridNativePlatformSpec::getColorScheme() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JColorScheme>()>("getColorScheme");
-    auto result = method(_javaPart);
-    return result->toCpp();
+    auto __result = method(_javaPart);
+    return __result->toCpp();
   }
   double JHybridNativePlatformSpec::getFontScale() {
     static const auto method = _javaPart->getClass()->getMethod<double()>("getFontScale");
-    auto result = method(_javaPart);
-    return result;
+    auto __result = method(_javaPart);
+    return __result;
   }
   double JHybridNativePlatformSpec::getPixelRatio() {
     static const auto method = _javaPart->getClass()->getMethod<double()>("getPixelRatio");
-    auto result = method(_javaPart);
-    return result;
+    auto __result = method(_javaPart);
+    return __result;
   }
   Orientation JHybridNativePlatformSpec::getOrientation() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JOrientation>()>("getOrientation");
-    auto result = method(_javaPart);
-    return result->toCpp();
+    auto __result = method(_javaPart);
+    return __result->toCpp();
   }
   std::string JHybridNativePlatformSpec::getContentSizeCategory() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<jni::JString>()>("getContentSizeCategory");
-    auto result = method(_javaPart);
-    return result->toStdString();
+    auto __result = method(_javaPart);
+    return __result->toStdString();
   }
   Dimensions JHybridNativePlatformSpec::getScreenDimensions() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JDimensions>()>("getScreenDimensions");
-    auto result = method(_javaPart);
-    return result->toCpp();
+    auto __result = method(_javaPart);
+    return __result->toCpp();
   }
   Dimensions JHybridNativePlatformSpec::getStatusBarDimensions() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JDimensions>()>("getStatusBarDimensions");
-    auto result = method(_javaPart);
-    return result->toCpp();
+    auto __result = method(_javaPart);
+    return __result->toCpp();
   }
   Dimensions JHybridNativePlatformSpec::getNavigationBarDimensions() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JDimensions>()>("getNavigationBarDimensions");
-    auto result = method(_javaPart);
-    return result->toCpp();
+    auto __result = method(_javaPart);
+    return __result->toCpp();
   }
   bool JHybridNativePlatformSpec::getPrefersRtlDirection() {
     static const auto method = _javaPart->getClass()->getMethod<jboolean()>("getPrefersRtlDirection");
-    auto result = method(_javaPart);
-    return result;
+    auto __result = method(_javaPart);
+    return __result;
   }
   void JHybridNativePlatformSpec::setRootViewBackgroundColor(double color) {
     static const auto method = _javaPart->getClass()->getMethod<void(double /* color */)>("setRootViewBackgroundColor");
@@ -134,8 +134,8 @@ namespace margelo::nitro::unistyles {
   }
   UnistylesNativeMiniRuntime JHybridNativePlatformSpec::getMiniRuntime() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JUnistylesNativeMiniRuntime>()>("getMiniRuntime");
-    auto result = method(_javaPart);
-    return result->toCpp();
+    auto __result = method(_javaPart);
+    return __result->toCpp();
   }
   void JHybridNativePlatformSpec::registerPlatformListener(const std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>& callback) {
     static const auto method = _javaPart->getClass()->getMethod<void(jni::alias_ref<JFunc_void_std__vector_UnistyleDependency_::javaobject> /* callback */)>("registerPlatformListener");

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

@@ -50,7 +50,7 @@ namespace margelo::nitro::unistyles {
           return clazz->getStaticFieldValue(fieldLANDSCAPE);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));
-          throw std::runtime_error("Invalid enum value (" + stringValue + "!");
+          throw std::invalid_argument("Invalid enum value (" + stringValue + "!");
       }
     }
   };

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

@@ -86,7 +86,7 @@ namespace margelo::nitro::unistyles {
           return clazz->getStaticFieldValue(fieldNAVIGATIONBAR);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));
-          throw std::runtime_error("Invalid enum value (" + stringValue + "!");
+          throw std::invalid_argument("Invalid enum value (" + stringValue + "!");
       }
     }
   };

package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/HybridNativePlatformSpec.kt

@@ -116,8 +116,8 @@ abstract class HybridNativePlatformSpec: HybridObject() {
   @DoNotStrip
   @Keep
   private fun registerPlatformListener(callback: Func_void_std__vector_UnistyleDependency_): Unit {
-    val result = registerPlatformListener(callback.toLambda())
-    return result
+    val __result = registerPlatformListener(callback.toLambda())
+    return __result
   }
 
   private external fun initHybrid(): HybridData

package/nitrogen/generated/android/{UnistylesOnLoad.cpp → unistylesOnLoad.cpp}

@@ -1,11 +1,11 @@
 ///
-/// UnistylesOnLoad.cpp
+/// unistylesOnLoad.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2024 Marc Rousavy @ Margelo
 ///
 
-#include "UnistylesOnLoad.hpp"
+#include "unistylesOnLoad.hpp"
 
 #include <jni.h>
 #include <fbjni/fbjni.h>

package/nitrogen/generated/android/{UnistylesOnLoad.hpp → unistylesOnLoad.hpp}

@@ -1,5 +1,5 @@
 ///
-/// UnistylesOnLoad.hpp
+/// unistylesOnLoad.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2024 Marc Rousavy @ Margelo

package/nitrogen/generated/ios/Unistyles+autolinking.rb

@@ -24,7 +24,7 @@ def add_nitrogen_files(spec)
 
   spec.dependency "NitroModules"
 
-  current_source_files = spec.attributes_hash['source_files'] || []
+  current_source_files = Array(spec.attributes_hash['source_files'])
   spec.source_files = current_source_files + [
     # Generated cross-platform specs
     "nitrogen/generated/shared/**/*.{h,hpp,c,cpp,swift}",
@@ -32,7 +32,7 @@ def add_nitrogen_files(spec)
     "nitrogen/generated/ios/**/*.{h,hpp,c,cpp,mm,swift}",
   ]
 
-  current_public_header_files = spec.attributes_hash['public_header_files'] || []
+  current_public_header_files = Array(spec.attributes_hash['public_header_files'])
   spec.public_header_files = current_public_header_files + [
     # Generated specs
     "nitrogen/generated/shared/**/*.{h,hpp}",
@@ -40,7 +40,7 @@ def add_nitrogen_files(spec)
     "nitrogen/generated/ios/Unistyles-Swift-Cxx-Bridge.hpp"
   ]
 
-  current_private_header_files = spec.attributes_hash['private_header_files'] || []
+  current_private_header_files = Array(spec.attributes_hash['private_header_files'])
   spec.private_header_files = current_private_header_files + [
     # iOS specific specs
     "nitrogen/generated/ios/c++/**/*.{h,hpp}",
@@ -52,5 +52,7 @@ def add_nitrogen_files(spec)
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
     # Enables C++ <-> Swift interop (by default it's only C)
     "SWIFT_OBJC_INTEROP_MODE" => "objcxx",
+    # Enables stricter modular headers
+    "DEFINES_MODULE" => "YES",
   })
 end

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

@@ -6,3 +6,28 @@
 ///
 
 #include "Unistyles-Swift-Cxx-Bridge.hpp"
+
+// Include C++ implementation defined types
+#include "HybridNativePlatformSpecSwift.hpp"
+#include "Unistyles-Swift-Cxx-Umbrella.hpp"
+#include <NitroModules/HybridContext.hpp>
+
+namespace margelo::nitro::unistyles::bridge::swift {
+
+  // pragma MARK: std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>
+  std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec> create_std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_(void* _Nonnull swiftUnsafePointer) {
+    Unistyles::HybridNativePlatformSpecCxx swiftPart = Unistyles::HybridNativePlatformSpecCxxUnsafe::fromUnsafe(swiftUnsafePointer);
+    return HybridContext::getOrCreate<margelo::nitro::unistyles::HybridNativePlatformSpecSwift>(swiftPart);
+  }
+  void* _Nonnull get_std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_(std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_ cppType) {
+    std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpecSwift> swiftWrapper = std::dynamic_pointer_cast<margelo::nitro::unistyles::HybridNativePlatformSpecSwift>(cppType);
+  #ifdef NITRO_DEBUG
+    if (swiftWrapper == nullptr) [[unlikely]] {
+      throw std::runtime_error("Class \"HybridNativePlatformSpec\" is not implemented in Swift!");
+    }
+  #endif
+    Unistyles::HybridNativePlatformSpecCxx swiftPart = swiftWrapper->getSwiftPart();
+    return Unistyles::HybridNativePlatformSpecCxxUnsafe::toUnsafe(swiftPart);
+  }
+
+} // namespace margelo::nitro::unistyles::bridge::swift

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

@@ -7,29 +7,28 @@
 
 #pragma once
 
+#if __has_include(<NitroModules/NitroDefines.hpp>)
+#include <NitroModules/NitroDefines.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
 // Forward declarations of C++ defined types
+// Forward declaration of `HybridNativePlatformSpec` to properly resolve imports.
+namespace margelo::nitro::unistyles { class HybridNativePlatformSpec; }
 // Forward declaration of `UnistyleDependency` to properly resolve imports.
 namespace margelo::nitro::unistyles { enum class UnistyleDependency; }
 
+// Forward declarations of Swift defined types
+// Forward declaration of `HybridNativePlatformSpecCxx` to properly resolve imports.
+namespace Unistyles { class HybridNativePlatformSpecCxx; }
+
 // Include C++ defined types
-#if __has_include("UnistyleDependency.hpp")
- #include "UnistyleDependency.hpp"
-#endif
-#if __has_include(<functional>)
- #include <functional>
-#endif
-#if __has_include(<memory>)
- #include <memory>
-#endif
-#if __has_include(<optional>)
- #include <optional>
-#endif
-#if __has_include(<string>)
- #include <string>
-#endif
-#if __has_include(<vector>)
- #include <vector>
-#endif
+#include "HybridNativePlatformSpec.hpp"
+#include "UnistyleDependency.hpp"
+#include <functional>
+#include <memory>
+#include <vector>
 
 /**
  * Contains specialized versions of C++ templated types so they can be accessed from Swift,
@@ -37,6 +36,7 @@ namespace margelo::nitro::unistyles { enum class UnistyleDependency; }
  */
 namespace margelo::nitro::unistyles::bridge::swift {
 
+  // pragma MARK: std::vector<UnistyleDependency>
   /**
    * Specialized version of `std::vector<UnistyleDependency>`.
    */
@@ -47,6 +47,7 @@ namespace margelo::nitro::unistyles::bridge::swift {
     return vector;
   }
   
+  // pragma MARK: std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>
   /**
    * Specialized version of `std::function<void(const std::vector<UnistyleDependency>&)>`.
    */
@@ -54,18 +55,17 @@ namespace margelo::nitro::unistyles::bridge::swift {
   /**
    * Wrapper class for a `std::function<void(const std::vector<UnistyleDependency>& / * dependencies * /)>`, this can be used from Swift.
    */
-  class Func_void_std__vector_UnistyleDependency__Wrapper {
+  class Func_void_std__vector_UnistyleDependency__Wrapper final {
   public:
-    explicit Func_void_std__vector_UnistyleDependency__Wrapper(const std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>& func): function(func) {}
-    explicit Func_void_std__vector_UnistyleDependency__Wrapper(std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>&& func): function(std::move(func)) {}
-  
-    void call(std::vector<UnistyleDependency> dependencies) const {
-      function(dependencies);
+    explicit Func_void_std__vector_UnistyleDependency__Wrapper(const std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>& func): _function(func) {}
+    explicit Func_void_std__vector_UnistyleDependency__Wrapper(std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>&& func): _function(std::move(func)) {}
+    inline void call(std::vector<UnistyleDependency> dependencies) const {
+      _function(dependencies);
     }
-  
-    std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)> function;
+  private:
+    std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)> _function;
   };
-  inline Func_void_std__vector_UnistyleDependency_ create_Func_void_std__vector_UnistyleDependency_(void* closureHolder, void(*call)(void* /* closureHolder */, std::vector<UnistyleDependency>), void(*destroy)(void*)) {
+  inline Func_void_std__vector_UnistyleDependency_ create_Func_void_std__vector_UnistyleDependency_(void* _Nonnull closureHolder, void(* _Nonnull call)(void* _Nonnull /* closureHolder */, std::vector<UnistyleDependency>), void(* _Nonnull destroy)(void* _Nonnull)) {
     std::shared_ptr<void> sharedClosureHolder(closureHolder, destroy);
     return Func_void_std__vector_UnistyleDependency_([sharedClosureHolder, call](const std::vector<UnistyleDependency>& dependencies) -> void {
       call(sharedClosureHolder.get(), dependencies);
@@ -75,12 +75,12 @@ namespace margelo::nitro::unistyles::bridge::swift {
     return std::make_shared<Func_void_std__vector_UnistyleDependency__Wrapper>(value);
   }
   
+  // pragma MARK: std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>
   /**
-   * Specialized version of `std::optional<std::string>`.
+   * Specialized version of `std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>`.
    */
-  using std__optional_std__string_ = std::optional<std::string>;
-  inline std::optional<std::string> create_std__optional_std__string_(const std::string& value) {
-    return std::optional<std::string>(value);
-  }
+  using std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_ = std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>;
+  std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec> create_std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_(void* _Nonnull swiftUnsafePointer);
+  void* _Nonnull get_std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_(std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_ cppType);
 
 } // namespace margelo::nitro::unistyles::bridge::swift

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

@@ -14,24 +14,12 @@ namespace margelo::nitro::unistyles { enum class ColorScheme; }
 namespace margelo::nitro::unistyles { struct Dimensions; }
 // Forward declaration of `HybridNativePlatformSpec` to properly resolve imports.
 namespace margelo::nitro::unistyles { class HybridNativePlatformSpec; }
-// Forward declaration of `HybridUnistylesNavigationBarSpec` to properly resolve imports.
-namespace margelo::nitro::unistyles { class HybridUnistylesNavigationBarSpec; }
-// Forward declaration of `HybridUnistylesRuntimeSpec` to properly resolve imports.
-namespace margelo::nitro::unistyles { class HybridUnistylesRuntimeSpec; }
-// Forward declaration of `HybridUnistylesShadowRegistrySpec` to properly resolve imports.
-namespace margelo::nitro::unistyles { class HybridUnistylesShadowRegistrySpec; }
-// Forward declaration of `HybridUnistylesStatusBarSpec` to properly resolve imports.
-namespace margelo::nitro::unistyles { class HybridUnistylesStatusBarSpec; }
-// Forward declaration of `HybridUnistylesStyleSheetSpec` to properly resolve imports.
-namespace margelo::nitro::unistyles { class HybridUnistylesStyleSheetSpec; }
 // Forward declaration of `Insets` to properly resolve imports.
 namespace margelo::nitro::unistyles { struct Insets; }
 // Forward declaration of `Orientation` to properly resolve imports.
 namespace margelo::nitro::unistyles { enum class Orientation; }
 // Forward declaration of `UnistyleDependency` to properly resolve imports.
 namespace margelo::nitro::unistyles { enum class UnistyleDependency; }
-// Forward declaration of `UnistylesCxxMiniRuntime` to properly resolve imports.
-namespace margelo::nitro::unistyles { struct UnistylesCxxMiniRuntime; }
 // Forward declaration of `UnistylesNativeMiniRuntime` to properly resolve imports.
 namespace margelo::nitro::unistyles { struct UnistylesNativeMiniRuntime; }
 
@@ -39,19 +27,12 @@ namespace margelo::nitro::unistyles { struct UnistylesNativeMiniRuntime; }
 #include "ColorScheme.hpp"
 #include "Dimensions.hpp"
 #include "HybridNativePlatformSpec.hpp"
-#include "HybridUnistylesNavigationBarSpec.hpp"
-#include "HybridUnistylesRuntimeSpec.hpp"
-#include "HybridUnistylesShadowRegistrySpec.hpp"
-#include "HybridUnistylesStatusBarSpec.hpp"
-#include "HybridUnistylesStyleSheetSpec.hpp"
 #include "Insets.hpp"
 #include "Orientation.hpp"
 #include "UnistyleDependency.hpp"
-#include "UnistylesCxxMiniRuntime.hpp"
 #include "UnistylesNativeMiniRuntime.hpp"
 #include <functional>
 #include <memory>
-#include <optional>
 #include <string>
 #include <vector>
 
@@ -67,16 +48,6 @@ namespace margelo::nitro::unistyles { struct UnistylesNativeMiniRuntime; }
 // Forward declarations of Swift defined types
 // Forward declaration of `HybridNativePlatformSpecCxx` to properly resolve imports.
 namespace Unistyles { class HybridNativePlatformSpecCxx; }
-// Forward declaration of `HybridUnistylesNavigationBarSpecCxx` to properly resolve imports.
-namespace Unistyles { class HybridUnistylesNavigationBarSpecCxx; }
-// Forward declaration of `HybridUnistylesRuntimeSpecCxx` to properly resolve imports.
-namespace Unistyles { class HybridUnistylesRuntimeSpecCxx; }
-// Forward declaration of `HybridUnistylesShadowRegistrySpecCxx` to properly resolve imports.
-namespace Unistyles { class HybridUnistylesShadowRegistrySpecCxx; }
-// Forward declaration of `HybridUnistylesStatusBarSpecCxx` to properly resolve imports.
-namespace Unistyles { class HybridUnistylesStatusBarSpecCxx; }
-// Forward declaration of `HybridUnistylesStyleSheetSpecCxx` to properly resolve imports.
-namespace Unistyles { class HybridUnistylesStyleSheetSpecCxx; }
 
 // Include Swift defined types
 #if __has_include("Unistyles-Swift.h")

package/nitrogen/generated/ios/swift/HybridNativePlatformSpec.swift

@@ -51,15 +51,3 @@ public protocol HybridNativePlatformSpec: AnyObject, HybridObjectSpec {
   func getMiniRuntime() throws -> UnistylesNativeMiniRuntime
   func registerPlatformListener(callback: @escaping ((_ dependencies: [UnistyleDependency]) -> Void)) throws -> Void
 }
-
-public extension HybridNativePlatformSpec {
-  /**
-   * Create a new instance of HybridNativePlatformSpecCxx for the given HybridNativePlatformSpec.
-   *
-   * Instances of HybridNativePlatformSpecCxx can be accessed from C++, and contain
-   * additional required bridging code for C++ <> Swift interop.
-   */
-  func createCxxBridge() -> HybridNativePlatformSpecCxx {
-    return HybridNativePlatformSpecCxx(self)
-  }
-}