@kingstinct/react-native-healthkit 5.4.0 → 6.0.0

package/lib/module/utils/serializeDate.js

@@ -1,4 +1,4 @@
-const serializeDate = date => date ? date.toISOString() : new Date(0).toISOString();
+const serializeDate = date => (date || new Date(-1)).toISOString();
 
 export default serializeDate;
 //# sourceMappingURL=serializeDate.js.map

package/lib/module/utils/serializeDate.js.map

@@ -1 +1 @@
-{"version":3,"names":["serializeDate","date","toISOString","Date"],"sources":["serializeDate.ts"],"sourcesContent":["const serializeDate = (date?: Date | null): string => (date ? date.toISOString() : new Date(0).toISOString())\n\nexport default serializeDate\n"],"mappings":"AAAA,MAAMA,aAAa,GAAIC,IAAD,IAAiCA,IAAI,GAAGA,IAAI,CAACC,WAAL,EAAH,GAAwB,IAAIC,IAAJ,CAAS,CAAT,EAAYD,WAAZ,EAAnF;;AAEA,eAAeF,aAAf"}
+{"version":3,"names":["serializeDate","date","Date","toISOString"],"sources":["serializeDate.ts"],"sourcesContent":["const serializeDate = (date?: Date | null): string => (\n  (date || new Date(-1)).toISOString()\n)\n\nexport default serializeDate\n"],"mappings":"AAAA,MAAMA,aAAa,GAAIC,IAAD,IACpB,CAACA,IAAI,IAAI,IAAIC,IAAJ,CAAS,CAAC,CAAV,CAAT,EAAuBC,WAAvB,EADF;;AAIA,eAAeH,aAAf"}

package/lib/module/utils/serializeDate.test.js

@@ -8,7 +8,7 @@ describe('serializeDate', () => {
     expect(serializeDate(date)).toBe(date.toISOString());
   });
   it('should serialize null date', () => {
-    expect(serializeDate(null)).toBe('1970-01-01T00:00:00.000Z');
+    expect(serializeDate(null)).toBe('1969-12-31T23:59:59.999Z');
   });
 });
 //# sourceMappingURL=serializeDate.test.js.map

package/lib/module/utils/serializeDate.test.js.map

@@ -1 +1 @@
-{"version":3,"names":["serializeDate","describe","it","expect","Date","toBe","date","toISOString"],"sources":["serializeDate.test.ts"],"sourcesContent":["import serializeDate from './serializeDate'\n\ndescribe('serializeDate', () => {\n  it('should serialize zero date', () => {\n    expect(serializeDate(new Date(0))).toBe('1970-01-01T00:00:00.000Z')\n  })\n\n  it('should serialize date', () => {\n    const date = new Date()\n    expect(serializeDate(date)).toBe(date.toISOString())\n  })\n\n  it('should serialize null date', () => {\n    expect(serializeDate(null)).toBe('1970-01-01T00:00:00.000Z')\n  })\n})\n"],"mappings":"AAAA,OAAOA,aAAP,MAA0B,iBAA1B;AAEAC,QAAQ,CAAC,eAAD,EAAkB,MAAM;EAC9BC,EAAE,CAAC,4BAAD,EAA+B,MAAM;IACrCC,MAAM,CAACH,aAAa,CAAC,IAAII,IAAJ,CAAS,CAAT,CAAD,CAAd,CAAN,CAAmCC,IAAnC,CAAwC,0BAAxC;EACD,CAFC,CAAF;EAIAH,EAAE,CAAC,uBAAD,EAA0B,MAAM;IAChC,MAAMI,IAAI,GAAG,IAAIF,IAAJ,EAAb;IACAD,MAAM,CAACH,aAAa,CAACM,IAAD,CAAd,CAAN,CAA4BD,IAA5B,CAAiCC,IAAI,CAACC,WAAL,EAAjC;EACD,CAHC,CAAF;EAKAL,EAAE,CAAC,4BAAD,EAA+B,MAAM;IACrCC,MAAM,CAACH,aAAa,CAAC,IAAD,CAAd,CAAN,CAA4BK,IAA5B,CAAiC,0BAAjC;EACD,CAFC,CAAF;AAGD,CAbO,CAAR"}
+{"version":3,"names":["serializeDate","describe","it","expect","Date","toBe","date","toISOString"],"sources":["serializeDate.test.ts"],"sourcesContent":["import serializeDate from './serializeDate'\n\ndescribe('serializeDate', () => {\n  it('should serialize zero date', () => {\n    expect(serializeDate(new Date(0))).toBe('1970-01-01T00:00:00.000Z')\n  })\n\n  it('should serialize date', () => {\n    const date = new Date()\n    expect(serializeDate(date)).toBe(date.toISOString())\n  })\n\n  it('should serialize null date', () => {\n    expect(serializeDate(null)).toBe('1969-12-31T23:59:59.999Z')\n  })\n})\n"],"mappings":"AAAA,OAAOA,aAAP,MAA0B,iBAA1B;AAEAC,QAAQ,CAAC,eAAD,EAAkB,MAAM;EAC9BC,EAAE,CAAC,4BAAD,EAA+B,MAAM;IACrCC,MAAM,CAACH,aAAa,CAAC,IAAII,IAAJ,CAAS,CAAT,CAAD,CAAd,CAAN,CAAmCC,IAAnC,CAAwC,0BAAxC;EACD,CAFC,CAAF;EAIAH,EAAE,CAAC,uBAAD,EAA0B,MAAM;IAChC,MAAMI,IAAI,GAAG,IAAIF,IAAJ,EAAb;IACAD,MAAM,CAACH,aAAa,CAACM,IAAD,CAAd,CAAN,CAA4BD,IAA5B,CAAiCC,IAAI,CAACC,WAAL,EAAjC;EACD,CAHC,CAAF;EAKAL,EAAE,CAAC,4BAAD,EAA+B,MAAM;IACrCC,MAAM,CAACH,aAAa,CAAC,IAAD,CAAd,CAAN,CAA4BK,IAA5B,CAAiC,0BAAjC;EACD,CAFC,CAAF;AAGD,CAbO,CAAR"}

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

