@kingstinct/react-native-healthkit 9.0.7 → 9.0.9

package/ios/QuantityTypeModule.swift

@@ -8,7 +8,7 @@ func queryQuantitySamplesInternal(
     let quantityType = try initializeQuantityType(typeIdentifier.stringValue)
     let predicate = try createPredicate(filter: options?.filter)
     let limit = getQueryLimit(options?.limit)
-    
+
     return Promise.async {
         let unit = try await getUnitToUse(unitOverride: options?.unit, quantityType: quantityType)
         return try await withCheckedThrowingContinuation { continuation in
@@ -26,13 +26,13 @@ func queryQuantitySamplesInternal(
                                 sample: sample,
                                 unit: unit
                               )
-                              
+
                               return serialized
                           } catch {
                               print(error.localizedDescription)
                           }
                       }
-                      
+
                       return nil
                   }) {
                       return continuation.resume(returning: returnValue)
@@ -66,7 +66,7 @@ func saveQuantitySampleInternal(
     end: end,
     metadata: metadata
   )
-    
+
     return Promise.async {
         return try await withCheckedThrowingContinuation { continuation in
             store.save(sample) { (success: Bool, error: Error?) in
@@ -80,39 +80,39 @@ func saveQuantitySampleInternal(
 }
 
 func getAnyMapValue(_ anyMap: AnyMapHolder, key: String) -> Any? {
-    if(anyMap.isBool(key: key)){
+    if anyMap.isBool(key: key) {
         return anyMap.getBoolean(key: key)
     }
-    if(anyMap.isArray(key: key)){
+    if anyMap.isArray(key: key) {
         return anyMap.getArray(key: key)
     }
-    if(anyMap.isDouble(key: key)){
+    if anyMap.isDouble(key: key) {
         return anyMap.getDouble(key: key)
     }
-    if(anyMap.isObject(key: key)){
+    if anyMap.isObject(key: key) {
         return anyMap.getObject(key: key)
     }
-    if(anyMap.isString(key: key)){
+    if anyMap.isString(key: key) {
         return anyMap.getString(key: key)
     }
-    if(anyMap.isBigInt(key: key)){
+    if anyMap.isBigInt(key: key) {
         return anyMap.getBigInt(key: key)
     }
-    if(anyMap.isNull(key: key)){
+    if anyMap.isNull(key: key) {
         return nil
     }
     return nil
 }
 
 func anyMapToDictionary(_ anyMap: AnyMapHolder) -> [String: Any] {
-    var dict = Dictionary<String, Any>()
+    var dict = [String: Any]()
     anyMap.getAllKeys().forEach { key in
         dict[key] = getAnyMapValue(anyMap, key: key)
     }
     return dict
 }
 
-func buildStatisticsOptions(statistics: [StatisticsOptions]) -> HKStatisticsOptions{
+func buildStatisticsOptions(statistics: [StatisticsOptions]) -> HKStatisticsOptions {
     // Build statistics options
     var opts = HKStatisticsOptions()
     for statistic in statistics {
@@ -140,11 +140,11 @@ func buildStatisticsOptions(statistics: [StatisticsOptions]) -> HKStatisticsOpti
     return opts
 }
 
-class QuantityTypeModule : HybridQuantityTypeModuleSpec {
+class QuantityTypeModule: HybridQuantityTypeModuleSpec {
     func deleteQuantitySamples(identifier: QuantityTypeIdentifier, filter: FilterForSamples) throws -> Promise<Bool> {
         let sampleType = try initializeQuantityType(identifier.stringValue)
         let samplePredicate = try createPredicateForSamples(filter: filter)
-        
+
         return Promise.async {
             return try await withCheckedThrowingContinuation { continuation in
                 store.deleteObjects(of: sampleType, predicate: samplePredicate) { (success: Bool, _: Int, error: Error?) in
@@ -156,21 +156,21 @@ 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))
     }
-    
+
     func queryStatisticsForQuantity(identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions], options: StatisticsQueryOptions?) throws -> Promise<QueryStatisticsResponse> {
-        
+
         let quantityType = try initializeQuantityType(identifier.stringValue)
         let predicate = try createPredicate(filter: options?.filter)
         let unit = HKUnit.init(from: options?.unit ?? "count")
-        
+
         return Promise.async {
             return try await withCheckedThrowingContinuation { continuation in
                 let query = HKStatisticsQuery.init(
@@ -182,15 +182,15 @@ class QuantityTypeModule : HybridQuantityTypeModuleSpec {
                         continuation.resume(throwing: error)
                         return
                     }
-                    
+
                     guard let gottenStats = stats else {
                         let emptyResponse = QueryStatisticsResponse()
                         continuation.resume(returning: emptyResponse)
                         return
                     }
-                    
+
                     var response = QueryStatisticsResponse()
-                    
+
                     if let averageQuantity = gottenStats.averageQuantity() {
                         response.averageQuantity = Quantity(
                             unit: unit.unitString,
@@ -215,7 +215,7 @@ class QuantityTypeModule : HybridQuantityTypeModuleSpec {
                             quantity: sumQuantity.doubleValue(for: unit)
                         )
                     }
-                    
+
                     if #available(iOS 12, *) {
                         if let mostRecent = gottenStats.mostRecentQuantity() {
                             response.mostRecentQuantity = Quantity(
@@ -223,7 +223,7 @@ class QuantityTypeModule : HybridQuantityTypeModuleSpec {
                                 quantity: mostRecent.doubleValue(for: unit)
                             )
                         }
-                        
+
                         if let mostRecentDateInterval = gottenStats.mostRecentQuantityDateInterval() {
                             response.mostRecentQuantityDateInterval = QuantityDateInterval(
                                 from: mostRecentDateInterval.start,
@@ -231,7 +231,7 @@ class QuantityTypeModule : HybridQuantityTypeModuleSpec {
                             )
                         }
                     }
-                    
+
                     if #available(iOS 13, *) {
                         if let duration = gottenStats.duration() {
                             let durationUnit = HKUnit.second()
@@ -241,27 +241,27 @@ class QuantityTypeModule : HybridQuantityTypeModuleSpec {
                             )
                         }
                     }
-                    
+
                     continuation.resume(returning: response)
                 }
-                
+
                 store.execute(query)
             }
         }
     }
-    
+
     func queryStatisticsCollectionForQuantity(identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions], anchorDate: String, intervalComponents: IntervalComponents, options: StatisticsQueryOptions?) throws -> Promise<[QueryStatisticsResponse]> {
         let quantityType = try initializeQuantityType(identifier.stringValue)
-        
+
         let predicate = try createPredicate(filter: options?.filter)
         let unit = HKUnit.init(from: options?.unit ?? "count")
-        
+
         // Convert the anchor date string to Date
         let dateFormatter = ISO8601DateFormatter()
         guard let anchor = dateFormatter.date(from: anchorDate) else {
             throw RuntimeError.error(withMessage: "Invalid anchor date format: " + anchorDate)
         }
-        
+
         // Create date components from interval
         var dateComponents = DateComponents()
         if let minute = intervalComponents.minute {
@@ -279,10 +279,10 @@ class QuantityTypeModule : HybridQuantityTypeModuleSpec {
         if let year = intervalComponents.year {
             dateComponents.year = Int(year)
         }
-        
+
         // Build statistics options
         let opts = buildStatisticsOptions(statistics: statistics)
-        
+
         return Promise.async {
             return try await withCheckedThrowingContinuation { continuation in
                 let query = HKStatisticsCollectionQuery.init(
@@ -292,24 +292,37 @@ class QuantityTypeModule : HybridQuantityTypeModuleSpec {
                     anchorDate: anchor,
                     intervalComponents: dateComponents
                 )
-                
+
                 query.initialResultsHandler = { (_, results: HKStatisticsCollection?, error: Error?) in
                     if let error = error {
                         continuation.resume(throwing: error)
                         return
                     }
-                    
+
                     guard let statistics = results else {
                         continuation.resume(returning: [])
                         return
                     }
-                    
+
                     var responseArray: [QueryStatisticsResponse] = []
-                    
-                    // todo: handle from/to here?
-                    statistics.enumerateStatistics(from: Date.distantPast, to: Date()) { stats, _ in
+
+                    // Limit enumeration to the range in the provided filter if possible
+                    var enumerateFrom = Date.distantPast
+                    var enumerateTo = Date()
+
+                    if let filter = options?.filter {
+                        switch filter {
+                        case .fourth(let dateFilter):
+                            enumerateFrom = dateFilter.startDate ?? enumerateFrom
+                            enumerateTo = dateFilter.endDate ?? enumerateTo
+                        default:
+                            break
+                        }
+                    }
+
+                    statistics.enumerateStatistics(from: enumerateFrom, to: enumerateTo) { stats, _ in
                         var response = QueryStatisticsResponse()
-                        
+
                         if let averageQuantity = stats.averageQuantity() {
                             response.averageQuantity = Quantity(
                                 unit: unit.unitString,
@@ -334,7 +347,7 @@ class QuantityTypeModule : HybridQuantityTypeModuleSpec {
                                 quantity: sumQuantity.doubleValue(for: unit)
                             )
                         }
-                        
+
                         if #available(iOS 12, *) {
                             if let mostRecent = stats.mostRecentQuantity() {
                                 response.mostRecentQuantity = Quantity(
@@ -342,7 +355,7 @@ class QuantityTypeModule : HybridQuantityTypeModuleSpec {
                                     quantity: mostRecent.doubleValue(for: unit)
                                 )
                             }
-                            
+
                             if let mostRecentDateInterval = stats.mostRecentQuantityDateInterval() {
                                 response.mostRecentQuantityDateInterval = QuantityDateInterval(
                                     from: mostRecentDateInterval.start,
@@ -350,7 +363,7 @@ class QuantityTypeModule : HybridQuantityTypeModuleSpec {
                                 )
                             }
                         }
-                        
+
                         if #available(iOS 13, *) {
                             if let duration = stats.duration() {
                                 let durationUnit = HKUnit.second()
@@ -360,30 +373,30 @@ class QuantityTypeModule : HybridQuantityTypeModuleSpec {
                                 )
                             }
                         }
-                        
+
                         responseArray.append(response)
                     }
-                    
+
                     continuation.resume(returning: responseArray)
                 }
-                
+
                 store.execute(query)
             }
         }
     }
-    
+
     func queryQuantitySamplesWithAnchor(identifier: QuantityTypeIdentifier, options: QueryOptionsWithAnchorAndUnit) throws -> Promise<QuantitySamplesWithAnchorResponse> {
         let quantityType = try initializeQuantityType(identifier.stringValue)
         let predicate = try createPredicate(filter: options.filter)
         let limit = getQueryLimit(options.limit)
         let actualAnchor = try deserializeHKQueryAnchor(base64String: options.anchor)
-        
+
         return Promise.async {
             let unit = try await getUnitToUse(
                 unitOverride: options.unit,
                 quantityType: quantityType
             )
-            
+
             return try await withCheckedThrowingContinuation { continuation in
                 let query = HKAnchoredObjectQuery(
                     type: quantityType,
@@ -401,7 +414,7 @@ class QuantityTypeModule : HybridQuantityTypeModuleSpec {
                         continuation.resume(throwing: error)
                         return
                     }
-                    
+
                     guard let samples = samples else {
                         let response = QuantitySamplesWithAnchorResponse(
                             samples: [],
@@ -411,7 +424,7 @@ class QuantityTypeModule : HybridQuantityTypeModuleSpec {
                         continuation.resume(returning: response)
                         return
                     }
-                    
+
                     let quantitySamples = samples.compactMap { sample in
                         if let quantitySample = sample as? HKQuantitySample {
                             do {
@@ -425,21 +438,21 @@ class QuantityTypeModule : HybridQuantityTypeModuleSpec {
                         }
                         return nil
                     }
-                    
+
                     let response = QuantitySamplesWithAnchorResponse(
                         samples: quantitySamples,
                         deletedSamples: deletedSamples?.map { serializeDeletedSample(sample: $0) } ?? [],
                         newAnchor: serializeAnchor(anchor: newAnchor) ?? ""
                     )
-                    
+
                     continuation.resume(returning: response)
                 }
-                
+
                 store.execute(query)
             }
         }
     }
-    
+
     func saveQuantitySample(identifier: QuantityTypeIdentifier, unit: String, value: Double, start: Date, end: Date, metadata: AnyMapHolder) throws -> Promise<Bool> {
         return saveQuantitySampleInternal(
             typeIdentifier: HKQuantityType(
@@ -456,6 +469,5 @@ class QuantityTypeModule : HybridQuantityTypeModuleSpec {
     func queryQuantitySamples(identifier: QuantityTypeIdentifier, options: QueryOptionsWithSortOrderAndUnit?) throws -> Promise<[QuantitySample]> {
         return try queryQuantitySamplesInternal(typeIdentifier: identifier, options: options)
     }
-    
-    
+
 }

package/ios/Serializers.swift

@@ -13,7 +13,7 @@ func serializeQuantityTyped(unit: HKUnit, quantityNullable: HKQuantity?) -> Quan
     guard let q = quantityNullable else {
         return nil
     }
-    
+
     return Quantity(
         unit: unit.unitString,
         quantity: q.doubleValue(for: unit)
@@ -38,7 +38,7 @@ func serializeQuantitySample(sample: HKQuantitySample, unit: HKUnit) throws -> Q
             quantity: sample.quantity.doubleValue(for: unit),
             unit: unit.unitString,
             metadata: serializeMetadata(sample.metadata),
-            sourceRevision: serializeSourceRevision(sample.sourceRevision),
+            sourceRevision: serializeSourceRevision(sample.sourceRevision)
         )
     }
     throw RuntimeError.error(withMessage: "[react-native-healthkit] Unable to recognize quantityType: \(sample.quantityType.identifier)")
@@ -51,7 +51,6 @@ func serializeDeletedSample(sample: HKDeletedObject) -> DeletedSample {
   )
 }
 
-
 func serializeCategorySample(sample: HKCategorySample) -> CategorySample {
     return CategorySample(
         uuid: sample.uuid.uuidString,
@@ -71,7 +70,6 @@ func serializeSource(_ source: HKSource) -> SourceProxy {
     )
 }
 
-
 func getUnitForQuantityType(quantityType: HKQuantityType) -> HKUnit? {
     if quantityType.is(compatibleWith: HKUnit.percent()) {
         return HKUnit.percent()
@@ -92,7 +90,7 @@ func getUnitForQuantityType(quantityType: HKQuantityType) -> HKUnit? {
     if quantityType.is(compatibleWith: HKUnit.meter()) {
         return HKUnit.meter()
     }
-    
+
     if quantityType.is(compatibleWith: SpeedUnit) {
         return SpeedUnit
     }
@@ -130,7 +128,6 @@ func getUnitForQuantityType(quantityType: HKQuantityType) -> HKUnit? {
     }
 #endif
 
-
     return nil
 }
 
@@ -138,7 +135,7 @@ func serializeUnknownQuantityTyped(quantity: HKQuantity?) -> Quantity? {
     guard let quantity = quantity else {
         return nil
     }
-    
+
     if quantity.is(compatibleWith: HKUnit.percent()) {
         return serializeQuantityTyped(unit: HKUnit.percent(), quantity: quantity)
     }
@@ -199,14 +196,14 @@ func serializeUnknownQuantityTyped(quantity: HKQuantity?) -> Quantity? {
     return nil
 }
 
-func serializeUnknownQuantity(quantity: HKQuantity) -> Dictionary<String, AnyValue>? {
+func serializeUnknownQuantity(quantity: HKQuantity) -> [String: AnyValue]? {
     if let quantityTyped = serializeUnknownQuantityTyped(quantity: quantity) {
         return [
             "quantity": AnyValue.number(quantityTyped.quantity),
             "unit": AnyValue.string(quantityTyped.unit)
         ]
     }
-    
+
     return nil
 }
 
@@ -217,7 +214,7 @@ func serializeMetadata(_ metadata: [String: Any]?) -> AnyMapHolder {
             if let bool = item.value as? Bool {
                 serialized.setBoolean(key: item.key, value: bool)
             }
-            
+
             if let str = item.value as? String {
                 serialized.setString(key: item.key, value: str)
             }
@@ -225,14 +222,14 @@ func serializeMetadata(_ metadata: [String: Any]?) -> AnyMapHolder {
             if let double = item.value as? Double {
                 serialized.setDouble(key: item.key, value: double)
             }
-            
+
             if let quantity = item.value as? HKQuantity {
                 if let s = serializeUnknownQuantity(quantity: quantity) {
                     serialized.setObject(key: item.key, value: s)
                 }
             }
-            
-            if let dict = item.value as? Dictionary<String, AnyValue> {
+
+            if let dict = item.value as? [String: AnyValue] {
                 serialized.setObject(key: item.key, value: dict)
             }
         }
@@ -267,7 +264,7 @@ func serializeDevice(hkDevice: HKDevice?) -> Device? {
     guard let hkDevice = hkDevice else {
         return nil
     }
-    
+
     return Device(
         name: hkDevice.name,
         firmwareVersion: hkDevice.firmwareVersion,
@@ -295,7 +292,6 @@ func serializeSourceRevision(_ hkSourceRevision: HKSourceRevision?) -> SourceRev
         return nil
     }
 
-    
     if #available(iOS 11, *) {
         return SourceRevision(
             source: serializeSource(hkSourceRevision.source),
@@ -304,7 +300,7 @@ func serializeSourceRevision(_ hkSourceRevision: HKSourceRevision?) -> SourceRev
             productType: hkSourceRevision.productType
         )
     }
-    
+
     return SourceRevision(
         source: serializeSource(hkSourceRevision.source),
         version: hkSourceRevision.version,

package/ios/StateOfMindModule.swift

@@ -9,20 +9,20 @@ func serializeStateOfMindSample(sample: HKStateOfMind) -> StateOfMindSample {
             return association
         }
         print("[react-native-healthkit] Unknown StateOfMindAssociation raw value: \(association.rawValue)")
-        
+
         return nil
     }
-    
+
     // todo: warn if we get unknown labels??
     let labels = sample.labels.compactMap { label in
-        if let label = StateOfMindLabel(rawValue: Int32(label.rawValue)){
+        if let label = StateOfMindLabel(rawValue: Int32(label.rawValue)) {
             return label
         }
-        
+
         print("[react-native-healthkit] Unknown StateOfMindLabel raw value: \(label.rawValue)")
         return nil
     }
-    
+
     return StateOfMindSample(
         uuid: sample.uuid.uuidString,
         device: serializeDevice(hkDevice: sample.device),
@@ -41,18 +41,18 @@ func serializeStateOfMindSample(sample: HKStateOfMind) -> StateOfMindSample {
 }
 
 #if compiler(>=6)
-class StateOfMindModule : HybridStateOfMindModuleSpec {    
+class StateOfMindModule: HybridStateOfMindModuleSpec {
     func queryStateOfMindSamples(
         options: QueryOptionsWithSortOrder?
     ) throws -> Promise<[StateOfMindSample]> {
         if #available(iOS 18.0, *) {
             let predicate = try createPredicate(filter: options?.filter)
             let queryLimit = getQueryLimit(options?.limit)
-            
+
             return Promise.async {
                 try await withCheckedThrowingContinuation { continuation in
                     let type = HKStateOfMindType.stateOfMindType()
-                    
+
                     let query = HKSampleQuery(
                         sampleType: type,
                         predicate: predicate,
@@ -65,18 +65,18 @@ class StateOfMindModule : HybridStateOfMindModuleSpec {
                             continuation.resume(throwing: error)
                             return
                         }
-                        
+
                         guard let samples = samples as? [HKStateOfMind] else {
                             return continuation.resume(throwing: RuntimeError.error(withMessage: "[react-native-healthkit] Unexpected empty response"))
                         }
-                        
+
                         let serializedSamples = samples.map { sample -> StateOfMindSample in
                             return serializeStateOfMindSample(sample: sample)
                         }
-                        
+
                         continuation.resume(returning: serializedSamples)
                     }
-                    
+
                     store.execute(query)
                 }
             }
@@ -84,7 +84,7 @@ class StateOfMindModule : HybridStateOfMindModuleSpec {
             throw RuntimeError.error(withMessage: "StateOfMind is only available on iOS 18 and later")
         }
     }
-    
+
     func saveStateOfMindSample(
         date: Date,
         kind: StateOfMindKind,
@@ -112,7 +112,7 @@ class StateOfMindModule : HybridStateOfMindModuleSpec {
                             print("[react-native-healthkit] Unknown StateOfMindAssociation raw value: \($0.rawValue)")
                             return nil
                         }
-                        
+
                         let sample = HKStateOfMind(
                             date: date,
                             kind: hkKind,
@@ -121,7 +121,7 @@ class StateOfMindModule : HybridStateOfMindModuleSpec {
                             associations: hkAssociations,
                             metadata: anyMapToDictionary(metadata ?? AnyMapHolder())
                         )
-                        
+
                         store.save(sample) { (success: Bool, error: Error?) in
                             if let error = error {
                                 continuation.resume(throwing: error)
@@ -139,13 +139,13 @@ class StateOfMindModule : HybridStateOfMindModuleSpec {
 }
 #else
 // Fallback for older Xcode versions
-class StateOfMind : HybridStateOfMindModuleSpec {
+class StateOfMind: HybridStateOfMindModuleSpec {
     func queryStateOfMindSamples(
         options: QueryOptionsWithSortOrder?
     ) throws -> Promise<[StateOfMindSample]> {
         throw RuntimeError.error(withMessage: "State of Mind features require iOS 18.0 or later and Xcode 16 or later to compile")
     }
-    
+
     func saveStateOfMindSample(
         date: Date,
         kind: StateOfMindKind,