@kingstinct/react-native-healthkit 6.1.0 → 7.0.0

package/lib/typescript/src/types.d.ts

@@ -8,7 +8,7 @@ export interface HKCategorySample<T extends HKCategoryTypeIdentifier = HKCategor
     readonly startDate: Date;
     readonly endDate: Date;
 }
-export declare type GenericQueryOptions = {
+export type GenericQueryOptions = {
     readonly from?: Date;
     readonly to?: Date;
     readonly limit?: number;
@@ -40,8 +40,8 @@ export interface QueryStatisticsResponse<TIdentifier extends HKQuantityTypeIdent
         readonly to: Date;
     };
 }
-export declare type HKCategorySampleForSaving = Omit<HKCategorySample, 'device' | 'endDate' | 'startDate' | 'uuid'>;
-export declare type HKQuantitySampleForSaving = Omit<HKQuantitySample, 'device' | 'endDate' | 'startDate' | 'uuid'>;
+export type HKCategorySampleForSaving = Omit<HKCategorySample, 'device' | 'endDate' | 'startDate' | 'uuid'>;
+export type HKQuantitySampleForSaving = Omit<HKQuantitySample, 'device' | 'endDate' | 'startDate' | 'uuid'>;
 export interface HKCorrelation<TIdentifier extends HKCorrelationTypeIdentifier> extends Omit<HKCorrelationRaw<TIdentifier>, 'endDate' | 'objects' | 'startDate'> {
     readonly objects: readonly (HKCategorySample | HKQuantitySample)[];
     readonly startDate: Date;

package/lib/typescript/src/utils/deleteQuantitySample.d.ts

@@ -1,4 +1,4 @@
 import type { HKQuantityTypeIdentifier } from '../native-types';
-export declare type DeleteQuantitySampleFn = <TIdentifier extends HKQuantityTypeIdentifier>(identifier: TIdentifier, uuid: string) => Promise<boolean>;
+export type DeleteQuantitySampleFn = <TIdentifier extends HKQuantityTypeIdentifier>(identifier: TIdentifier, uuid: string) => Promise<boolean>;
 declare const deleteQuantitySample: DeleteQuantitySampleFn;
 export default deleteQuantitySample;

package/lib/typescript/src/utils/deleteSamples.d.ts

@@ -1,5 +1,5 @@
 import type { HKQuantityTypeIdentifier } from '../native-types';
-export declare type DeleteSamplesFn = <TIdentifier extends HKQuantityTypeIdentifier>(sample: {
+export type DeleteSamplesFn = <TIdentifier extends HKQuantityTypeIdentifier>(sample: {
     readonly identifier: TIdentifier;
     readonly startDate?: Date;
     readonly endDate?: Date;

package/lib/typescript/src/utils/getMostRecentCategorySample.d.ts

@@ -1,3 +1,3 @@
 import type { HKCategoryTypeIdentifier } from '../native-types';
-declare function getMostRecentCategorySample<T extends HKCategoryTypeIdentifier>(identifier: T): Promise<import("..").HKCategorySample<T> | null>;
+declare function getMostRecentCategorySample<T extends HKCategoryTypeIdentifier>(identifier: T): Promise<import("../native-types").HKCategorySampleRaw<T> | null>;
 export default getMostRecentCategorySample;

package/lib/typescript/src/utils/getMostRecentQuantitySample.d.ts

@@ -1,3 +1,3 @@
 import type { HKQuantityTypeIdentifier, UnitForIdentifier } from '../native-types';
-declare function getMostRecentQuantitySample<TIdentifier extends HKQuantityTypeIdentifier, TUnit extends UnitForIdentifier<TIdentifier>>(identifier: TIdentifier, unit: TUnit): Promise<import("..").HKQuantitySample<TIdentifier, UnitForIdentifier<TIdentifier>> | null>;
+declare function getMostRecentQuantitySample<TIdentifier extends HKQuantityTypeIdentifier, TUnit extends UnitForIdentifier<TIdentifier>>(identifier: TIdentifier, unit: TUnit): Promise<import("../native-types").HKQuantitySampleRaw<TIdentifier, UnitForIdentifier<TIdentifier>> | null>;
 export default getMostRecentQuantitySample;

package/lib/typescript/src/utils/getMostRecentWorkout.d.ts

@@ -1,5 +1,5 @@
 import type { EnergyUnit, LengthUnit } from '../native-types';
 import type { HKWorkout, QueryWorkoutsOptions } from '../types';
-export declare type GetMostRecentWorkoutFn = <TEnergy extends EnergyUnit, TDistance extends LengthUnit>(options?: Pick<QueryWorkoutsOptions<TEnergy, TDistance>, 'distanceUnit' | 'energyUnit'>) => Promise<HKWorkout<TEnergy, TDistance> | null>;
+export type GetMostRecentWorkoutFn = <TEnergy extends EnergyUnit, TDistance extends LengthUnit>(options?: Pick<QueryWorkoutsOptions<TEnergy, TDistance>, 'distanceUnit' | 'energyUnit'>) => Promise<HKWorkout<TEnergy, TDistance> | null>;
 declare const getMostRecentWorkout: GetMostRecentWorkoutFn;
 export default getMostRecentWorkout;

package/lib/typescript/src/utils/getPreferredUnit.d.ts

@@ -1,4 +1,4 @@
 import type { HKQuantityTypeIdentifier, HKUnit } from '../native-types';
-export declare type GetPreferredUnitFn = (identifier: HKQuantityTypeIdentifier) => Promise<HKUnit | undefined>;
+export type GetPreferredUnitFn = (identifier: HKQuantityTypeIdentifier) => Promise<HKUnit | undefined>;
 declare const getPreferredUnit: GetPreferredUnitFn;
 export default getPreferredUnit;

package/lib/typescript/src/utils/getPreferredUnits.d.ts

@@ -1,4 +1,4 @@
 import type { HKQuantityTypeIdentifier, HKUnit } from '../native-types';
-export declare type GetPreferredUnitsFn = (identifiers: readonly HKQuantityTypeIdentifier[]) => Promise<readonly HKUnit[]>;
+export type GetPreferredUnitsFn = (identifiers: readonly HKQuantityTypeIdentifier[]) => Promise<readonly HKUnit[]>;
 declare const getPreferredUnits: GetPreferredUnitsFn;
 export default getPreferredUnits;

package/lib/typescript/src/utils/queryCategorySamples.d.ts

@@ -1,10 +1,5 @@
-import type { HKCategoryTypeIdentifier, DeletedCategorySampleRaw } from '../native-types';
-import type { GenericQueryOptions, HKCategorySample } from '../types';
-export declare type QueryCategorySamplesResponse<T extends HKCategoryTypeIdentifier> = {
-    readonly samples: readonly HKCategorySample<T>[];
-    readonly deletedSamples: readonly DeletedCategorySampleRaw<T>[];
-    readonly newAnchor: string;
-};
-export declare type QueryCategorySamplesFn = <T extends HKCategoryTypeIdentifier>(identifier: T, options: GenericQueryOptions) => Promise<QueryCategorySamplesResponse<T>>;
+import type { HKCategoryTypeIdentifier, HKCategorySampleRaw } from '../native-types';
+import type { GenericQueryOptions } from '../types';
+export type QueryCategorySamplesFn = <T extends HKCategoryTypeIdentifier>(identifier: T, options: Omit<GenericQueryOptions, 'anchor'>) => Promise<readonly HKCategorySampleRaw<T>[]>;
 declare const queryCategorySamples: QueryCategorySamplesFn;
 export default queryCategorySamples;

package/lib/typescript/src/utils/queryCategorySamplesWithAnchor.d.ts

@@ -0,0 +1,10 @@
+import type { HKCategoryTypeIdentifier, DeletedCategorySampleRaw } from '../native-types';
+import type { GenericQueryOptions, HKCategorySample } from '../types';
+export type QueryCategorySamplesWithAnchorResponse<T extends HKCategoryTypeIdentifier> = {
+    readonly samples: readonly HKCategorySample<T>[];
+    readonly deletedSamples: readonly DeletedCategorySampleRaw<T>[];
+    readonly newAnchor: string;
+};
+export type QueryCategorySamplesWithAnchorFn = <T extends HKCategoryTypeIdentifier>(identifier: T, options: Omit<GenericQueryOptions, 'ascending'>) => Promise<QueryCategorySamplesWithAnchorResponse<T>>;
+declare const queryCategorySamplesWithAnchor: QueryCategorySamplesWithAnchorFn;
+export default queryCategorySamplesWithAnchor;

package/lib/typescript/src/utils/queryCorrelationSamples.d.ts

@@ -1,5 +1,5 @@
 import type { HKCorrelationTypeIdentifier } from '../native-types';
 import type { GenericQueryOptions, HKCorrelation } from '../types';
-export declare type QueryCorrelationSamplesFn = <TIdentifier extends HKCorrelationTypeIdentifier>(typeIdentifier: TIdentifier, options: Omit<GenericQueryOptions, 'ascending' | 'limit'>) => Promise<readonly HKCorrelation<TIdentifier>[]>;
+export type QueryCorrelationSamplesFn = <TIdentifier extends HKCorrelationTypeIdentifier>(typeIdentifier: TIdentifier, options: Omit<GenericQueryOptions, 'anchor' | 'ascending' | 'limit'>) => Promise<readonly HKCorrelation<TIdentifier>[]>;
 declare const queryCorrelationSamples: QueryCorrelationSamplesFn;
 export default queryCorrelationSamples;

package/lib/typescript/src/utils/queryHeartbeatSeriesSamples.d.ts

@@ -1,10 +1,10 @@
 import type { DeletedHeartbeatSeriesSampleRaw } from '../native-types';
 import type { GenericQueryOptions, HKHeartbeatSeriesSample } from '../types';
-export declare type QueryHeartbeatSeriesSamplesResponse = {
+export type QueryHeartbeatSeriesSamplesResponse = {
     readonly samples: readonly HKHeartbeatSeriesSample[];
     readonly deletedSamples: readonly DeletedHeartbeatSeriesSampleRaw[];
     readonly newAnchor: string;
 };
-export declare type QueryHeartbeatSeriesSamplesFn = (options: GenericQueryOptions) => Promise<QueryHeartbeatSeriesSamplesResponse>;
+export type QueryHeartbeatSeriesSamplesFn = (options: Omit<GenericQueryOptions, 'anchor'>) => Promise<readonly HKHeartbeatSeriesSample[]>;
 declare const queryHeartbeatSeriesSamples: QueryHeartbeatSeriesSamplesFn;
 export default queryHeartbeatSeriesSamples;

package/lib/typescript/src/utils/queryHeartbeatSeriesSamplesWithAnchor.d.ts

@@ -0,0 +1,10 @@
+import type { DeletedHeartbeatSeriesSampleRaw } from '../native-types';
+import type { GenericQueryOptions, HKHeartbeatSeriesSample } from '../types';
+export type QueryHeartbeatSeriesSamplesResponse = {
+    readonly samples: readonly HKHeartbeatSeriesSample[];
+    readonly deletedSamples: readonly DeletedHeartbeatSeriesSampleRaw[];
+    readonly newAnchor: string;
+};
+export type QueryHeartbeatSeriesSamplesFn = (options: Omit<GenericQueryOptions, 'ascending'>) => Promise<QueryHeartbeatSeriesSamplesResponse>;
+declare const queryHeartbeatSeriesSamplesWithAnchor: QueryHeartbeatSeriesSamplesFn;
+export default queryHeartbeatSeriesSamplesWithAnchor;

package/lib/typescript/src/utils/queryQuantitySamples.d.ts

@@ -1,12 +1,7 @@
-import type { HKQuantityTypeIdentifier, UnitForIdentifier, DeletedQuantitySampleRaw } from '../native-types';
-import type { GenericQueryOptions, HKQuantitySample } from '../types';
-export declare type QueryQuantitySamplesResponse<T extends HKQuantityTypeIdentifier> = {
-    readonly samples: readonly HKQuantitySample<T>[];
-    readonly deletedSamples: readonly DeletedQuantitySampleRaw<T>[];
-    readonly newAnchor: string;
-};
-export declare type QueryQuantitySamplesFn = <TIdentifier extends HKQuantityTypeIdentifier, TUnit extends UnitForIdentifier<TIdentifier>>(identifier: TIdentifier, options: GenericQueryOptions & {
+import type { HKQuantityTypeIdentifier, UnitForIdentifier, HKQuantitySampleRaw } from '../native-types';
+import type { GenericQueryOptions } from '../types';
+export type QueryQuantitySamplesFn = <TIdentifier extends HKQuantityTypeIdentifier, TUnit extends UnitForIdentifier<TIdentifier>>(identifier: TIdentifier, options: Omit<GenericQueryOptions, 'anchor'> & {
     readonly unit?: TUnit;
-}) => Promise<QueryQuantitySamplesResponse<TIdentifier>>;
+}) => Promise<readonly HKQuantitySampleRaw<TIdentifier>[]>;
 declare const queryQuantitySamples: QueryQuantitySamplesFn;
 export default queryQuantitySamples;

package/lib/typescript/src/utils/queryQuantitySamplesWithAnchor.d.ts

@@ -0,0 +1,12 @@
+import type { HKQuantityTypeIdentifier, UnitForIdentifier, DeletedQuantitySampleRaw } from '../native-types';
+import type { GenericQueryOptions, HKQuantitySample } from '../types';
+export type QueryQuantitySamplesWithAnchorResponse<T extends HKQuantityTypeIdentifier> = {
+    readonly samples: readonly HKQuantitySample<T>[];
+    readonly deletedSamples: readonly DeletedQuantitySampleRaw<T>[];
+    readonly newAnchor: string;
+};
+export type QueryQuantitySamplesWithAnchorFn = <TIdentifier extends HKQuantityTypeIdentifier, TUnit extends UnitForIdentifier<TIdentifier>>(identifier: TIdentifier, options: Omit<GenericQueryOptions, 'ascending'> & {
+    readonly unit?: TUnit;
+}) => Promise<QueryQuantitySamplesWithAnchorResponse<TIdentifier>>;
+declare const queryQuantitySamplesWithAnchor: QueryQuantitySamplesWithAnchorFn;
+export default queryQuantitySamplesWithAnchor;

package/lib/typescript/src/utils/querySources.d.ts

@@ -1,4 +1,4 @@
 import type { HKQuantityTypeIdentifier, HKSource, HKCategoryTypeIdentifier } from '../native-types';
-export declare type QuerySourcesFn = <TIdentifier extends HKCategoryTypeIdentifier | HKQuantityTypeIdentifier>(identifier: TIdentifier) => Promise<readonly HKSource[]>;
+export type QuerySourcesFn = <TIdentifier extends HKCategoryTypeIdentifier | HKQuantityTypeIdentifier>(identifier: TIdentifier) => Promise<readonly HKSource[]>;
 declare const querySources: QuerySourcesFn;
 export default querySources;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kingstinct/react-native-healthkit",
-  "version": "6.1.0",
+  "version": "7.0.0",
   "description": "React Native bindings for HealthKit",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -10,26 +10,32 @@
   "files": [
     "src",
     "lib",
-    "android",
     "ios",
     "cpp",
     "kingstinct-react-native-healthkit.podspec",
     "!lib/typescript/example",
     "!**/__tests__",
     "!**/__fixtures__",
-    "!**/__mocks__"
+    "!**/__mocks__",
+    "app.plugin.js"
   ],
   "scripts": {
     "test-only": "jest",
     "test": "concurrently \"yarn test-only\" \"yarn typecheck\" \"yarn lint\"",
     "typecheck": "tsc --noEmit",
     "lint": "eslint \"**/*.{js,ts,tsx}\" --cache",
-    "prepare": "bob build",
+    "prepare": "bob build && husky install",
     "release": "release-it",
     "example": "yarn --cwd example",
     "pods": "cd example && pod-install --quiet",
     "bootstrap": "yarn example && yarn && yarn pods"
   },
+  "lint-staged": {
+    "*.swift": "swiftlint ios --fix",
+    "*.ts": "eslint --fix",
+    "*.js": "eslint --fix",
+    "*.json": "eslint --fix"
+  },
   "keywords": [
     "react-native",
     "ios",
@@ -51,15 +57,14 @@
     "@expo/config-plugins": "^6.0.1",
     "@graphql-eslint/eslint-plugin": ">=3",
     "@release-it/conventional-changelog": "2",
-    "@testing-library/react-native": "^11.0.0",
+    "@testing-library/react-native": "12",
     "@types/jest": ">=26",
     "@types/node": "^18.7.14",
-    "@types/react": "17",
-    "@types/react-native": "0.67",
+    "@types/react": "~18.0.27",
     "@typescript-eslint/eslint-plugin": ">=5",
     "@typescript-eslint/parser": ">=5",
     "commitlint": "^17.1.1",
-    "concurrently": "^7.3.0",
+    "concurrently": "8",
     "eslint": ">=8",
     "eslint-config-airbnb": ">=19",
     "eslint-config-airbnb-base": ">=15",
@@ -82,26 +87,23 @@
     "husky": "8",
     "jest": ">=26",
     "jest-environment-jsdom": "^29.0.2",
+    "lint-staged": "^13.2.2",
     "metro-react-native-babel-preset": "^0.70.3",
     "pod-install": "^0.1.0",
-    "react": "17",
-    "react-native": "0.68",
+    "react": "18.2.0",
+    "react-native": "0.71.8",
     "react-native-builder-bob": "^0.18.1",
-    "react-test-renderer": "17",
+    "react-test-renderer": "18",
     "release-it": "14",
+    "solidarity": "^3.0.4",
+    "solidarity-react-native": "^2.1.2",
     "ts-node": "^10.9.1",
-    "typescript": ">=4"
+    "typescript": "^4.9.4"
   },
   "peerDependencies": {
     "react": "*",
     "react-native": "*"
   },
-  "husky": {
-    "hooks": {
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-commit": "yarn lint && yarn typescript"
-    }
-  },
   "commitlint": {
     "extends": [
       "@commitlint/config-conventional"

package/src/hooks/useHealthkitAuthorization.test.ts

@@ -1,8 +1,8 @@
 import { renderHook, act } from '@testing-library/react-native'
 
+import useHealthkitAuthorization from './useHealthkitAuthorization'
 import Native, { HKAuthorizationRequestStatus, HKCategoryTypeIdentifier } from '../native-types'
 import waitForNextUpdate from '../test-utils'
-import useHealthkitAuthorization from './useHealthkitAuthorization'
 
 describe('useHealthkitAuthorization', () => {
   test('should return shouldRequest', async () => {

package/src/hooks/useIsHealthDataAvailable.test.ts

@@ -1,8 +1,8 @@
 import { renderHook } from '@testing-library/react-native'
 
+import useIsHealthDataAvailable from './useIsHealthDataAvailable'
 import Native from '../native-types'
 import waitForNextUpdate from '../test-utils'
-import useIsHealthDataAvailable from './useIsHealthDataAvailable'
 
 describe('useIsHealthDataAvailable', () => {
   test('should return false', async () => {

package/src/hooks/useMostRecentCategorySample.ts

@@ -1,15 +1,14 @@
 import { useCallback, useState } from 'react'
 
-import getMostRecentCategorySample from '../utils/getMostRecentCategorySample'
 import useSubscribeToChanges from './useSubscribeToChanges'
+import getMostRecentCategorySample from '../utils/getMostRecentCategorySample'
 
-import type { HKCategoryTypeIdentifier } from '../native-types'
-import type { HKCategorySample } from '../types'
+import type { HKCategorySampleRaw, HKCategoryTypeIdentifier } from '../native-types'
 
 function useMostRecentCategorySample<
   TCategory extends HKCategoryTypeIdentifier
 >(identifier: TCategory) {
-  const [category, setCategory] = useState<HKCategorySample<TCategory> | null>(
+  const [category, setCategory] = useState<HKCategorySampleRaw<TCategory> | null>(
     null,
   )
   const updater = useCallback(() => {

package/src/hooks/useMostRecentQuantitySample.ts

@@ -4,14 +4,13 @@ import ensureUnit from '../utils/ensureUnit'
 import getMostRecentQuantitySample from '../utils/getMostRecentQuantitySample'
 import subscribeToChanges from '../utils/subscribeToChanges'
 
-import type { HKQuantityTypeIdentifier, UnitForIdentifier } from '../native-types'
-import type { HKQuantitySample } from '../types'
+import type { HKQuantitySampleRaw, HKQuantityTypeIdentifier, UnitForIdentifier } from '../native-types'
 
 function useMostRecentQuantitySample<
   TIdentifier extends HKQuantityTypeIdentifier,
   TUnit extends UnitForIdentifier<TIdentifier>
 >(identifier: TIdentifier, unit?: TUnit) {
-  const [lastSample, setLastSample] = useState<HKQuantitySample<
+  const [lastSample, setLastSample] = useState<HKQuantitySampleRaw<
   TIdentifier
   > | null>(null)
 

package/src/hooks/useStatisticsForQuantity.ts

@@ -2,8 +2,8 @@ import {
   useState, useEffect, useCallback, useRef,
 } from 'react'
 
-import queryStatisticsForQuantity from '../utils/queryStatisticsForQuantity'
 import useSubscribeToChanges from './useSubscribeToChanges'
+import queryStatisticsForQuantity from '../utils/queryStatisticsForQuantity'
 
 import type { HKQuantityTypeIdentifier, HKStatisticsOptions, UnitForIdentifier } from '../native-types'
 import type { QueryStatisticsResponse } from '../types'

package/src/index.ios.tsx

@@ -15,9 +15,12 @@ import getPreferredUnit from './utils/getPreferredUnit'
 import getPreferredUnits from './utils/getPreferredUnits'
 import getRequestStatusForAuthorization from './utils/getRequestStatusForAuthorization'
 import queryCategorySamples from './utils/queryCategorySamples'
+import queryCategorySamplesWithAnchor from './utils/queryCategorySamplesWithAnchor'
 import queryCorrelationSamples from './utils/queryCorrelationSamples'
 import queryHeartbeatSeriesSamples from './utils/queryHeartbeatSeriesSamples'
+import queryHeartbeatSeriesSamplesWithAnchor from './utils/queryHeartbeatSeriesSamplesWithAnchor'
 import queryQuantitySamples from './utils/queryQuantitySamples'
+import queryQuantitySamplesWithAnchor from './utils/queryQuantitySamplesWithAnchor'
 import querySources from './utils/querySources'
 import queryStatisticsForQuantity from './utils/queryStatisticsForQuantity'
 import queryWorkouts from './utils/queryWorkouts'
@@ -59,9 +62,12 @@ const Healthkit = {
 
   // query methods
   queryCategorySamples,
+  queryCategorySamplesWithAnchor,
   queryCorrelationSamples,
   queryHeartbeatSeriesSamples,
+  queryHeartbeatSeriesSamplesWithAnchor,
   queryQuantitySamples,
+  queryQuantitySamplesWithAnchor,
   queryStatisticsForQuantity,
   queryWorkouts,
   querySources,

package/src/index.tsx

@@ -1,10 +1,12 @@
 import { Platform } from 'react-native'
 
 import {
-  HKAuthorizationRequestStatus, HKBiologicalSex, HKBloodType, HKFitzpatrickSkinType, HKQuantityTypeIdentifier, HKUnits, HKWheelchairUse, QueryQuantitySamplesResponseRaw,
+  HKAuthorizationRequestStatus, HKAuthorizationStatus, HKBiologicalSex, HKBloodType, HKFitzpatrickSkinType, HKUnits, HKWheelchairUse, QueryQuantitySamplesResponseRaw,
 } from './native-types'
 
 import type ReactNativeHealthkit from './index.ios'
+import type { QueryCategorySamplesFn } from './utils/queryCategorySamples'
+import type { QueryQuantitySamplesFn } from './utils/queryQuantitySamples'
 
 const notAvailableError = `[@kingstinct/react-native-healthkit] Platform "${
   Platform.OS
@@ -24,7 +26,7 @@ function UnavailableFn<T = unknown>(retVal: T) {
 }
 
 const Healthkit: typeof ReactNativeHealthkit = {
-  authorizationStatusFor: UnavailableFn(Promise.resolve(false)),
+  authorizationStatusFor: UnavailableFn(Promise.resolve(HKAuthorizationStatus.notDetermined)),
   disableAllBackgroundDelivery: UnavailableFn(Promise.resolve(false)),
   disableBackgroundDelivery: UnavailableFn(Promise.resolve(false)),
   enableBackgroundDelivery: UnavailableFn(Promise.resolve(false)),
@@ -41,18 +43,21 @@ const Healthkit: typeof ReactNativeHealthkit = {
   getWheelchairUse: UnavailableFn(Promise.resolve(HKWheelchairUse.notSet)),
   getWorkoutRoutes: UnavailableFn(Promise.resolve([])),
   isHealthDataAvailable: async () => Promise.resolve(false),
-  queryCategorySamples: UnavailableFn(Promise.resolve({
+  queryCategorySamples: UnavailableFn(Promise.resolve([])) as unknown as QueryCategorySamplesFn,
+  queryCategorySamplesWithAnchor: UnavailableFn(Promise.resolve({
     samples: [],
     deletedSamples: [],
     newAnchor: '',
   })),
   queryCorrelationSamples: UnavailableFn(Promise.resolve([])),
-  queryHeartbeatSeriesSamples: UnavailableFn(Promise.resolve({
+  queryHeartbeatSeriesSamples: UnavailableFn(Promise.resolve([])),
+  queryHeartbeatSeriesSamplesWithAnchor: UnavailableFn(Promise.resolve({
     samples: [],
     deletedSamples: [],
     newAnchor: '',
   })),
-  queryQuantitySamples: UnavailableFn(Promise.resolve({
+  queryQuantitySamples: UnavailableFn(Promise.resolve([])) as unknown as QueryQuantitySamplesFn,
+  queryQuantitySamplesWithAnchor: UnavailableFn(Promise.resolve({
     samples: [],
     deletedSamples: [],
     newAnchor: '',

package/src/jest.setup.ts

@@ -14,6 +14,8 @@ const mockModule: (NativeModule & typeof Native) = {
   disableAllBackgroundDelivery: jest.fn(),
   disableBackgroundDelivery: jest.fn(),
   enableBackgroundDelivery: jest.fn(),
+  queryCategorySamplesWithAnchor: jest.fn(),
+  queryQuantitySamplesWithAnchor: jest.fn(),
   getBiologicalSex: jest.fn(),
   getBloodType: jest.fn(),
   getDateOfBirth: jest.fn(),
@@ -25,6 +27,7 @@ const mockModule: (NativeModule & typeof Native) = {
   queryCategorySamples: jest.fn(),
   queryCorrelationSamples: jest.fn(),
   queryHeartbeatSeriesSamples: jest.fn(),
+  queryHeartbeatSeriesSamplesWithAnchor: jest.fn(),
   queryQuantitySamples: jest.fn(),
   querySources: jest.fn(),
   queryStatisticsForQuantity: jest.fn(),

package/src/native-types.ts

@@ -1240,7 +1240,7 @@ type ReactNativeHealthkitTypeNative = {
     identifier: HKSampleTypeIdentifier
   ): Promise<QueryId>;
   unsubscribeQuery(queryId: QueryId): Promise<boolean>;
-  authorizationStatusFor(type: HealthkitReadAuthorization): Promise<boolean>;
+  authorizationStatusFor(type: HealthkitReadAuthorization): Promise<HKAuthorizationStatus>;
   getRequestStatusForAuthorization(
     write: WritePermissions,
     read: ReadPermissions
@@ -1286,16 +1286,26 @@ type ReactNativeHealthkitTypeNative = {
     to: string,
     limit: number,
     ascending: boolean,
-    anchor: string
-  ) => Promise<QueryCategorySamplesResponseRaw<T>>;
-  readonly queryHeartbeatSeriesSamples: (
+  ) => Promise<readonly HKCategorySampleRaw<T>[]>;
+  readonly queryQuantitySamples: <
+    TIdentifier extends HKQuantityTypeIdentifier,
+    TUnit extends UnitForIdentifier<TIdentifier>
+  >(
+    identifier: TIdentifier,
+    unit: TUnit,
     from: string,
     to: string,
     limit: number,
     ascending: boolean,
+  ) => Promise<readonly HKQuantitySampleRaw<TIdentifier>[]>;
+  readonly queryCategorySamplesWithAnchor: <T extends HKCategoryTypeIdentifier>(
+    identifier: T,
+    from: string,
+    to: string,
+    limit: number,
     anchor: string
-  ) => Promise<QueryHeartbeatSeriesSamplesResponseRaw>;
-  readonly queryQuantitySamples: <
+  ) => Promise<QueryCategorySamplesResponseRaw<T>>;
+  readonly queryQuantitySamplesWithAnchor: <
     TIdentifier extends HKQuantityTypeIdentifier,
     TUnit extends UnitForIdentifier<TIdentifier>
   >(
@@ -1304,9 +1314,20 @@ type ReactNativeHealthkitTypeNative = {
     from: string,
     to: string,
     limit: number,
-    ascending: boolean,
     anchor: string
   ) => Promise<QueryQuantitySamplesResponseRaw<TIdentifier>>;
+  readonly queryHeartbeatSeriesSamples: (
+    from: string,
+    to: string,
+    limit: number,
+    ascending: boolean,
+  ) => Promise<readonly HKHeartbeatSeriesSampleRaw[]>;
+  readonly queryHeartbeatSeriesSamplesWithAnchor: (
+    from: string,
+    to: string,
+    limit: number,
+    anchor: string
+  ) => Promise<QueryHeartbeatSeriesSamplesResponseRaw>;
   readonly querySources: <
     TIdentifier extends HKCategoryTypeIdentifier | HKQuantityTypeIdentifier
   >(

package/src/utils/deserializeCategorySample.test.ts

@@ -1,5 +1,5 @@
-import { HKCategorySampleRaw, HKCategoryTypeIdentifier } from '../types'
 import deserializeCategorySample from './deserializeCategorySample'
+import { HKCategorySampleRaw, HKCategoryTypeIdentifier } from '../types'
 
 describe('deserializeCategorySample', () => {
   it('should deserialize category sample', () => {

package/src/utils/getMostRecentCategorySample.ts

@@ -12,7 +12,7 @@ async function getMostRecentCategorySample<
     ascending: false,
   })
 
-  return samples.samples[0] || null
+  return samples[0] || null
 }
 
 export default getMostRecentCategorySample

package/src/utils/getMostRecentQuantitySample.ts

@@ -13,7 +13,7 @@ async function getMostRecentQuantitySample<
     limit: 1,
     unit,
   })
-  return samples.samples[0] || null
+  return samples[0] || null
 }
 
 export default getMostRecentQuantitySample

package/src/utils/queryCategorySamples.ts

@@ -1,20 +1,13 @@
-import Native from '../native-types'
-import deserializCategorySample from './deserializeCategorySample'
 import prepareOptions from './prepareOptions'
+import Native from '../native-types'
 
-import type { HKCategoryTypeIdentifier, DeletedCategorySampleRaw } from '../native-types'
-import type { GenericQueryOptions, HKCategorySample } from '../types'
-
-export type QueryCategorySamplesResponse<T extends HKCategoryTypeIdentifier> = {
-  readonly samples: readonly HKCategorySample<T>[],
-  readonly deletedSamples: readonly DeletedCategorySampleRaw<T>[],
-  readonly newAnchor: string
-}
+import type { HKCategoryTypeIdentifier, HKCategorySampleRaw } from '../native-types'
+import type { GenericQueryOptions } from '../types'
 
 export type QueryCategorySamplesFn = <T extends HKCategoryTypeIdentifier>(
   identifier: T,
-  options: GenericQueryOptions
-) => Promise<QueryCategorySamplesResponse<T>>;
+  options: Omit<GenericQueryOptions, 'anchor'>
+) => Promise<readonly HKCategorySampleRaw<T>[]>;
 
 const queryCategorySamples: QueryCategorySamplesFn = async (
   identifier,
@@ -27,14 +20,9 @@ const queryCategorySamples: QueryCategorySamplesFn = async (
     opts.to,
     opts.limit,
     opts.ascending,
-    opts.anchor,
   )
 
-  return {
-    samples: raw.samples.map(deserializCategorySample),
-    deletedSamples: raw.deletedSamples,
-    newAnchor: raw.newAnchor,
-  }
+  return raw
 }
 
 export default queryCategorySamples

package/src/utils/queryCategorySamplesWithAnchor.ts

@@ -0,0 +1,39 @@
+import deserializCategorySample from './deserializeCategorySample'
+import prepareOptions from './prepareOptions'
+import Native from '../native-types'
+
+import type { HKCategoryTypeIdentifier, DeletedCategorySampleRaw } from '../native-types'
+import type { GenericQueryOptions, HKCategorySample } from '../types'
+
+export type QueryCategorySamplesWithAnchorResponse<T extends HKCategoryTypeIdentifier> = {
+  readonly samples: readonly HKCategorySample<T>[],
+  readonly deletedSamples: readonly DeletedCategorySampleRaw<T>[],
+  readonly newAnchor: string
+}
+
+export type QueryCategorySamplesWithAnchorFn = <T extends HKCategoryTypeIdentifier>(
+  identifier: T,
+  options: Omit<GenericQueryOptions, 'ascending'>
+) => Promise<QueryCategorySamplesWithAnchorResponse<T>>;
+
+const queryCategorySamplesWithAnchor: QueryCategorySamplesWithAnchorFn = async (
+  identifier,
+  options,
+) => {
+  const opts = prepareOptions(options)
+  const raw = await Native.queryCategorySamplesWithAnchor(
+    identifier,
+    opts.from,
+    opts.to,
+    opts.limit,
+    opts.anchor,
+  )
+
+  return {
+    samples: raw.samples.map(deserializCategorySample),
+    deletedSamples: raw.deletedSamples,
+    newAnchor: raw.newAnchor,
+  }
+}
+
+export default queryCategorySamplesWithAnchor

package/src/utils/queryCorrelationSamples.ts

@@ -1,6 +1,6 @@
-import Native from '../native-types'
 import deserializeCorrelation from './deserializeCorrelation'
 import prepareOptions from './prepareOptions'
+import Native from '../native-types'
 
 import type { HKCorrelationTypeIdentifier } from '../native-types'
 import type { GenericQueryOptions, HKCorrelation } from '../types'
@@ -9,7 +9,7 @@ export type QueryCorrelationSamplesFn = <
   TIdentifier extends HKCorrelationTypeIdentifier
 >(
   typeIdentifier: TIdentifier,
-  options: Omit<GenericQueryOptions, 'ascending' | 'limit'>
+  options: Omit<GenericQueryOptions, 'anchor' | 'ascending' | 'limit'>
 ) => Promise<readonly HKCorrelation<TIdentifier>[]>;
 
 const queryCorrelationSamples: QueryCorrelationSamplesFn = async (