@kingstinct/react-native-healthkit 6.1.0 → 7.0.0

package/src/utils/queryHeartbeatSeriesSamples.ts

@@ -1,6 +1,6 @@
-import Native from '../native-types'
 import deserializeHeartbeatSeriesSample from './deserializeHeartbeatSeriesSample'
 import prepareOptions from './prepareOptions'
+import Native from '../native-types'
 
 import type { DeletedHeartbeatSeriesSampleRaw } from '../native-types'
 import type { GenericQueryOptions, HKHeartbeatSeriesSample } from '../types'
@@ -11,7 +11,7 @@ export type QueryHeartbeatSeriesSamplesResponse = {
   readonly newAnchor: string
 }
 
-export type QueryHeartbeatSeriesSamplesFn = (options: GenericQueryOptions) => Promise<QueryHeartbeatSeriesSamplesResponse>;
+export type QueryHeartbeatSeriesSamplesFn = (options: Omit<GenericQueryOptions, 'anchor'>) => Promise<readonly HKHeartbeatSeriesSample[]>;
 
 const queryHeartbeatSeriesSamples: QueryHeartbeatSeriesSamplesFn = async (options) => {
   const opts = prepareOptions(options)
@@ -21,14 +21,9 @@ const queryHeartbeatSeriesSamples: QueryHeartbeatSeriesSamplesFn = async (option
     opts.to,
     opts.limit,
     opts.ascending,
-    opts.anchor,
   )
 
-  return {
-    deletedSamples: result.deletedSamples,
-    newAnchor: result.newAnchor,
-    samples: result.samples.map(deserializeHeartbeatSeriesSample),
-  }
+  return result.map(deserializeHeartbeatSeriesSample)
 }
 
 export default queryHeartbeatSeriesSamples

package/src/utils/queryHeartbeatSeriesSamplesWithAnchor.ts

@@ -0,0 +1,33 @@
+import deserializeHeartbeatSeriesSample from './deserializeHeartbeatSeriesSample'
+import prepareOptions from './prepareOptions'
+import Native from '../native-types'
+
+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>;
+
+const queryHeartbeatSeriesSamplesWithAnchor: QueryHeartbeatSeriesSamplesFn = async (options) => {
+  const opts = prepareOptions(options)
+
+  const result = await Native.queryHeartbeatSeriesSamplesWithAnchor(
+    opts.from,
+    opts.to,
+    opts.limit,
+    opts.anchor,
+  )
+
+  return {
+    deletedSamples: result.deletedSamples,
+    newAnchor: result.newAnchor,
+    samples: result.samples.map(deserializeHeartbeatSeriesSample),
+  }
+}
+
+export default queryHeartbeatSeriesSamplesWithAnchor

package/src/utils/queryQuantitySamples.ts

@@ -1,24 +1,19 @@
-import Native from '../native-types'
-import deserializeQuantitySample from './deserializeSample'
 import ensureUnit from './ensureUnit'
 import prepareOptions from './prepareOptions'
+import Native 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
-}
+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: GenericQueryOptions & { readonly unit?: TUnit }
-) => Promise<QueryQuantitySamplesResponse<TIdentifier>>;
+  options: Omit<GenericQueryOptions, 'anchor'> & { readonly unit?: TUnit }
+) => Promise<readonly HKQuantitySampleRaw<TIdentifier>[]>;
 
 const queryQuantitySamples: QueryQuantitySamplesFn = async (
   identifier,
@@ -34,14 +29,9 @@ const queryQuantitySamples: QueryQuantitySamplesFn = async (
     opts.to,
     opts.limit,
     opts.ascending,
-    opts.anchor,
   )
 
-  return {
-    deletedSamples: result.deletedSamples,
-    newAnchor: result.newAnchor,
-    samples: result.samples.map(deserializeQuantitySample),
-  }
+  return result
 }
 
 export default queryQuantitySamples

package/src/utils/queryQuantitySamplesWithAnchor.ts

@@ -0,0 +1,46 @@
+import deserializeQuantitySample from './deserializeSample'
+import ensureUnit from './ensureUnit'
+import prepareOptions from './prepareOptions'
+import Native from '../native-types'
+
+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>>;
+
+const queryQuantitySamplesWithAnchor: QueryQuantitySamplesWithAnchorFn = async (
+  identifier,
+  options,
+) => {
+  const unit = await ensureUnit(identifier, options.unit)
+  const opts = prepareOptions(options)
+
+  const result = await Native.queryQuantitySamplesWithAnchor(
+    identifier,
+    unit,
+    opts.from,
+    opts.to,
+    opts.limit,
+    opts.anchor,
+  )
+
+  return {
+    deletedSamples: result.deletedSamples,
+    newAnchor: result.newAnchor,
+    samples: result.samples.map(deserializeQuantitySample),
+  }
+}
+
+export default queryQuantitySamplesWithAnchor

package/src/utils/queryStatisticsForQuantity.ts

@@ -1,5 +1,5 @@
-import Native from '../native-types'
 import ensureUnit from './ensureUnit'
+import Native from '../native-types'
 
 import type { HKQuantityTypeIdentifier, HKStatisticsOptions, UnitForIdentifier } from '../native-types'
 

package/src/utils/queryWorkouts.ts

@@ -1,7 +1,7 @@
-import Native from '../native-types'
 import deserializeWorkout from './deserializeWorkout'
 import getPreferredUnitsTyped from './getPreferredUnitsTyped'
 import prepareOptions from './prepareOptions'
+import Native from '../native-types'
 
 import type { EnergyUnit, LengthUnit } from '../native-types'
 import type { QueryWorkoutsOptions } from '../types'

package/src/utils/saveCorrelationSample.ts