@@ -643,6 +643,7 @@ export declare type HKDevice = {
     readonly manufacturer: string;
     readonly model: string;
     readonly softwareVersion: string;
+    readonly udiDeviceIdentifier: string | null;
 };
 export declare type HKSource = {
     readonly name: string;
@@ -705,6 +706,24 @@ export declare type HKCategorySampleRaw<T extends HKCategoryTypeIdentifier = HKC
     readonly metadata: MetadataMapperForCategoryIdentifier<T>;
     readonly sourceRevision?: HKSourceRevision;
 };
+export declare type DeletedCategorySampleRaw<T extends HKCategoryTypeIdentifier> = {
+    readonly uuid: string;
+    readonly metadata: MetadataMapperForCategoryIdentifier<T>;
+};
+export declare type DeletedQuantitySampleRaw<T extends HKQuantityTypeIdentifier> = {
+    readonly uuid: string;
+    readonly metadata: MetadataMapperForQuantityIdentifier<T>;
+};
+export declare type QueryCategorySamplesResponseRaw<T extends HKCategoryTypeIdentifier> = {
+    readonly samples: readonly HKCategorySampleRaw<T>[];
+    readonly deletedSamples: readonly DeletedCategorySampleRaw<T>[];
+    readonly newAnchor: string;
+};
+export declare type QueryQuantitySamplesResponseRaw<T extends HKQuantityTypeIdentifier> = {
+    readonly samples: readonly HKQuantitySampleRaw<T>[];
+    readonly deletedSamples: readonly DeletedQuantitySampleRaw<T>[];
+    readonly newAnchor: string;
+};
 export declare type HKCorrelationRaw<TIdentifier extends HKCorrelationTypeIdentifier> = {
     readonly correlationType: HKCorrelationTypeIdentifier;
     readonly objects: readonly (HKCategorySampleRaw | HKQuantitySampleRaw)[];
@@ -758,8 +777,8 @@ declare type ReactNativeHealthkitTypeNative = {
     readonly deleteQuantitySample: <TIdentifier extends HKQuantityTypeIdentifier>(typeIdentifier: TIdentifier, uuid: string) => Promise<boolean>;
     readonly deleteSamples: <TIdentifier extends HKQuantityTypeIdentifier>(identifier: TIdentifier, start: string, end: string) => Promise<boolean>;
     readonly queryWorkoutSamples: <TEnergy extends EnergyUnit, TDistance extends LengthUnit>(energyUnit: TEnergy, distanceUnit: TDistance, from: string, to: string, limit: number, ascending: boolean) => Promise<readonly HKWorkoutRaw<TEnergy, TDistance>[]>;
-    readonly queryCategorySamples: <T extends HKCategoryTypeIdentifier>(identifier: T, from: string, to: string, limit: number, ascending: boolean) => 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, TUnit>[]>;
+    readonly queryCategorySamples: <T extends HKCategoryTypeIdentifier>(identifier: T, from: string, to: string, limit: number, ascending: boolean, anchor: string) => Promise<QueryCategorySamplesResponseRaw<T>>;
+    readonly queryQuantitySamples: <TIdentifier extends HKQuantityTypeIdentifier, TUnit extends UnitForIdentifier<TIdentifier>>(identifier: TIdentifier, unit: TUnit, from: string, to: string, limit: number, ascending: boolean, anchor: string) => Promise<QueryQuantitySamplesResponseRaw<TIdentifier>>;
     readonly querySources: <TIdentifier extends HKCategoryTypeIdentifier | HKQuantityTypeIdentifier>(identifier: TIdentifier) => Promise<readonly HKSource[]>;
     readonly saveCategorySample: <T extends HKCategoryTypeIdentifier>(identifier: T, value: HKCategoryValueForIdentifier<T>, start: string, end: string, metadata: unknown) => Promise<boolean>;
     readonly queryStatisticsForQuantity: <TIdentifier extends HKQuantityTypeIdentifier, TUnit extends UnitForIdentifier<TIdentifier>>(identifier: HKQuantityTypeIdentifier, unit: TUnit, from: string, to: string, options: readonly HKStatisticsOptions[]) => Promise<QueryStatisticsResponseRaw<TIdentifier, TUnit>>;

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

@@ -13,6 +13,7 @@ export declare type GenericQueryOptions = {
     readonly to?: Date;
     readonly limit?: number;
     readonly ascending?: boolean;
+    readonly anchor?: string;
 };
 export interface HKWorkout<TEnergy extends EnergyUnit = EnergyUnit, TDistance extends LengthUnit = LengthUnit> extends Omit<HKWorkoutRaw<TEnergy, TDistance>, 'endDate' | 'startDate'> {
     readonly startDate: Date;

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

@@ -1,4 +1,4 @@
 import type { HKQuantitySampleRaw, HKQuantityTypeIdentifier, UnitForIdentifier } from '../native-types';
 import type { HKQuantitySample } from '../types';
-declare function deserializeSample<TIdentifier extends HKQuantityTypeIdentifier, TUnit extends UnitForIdentifier<TIdentifier>>(sample: HKQuantitySampleRaw<TIdentifier, TUnit>): HKQuantitySample<TIdentifier, TUnit>;
-export default deserializeSample;
+declare function deserializeQuantitySample<TIdentifier extends HKQuantityTypeIdentifier, TUnit extends UnitForIdentifier<TIdentifier>>(sample: HKQuantitySampleRaw<TIdentifier, TUnit>): HKQuantitySample<TIdentifier, TUnit>;
+export default deserializeQuantitySample;

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

@@ -4,5 +4,6 @@ declare const prepareOptions: (options: GenericQueryOptions) => {
     ascending: boolean;
     from: string;
     to: string;
+    anchor: string;
 };
 export default prepareOptions;

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

@@ -1,5 +1,10 @@
-import type { HKCategoryTypeIdentifier } from '../native-types';
+import type { HKCategoryTypeIdentifier, DeletedCategorySampleRaw } from '../native-types';
 import type { GenericQueryOptions, HKCategorySample } from '../types';
-export declare type QueryCategorySamplesFn = <T extends HKCategoryTypeIdentifier>(identifier: T, options: GenericQueryOptions) => Promise<readonly HKCategorySample<T>[]>;
+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>>;
 declare const queryCategorySamples: QueryCategorySamplesFn;
 export default queryCategorySamples;

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

@@ -1,7 +1,12 @@
-import type { HKQuantityTypeIdentifier, UnitForIdentifier } from '../native-types';
+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 & {
     readonly unit?: TUnit;
-}) => Promise<readonly HKQuantitySample<TIdentifier>[]>;
+}) => Promise<QueryQuantitySamplesResponse<TIdentifier>>;
 declare const queryQuantitySamples: QueryQuantitySamplesFn;
 export default queryQuantitySamples;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kingstinct/react-native-healthkit",
