@kingstinct/react-native-healthkit 10.0.0 → 11.0.0

package/nitrogen/generated/shared/c++/WorkoutActivityType.hpp

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <cmath>
 #if __has_include(<NitroModules/JSIConverter.hpp>)
 #include <NitroModules/JSIConverter.hpp>
 #else
@@ -115,16 +114,14 @@ namespace margelo::nitro::healthkit {
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::healthkit;
-
   // C++ WorkoutActivityType <> JS WorkoutActivityType (enum)
   template <>
-  struct JSIConverter<WorkoutActivityType> final {
-    static inline WorkoutActivityType fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::healthkit::WorkoutActivityType> final {
+    static inline margelo::nitro::healthkit::WorkoutActivityType fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       int enumValue = JSIConverter<int>::fromJSI(runtime, arg);
-      return static_cast<WorkoutActivityType>(enumValue);
+      return static_cast<margelo::nitro::healthkit::WorkoutActivityType>(enumValue);
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, WorkoutActivityType arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, margelo::nitro::healthkit::WorkoutActivityType arg) {
       int enumValue = static_cast<int>(arg);
       return JSIConverter<int>::toJSI(runtime, enumValue);
     }
@@ -132,14 +129,100 @@ namespace margelo::nitro {
       if (!value.isNumber()) {
         return false;
       }
-      double integer;
-      double fraction = modf(value.getNumber(), &integer);
-      if (fraction != 0.0) {
-        // It is some kind of floating point number - our enums are ints.
+      double number = value.getNumber();
+      int integer = static_cast<int>(number);
+      if (number != integer) {
+        // The integer is not the same value as the double - we truncated floating points.
+        // Enums are all integers, so the input floating point number is obviously invalid.
         return false;
       }
-      // Check if we are within the bounds of the enum.
-      return integer >= 0 && integer <= 83;
+      switch (integer) {
+        case 1 /* AMERICANFOOTBALL */: return true;
+        case 2 /* ARCHERY */: return true;
+        case 3 /* AUSTRALIANFOOTBALL */: return true;
+        case 4 /* BADMINTON */: return true;
+        case 5 /* BASEBALL */: return true;
+        case 6 /* BASKETBALL */: return true;
+        case 7 /* BOWLING */: return true;
+        case 8 /* BOXING */: return true;
+        case 9 /* CLIMBING */: return true;
+        case 10 /* CRICKET */: return true;
+        case 11 /* CROSSTRAINING */: return true;
+        case 12 /* CURLING */: return true;
+        case 13 /* CYCLING */: return true;
+        case 14 /* DANCE */: return true;
+        case 15 /* DANCEINSPIREDTRAINING */: return true;
+        case 16 /* ELLIPTICAL */: return true;
+        case 17 /* EQUESTRIANSPORTS */: return true;
+        case 18 /* FENCING */: return true;
+        case 19 /* FISHING */: return true;
+        case 20 /* FUNCTIONALSTRENGTHTRAINING */: return true;
+        case 21 /* GOLF */: return true;
+        case 22 /* GYMNASTICS */: return true;
+        case 23 /* HANDBALL */: return true;
+        case 24 /* HIKING */: return true;
+        case 25 /* HOCKEY */: return true;
+        case 26 /* HUNTING */: return true;
+        case 27 /* LACROSSE */: return true;
+        case 28 /* MARTIALARTS */: return true;
+        case 29 /* MINDANDBODY */: return true;
+        case 30 /* MIXEDMETABOLICCARDIOTRAINING */: return true;
+        case 31 /* PADDLESPORTS */: return true;
+        case 32 /* PLAY */: return true;
+        case 33 /* PREPARATIONANDRECOVERY */: return true;
+        case 34 /* RACQUETBALL */: return true;
+        case 35 /* ROWING */: return true;
+        case 36 /* RUGBY */: return true;
+        case 37 /* RUNNING */: return true;
+        case 38 /* SAILING */: return true;
+        case 39 /* SKATINGSPORTS */: return true;
+        case 40 /* SNOWSPORTS */: return true;
+        case 41 /* SOCCER */: return true;
+        case 42 /* SOFTBALL */: return true;
+        case 43 /* SQUASH */: return true;
+        case 44 /* STAIRCLIMBING */: return true;
+        case 45 /* SURFINGSPORTS */: return true;
+        case 46 /* SWIMMING */: return true;
+        case 47 /* TABLETENNIS */: return true;
+        case 48 /* TENNIS */: return true;
+        case 49 /* TRACKANDFIELD */: return true;
+        case 50 /* TRADITIONALSTRENGTHTRAINING */: return true;
+        case 51 /* VOLLEYBALL */: return true;
+        case 52 /* WALKING */: return true;
+        case 53 /* WATERFITNESS */: return true;
+        case 54 /* WATERPOLO */: return true;
+        case 55 /* WATERSPORTS */: return true;
+        case 56 /* WRESTLING */: return true;
+        case 57 /* YOGA */: return true;
+        case 58 /* BARRE */: return true;
+        case 59 /* CORETRAINING */: return true;
+        case 60 /* CROSSCOUNTRYSKIING */: return true;
+        case 61 /* DOWNHILLSKIING */: return true;
+        case 62 /* FLEXIBILITY */: return true;
+        case 63 /* HIGHINTENSITYINTERVALTRAINING */: return true;
+        case 64 /* JUMPROPE */: return true;
+        case 65 /* KICKBOXING */: return true;
+        case 66 /* PILATES */: return true;
+        case 67 /* SNOWBOARDING */: return true;
+        case 68 /* STAIRS */: return true;
+        case 69 /* STEPTRAINING */: return true;
+        case 70 /* WHEELCHAIRWALKPACE */: return true;
+        case 71 /* WHEELCHAIRRUNPACE */: return true;
+        case 72 /* TAICHI */: return true;
+        case 73 /* MIXEDCARDIO */: return true;
+        case 74 /* HANDCYCLING */: return true;
+        case 75 /* DISCSPORTS */: return true;
+        case 76 /* FITNESSGAMING */: return true;
+        case 77 /* CARDIODANCE */: return true;
+        case 78 /* SOCIALDANCE */: return true;
+        case 79 /* PICKLEBALL */: return true;
+        case 80 /* COOLDOWN */: return true;
+        case 82 /* SWIMBIKERUN */: return true;
+        case 83 /* TRANSITION */: return true;
+        case 84 /* UNDERWATERDIVING */: return true;
+        case 3000 /* OTHER */: return true;
+        default: return false;
+      }
     }
   };
 

package/nitrogen/generated/shared/c++/WorkoutActivityTypePredicate.hpp

@@ -41,20 +41,18 @@ namespace margelo::nitro::healthkit {
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::healthkit;
-
   // C++ WorkoutActivityTypePredicate <> JS WorkoutActivityTypePredicate (object)
   template <>
-  struct JSIConverter<WorkoutActivityTypePredicate> final {
-    static inline WorkoutActivityTypePredicate fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::healthkit::WorkoutActivityTypePredicate> final {
+    static inline margelo::nitro::healthkit::WorkoutActivityTypePredicate fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return WorkoutActivityTypePredicate(
-        JSIConverter<WorkoutActivityType>::fromJSI(runtime, obj.getProperty(runtime, "workoutActivityType"))
+      return margelo::nitro::healthkit::WorkoutActivityTypePredicate(
+        JSIConverter<margelo::nitro::healthkit::WorkoutActivityType>::fromJSI(runtime, obj.getProperty(runtime, "workoutActivityType"))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const WorkoutActivityTypePredicate& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::healthkit::WorkoutActivityTypePredicate& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "workoutActivityType", JSIConverter<WorkoutActivityType>::toJSI(runtime, arg.workoutActivityType));
+      obj.setProperty(runtime, "workoutActivityType", JSIConverter<margelo::nitro::healthkit::WorkoutActivityType>::toJSI(runtime, arg.workoutActivityType));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -62,7 +60,7 @@ namespace margelo::nitro {
         return false;
       }
       jsi::Object obj = value.getObject(runtime);
-      if (!JSIConverter<WorkoutActivityType>::canConvert(runtime, obj.getProperty(runtime, "workoutActivityType"))) return false;
+      if (!JSIConverter<margelo::nitro::healthkit::WorkoutActivityType>::canConvert(runtime, obj.getProperty(runtime, "workoutActivityType"))) return false;
       return true;
     }
   };

package/nitrogen/generated/shared/c++/WorkoutConfiguration.hpp

@@ -24,8 +24,8 @@ namespace margelo::nitro::healthkit { enum class WorkoutActivityType; }
 namespace margelo::nitro::healthkit { enum class WorkoutSessionLocationType; }
 
 #include "WorkoutActivityType.hpp"
-#include <optional>
 #include "WorkoutSessionLocationType.hpp"
+#include <optional>
 
 namespace margelo::nitro::healthkit {
 
@@ -46,22 +46,20 @@ namespace margelo::nitro::healthkit {
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::healthkit;
-
   // C++ WorkoutConfiguration <> JS WorkoutConfiguration (object)
   template <>
-  struct JSIConverter<WorkoutConfiguration> final {
-    static inline WorkoutConfiguration fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::healthkit::WorkoutConfiguration> final {
+    static inline margelo::nitro::healthkit::WorkoutConfiguration fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return WorkoutConfiguration(
-        JSIConverter<WorkoutActivityType>::fromJSI(runtime, obj.getProperty(runtime, "activityType")),
-        JSIConverter<std::optional<WorkoutSessionLocationType>>::fromJSI(runtime, obj.getProperty(runtime, "locationType"))
+      return margelo::nitro::healthkit::WorkoutConfiguration(
+        JSIConverter<margelo::nitro::healthkit::WorkoutActivityType>::fromJSI(runtime, obj.getProperty(runtime, "activityType")),
+        JSIConverter<std::optional<margelo::nitro::healthkit::WorkoutSessionLocationType>>::fromJSI(runtime, obj.getProperty(runtime, "locationType"))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const WorkoutConfiguration& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::healthkit::WorkoutConfiguration& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "activityType", JSIConverter<WorkoutActivityType>::toJSI(runtime, arg.activityType));
-      obj.setProperty(runtime, "locationType", JSIConverter<std::optional<WorkoutSessionLocationType>>::toJSI(runtime, arg.locationType));
+      obj.setProperty(runtime, "activityType", JSIConverter<margelo::nitro::healthkit::WorkoutActivityType>::toJSI(runtime, arg.activityType));
+      obj.setProperty(runtime, "locationType", JSIConverter<std::optional<margelo::nitro::healthkit::WorkoutSessionLocationType>>::toJSI(runtime, arg.locationType));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -69,8 +67,8 @@ namespace margelo::nitro {
         return false;
       }
       jsi::Object obj = value.getObject(runtime);
-      if (!JSIConverter<WorkoutActivityType>::canConvert(runtime, obj.getProperty(runtime, "activityType"))) return false;
-      if (!JSIConverter<std::optional<WorkoutSessionLocationType>>::canConvert(runtime, obj.getProperty(runtime, "locationType"))) return false;
+      if (!JSIConverter<margelo::nitro::healthkit::WorkoutActivityType>::canConvert(runtime, obj.getProperty(runtime, "activityType"))) return false;
+      if (!JSIConverter<std::optional<margelo::nitro::healthkit::WorkoutSessionLocationType>>::canConvert(runtime, obj.getProperty(runtime, "locationType"))) return false;
       return true;
     }
   };

package/nitrogen/generated/shared/c++/WorkoutDurationPredicate.hpp

@@ -42,21 +42,19 @@ namespace margelo::nitro::healthkit {
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::healthkit;
-
   // C++ WorkoutDurationPredicate <> JS WorkoutDurationPredicate (object)
   template <>
-  struct JSIConverter<WorkoutDurationPredicate> final {
-    static inline WorkoutDurationPredicate fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::healthkit::WorkoutDurationPredicate> final {
+    static inline margelo::nitro::healthkit::WorkoutDurationPredicate fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return WorkoutDurationPredicate(
-        JSIConverter<ComparisonPredicateOperator>::fromJSI(runtime, obj.getProperty(runtime, "predicateOperator")),
+      return margelo::nitro::healthkit::WorkoutDurationPredicate(
+        JSIConverter<margelo::nitro::healthkit::ComparisonPredicateOperator>::fromJSI(runtime, obj.getProperty(runtime, "predicateOperator")),
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "durationInSeconds"))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const WorkoutDurationPredicate& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::healthkit::WorkoutDurationPredicate& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "predicateOperator", JSIConverter<ComparisonPredicateOperator>::toJSI(runtime, arg.predicateOperator));
+      obj.setProperty(runtime, "predicateOperator", JSIConverter<margelo::nitro::healthkit::ComparisonPredicateOperator>::toJSI(runtime, arg.predicateOperator));
       obj.setProperty(runtime, "durationInSeconds", JSIConverter<double>::toJSI(runtime, arg.durationInSeconds));
       return obj;
     }
@@ -65,7 +63,7 @@ namespace margelo::nitro {
         return false;
       }
       jsi::Object obj = value.getObject(runtime);
-      if (!JSIConverter<ComparisonPredicateOperator>::canConvert(runtime, obj.getProperty(runtime, "predicateOperator"))) return false;
+      if (!JSIConverter<margelo::nitro::healthkit::ComparisonPredicateOperator>::canConvert(runtime, obj.getProperty(runtime, "predicateOperator"))) return false;
       if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "durationInSeconds"))) return false;
       return true;
     }

package/nitrogen/generated/shared/c++/WorkoutEvent.hpp

@@ -44,22 +44,20 @@ namespace margelo::nitro::healthkit {
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::healthkit;
-
   // C++ WorkoutEvent <> JS WorkoutEvent (object)
   template <>
-  struct JSIConverter<WorkoutEvent> final {
-    static inline WorkoutEvent fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::healthkit::WorkoutEvent> final {
+    static inline margelo::nitro::healthkit::WorkoutEvent fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return WorkoutEvent(
-        JSIConverter<WorkoutEventType>::fromJSI(runtime, obj.getProperty(runtime, "type")),
+      return margelo::nitro::healthkit::WorkoutEvent(
+        JSIConverter<margelo::nitro::healthkit::WorkoutEventType>::fromJSI(runtime, obj.getProperty(runtime, "type")),
         JSIConverter<std::chrono::system_clock::time_point>::fromJSI(runtime, obj.getProperty(runtime, "startDate")),
         JSIConverter<std::chrono::system_clock::time_point>::fromJSI(runtime, obj.getProperty(runtime, "endDate"))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const WorkoutEvent& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::healthkit::WorkoutEvent& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "type", JSIConverter<WorkoutEventType>::toJSI(runtime, arg.type));
+      obj.setProperty(runtime, "type", JSIConverter<margelo::nitro::healthkit::WorkoutEventType>::toJSI(runtime, arg.type));
       obj.setProperty(runtime, "startDate", JSIConverter<std::chrono::system_clock::time_point>::toJSI(runtime, arg.startDate));
       obj.setProperty(runtime, "endDate", JSIConverter<std::chrono::system_clock::time_point>::toJSI(runtime, arg.endDate));
       return obj;
@@ -69,7 +67,7 @@ namespace margelo::nitro {
         return false;
       }
       jsi::Object obj = value.getObject(runtime);
-      if (!JSIConverter<WorkoutEventType>::canConvert(runtime, obj.getProperty(runtime, "type"))) return false;
+      if (!JSIConverter<margelo::nitro::healthkit::WorkoutEventType>::canConvert(runtime, obj.getProperty(runtime, "type"))) return false;
       if (!JSIConverter<std::chrono::system_clock::time_point>::canConvert(runtime, obj.getProperty(runtime, "startDate"))) return false;
       if (!JSIConverter<std::chrono::system_clock::time_point>::canConvert(runtime, obj.getProperty(runtime, "endDate"))) return false;
       return true;

package/nitrogen/generated/shared/c++/WorkoutEventType.hpp

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <cmath>
 #if __has_include(<NitroModules/JSIConverter.hpp>)
 #include <NitroModules/JSIConverter.hpp>
 #else
@@ -39,16 +38,14 @@ namespace margelo::nitro::healthkit {
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::healthkit;
-
   // C++ WorkoutEventType <> JS WorkoutEventType (enum)
   template <>
-  struct JSIConverter<WorkoutEventType> final {
-    static inline WorkoutEventType fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::healthkit::WorkoutEventType> final {
+    static inline margelo::nitro::healthkit::WorkoutEventType fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       int enumValue = JSIConverter<int>::fromJSI(runtime, arg);
-      return static_cast<WorkoutEventType>(enumValue);
+      return static_cast<margelo::nitro::healthkit::WorkoutEventType>(enumValue);
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, WorkoutEventType arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, margelo::nitro::healthkit::WorkoutEventType arg) {
       int enumValue = static_cast<int>(arg);
       return JSIConverter<int>::toJSI(runtime, enumValue);
     }
@@ -56,14 +53,15 @@ namespace margelo::nitro {
       if (!value.isNumber()) {
         return false;
       }
-      double integer;
-      double fraction = modf(value.getNumber(), &integer);
-      if (fraction != 0.0) {
-        // It is some kind of floating point number - our enums are ints.
+      double number = value.getNumber();
+      int integer = static_cast<int>(number);
+      if (number != integer) {
+        // The integer is not the same value as the double - we truncated floating points.
+        // Enums are all integers, so the input floating point number is obviously invalid.
         return false;
       }
       // Check if we are within the bounds of the enum.
-      return integer >= 0 && integer <= 7;
+      return integer >= 1 && integer <= 8;
     }
   };
 

package/nitrogen/generated/shared/c++/WorkoutPlan.hpp

@@ -43,22 +43,20 @@ namespace margelo::nitro::healthkit {
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::healthkit;
-
   // C++ WorkoutPlan <> JS WorkoutPlan (object)
   template <>
-  struct JSIConverter<WorkoutPlan> final {
-    static inline WorkoutPlan fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::healthkit::WorkoutPlan> final {
+    static inline margelo::nitro::healthkit::WorkoutPlan fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return WorkoutPlan(
+      return margelo::nitro::healthkit::WorkoutPlan(
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "id")),
-        JSIConverter<WorkoutActivityType>::fromJSI(runtime, obj.getProperty(runtime, "activityType"))
+        JSIConverter<margelo::nitro::healthkit::WorkoutActivityType>::fromJSI(runtime, obj.getProperty(runtime, "activityType"))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const WorkoutPlan& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::healthkit::WorkoutPlan& arg) {
       jsi::Object obj(runtime);
       obj.setProperty(runtime, "id", JSIConverter<std::string>::toJSI(runtime, arg.id));
-      obj.setProperty(runtime, "activityType", JSIConverter<WorkoutActivityType>::toJSI(runtime, arg.activityType));
+      obj.setProperty(runtime, "activityType", JSIConverter<margelo::nitro::healthkit::WorkoutActivityType>::toJSI(runtime, arg.activityType));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -67,7 +65,7 @@ namespace margelo::nitro {
       }
       jsi::Object obj = value.getObject(runtime);
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "id"))) return false;
-      if (!JSIConverter<WorkoutActivityType>::canConvert(runtime, obj.getProperty(runtime, "activityType"))) return false;
+      if (!JSIConverter<margelo::nitro::healthkit::WorkoutActivityType>::canConvert(runtime, obj.getProperty(runtime, "activityType"))) return false;
       return true;
     }
   };

package/nitrogen/generated/shared/c++/WorkoutQueryOptions.hpp

@@ -37,9 +37,6 @@ namespace margelo::nitro::healthkit { struct PredicateForWorkoutsOr; }
 // Forward declaration of `PredicateForWorkoutsAnd` to properly resolve imports.
 namespace margelo::nitro::healthkit { struct PredicateForWorkoutsAnd; }
 
-#include <optional>
-#include <string>
-#include <variant>
 #include "PredicateWithUUID.hpp"
 #include "PredicateWithUUIDs.hpp"
 #include "PredicateWithMetadataKey.hpp"
@@ -49,6 +46,8 @@ namespace margelo::nitro::healthkit { struct PredicateForWorkoutsAnd; }
 #include "WorkoutDurationPredicate.hpp"
 #include "PredicateForWorkoutsOr.hpp"
 #include "PredicateForWorkoutsAnd.hpp"
+#include <variant>
+#include <optional>
 
 namespace margelo::nitro::healthkit {
 
@@ -57,41 +56,33 @@ namespace margelo::nitro::healthkit {
    */
   struct WorkoutQueryOptions {
   public:
-    std::optional<std::string> energyUnit     SWIFT_PRIVATE;
-    std::optional<std::string> distanceUnit     SWIFT_PRIVATE;
     std::optional<std::variant<PredicateWithUUID, PredicateWithUUIDs, PredicateWithMetadataKey, PredicateWithStartAndEnd, PredicateFromWorkout, WorkoutActivityTypePredicate, WorkoutDurationPredicate, PredicateForWorkoutsOr, PredicateForWorkoutsAnd>> filter     SWIFT_PRIVATE;
     std::optional<double> limit     SWIFT_PRIVATE;
     std::optional<bool> ascending     SWIFT_PRIVATE;
 
   public:
     WorkoutQueryOptions() = default;
-    explicit WorkoutQueryOptions(std::optional<std::string> energyUnit, std::optional<std::string> distanceUnit, std::optional<std::variant<PredicateWithUUID, PredicateWithUUIDs, PredicateWithMetadataKey, PredicateWithStartAndEnd, PredicateFromWorkout, WorkoutActivityTypePredicate, WorkoutDurationPredicate, PredicateForWorkoutsOr, PredicateForWorkoutsAnd>> filter, std::optional<double> limit, std::optional<bool> ascending): energyUnit(energyUnit), distanceUnit(distanceUnit), filter(filter), limit(limit), ascending(ascending) {}
+    explicit WorkoutQueryOptions(std::optional<std::variant<PredicateWithUUID, PredicateWithUUIDs, PredicateWithMetadataKey, PredicateWithStartAndEnd, PredicateFromWorkout, WorkoutActivityTypePredicate, WorkoutDurationPredicate, PredicateForWorkoutsOr, PredicateForWorkoutsAnd>> filter, std::optional<double> limit, std::optional<bool> ascending): filter(filter), limit(limit), ascending(ascending) {}
   };
 
 } // namespace margelo::nitro::healthkit
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::healthkit;
-
   // C++ WorkoutQueryOptions <> JS WorkoutQueryOptions (object)
   template <>
-  struct JSIConverter<WorkoutQueryOptions> final {
-    static inline WorkoutQueryOptions fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::healthkit::WorkoutQueryOptions> final {
+    static inline margelo::nitro::healthkit::WorkoutQueryOptions fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return WorkoutQueryOptions(
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "energyUnit")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "distanceUnit")),
-        JSIConverter<std::optional<std::variant<PredicateWithUUID, PredicateWithUUIDs, PredicateWithMetadataKey, PredicateWithStartAndEnd, PredicateFromWorkout, WorkoutActivityTypePredicate, WorkoutDurationPredicate, PredicateForWorkoutsOr, PredicateForWorkoutsAnd>>>::fromJSI(runtime, obj.getProperty(runtime, "filter")),
+      return margelo::nitro::healthkit::WorkoutQueryOptions(
+        JSIConverter<std::optional<std::variant<margelo::nitro::healthkit::PredicateWithUUID, margelo::nitro::healthkit::PredicateWithUUIDs, margelo::nitro::healthkit::PredicateWithMetadataKey, margelo::nitro::healthkit::PredicateWithStartAndEnd, margelo::nitro::healthkit::PredicateFromWorkout, margelo::nitro::healthkit::WorkoutActivityTypePredicate, margelo::nitro::healthkit::WorkoutDurationPredicate, margelo::nitro::healthkit::PredicateForWorkoutsOr, margelo::nitro::healthkit::PredicateForWorkoutsAnd>>>::fromJSI(runtime, obj.getProperty(runtime, "filter")),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "limit")),
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "ascending"))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const WorkoutQueryOptions& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::healthkit::WorkoutQueryOptions& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "energyUnit", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.energyUnit));
-      obj.setProperty(runtime, "distanceUnit", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.distanceUnit));
-      obj.setProperty(runtime, "filter", JSIConverter<std::optional<std::variant<PredicateWithUUID, PredicateWithUUIDs, PredicateWithMetadataKey, PredicateWithStartAndEnd, PredicateFromWorkout, WorkoutActivityTypePredicate, WorkoutDurationPredicate, PredicateForWorkoutsOr, PredicateForWorkoutsAnd>>>::toJSI(runtime, arg.filter));
+      obj.setProperty(runtime, "filter", JSIConverter<std::optional<std::variant<margelo::nitro::healthkit::PredicateWithUUID, margelo::nitro::healthkit::PredicateWithUUIDs, margelo::nitro::healthkit::PredicateWithMetadataKey, margelo::nitro::healthkit::PredicateWithStartAndEnd, margelo::nitro::healthkit::PredicateFromWorkout, margelo::nitro::healthkit::WorkoutActivityTypePredicate, margelo::nitro::healthkit::WorkoutDurationPredicate, margelo::nitro::healthkit::PredicateForWorkoutsOr, margelo::nitro::healthkit::PredicateForWorkoutsAnd>>>::toJSI(runtime, arg.filter));
       obj.setProperty(runtime, "limit", JSIConverter<std::optional<double>>::toJSI(runtime, arg.limit));
       obj.setProperty(runtime, "ascending", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.ascending));
       return obj;
@@ -101,9 +92,7 @@ namespace margelo::nitro {
         return false;
       }
       jsi::Object obj = value.getObject(runtime);
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "energyUnit"))) return false;
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "distanceUnit"))) return false;
-      if (!JSIConverter<std::optional<std::variant<PredicateWithUUID, PredicateWithUUIDs, PredicateWithMetadataKey, PredicateWithStartAndEnd, PredicateFromWorkout, WorkoutActivityTypePredicate, WorkoutDurationPredicate, PredicateForWorkoutsOr, PredicateForWorkoutsAnd>>>::canConvert(runtime, obj.getProperty(runtime, "filter"))) return false;
+      if (!JSIConverter<std::optional<std::variant<margelo::nitro::healthkit::PredicateWithUUID, margelo::nitro::healthkit::PredicateWithUUIDs, margelo::nitro::healthkit::PredicateWithMetadataKey, margelo::nitro::healthkit::PredicateWithStartAndEnd, margelo::nitro::healthkit::PredicateFromWorkout, margelo::nitro::healthkit::WorkoutActivityTypePredicate, margelo::nitro::healthkit::WorkoutDurationPredicate, margelo::nitro::healthkit::PredicateForWorkoutsOr, margelo::nitro::healthkit::PredicateForWorkoutsAnd>>>::canConvert(runtime, obj.getProperty(runtime, "filter"))) return false;
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "limit"))) return false;
       if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "ascending"))) return false;
       return true;

