@kingstinct/react-native-healthkit 12.2.0 → 13.0.0

package/ios/CategoryTypeModule.swift

@@ -7,8 +7,8 @@ class CategoryTypeModule: HybridCategoryTypeModuleSpec {
         value: Double,
         startDate: Date,
         endDate: Date,
-        metadata: AnyMap
-    ) -> Promise<Bool> {
+        metadata: AnyMap?
+    ) -> Promise<CategorySample?> {
         return Promise.async {
           let type = try initializeCategoryType(identifier.stringValue)
 
@@ -17,10 +17,12 @@ class CategoryTypeModule: HybridCategoryTypeModuleSpec {
               value: Int(value),
               start: startDate,
               end: endDate,
-              metadata: anyMapToDictionary(metadata)
+              metadata: anyMapToDictionaryOptional(metadata)
           )
 
-          return try await saveAsync(sample: sample)
+          let succeeded = try await saveAsync(sample: sample)
+
+          return succeeded ? serializeCategorySample(sample: sample) : nil
         }
     }
 

package/ios/CorrelationTypeModule.swift

@@ -121,8 +121,8 @@ class CorrelationTypeModule: HybridCorrelationTypeModuleSpec {
     samples: [SampleForSaving],
     start: Date,
     end: Date,
-    metadata: AnyMap
-  ) -> Promise<Bool> {
+    metadata: AnyMap?
+  ) -> Promise<CorrelationSample?> {
     return Promise.async {
       let correlationType = try initializeCorrelationType(typeIdentifier.stringValue)
 
@@ -144,7 +144,7 @@ class CorrelationTypeModule: HybridCorrelationTypeModuleSpec {
             quantity: quantity,
             start: start,
             end: end,
-            metadata: anyMapToDictionary(quantitySample.metadata)
+            metadata: anyMapToDictionaryOptional(quantitySample.metadata)
           )
           initializedSamples.insert(hkQuantitySample)
 
@@ -171,10 +171,16 @@ class CorrelationTypeModule: HybridCorrelationTypeModuleSpec {
         start: start,
         end: end,
         objects: initializedSamples,
-        metadata: anyMapToDictionary(metadata)
+        metadata: anyMapToDictionaryOptional(metadata)
       )
 
-      return try await saveAsync(sample: correlation)
+      let succeeded = try await saveAsync(sample: correlation)
+
+      let unitMap = try await getUnitMap(correlations: [correlation])
+
+      return succeeded
+        ? serializeCorrelationSample(correlation: correlation, unitMap: unitMap)
+        : nil
     }
   }
 

package/ios/Helpers.swift

@@ -421,6 +421,13 @@ func parseWorkoutConfiguration(_ config: WorkoutConfiguration) -> HKWorkoutConfi
   return configuration
 }
 
+func anyMapToDictionaryOptional(_ anyMap: AnyMap?) -> [String: Any]? {
+  if let anyMap = anyMap {
+    return anyMapToDictionary(anyMap)
+  }
+  return nil
+}
+
 func anyMapToDictionary(_ anyMap: AnyMap) -> [String: Any] {
   var dict = [String: Any]()
   anyMap.getAllKeys().forEach { key in

package/ios/PredicateHelpers.swift

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

package/ios/QuantityTypeModule.swift

@@ -10,6 +10,39 @@ func emptyStatisticsResponse(from: Date, to: Date) -> QueryStatisticsResponse {
   return response
 }
 
+func queryStatisticsForQuantityInternal(
+  quantityType: HKQuantityType,
+  statistics: [StatisticsOptions],
+  options: StatisticsQueryOptions?
+) 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)
+    ) { (_, stats: HKStatistics?, error: Error?) in
+      DispatchQueue.main.async {
+        if let error = error {
+          return continuation.resume(throwing: error)
+        }
+
+        if let stats = stats {
+          return continuation.resume(returning: stats)
+        } else {
+          return continuation.resume(
+            throwing: runtimeErrorWithPrefix(
+              "queryStatisticsForQuantityInternal: unexpected empty response"))
+        }
+
+      }
+    }
+
+    store.execute(query)
+  }
+}
+
 func serializeStatistics(gottenStats: HKStatistics, unit: HKUnit) -> QueryStatisticsResponse {
   var response = QueryStatisticsResponse()
 
@@ -70,6 +103,128 @@ func serializeStatistics(gottenStats: HKStatistics, unit: HKUnit) -> QueryStatis
   return response
 }
 
