@kingstinct/react-native-healthkit 12.1.2 → 12.2.0

package/nitrogen/generated/ios/swift/QuantityTypeIdentifier.swift

@@ -19,6 +19,14 @@ public extension QuantityTypeIdentifier {
     switch string {
       case "HKQuantityTypeIdentifierWalkingHeartRateAverage":
         self = .hkquantitytypeidentifierwalkingheartrateaverage
+      case "HKQuantityTypeIdentifierAtrialFibrillationBurden":
+        self = .hkquantitytypeidentifieratrialfibrillationburden
+      case "HKQuantityTypeIdentifierAppleExerciseTime":
+        self = .hkquantitytypeidentifierappleexercisetime
+      case "HKQuantityTypeIdentifierAppleStandTime":
+        self = .hkquantitytypeidentifierapplestandtime
+      case "HKQuantityTypeIdentifierAppleWalkingSteadiness":
+        self = .hkquantitytypeidentifierapplewalkingsteadiness
       case "HKQuantityTypeIdentifierBodyMassIndex":
         self = .hkquantitytypeidentifierbodymassindex
       case "HKQuantityTypeIdentifierBodyFatPercentage":
@@ -47,8 +55,6 @@ public extension QuantityTypeIdentifier {
         self = .hkquantitytypeidentifierflightsclimbed
       case "HKQuantityTypeIdentifierNikeFuel":
         self = .hkquantitytypeidentifiernikefuel
-      case "HKQuantityTypeIdentifierAppleExerciseTime":
-        self = .hkquantitytypeidentifierappleexercisetime
       case "HKQuantityTypeIdentifierPushCount":
         self = .hkquantitytypeidentifierpushcount
       case "HKQuantityTypeIdentifierDistanceSwimming":
@@ -59,8 +65,6 @@ public extension QuantityTypeIdentifier {
         self = .hkquantitytypeidentifiervo2max
       case "HKQuantityTypeIdentifierDistanceDownhillSnowSports":
         self = .hkquantitytypeidentifierdistancedownhillsnowsports
-      case "HKQuantityTypeIdentifierAppleStandTime":
-        self = .hkquantitytypeidentifierapplestandtime
       case "HKQuantityTypeIdentifierHeartRate":
         self = .hkquantitytypeidentifierheartrate
       case "HKQuantityTypeIdentifierBodyTemperature":
@@ -199,12 +203,8 @@ public extension QuantityTypeIdentifier {
         self = .hkquantitytypeidentifieruvexposure
       case "HKQuantityTypeIdentifierAppleMoveTime":
         self = .hkquantitytypeidentifierapplemovetime
-      case "HKQuantityTypeIdentifierAppleWalkingSteadiness":
-        self = .hkquantitytypeidentifierapplewalkingsteadiness
       case "HKQuantityTypeIdentifierNumberOfAlcoholicBeverages":
         self = .hkquantitytypeidentifiernumberofalcoholicbeverages
-      case "HKQuantityTypeIdentifierAtrialFibrillationBurden":
-        self = .hkquantitytypeidentifieratrialfibrillationburden
       case "HKQuantityTypeIdentifierUnderwaterDepth":
         self = .hkquantitytypeidentifierunderwaterdepth
       case "HKQuantityTypeIdentifierWaterTemperature":
@@ -267,6 +267,14 @@ public extension QuantityTypeIdentifier {
     switch self {
       case .hkquantitytypeidentifierwalkingheartrateaverage:
         return "HKQuantityTypeIdentifierWalkingHeartRateAverage"
+      case .hkquantitytypeidentifieratrialfibrillationburden:
+        return "HKQuantityTypeIdentifierAtrialFibrillationBurden"
+      case .hkquantitytypeidentifierappleexercisetime:
+        return "HKQuantityTypeIdentifierAppleExerciseTime"
+      case .hkquantitytypeidentifierapplestandtime:
+        return "HKQuantityTypeIdentifierAppleStandTime"
+      case .hkquantitytypeidentifierapplewalkingsteadiness:
+        return "HKQuantityTypeIdentifierAppleWalkingSteadiness"
       case .hkquantitytypeidentifierbodymassindex:
         return "HKQuantityTypeIdentifierBodyMassIndex"
       case .hkquantitytypeidentifierbodyfatpercentage:
@@ -295,8 +303,6 @@ public extension QuantityTypeIdentifier {
         return "HKQuantityTypeIdentifierFlightsClimbed"
       case .hkquantitytypeidentifiernikefuel:
         return "HKQuantityTypeIdentifierNikeFuel"
-      case .hkquantitytypeidentifierappleexercisetime:
-        return "HKQuantityTypeIdentifierAppleExerciseTime"
       case .hkquantitytypeidentifierpushcount:
         return "HKQuantityTypeIdentifierPushCount"
       case .hkquantitytypeidentifierdistanceswimming:
@@ -307,8 +313,6 @@ public extension QuantityTypeIdentifier {
         return "HKQuantityTypeIdentifierVO2Max"
       case .hkquantitytypeidentifierdistancedownhillsnowsports:
         return "HKQuantityTypeIdentifierDistanceDownhillSnowSports"
-      case .hkquantitytypeidentifierapplestandtime:
-        return "HKQuantityTypeIdentifierAppleStandTime"
       case .hkquantitytypeidentifierheartrate:
         return "HKQuantityTypeIdentifierHeartRate"
       case .hkquantitytypeidentifierbodytemperature:
@@ -447,12 +451,8 @@ public extension QuantityTypeIdentifier {
         return "HKQuantityTypeIdentifierUVExposure"
       case .hkquantitytypeidentifierapplemovetime:
         return "HKQuantityTypeIdentifierAppleMoveTime"
-      case .hkquantitytypeidentifierapplewalkingsteadiness:
-        return "HKQuantityTypeIdentifierAppleWalkingSteadiness"
       case .hkquantitytypeidentifiernumberofalcoholicbeverages:
         return "HKQuantityTypeIdentifierNumberOfAlcoholicBeverages"
-      case .hkquantitytypeidentifieratrialfibrillationburden:
-        return "HKQuantityTypeIdentifierAtrialFibrillationBurden"
       case .hkquantitytypeidentifierunderwaterdepth:
         return "HKQuantityTypeIdentifierUnderwaterDepth"
       case .hkquantitytypeidentifierwatertemperature:

package/nitrogen/generated/ios/swift/QueryCorrelationSamplesWithAnchorResponse.swift

@@ -0,0 +1,81 @@
+///
+/// QueryCorrelationSamplesWithAnchorResponse.swift
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+import NitroModules
+
+/**
+ * Represents an instance of `QueryCorrelationSamplesWithAnchorResponse`, backed by a C++ struct.
+ */
+public typealias QueryCorrelationSamplesWithAnchorResponse = margelo.nitro.healthkit.QueryCorrelationSamplesWithAnchorResponse
+
+public extension QueryCorrelationSamplesWithAnchorResponse {
+  private typealias bridge = margelo.nitro.healthkit.bridge.swift
+
+  /**
+   * Create a new instance of `QueryCorrelationSamplesWithAnchorResponse`.
+   */
+  init(correlations: [CorrelationSample], deletedSamples: [DeletedSample], newAnchor: String) {
+    self.init({ () -> bridge.std__vector_CorrelationSample_ in
+      var __vector = bridge.create_std__vector_CorrelationSample_(correlations.count)
+      for __item in correlations {
+        __vector.push_back(__item)
+      }
+      return __vector
+    }(), { () -> bridge.std__vector_DeletedSample_ in
+      var __vector = bridge.create_std__vector_DeletedSample_(deletedSamples.count)
+      for __item in deletedSamples {
+        __vector.push_back(__item)
+      }
+      return __vector
+    }(), std.string(newAnchor))
+  }
+
+  var correlations: [CorrelationSample] {
+    @inline(__always)
+    get {
+      return self.__correlations.map({ __item in __item })
+    }
+    @inline(__always)
+    set {
+      self.__correlations = { () -> bridge.std__vector_CorrelationSample_ in
+        var __vector = bridge.create_std__vector_CorrelationSample_(newValue.count)
+        for __item in newValue {
+          __vector.push_back(__item)
+        }
+        return __vector
+      }()
+    }
+  }
+  
+  var deletedSamples: [DeletedSample] {
+    @inline(__always)
+    get {
+      return self.__deletedSamples.map({ __item in __item })
+    }
+    @inline(__always)
+    set {
+      self.__deletedSamples = { () -> bridge.std__vector_DeletedSample_ in
+        var __vector = bridge.create_std__vector_DeletedSample_(newValue.count)
+        for __item in newValue {
+          __vector.push_back(__item)
+        }
+        return __vector
+      }()
+    }
+  }
+  
+  var newAnchor: String {
+    @inline(__always)
+    get {
+      return String(self.__newAnchor)
+    }
+    @inline(__always)
+    set {
+      self.__newAnchor = std.string(newValue)
+    }
+  }
+}

package/nitrogen/generated/ios/swift/QueryOptionsWithAnchor.swift

@@ -18,43 +18,20 @@ public extension QueryOptionsWithAnchor {
   /**
    * Create a new instance of `QueryOptionsWithAnchor`.
    */
-  init(anchor: String?, filter: Variant_PredicateWithUUID_PredicateWithUUIDs_PredicateWithMetadataKey_PredicateWithStartAndEnd_PredicateFromWorkout_FilterForSamplesAnd_FilterForSamplesOr?, limit: Double?) {
+  init(anchor: String?, filter: FilterForSamples?, limit: Double) {
     self.init({ () -> bridge.std__optional_std__string_ in
       if let __unwrappedValue = anchor {
         return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
       } else {
         return .init()
       }
-    }(), { () -> bridge.std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__ in
+    }(), { () -> bridge.std__optional_FilterForSamples_ in
       if let __unwrappedValue = filter {
-        return bridge.create_std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__({ () -> bridge.std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_ in
-          switch __unwrappedValue {
-            case .first(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .second(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .third(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .fourth(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .fifth(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .sixth(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .seventh(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-          }
-        }().variant)
+        return bridge.create_std__optional_FilterForSamples_(__unwrappedValue)
       } else {
         return .init()
       }
-    }(), { () -> bridge.std__optional_double_ in
-      if let __unwrappedValue = limit {
-        return bridge.create_std__optional_double_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }())
+    }(), limit)
   }
 
   var anchor: String? {
@@ -81,67 +58,16 @@ public extension QueryOptionsWithAnchor {
     }
   }
   
-  var filter: Variant_PredicateWithUUID_PredicateWithUUIDs_PredicateWithMetadataKey_PredicateWithStartAndEnd_PredicateFromWorkout_FilterForSamplesAnd_FilterForSamplesOr? {
+  var filter: FilterForSamples? {
     @inline(__always)
     get {
-      return { () -> Variant_PredicateWithUUID_PredicateWithUUIDs_PredicateWithMetadataKey_PredicateWithStartAndEnd_PredicateFromWorkout_FilterForSamplesAnd_FilterForSamplesOr? in
-        if bridge.has_value_std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__(self.__filter) {
-          let __unwrapped = bridge.get_std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__(self.__filter)
-          return { () -> Variant_PredicateWithUUID_PredicateWithUUIDs_PredicateWithMetadataKey_PredicateWithStartAndEnd_PredicateFromWorkout_FilterForSamplesAnd_FilterForSamplesOr in
-            let __variant = bridge.std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__unwrapped)
-            switch __variant.index() {
-              case 0:
-                let __actual = __variant.get_0()
-                return .first(__actual)
-              case 1:
-                let __actual = __variant.get_1()
-                return .second(__actual)
-              case 2:
-                let __actual = __variant.get_2()
-                return .third(__actual)
-              case 3:
-                let __actual = __variant.get_3()
-                return .fourth(__actual)
-              case 4:
-                let __actual = __variant.get_4()
-                return .fifth(__actual)
-              case 5:
-                let __actual = __variant.get_5()
-                return .sixth(__actual)
-              case 6:
-                let __actual = __variant.get_6()
-                return .seventh(__actual)
-              default:
-                fatalError("Variant can never have index \(__variant.index())!")
-            }
-          }()
-        } else {
-          return nil
-        }
-      }()
+      return self.__filter.value
     }
     @inline(__always)
     set {
-      self.__filter = { () -> bridge.std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__ in
+      self.__filter = { () -> bridge.std__optional_FilterForSamples_ in
         if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__({ () -> bridge.std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_ in
-            switch __unwrappedValue {
-              case .first(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .second(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .third(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .fourth(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .fifth(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .sixth(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .seventh(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            }
-          }().variant)
+          return bridge.create_std__optional_FilterForSamples_(__unwrappedValue)
         } else {
           return .init()
         }
@@ -149,20 +75,14 @@ public extension QueryOptionsWithAnchor {
     }
   }
   
-  var limit: Double? {
+  var limit: Double {
     @inline(__always)
     get {
-      return self.__limit.value
+      return self.__limit
     }
     @inline(__always)
     set {
-      self.__limit = { () -> bridge.std__optional_double_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_double_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
+      self.__limit = newValue
     }
   }
 }

package/nitrogen/generated/ios/swift/QueryOptionsWithAnchorAndUnit.swift

@@ -18,7 +18,7 @@ public extension QueryOptionsWithAnchorAndUnit {
   /**
    * Create a new instance of `QueryOptionsWithAnchorAndUnit`.
    */
-  init(unit: String?, anchor: String?, filter: Variant_PredicateWithUUID_PredicateWithUUIDs_PredicateWithMetadataKey_PredicateWithStartAndEnd_PredicateFromWorkout_FilterForSamplesAnd_FilterForSamplesOr?, limit: Double?) {
+  init(unit: String?, anchor: String?, filter: FilterForSamples?, limit: Double) {
     self.init({ () -> bridge.std__optional_std__string_ in
       if let __unwrappedValue = unit {
         return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
@@ -31,36 +31,13 @@ public extension QueryOptionsWithAnchorAndUnit {
       } else {
         return .init()
       }
-    }(), { () -> bridge.std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__ in
+    }(), { () -> bridge.std__optional_FilterForSamples_ in
       if let __unwrappedValue = filter {
-        return bridge.create_std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__({ () -> bridge.std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_ in
-          switch __unwrappedValue {
-            case .first(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .second(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .third(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .fourth(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .fifth(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .sixth(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .seventh(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-          }
-        }().variant)
+        return bridge.create_std__optional_FilterForSamples_(__unwrappedValue)
       } else {
         return .init()
       }
-    }(), { () -> bridge.std__optional_double_ in
-      if let __unwrappedValue = limit {
-        return bridge.create_std__optional_double_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }())
+    }(), limit)
   }
 
   var unit: String? {
@@ -111,67 +88,16 @@ public extension QueryOptionsWithAnchorAndUnit {
     }
   }
   
-  var filter: Variant_PredicateWithUUID_PredicateWithUUIDs_PredicateWithMetadataKey_PredicateWithStartAndEnd_PredicateFromWorkout_FilterForSamplesAnd_FilterForSamplesOr? {
+  var filter: FilterForSamples? {
     @inline(__always)
     get {
-      return { () -> Variant_PredicateWithUUID_PredicateWithUUIDs_PredicateWithMetadataKey_PredicateWithStartAndEnd_PredicateFromWorkout_FilterForSamplesAnd_FilterForSamplesOr? in
-        if bridge.has_value_std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__(self.__filter) {
-          let __unwrapped = bridge.get_std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__(self.__filter)
-          return { () -> Variant_PredicateWithUUID_PredicateWithUUIDs_PredicateWithMetadataKey_PredicateWithStartAndEnd_PredicateFromWorkout_FilterForSamplesAnd_FilterForSamplesOr in
-            let __variant = bridge.std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__unwrapped)
-            switch __variant.index() {
-              case 0:
-                let __actual = __variant.get_0()
-                return .first(__actual)
-              case 1:
-                let __actual = __variant.get_1()
-                return .second(__actual)
-              case 2:
-                let __actual = __variant.get_2()
-                return .third(__actual)
-              case 3:
-                let __actual = __variant.get_3()
-                return .fourth(__actual)
-              case 4:
-                let __actual = __variant.get_4()
-                return .fifth(__actual)
-              case 5:
-                let __actual = __variant.get_5()
-                return .sixth(__actual)
-              case 6:
-                let __actual = __variant.get_6()
-                return .seventh(__actual)
-              default:
-                fatalError("Variant can never have index \(__variant.index())!")
-            }
-          }()
-        } else {
-          return nil
-        }
-      }()
+      return self.__filter.value
     }
     @inline(__always)
     set {
-      self.__filter = { () -> bridge.std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__ in
+      self.__filter = { () -> bridge.std__optional_FilterForSamples_ in
         if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__({ () -> bridge.std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_ in
-            switch __unwrappedValue {
-              case .first(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .second(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .third(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .fourth(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .fifth(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .sixth(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .seventh(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            }
-          }().variant)
+          return bridge.create_std__optional_FilterForSamples_(__unwrappedValue)
         } else {
           return .init()
         }
@@ -179,20 +105,14 @@ public extension QueryOptionsWithAnchorAndUnit {
     }
   }
   
-  var limit: Double? {
+  var limit: Double {
     @inline(__always)
     get {
-      return self.__limit.value
+      return self.__limit
     }
     @inline(__always)
     set {
-      self.__limit = { () -> bridge.std__optional_double_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_double_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
+      self.__limit = newValue
     }
   }
 }

package/nitrogen/generated/ios/swift/QueryOptionsWithSortOrder.swift

@@ -18,43 +18,20 @@ public extension QueryOptionsWithSortOrder {
   /**
    * Create a new instance of `QueryOptionsWithSortOrder`.
    */
-  init(ascending: Bool?, filter: Variant_PredicateWithUUID_PredicateWithUUIDs_PredicateWithMetadataKey_PredicateWithStartAndEnd_PredicateFromWorkout_FilterForSamplesAnd_FilterForSamplesOr?, limit: Double?) {
+  init(ascending: Bool?, filter: FilterForSamples?, limit: Double) {
     self.init({ () -> bridge.std__optional_bool_ in
       if let __unwrappedValue = ascending {
         return bridge.create_std__optional_bool_(__unwrappedValue)
       } else {
         return .init()
       }
-    }(), { () -> bridge.std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__ in
+    }(), { () -> bridge.std__optional_FilterForSamples_ in
       if let __unwrappedValue = filter {
-        return bridge.create_std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__({ () -> bridge.std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_ in
-          switch __unwrappedValue {
-            case .first(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .second(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .third(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .fourth(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .fifth(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .sixth(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            case .seventh(let __value):
-              return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-          }
-        }().variant)
+        return bridge.create_std__optional_FilterForSamples_(__unwrappedValue)
       } else {
         return .init()
       }
-    }(), { () -> bridge.std__optional_double_ in
-      if let __unwrappedValue = limit {
-        return bridge.create_std__optional_double_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }())
+    }(), limit)
   }
 
   var ascending: Bool? {
@@ -81,67 +58,16 @@ public extension QueryOptionsWithSortOrder {
     }
   }
   
-  var filter: Variant_PredicateWithUUID_PredicateWithUUIDs_PredicateWithMetadataKey_PredicateWithStartAndEnd_PredicateFromWorkout_FilterForSamplesAnd_FilterForSamplesOr? {
+  var filter: FilterForSamples? {
     @inline(__always)
     get {
-      return { () -> Variant_PredicateWithUUID_PredicateWithUUIDs_PredicateWithMetadataKey_PredicateWithStartAndEnd_PredicateFromWorkout_FilterForSamplesAnd_FilterForSamplesOr? in
-        if bridge.has_value_std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__(self.__filter) {
-          let __unwrapped = bridge.get_std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__(self.__filter)
-          return { () -> Variant_PredicateWithUUID_PredicateWithUUIDs_PredicateWithMetadataKey_PredicateWithStartAndEnd_PredicateFromWorkout_FilterForSamplesAnd_FilterForSamplesOr in
-            let __variant = bridge.std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__unwrapped)
-            switch __variant.index() {
-              case 0:
-                let __actual = __variant.get_0()
-                return .first(__actual)
-              case 1:
-                let __actual = __variant.get_1()
-                return .second(__actual)
-              case 2:
-                let __actual = __variant.get_2()
-                return .third(__actual)
-              case 3:
-                let __actual = __variant.get_3()
-                return .fourth(__actual)
-              case 4:
-                let __actual = __variant.get_4()
-                return .fifth(__actual)
-              case 5:
-                let __actual = __variant.get_5()
-                return .sixth(__actual)
-              case 6:
-                let __actual = __variant.get_6()
-                return .seventh(__actual)
-              default:
-                fatalError("Variant can never have index \(__variant.index())!")
-            }
-          }()
-        } else {
-          return nil
-        }
-      }()
+      return self.__filter.value
     }
     @inline(__always)
     set {
-      self.__filter = { () -> bridge.std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__ in
+      self.__filter = { () -> bridge.std__optional_FilterForSamples_ in
         if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr__({ () -> bridge.std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_ in
-            switch __unwrappedValue {
-              case .first(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .second(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .third(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .fourth(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .fifth(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .sixth(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-              case .seventh(let __value):
-                return bridge.create_std__variant_PredicateWithUUID__PredicateWithUUIDs__PredicateWithMetadataKey__PredicateWithStartAndEnd__PredicateFromWorkout__FilterForSamplesAnd__FilterForSamplesOr_(__value)
-            }
-          }().variant)
+          return bridge.create_std__optional_FilterForSamples_(__unwrappedValue)
         } else {
           return .init()
         }
@@ -149,20 +75,14 @@ public extension QueryOptionsWithSortOrder {
     }
   }
   
-  var limit: Double? {
+  var limit: Double {
     @inline(__always)
     get {
-      return self.__limit.value
+      return self.__limit
     }
     @inline(__always)
     set {
-      self.__limit = { () -> bridge.std__optional_double_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_double_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
+      self.__limit = newValue
     }
   }
 }