package/nitrogen/generated/shared/c++/WorkoutQueryOptionsWithAnchor.hpp

@@ -37,9 +37,6 @@ namespace margelo::nitro::healthkit { struct PredicateForWorkoutsOr; }
 // Forward declaration of `PredicateForWorkoutsAnd` to properly resolve imports.
 namespace margelo::nitro::healthkit { struct PredicateForWorkoutsAnd; }
 
-#include <optional>
-#include <string>
-#include <variant>
 #include "PredicateWithUUID.hpp"
 #include "PredicateWithUUIDs.hpp"
 #include "PredicateWithMetadataKey.hpp"
@@ -49,6 +46,9 @@ namespace margelo::nitro::healthkit { struct PredicateForWorkoutsAnd; }
 #include "WorkoutDurationPredicate.hpp"
 #include "PredicateForWorkoutsOr.hpp"
 #include "PredicateForWorkoutsAnd.hpp"
+#include <variant>
+#include <optional>
+#include <string>
 
 namespace margelo::nitro::healthkit {
 
@@ -57,41 +57,33 @@ namespace margelo::nitro::healthkit {
    */
   struct WorkoutQueryOptionsWithAnchor {
   public:
-    std::optional<std::string> energyUnit     SWIFT_PRIVATE;
-    std::optional<std::string> distanceUnit     SWIFT_PRIVATE;
     std::optional<std::variant<PredicateWithUUID, PredicateWithUUIDs, PredicateWithMetadataKey, PredicateWithStartAndEnd, PredicateFromWorkout, WorkoutActivityTypePredicate, WorkoutDurationPredicate, PredicateForWorkoutsOr, PredicateForWorkoutsAnd>> filter     SWIFT_PRIVATE;
     std::optional<double> limit     SWIFT_PRIVATE;
     std::optional<std::string> anchor     SWIFT_PRIVATE;
 
   public:
     WorkoutQueryOptionsWithAnchor() = default;
-    explicit WorkoutQueryOptionsWithAnchor(std::optional<std::string> energyUnit, std::optional<std::string> distanceUnit, std::optional<std::variant<PredicateWithUUID, PredicateWithUUIDs, PredicateWithMetadataKey, PredicateWithStartAndEnd, PredicateFromWorkout, WorkoutActivityTypePredicate, WorkoutDurationPredicate, PredicateForWorkoutsOr, PredicateForWorkoutsAnd>> filter, std::optional<double> limit, std::optional<std::string> anchor): energyUnit(energyUnit), distanceUnit(distanceUnit), filter(filter), limit(limit), anchor(anchor) {}
+    explicit WorkoutQueryOptionsWithAnchor(std::optional<std::variant<PredicateWithUUID, PredicateWithUUIDs, PredicateWithMetadataKey, PredicateWithStartAndEnd, PredicateFromWorkout, WorkoutActivityTypePredicate, WorkoutDurationPredicate, PredicateForWorkoutsOr, PredicateForWorkoutsAnd>> filter, std::optional<double> limit, std::optional<std::string> anchor): filter(filter), limit(limit), anchor(anchor) {}
   };
 
 } // namespace margelo::nitro::healthkit
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::healthkit;
-
   // C++ WorkoutQueryOptionsWithAnchor <> JS WorkoutQueryOptionsWithAnchor (object)
   template <>
-  struct JSIConverter<WorkoutQueryOptionsWithAnchor> final {
-    static inline WorkoutQueryOptionsWithAnchor fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::healthkit::WorkoutQueryOptionsWithAnchor> final {
+    static inline margelo::nitro::healthkit::WorkoutQueryOptionsWithAnchor fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return WorkoutQueryOptionsWithAnchor(
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "energyUnit")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "distanceUnit")),
-        JSIConverter<std::optional<std::variant<PredicateWithUUID, PredicateWithUUIDs, PredicateWithMetadataKey, PredicateWithStartAndEnd, PredicateFromWorkout, WorkoutActivityTypePredicate, WorkoutDurationPredicate, PredicateForWorkoutsOr, PredicateForWorkoutsAnd>>>::fromJSI(runtime, obj.getProperty(runtime, "filter")),
+      return margelo::nitro::healthkit::WorkoutQueryOptionsWithAnchor(
+        JSIConverter<std::optional<std::variant<margelo::nitro::healthkit::PredicateWithUUID, margelo::nitro::healthkit::PredicateWithUUIDs, margelo::nitro::healthkit::PredicateWithMetadataKey, margelo::nitro::healthkit::PredicateWithStartAndEnd, margelo::nitro::healthkit::PredicateFromWorkout, margelo::nitro::healthkit::WorkoutActivityTypePredicate, margelo::nitro::healthkit::WorkoutDurationPredicate, margelo::nitro::healthkit::PredicateForWorkoutsOr, margelo::nitro::healthkit::PredicateForWorkoutsAnd>>>::fromJSI(runtime, obj.getProperty(runtime, "filter")),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "limit")),
         JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "anchor"))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const WorkoutQueryOptionsWithAnchor& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::healthkit::WorkoutQueryOptionsWithAnchor& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "energyUnit", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.energyUnit));