+func queryStatisticsCollectionForQuantityInternal(
+  quantityType: HKQuantityType,
+  statistics: [StatisticsOptions],
+  anchorDate: Date,
+  intervalComponents: IntervalComponents,
+  options: StatisticsQueryOptions?
+) async throws -> HKStatisticsCollection {
+  let predicate = createPredicateForSamples(options?.filter)
+
+  // Create date components from interval
+  var dateComponents = DateComponents()
+  if let minute = intervalComponents.minute {
+    dateComponents.minute = Int(minute)
+  }
+  if let hour = intervalComponents.hour {
+    dateComponents.hour = Int(hour)
+  }
+  if let day = intervalComponents.day {
+    dateComponents.day = Int(day)
+  }
+  if let month = intervalComponents.month {
+    dateComponents.month = Int(month)
+  }
+  if let year = intervalComponents.year {
+    dateComponents.year = Int(year)
+  }
+
+  // Build statistics options
+  let opts = buildStatisticsOptions(statistics: statistics)
+
+  let unit = try await getUnitToUse(unitOverride: options?.unit, quantityType: quantityType)
+
+  return try await withCheckedThrowingContinuation { continuation in
+    let query = HKStatisticsCollectionQuery.init(
+      quantityType: quantityType,
+      quantitySamplePredicate: predicate,
+      options: opts,
+      anchorDate: anchorDate,
+      intervalComponents: dateComponents
+    )
+
+    query.initialResultsHandler = { (_, results: HKStatisticsCollection?, error: Error?) in
+      if let error = error {
+        return continuation.resume(throwing: error)
+      }
+
+      guard let statistics = results else {
+        return continuation.resume(throwing: runtimeErrorWithPrefix("queryStatisticsCollectionForQuantityInternal: unexpected empty results"))
+      }
+
+      return continuation.resume(returning: statistics)
+    }
+
+    store.execute(query)
+  }
+}
+
+func serializeStatisticsPerSource(gottenStats: HKStatistics, unit: HKUnit)
+  -> [QueryStatisticsResponseFromSingleSource] {
+  if let sources = gottenStats.sources {
+    return sources.map { source in
+      var response = QueryStatisticsResponseFromSingleSource()
+
+      response.startDate = gottenStats.startDate
+      response.endDate = gottenStats.endDate
+
+      if let averageQuantity = gottenStats.averageQuantity(for: source) {
+        response.averageQuantity = Quantity(
+          unit: unit.unitString,
+          quantity: averageQuantity.doubleValue(for: unit)
+        )
+      }
+      if let maximumQuantity = gottenStats.maximumQuantity(for: source) {
+        response.maximumQuantity = Quantity(
+          unit: unit.unitString,
+          quantity: maximumQuantity.doubleValue(for: unit)
+        )
+      }
+      if let minimumQuantity = gottenStats.minimumQuantity(for: source) {
+        response.minimumQuantity = Quantity(
+          unit: unit.unitString,
+          quantity: minimumQuantity.doubleValue(for: unit)
+        )
+      }
+      if let sumQuantity = gottenStats.sumQuantity(for: source) {
+        response.sumQuantity = Quantity(
+          unit: unit.unitString,
+          quantity: sumQuantity.doubleValue(for: unit)
+        )
+      }
+
+      if #available(iOS 12, *) {
+        if let mostRecent = gottenStats.mostRecentQuantity(for: source) {
+          response.mostRecentQuantity = Quantity(
+            unit: unit.unitString,
+            quantity: mostRecent.doubleValue(for: unit)
+          )
+        }
+
+        if let mostRecentDateInterval = gottenStats.mostRecentQuantityDateInterval(for: source) {
+          response.mostRecentQuantityDateInterval = QuantityDateInterval(
+            from: mostRecentDateInterval.start,
+            to: mostRecentDateInterval.end
+          )
+        }
+      }
+
+      if #available(iOS 13, *) {
+        if let duration = gottenStats.duration(for: source) {
+          let durationUnit = HKUnit.second()
+          response.duration = Quantity(
+            unit: durationUnit.unitString,
+            quantity: duration.doubleValue(for: durationUnit)
+          )
+        }
+      }
+      return response
+    }
+  }
+  return []
+}
+
 func getAnyMapValue(_ anyMap: AnyMap, key: String) -> Any? {
   if anyMap.isBool(key: key) {
     return anyMap.getBoolean(key: key)
@@ -116,9 +271,6 @@ func buildStatisticsOptions(statistics: [StatisticsOptions]) -> HKStatisticsOpti
         opts.insert(HKStatisticsOptions.mostRecent)
       }
     }
