@kingstinct/react-native-healthkit 14.0.2 → 15.1.0

package/ios/ExceptionCatcher.mm

@@ -15,3 +15,18 @@ HKUnit * _Nullable HKUnitFromStringCatchingExceptions(NSString * _Nonnull unitSt
         return nil;
     }
 }
+
+BOOL RunBlockCatchingObjCExceptions(void (NS_NOESCAPE ^block)(void), NSError * _Nullable * _Nullable outError) {
+    if (outError) { *outError = nil; }
+    @try {
+        block();
+        return YES;
+    }
+    @catch (NSException *exception) {
+        if (outError) {
+            NSDictionary *userInfo = exception.userInfo ?: @{};
+            *outError = [NSError errorWithDomain:exception.name code:0 userInfo:userInfo];
+        }
+        return NO;
+    }
+}

package/ios/Helpers.swift

@@ -172,7 +172,7 @@ func deserializeHKQueryAnchor(base64String: String?) throws -> HKQueryAnchor? {
 }
 
 func initializeCategoryType(_ identifier: String) throws -> HKCategoryType {
-  let identifier = HKCategoryTypeIdentifier(rawValue: identifier)
+  let identifier = hkCategoryTypeIdentifier(fromIdentifierName: identifier)
   if let sampleType = HKSampleType.categoryType(forIdentifier: identifier) {
     return sampleType
   }
@@ -483,3 +483,31 @@ func buildStatisticsOptions(statistics: [StatisticsOptions], quantityType: HKQua
   }
   return opts
 }
+
+private let storeReopenRetryDelay: UInt64 = 1_000_000_000
+
+/// HealthKit seals its store the moment the device locks and re-opens it a beat
+/// after it unlocks, and iOS can resume the app inside that beat. A query that
+/// hits the gap fails with `errorDatabaseInaccessible` although protected data is
+/// reported available — the store is re-opening, not sealed. Runs `operation`
+/// and, on exactly that refusal, gives it one more attempt after a short delay.
+/// A refusal while protected data is unavailable is the sealed store itself and
+/// is thrown as-is, as is every other error.
+func retryingWhileStoreReopens<T>(
+  _ operation: () async throws -> T
+) async throws -> T {
+  do {
+    return try await operation()
+  } catch {
+    let nsError = error as NSError
+    guard nsError.domain == HKError.errorDomain,
+      nsError.code == HKError.Code.errorDatabaseInaccessible.rawValue
+    else { throw error }
+    let protectedDataAvailable = await MainActor.run {
+      UIApplication.shared.isProtectedDataAvailable
+    }
+    guard protectedDataAvailable else { throw error }
+    try await Task.sleep(nanoseconds: storeReopenRetryDelay)
+    return try await operation()
+  }
+}

package/ios/MemoryEstimation.swift

@@ -0,0 +1,83 @@
+//
+//  MemoryEstimation.swift
+//  Pods
+//
+//  Rough estimates of the native heap kept alive by HybridObject proxies,
+//  reported to Nitro via `memorySize` so the JS garbage collector can account
+//  for memory it cannot see. Precision is not the goal; the right order of
+//  magnitude per object is.
+//
+
+import HealthKit
+
+/// Approximate per-object bridging overhead of a Nitro HybridObject that Nitro
+/// does not account for itself. The generated `*Spec_cxx.swift` adds the Swift
+/// implementation instance via `MemoryHelper.getSizeOf`; this covers the rest:
+/// the Swift `_cxx` bridge class, the C++ `HybridObject` with its per-runtime
+/// cache map, the `shared_ptr` control block and the reference-state records
+/// behind the JS weak reference. Add it once, in each proxy's `memorySize`.
+let nitroHybridObjectOverheadBytes = 512
+
+/// Rough size of an `NSString` on the heap, including its object header.
+func estimateStringMemorySize(_ value: String?) -> Int {
+  guard let value = value else {
+    return 0
+  }
+  return 32 + value.utf16.count * 2
+}
+
+/// Rough size of a `metadata` dictionary as HealthKit keeps it in memory.
+func estimateMetadataMemorySize(_ metadata: [String: Any]?) -> Int {
+  guard let metadata = metadata, !metadata.isEmpty else {
+    return 0
+  }
+  // NSDictionary header plus one bucket per entry.
+  var total = 64 + metadata.count * 48
+  for (key, value) in metadata {
+    total += estimateStringMemorySize(key)
+    if let string = value as? String {
+      total += estimateStringMemorySize(string)
+    } else if value is HKQuantity {
+      // HKQuantity: object header, unit object, double.
+      total += 128
+    } else {
+      // NSNumber, NSDate and friends are small tagged or boxed objects.
+      total += 32
+    }
+  }
+  return total
+}
+
+/// Rough size of one `HKStatistics` entry: the object itself plus the
+/// sum/min/max/average/most-recent quantities and their date interval.
+let estimatedStatisticsEntryMemorySize = 512
+
+/// Estimate of the `HKWorkout` object graph only; the proxy adds Nitro's
+/// bridging overhead on top.
+func estimateWorkoutMemorySize(_ workout: HKWorkout) -> Int {
+  // HKWorkout object, uuid, dates, HKSourceRevision (+HKSource), HKDevice,
+  // and the four total quantities.
+  var total = 1_024
+  total += estimateMetadataMemorySize(workout.metadata)
+
+  if let events = workout.workoutEvents {
+    for event in events {
+      // HKWorkoutEvent: object header, type, NSDateInterval.
+      total += 128 + estimateMetadataMemorySize(event.metadata)
+    }
+  }
+
+  if #available(iOS 16.0, *) {
+    total += workout.allStatistics.count * estimatedStatisticsEntryMemorySize
+
+    for activity in workout.workoutActivities {
+      // HKWorkoutActivity: object header, uuid, dates, HKWorkoutConfiguration.
+      total += 512
+      total += estimateMetadataMemorySize(activity.metadata)
+      total += activity.workoutEvents.count * 128
+      total += activity.allStatistics.count * estimatedStatisticsEntryMemorySize
+    }
+  }
+
+  return total
+}