-      obj.setProperty(runtime, "distanceUnit", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.distanceUnit));
-      obj.setProperty(runtime, "filter", JSIConverter<std::optional<std::variant<PredicateWithUUID, PredicateWithUUIDs, PredicateWithMetadataKey, PredicateWithStartAndEnd, PredicateFromWorkout, WorkoutActivityTypePredicate, WorkoutDurationPredicate, PredicateForWorkoutsOr, PredicateForWorkoutsAnd>>>::toJSI(runtime, arg.filter));
+      obj.setProperty(runtime, "filter", JSIConverter<std::optional<std::variant<margelo::nitro::healthkit::PredicateWithUUID, margelo::nitro::healthkit::PredicateWithUUIDs, margelo::nitro::healthkit::PredicateWithMetadataKey, margelo::nitro::healthkit::PredicateWithStartAndEnd, margelo::nitro::healthkit::PredicateFromWorkout, margelo::nitro::healthkit::WorkoutActivityTypePredicate, margelo::nitro::healthkit::WorkoutDurationPredicate, margelo::nitro::healthkit::PredicateForWorkoutsOr, margelo::nitro::healthkit::PredicateForWorkoutsAnd>>>::toJSI(runtime, arg.filter));
       obj.setProperty(runtime, "limit", JSIConverter<std::optional<double>>::toJSI(runtime, arg.limit));
       obj.setProperty(runtime, "anchor", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.anchor));
       return obj;