-    if statistic == .separatebysource {
-      opts.insert(HKStatisticsOptions.separateBySource)
-    }
   }
   return opts
 }
@@ -144,6 +296,56 @@ func handleHKNoDataOrThrow<T>(
 }
 
 class QuantityTypeModule: HybridQuantityTypeModuleSpec {
+  func queryStatisticsForQuantitySeparateBySource(
+    identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions],
+    options: StatisticsQueryOptions?
+  ) -> Promise<[QueryStatisticsResponseFromSingleSource]> {
+    return Promise.async {
+      let quantityType = try initializeQuantityType(identifier.stringValue)
+
+      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
+    }
+  }
+
+  func queryStatisticsCollectionForQuantitySeparateBySource(
+    identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions], anchorDate: Date,
+    intervalComponents: IntervalComponents, options: StatisticsQueryOptions?
+  ) -> Promise<[QueryStatisticsResponseFromSingleSource]> {
+    return Promise.async {
+      let quantityType = try initializeQuantityType(identifier.stringValue)
+
+      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
+      )
+
+      return statistics.statistics().flatMap { statistics in
+        return serializeStatisticsPerSource(gottenStats: statistics, unit: unit)
+      }
+    }
+  }
+
   func aggregationStyle(identifier: QuantityTypeIdentifier) throws -> AggregationStyle {
     let sampleType = try initializeQuantityType(identifier.stringValue)
 
@@ -168,34 +370,21 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
   ) -> Promise<QueryStatisticsResponse> {
     return Promise.async {
       let quantityType = try initializeQuantityType(identifier.stringValue)
-      let predicate = createPredicateForSamples(options?.filter)
-      let unit = try await getUnitToUse(unitOverride: options?.unit, quantityType: quantityType)
-      return try await withCheckedThrowingContinuation { continuation in
-        let query = HKStatisticsQuery.init(
-          quantityType: quantityType,
-          quantitySamplePredicate: predicate,
-          options: buildStatisticsOptions(statistics: statistics)
-        ) { (_, stats: HKStatistics?, error: Error?) in
-          DispatchQueue.main.async {
-            if let error = error {
-              return handleHKNoDataOrThrow(error: error, continuation: continuation) {
-                QueryStatisticsResponse()
-              }
-            }
-
-            guard let gottenStats = stats else {
-              let emptyResponse = QueryStatisticsResponse()
-              return continuation.resume(returning: emptyResponse)
-            }
-
-            let response = serializeStatistics(gottenStats: gottenStats, unit: unit)
-
-            continuation.resume(returning: response)
-          }
-        }
 
-        store.execute(query)
-      }
+      let gottenStats = try await queryStatisticsForQuantityInternal(
+        quantityType: quantityType,
+        statistics: statistics,
+        options: options
+      )
+
+      let unit = try await getUnitToUse(
+        unitOverride: options?.unit,
+        quantityType: quantityType
+      )
+
+      let response = serializeStatistics(gottenStats: gottenStats, unit: unit)
+
+      return response
     }
   }
 
@@ -206,73 +395,21 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
     return Promise.async {
       let quantityType = try initializeQuantityType(identifier.stringValue)
 
-      let predicate = createPredicateForSamples(options?.filter)
-
-      // Create date components from interval
-      var dateComponents = DateComponents()
-      if let minute = intervalComponents.minute {
-        dateComponents.minute = Int(minute)
-      }
-      if let hour = intervalComponents.hour {
-        dateComponents.hour = Int(hour)
-      }
-      if let day = intervalComponents.day {
-        dateComponents.day = Int(day)
-      }
-      if let month = intervalComponents.month {
-        dateComponents.month = Int(month)
-      }
-      if let year = intervalComponents.year {
-        dateComponents.year = Int(year)
-      }
-
-      // Build statistics options
-      let opts = buildStatisticsOptions(statistics: statistics)
-
-      let unit = try await getUnitToUse(unitOverride: options?.unit, quantityType: quantityType)
-
-      return try await withCheckedThrowingContinuation { continuation in
-        let query = HKStatisticsCollectionQuery.init(
-          quantityType: quantityType,
-          quantitySamplePredicate: predicate,
-          options: opts,
-          anchorDate: anchorDate,
-          intervalComponents: dateComponents
-        )
-
-        query.initialResultsHandler = { (_, results: HKStatisticsCollection?, error: Error?) in
-          if let error = error {
-            return handleHKNoDataOrThrow(error: error, continuation: continuation) {
-              []
-            }
-          }
-
-          guard let statistics = results else {
-            continuation.resume(returning: [])
-            return
-          }
-
-          var responseArray: [QueryStatisticsResponse] = []
-
-          // Limit enumeration to the range in the provided filter if possible
-          var enumerateFrom = Date.distantPast
-          var enumerateTo = Date()
-
-          if let filter = options?.filter {
-            enumerateFrom = filter.date?.startDate ?? enumerateFrom
-            enumerateTo = filter.date?.endDate ?? enumerateTo
-          }
-
-          statistics.enumerateStatistics(from: enumerateFrom, to: enumerateTo) { stats, _ in
-            let response = serializeStatistics(gottenStats: stats, unit: unit)
-
-            responseArray.append(response)
-          }
+      let statistics = try await queryStatisticsCollectionForQuantityInternal(
+        quantityType: quantityType,
+        statistics: statistics,
+        anchorDate: anchorDate,
+        intervalComponents: intervalComponents,
+        options: options
+      )
 
-          continuation.resume(returning: responseArray)
-        }
+      let unit = try await getUnitToUse(
+        unitOverride: options?.unit,
+        quantityType: quantityType
+      )
 
-        store.execute(query)
+      return statistics.statistics().map { statistics in
+        return serializeStatistics(gottenStats: statistics, unit: unit)
       }
     }
   }
