@kingstinct/react-native-healthkit 7.0.6 → 7.1.0

package/ios/ReactNativeHealthkit.swift

@@ -1,6 +1,10 @@
 import HealthKit
 import CoreLocation
 
+#if canImport(WorkoutKit)
+import WorkoutKit
+#endif
+
 @objc(ReactNativeHealthkit)
 @available(iOS 10.0, *)
 class ReactNativeHealthkit: RCTEventEmitter {
@@ -504,6 +508,8 @@ class ReactNativeHealthkit: RCTEventEmitter {
         store.execute(query)
 
         self._runningQueries.updateValue(query, forKey: queryId)
+
+        resolve(queryId)
     }
 
     @objc(unsubscribeQuery:resolve:reject:)
@@ -617,6 +623,7 @@ class ReactNativeHealthkit: RCTEventEmitter {
 
     @objc(queryWorkoutSamples:distanceUnitString:from:to:limit:ascending:resolve:reject:)
     func queryWorkoutSamples(energyUnitString: String, distanceUnitString: String, from: Date, to: Date, limit: Int, ascending: Bool, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        
         guard let store = _store else {
             return reject(INIT_ERROR, INIT_ERROR_MESSAGE, nil)
         }
@@ -656,11 +663,70 @@ class ReactNativeHealthkit: RCTEventEmitter {
                             "metadata": serializeMetadata(metadata: workout.metadata),
                             "sourceRevision": serializeSourceRevision(_sourceRevision: workout.sourceRevision) as Any
                         ]
-
+                        
+                        //this is used for our laps functionality to get markers
+                        //https://developer.apple.com/documentation/healthkit/hkworkoutevent
+                        var eventArray: [[String: Any]] = []
+                        if let events = workout.workoutEvents {
+                            for event in events {
+                                let eventStartDate = self._dateFormatter.string(from: event.dateInterval.start)
+                                let eventEndDate = self._dateFormatter.string(from: event.dateInterval.end)
+                                let eventDict: [String: Any] = [
+                                    "type": event.type.rawValue, //https://developer.apple.com/documentation/healthkit/hkworkouteventtype
+                                    "startDate": eventStartDate,
+                                    "endDate": eventEndDate
+                                ]
+                                eventArray.append(eventDict)
+                            }
+                        }
+                        dict["events"] = eventArray
+                        
+                        //also used for our laps functionality to get activities for custom workouts defined by the user
+                        //https://developer.apple.com/documentation/healthkit/hkworkout/1615340-init
+                        //it seems this might be depricated in the latest beta so this might need updating!
+                        var activitiesArray: [[String: Any]] = []
+                        if #available(iOS 16.0, *) {
+                            let activities: [HKWorkoutActivity] = workout.workoutActivities
+                            
+                            if !activities.isEmpty{
+                                for activity in activities {
+                                    var activityStartDate = ""
+                                    var activityEndDate = ""
+                                    if let start = activity.startDate as Date? {
+                                        activityStartDate = self._dateFormatter.string(from: activity.startDate)
+                                    }
+                                    if let end = activity.endDate as Date? {
+                                        activityEndDate = self._dateFormatter.string(from: activity.endDate!)
+                                    }
+                                    let activityDict: [String: Any] = [
+                                        "startDate": activityStartDate,
+                                        "endDate": activityEndDate,
+                                        "uuid": activity.uuid.uuidString,
+                                        "duration": activity.duration
+                                    ]
+                                    activitiesArray.append(activityDict)
+                                }
+                            }
+                        }
+                        dict["activities"] = activitiesArray
+                        
                         if #available(iOS 11, *) {
                             dict.setValue(serializeQuantity(unit: HKUnit.count(), quantity: workout.totalFlightsClimbed), forKey: "totalFlightsClimbed")
                         }
-
+                        
+                        #if canImport(WorkoutKit)
+                        if #available(iOS 17.0, *) {
+                            do {
+                                let workoutplan = try await workout.workoutPlan
+                                if let workoutplanId = workoutplan?.id {
+                                    dict["workoutPlanId"] = workoutplanId.uuidString
+                                }
+                            } catch {
+                                // handle error
+                            }
+                        }
+                        #endif
+                        
                         arr.add(dict)
                     }
                 }