@@ -101,9 +93,7 @@ namespace margelo::nitro {
         return false;
       }
       jsi::Object obj = value.getObject(runtime);
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "energyUnit"))) return false;
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "distanceUnit"))) return false;
-      if (!JSIConverter<std::optional<std::variant<PredicateWithUUID, PredicateWithUUIDs, PredicateWithMetadataKey, PredicateWithStartAndEnd, PredicateFromWorkout, WorkoutActivityTypePredicate, WorkoutDurationPredicate, PredicateForWorkoutsOr, PredicateForWorkoutsAnd>>>::canConvert(runtime, obj.getProperty(runtime, "filter"))) return false;
+      if (!JSIConverter<std::optional<std::variant<margelo::nitro::healthkit::PredicateWithUUID, margelo::nitro::healthkit::PredicateWithUUIDs, margelo::nitro::healthkit::PredicateWithMetadataKey, margelo::nitro::healthkit::PredicateWithStartAndEnd, margelo::nitro::healthkit::PredicateFromWorkout, margelo::nitro::healthkit::WorkoutActivityTypePredicate, margelo::nitro::healthkit::WorkoutDurationPredicate, margelo::nitro::healthkit::PredicateForWorkoutsOr, margelo::nitro::healthkit::PredicateForWorkoutsAnd>>>::canConvert(runtime, obj.getProperty(runtime, "filter"))) return false;
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "limit"))) return false;
       if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "anchor"))) return false;
       return true;