@@ -319,16 +456,20 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
   }
 
   func saveQuantitySample(
-    identifier: QuantityTypeIdentifier, unit: String, value: Double, start: Date, end: Date,
-    metadata: AnyMap
-  ) -> Promise<Bool> {
+    identifier: QuantityTypeIdentifier,
+    unit: String,
+    value: Double,
+    start: Date,
+    end: Date,
+    metadata: AnyMap?
+  ) -> Promise<QuantitySample?> {
     return Promise.async {
       let unit = HKUnit.init(from: unit)
       let quantity = HKQuantity.init(unit: unit, doubleValue: value)
       let typeIdentifier = HKQuantityType(
         HKQuantityTypeIdentifier(rawValue: identifier.stringValue)
       )
-      let metadata = anyMapToDictionary(metadata)
+      let metadata = anyMapToDictionaryOptional(metadata)
 
       let sample = HKQuantitySample.init(
         type: typeIdentifier,
@@ -337,7 +478,10 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
         end: end,
         metadata: metadata
       )
-      return try await saveAsync(sample: sample)
+
+      let succeeded = try await saveAsync(sample: sample)
+
+      return succeeded ? try serializeQuantitySample(sample: sample, unit: unit) : nil
     }
   }
 

package/ios/StateOfMindModule.swift

@@ -145,7 +145,7 @@ import NitroModules
       labels: [StateOfMindLabel],
       associations: [StateOfMindAssociation],
       metadata: AnyMap?
-    ) -> Promise<Bool> {
+    ) -> Promise<StateOfMindSample?> {
 
       return Promise.async {
         if #available(iOS 18, *) {
@@ -179,7 +179,9 @@ import NitroModules
               metadata: anyMapToDictionary(metadata ?? AnyMap())
             )
 
-            return try await saveAsync(sample: sample)
+            let succeeded = try await saveAsync(sample: sample)
+
+            return succeeded ? serializeStateOfMindSample(sample: sample) : nil
           }
           throw runtimeErrorWithPrefix(
             "saveStateOfMindSample: Unknown StateOfMindKind rawValue: \(kind.rawValue)")

package/lib/commonjs/healthkit.ios.js