package/lib/commonjs/native-types.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.UnitOfVolume = exports.UnitOfTime = exports.UnitOfPressure = exports.UnitOfMass = exports.UnitOfLength = exports.UnitOfEnergy = exports.TemperatureUnit = exports.HKWorkoutTypeIdentifier = exports.HKWorkoutRouteTypeIdentifier = exports.HKWorkoutActivityType = exports.HKWheelchairUse = exports.HKWeatherCondition = exports.HKUpdateFrequency = exports.HKUnits = exports.HKUnitMetric = exports.HKStatisticsOptions = exports.HKQuantityTypeIdentifier = exports.HKMetricPrefix = exports.HKInsulinDeliveryReason = exports.HKHeartRateMotionContext = exports.HKFitzpatrickSkinType = exports.HKDataTypeIdentifierHeartbeatSeries = exports.HKCorrelationTypeIdentifier = exports.HKCharacteristicTypeIdentifier = exports.HKCategoryValueSleepAnalysis = exports.HKCategoryValueSeverity = exports.HKCategoryValuePresence = exports.HKCategoryValueOvulationTestResult = exports.HKCategoryValueNotApplicable = exports.HKCategoryValueMenstrualFlow = exports.HKCategoryValueLowCardioFitnessEvent = exports.HKCategoryValueCervicalMucusQuality = exports.HKCategoryValueAppleStandHour = exports.HKCategoryValueAppetiteChanges = exports.HKCategoryTypeIdentifier = exports.HKBloodType = exports.HKBiologicalSex = exports.HKAuthorizationStatus = exports.HKAuthorizationRequestStatus = exports.HKAudiogramTypeIdentifier = exports.EventEmitter = exports.BloodGlucoseUnit = void 0;
+exports.default = exports.UnitOfVolume = exports.UnitOfTime = exports.UnitOfPressure = exports.UnitOfMass = exports.UnitOfLength = exports.UnitOfEnergy = exports.TemperatureUnit = exports.HKWorkoutTypeIdentifier = exports.HKWorkoutRouteTypeIdentifier = exports.HKWorkoutEventType = exports.HKWorkoutActivityType = exports.HKWheelchairUse = exports.HKWeatherCondition = exports.HKUpdateFrequency = exports.HKUnits = exports.HKUnitMetric = exports.HKStatisticsOptions = exports.HKQuantityTypeIdentifier = exports.HKMetricPrefix = exports.HKInsulinDeliveryReason = exports.HKHeartRateMotionContext = exports.HKFitzpatrickSkinType = exports.HKCorrelationTypeIdentifier = exports.HKCharacteristicTypeIdentifier = exports.HKCategoryValueSleepAnalysis = exports.HKCategoryValueSeverity = exports.HKCategoryValuePresence = exports.HKCategoryValueOvulationTestResult = exports.HKCategoryValueNotApplicable = exports.HKCategoryValueMenstrualFlow = exports.HKCategoryValueLowCardioFitnessEvent = exports.HKCategoryValueCervicalMucusQuality = exports.HKCategoryValueAppleStandHour = exports.HKCategoryValueAppetiteChanges = exports.HKCategoryTypeIdentifier = exports.HKBloodType = exports.HKBiologicalSex = exports.HKAuthorizationStatus = exports.HKAuthorizationRequestStatus = exports.HKAudiogramTypeIdentifier = exports.HKActivitySummaryType = exports.EventEmitter = exports.BloodGlucoseUnit = void 0;
 var _reactNative = require("react-native");
 /**
  * Represents a workout type identifier.
@@ -12,10 +12,18 @@ var _reactNative = require("react-native");
 const HKWorkoutTypeIdentifier = 'HKWorkoutTypeIdentifier';
 
 /**
- * Represents an audiogram type identifier.
+ * Represents a type that identifies activity summary objects.
+ * @see {@link https://developer.apple.com/documentation/healthkit/hkactivitysummarytype Apple Docs HKActivitySummaryType}
  */
 exports.HKWorkoutTypeIdentifier = HKWorkoutTypeIdentifier;
-const HKAudiogramTypeIdentifier = 'HKAudiogramTypeIdentifier';
+const HKActivitySummaryType = 'HKActivitySummaryType';
+
+/**
+ * Represents an audiogram type identifier.
+ * @see {@link https://developer.apple.com/documentation/healthkit/HKAudiogramSampleType Apple Docs HKAudiogramSampleType}
+ */
+exports.HKActivitySummaryType = HKActivitySummaryType;
+const HKAudiogramTypeIdentifier = 'HKAudiogramSampleType';
 
 /**
  * Represents a workout route type identifier.
@@ -23,14 +31,16 @@ const HKAudiogramTypeIdentifier = 'HKAudiogramTypeIdentifier';
  */
 exports.HKAudiogramTypeIdentifier = HKAudiogramTypeIdentifier;
 const HKWorkoutRouteTypeIdentifier = 'HKWorkoutRouteTypeIdentifier';
