@kingstinct/react-native-healthkit 9.0.8 → 9.0.10

package/ios/QuantityTypeModule.swift

@@ -169,9 +169,9 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
 
         let quantityType = try initializeQuantityType(identifier.stringValue)
         let predicate = try createPredicate(filter: options?.filter)
-        let unit = HKUnit.init(from: options?.unit ?? "count")
 
         return Promise.async {
+            let unit = try await getUnitToUse(unitOverride: options?.unit, quantityType: quantityType)
             return try await withCheckedThrowingContinuation { continuation in
                 let query = HKStatisticsQuery.init(
                     quantityType: quantityType,
@@ -254,7 +254,6 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
         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()
@@ -284,6 +283,7 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
         let opts = buildStatisticsOptions(statistics: statistics)
 
         return Promise.async {
+            let unit = try await getUnitToUse(unitOverride: options?.unit, quantityType: quantityType)
             return try await withCheckedThrowingContinuation { continuation in
                 let query = HKStatisticsCollectionQuery.init(
                     quantityType: quantityType,
@@ -306,8 +306,21 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
 
                     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() {

package/lib/commonjs/healthkit.js

@@ -81,7 +81,7 @@ function queryCategorySamples(_categoryTypeIdentifier) {
     }
     return Promise.resolve([]);
 }
-function queryCategorySamplesWithAnchor(_categoryTypeIdentifier) {
+function queryCategorySamplesWithAnchor(_categoryTypeIdentifier, _options) {
     if (react_native_1.Platform.OS !== 'ios' && !hasWarned) {
         console.warn(notAvailableError);
         hasWarned = true;

package/lib/module/healthkit.js

@@ -59,7 +59,7 @@ export function queryCategorySamples(_categoryTypeIdentifier) {
     }
     return Promise.resolve([]);
 }
-export function queryCategorySamplesWithAnchor(_categoryTypeIdentifier) {
+export function queryCategorySamplesWithAnchor(_categoryTypeIdentifier, _options) {
     if (Platform.OS !== 'ios' && !hasWarned) {
         console.warn(notAvailableError);
         hasWarned = true;

package/lib/typescript/healthkit.d.ts

@@ -5,6 +5,7 @@ import type { CategorySamplesWithAnchorResponseTyped, CategorySampleTyped } from
 import type { CategoryTypeIdentifier } from './types/CategoryTypeIdentifier';
 import { BiologicalSex, BloodType, FitzpatrickSkinType, WheelchairUse } from './types/Characteristics';
 import type { QuantitySample } from './types/QuantitySample';
+import type { QueryOptionsWithAnchor } from './types/QueryOptions';
 export * from './types';
 export declare const authorizationStatusFor: (type: import("./types").ObjectTypeIdentifier) => AuthorizationStatus;
 export declare const disableAllBackgroundDelivery: () => Promise<boolean>;
@@ -35,12 +36,12 @@ export declare const queryStatisticsCollectionForQuantity: (identifier: import("
 export declare const saveQuantitySample: (identifier: import("./types").QuantityTypeIdentifier, unit: string, value: number, start: Date, end: Date, metadata: import("react-native-nitro-modules").AnyMap) => Promise<boolean>;
 export declare const isQuantityCompatibleWithUnit: (identifier: import("./types").QuantityTypeIdentifier, unit: string) => boolean;
 export declare function queryCategorySamples<T extends CategoryTypeIdentifier>(_categoryTypeIdentifier: T): Promise<CategorySampleTyped<T>[]>;
-export declare function queryCategorySamplesWithAnchor<T extends CategoryTypeIdentifier>(_categoryTypeIdentifier: T): Promise<CategorySamplesWithAnchorResponseTyped<T>>;
+export declare function queryCategorySamplesWithAnchor<T extends CategoryTypeIdentifier>(_categoryTypeIdentifier: T, _options: QueryOptionsWithAnchor): Promise<CategorySamplesWithAnchorResponseTyped<T>>;
 export declare const saveCategorySample: <T extends CategoryTypeIdentifier>(identifier: T, value: import("./types").CategoryValueForIdentifier, startDate: Date, endDate: Date, metadata: import("./types").MetadataForCategoryIdentifier<T>) => Promise<boolean>;
 export declare const queryCorrelationSamples: (typeIdentifier: import("./types").CorrelationTypeIdentifier, from: Date, to: Date) => Promise<readonly import("./types").CorrelationSample[]>;
 export declare const saveCorrelationSample: (typeIdentifier: import("./types").CorrelationTypeIdentifier, samples: import("./types").SampleForSaving[], start: Date, end: Date, metadata: import("react-native-nitro-modules").AnyMap) => Promise<boolean>;
 export declare const queryHeartbeatSeriesSamples: (options?: import("./types").QueryOptionsWithSortOrder) => Promise<readonly import("./types").HeartbeatSeriesSample[]>;
-export declare const queryHeartbeatSeriesSamplesWithAnchor: (options: import("./types").QueryOptionsWithAnchor) => Promise<import("./types").HeartbeatSeriesSamplesWithAnchorResponse>;
+export declare const queryHeartbeatSeriesSamplesWithAnchor: (options: QueryOptionsWithAnchor) => Promise<import("./types").HeartbeatSeriesSamplesWithAnchorResponse>;
 export declare const queryWorkoutSamples: (options: import("./types").WorkoutQueryOptions) => Promise<WorkoutProxy[]>;
 export declare const queryWorkoutSamplesWithAnchor: (options: import("./types").WorkoutQueryOptionsWithAnchor) => Promise<import("./types").QueryWorkoutSamplesWithAnchorResponse>;
 export declare const saveWorkoutSample: (workoutActivityType: import("./types").WorkoutActivityType, quantities: readonly import("./types").QuantitySampleForSaving[], startDate: Date, endDate: Date, totals: import("./types").WorkoutTotals, metadata: import("react-native-nitro-modules").AnyMap) => Promise<string>;

package/package.json

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

package/src/healthkit.ts

@@ -21,6 +21,7 @@ import {
   WheelchairUse,
 } from './types/Characteristics'
 import type { QuantitySample } from './types/QuantitySample'
+import type { QueryOptionsWithAnchor } from './types/QueryOptions'
 
 export * from './types'
 
@@ -185,6 +186,7 @@ export function queryCategorySamplesWithAnchor<
   T extends CategoryTypeIdentifier,
 >(
   _categoryTypeIdentifier: T,
+  _options: QueryOptionsWithAnchor,
 ): Promise<CategorySamplesWithAnchorResponseTyped<T>> {
   if (Platform.OS !== 'ios' && !hasWarned) {
     console.warn(notAvailableError)