@kingstinct/react-native-healthkit 8.4.0 → 8.5.0

package/ios/Helpers.swift

@@ -18,7 +18,8 @@ func limitOrNilIfZero(limit: Int) -> Int {
 
 func createPredicate(from: Date?, to: Date?) -> NSPredicate? {
     if from != nil || to != nil {
-        return HKQuery.predicateForSamples(withStart: from, end: to, options: [.strictEndDate, .strictStartDate])
+        return HKQuery.predicateForSamples(
+            withStart: from, end: to, options: [.strictEndDate, .strictStartDate])
     } else {
         return nil
     }
@@ -29,23 +30,23 @@ func getSortDescriptors(ascending: Bool) -> [NSSortDescriptor] {
 }
 
 func base64StringToHKQueryAnchor(base64String: String) -> HKQueryAnchor? {
-  // Step 1: Decode the base64 string to a Data object
-  guard let data = Data(base64Encoded: base64String) else {
-      print("Error: Invalid base64 string")
-      return nil
-  }
-
-  // Step 2: Use NSKeyedUnarchiver to unarchive the data and create an HKQueryAnchor object
-  do {
-      let unarchiver = try NSKeyedUnarchiver(forReadingFrom: data)
-      unarchiver.requiresSecureCoding = true
-      let anchor = try? NSKeyedUnarchiver.unarchiveTopLevelObjectWithData(data)
-
-      return anchor as? HKQueryAnchor
-  } catch {
-      print("Error: Unable to unarchive HKQueryAnchor object: \(error)")
-      return nil
-  }
+    // Step 1: Decode the base64 string to a Data object
+    guard let data = Data(base64Encoded: base64String) else {
+        print("Error: Invalid base64 string")
+        return nil
+    }
+
+    // Step 2: Use NSKeyedUnarchiver to unarchive the data and create an HKQueryAnchor object
+    do {
+        let unarchiver = try NSKeyedUnarchiver(forReadingFrom: data)
+        unarchiver.requiresSecureCoding = true
+        let anchor = try? NSKeyedUnarchiver.unarchiveTopLevelObjectWithData(data)
+
+        return anchor as? HKQueryAnchor
+    } catch {
+        print("Error: Unable to unarchive HKQueryAnchor object: \(error)")
+        return nil
+    }
 }
 
 func sampleTypeFromString(typeIdentifier: String) -> HKSampleType? {
@@ -102,7 +103,7 @@ func sampleTypesFromDictionary(typeIdentifiers: NSDictionary) -> Set<HKSampleTyp
         if item.value as! Bool {
             let sampleType = sampleTypeFromString(typeIdentifier: item.key as! String)
             if sampleType != nil {
-             share.insert(sampleType!)
+                share.insert(sampleType!)
             }
         }
     }
@@ -134,11 +135,13 @@ func objectTypeFromString(typeIdentifier: String) -> HKObjectType? {
         return HKObjectType.activitySummaryType()
     }
 
-    if #available(iOS 18, *) {
-      if typeIdentifier == HKStateOfMindTypeIdentifier {
-        return HKObjectType.stateOfMindType()
-      }
-    }
+    #if compiler(>=6)
+        if #available(iOS 18, *) {
+            if typeIdentifier == HKStateOfMindTypeIdentifier {
+                return HKObjectType.stateOfMindType()
+            }
+        }
+    #endif
 
     if #available(iOS 13, *) {
         if typeIdentifier == HKAudiogramTypeIdentifier {
@@ -223,23 +226,24 @@ func serializeQuantityIfExists(unit: HKUnit, quantity: HKQuantity?) -> [String:
     return serializeQuantity(unit: unit, quantity: quantity)
 }
 
-func serializeStatisticIfExists(unit: HKUnit, quantity: HKQuantity?, stats: HKStatistics) -> [String: Any]? {
+func serializeStatisticIfExists(unit: HKUnit, quantity: HKQuantity?, stats: HKStatistics)
+    -> [String: Any]? {
     guard let quantity = quantity else { return nil }
     return serializeStatistic(unit: unit, quantity: quantity, stats: stats)
 }
 
 func parseWorkoutConfiguration(_ dict: NSDictionary) -> HKWorkoutConfiguration {
-  let configuration = HKWorkoutConfiguration()
+    let configuration = HKWorkoutConfiguration()
 
-  if let activityTypeRaw = dict[HKWorkoutActivityTypePropertyName] as? UInt,
-     let activityType = HKWorkoutActivityType(rawValue: activityTypeRaw) {
-    configuration.activityType = activityType
-  }
+    if let activityTypeRaw = dict[HKWorkoutActivityTypePropertyName] as? UInt,
+        let activityType = HKWorkoutActivityType(rawValue: activityTypeRaw) {
+        configuration.activityType = activityType
+    }
 
-  if let locationTypeRaw = dict[HKWorkoutSessionLocationTypePropertyName] as? Int,
-     let locationType = HKWorkoutSessionLocationType(rawValue: locationTypeRaw) {
-    configuration.locationType = locationType
-  }
+    if let locationTypeRaw = dict[HKWorkoutSessionLocationTypePropertyName] as? Int,
+        let locationType = HKWorkoutSessionLocationType(rawValue: locationTypeRaw) {
+        configuration.locationType = locationType
+    }
 
-  return configuration
+    return configuration
 }

package/ios/ReactNativeHealthkit.swift

@@ -1,8 +1,8 @@
-import HealthKit
 import CoreLocation
+import HealthKit
 
 #if canImport(WorkoutKit)
-import WorkoutKit
+  import WorkoutKit
 #endif
 
 @objc(ReactNativeHealthkit)
@@ -87,10 +87,11 @@ class ReactNativeHealthkit: RCTEventEmitter {
     let share = sampleTypesFromDictionary(typeIdentifiers: toShare)
     let toRead = objectTypesFromDictionary(typeIdentifiers: read)
 
-    store.getRequestStatusForAuthorization(toShare: share, read: toRead) { (
-      status: HKAuthorizationRequestStatus,
-      error: Error?
-    ) in
+    store.getRequestStatusForAuthorization(toShare: share, read: toRead) {
+      (
+        status: HKAuthorizationRequestStatus,
+        error: Error?
+      ) in
       guard let err = error else {
         return resolve(status.rawValue)
       }
@@ -116,7 +117,8 @@ class ReactNativeHealthkit: RCTEventEmitter {
       }
     }
 
-    store.preferredUnits(for: quantityTypes) { (typePerUnits: [HKQuantityType: HKUnit], _: Error?) in
+    store.preferredUnits(for: quantityTypes) {
+      (typePerUnits: [HKQuantityType: HKUnit], _: Error?) in
       let dic: NSMutableDictionary = NSMutableDictionary()
 
       for typePerUnit in typePerUnits {
@@ -291,7 +293,8 @@ class ReactNativeHealthkit: RCTEventEmitter {
 
     let samplePredicate = HKQuery.predicateForObject(with: sampleUuid)
 
-    store.deleteObjects(of: sampleType, predicate: samplePredicate) { (success: Bool, _: Int, error: Error?) in
+    store.deleteObjects(of: sampleType, predicate: samplePredicate) {
+      (success: Bool, _: Int, error: Error?) in
       guard let err = error else {
         return resolve(success)
       }
@@ -323,7 +326,8 @@ class ReactNativeHealthkit: RCTEventEmitter {
       options: HKQueryOptions.strictStartDate
     )
 
-    store.deleteObjects(of: sampleType, predicate: samplePredicate) { (success: Bool, _: Int, error: Error?) in
+    store.deleteObjects(of: sampleType, predicate: samplePredicate) {
+      (success: Bool, _: Int, error: Error?) in
       guard let err = error else {
         return resolve(success)
       }
@@ -421,7 +425,9 @@ class ReactNativeHealthkit: RCTEventEmitter {
     }
 
     guard let type = HKWorkoutActivityType.init(rawValue: typeIdentifier) else {
-      return reject(TYPE_IDENTIFIER_ERROR, "Failed to initialize HKWorkoutActivityType " + typeIdentifier.description, nil)
+      return reject(
+        TYPE_IDENTIFIER_ERROR,
+        "Failed to initialize HKWorkoutActivityType " + typeIdentifier.description, nil)
     }
 
     // if start and end both exist,  ensure that start date is before end date
@@ -572,13 +578,14 @@ class ReactNativeHealthkit: RCTEventEmitter {
     var clLocations: [CLLocation] = []
     for location in locations {
       guard let latitude = location["latitude"] as? CLLocationDegrees,
-            let longitude = location["longitude"] as? CLLocationDegrees,
-            let altitude = location["altitude"] as? CLLocationDistance,
-            let horizontalAccuracy = location["horizontalAccuracy"] as? CLLocationAccuracy,
-            let verticalAccuracy = location["verticalAccuracy"] as? CLLocationAccuracy,
-            let course = location["course"] as? CLLocationDirection,
-            let speed = location["speed"] as? CLLocationSpeed,
-            let timestamp = location["timestamp"] as? String else {
+        let longitude = location["longitude"] as? CLLocationDegrees,
+        let altitude = location["altitude"] as? CLLocationDistance,
+        let horizontalAccuracy = location["horizontalAccuracy"] as? CLLocationAccuracy,
+        let verticalAccuracy = location["verticalAccuracy"] as? CLLocationAccuracy,
+        let course = location["course"] as? CLLocationDirection,
+        let speed = location["speed"] as? CLLocationSpeed,
+        let timestamp = location["timestamp"] as? String
+      else {
         continue
       }
 
@@ -698,7 +705,7 @@ class ReactNativeHealthkit: RCTEventEmitter {
       return reject("UpdateFrequency not valid", "UpdateFrequency not valid", nil)
     }
 
-    store.enableBackgroundDelivery(for: sampleType, frequency: frequency ) { (success, error) in
+    store.enableBackgroundDelivery(for: sampleType, frequency: frequency) { (success, error) in
       guard let err = error else {
         return resolve(success)
       }
@@ -767,13 +774,17 @@ class ReactNativeHealthkit: RCTEventEmitter {
 
     let queryId = UUID().uuidString
 
-    func responder(query: HKObserverQuery, handler: @escaping HKObserverQueryCompletionHandler, error: Error?) {
+    func responder(
+      query: HKObserverQuery, handler: @escaping HKObserverQueryCompletionHandler, error: Error?
+    ) {
       if error == nil {
         DispatchQueue.main.async {
           if self.bridge != nil && self.bridge.isValid {
-            self.sendEvent(withName: "onChange", body: [
-              "typeIdentifier": typeIdentifier
-            ])
+            self.sendEvent(
+              withName: "onChange",
+              body: [
+                "typeIdentifier": typeIdentifier
+              ])
           }
 
         }
@@ -784,7 +795,9 @@ class ReactNativeHealthkit: RCTEventEmitter {
     let query = HKObserverQuery(
       sampleType: sampleType,
       predicate: predicate
-    ) { (query: HKObserverQuery, handler: @escaping HKObserverQueryCompletionHandler, error: Error?) in
+    ) {
+      (query: HKObserverQuery, handler: @escaping HKObserverQueryCompletionHandler, error: Error?)
+      in
       guard let err = error else {
         return responder(query: query, handler: handler, error: error)
       }
@@ -894,34 +907,38 @@ class ReactNativeHealthkit: RCTEventEmitter {
 
       let unit = HKUnit.init(from: unitString)
       if let averageQuantity = gottenStats.averageQuantity() {
-        dic.updateValue(serializeQuantity(unit: unit, quantity: averageQuantity), forKey: "averageQuantity")
+        dic.updateValue(
+          serializeQuantity(unit: unit, quantity: averageQuantity), forKey: "averageQuantity")
       }
       if let maximumQuantity = gottenStats.maximumQuantity() {
-        dic.updateValue(serializeQuantity(unit: unit, quantity: maximumQuantity), forKey: "maximumQuantity")
+        dic.updateValue(
+          serializeQuantity(unit: unit, quantity: maximumQuantity), forKey: "maximumQuantity")
       }
       if let minimumQuantity = gottenStats.minimumQuantity() {
-        dic.updateValue(serializeQuantity(unit: unit, quantity: minimumQuantity), forKey: "minimumQuantity")
+        dic.updateValue(
+          serializeQuantity(unit: unit, quantity: minimumQuantity), forKey: "minimumQuantity")
       }
       if let sumQuantity = gottenStats.sumQuantity() {
         dic.updateValue(serializeQuantity(unit: unit, quantity: sumQuantity), forKey: "sumQuantity")
       }
       if #available(iOS 12, *) {
         if let mostRecent = gottenStats.mostRecentQuantity() {
-          dic.updateValue(serializeQuantity(unit: unit, quantity: mostRecent), forKey: "mostRecentQuantity")
+          dic.updateValue(
+            serializeQuantity(unit: unit, quantity: mostRecent), forKey: "mostRecentQuantity")
         }
 
         if let mostRecentDateInterval = gottenStats.mostRecentQuantityDateInterval() {
-          dic.updateValue([
-            "start": self._dateFormatter.string(from: mostRecentDateInterval.start),
-            "end": self._dateFormatter.string(from: mostRecentDateInterval.end)
-          ], forKey: "mostRecentQuantityDateInterval")
+          dic.updateValue(
+            [
+              "start": self._dateFormatter.string(from: mostRecentDateInterval.start),
+              "end": self._dateFormatter.string(from: mostRecentDateInterval.end)
+            ], forKey: "mostRecentQuantityDateInterval")
         }
       }
       if #available(iOS 13, *) {
         let durationUnit = HKUnit.second()
-        if let duration = gottenStats.duration() {
-          dic.updateValue(serializeQuantity(unit: durationUnit, quantity: duration), forKey: "duration")
-        }
+        dic["duration"] = serializeQuantityIfExists(
+          unit: durationUnit, quantity: gottenStats.duration())
       }
 
       resolve(dic)
@@ -930,83 +947,97 @@ class ReactNativeHealthkit: RCTEventEmitter {
     store.execute(query)
   }
 
-  @objc(queryStatisticsCollectionForQuantity:unitString:options:anchorDate:interval:startDate:endDate:resolve:reject:)
+  @objc(
+    queryStatisticsCollectionForQuantity:unitString:options:anchorDate:interval:startDate:endDate:
+    resolve:reject:
+  )
   func queryStatisticsCollectionForQuantity(
-      typeIdentifier: String,
-      unitString: String,
-      options: NSArray,
-      anchorDate: Date,
-      interval: NSDictionary,
-      startDate: Date,
-      endDate: Date,
-      resolve: @escaping RCTPromiseResolveBlock,
-      reject: @escaping RCTPromiseRejectBlock
+    typeIdentifier: String,
+    unitString: String,
+    options: NSArray,
+    anchorDate: Date,
+    interval: NSDictionary,
+    startDate: Date,
+    endDate: Date,
+    resolve: @escaping RCTPromiseResolveBlock,
+    reject: @escaping RCTPromiseRejectBlock
   ) {
-      guard let store = _store else {
-          return reject(INIT_ERROR, INIT_ERROR_MESSAGE, nil)
-      }
-
-      guard let quantityType = HKObjectType.quantityType(forIdentifier: HKQuantityTypeIdentifier(rawValue: typeIdentifier)) else {
-          return reject(TYPE_IDENTIFIER_ERROR, "Failed to initialize quantity type for identifier: \(typeIdentifier)", nil)
-      }
-
-      let opts = hkStatisticsOptionsFromOptions(options)
-      let intervalComponents = componentsFromInterval(interval)
+    guard let store = _store else {
+      return reject(INIT_ERROR, INIT_ERROR_MESSAGE, nil)
+    }
 
-      let query = HKStatisticsCollectionQuery(
-          quantityType: quantityType,
-          quantitySamplePredicate: nil, // We will use enumerateStatistics to filter with date
-          options: opts,
-          anchorDate: anchorDate,
-          intervalComponents: intervalComponents
-      )
+    guard
+      let quantityType = HKObjectType.quantityType(
+        forIdentifier: HKQuantityTypeIdentifier(rawValue: typeIdentifier))
+    else {
+      return reject(
+        TYPE_IDENTIFIER_ERROR,
+        "Failed to initialize quantity type for identifier: \(typeIdentifier)", nil)
+    }
 
-      query.initialResultsHandler = { _, statsCollection, error in
-          if let error = error {
-              return reject(QUERY_ERROR, error.localizedDescription, error)
-          }
+    let opts = hkStatisticsOptionsFromOptions(options)
+    let intervalComponents = componentsFromInterval(interval)
 
-          var results = [[String: [String: Any]?]]()
+    let query = HKStatisticsCollectionQuery(
+      quantityType: quantityType,
+      quantitySamplePredicate: nil,  // We will use enumerateStatistics to filter with date
+      options: opts,
+      anchorDate: anchorDate,
+      intervalComponents: intervalComponents
+    )
 
-          guard let collection = statsCollection else {
-              return resolve(results)
-          }
+    query.initialResultsHandler = { _, statsCollection, error in
+      if let error = error {
+        return reject(QUERY_ERROR, error.localizedDescription, error)
+      }
 
-          let unit = HKUnit(from: unitString)
+      var results = [[String: [String: Any]?]]()
 
-          collection.enumerateStatistics(from: startDate, to: endDate) { stats, _ in
-              var dic = [String: [String: Any]?]()
+      guard let collection = statsCollection else {
+        return resolve(results)
+      }
 
-              let startDate = self._dateFormatter.string(from: stats.startDate)
-              let endDate = self._dateFormatter.string(from: stats.endDate)
+      let unit = HKUnit(from: unitString)
 
-              dic["averageQuantity"] = serializeQuantityIfExists(unit: unit, quantity: stats.averageQuantity())
-              dic["maximumQuantity"] = serializeQuantityIfExists(unit: unit, quantity: stats.maximumQuantity())
-              dic["minimumQuantity"] = serializeQuantityIfExists(unit: unit, quantity: stats.minimumQuantity())
-              dic["sumQuantity"] = serializeStatisticIfExists(unit: unit, quantity: stats.sumQuantity(), stats: stats)
+      collection.enumerateStatistics(from: startDate, to: endDate) { stats, _ in
+        var dic = [String: [String: Any]?]()
 
-              if #available(iOS 12, *) {
-                  dic["mostRecentQuantity"] = serializeQuantityIfExists(unit: unit, quantity: stats.mostRecentQuantity())
-                  if let mostRecentDateInterval = stats.mostRecentQuantityDateInterval() {
-                      dic["mostRecentQuantityDateInterval"] = [
-                          "start": self._dateFormatter.string(from: mostRecentDateInterval.start),
-                          "end": self._dateFormatter.string(from: mostRecentDateInterval.end)
-                      ]
-                  }
-              }
+        let startDate = self._dateFormatter.string(from: stats.startDate)
+        let endDate = self._dateFormatter.string(from: stats.endDate)
 
-              if #available(iOS 13, *) {
-                  let durationUnit = HKUnit.second()
-                  dic["duration"] = serializeQuantityIfExists(unit: durationUnit, quantity: stats.duration())
-              }
+        dic["averageQuantity"] = serializeQuantityIfExists(
+          unit: unit, quantity: stats.averageQuantity())
+        dic["maximumQuantity"] = serializeQuantityIfExists(
+          unit: unit, quantity: stats.maximumQuantity())
+        dic["minimumQuantity"] = serializeQuantityIfExists(
+          unit: unit, quantity: stats.minimumQuantity())
+        dic["sumQuantity"] = serializeStatisticIfExists(
+          unit: unit, quantity: stats.sumQuantity(), stats: stats)
 
-              results.append(dic)
+        if #available(iOS 12, *) {
+          dic["mostRecentQuantity"] = serializeQuantityIfExists(
+            unit: unit, quantity: stats.mostRecentQuantity())
+          if let mostRecentDateInterval = stats.mostRecentQuantityDateInterval() {
+            dic["mostRecentQuantityDateInterval"] = [
+              "start": self._dateFormatter.string(from: mostRecentDateInterval.start),
+              "end": self._dateFormatter.string(from: mostRecentDateInterval.end)
+            ]
           }
+        }
 
-          resolve(results)
+        if #available(iOS 13, *) {
+          let durationUnit = HKUnit.second()
+          dic["duration"] = serializeQuantityIfExists(
+            unit: durationUnit, quantity: stats.duration())
+        }
+
+        results.append(dic)
       }
 
-      store.execute(query)
+      resolve(results)
+    }
+
+    store.execute(query)
   }
 
   func mapWorkout(
@@ -1021,9 +1052,12 @@ class ReactNativeHealthkit: RCTEventEmitter {
       "uuid": workout.uuid.uuidString,
       "device": serializeDevice(_device: workout.device) as Any,
       "duration": workout.duration,
-      "totalDistance": serializeQuantity(unit: distanceUnit, quantity: workout.totalDistance) as Any,
-      "totalEnergyBurned": serializeQuantity(unit: energyUnit, quantity: workout.totalEnergyBurned) as Any,
-      "totalSwimmingStrokeCount": serializeQuantity(unit: HKUnit.count(), quantity: workout.totalSwimmingStrokeCount) as Any,
+      "totalDistance": serializeQuantity(unit: distanceUnit, quantity: workout.totalDistance)
+        as Any,
+      "totalEnergyBurned": serializeQuantity(unit: energyUnit, quantity: workout.totalEnergyBurned)
+        as Any,
+      "totalSwimmingStrokeCount": serializeQuantity(
+        unit: HKUnit.count(), quantity: workout.totalSwimmingStrokeCount) as Any,
       "workoutActivityType": workout.workoutActivityType.rawValue,
       "startDate": startDate,
       "endDate": endDate,
@@ -1039,7 +1073,7 @@ class ReactNativeHealthkit: RCTEventEmitter {
         let eventStartDate = self._dateFormatter.string(from: event.dateInterval.start)
         let eventEndDate = self._dateFormatter.string(from: event.dateInterval.end)
         let eventDict: [String: Any] = [
-          "type": event.type.rawValue, // https://developer.apple.com/documentation/healthkit/hkworkouteventtype
+          "type": event.type.rawValue,  // https://developer.apple.com/documentation/healthkit/hkworkouteventtype
           "startDate": eventStartDate,
           "endDate": eventEndDate
         ]
@@ -1078,7 +1112,9 @@ class ReactNativeHealthkit: RCTEventEmitter {
     dict["activities"] = activitiesArray
 
     if #available(iOS 11, *) {
-      dict.setValue(serializeQuantity(unit: HKUnit.count(), quantity: workout.totalFlightsClimbed), forKey: "totalFlightsClimbed")
+      dict.setValue(
+        serializeQuantity(unit: HKUnit.count(), quantity: workout.totalFlightsClimbed),
+        forKey: "totalFlightsClimbed")
     }
     return dict
   }
@@ -1167,13 +1203,16 @@ class ReactNativeHealthkit: RCTEventEmitter {
 
     let actualAnchor = deserializeHKQueryAnchor(anchor: anchor)
 
-    let q = HKAnchoredObjectQuery(type: .workoutType(), predicate: predicate, anchor: actualAnchor, limit: limit) { (
-      _: HKAnchoredObjectQuery,
-      s: [HKSample]?,
-      deletedSamples: [HKDeletedObject]?,
-      newAnchor: HKQueryAnchor?,
-      error: Error?
-    ) in
+    let q = HKAnchoredObjectQuery(
+      type: .workoutType(), predicate: predicate, anchor: actualAnchor, limit: limit
+    ) {
+      (
+        _: HKAnchoredObjectQuery,
+        s: [HKSample]?,
+        deletedSamples: [HKDeletedObject]?,
+        newAnchor: HKQueryAnchor?,
+        error: Error?
+      ) in
       guard let err = error else {
         guard let samples = s else {
           return resolve([])
@@ -1246,7 +1285,8 @@ class ReactNativeHealthkit: RCTEventEmitter {
 
         for s in samples {
           if let sample = s as? HKQuantitySample {
-            let serialized = serializeQuantitySample(sample: sample, unit: HKUnit.init(from: unitString))
+            let serialized = serializeQuantitySample(
+              sample: sample, unit: HKUnit.init(from: unitString))
 
             arr.add(serialized)
           }
@@ -1365,7 +1405,10 @@ class ReactNativeHealthkit: RCTEventEmitter {
     let predicate = createPredicate(from: from, to: to)
     let limit = limitOrNilIfZero(limit: limit)
 
-    let q = HKSampleQuery(sampleType: sampleType, predicate: predicate, limit: limit, sortDescriptors: getSortDescriptors(ascending: ascending)) { (_: HKSampleQuery, sample: [HKSample]?, error: Error?) in
+    let q = HKSampleQuery(
+      sampleType: sampleType, predicate: predicate, limit: limit,
+      sortDescriptors: getSortDescriptors(ascending: ascending)
+    ) { (_: HKSampleQuery, sample: [HKSample]?, error: Error?) in
       guard let err = error else {
         guard let samples = sample else {
           return resolve([])
@@ -1420,13 +1463,14 @@ class ReactNativeHealthkit: RCTEventEmitter {
       predicate: predicate,
       anchor: actualAnchor,
       limit: limit
-    ) { (
-      _: HKAnchoredObjectQuery,
-      s: [HKSample]?,
-      deletedSamples: [HKDeletedObject]?,
-      newAnchor: HKQueryAnchor?,
-      error: Error?
-    ) in
+    ) {
+      (
+        _: HKAnchoredObjectQuery,
+        s: [HKSample]?,
+        deletedSamples: [HKDeletedObject]?,
+        newAnchor: HKQueryAnchor?,
+        error: Error?
+      ) in
       guard let err = error else {
         guard let samples = s else {
           return resolve([])
@@ -1482,13 +1526,14 @@ class ReactNativeHealthkit: RCTEventEmitter {
       predicate: predicate,
       anchor: anchor != "" ? base64StringToHKQueryAnchor(base64String: anchor) : nil,
       limit: limit
-    ) { (
-      _: HKAnchoredObjectQuery,
-      s: [HKSample]?,
-      deletedSamples: [HKDeletedObject]?,
-      newAnchor: HKQueryAnchor?,
-      error: Error?
-    ) in
+    ) {
+      (
+        _: HKAnchoredObjectQuery,
+        s: [HKSample]?,
+        deletedSamples: [HKDeletedObject]?,
+        newAnchor: HKQueryAnchor?,
+        error: Error?
+      ) in
       guard let err = error else {
         guard let samples = s else {
           return resolve([])
@@ -1536,11 +1581,12 @@ class ReactNativeHealthkit: RCTEventEmitter {
     let query = HKSourceQuery(
       sampleType: type as! HKSampleType,
       samplePredicate: nil
-    ) { (
-      _: HKSourceQuery,
-      source: Set<HKSource>?,
-      error: Error?
-    ) in
+    ) {
+      (
+        _: HKSourceQuery,
+        source: Set<HKSource>?,
+        error: Error?
+      ) in
       guard let err = error else {
         guard let sources = source else {
           return resolve([])
@@ -1585,8 +1631,10 @@ class ReactNativeHealthkit: RCTEventEmitter {
   }
 
   @available(iOS 13.0.0, *)
-  func getWorkoutByID(store: HKHealthStore,
-                      workoutUUID: UUID) async -> HKWorkout? {
+  func getWorkoutByID(
+    store: HKHealthStore,
+    workoutUUID: UUID
+  ) async -> HKWorkout? {
     let workoutPredicate = HKQuery.predicateForObject(with: workoutUUID)
 
     let samples = try! await withCheckedThrowingContinuation {
@@ -1698,28 +1746,30 @@ class ReactNativeHealthkit: RCTEventEmitter {
   func getSerializedWorkoutLocations(
     store: HKHealthStore,
     workoutUUID: UUID
-  ) async -> [Dictionary<String, Any>]? {
+  ) async -> [[String: Any]]? {
     let routes = await _getWorkoutRoutes(
       store: store,
       workoutUUID: workoutUUID
     )
 
-    var allRoutes: [Dictionary<String, Any>] = []
+    var allRoutes: [[String: Any]] = []
     guard let _routes = routes else {
       return nil
     }
     for route in _routes {
-      let routeMetadata = serializeMetadata(
-        metadata: route.metadata
-      ) as! [String: Any]
+      let routeMetadata =
+        serializeMetadata(
+          metadata: route.metadata
+        ) as! [String: Any]
       let routeCLLocations = await getRouteLocations(
         store: store,
         route: route
       )
       let routeLocations = routeCLLocations.enumerated().map {
-        (i, loc) in serializeLocation(
+        (i, loc) in
+        serializeLocation(
           location: loc,
-          previousLocation: i == 0 ? nil: routeCLLocations[i - 1]
+          previousLocation: i == 0 ? nil : routeCLLocations[i - 1]
         )
       }
       let routeInfos: [String: Any] = ["locations": routeLocations]
@@ -1731,59 +1781,60 @@ class ReactNativeHealthkit: RCTEventEmitter {
 
   @available(iOS 17.0.0, *)
   func getWorkoutPlan(workout: HKWorkout) async -> [String: Any]? {
-#if canImport(WorkoutKit)
-    do {
-      let workoutPlan = try await workout.workoutPlan
+    #if canImport(WorkoutKit)
+      do {
+        let workoutPlan = try await workout.workoutPlan
 
-      var dict = [String: Any]()
-      if (workoutPlan?.id) != nil {
-        dict["id"] = workoutPlan?.id.uuidString
+        var dict = [String: Any]()
+        if (workoutPlan?.id) != nil {
+          dict["id"] = workoutPlan?.id.uuidString
 
-      }
-      if (workoutPlan?.workout.activity) != nil {
-        dict["activityType"] = workoutPlan?.workout.activity.rawValue
-      }
+        }
+        if (workoutPlan?.workout.activity) != nil {
+          dict["activityType"] = workoutPlan?.workout.activity.rawValue
+        }
 
-      if dict.isEmpty {
+        if dict.isEmpty {
+          return nil
+        }
+        return dict
+      } catch {
         return nil
       }
-      return dict
-    } catch {
+    #else
       return nil
-    }
-#else
-    return nil
-#endif
+    #endif
   }
 
   @objc(getWorkoutPlanById:resolve:reject:)
   func getWorkoutPlanById(
     workoutUUID: String,
     resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock) {
+    reject: @escaping RCTPromiseRejectBlock
+  ) {
     if #available(iOS 17.0, *) {
-#if canImport(WorkoutKit)
-      guard let store = _store else {
-        return reject(INIT_ERROR, INIT_ERROR_MESSAGE, nil)
-      }
+      #if canImport(WorkoutKit)
+        guard let store = _store else {
+          return reject(INIT_ERROR, INIT_ERROR_MESSAGE, nil)
+        }
 
-      Task {
-        if let uuid = UUID(uuidString: workoutUUID) {
-          let workout = await self.getWorkoutByID(store: store, workoutUUID: uuid)
-          if let workout {
-            let workoutPlan = await self.getWorkoutPlan(workout: workout)
+        Task {
+          if let uuid = UUID(uuidString: workoutUUID) {
+            let workout = await self.getWorkoutByID(store: store, workoutUUID: uuid)
+            if let workout {
+              let workoutPlan = await self.getWorkoutPlan(workout: workout)
 
-            return resolve(workoutPlan)
+              return resolve(workoutPlan)
+            } else {
+              return reject(GENERIC_ERROR, "No workout found", nil)
+            }
           } else {
-            return reject(GENERIC_ERROR, "No workout found", nil)
+            return reject(GENERIC_ERROR, "Invalid UUID", nil)
           }
-        } else {
-          return reject(GENERIC_ERROR, "Invalid UUID", nil)
         }
-      }
-#else
-      return resolve(nil)
-#endif
+      #else
+        return resolve(nil)
+      #endif
     } else {
       return resolve(nil)
     }
@@ -1814,25 +1865,26 @@ class ReactNativeHealthkit: RCTEventEmitter {
   func getWorkoutRoutes(
     workoutUUID: String,
     resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock) {
+    reject: @escaping RCTPromiseRejectBlock
+  ) {
 
-      guard let store = _store else {
-        return reject(INIT_ERROR, INIT_ERROR_MESSAGE, nil)
-      }
+    guard let store = _store else {
+      return reject(INIT_ERROR, INIT_ERROR_MESSAGE, nil)
+    }
 
-      guard let _workoutUUID = UUID(uuidString: workoutUUID) else {
-        return reject("INVALID_UUID_ERROR", "Invalid UUID received", nil)
-      }
+    guard let _workoutUUID = UUID(uuidString: workoutUUID) else {
+      return reject("INVALID_UUID_ERROR", "Invalid UUID received", nil)
+    }
 
-      Task {
-        do {
-          let locations = await getSerializedWorkoutLocations(store: store, workoutUUID: _workoutUUID)
-          resolve(locations)
-        } catch {
-          reject("WORKOUT_LOCATION_ERROR", "Failed to retrieve workout locations", nil)
-        }
+    Task {
+      do {
+        let locations = await getSerializedWorkoutLocations(store: store, workoutUUID: _workoutUUID)
+        resolve(locations)
+      } catch {
+        reject("WORKOUT_LOCATION_ERROR", "Failed to retrieve workout locations", nil)
       }
     }
+  }
 
   typealias HKAnchoredObjectQueryResult = (
     samples: [HKSample],
@@ -1854,13 +1906,14 @@ class ReactNativeHealthkit: RCTEventEmitter {
         predicate: predicate,
         anchor: anchor,
         limit: limit
-      ) { (
-        _: HKAnchoredObjectQuery,
-        s: [HKSample]?,
-        deletedSamples: [HKDeletedObject]?,
-        newAnchor: HKQueryAnchor?,
-        error: Error?
-      ) in
+      ) {
+        (
+          _: HKAnchoredObjectQuery,
+          s: [HKSample]?,
+          deletedSamples: [HKDeletedObject]?,
+          newAnchor: HKQueryAnchor?,
+          error: Error?
+        ) in
         if let err = error {
           return continuation.resume(throwing: err)
         } else {
@@ -1887,18 +1940,19 @@ class ReactNativeHealthkit: RCTEventEmitter {
   func getHeartbeatSeriesHeartbeats(
     store: HKHealthStore,
     sample: HKHeartbeatSeriesSample
-  ) async throws -> [Dictionary<String, Any>] {
+  ) async throws -> [[String: Any]] {
     let beatTimes = try await withCheckedThrowingContinuation {
-      (continuation: CheckedContinuation<[Dictionary<String, Any>], Error>) in
-      var allBeats: [Dictionary<String, Any>] = []
-
-      let query = HKHeartbeatSeriesQuery(heartbeatSeries: sample) { (
-        _: HKHeartbeatSeriesQuery,
-        timeSinceSeriesStart: TimeInterval,
-        precededByGap: Bool,
-        done: Bool,
-        error: Error?
-      ) in
+      (continuation: CheckedContinuation<[[String: Any]], Error>) in
+      var allBeats: [[String: Any]] = []
+
+      let query = HKHeartbeatSeriesQuery(heartbeatSeries: sample) {
+        (
+          _: HKHeartbeatSeriesQuery,
+          timeSinceSeriesStart: TimeInterval,
+          precededByGap: Bool,
+          done: Bool,
+          error: Error?
+        ) in
         if let err = error {
           return continuation.resume(throwing: err)
         } else {
@@ -1975,7 +2029,7 @@ class ReactNativeHealthkit: RCTEventEmitter {
           anchor: actualAnchor
         )
 
-        var allHeartbeatSamples: [Dictionary<String, Any>] = []
+        var allHeartbeatSamples: [[String: Any]] = []
         for sample in queryResult.samples as! [HKHeartbeatSeriesSample] {
           allHeartbeatSamples.append(
             try await getSerializedHeartbeatSeriesSample(
@@ -2012,7 +2066,9 @@ class ReactNativeHealthkit: RCTEventEmitter {
         sampleType: HKSeriesType.heartbeat(),
         predicate: predicate,
         limit: limit,
-        sortDescriptors: [NSSortDescriptor(key: HKSampleSortIdentifierStartDate, ascending: ascending)]
+        sortDescriptors: [
+          NSSortDescriptor(key: HKSampleSortIdentifierStartDate, ascending: ascending)
+        ]
       ) { (_: HKSampleQuery, sample: [HKSample]?, error: Error?) in
         if let err = error {
           continuation.resume(throwing: err)
@@ -2065,7 +2121,7 @@ class ReactNativeHealthkit: RCTEventEmitter {
           ascending: ascending
         )
 
-        var allHeartbeatSamples: [Dictionary<String, Any>] = []
+        var allHeartbeatSamples: [[String: Any]] = []
         for sample in samples as! [HKHeartbeatSeriesSample] {
           allHeartbeatSamples.append(
             try await getSerializedHeartbeatSeriesSample(
@@ -2105,7 +2161,6 @@ class ReactNativeHealthkit: RCTEventEmitter {
     }
   }
 
-  @available(iOS 18.0, *)
   @objc(queryStateOfMindSamples:to:limit:ascending:resolve:reject:)
   func queryStateOfMindSamples(
     from: Date,
@@ -2115,56 +2170,60 @@ class ReactNativeHealthkit: RCTEventEmitter {
     resolve: @escaping RCTPromiseResolveBlock,
     reject: @escaping RCTPromiseRejectBlock
   ) {
-    guard let store = _store else {
-      return reject(INIT_ERROR, INIT_ERROR_MESSAGE, nil)
-    }
-
-    Task {
-        let from = dateOrNilIfZero(date: from)
-        let to = dateOrNilIfZero(date: to)
-
-        let predicate = createPredicate(
-          from: from,
-          to: to
-        )
-
-        let limit = limitOrNilIfZero(
-          limit: limit
-        )
+    #if compiler(>=6)
+      if #available(iOS 18.0, *) {
+        guard let store = _store else {
+          return reject(INIT_ERROR, INIT_ERROR_MESSAGE, nil)
+        }
 
-        let type = HKStateOfMindType.stateOfMindType()
+        Task {
+          let from = dateOrNilIfZero(date: from)
+          let to = dateOrNilIfZero(date: to)
 
-        let query = HKSampleQuery(
-          sampleType: type,
-          predicate: predicate,
-          limit: limit,
-          sortDescriptors: [NSSortDescriptor(key: HKSampleSortIdentifierStartDate, ascending: ascending)]
-        ) { (_, samples, error) in
-          if let error = error {
-            reject(GENERIC_ERROR, error.localizedDescription, error)
-            return
-          }
+          let predicate = createPredicate(
+            from: from,
+            to: to
+          )
 
-          guard let samples = samples as? [HKStateOfMind] else {
-            resolve([])
-            return
-          }
+          let limit = limitOrNilIfZero(
+            limit: limit
+          )
 
-          let serializedSamples = samples.map { sample in
-            var associations: [Int] = []
-            if #available(iOS 18.0, *) {
-              associations = sample.associations.map({ association in
-                return association.rawValue
-              })
+          let type = HKStateOfMindType.stateOfMindType()
+
+          let query = HKSampleQuery(
+            sampleType: type,
+            predicate: predicate,
+            limit: limit,
+            sortDescriptors: [
+              NSSortDescriptor(key: HKSampleSortIdentifierStartDate, ascending: ascending)
+            ]
+          ) { (_, samples, error) in
+            if let error = error {
+              reject(GENERIC_ERROR, error.localizedDescription, error)
+              return
             }
 
-            var labels: [Int] = []
-            if #available(iOS 18.0, *) {
-              labels = sample.labels.map({ label in
-                return label.rawValue
-              })
+            guard let samples = samples as? [HKStateOfMind] else {
+              resolve([])
+              return
             }
 
+            let serializedSamples = samples.map { sample in
+              var associations: [Int] = []
+              if #available(iOS 18.0, *) {
+                associations = sample.associations.map({ association in
+                  return association.rawValue
+                })
+              }
+
+              var labels: [Int] = []
+              if #available(iOS 18.0, *) {
+                labels = sample.labels.map({ label in
+                  return label.rawValue
+                })
+              }
+
               return [
                 "uuid": sample.uuid.uuidString,
                 "device": serializeDevice(_device: sample.device) as Any,
@@ -2176,15 +2235,22 @@ class ReactNativeHealthkit: RCTEventEmitter {
                 "associations": associations,
                 "labels": labels,
                 "metadata": serializeMetadata(metadata: sample.metadata),
-                "sourceRevision": serializeSourceRevision(_sourceRevision: sample.sourceRevision) as Any
+                "sourceRevision": serializeSourceRevision(_sourceRevision: sample.sourceRevision)
+                  as Any
               ]
+            }
+
+            resolve(serializedSamples)
           }
 
-          resolve(serializedSamples)
+          store.execute(query)
         }
-
-        store.execute(query)
-    }
+      } else {
+        reject("STATE_OF_MIND_ERROR", "State of Mind features require iOS 18.0 or later", nil)
+      }
+    #else
+      reject(
+        "STATE_OF_MIND_ERROR", "State of Mind features require Xcode 16 or later to compile", nil)
+    #endif
   }
-
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kingstinct/react-native-healthkit",
-  "version": "8.4.0",
+  "version": "8.5.0",
   "description": "React Native bindings for HealthKit",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",