package/ios/QuantityTypeModule.swift

@@ -53,7 +53,7 @@ func queryStatisticsForQuantityInternal(
 
 func serializeStatistics(gottenStats: HKStatistics, unit: HKUnit) -> QueryStatisticsResponse {
   let sources = gottenStats.sources?.map { source in
-    return serializeSource(source)
+    return serializeSourceStruct(source)
   } ?? []
 
   var averageQuantity: Quantity?
@@ -244,7 +244,7 @@ func serializeStatisticsPerSource(gottenStats: HKStatistics, unit: HKUnit)
       }
 
       return QueryStatisticsResponseFromSingleSource(
-        source: serializeSource(source),
+        source: serializeSourceStruct(source),
         startDate: gottenStats.startDate,
         endDate: gottenStats.endDate,
         duration: duration,
@@ -313,11 +313,13 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
     return Promise.async {
       let quantityType = try initializeQuantityType(identifier.stringValue)
 
-      if let gottenStats = try await queryStatisticsForQuantityInternal(
-        quantityType: quantityType,
-        statistics: statistics,
-        options: options
-      ) {
+      if let gottenStats = try await retryingWhileStoreReopens({
+        try await queryStatisticsForQuantityInternal(
+          quantityType: quantityType,
+          statistics: statistics,
+          options: options
+        )
+      }) {
         let unit = try await getUnitToUse(
           unitOverride: options?.unit,
           quantityType: quantityType
@@ -336,13 +338,15 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
     return Promise.async {
       let quantityType = try initializeQuantityType(identifier.stringValue)
 
-      if let statistics = try await queryStatisticsCollectionForQuantityInternal(
-        quantityType: quantityType,
-        statistics: statistics,
-        anchorDate: anchorDate,
-        intervalComponents: intervalComponents,
-        options: options
-      ) {
+      if let statistics = try await retryingWhileStoreReopens({
+        try await queryStatisticsCollectionForQuantityInternal(
+          quantityType: quantityType,
+          statistics: statistics,
+          anchorDate: anchorDate,
+          intervalComponents: intervalComponents,
+          options: options
+        )
+      }) {
 
         let unit = try await getUnitToUse(
           unitOverride: options?.unit,
@@ -385,11 +389,13 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
     return Promise.async {
       let quantityType = try initializeQuantityType(identifier.stringValue)
 
-      if let gottenStats = try await queryStatisticsForQuantityInternal(
-        quantityType: quantityType,
-        statistics: statistics,
-        options: options
-      ) {
+      if let gottenStats = try await retryingWhileStoreReopens({
+        try await queryStatisticsForQuantityInternal(
+          quantityType: quantityType,
+          statistics: statistics,
+          options: options
+        )
+      }) {
         let unit = try await getUnitToUse(
           unitOverride: options?.unit,
           quantityType: quantityType
@@ -412,13 +418,15 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
     return Promise.async {
       let quantityType = try initializeQuantityType(identifier.stringValue)
 
-      if let statistics = try await queryStatisticsCollectionForQuantityInternal(
-        quantityType: quantityType,
-        statistics: statistics,
-        anchorDate: anchorDate,
-        intervalComponents: intervalComponents,
-        options: options
-      ) {
+      if let statistics = try await retryingWhileStoreReopens({
+        try await queryStatisticsCollectionForQuantityInternal(
+          quantityType: quantityType,
+          statistics: statistics,
+          anchorDate: anchorDate,
+          intervalComponents: intervalComponents,
+          options: options
+        )
+      }) {
         let unit = try await getUnitToUse(
           unitOverride: options?.unit,
           quantityType: quantityType

package/ios/Serializers.swift

@@ -62,7 +62,9 @@ func serializeDeletedSample(sample: HKDeletedObject) -> DeletedSample {
 
 func serializeCategorySample(sample: HKCategorySample) -> CategorySample {
   return CategorySample(
-    categoryType: CategoryTypeIdentifier(fromString: sample.categoryType.identifier)!,
+    categoryType: CategoryTypeIdentifier(
+      fromString: categoryTypeIdentifierName(
+        fromHealthKitIdentifier: sample.categoryType.identifier))!,
     value: Double(sample.value),
     sampleType: serializeSampleType(sample.sampleType),
     startDate: sample.startDate,
@@ -75,12 +77,23 @@ func serializeCategorySample(sample: HKCategorySample) -> CategorySample {
   )
 }
 
+/// Wraps an `HKSource` in a proxy HybridObject. Only use this where the
+/// caller explicitly asks for a source handle (`querySources`,
+/// `currentAppSource`); everything embedded in serialized values should use
+/// `serializeSourceStruct` so that no per-sample native object is allocated.
 func serializeSource(_ source: HKSource) -> SourceProxy {
   return SourceProxy(
     source: source
   )
 }
 
+func serializeSourceStruct(_ source: HKSource) -> Source {
+  return Source(
+    name: source.name,
+    bundleIdentifier: source.bundleIdentifier
+  )
+}
+
 func serializeUnknownQuantityTyped(quantity: HKQuantity?) -> Quantity? {
   guard let quantity = quantity else {
     return nil
@@ -290,7 +303,7 @@ func serializeOperatingSystemVersion(_ version: OperatingSystemVersion) -> Strin
 
 func serializeSourceRevision(_ hkSourceRevision: HKSourceRevision) -> SourceRevision {
   return SourceRevision(
-    source: serializeSource(hkSourceRevision.source),
+    source: serializeSourceStruct(hkSourceRevision.source),
     version: hkSourceRevision.version,
     operatingSystemVersion: serializeOperatingSystemVersion(
       hkSourceRevision.operatingSystemVersion),
@@ -300,7 +313,9 @@ func serializeSourceRevision(_ hkSourceRevision: HKSourceRevision) -> SourceRevi
 
 func serializeSampleType(_ sampleType: HKSampleType) -> SampleType {
   return SampleType(
-    identifier: sampleType.identifier,
+    identifier: sampleType is HKCategoryType
+      ? categoryTypeIdentifierName(fromHealthKitIdentifier: sampleType.identifier)
+      : sampleType.identifier,
     allowsRecalibrationForEstimates: sampleType.allowsRecalibrationForEstimates,
     isMinimumDurationRestricted: sampleType.isMinimumDurationRestricted,
     isMaximumDurationRestricted: sampleType.isMaximumDurationRestricted

package/ios/SourceProxy.swift

@@ -14,11 +14,7 @@ class SourceProxy: HybridSourceProxySpec {
       warnWithPrefix("SourceProxy does not support toJSON with key: \(key!)")
     }
 
-    return Source(
-      name: self.name,
-      bundleIdentifier: self.bundleIdentifier
-    )
-
+    return serializeSourceStruct(source)
   }
 
   let source: HKSource
@@ -31,5 +27,18 @@ class SourceProxy: HybridSourceProxySpec {
     self.source = source
     self.name = source.name
     self.bundleIdentifier = source.bundleIdentifier
+    // HKSource object with its own name and bundle identifier strings, plus
+    // the Swift copies of those strings. Computed once; Nitro reads it on
+    // every conversion to JS.
+    self.memorySize =
+      128
+      + 2 * estimateStringMemorySize(source.name)
+      + 2 * estimateStringMemorySize(source.bundleIdentifier)
+      + nitroHybridObjectOverheadBytes
   }
+
+  /// Estimated heap footprint of the wrapped `HKSource`, reported to Nitro so
+  /// the JS garbage collector accounts for the native memory held by each
+  /// proxy. Nitro adds the Swift instance's own size on top.
+  let memorySize: Int
 }

package/ios/WorkoutProxy.swift

@@ -49,38 +49,43 @@ func getWorkoutRoutesInternal(
 
 func getRouteLocations(
   route: HKWorkoutRoute
-) async -> [CLLocation] {
-  let locations = try! await withCheckedThrowingContinuation {
+) async throws -> [CLLocation] {
+  return try await withCheckedThrowingContinuation {
     (continuation: CheckedContinuation<[CLLocation], Error>) in
     var allLocations: [CLLocation] = []
+    // HealthKit streams locations in batches through the same handler; make
+    // sure the continuation is resumed exactly once whatever the sequence.
+    var hasFinished = false
+    let finish = { (result: Result<[CLLocation], Error>) in
+      guard !hasFinished else {
+        return
+      }
+      hasFinished = true
+      continuation.resume(with: result)
+    }
 
     let query = HKWorkoutRouteQuery(route: route) {
       (_, locationsOrNil, done, errorOrNil) in
 
       DispatchQueue.main.async {
         if let error = errorOrNil {
-          continuation.resume(throwing: error)
-          return
+          return finish(.failure(error))
         }
 
         guard let currentLocationBatch = locationsOrNil else {
-          return continuation.resume(
-            throwing: runtimeErrorWithPrefix("Unexpected empty response")
-          )
+          return finish(.failure(runtimeErrorWithPrefix("Unexpected empty response")))
         }
 
         allLocations.append(contentsOf: currentLocationBatch)
 
         if done {
-          continuation.resume(returning: allLocations)
+          finish(.success(allLocations))
         }
       }
     }
 
     store.execute(query)
   }
-
-  return locations
 }
 
 func serializeLocation(location: CLLocation, previousLocation: CLLocation?)
@@ -122,7 +127,7 @@ func getSerializedWorkoutLocations(
       route.metadata
     )
 
-    let routeCLLocations = await getRouteLocations(
+    let routeCLLocations = try await getRouteLocations(
       route: route
     )
 
@@ -370,11 +375,23 @@ class WorkoutProxy: HybridWorkoutProxySpec {
       let hkActivities = workout.workoutActivities
 
       return hkActivities.map { activity in
+        let rawActivityType = activity.workoutConfiguration.activityType.rawValue
+        let activityType = Int32(exactly: rawActivityType).flatMap {
+          WorkoutActivityType.init(rawValue: $0)
+        }
+
+        if activityType == nil {
+          warnWithPrefix(
+            "Unknown workoutActivityType with rawValue: \(rawActivityType), falling back to 'other'"
+          )
+        }
+
         return WorkoutActivity(
           startDate: activity.startDate,
           endDate: activity.endDate ?? activity.startDate,
           uuid: activity.uuid.uuidString,
-          duration: activity.duration
+          duration: activity.duration,
+          activityType: activityType ?? WorkoutActivityType.other
         )
       }
     }
@@ -385,8 +402,20 @@ class WorkoutProxy: HybridWorkoutProxySpec {
 
   init(workout: HKWorkout) {
     self.workout = workout
+    // Computed here rather than lazily: proxies are created inside
+    // `Promise.async` on a background executor, while Nitro reads `memorySize`
+    // on the JS thread every time the proxy is converted to a JS object.
+    self.memorySize = estimateWorkoutMemorySize(workout) + nitroHybridObjectOverheadBytes
   }
 
+  /// Estimated heap footprint of the wrapped `HKWorkout` graph (events,
+  /// activities, statistics, metadata), reported to Nitro so the JS garbage
+  /// collector sees the native memory kept alive by each proxy. Nitro adds
+  /// the Swift instance's own size on top. Rough by design: the goal is the
+  /// right order of magnitude per workout, so hundreds of proxies from a query
+  /// do not look like hundreds of empty objects.
+  let memorySize: Int
+
   func getWorkoutPlan() throws -> Promise<WorkoutPlan?> {
     return Promise.async {
       if #available(iOS 17.0.0, *) {

package/lib/commonjs/generated/healthkit.generated.js

@@ -4,7 +4,7 @@
  * Source: scripts/generate-healthkit.ts
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WorkoutSwimmingLocationType = exports.WorkoutEventType = exports.WorkoutActivityType = exports.WeatherCondition = exports.WaterSalinity = exports.VO2MaxTestType = exports.UserMotionContext = exports.SwimmingStrokeStyle = exports.PhysicalEffortEstimationType = exports.InsulinDeliveryReason = exports.HeartRateSensorLocation = exports.HeartRateRecoveryTestType = exports.HeartRateMotionContext = exports.DevicePlacementSide = exports.CyclingFunctionalThresholdPowerTestType = exports.CategoryValueVaginalBleeding = exports.CategoryValueSleepAnalysis = exports.CategoryValueSeverity = exports.CategoryValueProgesteroneTestResult = exports.CategoryValuePresence = exports.CategoryValuePregnancyTestResult = exports.CategoryValueOvulationTestResult = exports.CategoryValueMenstrualFlow = exports.CategoryValueLowCardioFitnessEvent = exports.CategoryValueHeadphoneAudioExposureEvent = exports.CategoryValueEnvironmentalAudioExposureEvent = exports.CategoryValueContraceptive = exports.CategoryValueCervicalMucusQuality = exports.CategoryValueAudioExposureEvent = exports.CategoryValueAppleWalkingSteadinessEvent = exports.CategoryValueAppleStandHour = exports.CategoryValueAppetiteChanges = exports.CategoryValue = exports.BodyTemperatureSensorLocation = exports.BloodGlucoseMealTime = exports.AppleECGAlgorithmVersion = exports.CATEGORY_IDENTIFIER_VALUE_ENUMS = exports.QUANTITY_IDENTIFIER_CANONICAL_UNITS = exports.CATEGORY_IDENTIFIER_IOS_AVAILABILITY = exports.QUANTITY_IDENTIFIER_IOS_AVAILABILITY = void 0;
+exports.WorkoutSwimmingLocationType = exports.WorkoutEventType = exports.WorkoutActivityType = exports.WeatherCondition = exports.WaterSalinity = exports.VO2MaxTestType = exports.UserMotionContext = exports.SwimmingStrokeStyle = exports.PhysicalEffortEstimationType = exports.InsulinDeliveryReason = exports.HeartRateSensorLocation = exports.HeartRateRecoveryTestType = exports.HeartRateMotionContext = exports.DevicePlacementSide = exports.CyclingFunctionalThresholdPowerTestType = exports.CategoryValueVaginalBleeding = exports.CategoryValueSleepAnalysis = exports.CategoryValueSeverity = exports.CategoryValueProgesteroneTestResult = exports.CategoryValuePresence = exports.CategoryValuePregnancyTestResult = exports.CategoryValueOvulationTestResult = exports.CategoryValueMenstrualFlow = exports.CategoryValueMenopausalState = exports.CategoryValueLowCardioFitnessEvent = exports.CategoryValueHeadphoneAudioExposureEvent = exports.CategoryValueEnvironmentalAudioExposureEvent = exports.CategoryValueContraceptive = exports.CategoryValueCervicalMucusQuality = exports.CategoryValueAudioExposureEvent = exports.CategoryValueAppleWalkingSteadinessEvent = exports.CategoryValueAppleStandHour = exports.CategoryValueAppetiteChanges = exports.CategoryValue = exports.BodyTemperatureSensorLocation = exports.BloodGlucoseMealTime = exports.AppleECGAlgorithmVersion = exports.CATEGORY_IDENTIFIER_VALUE_ENUMS = exports.QUANTITY_IDENTIFIER_CANONICAL_UNITS = exports.CATEGORY_IDENTIFIER_IOS_AVAILABILITY = exports.QUANTITY_IDENTIFIER_IOS_AVAILABILITY = void 0;
 exports.QUANTITY_IDENTIFIER_IOS_AVAILABILITY = {
     HKQuantityTypeIdentifierActiveEnergyBurned: '8.0',
     HKQuantityTypeIdentifierAppleExerciseTime: '9.3',
@@ -135,6 +135,7 @@ exports.CATEGORY_IDENTIFIER_IOS_AVAILABILITY = {
     HKCategoryTypeIdentifierAppleWalkingSteadinessEvent: '15.0',
     HKCategoryTypeIdentifierAudioExposureEvent: '13.0',
     HKCategoryTypeIdentifierBladderIncontinence: '14.0',
+    HKCategoryTypeIdentifierBleedingAfterMenopause: '27.0',
     HKCategoryTypeIdentifierBleedingAfterPregnancy: '18.0',
     HKCategoryTypeIdentifierBleedingDuringPregnancy: '18.0',
     HKCategoryTypeIdentifierBloating: '13.6',
@@ -172,6 +173,7 @@ exports.CATEGORY_IDENTIFIER_IOS_AVAILABILITY = {
     HKCategoryTypeIdentifierLowerBackPain: '13.6',
     HKCategoryTypeIdentifierLowHeartRateEvent: '12.2',
     HKCategoryTypeIdentifierMemoryLapse: '14.0',
+    HKCategoryTypeIdentifierMenopausalState: '27.0',
     HKCategoryTypeIdentifierMenstrualFlow: '9.0',
     HKCategoryTypeIdentifierMindfulSession: '10.0',
     HKCategoryTypeIdentifierMoodChanges: '13.6',
@@ -329,6 +331,7 @@ exports.CATEGORY_IDENTIFIER_VALUE_ENUMS = {
     HKCategoryTypeIdentifierAppleWalkingSteadinessEvent: 'CategoryValueAppleWalkingSteadinessEvent',
     HKCategoryTypeIdentifierAudioExposureEvent: null,
     HKCategoryTypeIdentifierBladderIncontinence: 'CategoryValueSeverity',
+    HKCategoryTypeIdentifierBleedingAfterMenopause: 'CategoryValueVaginalBleeding',
     HKCategoryTypeIdentifierBleedingAfterPregnancy: 'CategoryValueVaginalBleeding',
     HKCategoryTypeIdentifierBleedingDuringPregnancy: 'CategoryValueVaginalBleeding',
     HKCategoryTypeIdentifierBloating: 'CategoryValueSeverity',
@@ -366,6 +369,7 @@ exports.CATEGORY_IDENTIFIER_VALUE_ENUMS = {
     HKCategoryTypeIdentifierLowerBackPain: 'CategoryValueSeverity',
     HKCategoryTypeIdentifierLowHeartRateEvent: 'CategoryValue',
     HKCategoryTypeIdentifierMemoryLapse: 'CategoryValueSeverity',
+    HKCategoryTypeIdentifierMenopausalState: 'CategoryValueMenopausalState',
     HKCategoryTypeIdentifierMenstrualFlow: 'CategoryValueMenstrualFlow',
     HKCategoryTypeIdentifierMindfulSession: 'CategoryValue',
     HKCategoryTypeIdentifierMoodChanges: 'CategoryValuePresence',
@@ -475,6 +479,12 @@ var CategoryValueLowCardioFitnessEvent;
 (function (CategoryValueLowCardioFitnessEvent) {
     CategoryValueLowCardioFitnessEvent[CategoryValueLowCardioFitnessEvent["lowFitness"] = 1] = "lowFitness";
 })(CategoryValueLowCardioFitnessEvent || (exports.CategoryValueLowCardioFitnessEvent = CategoryValueLowCardioFitnessEvent = {}));
+var CategoryValueMenopausalState;
+(function (CategoryValueMenopausalState) {
+    CategoryValueMenopausalState[CategoryValueMenopausalState["menopause"] = 1] = "menopause";
+    CategoryValueMenopausalState[CategoryValueMenopausalState["perimenopause"] = 2] = "perimenopause";
+    CategoryValueMenopausalState[CategoryValueMenopausalState["none"] = 3] = "none";
+})(CategoryValueMenopausalState || (exports.CategoryValueMenopausalState = CategoryValueMenopausalState = {}));
 var CategoryValueMenstrualFlow;
 (function (CategoryValueMenstrualFlow) {
     CategoryValueMenstrualFlow[CategoryValueMenstrualFlow["unspecified"] = 1] = "unspecified";
@@ -724,6 +734,8 @@ var WorkoutActivityType;
     WorkoutActivityType[WorkoutActivityType["swimBikeRun"] = 82] = "swimBikeRun";
     WorkoutActivityType[WorkoutActivityType["transition"] = 83] = "transition";
     WorkoutActivityType[WorkoutActivityType["underwaterDiving"] = 84] = "underwaterDiving";
+    WorkoutActivityType[WorkoutActivityType["rest"] = 2998] = "rest";
+    WorkoutActivityType[WorkoutActivityType["group"] = 2999] = "group";
     WorkoutActivityType[WorkoutActivityType["other"] = 3000] = "other";
 })(WorkoutActivityType || (exports.WorkoutActivityType = WorkoutActivityType = {}));
 var WorkoutEventType;

package/lib/commonjs/healthkit.ios.js

@@ -18,7 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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.clearBackgroundTypes = exports.configureBackgroundTypes = exports.enableBackgroundDelivery = exports.disableBackgroundDelivery = exports.disableAllBackgroundDelivery = exports.requestPerObjectReadAuthorization = 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 = exports.saveCategorySample = exports.deleteObjects = exports.requestAuthorization = 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.isProtectedDataAvailableAsync = exports.isProtectedDataAvailable = exports.startWatchApp = exports.saveWorkoutSample = exports.saveQuantitySample = exports.saveCorrelationSample = exports.saveCategorySample = exports.deleteObjects = exports.requestAuthorization = void 0;
 const react_native_1 = require("react-native");
 const useHealthkitAuthorization_1 = __importDefault(require("./hooks/useHealthkitAuthorization"));
 exports.useHealthkitAuthorization = useHealthkitAuthorization_1.default;
@@ -129,6 +129,7 @@ exports.saveQuantitySample = modules_1.QuantityTypes.saveQuantitySample.bind(mod
 exports.saveWorkoutSample = WorkoutBindings.saveWorkoutSample;
 exports.startWatchApp = modules_1.Workouts.startWatchAppWithWorkoutConfiguration.bind(modules_1.Workouts);
 exports.isProtectedDataAvailable = modules_1.Core.isProtectedDataAvailable.bind(modules_1.Core);
+exports.isProtectedDataAvailableAsync = modules_1.Core.isProtectedDataAvailableAsync.bind(modules_1.Core);
 exports.queryStateOfMindSamples = StateOfMindBindings.queryStateOfMindSamples;
 exports.queryStateOfMindSamplesWithAnchor = StateOfMindBindings.queryStateOfMindSamplesWithAnchor;
 exports.saveStateOfMindSample = StateOfMindBindings.saveStateOfMindSample;
@@ -205,6 +206,7 @@ exports.default = {
     subscribeToQuantitySamples: subscribeToQuantitySamples_1.subscribeToQuantitySamples,
     startWatchApp: exports.startWatchApp,
     isProtectedDataAvailable: exports.isProtectedDataAvailable,
+    isProtectedDataAvailableAsync: exports.isProtectedDataAvailableAsync,
     queryStateOfMindSamples: exports.queryStateOfMindSamples,
     queryStateOfMindSamplesWithAnchor: exports.queryStateOfMindSamplesWithAnchor,
     saveStateOfMindSample: exports.saveStateOfMindSample,

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.getWheelchairUseAsync = exports.getFitzpatrickSkinTypeAsync = exports.getDateOfBirthAsync = exports.getBloodTypeAsync = exports.getBiologicalSexAsync = exports.useStatisticsForQuantity = exports.useSources = exports.useIsHealthDataAvailable = exports.useHealthkitAuthorization = exports.useSubscribeToChanges = exports.useMostRecentWorkout = exports.getMostRecentWorkout = 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.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.clearBackgroundTypes = exports.configureBackgroundTypes = exports.enableBackgroundDelivery = exports.disableBackgroundDelivery = exports.disableAllBackgroundDelivery = exports.authorizationStatusFor = void 0;
-exports.requestMedicationsAuthorization = exports.subscribeToCategorySamples = exports.requestPerObjectReadAuthorization = exports.useSubscribeToCategorySamples = exports.useSubscribeToQuantitySamples = exports.queryMedicationEventsWithAnchor = exports.queryMedicationEvents = exports.queryMedications = exports.currentAppSource = exports.subscribeToQuantitySamples = void 0;
+exports.getFitzpatrickSkinTypeAsync = exports.getDateOfBirthAsync = exports.getBloodTypeAsync = exports.getBiologicalSexAsync = exports.useStatisticsForQuantity = exports.useSources = exports.useIsHealthDataAvailable = exports.useHealthkitAuthorization = exports.useSubscribeToChanges = exports.useMostRecentWorkout = exports.getMostRecentWorkout = 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.getWheelchairUse = exports.getFitzpatrickSkinType = exports.getDateOfBirth = exports.getBloodType = exports.getBiologicalSex = exports.areObjectTypesAvailableAsync = exports.areObjectTypesAvailable = exports.isObjectTypeAvailableAsync = exports.isObjectTypeAvailable = exports.isProtectedDataAvailableAsync = exports.isProtectedDataAvailable = exports.subscribeToChanges = exports.deleteObjects = exports.requestAuthorization = exports.querySources = exports.isHealthDataAvailableAsync = exports.isHealthDataAvailable = exports.getRequestStatusForAuthorization = exports.getPreferredUnits = exports.clearBackgroundTypes = exports.configureBackgroundTypes = exports.enableBackgroundDelivery = exports.disableBackgroundDelivery = exports.disableAllBackgroundDelivery = exports.authorizationStatusFor = void 0;
+exports.requestMedicationsAuthorization = exports.subscribeToCategorySamples = exports.requestPerObjectReadAuthorization = exports.useSubscribeToCategorySamples = exports.useSubscribeToQuantitySamples = exports.queryMedicationEventsWithAnchor = exports.queryMedicationEvents = exports.queryMedications = exports.currentAppSource = exports.subscribeToQuantitySamples = exports.getWheelchairUseAsync = void 0;
 exports.queryQuantitySamples = queryQuantitySamples;
 exports.queryQuantitySamplesWithAnchor = queryQuantitySamplesWithAnchor;
 exports.queryStatisticsForQuantity = queryStatisticsForQuantity;
@@ -67,6 +67,7 @@ exports.subscribeToChanges = UnavailableFnFromModule('subscribeToChanges', {
     remove: () => false,
 }); // Mocking the observer query UUID
 exports.isProtectedDataAvailable = UnavailableFnFromModule('isProtectedDataAvailable', false);
+exports.isProtectedDataAvailableAsync = UnavailableFnFromModule('isProtectedDataAvailableAsync', Promise.resolve(false));
 exports.isObjectTypeAvailable = UnavailableFnFromModule('isObjectTypeAvailable', false);
 exports.isObjectTypeAvailableAsync = UnavailableFnFromModule('isObjectTypeAvailableAsync', Promise.resolve(false));
 exports.areObjectTypesAvailable = UnavailableFnFromModule('areObjectTypesAvailable', {});
@@ -331,6 +332,7 @@ const HealthkitModule = {
     subscribeToChanges: exports.subscribeToChanges,
     startWatchApp: exports.startWatchApp,
     isProtectedDataAvailable: exports.isProtectedDataAvailable,
+    isProtectedDataAvailableAsync: exports.isProtectedDataAvailableAsync,
     queryStateOfMindSamples: exports.queryStateOfMindSamples,
     queryStateOfMindSamplesWithAnchor: exports.queryStateOfMindSamplesWithAnchor,
     saveStateOfMindSample: exports.saveStateOfMindSample,

package/lib/module/generated/healthkit.generated.js

@@ -132,6 +132,7 @@ export const CATEGORY_IDENTIFIER_IOS_AVAILABILITY = {
     HKCategoryTypeIdentifierAppleWalkingSteadinessEvent: '15.0',
     HKCategoryTypeIdentifierAudioExposureEvent: '13.0',
     HKCategoryTypeIdentifierBladderIncontinence: '14.0',
+    HKCategoryTypeIdentifierBleedingAfterMenopause: '27.0',
     HKCategoryTypeIdentifierBleedingAfterPregnancy: '18.0',
     HKCategoryTypeIdentifierBleedingDuringPregnancy: '18.0',
     HKCategoryTypeIdentifierBloating: '13.6',
@@ -169,6 +170,7 @@ export const CATEGORY_IDENTIFIER_IOS_AVAILABILITY = {
     HKCategoryTypeIdentifierLowerBackPain: '13.6',
     HKCategoryTypeIdentifierLowHeartRateEvent: '12.2',
     HKCategoryTypeIdentifierMemoryLapse: '14.0',
+    HKCategoryTypeIdentifierMenopausalState: '27.0',
     HKCategoryTypeIdentifierMenstrualFlow: '9.0',
     HKCategoryTypeIdentifierMindfulSession: '10.0',
     HKCategoryTypeIdentifierMoodChanges: '13.6',
@@ -326,6 +328,7 @@ export const CATEGORY_IDENTIFIER_VALUE_ENUMS = {
     HKCategoryTypeIdentifierAppleWalkingSteadinessEvent: 'CategoryValueAppleWalkingSteadinessEvent',
     HKCategoryTypeIdentifierAudioExposureEvent: null,
     HKCategoryTypeIdentifierBladderIncontinence: 'CategoryValueSeverity',
+    HKCategoryTypeIdentifierBleedingAfterMenopause: 'CategoryValueVaginalBleeding',
     HKCategoryTypeIdentifierBleedingAfterPregnancy: 'CategoryValueVaginalBleeding',
     HKCategoryTypeIdentifierBleedingDuringPregnancy: 'CategoryValueVaginalBleeding',
     HKCategoryTypeIdentifierBloating: 'CategoryValueSeverity',
@@ -363,6 +366,7 @@ export const CATEGORY_IDENTIFIER_VALUE_ENUMS = {
     HKCategoryTypeIdentifierLowerBackPain: 'CategoryValueSeverity',
     HKCategoryTypeIdentifierLowHeartRateEvent: 'CategoryValue',
     HKCategoryTypeIdentifierMemoryLapse: 'CategoryValueSeverity',
+    HKCategoryTypeIdentifierMenopausalState: 'CategoryValueMenopausalState',
     HKCategoryTypeIdentifierMenstrualFlow: 'CategoryValueMenstrualFlow',
     HKCategoryTypeIdentifierMindfulSession: 'CategoryValue',
     HKCategoryTypeIdentifierMoodChanges: 'CategoryValuePresence',
@@ -472,6 +476,12 @@ export var CategoryValueLowCardioFitnessEvent;
 (function (CategoryValueLowCardioFitnessEvent) {
     CategoryValueLowCardioFitnessEvent[CategoryValueLowCardioFitnessEvent["lowFitness"] = 1] = "lowFitness";
 })(CategoryValueLowCardioFitnessEvent || (CategoryValueLowCardioFitnessEvent = {}));
+export var CategoryValueMenopausalState;
+(function (CategoryValueMenopausalState) {
+    CategoryValueMenopausalState[CategoryValueMenopausalState["menopause"] = 1] = "menopause";
+    CategoryValueMenopausalState[CategoryValueMenopausalState["perimenopause"] = 2] = "perimenopause";
+    CategoryValueMenopausalState[CategoryValueMenopausalState["none"] = 3] = "none";
+})(CategoryValueMenopausalState || (CategoryValueMenopausalState = {}));
 export var CategoryValueMenstrualFlow;
 (function (CategoryValueMenstrualFlow) {
     CategoryValueMenstrualFlow[CategoryValueMenstrualFlow["unspecified"] = 1] = "unspecified";
@@ -721,6 +731,8 @@ export var WorkoutActivityType;
     WorkoutActivityType[WorkoutActivityType["swimBikeRun"] = 82] = "swimBikeRun";
     WorkoutActivityType[WorkoutActivityType["transition"] = 83] = "transition";
     WorkoutActivityType[WorkoutActivityType["underwaterDiving"] = 84] = "underwaterDiving";
+    WorkoutActivityType[WorkoutActivityType["rest"] = 2998] = "rest";
+    WorkoutActivityType[WorkoutActivityType["group"] = 2999] = "group";
     WorkoutActivityType[WorkoutActivityType["other"] = 3000] = "other";
 })(WorkoutActivityType || (WorkoutActivityType = {}));
 export var WorkoutEventType;

package/lib/module/healthkit.ios.js

@@ -92,6 +92,7 @@ export const saveQuantitySample = QuantityTypes.saveQuantitySample.bind(Quantity
 export const saveWorkoutSample = WorkoutBindings.saveWorkoutSample;
 export const startWatchApp = Workouts.startWatchAppWithWorkoutConfiguration.bind(Workouts);
 export const isProtectedDataAvailable = Core.isProtectedDataAvailable.bind(Core);
+export const isProtectedDataAvailableAsync = Core.isProtectedDataAvailableAsync.bind(Core);
 export const queryStateOfMindSamples = StateOfMindBindings.queryStateOfMindSamples;
 export const queryStateOfMindSamplesWithAnchor = StateOfMindBindings.queryStateOfMindSamplesWithAnchor;
 export const saveStateOfMindSample = StateOfMindBindings.saveStateOfMindSample;
@@ -168,6 +169,7 @@ export default {
     subscribeToQuantitySamples,
     startWatchApp,
     isProtectedDataAvailable,
+    isProtectedDataAvailableAsync,
     queryStateOfMindSamples,
     queryStateOfMindSamplesWithAnchor,
     saveStateOfMindSample,