@kingstinct/react-native-healthkit 11.1.2 → 12.1.0

package/README.md

@@ -84,14 +84,16 @@ Some imperative examples:
   const isAvailable = await isHealthDataAvailable();
 
   /* Read latest sample of any data */
-  await requestAuthorization(['HKQuantityTypeIdentifierBodyFatPercentage']); // request read permission for bodyFatPercentage
+  await requestAuthorization({ toRead: ['HKQuantityTypeIdentifierBodyFatPercentage'] }); // request read permission for bodyFatPercentage
 
   const { quantity, unit, startDate, endDate } = await getMostRecentQuantitySample('HKQuantityTypeIdentifierBodyFatPercentage'); // read latest sample
   
   console.log(quantity) // 17.5
   console.log(unit) // %
 
-  await requestAuthorization(['HKQuantityTypeIdentifierHeartRate']); // request read permission for heart rate
+  await requestAuthorization({
+    toRead: ['HKQuantityTypeIdentifierHeartRate']
+  }); // request read permission for heart rate
 
   /* Subscribe to data (Make sure to request permissions before subscribing to changes) */
   const [hasRequestedAuthorization, setHasRequestedAuthorization] = useState(false);
@@ -113,7 +115,7 @@ Some imperative examples:
   }, [hasRequestedAuthorization]);
 
   /* write data */
