@kingstinct/react-native-healthkit 13.3.1 → 14.0.0

package/nitrogen/generated/ios/swift/HeartbeatSeriesSample.swift

@@ -18,139 +18,19 @@ public extension HeartbeatSeriesSample {
   /**
    * Create a new instance of `HeartbeatSeriesSample`.
    */
-  init(heartbeats: [Heartbeat], sampleType: SampleType, startDate: Date, endDate: Date, hasUndeterminedDuration: Bool, metadataWeatherCondition: WeatherCondition?, metadataWeatherHumidity: Quantity?, metadataWeatherTemperature: Quantity?, metadataInsulinDeliveryReason: InsulinDeliveryReason?, metadataHeartRateMotionContext: HeartRateMotionContext?, uuid: String, sourceRevision: SourceRevision, device: Device?, metadata: AnyMap, metadataExternalUUID: String?, metadataTimeZone: String?, metadataWasUserEntered: Bool?, metadataDeviceSerialNumber: String?, metadataUdiDeviceIdentifier: String?, metadataUdiProductionIdentifier: String?, metadataDigitalSignature: String?, metadataDeviceName: String?, metadataDeviceManufacturerName: String?, metadataSyncIdentifier: String?, metadataSyncVersion: Double?, metadataWasTakenInLab: Bool?, metadataReferenceRangeLowerLimit: Double?, metadataReferenceRangeUpperLimit: Double?, metadataAlgorithmVersion: Double?) {
+  init(heartbeats: [Heartbeat], sampleType: SampleType, startDate: Date, endDate: Date, hasUndeterminedDuration: Bool, metadata: AnyMap, uuid: String, sourceRevision: SourceRevision, device: Device?) {
     self.init({ () -> bridge.std__vector_Heartbeat_ in
       var __vector = bridge.create_std__vector_Heartbeat_(heartbeats.count)
       for __item in heartbeats {
         __vector.push_back(__item)
       }
       return __vector
-    }(), sampleType, startDate.toCpp(), endDate.toCpp(), hasUndeterminedDuration, { () -> bridge.std__optional_WeatherCondition_ in
-      if let __unwrappedValue = metadataWeatherCondition {
-        return bridge.create_std__optional_WeatherCondition_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_Quantity_ in
-      if let __unwrappedValue = metadataWeatherHumidity {
-        return bridge.create_std__optional_Quantity_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_Quantity_ in
-      if let __unwrappedValue = metadataWeatherTemperature {
-        return bridge.create_std__optional_Quantity_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_InsulinDeliveryReason_ in
-      if let __unwrappedValue = metadataInsulinDeliveryReason {
-        return bridge.create_std__optional_InsulinDeliveryReason_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_HeartRateMotionContext_ in
-      if let __unwrappedValue = metadataHeartRateMotionContext {
-        return bridge.create_std__optional_HeartRateMotionContext_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), std.string(uuid), sourceRevision, { () -> bridge.std__optional_Device_ in
+    }(), sampleType, startDate.toCpp(), endDate.toCpp(), hasUndeterminedDuration, metadata.cppPart, std.string(uuid), sourceRevision, { () -> bridge.std__optional_Device_ in
       if let __unwrappedValue = device {
         return bridge.create_std__optional_Device_(__unwrappedValue)
       } else {
         return .init()
       }
-    }(), metadata.cppPart, { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataExternalUUID {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataTimeZone {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_bool_ in
-      if let __unwrappedValue = metadataWasUserEntered {
-        return bridge.create_std__optional_bool_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataDeviceSerialNumber {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataUdiDeviceIdentifier {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataUdiProductionIdentifier {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataDigitalSignature {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataDeviceName {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataDeviceManufacturerName {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataSyncIdentifier {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_double_ in
-      if let __unwrappedValue = metadataSyncVersion {
-        return bridge.create_std__optional_double_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_bool_ in
-      if let __unwrappedValue = metadataWasTakenInLab {
-        return bridge.create_std__optional_bool_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_double_ in
-      if let __unwrappedValue = metadataReferenceRangeLowerLimit {
-        return bridge.create_std__optional_double_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_double_ in
-      if let __unwrappedValue = metadataReferenceRangeUpperLimit {
-        return bridge.create_std__optional_double_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_double_ in
-      if let __unwrappedValue = metadataAlgorithmVersion {
-        return bridge.create_std__optional_double_(__unwrappedValue)
-      } else {
-        return .init()
-      }
     }())
   }
 
@@ -180,28 +60,8 @@ public extension HeartbeatSeriesSample {
   }
   
   @inline(__always)
-  var metadataWeatherCondition: WeatherCondition? {
-    return self.__metadataWeatherCondition.has_value() ? self.__metadataWeatherCondition.pointee : nil
-  }
-  
-  @inline(__always)
-  var metadataWeatherHumidity: Quantity? {
-    return self.__metadataWeatherHumidity.value
-  }
-  
-  @inline(__always)
-  var metadataWeatherTemperature: Quantity? {
-    return self.__metadataWeatherTemperature.value
-  }
-  
-  @inline(__always)
-  var metadataInsulinDeliveryReason: InsulinDeliveryReason? {
-    return self.__metadataInsulinDeliveryReason.has_value() ? self.__metadataInsulinDeliveryReason.pointee : nil
-  }
-  
-  @inline(__always)
-  var metadataHeartRateMotionContext: HeartRateMotionContext? {
-    return self.__metadataHeartRateMotionContext.has_value() ? self.__metadataHeartRateMotionContext.pointee : nil
+  var metadata: AnyMap {
+    return AnyMap(withCppPart: self.__metadata)
   }
   
   @inline(__always)
@@ -218,189 +78,4 @@ public extension HeartbeatSeriesSample {
   var device: Device? {
     return self.__device.value
   }
-  
-  @inline(__always)
-  var metadata: AnyMap {
-    return AnyMap(withCppPart: self.__metadata)
-  }
-  
-  @inline(__always)
-  var metadataExternalUUID: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataExternalUUID) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataExternalUUID)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataTimeZone: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataTimeZone) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataTimeZone)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataWasUserEntered: Bool? {
-    return { () -> Bool? in
-      if bridge.has_value_std__optional_bool_(self.__metadataWasUserEntered) {
-        let __unwrapped = bridge.get_std__optional_bool_(self.__metadataWasUserEntered)
-        return __unwrapped
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataDeviceSerialNumber: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataDeviceSerialNumber) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataDeviceSerialNumber)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataUdiDeviceIdentifier: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataUdiDeviceIdentifier) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataUdiDeviceIdentifier)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataUdiProductionIdentifier: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataUdiProductionIdentifier) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataUdiProductionIdentifier)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataDigitalSignature: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataDigitalSignature) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataDigitalSignature)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataDeviceName: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataDeviceName) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataDeviceName)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataDeviceManufacturerName: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataDeviceManufacturerName) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataDeviceManufacturerName)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataSyncIdentifier: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataSyncIdentifier) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataSyncIdentifier)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataSyncVersion: Double? {
-    return { () -> Double? in
-      if bridge.has_value_std__optional_double_(self.__metadataSyncVersion) {
-        let __unwrapped = bridge.get_std__optional_double_(self.__metadataSyncVersion)
-        return __unwrapped
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataWasTakenInLab: Bool? {
-    return { () -> Bool? in
-      if bridge.has_value_std__optional_bool_(self.__metadataWasTakenInLab) {
-        let __unwrapped = bridge.get_std__optional_bool_(self.__metadataWasTakenInLab)
-        return __unwrapped
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataReferenceRangeLowerLimit: Double? {
-    return { () -> Double? in
-      if bridge.has_value_std__optional_double_(self.__metadataReferenceRangeLowerLimit) {
-        let __unwrapped = bridge.get_std__optional_double_(self.__metadataReferenceRangeLowerLimit)
-        return __unwrapped
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataReferenceRangeUpperLimit: Double? {
-    return { () -> Double? in
-      if bridge.has_value_std__optional_double_(self.__metadataReferenceRangeUpperLimit) {
-        let __unwrapped = bridge.get_std__optional_double_(self.__metadataReferenceRangeUpperLimit)
-        return __unwrapped
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataAlgorithmVersion: Double? {
-    return { () -> Double? in
-      if bridge.has_value_std__optional_double_(self.__metadataAlgorithmVersion) {
-        let __unwrapped = bridge.get_std__optional_double_(self.__metadataAlgorithmVersion)
-        return __unwrapped
-      } else {
-        return nil
-      }
-    }()
-  }
 }

package/nitrogen/generated/ios/swift/HybridCategoryTypeModuleSpec.swift

@@ -13,7 +13,7 @@ public protocol HybridCategoryTypeModuleSpec_protocol: HybridObject {
   
 
   // Methods
-  func saveCategorySample(identifier: CategoryTypeIdentifier, value: Double, startDate: Date, endDate: Date, metadata: AnyMap?) throws -> Promise<CategorySample?>
+  func saveCategorySample(identifier: CategoryTypeIdentifierWriteable, value: Double, startDate: Date, endDate: Date, metadata: AnyMap?) throws -> Promise<CategorySample?>
   func queryCategorySamples(identifier: CategoryTypeIdentifier, options: QueryOptionsWithSortOrder) throws -> Promise<[CategorySample]>
   func queryCategorySamplesWithAnchor(identifier: CategoryTypeIdentifier, options: QueryOptionsWithAnchor) throws -> Promise<CategorySamplesWithAnchorResponse>
 }

package/nitrogen/generated/ios/swift/HybridCategoryTypeModuleSpec_cxx.swift

@@ -127,7 +127,7 @@ open class HybridCategoryTypeModuleSpec_cxx {
   @inline(__always)
   public final func saveCategorySample(identifier: Int32, value: Double, startDate: margelo.nitro.chrono_time, endDate: margelo.nitro.chrono_time, metadata: bridge.std__optional_std__shared_ptr_AnyMap__) -> bridge.Result_std__shared_ptr_Promise_std__optional_CategorySample____ {
     do {
-      let __result = try self.__implementation.saveCategorySample(identifier: margelo.nitro.healthkit.CategoryTypeIdentifier(rawValue: identifier)!, value: value, startDate: Date(fromChrono: startDate), endDate: Date(fromChrono: endDate), metadata: { () -> AnyMap? in
+      let __result = try self.__implementation.saveCategorySample(identifier: margelo.nitro.healthkit.CategoryTypeIdentifierWriteable(rawValue: identifier)!, value: value, startDate: Date(fromChrono: startDate), endDate: Date(fromChrono: endDate), metadata: { () -> AnyMap? in
         if bridge.has_value_std__optional_std__shared_ptr_AnyMap__(metadata) {
           let __unwrapped = bridge.get_std__optional_std__shared_ptr_AnyMap__(metadata)
           return AnyMap(withCppPart: __unwrapped)

package/nitrogen/generated/ios/swift/HybridCoreModuleSpec.swift

@@ -16,6 +16,8 @@ public protocol HybridCoreModuleSpec_protocol: HybridObject {
   func enableBackgroundDelivery(typeIdentifier: ObjectTypeIdentifier, updateFrequency: UpdateFrequency) throws -> Promise<Bool>
   func disableBackgroundDelivery(typeIdentifier: ObjectTypeIdentifier) throws -> Promise<Bool>
   func disableAllBackgroundDelivery() throws -> Promise<Bool>
+  func configureBackgroundTypes(typeIdentifiers: [String], updateFrequency: UpdateFrequency) throws -> Promise<Bool>
+  func clearBackgroundTypes() throws -> Promise<Bool>
   func isHealthDataAvailable() throws -> Bool
   func isHealthDataAvailableAsync() throws -> Promise<Bool>
   func isProtectedDataAvailable() throws -> Bool

package/nitrogen/generated/ios/swift/HybridCoreModuleSpec_cxx.swift

@@ -181,6 +181,44 @@ open class HybridCoreModuleSpec_cxx {
     }
   }
   
+  @inline(__always)
+  public final func configureBackgroundTypes(typeIdentifiers: bridge.std__vector_std__string_, updateFrequency: Int32) -> bridge.Result_std__shared_ptr_Promise_bool___ {
+    do {
+      let __result = try self.__implementation.configureBackgroundTypes(typeIdentifiers: typeIdentifiers.map({ __item in String(__item) }), updateFrequency: margelo.nitro.healthkit.UpdateFrequency(rawValue: updateFrequency)!)
+      let __resultCpp = { () -> bridge.std__shared_ptr_Promise_bool__ in
+        let __promise = bridge.create_std__shared_ptr_Promise_bool__()
+        let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_bool__(__promise)
+        __result
+          .then({ __result in __promiseHolder.resolve(__result) })
+          .catch({ __error in __promiseHolder.reject(__error.toCpp()) })
+        return __promise
+      }()
+      return bridge.create_Result_std__shared_ptr_Promise_bool___(__resultCpp)
+    } catch (let __error) {
+      let __exceptionPtr = __error.toCpp()
+      return bridge.create_Result_std__shared_ptr_Promise_bool___(__exceptionPtr)
+    }
+  }
+  
+  @inline(__always)
+  public final func clearBackgroundTypes() -> bridge.Result_std__shared_ptr_Promise_bool___ {
+    do {
+      let __result = try self.__implementation.clearBackgroundTypes()
+      let __resultCpp = { () -> bridge.std__shared_ptr_Promise_bool__ in
+        let __promise = bridge.create_std__shared_ptr_Promise_bool__()
+        let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_bool__(__promise)
+        __result
+          .then({ __result in __promiseHolder.resolve(__result) })
+          .catch({ __error in __promiseHolder.reject(__error.toCpp()) })
+        return __promise
+      }()
+      return bridge.create_Result_std__shared_ptr_Promise_bool___(__resultCpp)
+    } catch (let __error) {
+      let __exceptionPtr = __error.toCpp()
+      return bridge.create_Result_std__shared_ptr_Promise_bool___(__exceptionPtr)
+    }
+  }
+  
   @inline(__always)
   public final func isHealthDataAvailable() -> bridge.Result_bool_ {
     do {

package/nitrogen/generated/ios/swift/HybridQuantityTypeModuleSpec.swift

@@ -16,12 +16,12 @@ public protocol HybridQuantityTypeModuleSpec_protocol: HybridObject {
   func isQuantityCompatibleWithUnit(identifier: QuantityTypeIdentifier, unit: String) throws -> Bool
   func aggregationStyle(identifier: QuantityTypeIdentifier) throws -> AggregationStyle
   func saveQuantitySample(identifier: QuantityTypeIdentifierWriteable, unit: String, value: Double, start: Date, end: Date, metadata: AnyMap?) throws -> Promise<QuantitySample?>
-  func queryQuantitySamples(identifier: QuantityTypeIdentifier, options: QueryOptionsWithSortOrderAndUnit) throws -> Promise<[QuantitySample]>
-  func queryStatisticsForQuantity(identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions], options: StatisticsQueryOptions?) throws -> Promise<QueryStatisticsResponse>
-  func queryStatisticsCollectionForQuantity(identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions], anchorDate: Date, intervalComponents: IntervalComponents, options: StatisticsQueryOptions?) throws -> Promise<[QueryStatisticsResponse]>
-  func queryStatisticsForQuantitySeparateBySource(identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions], options: StatisticsQueryOptions?) throws -> Promise<[QueryStatisticsResponseFromSingleSource]>
-  func queryStatisticsCollectionForQuantitySeparateBySource(identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions], anchorDate: Date, intervalComponents: IntervalComponents, options: StatisticsQueryOptions?) throws -> Promise<[QueryStatisticsResponseFromSingleSource]>
-  func queryQuantitySamplesWithAnchor(identifier: QuantityTypeIdentifier, options: QueryOptionsWithAnchorAndUnit) throws -> Promise<QuantitySamplesWithAnchorResponse>
+  func queryQuantitySamples(identifier: QuantityTypeIdentifier, options: QueryOptionsWithSortOrderAndStringUnit) throws -> Promise<[QuantitySample]>
+  func queryStatisticsForQuantity(identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions], options: StatisticsQueryOptionsWithStringUnit?) throws -> Promise<QueryStatisticsResponse>
+  func queryStatisticsCollectionForQuantity(identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions], anchorDate: Date, intervalComponents: IntervalComponents, options: StatisticsQueryOptionsWithStringUnit?) throws -> Promise<[QueryStatisticsResponse]>
+  func queryStatisticsForQuantitySeparateBySource(identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions], options: StatisticsQueryOptionsWithStringUnit?) throws -> Promise<[QueryStatisticsResponseFromSingleSource]>
+  func queryStatisticsCollectionForQuantitySeparateBySource(identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions], anchorDate: Date, intervalComponents: IntervalComponents, options: StatisticsQueryOptionsWithStringUnit?) throws -> Promise<[QueryStatisticsResponseFromSingleSource]>
+  func queryQuantitySamplesWithAnchor(identifier: QuantityTypeIdentifier, options: QueryOptionsWithAnchorAndStringUnit) throws -> Promise<QuantitySamplesWithAnchorResponse>
 }
 
 public extension HybridQuantityTypeModuleSpec_protocol {

package/nitrogen/generated/ios/swift/HybridQuantityTypeModuleSpec_cxx.swift

@@ -181,7 +181,7 @@ open class HybridQuantityTypeModuleSpec_cxx {
   }
   
   @inline(__always)
-  public final func queryQuantitySamples(identifier: Int32, options: QueryOptionsWithSortOrderAndUnit) -> bridge.Result_std__shared_ptr_Promise_std__vector_QuantitySample____ {
+  public final func queryQuantitySamples(identifier: Int32, options: QueryOptionsWithSortOrderAndStringUnit) -> bridge.Result_std__shared_ptr_Promise_std__vector_QuantitySample____ {
     do {
       let __result = try self.__implementation.queryQuantitySamples(identifier: margelo.nitro.healthkit.QuantityTypeIdentifier(rawValue: identifier)!, options: options)
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_std__vector_QuantitySample___ in
@@ -206,7 +206,7 @@ open class HybridQuantityTypeModuleSpec_cxx {
   }
   
   @inline(__always)
-  public final func queryStatisticsForQuantity(identifier: Int32, statistics: bridge.std__vector_StatisticsOptions_, options: bridge.std__optional_StatisticsQueryOptions_) -> bridge.Result_std__shared_ptr_Promise_QueryStatisticsResponse___ {
+  public final func queryStatisticsForQuantity(identifier: Int32, statistics: bridge.std__vector_StatisticsOptions_, options: bridge.std__optional_StatisticsQueryOptionsWithStringUnit_) -> bridge.Result_std__shared_ptr_Promise_QueryStatisticsResponse___ {
     do {
       let __result = try self.__implementation.queryStatisticsForQuantity(identifier: margelo.nitro.healthkit.QuantityTypeIdentifier(rawValue: identifier)!, statistics: statistics.map({ __item in __item }), options: options.value)
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_QueryStatisticsResponse__ in
@@ -225,7 +225,7 @@ open class HybridQuantityTypeModuleSpec_cxx {
   }
   
   @inline(__always)
-  public final func queryStatisticsCollectionForQuantity(identifier: Int32, statistics: bridge.std__vector_StatisticsOptions_, anchorDate: margelo.nitro.chrono_time, intervalComponents: IntervalComponents, options: bridge.std__optional_StatisticsQueryOptions_) -> bridge.Result_std__shared_ptr_Promise_std__vector_QueryStatisticsResponse____ {
+  public final func queryStatisticsCollectionForQuantity(identifier: Int32, statistics: bridge.std__vector_StatisticsOptions_, anchorDate: margelo.nitro.chrono_time, intervalComponents: IntervalComponents, options: bridge.std__optional_StatisticsQueryOptionsWithStringUnit_) -> bridge.Result_std__shared_ptr_Promise_std__vector_QueryStatisticsResponse____ {
     do {
       let __result = try self.__implementation.queryStatisticsCollectionForQuantity(identifier: margelo.nitro.healthkit.QuantityTypeIdentifier(rawValue: identifier)!, statistics: statistics.map({ __item in __item }), anchorDate: Date(fromChrono: anchorDate), intervalComponents: intervalComponents, options: options.value)
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_std__vector_QueryStatisticsResponse___ in
@@ -250,7 +250,7 @@ open class HybridQuantityTypeModuleSpec_cxx {
   }
   
   @inline(__always)
-  public final func queryStatisticsForQuantitySeparateBySource(identifier: Int32, statistics: bridge.std__vector_StatisticsOptions_, options: bridge.std__optional_StatisticsQueryOptions_) -> bridge.Result_std__shared_ptr_Promise_std__vector_QueryStatisticsResponseFromSingleSource____ {
+  public final func queryStatisticsForQuantitySeparateBySource(identifier: Int32, statistics: bridge.std__vector_StatisticsOptions_, options: bridge.std__optional_StatisticsQueryOptionsWithStringUnit_) -> bridge.Result_std__shared_ptr_Promise_std__vector_QueryStatisticsResponseFromSingleSource____ {
     do {
       let __result = try self.__implementation.queryStatisticsForQuantitySeparateBySource(identifier: margelo.nitro.healthkit.QuantityTypeIdentifier(rawValue: identifier)!, statistics: statistics.map({ __item in __item }), options: options.value)
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_std__vector_QueryStatisticsResponseFromSingleSource___ in
@@ -275,7 +275,7 @@ open class HybridQuantityTypeModuleSpec_cxx {
   }
   
   @inline(__always)
-  public final func queryStatisticsCollectionForQuantitySeparateBySource(identifier: Int32, statistics: bridge.std__vector_StatisticsOptions_, anchorDate: margelo.nitro.chrono_time, intervalComponents: IntervalComponents, options: bridge.std__optional_StatisticsQueryOptions_) -> bridge.Result_std__shared_ptr_Promise_std__vector_QueryStatisticsResponseFromSingleSource____ {
+  public final func queryStatisticsCollectionForQuantitySeparateBySource(identifier: Int32, statistics: bridge.std__vector_StatisticsOptions_, anchorDate: margelo.nitro.chrono_time, intervalComponents: IntervalComponents, options: bridge.std__optional_StatisticsQueryOptionsWithStringUnit_) -> bridge.Result_std__shared_ptr_Promise_std__vector_QueryStatisticsResponseFromSingleSource____ {
     do {
       let __result = try self.__implementation.queryStatisticsCollectionForQuantitySeparateBySource(identifier: margelo.nitro.healthkit.QuantityTypeIdentifier(rawValue: identifier)!, statistics: statistics.map({ __item in __item }), anchorDate: Date(fromChrono: anchorDate), intervalComponents: intervalComponents, options: options.value)
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_std__vector_QueryStatisticsResponseFromSingleSource___ in
@@ -300,7 +300,7 @@ open class HybridQuantityTypeModuleSpec_cxx {
   }
   
   @inline(__always)
-  public final func queryQuantitySamplesWithAnchor(identifier: Int32, options: QueryOptionsWithAnchorAndUnit) -> bridge.Result_std__shared_ptr_Promise_QuantitySamplesWithAnchorResponse___ {
+  public final func queryQuantitySamplesWithAnchor(identifier: Int32, options: QueryOptionsWithAnchorAndStringUnit) -> bridge.Result_std__shared_ptr_Promise_QuantitySamplesWithAnchorResponse___ {
     do {
       let __result = try self.__implementation.queryQuantitySamplesWithAnchor(identifier: margelo.nitro.healthkit.QuantityTypeIdentifier(rawValue: identifier)!, options: options)
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_QuantitySamplesWithAnchorResponse__ in

package/nitrogen/generated/ios/swift/HybridWorkoutProxySpec.swift

@@ -18,40 +18,14 @@ public protocol HybridWorkoutProxySpec_protocol: HybridObject {
   var totalFlightsClimbed: Quantity? { get }
   var events: [WorkoutEvent]? { get }
   var activities: [WorkoutActivity]? { get }
-  var metadataAverageMETs: Quantity? { get }
-  var metadataElevationAscended: Quantity? { get }
-  var metadataElevationDescended: Quantity? { get }
-  var metadataIndoorWorkout: Bool? { get }
-  var metadataAverageSpeed: Quantity? { get }
-  var metadataMaximumSpeed: Quantity? { get }
+  var metadata: AnyMap { get }
   var sampleType: SampleType { get }
   var startDate: Date { get }
   var endDate: Date { get }
   var hasUndeterminedDuration: Bool { get }
-  var metadataWeatherCondition: WeatherCondition? { get }
-  var metadataWeatherHumidity: Quantity? { get }
-  var metadataWeatherTemperature: Quantity? { get }
-  var metadataInsulinDeliveryReason: InsulinDeliveryReason? { get }
-  var metadataHeartRateMotionContext: HeartRateMotionContext? { get }
   var uuid: String { get }
   var sourceRevision: SourceRevision { get }
   var device: Device? { get }
-  var metadata: AnyMap { get }
-  var metadataExternalUUID: String? { get }
-  var metadataTimeZone: String? { get }
-  var metadataWasUserEntered: Bool? { get }
-  var metadataDeviceSerialNumber: String? { get }
-  var metadataUdiDeviceIdentifier: String? { get }
-  var metadataUdiProductionIdentifier: String? { get }
-  var metadataDigitalSignature: String? { get }
-  var metadataDeviceName: String? { get }
-  var metadataDeviceManufacturerName: String? { get }
-  var metadataSyncIdentifier: String? { get }
-  var metadataSyncVersion: Double? { get }
-  var metadataWasTakenInLab: Bool? { get }
-  var metadataReferenceRangeLowerLimit: Double? { get }
-  var metadataReferenceRangeUpperLimit: Double? { get }
-  var metadataAlgorithmVersion: Double? { get }
 
   // Methods
   func toJSON(key: String?) throws -> WorkoutSample