@kingstinct/react-native-healthkit 13.3.1 → 14.0.0

package/ReactNativeHealthkit.podspec

@@ -35,6 +35,7 @@ Pod::Spec.new do |s|
   load 'nitrogen/generated/ios/ReactNativeHealthkit+autolinking.rb'
   add_nitrogen_files(s)
 
+
   # Workaround for Swift 6.2 (Xcode 26): shared_ptr lost automatic CxxConvertibleToBool conformance,
   # causing nitrogen-generated Bool(fromCxx:) calls to fail. Replace with use_count() > 0.
   # This can be removed once nitrogen fixes the codegen template upstream.

package/app.plugin.ts

@@ -1,6 +1,7 @@
 import {
   type ConfigPlugin,
   createRunOncePlugin,
+  withAppDelegate,
   withEntitlementsPlist,
   withInfoPlist,
   withPlugins,
@@ -8,8 +9,6 @@ import {
 
 import pkg from './package.json'
 
-// please note that the BackgroundConfig currently doesn't actually enable background delivery for any types, but you
-// can set it to false if you don't want the entitlement
 type BackgroundConfig = boolean
 
 type InfoPlistConfig = {
@@ -57,10 +56,49 @@ const withInfoPlistPlugin: ConfigPlugin<InfoPlistConfig> = (config, props) => {
   })
 }
 
+const withAppDelegatePlugin: ConfigPlugin<{
+  background?: BackgroundConfig
+}> = (config, props) => {
+  if (props?.background === false) {
+    return config
+  }
+
+  return withAppDelegate(config, (configDelegate) => {
+    const contents = configDelegate.modResults.contents
+
+    // Add import for HealthKit if not already present
+    if (!contents.includes('import HealthKit')) {
+      configDelegate.modResults.contents =
+        configDelegate.modResults.contents.replace(
+          /^(import .+\n)/m,
+          '$1import HealthKit\n',
+        )
+    }
+
+    // Insert BackgroundDeliveryManager setup into didFinishLaunchingWithOptions
+    const setupCall =
+      '    BackgroundDeliveryManager.shared.setupBackgroundObservers()\n'
+
+    if (
+      !configDelegate.modResults.contents.includes('BackgroundDeliveryManager')
+    ) {
+      // Match the opening of didFinishLaunchingWithOptions and insert after the opening brace
+      configDelegate.modResults.contents =
+        configDelegate.modResults.contents.replace(
+          /(func application\(.+didFinishLaunchingWithOptions.+\{)\n/,
+          `$1\n${setupCall}`,
+        )
+    }
+
+    return configDelegate
+  })
+}
+
 const healthkitAppPlugin: ConfigPlugin<AppPluginConfig> = (config, props) => {
   return withPlugins(config, [
     [withEntitlementsPlugin, props],
     [withInfoPlistPlugin, props],
+    [withAppDelegatePlugin, props],
   ])
 }
 

package/ios/BackgroundDeliveryManager.swift

@@ -0,0 +1,196 @@
+import Foundation
+import HealthKit
+
+/// Manages HealthKit background delivery by registering observer queries at app launch,
+/// before the JS bridge is available. This is required by Apple — observer queries must
+/// be set up in `application(_:didFinishLaunchingWithOptions:)` to receive background
+/// delivery callbacks after the app has been terminated.
+///
+/// Usage from AppDelegate.swift:
+///   BackgroundDeliveryManager.shared.setupBackgroundObservers()
+///
+/// The types to observe are persisted in UserDefaults by `configureBackgroundTypes()`
+/// called from JS. On subsequent cold launches, the manager reads these and registers
+/// observers immediately, queuing any events until JS subscribes via `drainPendingEvents()`.
+@objc public class BackgroundDeliveryManager: NSObject {
+  @objc public static let shared = BackgroundDeliveryManager()
+
+  private let healthStore = HKHealthStore()
+  private let queue = DispatchQueue(label: "com.kingstinct.healthkit.background", attributes: .concurrent)
+  private var observerQueries: [String: HKObserverQuery] = [:]
+  private var pendingEvents: [(typeIdentifier: String, errorMessage: String?)] = []
+  private var jsCallback: ((String, String?) -> Void)?
+  private var isSetUp = false
+
+  static let typesKey = "com.kingstinct.healthkit.backgroundTypes"
+  static let frequencyKey = "com.kingstinct.healthkit.backgroundFrequency"
+
+  private override init() {
+    super.init()
+  }
+
+  /// Call this from AppDelegate.didFinishLaunchingWithOptions to register observer queries
+  /// for any previously configured background delivery types.
+  @objc public func setupBackgroundObservers() {
+    guard HKHealthStore.isHealthDataAvailable() else { return }
+
+    guard let typeIdentifiers = UserDefaults.standard.stringArray(forKey: BackgroundDeliveryManager.typesKey) else {
+      return
+    }
+
+    let frequencyRaw = UserDefaults.standard.integer(forKey: BackgroundDeliveryManager.frequencyKey)
+    let frequency = HKUpdateFrequency(rawValue: frequencyRaw) ?? .immediate
+
+    registerObservers(typeIdentifiers: typeIdentifiers, frequency: frequency)
+  }
+
+  /// Persist types and frequency, then register observers for the current session.
+  /// Called from JS via CoreModule.configureBackgroundTypes().
+  func configure(typeIdentifiers: [String], frequency: HKUpdateFrequency) {
+    UserDefaults.standard.set(typeIdentifiers, forKey: BackgroundDeliveryManager.typesKey)
+    UserDefaults.standard.set(frequency.rawValue, forKey: BackgroundDeliveryManager.frequencyKey)
+
+    // Tear down existing observers before re-registering
+    tearDown()
+    registerObservers(typeIdentifiers: typeIdentifiers, frequency: frequency)
+  }
+
+  /// Subscribe a JS callback. Any events that arrived before JS was ready are flushed immediately.
+  func setCallback(_ callback: @escaping (String, String?) -> Void) {
+    queue.sync(flags: .barrier) {
+      self.jsCallback = callback
+      let events = self.pendingEvents
+      self.pendingEvents = []
+
+      for event in events {
+        callback(event.typeIdentifier, event.errorMessage)
+      }
+    }
+  }
+
+  /// Remove the JS callback (e.g., on teardown).
+  func removeCallback() {
+    queue.sync(flags: .barrier) {
+      self.jsCallback = nil
+    }
+  }
+
+  /// Returns any pending events and clears the queue. Used by CoreModule.subscribeToObserverQuery
+  /// to flush events that arrived before JS subscribed.
+  func drainPendingEvents() -> [(typeIdentifier: String, errorMessage: String?)] {
+    return queue.sync(flags: .barrier) {
+      let events = self.pendingEvents
+      self.pendingEvents = []
+      return events
+    }
+  }
+
+  /// Stop all observer queries and clear state.
+  func tearDown() {
+    queue.sync(flags: .barrier) {
+      for (_, query) in self.observerQueries {
+        self.healthStore.stop(query)
+      }
+      self.observerQueries = [:]
+      self.isSetUp = false
+    }
+  }
+
+  /// Clear persisted configuration (disables background delivery on next launch).
+  func clearConfiguration() {
+    UserDefaults.standard.removeObject(forKey: BackgroundDeliveryManager.typesKey)
+    UserDefaults.standard.removeObject(forKey: BackgroundDeliveryManager.frequencyKey)
+    tearDown()
+  }
+
+  private func registerObservers(typeIdentifiers: [String], frequency: HKUpdateFrequency) {
+    queue.sync(flags: .barrier) {
+      guard !self.isSetUp else { return }
+      self.isSetUp = true
+    }
+
+    for typeIdentifier in typeIdentifiers {
+      guard let sampleType = sampleTypeFromString(typeIdentifier) else {
+        print("[react-native-healthkit] BackgroundDeliveryManager: skipping unrecognized type \(typeIdentifier)")
+        continue
+      }
+
+      // Use nil predicate to catch all samples, including those written while the app was terminated.
+      // The current subscribeToObserverQuery uses Date.init() which misses data from when the app was dead.
+      let query = HKObserverQuery(
+        sampleType: sampleType,
+        predicate: nil
+      ) { [weak self] (_: HKObserverQuery, completionHandler: @escaping HKObserverQueryCompletionHandler, error: Error?) in
+        self?.handleObserverCallback(
+          typeIdentifier: typeIdentifier,
+          error: error
+        )
+        // Must call the completion handler promptly so iOS knows we processed the update.
+        completionHandler()
+      }
+
+      healthStore.execute(query)
+
+      healthStore.enableBackgroundDelivery(for: sampleType, frequency: frequency) { success, error in
+        if let error = error {
+          print("[react-native-healthkit] BackgroundDeliveryManager: enableBackgroundDelivery failed for \(typeIdentifier): \(error.localizedDescription)")
+        } else if !success {
+          print("[react-native-healthkit] BackgroundDeliveryManager: enableBackgroundDelivery returned false for \(typeIdentifier)")
+        }
+      }
+
+      queue.sync(flags: .barrier) {
+        self.observerQueries[typeIdentifier] = query
+      }
+    }
+  }
+
+  private func handleObserverCallback(typeIdentifier: String, error: Error?) {
+    let errorMessage = error?.localizedDescription
+
+    queue.sync(flags: .barrier) {
+      if let callback = self.jsCallback {
+        // JS is connected — dispatch to main thread for JSI safety
+        DispatchQueue.main.async {
+          callback(typeIdentifier, errorMessage)
+        }
+      } else {
+        // JS not ready yet — queue the event for later
+        self.pendingEvents.append((typeIdentifier: typeIdentifier, errorMessage: errorMessage))
+      }
+    }
+  }
+
+  // Local type resolution that doesn't depend on NitroModules (which isn't available at AppDelegate time).
+  // Uses the older factory APIs (quantityType(forIdentifier:) etc.) for iOS 13+ compatibility.
+  private func sampleTypeFromString(_ identifier: String) -> HKSampleType? {
+    if identifier.starts(with: "HKQuantityTypeIdentifier") {
+      let typeId = HKQuantityTypeIdentifier(rawValue: identifier)
+      return HKSampleType.quantityType(forIdentifier: typeId)
+    }
+    if identifier.starts(with: "HKCategoryTypeIdentifier") {
+      let typeId = HKCategoryTypeIdentifier(rawValue: identifier)
+      return HKSampleType.categoryType(forIdentifier: typeId)
+    }
+    if identifier == "HKWorkoutTypeIdentifier" {
+      return HKSampleType.workoutType()
+    }
+    if identifier.starts(with: "HKCorrelationTypeIdentifier") {
+      let typeId = HKCorrelationTypeIdentifier(rawValue: identifier)
+      return HKSampleType.correlationType(forIdentifier: typeId)
+    }
+    if identifier == "HKAudiogramSampleType" {
+      return HKObjectType.audiogramSampleType()
+    }
+    if identifier == "HKDataTypeIdentifierHeartbeatSeries" || identifier == "HKWorkoutRouteTypeIdentifier" {
+      return HKObjectType.seriesType(forIdentifier: identifier)
+    }
+    if identifier == "HKElectrocardiogramType" {
+      if #available(iOS 14.0, *) {
+        return HKSampleType.electrocardiogramType()
+      }
+      return nil
+    }
+    return nil
+  }
+}

package/ios/CategoryTypeModule.swift

@@ -3,7 +3,7 @@ import NitroModules
 
 class CategoryTypeModule: HybridCategoryTypeModuleSpec {
     func saveCategorySample(
-        identifier: CategoryTypeIdentifier,
+        identifier: CategoryTypeIdentifierWriteable,
         value: Double,
         startDate: Date,
         endDate: Date,

package/ios/CoreModule.swift

@@ -430,6 +430,30 @@ class CoreModule: HybridCoreModuleSpec {
     }
   }
 
+  func configureBackgroundTypes(
+    typeIdentifiers: [String], updateFrequency: UpdateFrequency
+  ) -> Promise<Bool> {
+    return Promise.async {
+      guard let frequency = HKUpdateFrequency(rawValue: Int(updateFrequency.rawValue)) else {
+        throw runtimeErrorWithPrefix("Invalid update frequency rawValue: \(updateFrequency)")
+      }
+
+      BackgroundDeliveryManager.shared.configure(
+        typeIdentifiers: typeIdentifiers,
+        frequency: frequency
+      )
+
+      return true
+    }
+  }
+
+  func clearBackgroundTypes() -> Promise<Bool> {
+    return Promise.async {
+      BackgroundDeliveryManager.shared.clearConfiguration()
+      return true
+    }
+  }
+
   func unsubscribeQueries(queryIds: [String]) -> Double {
     let successCounts = queryIds.map { queryId in
       if let query = self._runningQueries[queryId] {

package/ios/CorrelationTypeModule.swift

@@ -24,47 +24,14 @@ func serializeCorrelationSample(correlation: HKCorrelation, unitMap: [HKQuantity
   return CorrelationSample(
     correlationType: CorrelationTypeIdentifier(fromString: correlation.correlationType.identifier)!,
     objects: objects,
-    metadataFoodType: correlation.metadata?[HKMetadataKeyFoodType] as? String,
     sampleType: serializeSampleType(correlation.sampleType),
     startDate: correlation.startDate,
     endDate: correlation.endDate,
     hasUndeterminedDuration: correlation.hasUndeterminedDuration,
-
-    metadataWeatherCondition: serializeWeatherCondition(
-      correlation.metadata?[HKMetadataKeyWeatherCondition] as? HKWeatherCondition),
-    metadataWeatherHumidity: serializeUnknownQuantityTyped(
-      quantity: correlation.metadata?[HKMetadataKeyWeatherHumidity] as? HKQuantity),
-    metadataWeatherTemperature: serializeUnknownQuantityTyped(
-      quantity: correlation.metadata?[HKMetadataKeyWeatherTemperature] as? HKQuantity),
-    metadataInsulinDeliveryReason: serializeInsulinDeliveryReason(
-      correlation.metadata?[HKMetadataKeyInsulinDeliveryReason] as? HKInsulinDeliveryReason),
-    metadataHeartRateMotionContext: serializeHeartRateMotionContext(
-      correlation.metadata?[HKMetadataKeyHeartRateMotionContext] as? HKHeartRateMotionContext),
-
+    metadata: serializeMetadata(correlation.metadata),
     uuid: correlation.uuid.uuidString,
     sourceRevision: serializeSourceRevision(correlation.sourceRevision),
-    device: serializeDevice(hkDevice: correlation.device),
-    metadata: serializeMetadata(correlation.metadata),
-
-    metadataExternalUUID: correlation.metadata?[HKMetadataKeyExternalUUID] as? String,
-    metadataTimeZone: correlation.metadata?[HKMetadataKeyTimeZone] as? String,
-    metadataWasUserEntered: correlation.metadata?[HKMetadataKeyWasUserEntered] as? Bool,
-    metadataDeviceSerialNumber: correlation.metadata?[HKMetadataKeyDeviceSerialNumber] as? String,
-    metadataUdiDeviceIdentifier: correlation.metadata?[HKMetadataKeyUDIDeviceIdentifier] as? String,
-    metadataUdiProductionIdentifier: correlation.metadata?[HKMetadataKeyUDIProductionIdentifier]
-      as? String,
-    metadataDigitalSignature: correlation.metadata?[HKMetadataKeyDigitalSignature] as? String,
-    metadataDeviceName: correlation.metadata?[HKMetadataKeyDeviceName] as? String,
-    metadataDeviceManufacturerName: correlation.metadata?[HKMetadataKeyDeviceManufacturerName]
-      as? String,
-    metadataSyncIdentifier: correlation.metadata?[HKMetadataKeySyncIdentifier] as? String,
-    metadataSyncVersion: correlation.metadata?[HKMetadataKeySyncVersion] as? Double,
-    metadataWasTakenInLab: correlation.metadata?[HKMetadataKeyWasTakenInLab] as? Bool,
-    metadataReferenceRangeLowerLimit: correlation.metadata?[HKMetadataKeyReferenceRangeLowerLimit]
-      as? Double,
-    metadataReferenceRangeUpperLimit: correlation.metadata?[HKMetadataKeyReferenceRangeUpperLimit]
-      as? Double,
-    metadataAlgorithmVersion: correlation.metadata?[HKMetadataKeyAlgorithmVersion] as? Double
+    device: serializeDevice(hkDevice: correlation.device)
   )
 }
 

package/ios/ElectrocardiogramModule.swift

@@ -38,42 +38,10 @@ private func serializeECGSample(sample: HKElectrocardiogram, includeVoltages: Bo
     startDate: sample.startDate,
     endDate: sample.endDate,
     hasUndeterminedDuration: sample.hasUndeterminedDuration,
-
-    metadataWeatherCondition: serializeWeatherCondition(
-      sample.metadata?[HKMetadataKeyWeatherCondition] as? HKWeatherCondition),
-    metadataWeatherHumidity: serializeUnknownQuantityTyped(
-      quantity: sample.metadata?[HKMetadataKeyWeatherHumidity] as? HKQuantity),
-    metadataWeatherTemperature: serializeUnknownQuantityTyped(
-      quantity: sample.metadata?[HKMetadataKeyWeatherTemperature] as? HKQuantity),
-    metadataInsulinDeliveryReason: serializeInsulinDeliveryReason(
-      sample.metadata?[HKMetadataKeyInsulinDeliveryReason] as? HKInsulinDeliveryReason),
-    metadataHeartRateMotionContext: serializeHeartRateMotionContext(
-      sample.metadata?[HKMetadataKeyHeartRateMotionContext] as? HKHeartRateMotionContext),
-
+    metadata: serializeMetadata(sample.metadata),
     uuid: sample.uuid.uuidString,
     sourceRevision: serializeSourceRevision(sample.sourceRevision),
-    device: serializeDevice(hkDevice: sample.device),
-    metadata: serializeMetadata(sample.metadata),
-
-    metadataExternalUUID: sample.metadata?[HKMetadataKeyExternalUUID] as? String,
-    metadataTimeZone: sample.metadata?[HKMetadataKeyTimeZone] as? String,
-    metadataWasUserEntered: sample.metadata?[HKMetadataKeyWasUserEntered] as? Bool,
-    metadataDeviceSerialNumber: sample.metadata?[HKMetadataKeyDeviceSerialNumber] as? String,
-    metadataUdiDeviceIdentifier: sample.metadata?[HKMetadataKeyUDIDeviceIdentifier] as? String,
-    metadataUdiProductionIdentifier: sample.metadata?[HKMetadataKeyUDIProductionIdentifier]
-      as? String,
-    metadataDigitalSignature: sample.metadata?[HKMetadataKeyDigitalSignature] as? String,
-    metadataDeviceName: sample.metadata?[HKMetadataKeyDeviceName] as? String,
-    metadataDeviceManufacturerName: sample.metadata?[HKMetadataKeyDeviceManufacturerName]
-      as? String,
-    metadataSyncIdentifier: sample.metadata?[HKMetadataKeySyncIdentifier] as? String,
-    metadataSyncVersion: sample.metadata?[HKMetadataKeySyncVersion] as? Double,
-    metadataWasTakenInLab: sample.metadata?[HKMetadataKeyWasTakenInLab] as? Bool,
-    metadataReferenceRangeLowerLimit: sample.metadata?[HKMetadataKeyReferenceRangeLowerLimit]
-      as? Double,
-    metadataReferenceRangeUpperLimit: sample.metadata?[HKMetadataKeyReferenceRangeUpperLimit]
-      as? Double,
-    metadataAlgorithmVersion: sample.metadata?[HKMetadataKeyAlgorithmVersion] as? Double
+    device: serializeDevice(hkDevice: sample.device)
   )
 }
 

package/ios/HeartbeatSeriesModule.swift

@@ -11,42 +11,10 @@ func serializeHeartbeatSeriesSample(sample: HKHeartbeatSeriesSample) async throw
     startDate: sample.startDate,
     endDate: sample.endDate,
     hasUndeterminedDuration: sample.hasUndeterminedDuration,
-
-    metadataWeatherCondition: serializeWeatherCondition(
-      sample.metadata?[HKMetadataKeyWeatherCondition] as? HKWeatherCondition),
-    metadataWeatherHumidity: serializeUnknownQuantityTyped(
-      quantity: sample.metadata?[HKMetadataKeyWeatherHumidity] as? HKQuantity),
-    metadataWeatherTemperature: serializeUnknownQuantityTyped(
-      quantity: sample.metadata?[HKMetadataKeyWeatherTemperature] as? HKQuantity),
-    metadataInsulinDeliveryReason: serializeInsulinDeliveryReason(
-      sample.metadata?[HKMetadataKeyInsulinDeliveryReason] as? HKInsulinDeliveryReason),
-    metadataHeartRateMotionContext: serializeHeartRateMotionContext(
-      sample.metadata?[HKMetadataKeyHeartRateMotionContext] as? HKHeartRateMotionContext),
-
+    metadata: serializeMetadata(sample.metadata),
     uuid: sample.uuid.uuidString,
     sourceRevision: serializeSourceRevision(sample.sourceRevision),
-    device: serializeDevice(hkDevice: sample.device),
-    metadata: serializeMetadata(sample.metadata),
-
-    metadataExternalUUID: sample.metadata?[HKMetadataKeyExternalUUID] as? String,
-    metadataTimeZone: sample.metadata?[HKMetadataKeyTimeZone] as? String,
-    metadataWasUserEntered: sample.metadata?[HKMetadataKeyWasUserEntered] as? Bool,
-    metadataDeviceSerialNumber: sample.metadata?[HKMetadataKeyDeviceSerialNumber] as? String,
-    metadataUdiDeviceIdentifier: sample.metadata?[HKMetadataKeyUDIDeviceIdentifier] as? String,
-    metadataUdiProductionIdentifier: sample.metadata?[HKMetadataKeyUDIProductionIdentifier]
-      as? String,
-    metadataDigitalSignature: sample.metadata?[HKMetadataKeyDigitalSignature] as? String,
-    metadataDeviceName: sample.metadata?[HKMetadataKeyDeviceName] as? String,
-    metadataDeviceManufacturerName: sample.metadata?[HKMetadataKeyDeviceManufacturerName]
-      as? String,
-    metadataSyncIdentifier: sample.metadata?[HKMetadataKeySyncIdentifier] as? String,
-    metadataSyncVersion: sample.metadata?[HKMetadataKeySyncVersion] as? Double,
-    metadataWasTakenInLab: sample.metadata?[HKMetadataKeyWasTakenInLab] as? Bool,
-    metadataReferenceRangeLowerLimit: sample.metadata?[HKMetadataKeyReferenceRangeLowerLimit]
-      as? Double,
-    metadataReferenceRangeUpperLimit: sample.metadata?[HKMetadataKeyReferenceRangeUpperLimit]
-      as? Double,
-    metadataAlgorithmVersion: sample.metadata?[HKMetadataKeyAlgorithmVersion] as? Double
+    device: serializeDevice(hkDevice: sample.device)
   )
 }
 

package/ios/MedicationModule.swift

@@ -97,21 +97,6 @@ import NitroModules
       startDate: sample.startDate,
       endDate: sample.endDate,
       hasUndeterminedDuration: sample.hasUndeterminedDuration,
-
-      metadataWeatherCondition: serializeWeatherCondition(
-        sample.metadata?[HKMetadataKeyWeatherCondition] as? HKWeatherCondition),
-      metadataWeatherHumidity: serializeUnknownQuantityTyped(
-        quantity: sample.metadata?[HKMetadataKeyWeatherHumidity] as? HKQuantity),
-      metadataWeatherTemperature: serializeUnknownQuantityTyped(
-        quantity: sample.metadata?[HKMetadataKeyWeatherTemperature] as? HKQuantity),
-      metadataInsulinDeliveryReason: serializeInsulinDeliveryReason(
-        sample.metadata?[HKMetadataKeyInsulinDeliveryReason] as? HKInsulinDeliveryReason),
-      metadataHeartRateMotionContext: serializeHeartRateMotionContext(
-        sample.metadata?[HKMetadataKeyHeartRateMotionContext] as? HKHeartRateMotionContext),
-
-      uuid: sample.uuid.uuidString,
-      sourceRevision: serializeSourceRevision(sample.sourceRevision),
-      device: serializeDevice(hkDevice: sample.device),
       metadata: {
         var meta = serializeMetadata(sample.metadata)
         if let nick = info?.nickname {
@@ -119,26 +104,9 @@ import NitroModules
         }
         return meta
       }(),
-
-      metadataExternalUUID: sample.metadata?[HKMetadataKeyExternalUUID] as? String,
-      metadataTimeZone: sample.metadata?[HKMetadataKeyTimeZone] as? String,
-      metadataWasUserEntered: sample.metadata?[HKMetadataKeyWasUserEntered] as? Bool,
-      metadataDeviceSerialNumber: sample.metadata?[HKMetadataKeyDeviceSerialNumber] as? String,
-      metadataUdiDeviceIdentifier: sample.metadata?[HKMetadataKeyUDIDeviceIdentifier] as? String,
-      metadataUdiProductionIdentifier: sample.metadata?[HKMetadataKeyUDIProductionIdentifier]
-        as? String,
-      metadataDigitalSignature: sample.metadata?[HKMetadataKeyDigitalSignature] as? String,
-      metadataDeviceName: sample.metadata?[HKMetadataKeyDeviceName] as? String,
-      metadataDeviceManufacturerName: sample.metadata?[HKMetadataKeyDeviceManufacturerName]
-        as? String,
-      metadataSyncIdentifier: sample.metadata?[HKMetadataKeySyncIdentifier] as? String,
-      metadataSyncVersion: sample.metadata?[HKMetadataKeySyncVersion] as? Double,
-      metadataWasTakenInLab: sample.metadata?[HKMetadataKeyWasTakenInLab] as? Bool,
-      metadataReferenceRangeLowerLimit: sample.metadata?[HKMetadataKeyReferenceRangeLowerLimit]
-        as? Double,
-      metadataReferenceRangeUpperLimit: sample.metadata?[HKMetadataKeyReferenceRangeUpperLimit]
-        as? Double,
-      metadataAlgorithmVersion: sample.metadata?[HKMetadataKeyAlgorithmVersion] as? Double
+      uuid: sample.uuid.uuidString,
+      sourceRevision: serializeSourceRevision(sample.sourceRevision),
+      device: serializeDevice(hkDevice: sample.device)
     )
   }
 

package/ios/PredicateHelpers.swift

@@ -71,10 +71,10 @@ func getPredicateForWorkoutBase(_ filter: FilterForWorkouts?) -> FilterForWorkou
     return FilterForWorkoutsBase(
       workoutActivityType: filter.workoutActivityType,
       duration: filter.duration,
-      sources: filter.sources,
+      metadata: filter.metadata,
       uuid: filter.uuid,
+      sources: filter.sources,
       uuids: filter.uuids,
-      metadata: filter.metadata,
       date: filter.date,
     )
   }

package/ios/QuantityTypeModule.swift

@@ -19,7 +19,7 @@ func emptyStatisticsResponse(from: Date?, to: Date?) -> QueryStatisticsResponse
 func queryStatisticsForQuantityInternal(
   quantityType: HKQuantityType,
   statistics: [StatisticsOptions],
-  options: StatisticsQueryOptions?
+  options: StatisticsQueryOptionsWithStringUnit?
 ) async throws -> HKStatistics? {
   let predicate = createPredicateForSamples(options?.filter)
 
@@ -128,7 +128,7 @@ func queryStatisticsCollectionForQuantityInternal(
   statistics: [StatisticsOptions],
   anchorDate: Date,
   intervalComponents: IntervalComponents,
-  options: StatisticsQueryOptions?
+  options: StatisticsQueryOptionsWithStringUnit?
 ) async throws -> HKStatisticsCollection? {
   let predicate = createPredicateForSamples(options?.filter)
 
@@ -245,15 +245,15 @@ func serializeStatisticsPerSource(gottenStats: HKStatistics, unit: HKUnit)
 
       return QueryStatisticsResponseFromSingleSource(
         source: serializeSource(source),
+        startDate: gottenStats.startDate,
+        endDate: gottenStats.endDate,
         duration: duration,
         averageQuantity: averageQuantity,
         maximumQuantity: maximumQuantity,
         minimumQuantity: minimumQuantity,
         sumQuantity: sumQuantity,
         mostRecentQuantity: mostRecentQuantity,
-        mostRecentQuantityDateInterval: mostRecentQuantityDateInterval,
-        startDate: gottenStats.startDate,
-        endDate: gottenStats.endDate
+        mostRecentQuantityDateInterval: mostRecentQuantityDateInterval
       )
     }
   }
@@ -308,7 +308,7 @@ func handleHKNoDataOrThrow<T>(
 class QuantityTypeModule: HybridQuantityTypeModuleSpec {
   func queryStatisticsForQuantitySeparateBySource(
     identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions],
-    options: StatisticsQueryOptions?
+    options: StatisticsQueryOptionsWithStringUnit?
   ) -> Promise<[QueryStatisticsResponseFromSingleSource]> {
     return Promise.async {
       let quantityType = try initializeQuantityType(identifier.stringValue)
@@ -331,7 +331,7 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
 
   func queryStatisticsCollectionForQuantitySeparateBySource(
     identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions], anchorDate: Date,
-    intervalComponents: IntervalComponents, options: StatisticsQueryOptions?
+    intervalComponents: IntervalComponents, options: StatisticsQueryOptionsWithStringUnit?
   ) -> Promise<[QueryStatisticsResponseFromSingleSource]> {
     return Promise.async {
       let quantityType = try initializeQuantityType(identifier.stringValue)
@@ -380,7 +380,7 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
   func queryStatisticsForQuantity(
     identifier: QuantityTypeIdentifier,
     statistics: [StatisticsOptions],
-    options: StatisticsQueryOptions?
+    options: StatisticsQueryOptionsWithStringUnit?
   ) -> Promise<QueryStatisticsResponse> {
     return Promise.async {
       let quantityType = try initializeQuantityType(identifier.stringValue)
@@ -407,7 +407,7 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
 
   func queryStatisticsCollectionForQuantity(
     identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions], anchorDate: Date,
-    intervalComponents: IntervalComponents, options: StatisticsQueryOptions?
+    intervalComponents: IntervalComponents, options: StatisticsQueryOptionsWithStringUnit?
   ) -> Promise<[QueryStatisticsResponse]> {
     return Promise.async {
       let quantityType = try initializeQuantityType(identifier.stringValue)
@@ -434,7 +434,7 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
   }
 
   func queryQuantitySamplesWithAnchor(
-    identifier: QuantityTypeIdentifier, options: QueryOptionsWithAnchorAndUnit
+    identifier: QuantityTypeIdentifier, options: QueryOptionsWithAnchorAndStringUnit
   ) -> Promise<QuantitySamplesWithAnchorResponse> {
     return Promise.async {
       let quantityType = try initializeQuantityType(identifier.stringValue)
@@ -505,7 +505,7 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
   }
 
   func queryQuantitySamples(
-    identifier: QuantityTypeIdentifier, options: QueryOptionsWithSortOrderAndUnit
+    identifier: QuantityTypeIdentifier, options: QueryOptionsWithSortOrderAndStringUnit
   ) -> Promise<[QuantitySample]> {
     return Promise.async {
       let quantityType = try initializeQuantityType(identifier.stringValue)