@@ -1,5 +1,5 @@
-import Native from '../native-types'
 import ensureMetadata from './ensureMetadata'
+import Native from '../native-types'
 
 import type { MetadataMapperForCorrelationIdentifier, HKCorrelationTypeIdentifier } from '../native-types'
 import type { HKCategorySampleForSaving, HKQuantitySampleForSaving } from '../types'

package/src/utils/saveWorkoutSample.ts

@@ -1,5 +1,5 @@
-import Native from '../native-types'
 import ensureMetadata from './ensureMetadata'
+import Native from '../native-types'
 
 import type { HKWorkoutActivityType, HKWorkoutMetadata } from '../native-types'
 import type { HKQuantitySampleForSaving } from '../types'

package/android/.project

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>kingstinct_react-native-healthkit</name>
-	<comment>Project android_ created by Buildship.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1663745272821</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -1,13 +0,0 @@
-arguments=--init-script /var/folders/lb/4fb2wm497wq1_0vknwt43h3h0000gn/T/init5242912127258488867.gradle --init-script /var/folders/lb/4fb2wm497wq1_0vknwt43h3h0000gn/T/init4373878353927339792.gradle
-auto.sync=false
-build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.4.2))
-connection.project.dir=../example/android
-eclipse.preferences.version=1
-gradle.user.home=
-java.home=/Users/andarius/.sdkman/candidates/java/11.0.2-open
-jvm.arguments=
-offline.mode=false
-override.workspace.settings=true
-show.console.view=true
-show.executions.view=true

package/android/build.gradle

@@ -1,130 +0,0 @@
-buildscript {
-  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['ReactNativeHealthkit_kotlinVersion']
-
-  repositories {
-    google()
-    jcenter()
-  }
-
-  dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
-    // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-  }
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
-def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['ReactNativeHealthkit_' + name]
-}
-
-def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['ReactNativeHealthkit_' + name]).toInteger()
-}
-
-android {
-  compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
-  buildToolsVersion getExtOrDefault('buildToolsVersion')
-  defaultConfig {
-    minSdkVersion 16
-    targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    versionCode 1
-    versionName "1.0"
-    
-  }
-  
-  buildTypes {
-    release {
-      minifyEnabled false
-    }
-  }
-  lintOptions {
-    disable 'GradleCompatible'
-  }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-}
-
-repositories {
-  mavenCentral()
-  jcenter()
-  google()
-
-  def found = false
-  def defaultDir = null
-  def androidSourcesName = 'React Native sources'
-
-  if (rootProject.ext.has('reactNativeAndroidRoot')) {
-    defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
-  } else {
-    defaultDir = new File(
-            projectDir,
-            '/../../../node_modules/react-native/android'
-    )
-  }
-
-  if (defaultDir.exists()) {
-    maven {
-      url defaultDir.toString()
-      name androidSourcesName
-    }
-
-    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
-    found = true
-  } else {
-    def parentDir = rootProject.projectDir
-
-    1.upto(5, {
-      if (found) return true
-      parentDir = parentDir.parentFile
-
-      def androidSourcesDir = new File(
-              parentDir,
-              'node_modules/react-native'
-      )
-
-      def androidPrebuiltBinaryDir = new File(
-              parentDir,
-              'node_modules/react-native/android'
-      )
-
-      if (androidPrebuiltBinaryDir.exists()) {
-        maven {
-          url androidPrebuiltBinaryDir.toString()
-          name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
-        found = true
-      } else if (androidSourcesDir.exists()) {
-        maven {
-          url androidSourcesDir.toString()
-          name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
-        found = true
-      }
-    })
-  }
-
-  if (!found) {
-    throw new GradleException(
-            "${project.name}: unable to locate React Native android sources. " +
-                    "Ensure you have you installed React Native as a dependency in your project and try again."
-    )
-  }
-}
-
-def kotlin_version = getExtOrDefault('kotlinVersion')
-
-dependencies {
-  // noinspection GradleDynamicVersion
-  api 'com.facebook.react:react-native:+'
-  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-}

package/android/gradle.properties

@@ -1,4 +0,0 @@
-ReactNativeHealthkit_kotlinVersion=1.3.50
-ReactNativeHealthkit_compileSdkVersion=28
-ReactNativeHealthkit_buildToolsVersion=28.0.3
-ReactNativeHealthkit_targetSdkVersion=28

package/android/src/main/AndroidManifest.xml

@@ -1,4 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.kingstinctreactnativehealthkit">
-
-</manifest>

package/android/src/main/java/com/kingstinctreactnativehealthkit/ReactNativeHealthkitModule.kt

@@ -1,24 +0,0 @@
-package com.kingstinctreactnativehealthkit
-
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
-import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.bridge.Promise
-
-class ReactNativeHealthkitModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
-
-    override fun getName(): String {
-        return "ReactNativeHealthkit"
-    }
-
-    // Example method
-    // See https://facebook.github.io/react-native/docs/native-modules-android
-    @ReactMethod
-    fun multiply(a: Int, b: Int, promise: Promise) {
-    
-      promise.resolve(a * b)
-    
-    }
-
-    
-}

package/android/src/main/java/com/kingstinctreactnativehealthkit/ReactNativeHealthkitPackage.kt

@@ -1,20 +0,0 @@
-package com.kingstinctreactnativehealthkit
-
-import java.util.Arrays
-import java.util.Collections
-
-import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.NativeModule
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.uimanager.ViewManager
-import com.facebook.react.bridge.JavaScriptModule
-
-class ReactNativeHealthkitPackage : ReactPackage {
-    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        return Arrays.asList<NativeModule>(ReactNativeHealthkitModule(reactContext))
-    }
-
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-        return emptyList<ViewManager<*, *>>()
-    }
-}