@@ -17,8 +17,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.saveQuantitySample = exports.saveCorrelationSample = exports.saveCategorySample = exports.deleteObjects = exports.requestAuthorization = exports.querySources = exports.queryWorkoutSamplesWithAnchor = exports.queryWorkoutSamples = exports.queryStatisticsCollectionForQuantity = exports.queryStatisticsForQuantity = exports.queryQuantitySamplesWithAnchor = exports.queryQuantitySamples = exports.queryElectrocardiogramSamplesWithAnchor = exports.queryElectrocardiogramSamples = exports.queryHeartbeatSeriesSamplesWithAnchor = exports.queryHeartbeatSeriesSamples = exports.queryCorrelationSamplesWithAnchor = exports.queryCorrelationSamples = exports.queryCategorySamplesWithAnchor = exports.queryCategorySamples = exports.isHealthDataAvailableAsync = exports.isHealthDataAvailable = exports.getWheelchairUse = exports.getRequestStatusForAuthorization = exports.getPreferredUnits = exports.getFitzpatrickSkinType = exports.getDateOfBirth = exports.getBloodType = exports.getBiologicalSex = exports.enableBackgroundDelivery = exports.disableBackgroundDelivery = exports.disableAllBackgroundDelivery = exports.authorizationStatusFor = exports.useSubscribeToQuantitySamples = exports.useSubscribeToChanges = exports.useSubscribeToCategorySamples = exports.useStatisticsForQuantity = exports.useSources = exports.useMostRecentWorkout = exports.useMostRecentQuantitySample = exports.useMostRecentCategorySample = exports.useIsHealthDataAvailable = exports.useHealthkitAuthorization = exports.subscribeToQuantitySamples = exports.subscribeToChanges = exports.subscribeToCategorySamples = exports.getPreferredUnit = exports.getMostRecentWorkout = exports.getMostRecentQuantitySample = exports.getMostRecentCategorySample = void 0;
-exports.getWheelchairUseAsync = exports.getFitzpatrickSkinTypeAsync = exports.getDateOfBirthAsync = exports.getBloodTypeAsync = exports.getBiologicalSexAsync = exports.currentAppSource = exports.queryMedicationEventsWithAnchor = exports.queryMedicationEvents = exports.queryMedications = exports.requestMedicationsAuthorization = exports.areObjectTypesAvailableAsync = exports.areObjectTypesAvailable = exports.isObjectTypeAvailableAsync = exports.isObjectTypeAvailable = exports.isQuantityCompatibleWithUnit = exports.saveStateOfMindSample = exports.queryStateOfMindSamplesWithAnchor = exports.queryStateOfMindSamples = exports.isProtectedDataAvailable = exports.startWatchApp = exports.saveWorkoutSample = void 0;
+exports.saveCategorySample = exports.deleteObjects = exports.requestAuthorization = exports.querySources = exports.queryWorkoutSamplesWithAnchor = exports.queryWorkoutSamples = exports.queryStatisticsCollectionForQuantitySeparateBySource = exports.queryStatisticsForQuantitySeparateBySource = exports.queryStatisticsCollectionForQuantity = exports.queryStatisticsForQuantity = exports.queryQuantitySamplesWithAnchor = exports.queryQuantitySamples = exports.queryElectrocardiogramSamplesWithAnchor = exports.queryElectrocardiogramSamples = exports.queryHeartbeatSeriesSamplesWithAnchor = exports.queryHeartbeatSeriesSamples = exports.queryCorrelationSamplesWithAnchor = exports.queryCorrelationSamples = exports.queryCategorySamplesWithAnchor = exports.queryCategorySamples = exports.isHealthDataAvailableAsync = exports.isHealthDataAvailable = exports.getWheelchairUse = exports.getRequestStatusForAuthorization = exports.getPreferredUnits = exports.getFitzpatrickSkinType = exports.getDateOfBirth = exports.getBloodType = exports.getBiologicalSex = exports.enableBackgroundDelivery = exports.disableBackgroundDelivery = exports.disableAllBackgroundDelivery = exports.authorizationStatusFor = exports.useSubscribeToQuantitySamples = exports.useSubscribeToChanges = exports.useSubscribeToCategorySamples = exports.useStatisticsForQuantity = exports.useSources = exports.useMostRecentWorkout = exports.useMostRecentQuantitySample = exports.useMostRecentCategorySample = exports.useIsHealthDataAvailable = exports.useHealthkitAuthorization = exports.subscribeToQuantitySamples = exports.subscribeToChanges = exports.subscribeToCategorySamples = exports.getPreferredUnit = exports.getMostRecentWorkout = exports.getMostRecentQuantitySample = exports.getMostRecentCategorySample = void 0;
+exports.getWheelchairUseAsync = exports.getFitzpatrickSkinTypeAsync = exports.getDateOfBirthAsync = exports.getBloodTypeAsync = exports.getBiologicalSexAsync = exports.currentAppSource = exports.queryMedicationEventsWithAnchor = exports.queryMedicationEvents = exports.queryMedications = exports.requestMedicationsAuthorization = exports.areObjectTypesAvailableAsync = exports.areObjectTypesAvailable = exports.isObjectTypeAvailableAsync = exports.isObjectTypeAvailable = exports.isQuantityCompatibleWithUnit = exports.saveStateOfMindSample = exports.queryStateOfMindSamplesWithAnchor = exports.queryStateOfMindSamples = exports.isProtectedDataAvailable = exports.startWatchApp = exports.saveWorkoutSample = exports.saveQuantitySample = exports.saveCorrelationSample = void 0;
 const react_native_1 = require("react-native");
 const useHealthkitAuthorization_1 = __importDefault(require("./hooks/useHealthkitAuthorization"));
 exports.useHealthkitAuthorization = useHealthkitAuthorization_1.default;