-  await requestAuthorization([], ['HKQuantityTypeIdentifierInsulinDelivery']); // request write permission for insulin delivery
+  await requestAuthorization({ toShare: ['HKQuantityTypeIdentifierInsulinDelivery'] }); // request write permission for insulin delivery
 
   saveQuantitySample(
       'HKQuantityTypeIdentifierInsulinDelivery',

package/ios/CoreModule.swift

@@ -109,9 +109,9 @@ class CoreModule: HybridCoreModuleSpec {
         throw RuntimeError.error(withMessage: "[react-native-healthkit] got unrecognized AuthorizationStatus with value \(authStatus.rawValue)")
     }
 
-    func getRequestStatusForAuthorization(toShare: [SampleTypeIdentifierWriteable], toRead: [ObjectTypeIdentifier]) throws -> Promise<AuthorizationRequestStatus> {
-        let toShare = sampleTypesFromArray(typeIdentifiersWriteable: toShare)
-        let toRead = objectTypesFromArray(typeIdentifiers: toRead)
+    func getRequestStatusForAuthorization(toCheck: AuthDataTypes) throws -> Promise<AuthorizationRequestStatus> {
+        let toShare = sampleTypesFromArray(typeIdentifiersWriteable: toCheck.toShare ?? [])
+        let toRead = objectTypesFromArray(typeIdentifiers: toCheck.toRead ?? [])
 
         return Promise.async {
             try await withCheckedThrowingContinuation { continuation in
@@ -131,9 +131,9 @@ class CoreModule: HybridCoreModuleSpec {
         }
     }
 
-    func requestAuthorization(toShare: [SampleTypeIdentifierWriteable], toRead: [ObjectTypeIdentifier]) throws -> Promise<Bool> {
-        let share = sampleTypesFromArray(typeIdentifiersWriteable: toShare)
-        let toRead = objectTypesFromArray(typeIdentifiers: toRead)
+    func requestAuthorization(toRequest: AuthDataTypes) throws -> Promise<Bool> {
+        let share = sampleTypesFromArray(typeIdentifiersWriteable: toRequest.toShare ?? [])
+        let toRead = objectTypesFromArray(typeIdentifiers: toRequest.toRead ?? [])
 
         return Promise.async {
             try await withCheckedThrowingContinuation { continuation in

package/ios/Helpers.swift

@@ -29,7 +29,7 @@ func getQueryLimit(_ limit: Double?) -> Int {
         return Int(limit)
     }
 
-    return DEFAULT_QUERY_LIMIT
+    return HKObjectQueryNoLimit
 }
 
 func createPredicateForWorkout(filter: PredicateForWorkouts) throws -> NSPredicate {
@@ -144,12 +144,12 @@ func createMetadataPredicate(metadataKey: PredicateWithMetadataKey) throws -> NS
     let actualValue: Any
 
     switch valueVariant {
-      case .first(let stringValue):
+      case .first(let boolValue):
+          actualValue = NSNumber(value: boolValue ? 1 : 0)
+      case .second(let stringValue):
           actualValue = stringValue
-      case .second(let doubleValue):
+      case .third(let doubleValue):
           actualValue = NSNumber(value: doubleValue)
-      case .third(let boolValue):
-          actualValue = NSNumber(value: boolValue ? 1 : 0)
       case .fourth(let dateValue):
           actualValue = dateValue
     }

package/ios/QuantityTypeModule.swift

@@ -290,17 +290,11 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
         }
     }
 
-    func queryStatisticsCollectionForQuantity(identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions], anchorDate: String, intervalComponents: IntervalComponents, options: StatisticsQueryOptions?) throws -> Promise<[QueryStatisticsResponse]> {
+    func queryStatisticsCollectionForQuantity(identifier: QuantityTypeIdentifier, statistics: [StatisticsOptions], anchorDate: Date, intervalComponents: IntervalComponents, options: StatisticsQueryOptions?) throws -> Promise<[QueryStatisticsResponse]> {
         let quantityType = try initializeQuantityType(identifier.stringValue)
 
         let predicate = try createPredicate(filter: options?.filter)
 
-        // Convert the anchor date string to Date
-        let dateFormatter = ISO8601DateFormatter()
-        guard let anchor = dateFormatter.date(from: anchorDate) else {
-            throw RuntimeError.error(withMessage: "Invalid anchor date format: " + anchorDate)
-        }
-
         // Create date components from interval
         var dateComponents = DateComponents()
         if let minute = intervalComponents.minute {
@@ -324,12 +318,13 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
 
         return Promise.async {
             let unit = try await getUnitToUse(unitOverride: options?.unit, quantityType: quantityType)
+
             return try await withCheckedThrowingContinuation { continuation in
                 let query = HKStatisticsCollectionQuery.init(
                     quantityType: quantityType,
                     quantitySamplePredicate: predicate,
                     options: opts,
-                    anchorDate: anchor,
+                    anchorDate: anchorDate,
                     intervalComponents: dateComponents
                 )
 
@@ -413,16 +408,7 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
                     let deletedSamples = deletedSamples?.map { serializeDeletedSample(sample: $0) } ?? []
                     let newAnchor = serializeAnchor(anchor: newAnchor) ?? ""
 
-                    guard let samples = samples else {
-                        let response = QuantitySamplesWithAnchorResponse(
-                            samples: [],
-                            deletedSamples: deletedSamples,
-                            newAnchor: newAnchor
-                        )
-                        return continuation.resume(returning: response)
-                    }
-
-                    let quantitySamples = samples.compactMap { sample in
+                    let quantitySamples = samples?.compactMap { sample in
                         if let quantitySample = sample as? HKQuantitySample {
                             do {
                                 return try serializeQuantitySample(
@@ -437,7 +423,7 @@ class QuantityTypeModule: HybridQuantityTypeModuleSpec {
                     }
 
                     let response = QuantitySamplesWithAnchorResponse(
-                        samples: quantitySamples,
+                        samples: quantitySamples ?? [],
                         deletedSamples: deletedSamples,
                         newAnchor: newAnchor,
                     )

package/ios/WorkoutsModule.swift

@@ -94,20 +94,18 @@ class WorkoutsModule: HybridWorkoutsModuleSpec {
         quantities: [QuantitySampleForSaving],
         startDate: Date,
         endDate: Date,
-        totals: WorkoutTotals,
-        metadata: AnyMap
+        totals: WorkoutTotals?,
+        metadata: AnyMap?
     ) throws -> Promise<HybridWorkoutProxySpec> {
 
         let type = try initializeWorkoutActivityType(UInt(workoutActivityType.rawValue))
 
-        // if start and end both exist,  ensure that start date is before end date
-        if let startDate = startDate as Date?, let endDate = endDate as Date? {
-            if startDate > endDate {
-                throw RuntimeError.error(withMessage: "endDate must not be less than startDate")
-            }
+        // ensure that start date is before end date
+        if startDate > endDate {
+            throw RuntimeError.error(withMessage: "endDate must not be less than startDate")
         }
 
-        let metadataDeserialized = anyMapToDictionary(metadata)
+        let metadataDeserialized = metadata != nil ? anyMapToDictionary(metadata!) : nil
 
         var totalEnergyBurned: HKQuantity?
         var totalDistance: HKQuantity?
@@ -149,8 +147,8 @@ class WorkoutsModule: HybridWorkoutsModuleSpec {
         }
 
         // if totals are provided override samples
-        let rawTotalDistance = totals.distance ?? 0.0
-        let rawTotalEnergy = totals.energyBurned ?? 0.0
+        let rawTotalDistance = totals?.distance ?? 0.0
+        let rawTotalEnergy = totals?.energyBurned ?? 0.0
 
         if rawTotalDistance != 0.0 {
             totalDistance = HKQuantity(unit: .meter(), doubleValue: rawTotalDistance)
@@ -176,7 +174,7 @@ class WorkoutsModule: HybridWorkoutsModuleSpec {
             )
         } else {
             if #available(iOS 11, *) {
-                if totalFlightsClimbed != nil {
+                if let totalFlightsClimbed = totalFlightsClimbed {
                     workout = HKWorkout.init(
                         activityType: type,
                         start: startDate,
@@ -214,15 +212,17 @@ class WorkoutsModule: HybridWorkoutsModuleSpec {
                 store.save(workout) { (_: Bool, error: Error?) in
                     if let error = error {
                         return continuation.resume(throwing: error)
-                    }
-                    if !initializedSamples.isEmpty {
+                    } else if !initializedSamples.isEmpty {
                         store.add(initializedSamples, to: workout) { (_, error: Error?) in
                             if let error = error {
                                 return continuation.resume(throwing: error)
                             }
+                            return continuation.resume()
                         }
+                    } else {
+                      return continuation.resume()
                     }
-                    return continuation.resume()
+
                 }
             }) as Void
 

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.saveStateOfMindSample = exports.queryStateOfMindSamples = exports.isProtectedDataAvailable = exports.startWatchApp = exports.subscribeToChanges = exports.saveWorkoutSample = 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.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.useStatisticsForQuantity = exports.useSources = exports.useIsHealthDataAvailable = exports.useHealthkitAuthorization = exports.useSubscribeToChanges = exports.useMostRecentWorkout = exports.useMostRecentQuantitySample = exports.useMostRecentCategorySample = exports.getPreferredUnit = exports.getMostRecentWorkout = exports.getMostRecentQuantitySample = exports.getMostRecentCategorySample = void 0;
-exports.getWheelchairUseAsync = exports.getFitzpatrickSkinTypeAsync = exports.getDateOfBirthAsync = exports.getBloodTypeAsync = exports.getBiologicalSexAsync = exports.areObjectTypesAvailableAsync = exports.areObjectTypesAvailable = exports.isObjectTypeAvailableAsync = exports.isObjectTypeAvailable = exports.unsubscribeQueries = exports.isQuantityCompatibleWithUnit = void 0;
+exports.isProtectedDataAvailable = exports.startWatchApp = exports.saveWorkoutSample = 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.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.useStatisticsForQuantity = exports.useSources = exports.useMostRecentWorkout = exports.useMostRecentQuantitySample = exports.useMostRecentCategorySample = exports.useIsHealthDataAvailable = exports.useHealthkitAuthorization = exports.subscribeToQuantitySamples = exports.subscribeToChanges = exports.getPreferredUnit = exports.getMostRecentWorkout = exports.getMostRecentQuantitySample = exports.getMostRecentCategorySample = void 0;
+exports.getWheelchairUseAsync = exports.getFitzpatrickSkinTypeAsync = exports.getDateOfBirthAsync = exports.getBloodTypeAsync = exports.getBiologicalSexAsync = exports.areObjectTypesAvailableAsync = exports.areObjectTypesAvailable = exports.isObjectTypeAvailableAsync = exports.isObjectTypeAvailable = exports.isQuantityCompatibleWithUnit = exports.saveStateOfMindSample = exports.queryStateOfMindSamples = void 0;
 const react_native_1 = require("react-native");
 const useHealthkitAuthorization_1 = __importDefault(require("./hooks/useHealthkitAuthorization"));
 exports.useHealthkitAuthorization = useHealthkitAuthorization_1.default;
@@ -36,6 +36,8 @@ const useStatisticsForQuantity_1 = __importDefault(require("./hooks/useStatistic
 exports.useStatisticsForQuantity = useStatisticsForQuantity_1.default;
 const useSubscribeToChanges_1 = __importDefault(require("./hooks/useSubscribeToChanges"));
 exports.useSubscribeToChanges = useSubscribeToChanges_1.default;
+const useSubscribeToQuantitySamples_1 = __importDefault(require("./hooks/useSubscribeToQuantitySamples"));
+exports.useSubscribeToQuantitySamples = useSubscribeToQuantitySamples_1.default;
 const modules_1 = require("./modules");
 const getMostRecentCategorySample_1 = __importDefault(require("./utils/getMostRecentCategorySample"));
 exports.getMostRecentCategorySample = getMostRecentCategorySample_1.default;
@@ -45,6 +47,10 @@ const getMostRecentWorkout_1 = __importDefault(require("./utils/getMostRecentWor
 exports.getMostRecentWorkout = getMostRecentWorkout_1.default;
 const getPreferredUnit_1 = __importDefault(require("./utils/getPreferredUnit"));
 exports.getPreferredUnit = getPreferredUnit_1.default;
+const subscribeToChanges_1 = require("./utils/subscribeToChanges");
+Object.defineProperty(exports, "subscribeToChanges", { enumerable: true, get: function () { return subscribeToChanges_1.subscribeToChanges; } });
+const subscribeToQuantitySamples_1 = require("./utils/subscribeToQuantitySamples");
+Object.defineProperty(exports, "subscribeToQuantitySamples", { enumerable: true, get: function () { return subscribeToQuantitySamples_1.subscribeToQuantitySamples; } });
 __exportStar(require("./types"), exports);
 const currentMajorVersionIOS = react_native_1.Platform.OS === 'ios' ? Number.parseInt(react_native_1.Platform.Version, 10) : 0;
 // Named exports - all functions bound to their respective modules
@@ -81,13 +87,11 @@ exports.saveCategorySample = modules_1.CategoryTypes.saveCategorySample.bind(mod
 exports.saveCorrelationSample = modules_1.CorrelationTypes.saveCorrelationSample.bind(modules_1.CorrelationTypes);
 exports.saveQuantitySample = modules_1.QuantityTypes.saveQuantitySample.bind(modules_1.QuantityTypes);
 exports.saveWorkoutSample = modules_1.Workouts.saveWorkoutSample.bind(modules_1.Workouts);
-exports.subscribeToChanges = modules_1.Core.subscribeToObserverQuery.bind(modules_1.Core);
 exports.startWatchApp = modules_1.Workouts.startWatchAppWithWorkoutConfiguration.bind(modules_1.Workouts);
 exports.isProtectedDataAvailable = modules_1.Core.isProtectedDataAvailable.bind(modules_1.Core);
 exports.queryStateOfMindSamples = modules_1.StateOfMind.queryStateOfMindSamples.bind(modules_1.StateOfMind);
 exports.saveStateOfMindSample = modules_1.StateOfMind.saveStateOfMindSample.bind(modules_1.StateOfMind);
 exports.isQuantityCompatibleWithUnit = modules_1.QuantityTypes.isQuantityCompatibleWithUnit.bind(modules_1.QuantityTypes);
-exports.unsubscribeQueries = modules_1.Core.unsubscribeQueries.bind(modules_1.Core);
 exports.isObjectTypeAvailable = modules_1.Core.isObjectTypeAvailable.bind(modules_1.Core);
 exports.isObjectTypeAvailableAsync = modules_1.Core.isObjectTypeAvailableAsync.bind(modules_1.Core);
 exports.areObjectTypesAvailable = modules_1.Core.areObjectTypesAvailable.bind(modules_1.Core);
@@ -145,8 +149,8 @@ exports.default = {
     saveCorrelationSample: exports.saveCorrelationSample,
     saveQuantitySample: exports.saveQuantitySample,
     saveWorkoutSample: exports.saveWorkoutSample,
-    subscribeToChanges: exports.subscribeToChanges,
-    unsubscribeQueries: exports.unsubscribeQueries,
+    subscribeToChanges: subscribeToChanges_1.subscribeToChanges,
+    subscribeToQuantitySamples: subscribeToQuantitySamples_1.subscribeToQuantitySamples,
     startWatchApp: exports.startWatchApp,
     isProtectedDataAvailable: exports.isProtectedDataAvailable,
     queryStateOfMindSamples: exports.queryStateOfMindSamples,
@@ -156,6 +160,7 @@ exports.default = {
     useMostRecentQuantitySample: useMostRecentQuantitySample_1.default,
     useMostRecentWorkout: useMostRecentWorkout_1.default,
     useSubscribeToChanges: useSubscribeToChanges_1.default,
+    useSubscribeToQuantitySamples: useSubscribeToQuantitySamples_1.default,
     useHealthkitAuthorization: useHealthkitAuthorization_1.default,
     useIsHealthDataAvailable: useIsHealthDataAvailable_1.useIsHealthDataAvailable,
     useSources: useSources_1.default,

package/lib/commonjs/healthkit.js

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useSources = exports.useIsHealthDataAvailable = exports.useHealthkitAuthorization = exports.useSubscribeToChanges = exports.useMostRecentWorkout = exports.useMostRecentQuantitySample = exports.getPreferredUnit = exports.getMostRecentWorkout = exports.getMostRecentQuantitySample = exports.saveStateOfMindSample = 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.unsubscribeQueries = exports.getWheelchairUseAsync = exports.getFitzpatrickSkinTypeAsync = exports.getDateOfBirthAsync = exports.getBloodTypeAsync = exports.getBiologicalSexAsync = exports.useStatisticsForQuantity = void 0;
+exports.useSubscribeToQuantitySamples = exports.subscribeToQuantitySamples = exports.getWheelchairUseAsync = exports.getFitzpatrickSkinTypeAsync = exports.getDateOfBirthAsync = exports.getBloodTypeAsync = exports.getBiologicalSexAsync = exports.useStatisticsForQuantity = void 0;
 exports.queryCategorySamples = queryCategorySamples;
 exports.queryCategorySamplesWithAnchor = queryCategorySamplesWithAnchor;
 exports.getMostRecentCategorySample = getMostRecentCategorySample;
@@ -49,7 +49,9 @@ exports.isHealthDataAvailableAsync = UnavailableFnFromModule('isHealthDataAvaila
 exports.querySources = UnavailableFnFromModule('querySources', Promise.resolve([]));
 exports.requestAuthorization = UnavailableFnFromModule('requestAuthorization', Promise.resolve(false));
 exports.deleteObjects = UnavailableFnFromModule('deleteObjects', Promise.resolve(0));
-exports.subscribeToChanges = UnavailableFnFromModule('subscribeToChanges', 'dummy-query-uuid'); // Mocking the observer query UUID
+exports.subscribeToChanges = UnavailableFnFromModule('subscribeToChanges', {
+    remove: () => false,
+}); // Mocking the observer query UUID
 exports.isProtectedDataAvailable = UnavailableFnFromModule('isProtectedDataAvailable', false);
 exports.isObjectTypeAvailable = UnavailableFnFromModule('isObjectTypeAvailable', false);
 exports.isObjectTypeAvailableAsync = UnavailableFnFromModule('isObjectTypeAvailableAsync', Promise.resolve(false));
@@ -160,14 +162,18 @@ exports.getBloodTypeAsync = UnavailableFnFromModule('getBloodTypeAsync', Promise
 exports.getDateOfBirthAsync = UnavailableFnFromModule('getDateOfBirthAsync', Promise.resolve(new Date(0))); // Assuming string for date
 exports.getFitzpatrickSkinTypeAsync = UnavailableFnFromModule('getFitzpatrickSkinTypeAsync', Promise.resolve(Characteristics_1.FitzpatrickSkinType.notSet));
 exports.getWheelchairUseAsync = UnavailableFnFromModule('getWheelchairUseAsync', Promise.resolve(Characteristics_1.WheelchairUse.notSet));
-exports.unsubscribeQueries = UnavailableFnFromModule('unsubscribeQueries', 0);
+const subscribeToQuantitySamples = UnavailableFnFromModule('subscribeToQuantitySamples', {
+    remove: () => false,
+}); // Mocking the observer query UUID
+exports.subscribeToQuantitySamples = subscribeToQuantitySamples;
+const useSubscribeToQuantitySamples = UnavailableFnFromModule('useSubscribeToQuantitySamples', undefined); // Mocking callback structure
+exports.useSubscribeToQuantitySamples = useSubscribeToQuantitySamples;
 // --- Default Export ---
 // This attempts to match the structure of the default export from index.ios.ts
 const HealthkitModule = {
     // All named exports are also part of the default export object
     authorizationStatusFor: exports.authorizationStatusFor,
     isObjectTypeAvailable: exports.isObjectTypeAvailable,
-    unsubscribeQueries: exports.unsubscribeQueries,
     isObjectTypeAvailableAsync: exports.isObjectTypeAvailableAsync,
     areObjectTypesAvailable: exports.areObjectTypesAvailable,
     areObjectTypesAvailableAsync: exports.areObjectTypesAvailableAsync,
@@ -213,6 +219,8 @@ const HealthkitModule = {
     isProtectedDataAvailable: exports.isProtectedDataAvailable,
     queryStateOfMindSamples: exports.queryStateOfMindSamples,
     saveStateOfMindSample: exports.saveStateOfMindSample,
+    subscribeToQuantitySamples,
+    useSubscribeToQuantitySamples,
     // Hooks
     useMostRecentCategorySample,
     useMostRecentQuantitySample: exports.useMostRecentQuantitySample,

package/lib/commonjs/hooks/useHealthkitAuthorization.js

@@ -8,21 +8,27 @@ const modules_1 = require("../modules");
  * @see {@link https://developer.apple.com/documentation/healthkit/hkhealthstore/1614152-requestauthorization Apple Docs - requestAuthorization}
  * @see {@link https://developer.apple.com/documentation/healthkit/authorizing_access_to_health_data Apple Docs - Authorizing access to health data}
  */
-const useHealthkitAuthorization = (read, write) => {
+const useHealthkitAuthorization = ({ toWrite, toRead, }) => {
     const [status, setStatus] = (0, react_1.useState)(null);
-    const readMemo = (0, react_1.useRef)(read);
-    const writeMemo = (0, react_1.useRef)(write);
+    const readMemo = (0, react_1.useRef)(toRead);
+    const writeMemo = (0, react_1.useRef)(toWrite);
     (0, react_1.useEffect)(() => {
-        readMemo.current = read;
-        writeMemo.current = write;
-    }, [read, write]);
+        readMemo.current = toRead;
+        writeMemo.current = toWrite;
+    }, [toRead, toWrite]);
     const refreshAuthStatus = (0, react_1.useCallback)(async () => {
-        const auth = await modules_1.Core.getRequestStatusForAuthorization(writeMemo.current ?? [], readMemo.current);
+        const auth = await modules_1.Core.getRequestStatusForAuthorization({
+            toShare: writeMemo.current,
+            toRead: readMemo.current,
+        });
         setStatus(auth);
         return auth;
     }, []);
     const request = (0, react_1.useCallback)(async () => {
-        await modules_1.Core.requestAuthorization(writeMemo.current ?? [], readMemo.current);
+        await modules_1.Core.requestAuthorization({
+            toShare: writeMemo.current,
+            toRead: readMemo.current,
+        });
         return refreshAuthStatus();
     }, [refreshAuthStatus]);
     (0, react_1.useEffect)(() => {

package/lib/commonjs/hooks/useSubscribeToQuantitySamples.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useSubscribeToQuantitySamples = useSubscribeToQuantitySamples;
+const react_1 = require("react");
+const subscribeToQuantitySamples_1 = require("../utils/subscribeToQuantitySamples");
+function useSubscribeToQuantitySamples(identifier, onChange) {
+    const onChangeRef = (0, react_1.useRef)(onChange);
+    (0, react_1.useEffect)(() => {
+        onChangeRef.current = onChange;
+    }, [onChange]);
+    (0, react_1.useEffect)(() => {
+        const subscription = (0, subscribeToQuantitySamples_1.subscribeToQuantitySamples)(identifier, (args) => {
+            onChangeRef.current(args);
+        });
+        return () => {
+            subscription.remove();
+        };
+    }, [identifier]);
+}
+exports.default = useSubscribeToQuantitySamples;

package/lib/commonjs/utils/subscribeToQuantitySamples.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.subscribeToQuantitySamples = void 0;
+const modules_1 = require("../modules");
+const subscribeToChanges_1 = require("./subscribeToChanges");
+const subscribeToQuantitySamples = (identifier, callback, after) => {
+    let anchor;
+    const afterDate = after ?? new Date();
+    const init = async () => {
+        // we need to do an initial query to get a handle for the deletedSamples
+        const { newAnchor } = await modules_1.QuantityTypes.queryQuantitySamplesWithAnchor(identifier, {
+            filter: {
+                startDate: afterDate,
+            },
+        });
+        anchor = newAnchor;
+    };
+    init();
+    return (0, subscribeToChanges_1.subscribeToChanges)(identifier, async ({ errorMessage }) => {
+        if (errorMessage) {
+            return callback({
+                typeIdentifier: identifier,
+                errorMessage,
+            });
+        }
+        // seems like all deletedSamples are included when no anchor is provided, so we don't want to return those for the first query
+        const hadAnchorWhenDoingQuery = !!anchor;
+        const { samples, newAnchor, deletedSamples } = await modules_1.QuantityTypes.queryQuantitySamplesWithAnchor(identifier, {
+            anchor,
+            filter: {
+                startDate: afterDate,
+            },
+        });
+        anchor = newAnchor;
+        const hasNewSamples = samples.length > 0 ||
+            (deletedSamples.length > 0 && hadAnchorWhenDoingQuery);
+        if (hasNewSamples) {
+            callback({
+                typeIdentifier: identifier,
+                samples,
+                anchor: newAnchor,
+                deletedSamples: hadAnchorWhenDoingQuery ? deletedSamples : [],
+            });
+        }
+    });
+};
+exports.subscribeToQuantitySamples = subscribeToQuantitySamples;

package/lib/module/healthkit.ios.js

@@ -7,14 +7,17 @@ import useMostRecentWorkout from './hooks/useMostRecentWorkout';
 import useSources from './hooks/useSources';
 import useStatisticsForQuantity from './hooks/useStatisticsForQuantity';
 import useSubscribeToChanges from './hooks/useSubscribeToChanges';
+import useSubscribeToQuantitySamples from './hooks/useSubscribeToQuantitySamples';
 import { CategoryTypes, Characteristics, Core, CorrelationTypes, Electrocardiograms, HeartbeatSeries, QuantityTypes, StateOfMind, Workouts, } from './modules';
 import getMostRecentCategorySample from './utils/getMostRecentCategorySample';
 import getMostRecentQuantitySample from './utils/getMostRecentQuantitySample';
 import getMostRecentWorkout from './utils/getMostRecentWorkout';
 import getPreferredUnit from './utils/getPreferredUnit';
+import { subscribeToChanges } from './utils/subscribeToChanges';
+import { subscribeToQuantitySamples } from './utils/subscribeToQuantitySamples';
 export * from './types';
 const currentMajorVersionIOS = Platform.OS === 'ios' ? Number.parseInt(Platform.Version, 10) : 0;
-export { getMostRecentCategorySample, getMostRecentQuantitySample, getMostRecentWorkout, getPreferredUnit, useMostRecentCategorySample, useMostRecentQuantitySample, useMostRecentWorkout, useSubscribeToChanges, useHealthkitAuthorization, useIsHealthDataAvailable, useSources, useStatisticsForQuantity, };
+export { getMostRecentCategorySample, getMostRecentQuantitySample, getMostRecentWorkout, getPreferredUnit, subscribeToChanges, subscribeToQuantitySamples, useHealthkitAuthorization, useIsHealthDataAvailable, useMostRecentCategorySample, useMostRecentQuantitySample, useMostRecentWorkout, useSources, useStatisticsForQuantity, useSubscribeToChanges, useSubscribeToQuantitySamples, };
 // Named exports - all functions bound to their respective modules
 export const authorizationStatusFor = Core.authorizationStatusFor.bind(Core);
 export const disableAllBackgroundDelivery = Core.disableAllBackgroundDelivery.bind(Core);
@@ -49,13 +52,11 @@ export const saveCategorySample = CategoryTypes.saveCategorySample.bind(Category
 export const saveCorrelationSample = CorrelationTypes.saveCorrelationSample.bind(CorrelationTypes);
 export const saveQuantitySample = QuantityTypes.saveQuantitySample.bind(QuantityTypes);
 export const saveWorkoutSample = Workouts.saveWorkoutSample.bind(Workouts);
-export const subscribeToChanges = Core.subscribeToObserverQuery.bind(Core);
 export const startWatchApp = Workouts.startWatchAppWithWorkoutConfiguration.bind(Workouts);
 export const isProtectedDataAvailable = Core.isProtectedDataAvailable.bind(Core);
 export const queryStateOfMindSamples = StateOfMind.queryStateOfMindSamples.bind(StateOfMind);
 export const saveStateOfMindSample = StateOfMind.saveStateOfMindSample.bind(StateOfMind);
 export const isQuantityCompatibleWithUnit = QuantityTypes.isQuantityCompatibleWithUnit.bind(QuantityTypes);
-export const unsubscribeQueries = Core.unsubscribeQueries.bind(Core);
 export const isObjectTypeAvailable = Core.isObjectTypeAvailable.bind(Core);
 export const isObjectTypeAvailableAsync = Core.isObjectTypeAvailableAsync.bind(Core);
 export const areObjectTypesAvailable = Core.areObjectTypesAvailable.bind(Core);
@@ -114,7 +115,7 @@ export default {
     saveQuantitySample,
     saveWorkoutSample,
     subscribeToChanges,
-    unsubscribeQueries,
+    subscribeToQuantitySamples,
     startWatchApp,
     isProtectedDataAvailable,
     queryStateOfMindSamples,
@@ -124,6 +125,7 @@ export default {
     useMostRecentQuantitySample,
     useMostRecentWorkout,
     useSubscribeToChanges,
+    useSubscribeToQuantitySamples,
     useHealthkitAuthorization,
     useIsHealthDataAvailable,
     useSources,

package/lib/module/healthkit.js

@@ -27,7 +27,9 @@ export const isHealthDataAvailableAsync = UnavailableFnFromModule('isHealthDataA
 export const querySources = UnavailableFnFromModule('querySources', Promise.resolve([]));
 export const requestAuthorization = UnavailableFnFromModule('requestAuthorization', Promise.resolve(false));
 export const deleteObjects = UnavailableFnFromModule('deleteObjects', Promise.resolve(0));
-export const subscribeToChanges = UnavailableFnFromModule('subscribeToChanges', 'dummy-query-uuid'); // Mocking the observer query UUID
+export const subscribeToChanges = UnavailableFnFromModule('subscribeToChanges', {
+    remove: () => false,
+}); // Mocking the observer query UUID
 export const isProtectedDataAvailable = UnavailableFnFromModule('isProtectedDataAvailable', false);
 export const isObjectTypeAvailable = UnavailableFnFromModule('isObjectTypeAvailable', false);
 export const isObjectTypeAvailableAsync = UnavailableFnFromModule('isObjectTypeAvailableAsync', Promise.resolve(false));
@@ -138,14 +140,18 @@ export const getBloodTypeAsync = UnavailableFnFromModule('getBloodTypeAsync', Pr
 export const getDateOfBirthAsync = UnavailableFnFromModule('getDateOfBirthAsync', Promise.resolve(new Date(0))); // Assuming string for date
 export const getFitzpatrickSkinTypeAsync = UnavailableFnFromModule('getFitzpatrickSkinTypeAsync', Promise.resolve(FitzpatrickSkinType.notSet));
 export const getWheelchairUseAsync = UnavailableFnFromModule('getWheelchairUseAsync', Promise.resolve(WheelchairUse.notSet));
-export const unsubscribeQueries = UnavailableFnFromModule('unsubscribeQueries', 0);
+const subscribeToQuantitySamples = UnavailableFnFromModule('subscribeToQuantitySamples', {
+    remove: () => false,
+}); // Mocking the observer query UUID
+export { subscribeToQuantitySamples };
+const useSubscribeToQuantitySamples = UnavailableFnFromModule('useSubscribeToQuantitySamples', undefined); // Mocking callback structure
+export { useSubscribeToQuantitySamples };
 // --- Default Export ---
 // This attempts to match the structure of the default export from index.ios.ts
 const HealthkitModule = {
     // All named exports are also part of the default export object
     authorizationStatusFor,
     isObjectTypeAvailable,
-    unsubscribeQueries,
     isObjectTypeAvailableAsync,
     areObjectTypesAvailable,
     areObjectTypesAvailableAsync,
@@ -191,6 +197,8 @@ const HealthkitModule = {
     isProtectedDataAvailable,
     queryStateOfMindSamples,
     saveStateOfMindSample,
+    subscribeToQuantitySamples,
+    useSubscribeToQuantitySamples,
     // Hooks
     useMostRecentCategorySample,
     useMostRecentQuantitySample,

package/lib/module/hooks/useHealthkitAuthorization.js

@@ -5,21 +5,27 @@ import { Core } from '../modules';
  * @see {@link https://developer.apple.com/documentation/healthkit/hkhealthstore/1614152-requestauthorization Apple Docs - requestAuthorization}
  * @see {@link https://developer.apple.com/documentation/healthkit/authorizing_access_to_health_data Apple Docs - Authorizing access to health data}
  */
-export const useHealthkitAuthorization = (read, write) => {
+export const useHealthkitAuthorization = ({ toWrite, toRead, }) => {
     const [status, setStatus] = useState(null);
-    const readMemo = useRef(read);
-    const writeMemo = useRef(write);
+    const readMemo = useRef(toRead);
+    const writeMemo = useRef(toWrite);
     useEffect(() => {
-        readMemo.current = read;
-        writeMemo.current = write;
-    }, [read, write]);
+        readMemo.current = toRead;
+        writeMemo.current = toWrite;
+    }, [toRead, toWrite]);
     const refreshAuthStatus = useCallback(async () => {
-        const auth = await Core.getRequestStatusForAuthorization(writeMemo.current ?? [], readMemo.current);
+        const auth = await Core.getRequestStatusForAuthorization({
+            toShare: writeMemo.current,
+            toRead: readMemo.current,
+        });
         setStatus(auth);
         return auth;
     }, []);
     const request = useCallback(async () => {
-        await Core.requestAuthorization(writeMemo.current ?? [], readMemo.current);
+        await Core.requestAuthorization({
+            toShare: writeMemo.current,
+            toRead: readMemo.current,
+        });
         return refreshAuthStatus();
     }, [refreshAuthStatus]);
     useEffect(() => {

package/lib/module/hooks/useSubscribeToQuantitySamples.js

@@ -0,0 +1,17 @@
+import { useEffect, useRef } from 'react';
+import { subscribeToQuantitySamples } from '../utils/subscribeToQuantitySamples';
+export function useSubscribeToQuantitySamples(identifier, onChange) {
+    const onChangeRef = useRef(onChange);
+    useEffect(() => {
+        onChangeRef.current = onChange;
+    }, [onChange]);
+    useEffect(() => {
+        const subscription = subscribeToQuantitySamples(identifier, (args) => {
+            onChangeRef.current(args);
+        });
+        return () => {
+            subscription.remove();
+        };
+    }, [identifier]);
+}
+export default useSubscribeToQuantitySamples;

package/lib/module/utils/subscribeToQuantitySamples.js

@@ -0,0 +1,43 @@
+import { QuantityTypes } from '../modules';
+import { subscribeToChanges } from './subscribeToChanges';
+export const subscribeToQuantitySamples = (identifier, callback, after) => {
+    let anchor;
+    const afterDate = after ?? new Date();
+    const init = async () => {
+        // we need to do an initial query to get a handle for the deletedSamples
+        const { newAnchor } = await QuantityTypes.queryQuantitySamplesWithAnchor(identifier, {
+            filter: {
+                startDate: afterDate,
+            },
+        });
+        anchor = newAnchor;
+    };
+    init();
+    return subscribeToChanges(identifier, async ({ errorMessage }) => {
+        if (errorMessage) {
+            return callback({
+                typeIdentifier: identifier,
+                errorMessage,
+            });
+        }
+        // seems like all deletedSamples are included when no anchor is provided, so we don't want to return those for the first query
+        const hadAnchorWhenDoingQuery = !!anchor;
+        const { samples, newAnchor, deletedSamples } = await QuantityTypes.queryQuantitySamplesWithAnchor(identifier, {
+            anchor,
+            filter: {
+                startDate: afterDate,
+            },
+        });
+        anchor = newAnchor;
+        const hasNewSamples = samples.length > 0 ||
+            (deletedSamples.length > 0 && hadAnchorWhenDoingQuery);
+        if (hasNewSamples) {
+            callback({
+                typeIdentifier: identifier,
+                samples,
+                anchor: newAnchor,
+                deletedSamples: hadAnchorWhenDoingQuery ? deletedSamples : [],
+            });
+        }
+    });
+};