@kingstinct/react-native-healthkit 15.1.0 → 16.1.0

package/README.md

@@ -15,7 +15,7 @@ React Native bindings for HealthKit with full TypeScript and Promise support cov
 | 75+ Workout Activity Types  | ✅    | ✅    | ✅       | Swimming, running, table tennis etc..  |
 | Correlation Types           | ✅    | ✅    | ✅       | Food and blood pressure                |
 | Document Types              | ✅    | ❌    | ✅       | [CDA documents](https://developer.apple.com/documentation/healthkit/hkcdadocument) exposed as Base64 data  |
-| Clinical Records            | ⚠️    | ❌    | ⚠️       | Lab results etc in [FHIR JSON format](https://www.hl7.org/fhir/json.html) (see [Clinical Records](https://github.com/kingstinct/react-native-healthkit#clinical-records))  |
+| Clinical Records            | ✅    | ❌    | ✅       | Lab results, immunizations etc. as [FHIR](https://www.hl7.org/fhir/json.html) via [`@react-native-healthkit/health-records`](#clinical-records) |
 
 ### Disclaimer
 
@@ -23,6 +23,8 @@ This library is provided as-is without any warranty and is not affiliated with A
 
 ## Installation
 
+[`@react-native-healthkit/core`](packages/core) holds the code shared with [`@react-native-healthkit/health-records`](packages/health-records): types, config plugin building blocks and the `ReactNativeHealthkitCore` pod. It is a regular dependency pinned to an exact version, so your package manager installs the matching copy for you and there is no version to keep in sync. In a bare React Native app you additionally need it in your own `package.json`, because the React Native CLI only autolinks packages listed there.
+
 ### Expo
 Usage with Expo is possible - just keep in mind it will not work in Expo Go and [you'll need to roll your own Dev Client](https://docs.expo.dev/development/getting-started/). 
 
@@ -52,7 +54,9 @@ this will give you defaults that make the app build without any further configur
 3. Build a new Dev Client
 
 ### Native or Expo Bare Workflow
-1. `yarn add @kingstinct/react-native-healthkit react-native-nitro-modules`
+1. `yarn add @kingstinct/react-native-healthkit @react-native-healthkit/core react-native-nitro-modules`
+
+   `@react-native-healthkit/core` is installed automatically as a dependency, but the React Native CLI only autolinks packages listed in your own `package.json`, so name it explicitly here.
 2. `npx pod-install`
 3. Set `NSHealthUpdateUsageDescription` and `NSHealthShareUsageDescription` in your `Info.plist` 
 4. Enable the HealthKit capability for the project in Xcode.
@@ -202,7 +206,22 @@ We're striving to do as straight a mapping as possible to the Native Libraries.
 
 ## Clinical Records
 
-For accessing Clinical Records use old version (3.x) or use specific branch "including-clinical-records". The reason is we cannot refer to this code natively in apps without getting approval from Apple, this could probably be solved by the config plugin but we haven't had time to look into it yet.
+Clinical health records (allergies, conditions, immunizations, lab results, medications, procedures, vital signs, clinical notes and coverage) live in a separate package, [`@react-native-healthkit/health-records`](https://github.com/kingstinct/react-native-healthkit/tree/master/packages/health-records), so apps that don't need them avoid the extra entitlement and App Review scrutiny.
+
+- Records are read-only and delivered as FHIR resources, with anchored queries, change subscriptions and background delivery.
+- The app needs the HealthKit **Clinical Health Records** capability (`health-records` in `com.apple.developer.healthkit.access`) and an `NSHealthClinicalHealthRecordsShareUsageDescription`. Its Expo config plugin sets up both.
+- Health Records are only available in supported regions and never on the simulator, so check `supportsHealthRecords()` before offering the feature.
+
+```ts
+import { supportsHealthRecords, requestAuthorization, queryClinicalRecords } from '@react-native-healthkit/health-records'
+
+if (supportsHealthRecords()) {
+  await requestAuthorization(['HKClinicalTypeIdentifierLabResultRecord'])
+  const labResults = await queryClinicalRecords('HKClinicalTypeIdentifierLabResultRecord', { limit: 0 })
+}
+```
+
+See the [health-records README](https://github.com/kingstinct/react-native-healthkit/blob/master/packages/health-records/README.md) for installation, configuration and the full API.
 
 ## Android alternatives
 

package/ReactNativeHealthkit.podspec

@@ -1,7 +1,12 @@
 require "json"
+require "pathname"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
+# Resolved like Node resolves the dependency, so monorepo and node_modules layouts both work.
+core_ios_dir = Pathname.new(File.join(File.dirname(`node --print "require.resolve('@react-native-healthkit/core/package.json', { paths: ['#{__dir__}'] })"`.strip), "ios"))
+  .relative_path_from(Pathname.new(__dir__)).to_s
+
 Pod::Spec.new do |s|
   s.name         = "ReactNativeHealthkit"
   s.version      = package["version"]
@@ -16,20 +21,17 @@ Pod::Spec.new do |s|
   s.source_files = [
     # Implementation (Swift)
     "ios/**/*.{swift}",
-    # Autolinking/Registration (Objective-C++)
-    "ios/**/*.{m,mm}",
-    # Implementation (C++ objects)
+        # Implementation (C++ objects)
     "cpp/**/*.{hpp,cpp}",
   ]
 
-  s.public_header_files = "ios/**/*.h"
-
   s.pod_target_xcconfig = {
     # C++ compiler flags, mainly for folly.
     "GCC_PREPROCESSOR_DEFINITIONS" => "$(inherited) FOLLY_NO_CONFIG FOLLY_CFG_NO_COROUTINES",
     # Allow importing Objective-C headers in Swift without bridging header
     "CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
-    "SWIFT_INCLUDE_PATHS" => "$(inherited) $(PODS_TARGET_SRCROOT)/ios"
+    # Core's `internal import ReactNativeHealthkitCore_Private` must resolve here too (explicit module builds).
+    "SWIFT_INCLUDE_PATHS" => "$(inherited) \"$(PODS_TARGET_SRCROOT)/#{core_ios_dir}\""
   }
 
   load 'nitrogen/generated/ios/ReactNativeHealthkit+autolinking.rb'
@@ -45,6 +47,15 @@ Pod::Spec.new do |s|
     :execution_position => :before_compile,
   }
 
+  # The three packages are released in lockstep on a single version (changesets
+  # `fixed`), so the only combination this pod is ever built and tested against
+  # is a core of the exact same version. Requiring that here turns a mismatch --
+  # including a mixed-version family, e.g. this pod at 16.0.0 next to its
+  # sibling at 16.1.0 -- into a `pod install` version conflict naming both pods,
+  # instead of a Swift compile error inside Pods or a runtime surprise. Core's
+  # Swift surface is internal to these packages and is not semver-managed, so a
+  # same-major requirement would not be enough.
+  s.dependency 'ReactNativeHealthkitCore', s.version.to_s
   s.dependency 'React-jsi'
   s.dependency 'React-callinvoker'
   install_modules_dependencies(s)

package/app.plugin.js

@@ -7,43 +7,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_plugins_1 = require("@expo/config-plugins");
+const plugin_1 = require("@react-native-healthkit/core/plugin");
 const package_json_1 = __importDefault(require("./package.json"));
-const withEntitlementsPlugin = (config, props) => {
-    return (0, config_plugins_1.withEntitlementsPlist)(config, (configPlist) => {
-        configPlist.modResults['com.apple.developer.healthkit'] = true;
-        // background is enabled by default, but possible to opt-out from
-        // (haven't seen any drawbacks from having it enabled)
-        if (props?.background !== false) {
-            configPlist.modResults['com.apple.developer.healthkit.background-delivery'] = true;
-        }
-        return configPlist;
-    });
-};
-const withInfoPlistPlugin = (config, props) => {
-    return (0, config_plugins_1.withInfoPlist)(config, (configPlist) => {
-        const existingShareDescription = configPlist.modResults.NSHealthShareUsageDescription;
-        configPlist.modResults.NSHealthShareUsageDescription =
-            typeof props?.NSHealthShareUsageDescription === 'string'
-                ? props.NSHealthShareUsageDescription
-                : typeof existingShareDescription === 'string'
-                    ? existingShareDescription
-                    : `${config.name ?? package_json_1.default.name} wants to read your health data`;
-        if (props?.NSHealthUpdateUsageDescription !== false) {
-            const existingUpdateDescription = configPlist.modResults.NSHealthUpdateUsageDescription;
-            configPlist.modResults.NSHealthUpdateUsageDescription =
-                typeof props?.NSHealthUpdateUsageDescription === 'string'
-                    ? props.NSHealthUpdateUsageDescription
-                    : typeof existingUpdateDescription === 'string'
-                        ? existingUpdateDescription
-                        : `${config.name ?? package_json_1.default.name} wants to update your health data`;
-        }
-        return configPlist;
-    });
-};
 const healthkitAppPlugin = (config, props) => {
+    const withUpdateUsageDescription = (config) => props?.NSHealthUpdateUsageDescription === false
+        ? config
+        : (0, plugin_1.withUsageDescription)(config, {
+            key: 'NSHealthUpdateUsageDescription',
+            value: props?.NSHealthUpdateUsageDescription,
+            fallback: (appName) => `${appName} wants to update your health data`,
+            fallbackAppName: package_json_1.default.name,
+        });
     return (0, config_plugins_1.withPlugins)(config, [
-        [withEntitlementsPlugin, props],
-        [withInfoPlistPlugin, props],
+        [
+            plugin_1.withHealthKit,
+            {
+                background: props?.background,
+                NSHealthShareUsageDescription: props?.NSHealthShareUsageDescription,
+                fallbackAppName: package_json_1.default.name,
+            },
+        ],
+        withUpdateUsageDescription,
     ]);
 };
 exports.default = (0, config_plugins_1.createRunOncePlugin)(healthkitAppPlugin, package_json_1.default.name, package_json_1.default.version);

package/app.plugin.ts

@@ -1,10 +1,12 @@
 import {
   type ConfigPlugin,
   createRunOncePlugin,
-  withEntitlementsPlist,
-  withInfoPlist,
   withPlugins,
 } from '@expo/config-plugins'
+import {
+  withHealthKit,
+  withUsageDescription,
+} from '@react-native-healthkit/core/plugin'
 
 import pkg from './package.json'
 
@@ -19,60 +21,33 @@ type AppPluginConfig = InfoPlistConfig & {
   /**
    * Adds the background-delivery entitlement. Enabled by default; set to
    * `false` to opt out. Launch-time observer registration needs no AppDelegate
-   * change: the pod hooks UIApplicationDidFinishLaunchingNotification itself
-   * (see ios/BackgroundLaunchHook.mm).
+   * change: the core pod hooks UIApplicationDidFinishLaunchingNotification
+   * itself.
    */
   background?: BackgroundConfig
 }
 
-const withEntitlementsPlugin: ConfigPlugin<{
-  background?: BackgroundConfig
-}> = (config, props) => {
-  return withEntitlementsPlist(config, (configPlist) => {
-    configPlist.modResults['com.apple.developer.healthkit'] = true
-
-    // background is enabled by default, but possible to opt-out from
-    // (haven't seen any drawbacks from having it enabled)
-    if (props?.background !== false) {
-      configPlist.modResults[
-        'com.apple.developer.healthkit.background-delivery'
-      ] = true
-    }
-
-    return configPlist
-  })
-}
-
-const withInfoPlistPlugin: ConfigPlugin<InfoPlistConfig> = (config, props) => {
-  return withInfoPlist(config, (configPlist) => {
-    const existingShareDescription =
-      configPlist.modResults.NSHealthShareUsageDescription
-    configPlist.modResults.NSHealthShareUsageDescription =
-      typeof props?.NSHealthShareUsageDescription === 'string'
-        ? props.NSHealthShareUsageDescription
-        : typeof existingShareDescription === 'string'
-          ? existingShareDescription
-          : `${config.name ?? pkg.name} wants to read your health data`
-
-    if (props?.NSHealthUpdateUsageDescription !== false) {
-      const existingUpdateDescription =
-        configPlist.modResults.NSHealthUpdateUsageDescription
-      configPlist.modResults.NSHealthUpdateUsageDescription =
-        typeof props?.NSHealthUpdateUsageDescription === 'string'
-          ? props.NSHealthUpdateUsageDescription
-          : typeof existingUpdateDescription === 'string'
-            ? existingUpdateDescription
-            : `${config.name ?? pkg.name} wants to update your health data`
-    }
-
-    return configPlist
-  })
-}
-
 const healthkitAppPlugin: ConfigPlugin<AppPluginConfig> = (config, props) => {
+  const withUpdateUsageDescription: ConfigPlugin = (config) =>
+    props?.NSHealthUpdateUsageDescription === false
+      ? config
+      : withUsageDescription(config, {
+          key: 'NSHealthUpdateUsageDescription',
+          value: props?.NSHealthUpdateUsageDescription,
+          fallback: (appName) => `${appName} wants to update your health data`,
+          fallbackAppName: pkg.name,
+        })
+
   return withPlugins(config, [
-    [withEntitlementsPlugin, props],
-    [withInfoPlistPlugin, props],
+    [
+      withHealthKit,
+      {
+        background: props?.background,
+        NSHealthShareUsageDescription: props?.NSHealthShareUsageDescription,
+        fallbackAppName: pkg.name,
+      },
+    ],
+    withUpdateUsageDescription,
   ])
 }
 

package/ios/CategoryTypeModule.swift

@@ -1,5 +1,6 @@
 import HealthKit
 import NitroModules
+import ReactNativeHealthkitCore
 
 class CategoryTypeModule: HybridCategoryTypeModuleSpec {
     func saveCategorySample(

package/ios/CharacteristicTypeModule.swift

@@ -1,5 +1,6 @@
 import HealthKit
 import NitroModules
+import ReactNativeHealthkitCore
 
 class CharacteristicTypeModule: HybridCharacteristicTypeModuleSpec {
   func getBloodTypeAsync() -> Promise<BloodType> {
@@ -32,10 +33,10 @@ class CharacteristicTypeModule: HybridCharacteristicTypeModuleSpec {
     }
   }
 
-  // Using the global 'store' instance defined in Auth.swift
+  // Uses the healthStore shared through ReactNativeHealthkitCore
 
   func getBiologicalSex() throws -> BiologicalSex {
-    let biologicalSexObject = try store.biologicalSex()
+    let biologicalSexObject = try healthStore.biologicalSex()
     if let biologicalSex = BiologicalSex(
       rawValue: Int32(biologicalSexObject.biologicalSex.rawValue)) {
       return biologicalSex
@@ -46,7 +47,7 @@ class CharacteristicTypeModule: HybridCharacteristicTypeModuleSpec {
 
   func getDateOfBirth() throws -> Date? {
     do {
-      let components = try store.dateOfBirthComponents()
+      let components = try healthStore.dateOfBirthComponents()
       return components.date
     } catch {
       let nsError = error as NSError
@@ -69,7 +70,7 @@ class CharacteristicTypeModule: HybridCharacteristicTypeModuleSpec {
   }
 
   func getBloodType() throws -> BloodType {
-    let bloodTypeObject = try store.bloodType()
+    let bloodTypeObject = try healthStore.bloodType()
 
     if let bloodType = BloodType(rawValue: Int32(bloodTypeObject.bloodType.rawValue)) {
       return bloodType
@@ -80,7 +81,7 @@ class CharacteristicTypeModule: HybridCharacteristicTypeModuleSpec {
   }
 
   func getFitzpatrickSkinType() throws -> FitzpatrickSkinType {
-    let skinTypeObject = try store.fitzpatrickSkinType()
+    let skinTypeObject = try healthStore.fitzpatrickSkinType()
 
     if let skinType = FitzpatrickSkinType(rawValue: Int32(skinTypeObject.skinType.rawValue)) {
       return skinType
@@ -91,7 +92,7 @@ class CharacteristicTypeModule: HybridCharacteristicTypeModuleSpec {
   }
 
   func getWheelchairUse() throws -> WheelchairUse {
-    let wheelchairUseObject = try store.wheelchairUse()
+    let wheelchairUseObject = try healthStore.wheelchairUse()
     if let wheelChairUse = WheelchairUse(
       rawValue: Int32(wheelchairUseObject.wheelchairUse.rawValue)) {
       return wheelChairUse

package/ios/Constants.swift

@@ -7,6 +7,15 @@
 
 import Foundation
 import HealthKit
+import ReactNativeHealthkitCore
+
+let logPrefix = "[react-native-healthkit]"
+
+/// Namespaces this package's persisted background-delivery types in the shared
+/// BackgroundDeliveryManager. The id matches the UserDefaults keys used before
+/// the manager moved to ReactNativeHealthkitCore, so existing installs keep
+/// their configuration.
+let backgroundDeliveryScope = BackgroundDeliveryScope(id: "com.kingstinct.healthkit")
 
 let INIT_ERROR = "HEALTHKIT_INIT_ERROR"
 let INIT_ERROR_MESSAGE = "HealthKit not initialized"
@@ -14,17 +23,7 @@ let TYPE_IDENTIFIER_ERROR = "HEALTHKIT_TYPE_IDENTIFIER_NOT_RECOGNIZED_ERROR"
 let QUERY_ERROR = "HEALTHKIT_QUERY_ERROR"
 let GENERIC_ERROR = "HEALTHKIT_ERROR"
 
-let HKCharacteristicTypeIdentifier_PREFIX = "HKCharacteristicTypeIdentifier"
-let HKQuantityTypeIdentifier_PREFIX = "HKQuantityTypeIdentifier"
-let HKCategoryTypeIdentifier_PREFIX = "HKCategoryTypeIdentifier"
-let HKCorrelationTypeIdentifier_PREFIX = "HKCorrelationTypeIdentifier"
 let HKActivitySummaryTypeIdentifier = "HKActivitySummaryTypeIdentifier"
-let HKAudiogramTypeIdentifier = "HKAudiogramSampleType"
-let HKWorkoutTypeIdentifier = "HKWorkoutTypeIdentifier"
-let HKWorkoutRouteTypeIdentifier = "HKWorkoutRouteTypeIdentifier"
-let HKDataTypeIdentifierHeartbeatSeries = "HKDataTypeIdentifierHeartbeatSeries"
-let HKStateOfMindTypeIdentifier = "HKStateOfMindTypeIdentifier"
-let HKElectrocardiogramType = "HKElectrocardiogramType"
 
 let HKWorkoutActivityTypePropertyName = "activityType"
 let HKWorkoutSessionLocationTypePropertyName = "locationType"
@@ -34,27 +33,3 @@ let SpeedUnit =  HKUnit(from: "m/s") // HKUnit.meter().unitDivided(by: HKUnit.se
 let METUnit = HKUnit(from: "kcal/hr·kg")
 
 let DEFAULT_QUERY_LIMIT = 20
-
-/// Apple renamed `HKCategoryTypeIdentifierAudioExposureEvent` to
-/// `HKCategoryTypeIdentifierEnvironmentalAudioExposureEvent` in iOS 14, but the new
-/// constant still carries the old raw string at runtime. Building the identifier from the
-/// modern name as a raw string therefore makes `categoryType(forIdentifier:)` return nil,
-/// and samples read back from HealthKit report the legacy name. These helpers translate
-/// in both directions so JS only ever sees the modern identifier.
-let HKCategoryTypeIdentifierEnvironmentalAudioExposureEvent_NAME =
-  "HKCategoryTypeIdentifierEnvironmentalAudioExposureEvent"
-let HKCategoryTypeIdentifierAudioExposureEvent_NAME = "HKCategoryTypeIdentifierAudioExposureEvent"
-
-func hkCategoryTypeIdentifier(fromIdentifierName name: String) -> HKCategoryTypeIdentifier {
-  if name == HKCategoryTypeIdentifierEnvironmentalAudioExposureEvent_NAME {
-    return .environmentalAudioExposureEvent
-  }
-  return HKCategoryTypeIdentifier(rawValue: name)
-}
-
-func categoryTypeIdentifierName(fromHealthKitIdentifier identifier: String) -> String {
-  if identifier == HKCategoryTypeIdentifierAudioExposureEvent_NAME {
-    return HKCategoryTypeIdentifierEnvironmentalAudioExposureEvent_NAME
-  }
-  return identifier
-}

package/ios/CoreModule.swift

@@ -1,5 +1,6 @@
 import HealthKit
 import NitroModules
+import ReactNativeHealthkitCore
 
 //
 //  Core.swift
@@ -8,8 +9,6 @@ import NitroModules
 //  Created by Robert Herber on 2025-05-28.
 //
 
-var store = HKHealthStore.init()
-
 // Thread-safe cache with concurrent read/exclusive write access
 private let quantityTypeCacheQueue = DispatchQueue(
   label: "com.kingstinct.healthkit.cache",
@@ -57,7 +56,7 @@ async throws -> [HKQuantityType: HKUnit] {
   }
 
   return try await withCheckedThrowingContinuation { continuation in
-    store.preferredUnits(for: Set(quantityTypes)) {
+    healthStore.preferredUnits(for: Set(quantityTypes)) {
       (typePerUnits: [HKQuantityType: HKUnit], error: Error?) in
       DispatchQueue.main.async {
         if let error = error {
@@ -82,7 +81,7 @@ class CoreModule: HybridCoreModuleSpec {
     return Promise.async {
       let objectType = try perObjectTypeFrom(objectTypeIdentifier: typeIdentifier)
       if #available(iOS 16.0, *) {
-        try await store.requestPerObjectReadAuthorization(
+        try await healthStore.requestPerObjectReadAuthorization(
           for: objectType,
           predicate: nil
         )
@@ -92,6 +91,37 @@ class CoreModule: HybridCoreModuleSpec {
     }
   }
 
+  func getEarliestAuthorizedSampleDates(objectTypeIdentifiers: [ObjectTypeIdentifier]) -> Promise<
+    [String: Date]
+  > {
+    return Promise.async {
+      #if compiler(>=6.4)
+        if #available(iOS 27.0, *) {
+          let objectTypes = objectTypesFromArray(typeIdentifiers: objectTypeIdentifiers)
+
+          if objectTypes.isEmpty {
+            return [String: Date]()
+          }
+
+          let earliestDates = try await healthStore.earliestAuthorizedSampleDate(for: objectTypes)
+
+          return earliestDates.reduce(into: [String: Date]()) { result, entry in
+            result[entry.key.identifier] = entry.value
+          }
+        }
+      #else
+        if #available(iOS 27.0, *) {
+          warnWithPrefix(
+            "getEarliestAuthorizedSampleDates needs to be built with Xcode 27.0 or later to report limited-access dates"
+          )
+        }
+      #endif
+
+      // Before iOS 27 there is no limited-access earliest date, so no type has one.
+      return [String: Date]()
+    }
+  }
+
   func currentAppSource() -> any HybridSourceProxySpec {
     return SourceProxy(source: HKSource.default())
   }
@@ -133,7 +163,7 @@ class CoreModule: HybridCoreModuleSpec {
   ) throws -> AuthorizationStatus {
     let objectType = try objectTypeFrom(objectTypeIdentifier: type)
 
-    let authStatus = store.authorizationStatus(for: objectType)
+    let authStatus = healthStore.authorizationStatus(for: objectType)
 
     if let authStatus = AuthorizationStatus(rawValue: Int32(authStatus.rawValue)) {
       return authStatus
@@ -157,27 +187,27 @@ class CoreModule: HybridCoreModuleSpec {
             returning: .unnecessary
           )
         }
-        var caughtError: NSError?
-        let started = RunBlockCatchingObjCExceptions({
-          store.getRequestStatusForAuthorization(toShare: toShare, read: toRead) {
-            status, error in
-            DispatchQueue.main.async {
-              if let error = error {
-                continuation.resume(throwing: error)
-              } else {
-                if let authStatus = AuthorizationRequestStatus(rawValue: Int32(status.rawValue)) {
-                  continuation.resume(returning: authStatus)
+        do {
+          try runCatchingObjCExceptions {
+            healthStore.getRequestStatusForAuthorization(toShare: toShare, read: toRead) {
+              status, error in
+              DispatchQueue.main.async {
+                if let error = error {
+                  continuation.resume(throwing: error)
                 } else {
-                  continuation.resume(
-                    throwing: runtimeErrorWithPrefix(
-                      "Unrecognized authStatus returned: \(status.rawValue)"))
+                  if let authStatus = AuthorizationRequestStatus(rawValue: Int32(status.rawValue)) {
+                    continuation.resume(returning: authStatus)
+                  } else {
+                    continuation.resume(
+                      throwing: runtimeErrorWithPrefix(
+                        "Unrecognized authStatus returned: \(status.rawValue)"))
+                  }
                 }
               }
             }
           }
-        }, &caughtError)
-        if !started, let caughtError {
-          continuation.resume(throwing: caughtError)
+        } catch {
+          continuation.resume(throwing: error)
         }
       }
     }
@@ -189,20 +219,20 @@ class CoreModule: HybridCoreModuleSpec {
       let toRead = objectTypesFromArray(typeIdentifiers: toRequest.toRead ?? [])
 
       return try await withCheckedThrowingContinuation { continuation in
-        var caughtError: NSError?
-        let started = RunBlockCatchingObjCExceptions({
-          store.requestAuthorization(toShare: share, read: toRead) { status, error in
-            DispatchQueue.main.async {
-              if let error = error {
-                continuation.resume(throwing: error)
-              } else {
-                continuation.resume(returning: status)
+        do {
+          try runCatchingObjCExceptions {
+            healthStore.requestAuthorization(toShare: share, read: toRead) { status, error in
+              DispatchQueue.main.async {
+                if let error = error {
+                  continuation.resume(throwing: error)
+                } else {
+                  continuation.resume(returning: status)
+                }
               }
             }
           }
-        }, &caughtError)
-        if !started, let caughtError {
-          continuation.resume(throwing: caughtError)
+        } catch {
+          continuation.resume(throwing: error)
         }
       }
     }
@@ -243,7 +273,7 @@ class CoreModule: HybridCoreModuleSpec {
           }
         }
 
-        store.execute(query)
+        healthStore.execute(query)
       }
     }
   }
@@ -255,7 +285,7 @@ class CoreModule: HybridCoreModuleSpec {
       if let frequency = HKUpdateFrequency(rawValue: Int(updateFrequency.rawValue)) {
         let type = try objectTypeFrom(objectTypeIdentifier: typeIdentifier)
         return try await withCheckedThrowingContinuation { continuation in
-          store.enableBackgroundDelivery(
+          healthStore.enableBackgroundDelivery(
             for: type,
             frequency: frequency
           ) { (success, error) in
@@ -280,7 +310,7 @@ class CoreModule: HybridCoreModuleSpec {
     return Promise.async {
       let type = try objectTypeFrom(objectTypeIdentifier: typeIdentifier)
       return try await withCheckedThrowingContinuation { continuation in
-        store.disableBackgroundDelivery(
+        healthStore.disableBackgroundDelivery(
           for: type
         ) { (success, error) in
           DispatchQueue.main.async {
@@ -297,7 +327,7 @@ class CoreModule: HybridCoreModuleSpec {
   func disableAllBackgroundDelivery() -> Promise<Bool> {
     return Promise.async {
       try await withCheckedThrowingContinuation { continuation in
-        store.disableAllBackgroundDelivery(completion: { (success, error) in
+        healthStore.disableAllBackgroundDelivery(completion: { (success, error) in
           DispatchQueue.main.async {
             guard let err = error else {
               return continuation.resume(returning: success)
@@ -377,7 +407,7 @@ class CoreModule: HybridCoreModuleSpec {
 
         let of = try sampleTypeFrom(sampleTypeIdentifierWriteable: objectTypeIdentifier)
         return try await withCheckedThrowingContinuation { continuation in
-          store.deleteObjects(of: of, predicate: predicate) { (_, count, error) in
+          healthStore.deleteObjects(of: of, predicate: predicate) { (_, count, error) in
             DispatchQueue.main.async {
               if let error = error {
                 continuation.resume(throwing: error)
@@ -442,7 +472,7 @@ class CoreModule: HybridCoreModuleSpec {
 
     }
 
-    store.execute(query)
+    healthStore.execute(query)
 
     self._runningQueries.updateValue(query, forKey: queryId)
 
@@ -463,7 +493,7 @@ class CoreModule: HybridCoreModuleSpec {
       return false
     }
 
-    store.stop(query)
+    healthStore.stop(query)
 
     self._runningQueries.removeValue(forKey: queryId)
 
@@ -485,6 +515,7 @@ class CoreModule: HybridCoreModuleSpec {
       }
 
       BackgroundDeliveryManager.shared.configure(
+        scope: backgroundDeliveryScope,
         typeIdentifiers: typeIdentifiers,
         frequency: frequency
       )
@@ -495,7 +526,7 @@ class CoreModule: HybridCoreModuleSpec {
 
   func clearBackgroundTypes() -> Promise<Bool> {
     return Promise.async {
-      BackgroundDeliveryManager.shared.clearConfiguration()
+      BackgroundDeliveryManager.shared.clearConfiguration(scope: backgroundDeliveryScope)
       return true
     }
   }
@@ -503,7 +534,7 @@ class CoreModule: HybridCoreModuleSpec {
   func unsubscribeQueries(queryIds: [String]) -> Double {
     let successCounts = queryIds.map { queryId in
       if let query = self._runningQueries[queryId] {
-        store.stop(query)
+        healthStore.stop(query)
 
         self._runningQueries.removeValue(forKey: queryId)
 

package/ios/CorrelationTypeModule.swift

@@ -1,5 +1,6 @@
 import HealthKit
 import NitroModules
+import ReactNativeHealthkitCore
 
 func serializeCorrelationSample(correlation: HKCorrelation, unitMap: [HKQuantityType: HKUnit])
   -> CorrelationSample {
@@ -28,10 +29,10 @@ func serializeCorrelationSample(correlation: HKCorrelation, unitMap: [HKQuantity
     startDate: correlation.startDate,
     endDate: correlation.endDate,
     hasUndeterminedDuration: correlation.hasUndeterminedDuration,
-    metadata: serializeMetadata(correlation.metadata),
     uuid: correlation.uuid.uuidString,
     sourceRevision: serializeSourceRevision(correlation.sourceRevision),
-    device: serializeDevice(hkDevice: correlation.device)
+    device: serializeDevice(hkDevice: correlation.device),
+    metadata: serializeMetadata(correlation.metadata)
   )
 }