@@ -83,6 +83,8 @@ exports.queryQuantitySamples = modules_1.QuantityTypes.queryQuantitySamples.bind
 exports.queryQuantitySamplesWithAnchor = modules_1.QuantityTypes.queryQuantitySamplesWithAnchor.bind(modules_1.QuantityTypes);
 exports.queryStatisticsForQuantity = modules_1.QuantityTypes.queryStatisticsForQuantity.bind(modules_1.QuantityTypes);
 exports.queryStatisticsCollectionForQuantity = modules_1.QuantityTypes.queryStatisticsCollectionForQuantity.bind(modules_1.QuantityTypes);
+exports.queryStatisticsForQuantitySeparateBySource = modules_1.QuantityTypes.queryStatisticsForQuantitySeparateBySource.bind(modules_1.QuantityTypes);
+exports.queryStatisticsCollectionForQuantitySeparateBySource = modules_1.QuantityTypes.queryStatisticsCollectionForQuantitySeparateBySource.bind(modules_1.QuantityTypes);
 exports.queryWorkoutSamples = modules_1.Workouts.queryWorkoutSamples.bind(modules_1.Workouts);
 exports.queryWorkoutSamplesWithAnchor = modules_1.Workouts.queryWorkoutSamplesWithAnchor.bind(modules_1.Workouts);
 exports.querySources = modules_1.Core.querySources.bind(modules_1.Core);