-  "version": "5.4.0",
+  "version": "6.0.0",
   "description": "React Native bindings for HealthKit",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -48,6 +48,7 @@
     "@babel/core": ">=7",
     "@babel/preset-env": "^7.18.10",
     "@commitlint/config-conventional": "12",
+    "@expo/config-plugins": "^6.0.1",
     "@graphql-eslint/eslint-plugin": ">=3",
     "@release-it/conventional-changelog": "2",
     "@testing-library/react-native": "^11.0.0",

package/src/index.tsx

@@ -1,7 +1,7 @@
 import { Platform } from 'react-native'
 
 import {
-  HKAuthorizationRequestStatus, HKBiologicalSex, HKBloodType, HKFitzpatrickSkinType, HKUnits, HKWheelchairUse,
+  HKAuthorizationRequestStatus, HKBiologicalSex, HKBloodType, HKFitzpatrickSkinType, HKQuantityTypeIdentifier, HKUnits, HKWheelchairUse, QueryQuantitySamplesResponseRaw,
 } from './native-types'
 
 import type ReactNativeHealthkit from './index.ios'
@@ -41,9 +41,17 @@ 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({
+    samples: [],
+    deletedSamples: [],
+    newAnchor: '',
+  })),
   queryCorrelationSamples: UnavailableFn(Promise.resolve([])),