-exports.HKWorkoutRouteTypeIdentifier = HKWorkoutRouteTypeIdentifier;
-const HKDataTypeIdentifierHeartbeatSeries = 'HKDataTypeIdentifierHeartbeatSeries';
 
+/**
+ * Represents a series sample containing heartbeat data..
+ * @see {@link https://developer.apple.com/documentation/healthkit/HKDataTypeIdentifierHeartbeatSeries Apple Docs HKDataTypeIdentifierHeartbeatSeries}
+ */
+exports.HKWorkoutRouteTypeIdentifier = HKWorkoutRouteTypeIdentifier;
 /**
  * Represents a quantity type identifier.
  * @see {@link https://developer.apple.com/documentation/healthkit/hkquantitytypeidentifier Apple Docs HKQuantityTypeIdentifier}
  */
-exports.HKDataTypeIdentifierHeartbeatSeries = HKDataTypeIdentifierHeartbeatSeries;
 let HKQuantityTypeIdentifier = /*#__PURE__*/function (HKQuantityTypeIdentifier) {
   HKQuantityTypeIdentifier["bodyMassIndex"] = "HKQuantityTypeIdentifierBodyMassIndex";
   HKQuantityTypeIdentifier["bodyFatPercentage"] = "HKQuantityTypeIdentifierBodyFatPercentage";
@@ -137,6 +147,11 @@ let HKQuantityTypeIdentifier = /*#__PURE__*/function (HKQuantityTypeIdentifier)
   HKQuantityTypeIdentifier["cyclingCadence"] = "HKQuantityTypeIdentifierCyclingCadence";
   HKQuantityTypeIdentifier["environmentalSoundReduction"] = "HKQuantityTypeIdentifierEnvironmentalSoundReduction";
   HKQuantityTypeIdentifier["heartRateRecoveryOneMinute"] = "HKQuantityTypeIdentifierHeartRateRecoveryOneMinute";
+  HKQuantityTypeIdentifier["runningGroundContactTime"] = "HKQuantityTypeIdentifierRunningGroundContactTime";
+  HKQuantityTypeIdentifier["runningStrideLength"] = "HKQuantityTypeIdentifierRunningStrideLength";
+  HKQuantityTypeIdentifier["runningPower"] = "HKQuantityTypeIdentifierRunningPower";
+  HKQuantityTypeIdentifier["runningVerticalOscillation"] = "HKQuantityTypeIdentifierRunningVerticalOscillation";
+  HKQuantityTypeIdentifier["runningSpeed"] = "HKQuantityTypeIdentifierRunningSpeed";
   return HKQuantityTypeIdentifier;
 }({});
 exports.HKQuantityTypeIdentifier = HKQuantityTypeIdentifier;
@@ -715,6 +730,18 @@ let BloodGlucoseUnit = /*#__PURE__*/function (BloodGlucoseUnit) {
  * @see {@link https://developer.apple.com/documentation/healthkit/hkquantitysample Apple Docs }
  */
 exports.BloodGlucoseUnit = BloodGlucoseUnit;
+let HKWorkoutEventType = /*#__PURE__*/function (HKWorkoutEventType) {
+  HKWorkoutEventType[HKWorkoutEventType["pause"] = 1] = "pause";
+  HKWorkoutEventType[HKWorkoutEventType["resume"] = 2] = "resume";
+  HKWorkoutEventType[HKWorkoutEventType["lap"] = 3] = "lap";
+  HKWorkoutEventType[HKWorkoutEventType["marker"] = 4] = "marker";
+  HKWorkoutEventType[HKWorkoutEventType["motionPaused"] = 5] = "motionPaused";
+  HKWorkoutEventType[HKWorkoutEventType["motionResumed"] = 6] = "motionResumed";
+  HKWorkoutEventType[HKWorkoutEventType["segment"] = 7] = "segment";
+  HKWorkoutEventType[HKWorkoutEventType["pauseOrResumeRequest"] = 8] = "pauseOrResumeRequest";
+  return HKWorkoutEventType;
+}({});
+exports.HKWorkoutEventType = HKWorkoutEventType;
 // Straight mapping to https://developer.apple.com/documentation/healthkit/hkcharacteristictypeidentifier
 let HKCharacteristicTypeIdentifier = /*#__PURE__*/function (HKCharacteristicTypeIdentifier) {
   HKCharacteristicTypeIdentifier["fitzpatrickSkinType"] = "HKCharacteristicTypeIdentifierFitzpatrickSkinType";