@@ -152,6 +154,8 @@ exports.default = {
     queryQuantitySamplesWithAnchor: exports.queryQuantitySamplesWithAnchor,
     queryStatisticsForQuantity: exports.queryStatisticsForQuantity,
     queryStatisticsCollectionForQuantity: exports.queryStatisticsCollectionForQuantity,
+    queryStatisticsForQuantitySeparateBySource: exports.queryStatisticsForQuantitySeparateBySource,
+    queryStatisticsCollectionForQuantitySeparateBySource: exports.queryStatisticsCollectionForQuantitySeparateBySource,
     queryWorkoutSamples: exports.queryWorkoutSamples,
     queryWorkoutSamplesWithAnchor: exports.queryWorkoutSamplesWithAnchor,
     querySources: exports.querySources,

package/lib/commonjs/healthkit.js

@@ -14,8 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useHealthkitAuthorization = exports.useSubscribeToChanges = exports.useMostRecentWorkout = exports.useMostRecentQuantitySample = exports.getPreferredUnit = exports.getMostRecentWorkout = exports.getMostRecentQuantitySample = exports.saveStateOfMindSample = exports.queryCorrelationSamplesWithAnchor = exports.queryStateOfMindSamplesWithAnchor = exports.queryStateOfMindSamples = exports.startWatchApp = exports.saveWorkoutSample = exports.queryWorkoutSamplesWithAnchor = exports.queryWorkoutSamples = exports.queryElectrocardiogramSamplesWithAnchor = exports.queryElectrocardiogramSamples = exports.queryHeartbeatSeriesSamplesWithAnchor = exports.queryHeartbeatSeriesSamples = exports.saveCorrelationSample = exports.queryCorrelationSamples = exports.saveCategorySample = exports.isQuantityCompatibleWithUnit = exports.saveQuantitySample = exports.queryStatisticsCollectionForQuantity = exports.queryStatisticsForQuantity = exports.queryQuantitySamplesWithAnchor = exports.queryQuantitySamples = exports.getWheelchairUse = exports.getFitzpatrickSkinType = exports.getDateOfBirth = exports.getBloodType = exports.getBiologicalSex = exports.areObjectTypesAvailableAsync = exports.areObjectTypesAvailable = exports.isObjectTypeAvailableAsync = exports.isObjectTypeAvailable = exports.isProtectedDataAvailable = exports.subscribeToChanges = exports.deleteObjects = exports.requestAuthorization = exports.querySources = exports.isHealthDataAvailableAsync = exports.isHealthDataAvailable = exports.getRequestStatusForAuthorization = exports.getPreferredUnits = exports.enableBackgroundDelivery = exports.disableBackgroundDelivery = exports.disableAllBackgroundDelivery = exports.authorizationStatusFor = void 0;
-exports.requestMedicationsAuthorization = exports.subscribeToCategorySamples = exports.useSubscribeToCategorySamples = exports.useSubscribeToQuantitySamples = exports.queryMedicationEventsWithAnchor = exports.queryMedicationEvents = exports.queryMedications = exports.currentAppSource = exports.subscribeToQuantitySamples = exports.getWheelchairUseAsync = exports.getFitzpatrickSkinTypeAsync = exports.getDateOfBirthAsync = exports.getBloodTypeAsync = exports.getBiologicalSexAsync = exports.useStatisticsForQuantity = exports.useSources = exports.useIsHealthDataAvailable = void 0;
+exports.useMostRecentWorkout = exports.useMostRecentQuantitySample = exports.getPreferredUnit = exports.getMostRecentWorkout = exports.getMostRecentQuantitySample = exports.saveStateOfMindSample = exports.queryCorrelationSamplesWithAnchor = exports.queryStateOfMindSamplesWithAnchor = exports.queryStateOfMindSamples = exports.startWatchApp = exports.saveWorkoutSample = exports.queryWorkoutSamplesWithAnchor = exports.queryWorkoutSamples = exports.queryElectrocardiogramSamplesWithAnchor = exports.queryElectrocardiogramSamples = exports.queryHeartbeatSeriesSamplesWithAnchor = exports.queryHeartbeatSeriesSamples = exports.saveCorrelationSample = exports.queryCorrelationSamples = exports.saveCategorySample = exports.isQuantityCompatibleWithUnit = exports.saveQuantitySample = exports.queryStatisticsCollectionForQuantitySeparateBySource = exports.queryStatisticsForQuantitySeparateBySource = exports.queryStatisticsCollectionForQuantity = exports.queryStatisticsForQuantity = exports.queryQuantitySamplesWithAnchor = exports.queryQuantitySamples = exports.getWheelchairUse = exports.getFitzpatrickSkinType = exports.getDateOfBirth = exports.getBloodType = exports.getBiologicalSex = exports.areObjectTypesAvailableAsync = exports.areObjectTypesAvailable = exports.isObjectTypeAvailableAsync = exports.isObjectTypeAvailable = exports.isProtectedDataAvailable = exports.subscribeToChanges = exports.deleteObjects = exports.requestAuthorization = exports.querySources = exports.isHealthDataAvailableAsync = exports.isHealthDataAvailable = exports.getRequestStatusForAuthorization = exports.getPreferredUnits = exports.enableBackgroundDelivery = exports.disableBackgroundDelivery = exports.disableAllBackgroundDelivery = exports.authorizationStatusFor = void 0;
+exports.requestMedicationsAuthorization = exports.subscribeToCategorySamples = exports.useSubscribeToCategorySamples = exports.useSubscribeToQuantitySamples = exports.queryMedicationEventsWithAnchor = exports.queryMedicationEvents = exports.queryMedications = exports.currentAppSource = exports.subscribeToQuantitySamples = exports.getWheelchairUseAsync = exports.getFitzpatrickSkinTypeAsync = exports.getDateOfBirthAsync = exports.getBloodTypeAsync = exports.getBiologicalSexAsync = exports.useStatisticsForQuantity = exports.useSources = exports.useIsHealthDataAvailable = exports.useHealthkitAuthorization = exports.useSubscribeToChanges = void 0;
 exports.queryCategorySamples = queryCategorySamples;
 exports.queryCategorySamplesWithAnchor = queryCategorySamplesWithAnchor;
 exports.getMostRecentCategorySample = getMostRecentCategorySample;
@@ -70,9 +70,13 @@ exports.queryQuantitySamplesWithAnchor = UnavailableFnFromModule('queryQuantityS
     deletedSamples: [],
     newAnchor: '',
 }));
-exports.queryStatisticsForQuantity = UnavailableFnFromModule('queryStatisticsForQuantity', Promise.resolve({}));
+exports.queryStatisticsForQuantity = UnavailableFnFromModule('queryStatisticsForQuantity', Promise.resolve({
+    sources: [],
+}));
 exports.queryStatisticsCollectionForQuantity = UnavailableFnFromModule('queryStatisticsCollectionForQuantity', Promise.resolve([]));