-  queryQuantitySamples: UnavailableFn(Promise.resolve([])),
+  queryQuantitySamples: UnavailableFn(Promise.resolve({
+    samples: [],
+    deletedSamples: [],
+    newAnchor: '',
+  })),
   queryStatisticsForQuantity: UnavailableFn(Promise.resolve({
     averageQuantity: undefined,
     maximumQuantity: undefined,

package/src/native-types.ts

@@ -994,6 +994,7 @@ export type HKDevice = {
   readonly manufacturer: string; // ex: "Apple Inc."
   readonly model: string; // ex: "Watch"
   readonly softwareVersion: string; // ex: "9.0"
+  readonly udiDeviceIdentifier: string | null
 };
 
 export type HKSource = {
@@ -1099,6 +1100,28 @@ export type HKCategorySampleRaw<
   readonly sourceRevision?: HKSourceRevision;
 };
 
+export type DeletedCategorySampleRaw<T extends HKCategoryTypeIdentifier> = {
+  readonly uuid: string;
+  readonly metadata: MetadataMapperForCategoryIdentifier<T>
+}
+
+export type DeletedQuantitySampleRaw<T extends HKQuantityTypeIdentifier> = {
+  readonly uuid: string;
+  readonly metadata: MetadataMapperForQuantityIdentifier<T>
+}
+
+export type QueryCategorySamplesResponseRaw<T extends HKCategoryTypeIdentifier> = {
+  readonly samples: readonly HKCategorySampleRaw<T>[],
+  readonly deletedSamples: readonly DeletedCategorySampleRaw<T>[],
+  readonly newAnchor: string
+}
+
+export type QueryQuantitySamplesResponseRaw<T extends HKQuantityTypeIdentifier> = {
+  readonly samples: readonly HKQuantitySampleRaw<T>[],
+  readonly deletedSamples: readonly DeletedQuantitySampleRaw<T>[],
+  readonly newAnchor: string
+}
+
 export type HKCorrelationRaw<TIdentifier extends HKCorrelationTypeIdentifier> =
   {
     readonly correlationType: HKCorrelationTypeIdentifier;
@@ -1232,8 +1255,9 @@ type ReactNativeHealthkitTypeNative = {
     from: string,
     to: string,
     limit: number,
-    ascending: boolean
-  ) => Promise<readonly HKCategorySampleRaw<T>[]>;
+    ascending: boolean,
+    anchor: string
+  ) => Promise<QueryCategorySamplesResponseRaw<T>>;
   readonly queryQuantitySamples: <
     TIdentifier extends HKQuantityTypeIdentifier,
     TUnit extends UnitForIdentifier<TIdentifier>
@@ -1243,8 +1267,9 @@ type ReactNativeHealthkitTypeNative = {
     from: string,
     to: string,
     limit: number,
-    ascending: boolean
-  ) => Promise<readonly HKQuantitySampleRaw<TIdentifier, TUnit>[]>;
+    ascending: boolean,
+    anchor: string
+  ) => Promise<QueryQuantitySamplesResponseRaw<TIdentifier>>;
   readonly querySources: <
     TIdentifier extends HKCategoryTypeIdentifier | HKQuantityTypeIdentifier
   >(

package/src/types.ts

@@ -37,6 +37,7 @@ export type GenericQueryOptions = {
   readonly to?: Date;
   readonly limit?: number;
   readonly ascending?: boolean;
+  readonly anchor?: string
 };
 
 export interface HKWorkout<
@@ -69,132 +70,11 @@ export interface QueryStatisticsResponse<TIdentifier extends HKQuantityTypeIdent
   > {
   readonly mostRecentQuantityDateInterval?: { readonly from: Date; readonly to: Date };
 }
-/*
-export type IsHealthDataAvailableFn = () => Promise<boolean>;
-
-export type GetBloodTypeFn = () => Promise<HKBloodType>;
-
-export type GetDateOfBirthFn = () => Promise<Date>;
-export type GetBiologicalSexFn = () => Promise<HKBiologicalSex>;
-export type GetWheelchairUseFn = () => Promise<HKWheelchairUse>;
-export type GetFitzpatrickSkinTypeFn = () => Promise<HKFitzpatrickSkinType>;
-
-export type AuthorizationStatusForFn = (
-  type: HealthkitReadAuthorization
-) => Promise<boolean>;
-
-export type QueryCategorySamplesFn = <T extends HKCategoryTypeIdentifier>(
-  identifier: T,
-  options: GenericQueryOptions
-) => Promise<readonly HKCategorySample<T>[]>;
-
-export type GetRequestStatusForAuthorizationFn = (
-  read: readonly HealthkitReadAuthorization[],
-  write?: readonly HealthkitWriteAuthorization[]
-) => Promise<HKAuthorizationRequestStatus>;
-
-export type RequestAuthorizationFn = (
-  read: readonly HealthkitReadAuthorization[],
-  write?: readonly HealthkitWriteAuthorization[]
-) => Promise<boolean>;
-
-export type SaveQuantitySampleFn = <TType extends HKQuantityTypeIdentifier, TUnit extends UnitForIdentifier<TType>>(
-  identifier: TType,
-  unit: TUnit,
-  value: number,
-  options?: {
-    readonly start?: Date;
-    readonly end?: Date;
-    readonly metadata?: MetadataMapperForQuantityIdentifier<TType>;
-  }
-) => Promise<boolean>;
-
-export type QueryQuantitySamplesFn = <
-  TIdentifier extends HKQuantityTypeIdentifier,
-  TUnit extends UnitForIdentifier<TIdentifier>
->(
-  identifier: TIdentifier,
-  options: GenericQueryOptions & { readonly unit?: TUnit }
-) => Promise<readonly HKQuantitySample<TIdentifier>[]>; */
 
 export type HKCategorySampleForSaving =Omit<HKCategorySample, 'device' | 'endDate' | 'startDate' | 'uuid'>
 
 export type HKQuantitySampleForSaving =Omit<HKQuantitySample, 'device' | 'endDate' | 'startDate' | 'uuid'>
-/*
-export type SaveCategorySampleFn = <T extends HKCategoryTypeIdentifier>(
-  identifier: T,
-  value: HKCategoryValueForIdentifier<T>,
-  options?: {
-    readonly start?: Date;
-    readonly end?: Date;
-    readonly metadata?: MetadataMapperForCategoryIdentifier<T>;
-  }
-) => Promise<boolean>;
 
-export type MostRecentCategorySampleHook = <T extends HKCategoryTypeIdentifier>(
-  identifier: T
-) => HKCategorySample<T> | null;
-
-export type MostRecentCorrelationSampleHook = <
-  T extends HKCorrelationTypeIdentifier
->(
-  identifer: T
-) => HKCorrelation<T> | null;
-
-export type MostRecentQuantitySampleHook = <
-  TIdentifier extends HKQuantityTypeIdentifier,
-  TUnit extends UnitForIdentifier<TIdentifier>
->(
-  identifier: TIdentifier,
-  unit?: TUnit
-) => HKQuantitySample<TIdentifier> | null;
-
-export type MostRecentWorkoutHook = <
-  TEnergy extends EnergyUnit,
-  TDistance extends LengthUnit
->(
-  options?: Pick<
-  QueryWorkoutsOptions<TEnergy, TDistance>,
-  'distanceUnit' | 'energyUnit'
-  >
-) => HKWorkout<TEnergy, TDistance> | null;
-
-export type GetPreferredUnitsFn = (
-  identifiers: readonly HKQuantityTypeIdentifier[]
-) => Promise<readonly HKUnit[]>;
-
-export type GetPreferredUnitFn = (
-  identifier: HKQuantityTypeIdentifier
-) => Promise<HKUnit>;
-
-export type SaveCorrelationSampleFn = <
-  TIdentifier extends HKCorrelationTypeIdentifier
->(
-  typeIdentifier: TIdentifier,
-  samples: readonly (
-    | Omit<HKCategorySample, 'device' | 'endDate' | 'startDate' | 'uuid'>
-    | Omit<HKQuantitySample<HKQuantityTypeIdentifier>, 'device' | 'endDate' | 'startDate' | 'uuid'>
-  )[],
-  options?: {
-    readonly start?: Date;
-    readonly end?: Date;
-    readonly metadata?: MetadataMapperForCorrelationIdentifier<TIdentifier>;
-  }
-) => Promise<boolean>;
-
-export type SaveWorkoutSampleFn<TIdentifier extends HKWorkoutActivityType, TQIdentifier extends HKQuantityTypeIdentifier> = (
-  typeIdentifier: TIdentifier,
-  quantities: readonly Omit<
-  HKQuantitySample<TQIdentifier>,
-  'device' | 'endDate' | 'startDate' | 'uuid'
-  >[],
-  start: Date,
-  options?: {
-    readonly end?: Date;
-    readonly metadata?: HKWorkoutMetadata;
-  }
-) => Promise<boolean>;
-*/
 export interface HKCorrelation<TIdentifier extends HKCorrelationTypeIdentifier>
   extends Omit<
   HKCorrelationRaw<TIdentifier>,
@@ -204,16 +84,3 @@ export interface HKCorrelation<TIdentifier extends HKCorrelationTypeIdentifier>
   readonly startDate: Date;
   readonly endDate: Date;
 }
-/*
-export type SubscribeToChangesHook = <
-  TIdentifier extends HKSampleTypeIdentifier
->(
-  identifier: TIdentifier,
-  onChange: () => void,
-  runInitialUpdate?: boolean
-) => void;
-
-export type GetWorkoutRoutesFn = (
-  workoutUUID: string
-) => Promise<readonly WorkoutRoute[]>;
-*/

package/src/utils/deserializeCorrelation.ts

@@ -1,5 +1,5 @@
 import deserializCategorySample from './deserializeCategorySample'
-import deserializeSample from './deserializeSample'
+import deserializeQuantitySample from './deserializeSample'
 
 import type {
   HKCategorySampleRaw, HKCorrelationRaw, HKCorrelationTypeIdentifier, HKQuantitySampleRaw, HKQuantityTypeIdentifier,
@@ -15,7 +15,7 @@ function deserializeCorrelation<
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
       if (o.quantity !== undefined) {
-        return deserializeSample(o as HKQuantitySampleRaw<HKQuantityTypeIdentifier>)
+        return deserializeQuantitySample(o as HKQuantitySampleRaw<HKQuantityTypeIdentifier>)
       }
 
       return deserializCategorySample(o as HKCategorySampleRaw)

package/src/utils/deserializeSample.ts

@@ -1,7 +1,7 @@
 import type { HKQuantitySampleRaw, HKQuantityTypeIdentifier, UnitForIdentifier } from '../native-types'
 import type { HKQuantitySample } from '../types'
 
-function deserializeSample<
+function deserializeQuantitySample<
   TIdentifier extends HKQuantityTypeIdentifier,
   TUnit extends UnitForIdentifier<TIdentifier>
 >(
@@ -14,4 +14,4 @@ function deserializeSample<
   }
 }
 
-export default deserializeSample
+export default deserializeQuantitySample

package/src/utils/getMostRecentCategorySample.ts

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

package/src/utils/getMostRecentQuantitySample.ts

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

package/src/utils/prepareOptions.ts

@@ -3,12 +3,15 @@ import serializeDate from './serializeDate'
 import type { GenericQueryOptions } from '../types'
 
 const prepareOptions = (options: GenericQueryOptions) => {
-  const limit = !options.limit || options.limit === Infinity ? 0 : options.limit
+  const limit = !options.limit || options.limit === Infinity
+    ? 0
+    : options.limit
   const ascending = options.ascending ?? limit === 0
-  const from = serializeDate(options.from)
+  const from = serializeDate(options.from ? options.from : (limit > 0 ? new Date(0) : undefined))
   const to = serializeDate(options.to)
+  const anchor = options.anchor ?? ''
   return {
-    limit, ascending, from, to,
+    limit, ascending, from, to, anchor,
   }
 }
 

package/src/utils/queryCategorySamples.ts

@@ -2,28 +2,39 @@ import Native from '../native-types'
 import deserializCategorySample from './deserializeCategorySample'
 import prepareOptions from './prepareOptions'
 
-import type { HKCategoryTypeIdentifier } 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
+}
+
 export type QueryCategorySamplesFn = <T extends HKCategoryTypeIdentifier>(
   identifier: T,
   options: GenericQueryOptions
-) => Promise<readonly HKCategorySample<T>[]>;
+) => Promise<QueryCategorySamplesResponse<T>>;
 
 const queryCategorySamples: QueryCategorySamplesFn = async (
   identifier,
   options,
 ) => {
   const opts = prepareOptions(options)
-  const results = await Native.queryCategorySamples(
+  const raw = await Native.queryCategorySamples(
     identifier,
     opts.from,
     opts.to,
     opts.limit,
     opts.ascending,
+    opts.anchor,
   )
 
-  return results.map(deserializCategorySample)
+  return {
+    samples: raw.samples.map(deserializCategorySample),
+    deletedSamples: raw.deletedSamples,
+    newAnchor: raw.newAnchor,
+  }
 }
 
 export default queryCategorySamples

package/src/utils/queryQuantitySamples.ts

@@ -1,18 +1,24 @@
 import Native from '../native-types'
-import deserializeSample from './deserializeSample'
+import deserializeQuantitySample from './deserializeSample'
 import ensureUnit from './ensureUnit'
 import prepareOptions from './prepareOptions'
 
-import type { HKQuantityTypeIdentifier, UnitForIdentifier } from '../native-types'
+import type { HKQuantityTypeIdentifier, UnitForIdentifier, DeletedQuantitySampleRaw } from '../native-types'
 import type { GenericQueryOptions, HKQuantitySample } from '../types'
 
+export type QueryQuantitySamplesResponse<T extends HKQuantityTypeIdentifier> = {
+  readonly samples: readonly HKQuantitySample<T>[],
+  readonly deletedSamples: readonly DeletedQuantitySampleRaw<T>[],
+  readonly newAnchor: string
+}
+
 export type QueryQuantitySamplesFn = <
   TIdentifier extends HKQuantityTypeIdentifier,
   TUnit extends UnitForIdentifier<TIdentifier>
 >(
   identifier: TIdentifier,
   options: GenericQueryOptions & { readonly unit?: TUnit }
-) => Promise<readonly HKQuantitySample<TIdentifier>[]>;
+) => Promise<QueryQuantitySamplesResponse<TIdentifier>>;
 
 const queryQuantitySamples: QueryQuantitySamplesFn = async (
   identifier,
@@ -21,16 +27,21 @@ const queryQuantitySamples: QueryQuantitySamplesFn = async (
   const unit = await ensureUnit(identifier, options.unit)
   const opts = prepareOptions(options)
 
-  const quantitySamples = await Native.queryQuantitySamples(
+  const result = await Native.queryQuantitySamples(
     identifier,
     unit,
     opts.from,
     opts.to,
     opts.limit,
     opts.ascending,
+    opts.anchor,
   )
 
-  return quantitySamples.map(deserializeSample)
+  return {
+    deletedSamples: result.deletedSamples,
+    newAnchor: result.newAnchor,
+    samples: result.samples.map(deserializeQuantitySample),
+  }
 }
 
 export default queryQuantitySamples

package/src/utils/serializeDate.test.ts

@@ -11,6 +11,6 @@ describe('serializeDate', () => {
   })
 
   it('should serialize null date', () => {
-    expect(serializeDate(null)).toBe('1970-01-01T00:00:00.000Z')
+    expect(serializeDate(null)).toBe('1969-12-31T23:59:59.999Z')
   })
 })

package/src/utils/serializeDate.ts

@@ -1,3 +1,5 @@
-const serializeDate = (date?: Date | null): string => (date ? date.toISOString() : new Date(0).toISOString())
+const serializeDate = (date?: Date | null): string => (
+  (date || new Date(-1)).toISOString()
+)
 
 export default serializeDate