@kingstinct/react-native-healthkit 5.3.0 → 6.0.0

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/querySources.ts

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

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

package/ios/ReactNativeHealthkit.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>

package/ios/ReactNativeHealthkit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

package/ios/ReactNativeHealthkit.xcodeproj/xcuserdata/robertherber.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>ReactNativeHealthkit.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>