@kingstinct/react-native-healthkit 13.0.0 → 13.0.2

package/ReactNativeHealthkit.podspec

@@ -22,6 +22,8 @@ Pod::Spec.new do |s|
     "cpp/**/*.{hpp,cpp}",
   ]
 
+  s.public_header_files = "ios/**/*.h"
+
   s.pod_target_xcconfig = {
     # C++ compiler flags, mainly for folly.
     "GCC_PREPROCESSOR_DEFINITIONS" => "$(inherited) FOLLY_NO_CONFIG FOLLY_CFG_NO_COROUTINES"

package/ios/CoreModule.swift

@@ -19,7 +19,7 @@ private var quantityTypeUnitCache = [HKQuantityType: HKUnit]()
 
 func getUnitToUse(unitOverride: String?, quantityType: HKQuantityType) async throws -> HKUnit {
   if let unitOverride = unitOverride {
-    let unit = HKUnit(from: unitOverride)
+    let unit = try parseUnitStringSafe(unitOverride)
 
     if !quantityType.is(compatibleWith: unit) {
       throw runtimeErrorWithPrefix(

package/ios/CorrelationTypeModule.swift

@@ -137,8 +137,11 @@ class CorrelationTypeModule: HybridCorrelationTypeModuleSpec {
             continue
           }
 
-          let unit = HKUnit(from: quantitySample.unit)
-          let quantity = HKQuantity(unit: unit, doubleValue: quantitySample.quantity)
+          let unit = try parseUnitStringSafe(quantitySample.unit)
+          let quantity = HKQuantity(
+            unit: unit,
+            doubleValue: quantitySample.quantity
+          )
           let hkQuantitySample = HKQuantitySample(
             type: quantityType,
             quantity: quantity,

package/ios/ExceptionCatcher.h

@@ -0,0 +1,17 @@
+#import <Foundation/Foundation.h>
+#import <HealthKit/HealthKit.h>
+
+NS_INLINE HKUnit * _Nullable HKUnitFromStringCatchingExceptions(NSString * _Nonnull unitString, NSError * _Nullable * _Nullable outError) {
+    if (outError) { *outError = nil; }
+    @try {
+        HKUnit *unit = [HKUnit unitFromString:unitString];
+        return unit;
+    }
+    @catch (NSException *exception) {
+        if (outError) {
+            NSDictionary *userInfo = exception.userInfo ?: @{};
+            *outError = [NSError errorWithDomain:exception.name code:0 userInfo:userInfo];
+        }
+        return nil;
+    }
+}

package/ios/Helpers.swift

@@ -9,6 +9,17 @@ import Foundation
 import HealthKit
 import NitroModules
 
+func parseUnitStringSafe(_ unitString: String) throws -> HKUnit {
+  var err: NSError?
+  let unitOut = HKUnitFromStringCatchingExceptions(unitString, &err)
+
+  if let hkUnit = unitOut {
+    return hkUnit
+  }
+
+  throw runtimeErrorWithPrefix("Supplied invalid '\(unitString)' as HKUnit")
+}
+
 func getQueryLimit(_ limit: Double) -> Int {
   if limit == .infinity || limit <= 0 || limit == .nan || limit == .signalingNaN {
     return HKObjectQueryNoLimit
@@ -355,39 +366,6 @@ func objectTypeFrom(objectTypeIdentifier: ObjectTypeIdentifier) throws -> HKObje
     "Failed initializing unrecognized objectType identifier " + typeIdentifier)
 }
 
-func hkStatisticsOptionsFromOptions(_ options: NSArray) -> HKStatisticsOptions {
-  var opts = HKStatisticsOptions()
-
-  for o in options {
-    guard let str = o as? String else { continue }
-
-    switch str {
-    case "cumulativeSum":
-      opts.insert(.cumulativeSum)
-    case "discreteAverage":
-      opts.insert(.discreteAverage)
-    case "discreteMax":
-      opts.insert(.discreteMax)
-    case "discreteMin":
-      opts.insert(.discreteMin)
-    case "duration":
-      if #available(iOS 13, *) {
-        opts.insert(.duration)
-      }
-    case "mostRecent":
-      if #available(iOS 13, *) {
-        opts.insert(.mostRecent)
-      }
-    case "separateBySource":
-      opts.insert(.separateBySource)
-    default:
-      continue
-    }
-  }
-
-  return opts
-}
-
 func componentsFromInterval(_ interval: NSDictionary) -> DateComponents {
   let componentKeys: [String: WritableKeyPath<DateComponents, Int?>] = [
     "minute": \.minute,
@@ -443,3 +421,47 @@ func runtimeErrorWithPrefix(_ withMessage: String) -> Error {
 func warnWithPrefix(_ withMessage: String) {
   print("[react-native-healthkit] \(withMessage)")
 }
+
+func buildStatisticsOptions(statistics: [StatisticsOptions], quantityType: HKQuantityType) -> HKStatisticsOptions {
+
+  // Build statistics options
+  var opts = HKStatisticsOptions()
+  opts.insert(.separateBySource)
+  for statistic in statistics {
+    if statistic == .cumulativesum {
+      if quantityType.aggregationStyle == .cumulative {
+        opts.insert(HKStatisticsOptions.cumulativeSum)
+      } else {
+        warnWithPrefix("buildStatisticsOptions: cumulativesum statistic requested for discrete quantity type \(quantityType.identifier)")
+      }
+
+    } else if statistic == .discreteaverage {
+      if quantityType.aggregationStyle != .cumulative {
+        opts.insert(HKStatisticsOptions.discreteAverage)
+      } else {
+        warnWithPrefix("buildStatisticsOptions: discreteaverage statistic requested for cumulative quantity type \(quantityType.identifier)")
+      }
+    } else if statistic == .discretemax {
+      if quantityType.aggregationStyle != .cumulative {
+        opts.insert(HKStatisticsOptions.discreteMax)
+      } else {
+        warnWithPrefix("buildStatisticsOptions: discretemax statistic requested for cumulative quantity type \(quantityType.identifier)")
+      }
+    } else if statistic == .discretemin {
+      if quantityType.aggregationStyle != .cumulative {
+        opts.insert(HKStatisticsOptions.discreteMin)
+      } else {
+        warnWithPrefix("buildStatisticsOptions: discretemin statistic requested for cumulative quantity type \(quantityType.identifier)")
+      }
+    }
+    if #available(iOS 13, *) {
+      if statistic == .duration {
+        opts.insert(HKStatisticsOptions.duration)
+      }
+      if statistic == .mostrecent {
+        opts.insert(HKStatisticsOptions.mostRecent)
+      }
+    }
+  }
+  return opts
+}

package/ios/QuantityTypeModule.swift

@@ -1,11 +1,12 @@
 import HealthKit
 import NitroModules
 
-func emptyStatisticsResponse(from: Date, to: Date) -> QueryStatisticsResponse {
+func emptyStatisticsResponse(from: Date?, to: Date?) -> QueryStatisticsResponse {
   var response = QueryStatisticsResponse()
 
   response.startDate = from
   response.endDate = to
+  response.sources = []
 
   return response
 }
@@ -14,18 +15,20 @@ func queryStatisticsForQuantityInternal(
   quantityType: HKQuantityType,
   statistics: [StatisticsOptions],
   options: StatisticsQueryOptions?
-) async throws -> HKStatistics {
+) async throws -> HKStatistics? {
   let predicate = createPredicateForSamples(options?.filter)
 
   return try await withCheckedThrowingContinuation { continuation in
     let query = HKStatisticsQuery.init(
       quantityType: quantityType,
       quantitySamplePredicate: predicate,
-      options: buildStatisticsOptions(statistics: statistics)
+      options: buildStatisticsOptions(statistics: statistics, quantityType: quantityType)
     ) { (_, stats: HKStatistics?, error: Error?) in
       DispatchQueue.main.async {
         if let error = error {
-          return continuation.resume(throwing: error)
+          return handleHKNoDataOrThrow(error: error, continuation: continuation, noDataFallback: {
+            return nil
+          })
         }
 
         if let stats = stats {
@@ -49,6 +52,10 @@ func serializeStatistics(gottenStats: HKStatistics, unit: HKUnit) -> QueryStatis
   response.startDate = gottenStats.startDate
   response.endDate = gottenStats.endDate
 
+  response.sources = gottenStats.sources?.map { source in
+    return serializeSource(source)
+  } ?? []
+
   if let averageQuantity = gottenStats.averageQuantity() {
     response.averageQuantity = Quantity(
       unit: unit.unitString,
@@ -109,7 +116,7 @@ func queryStatisticsCollectionForQuantityInternal(
   anchorDate: Date,
   intervalComponents: IntervalComponents,
   options: StatisticsQueryOptions?
-) async throws -> HKStatisticsCollection {
+) async throws -> HKStatisticsCollection? {
   let predicate = createPredicateForSamples(options?.filter)
 
   // Create date components from interval
@@ -131,9 +138,7 @@ func queryStatisticsCollectionForQuantityInternal(
   }
 
   // Build statistics options
-  let opts = buildStatisticsOptions(statistics: statistics)
-
-  let unit = try await getUnitToUse(unitOverride: options?.unit, quantityType: quantityType)
+  let opts = buildStatisticsOptions(statistics: statistics, quantityType: quantityType)
 
   return try await withCheckedThrowingContinuation { continuation in
     let query = HKStatisticsCollectionQuery.init(
@@ -146,7 +151,9 @@ func queryStatisticsCollectionForQuantityInternal(
 
     query.initialResultsHandler = { (_, results: HKStatisticsCollection?, error: Error?) in
       if let error = error {
-        return continuation.resume(throwing: error)
+        return handleHKNoDataOrThrow(error: error, continuation: continuation, noDataFallback: {
+          return nil
+        })
       }
 
       guard let statistics = results else {
@@ -250,31 +257,6 @@ func getAnyMapValue(_ anyMap: AnyMap, key: String) -> Any? {
   return nil
 }
 
-func buildStatisticsOptions(statistics: [StatisticsOptions]) -> HKStatisticsOptions {
-  // Build statistics options
-  var opts = HKStatisticsOptions()
-  for statistic in statistics {
-    if statistic == .cumulativesum {
-      opts.insert(HKStatisticsOptions.cumulativeSum)
-    } else if statistic == .discreteaverage {
-      opts.insert(HKStatisticsOptions.discreteAverage)
-    } else if statistic == .discretemax {
-      opts.insert(HKStatisticsOptions.discreteMax)
-    } else if statistic == .discretemin {
-      opts.insert(HKStatisticsOptions.discreteMin)
-    }
-    if #available(iOS 13, *) {
-      if statistic == .duration {
-        opts.insert(HKStatisticsOptions.duration)
-      }
-      if statistic == .mostrecent {
-        opts.insert(HKStatisticsOptions.mostRecent)
-      }
-    }
-  }
-  return opts
-}
-
 /// Handles HealthKit's `errorNoData` by resuming the continuation with a fallback value if provided,
 /// otherwise resumes with `nil` for Optional result types. For other errors, resumes by throwing.
 /// - Parameters:
@@ -303,20 +285,19 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
     return Promise.async {
       let quantityType = try initializeQuantityType(identifier.stringValue)
 
-      let gottenStats = try await queryStatisticsForQuantityInternal(
+      if let gottenStats = try await queryStatisticsForQuantityInternal(
         quantityType: quantityType,
         statistics: statistics,
         options: options
-      )
-
-      let unit = try await getUnitToUse(
-        unitOverride: options?.unit,
-        quantityType: quantityType
-      )
-
-      let response = serializeStatisticsPerSource(gottenStats: gottenStats, unit: unit)
-
-      return response
+      ) {
+        let unit = try await getUnitToUse(
+          unitOverride: options?.unit,
+          quantityType: quantityType
+        )
+        return serializeStatisticsPerSource(gottenStats: gottenStats, unit: unit)
+      } else {
+        return []
+      }
     }
   }
 
@@ -327,22 +308,24 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
     return Promise.async {
       let quantityType = try initializeQuantityType(identifier.stringValue)
 
-      let statistics = try await queryStatisticsCollectionForQuantityInternal(
+      if let statistics = try await queryStatisticsCollectionForQuantityInternal(
         quantityType: quantityType,
         statistics: statistics,
         anchorDate: anchorDate,
         intervalComponents: intervalComponents,
         options: options
-      )
+      ) {
 
-      let unit = try await getUnitToUse(
-        unitOverride: options?.unit,
-        quantityType: quantityType
-      )
+        let unit = try await getUnitToUse(
+          unitOverride: options?.unit,
+          quantityType: quantityType
+        )
 
-      return statistics.statistics().flatMap { statistics in
-        return serializeStatisticsPerSource(gottenStats: statistics, unit: unit)
+        return statistics.statistics().flatMap { statistics in
+          return serializeStatisticsPerSource(gottenStats: statistics, unit: unit)
+        }
       }
+      return []
     }
   }
 
@@ -361,30 +344,36 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
   func isQuantityCompatibleWithUnit(identifier: QuantityTypeIdentifier, unit: String) throws -> Bool {
     let sampleType = try initializeQuantityType(identifier.stringValue)
 
-    return sampleType.is(compatibleWith: HKUnit.init(from: unit))
+    let hkUnit = try parseUnitStringSafe(unit)
+
+    return sampleType.is(compatibleWith: hkUnit)
   }
 
   func queryStatisticsForQuantity(
-    identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions],
+    identifier: QuantityTypeIdentifier,
+    statistics: [StatisticsOptions],
     options: StatisticsQueryOptions?
   ) -> Promise<QueryStatisticsResponse> {
     return Promise.async {
       let quantityType = try initializeQuantityType(identifier.stringValue)
 
-      let gottenStats = try await queryStatisticsForQuantityInternal(
+      if let gottenStats = try await queryStatisticsForQuantityInternal(
         quantityType: quantityType,
         statistics: statistics,
         options: options
-      )
-
-      let unit = try await getUnitToUse(
-        unitOverride: options?.unit,
-        quantityType: quantityType
-      )
+      ) {
+        let unit = try await getUnitToUse(
+          unitOverride: options?.unit,
+          quantityType: quantityType
+        )
 
-      let response = serializeStatistics(gottenStats: gottenStats, unit: unit)
+        return serializeStatistics(gottenStats: gottenStats, unit: unit)
+      }
 
-      return response
+      return emptyStatisticsResponse(
+        from: options?.filter?.date?.startDate,
+        to: options?.filter?.date?.endDate
+      )
     }
   }
 
@@ -395,22 +384,24 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
     return Promise.async {
       let quantityType = try initializeQuantityType(identifier.stringValue)
 
-      let statistics = try await queryStatisticsCollectionForQuantityInternal(
+      if let statistics = try await queryStatisticsCollectionForQuantityInternal(
         quantityType: quantityType,
         statistics: statistics,
         anchorDate: anchorDate,
         intervalComponents: intervalComponents,
         options: options
-      )
-
-      let unit = try await getUnitToUse(
-        unitOverride: options?.unit,
-        quantityType: quantityType
-      )
+      ) {
+        let unit = try await getUnitToUse(
+          unitOverride: options?.unit,
+          quantityType: quantityType
+        )
 
-      return statistics.statistics().map { statistics in
-        return serializeStatistics(gottenStats: statistics, unit: unit)
+        return statistics.statistics().map { statistics in
+          return serializeStatistics(gottenStats: statistics, unit: unit)
+        }
       }
+
+      return []
     }
   }
 
@@ -464,7 +455,7 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
     metadata: AnyMap?
   ) -> Promise<QuantitySample?> {
     return Promise.async {
-      let unit = HKUnit.init(from: unit)
+      let unit = try parseUnitStringSafe(unit)
       let quantity = HKQuantity.init(unit: unit, doubleValue: value)
       let typeIdentifier = HKQuantityType(
         HKQuantityTypeIdentifier(rawValue: identifier.stringValue)

package/ios/WorkoutsModule.swift

@@ -104,7 +104,7 @@ class WorkoutsModule: HybridWorkoutsModuleSpec {
         let quantityVal = quantity.quantity
         let quantityStart = quantity.startDate
         let quantityEnd = quantity.endDate
-        let unit = HKUnit.init(from: unitStr)
+        let unit = try parseUnitStringSafe(unitStr)
         let quantity = HKQuantity.init(unit: unit, doubleValue: quantityVal)
 
         if quantity.is(compatibleWith: HKUnit.kilocalorie()) {

package/nitrogen/generated/ios/ReactNativeHealthkit-Swift-Cxx-Bridge.cpp

@@ -21,6 +21,7 @@
 #include "HybridWorkoutProxySpecSwift.hpp"
 #include "HybridWorkoutsModuleSpecSwift.hpp"
 #include "ReactNativeHealthkit-Swift-Cxx-Umbrella.hpp"
+#include <NitroModules/NitroDefines.hpp>
 
 namespace margelo::nitro::healthkit::bridge::swift {
 

package/nitrogen/generated/ios/swift/AuthDataTypes.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/CategorySample.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/CategorySampleForSaving.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/CategorySamplesWithAnchorResponse.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/CorrelationSample.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/DateFilter.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/DeletedSample.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Device.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/ECGQueryOptionsWithAnchor.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/ECGQueryOptionsWithSortOrder.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/ElectrocardiogramSample.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/ElectrocardiogramSamplesWithAnchorResponse.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/ElectrocardiogramVoltage.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/FilterForSamples.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/FilterForSamplesBase.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/FilterForWorkouts.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/FilterForWorkoutsBase.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_AuthorizationRequestStatus.swift

@@ -5,9 +5,9 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
-
 /**
  * Wraps a Swift `(_ value: AuthorizationRequestStatus) -> Void` as a class.
  * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.

package/nitrogen/generated/ios/swift/Func_void_BiologicalSex.swift

@@ -5,9 +5,9 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
-
 /**
  * Wraps a Swift `(_ value: BiologicalSex) -> Void` as a class.
  * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.

package/nitrogen/generated/ios/swift/Func_void_BloodType.swift

@@ -5,9 +5,9 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
-
 /**
  * Wraps a Swift `(_ value: BloodType) -> Void` as a class.
  * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.

package/nitrogen/generated/ios/swift/Func_void_CategorySamplesWithAnchorResponse.swift

@@ -5,9 +5,9 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
-
 /**
  * Wraps a Swift `(_ value: CategorySamplesWithAnchorResponse) -> Void` as a class.
  * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.

package/nitrogen/generated/ios/swift/Func_void_ElectrocardiogramSamplesWithAnchorResponse.swift

@@ -5,9 +5,9 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
-
 /**
  * Wraps a Swift `(_ value: ElectrocardiogramSamplesWithAnchorResponse) -> Void` as a class.
  * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.

package/nitrogen/generated/ios/swift/Func_void_FitzpatrickSkinType.swift

@@ -5,9 +5,9 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
-
 /**
  * Wraps a Swift `(_ value: FitzpatrickSkinType) -> Void` as a class.
  * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.