package/nitrogen/generated/shared/c++/WorkoutRoute.hpp

@@ -21,10 +21,10 @@
 // Forward declaration of `WorkoutRouteLocation` to properly resolve imports.
 namespace margelo::nitro::healthkit { struct WorkoutRouteLocation; }
 
-#include <vector>
 #include "WorkoutRouteLocation.hpp"
-#include <optional>
+#include <vector>
 #include <string>
+#include <optional>
 
 namespace margelo::nitro::healthkit {
 
@@ -46,22 +46,20 @@ namespace margelo::nitro::healthkit {
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::healthkit;
-
   // C++ WorkoutRoute <> JS WorkoutRoute (object)
   template <>
-  struct JSIConverter<WorkoutRoute> final {
-    static inline WorkoutRoute fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::healthkit::WorkoutRoute> final {
+    static inline margelo::nitro::healthkit::WorkoutRoute fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return WorkoutRoute(
-        JSIConverter<std::vector<WorkoutRouteLocation>>::fromJSI(runtime, obj.getProperty(runtime, "locations")),
+      return margelo::nitro::healthkit::WorkoutRoute(
+        JSIConverter<std::vector<margelo::nitro::healthkit::WorkoutRouteLocation>>::fromJSI(runtime, obj.getProperty(runtime, "locations")),
         JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "HKMetadataKeySyncIdentifier")),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "HKMetadataKeySyncVersion"))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const WorkoutRoute& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::healthkit::WorkoutRoute& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "locations", JSIConverter<std::vector<WorkoutRouteLocation>>::toJSI(runtime, arg.locations));
+      obj.setProperty(runtime, "locations", JSIConverter<std::vector<margelo::nitro::healthkit::WorkoutRouteLocation>>::toJSI(runtime, arg.locations));
       obj.setProperty(runtime, "HKMetadataKeySyncIdentifier", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.HKMetadataKeySyncIdentifier));
       obj.setProperty(runtime, "HKMetadataKeySyncVersion", JSIConverter<std::optional<double>>::toJSI(runtime, arg.HKMetadataKeySyncVersion));
       return obj;
@@ -71,7 +69,7 @@ namespace margelo::nitro {
         return false;
       }
       jsi::Object obj = value.getObject(runtime);
-      if (!JSIConverter<std::vector<WorkoutRouteLocation>>::canConvert(runtime, obj.getProperty(runtime, "locations"))) return false;
+      if (!JSIConverter<std::vector<margelo::nitro::healthkit::WorkoutRouteLocation>>::canConvert(runtime, obj.getProperty(runtime, "locations"))) return false;
       if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "HKMetadataKeySyncIdentifier"))) return false;
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "HKMetadataKeySyncVersion"))) return false;
       return true;