-exports.saveQuantitySample = UnavailableFnFromModule('saveQuantitySample', Promise.resolve(false));
+exports.queryStatisticsForQuantitySeparateBySource = UnavailableFnFromModule('queryStatisticsForQuantitySeparateBySource', Promise.resolve([]));
+exports.queryStatisticsCollectionForQuantitySeparateBySource = UnavailableFnFromModule('queryStatisticsCollectionForQuantitySeparateBySource', Promise.resolve([]));
+exports.saveQuantitySample = UnavailableFnFromModule('saveQuantitySample', Promise.resolve(undefined));
 exports.isQuantityCompatibleWithUnit = UnavailableFnFromModule('isQuantityCompatibleWithUnit', false);
 // CategoryTypeModule functions
 function queryCategorySamples(_categoryTypeIdentifier, _options) {
@@ -93,10 +97,10 @@ function queryCategorySamplesWithAnchor(_categoryTypeIdentifier, _options) {
         newAnchor: '',
     });
 }
-exports.saveCategorySample = UnavailableFnFromModule('saveCategorySample', Promise.resolve(false));
+exports.saveCategorySample = UnavailableFnFromModule('saveCategorySample', Promise.resolve(undefined));
 // CorrelationTypeModule functions
 exports.queryCorrelationSamples = UnavailableFnFromModule('queryCorrelationSamples', Promise.resolve([]));
-exports.saveCorrelationSample = UnavailableFnFromModule('saveCorrelationSample', Promise.resolve(false));
+exports.saveCorrelationSample = UnavailableFnFromModule('saveCorrelationSample', Promise.resolve(undefined));
 // HeartbeatSeriesModule functions
 exports.queryHeartbeatSeriesSamples = UnavailableFnFromModule('queryHeartbeatSeriesSamples', Promise.resolve([]));
 exports.queryHeartbeatSeriesSamplesWithAnchor = UnavailableFnFromModule('queryHeartbeatSeriesSamplesWithAnchor', Promise.resolve({
@@ -133,7 +137,7 @@ exports.queryCorrelationSamplesWithAnchor = UnavailableFnFromModule('queryCorrel
     deletedSamples: [],
     newAnchor: '',
 }));
-exports.saveStateOfMindSample = UnavailableFnFromModule('saveStateOfMindSample', Promise.resolve(false));
+exports.saveStateOfMindSample = UnavailableFnFromModule('saveStateOfMindSample', Promise.resolve(undefined));
 // Utility functions (from original export list)
 function getMostRecentCategorySample(_identifier) {
     if (react_native_1.Platform.OS !== 'ios' && !hasWarned) {
@@ -226,6 +230,8 @@ const HealthkitModule = {
     queryQuantitySamplesWithAnchor: exports.queryQuantitySamplesWithAnchor,
     queryStatisticsForQuantity: exports.queryStatisticsForQuantity,
     queryStatisticsCollectionForQuantity: exports.queryStatisticsCollectionForQuantity,
+    queryStatisticsForQuantitySeparateBySource: exports.queryStatisticsForQuantitySeparateBySource,
+    queryStatisticsCollectionForQuantitySeparateBySource: exports.queryStatisticsCollectionForQuantitySeparateBySource,
     queryWorkoutSamples: exports.queryWorkoutSamples,
     queryWorkoutSamplesWithAnchor: exports.queryWorkoutSamplesWithAnchor,
     querySources: exports.querySources,

package/lib/module/healthkit.ios.js

@@ -46,6 +46,8 @@ export const queryQuantitySamples = QuantityTypes.queryQuantitySamples.bind(Quan
 export const queryQuantitySamplesWithAnchor = QuantityTypes.queryQuantitySamplesWithAnchor.bind(QuantityTypes);
 export const queryStatisticsForQuantity = QuantityTypes.queryStatisticsForQuantity.bind(QuantityTypes);
 export const queryStatisticsCollectionForQuantity = QuantityTypes.queryStatisticsCollectionForQuantity.bind(QuantityTypes);
+export const queryStatisticsForQuantitySeparateBySource = QuantityTypes.queryStatisticsForQuantitySeparateBySource.bind(QuantityTypes);
+export const queryStatisticsCollectionForQuantitySeparateBySource = QuantityTypes.queryStatisticsCollectionForQuantitySeparateBySource.bind(QuantityTypes);
 export const queryWorkoutSamples = Workouts.queryWorkoutSamples.bind(Workouts);
 export const queryWorkoutSamplesWithAnchor = Workouts.queryWorkoutSamplesWithAnchor.bind(Workouts);
 export const querySources = Core.querySources.bind(Core);
@@ -115,6 +117,8 @@ export default {
     queryQuantitySamplesWithAnchor,
     queryStatisticsForQuantity,
     queryStatisticsCollectionForQuantity,
+    queryStatisticsForQuantitySeparateBySource,
+    queryStatisticsCollectionForQuantitySeparateBySource,
     queryWorkoutSamples,
     queryWorkoutSamplesWithAnchor,
     querySources,