@kingstinct/react-native-healthkit 13.4.0 → 14.0.0

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

@@ -66,10 +66,14 @@ export interface QueryOptionsWithAnchor extends GenericQueryOptions {
 export interface QueryOptionsWithSortOrder extends GenericQueryOptions {
     readonly ascending?: boolean;
 }
-export interface QueryOptionsWithSortOrderAndUnit extends QueryOptionsWithSortOrder {
-    readonly unit?: string;
+export interface QueryOptionsWithSortOrderAndUnit<TUnit extends string = string> extends QueryOptionsWithSortOrder {
+    readonly unit?: TUnit;
 }
-export interface QueryOptionsWithAnchorAndUnit extends QueryOptionsWithAnchor {
-    readonly unit?: string;
+export interface QueryOptionsWithAnchorAndUnit<TUnit extends string = string> extends QueryOptionsWithAnchor {
+    readonly unit?: TUnit;
+}
+export interface QueryOptionsWithSortOrderAndStringUnit extends QueryOptionsWithSortOrderAndUnit<string> {
+}
+export interface QueryOptionsWithAnchorAndStringUnit extends QueryOptionsWithAnchorAndUnit<string> {
 }
 export {};

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

@@ -1,13 +1,12 @@
 import type { AnyMap } from 'react-native-nitro-modules';
+import type { KnownObjectMetadata, KnownSampleMetadata } from '../generated/healthkit.generated';
 import type { CategoryTypeIdentifier, CategoryTypeIdentifierWriteable } from './CategoryTypeIdentifier';
 import type { CharacteristicTypeIdentifier } from './Characteristics';
 import type { ActivitySummaryTypeIdentifier, AudiogramTypeIdentifier, ElectrocardiogramTypeIdentifier, HeartbeatSeriesTypeIdentifier, HKVisionPrescriptionTypeIdentifier, StateOfMindTypeIdentifier, UserAnnotatedMedicationTypeIdentifier, WorkoutRouteTypeIdentifier, WorkoutTypeIdentifier } from './Constants';
 import type { CorrelationTypeIdentifier } from './CorrelationType';
 import type { Device } from './Device';
-import type { HeartRateMotionContext, InsulinDeliveryReason, Quantity } from './QuantityType';
 import type { QuantityTypeIdentifier, QuantityTypeIdentifierWriteable } from './QuantityTypeIdentifier';
 import type { SourceRevision } from './Source';
-import type { WeatherCondition } from './WeatherCondition';
 export interface DeletedSample {
     readonly uuid: string;
     readonly metadata?: AnyMap;
@@ -16,42 +15,21 @@ export type ObjectTypeIdentifier = CharacteristicTypeIdentifier | SampleTypeIden
 export type PerObjectTypeIdentifier = typeof HKVisionPrescriptionTypeIdentifier | typeof UserAnnotatedMedicationTypeIdentifier;
 export type SampleTypeIdentifier = CategoryTypeIdentifier | CorrelationTypeIdentifier | QuantityTypeIdentifier | typeof StateOfMindTypeIdentifier | typeof AudiogramTypeIdentifier | typeof HeartbeatSeriesTypeIdentifier | typeof WorkoutRouteTypeIdentifier | typeof WorkoutTypeIdentifier | typeof ElectrocardiogramTypeIdentifier;
 export type SampleTypeIdentifierWriteable = CategoryTypeIdentifierWriteable | CorrelationTypeIdentifier | QuantityTypeIdentifierWriteable | typeof StateOfMindTypeIdentifier | typeof AudiogramTypeIdentifier | typeof HeartbeatSeriesTypeIdentifier | typeof WorkoutRouteTypeIdentifier | typeof WorkoutTypeIdentifier;
-export interface GenericMetadata {
-    readonly HKExternalUUID?: string;
-    readonly HKTimeZone?: string;
-    readonly HKWasUserEntered?: boolean;
-    readonly HKDeviceSerialNumber?: string;
-    readonly HKUDIDeviceIdentifier?: string;
-    readonly HKUDIProductionIdentifier?: string;
-    readonly HKDigitalSignature?: string;
-    readonly HKDeviceName?: string;
-    readonly HKDeviceManufacturerName?: string;
-    readonly HKSyncIdentifier?: string;
-    readonly HKSyncVersion?: number;
-    readonly HKWasTakenInLab?: boolean;
-    readonly HKReferenceRangeLowerLimit?: number;
-    readonly HKReferenceRangeUpperLimit?: number;
-}
+export type MetadataWithUnknown<T extends object> = AnyMap & T;
+export type GenericMetadata = AnyMap & KnownObjectMetadata;
+export type WithTypedMetadata<T, TMetadata extends object> = Omit<T, 'metadata'> & {
+    readonly metadata: AnyMap & TMetadata;
+};
+export type WithOptionalTypedMetadata<T, TMetadata extends object> = Omit<T, 'metadata'> & {
+    readonly metadata?: AnyMap & TMetadata;
+};
+export type BaseObjectTyped<TMetadata extends object = KnownObjectMetadata> = WithTypedMetadata<BaseObject, TMetadata>;
+export type BaseSampleTyped<TMetadata extends object = KnownSampleMetadata> = WithTypedMetadata<BaseSample, TMetadata>;
 export interface BaseObject {
     readonly uuid: string;
     readonly sourceRevision: SourceRevision;
     readonly device?: Device;
     readonly metadata: AnyMap;
-    readonly metadataExternalUUID?: string;
-    readonly metadataTimeZone?: string;
-    readonly metadataWasUserEntered?: boolean;
-    readonly metadataDeviceSerialNumber?: string;
-    readonly metadataUdiDeviceIdentifier?: string;
-    readonly metadataUdiProductionIdentifier?: string;
-    readonly metadataDigitalSignature?: string;
-    readonly metadataDeviceName?: string;
-    readonly metadataDeviceManufacturerName?: string;
-    readonly metadataSyncIdentifier?: string;
-    readonly metadataSyncVersion?: number;
-    readonly metadataWasTakenInLab?: boolean;
-    readonly metadataReferenceRangeLowerLimit?: number;
-    readonly metadataReferenceRangeUpperLimit?: number;
-    readonly metadataAlgorithmVersion?: number;
 }
 export interface SampleType {
     identifier: string;
@@ -64,12 +42,5 @@ export interface BaseSample extends BaseObject {
     readonly startDate: Date;
     readonly endDate: Date;
     readonly hasUndeterminedDuration: boolean;
-    readonly metadataWeatherCondition?: WeatherCondition;
-    readonly metadataWeatherHumidity?: Quantity;
-    readonly metadataWeatherTemperature?: Quantity;
-    readonly metadataInsulinDeliveryReason?: InsulinDeliveryReason;
-    /**
-     * postprandial or preprandial (https://developer.apple.com/documentation/healthkit/hkbloodglucosemealtime)
-     */
-    readonly metadataHeartRateMotionContext?: HeartRateMotionContext;
+    readonly metadata: AnyMap;
 }

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

@@ -1,4 +1,5 @@
-import type { BaseSample, DeletedSample } from './Shared';
+import type { KnownSampleMetadata } from '../generated/healthkit.generated';
+import type { BaseSample, DeletedSample, WithTypedMetadata } from './Shared';
 export declare enum StateOfMindValenceClassification {
     veryUnpleasant = 1,
     unpleasant = 2,
@@ -19,11 +20,17 @@ export interface StateOfMindSample extends BaseSample {
     readonly associations: readonly StateOfMindAssociation[];
     readonly labels: readonly StateOfMindLabel[];
 }
+export type StateOfMindSampleTyped = WithTypedMetadata<StateOfMindSample, KnownSampleMetadata>;
 export interface StateOfMindSamplesWithAnchorResponse {
     readonly samples: readonly StateOfMindSample[];
     readonly deletedSamples: readonly DeletedSample[];
     readonly newAnchor: string;
 }
+export interface StateOfMindSamplesWithAnchorResponseTyped {
+    readonly samples: readonly StateOfMindSampleTyped[];
+    readonly deletedSamples: readonly DeletedSample[];
+    readonly newAnchor: string;
+}
 /**
  * @see {@link https://developer.apple.com/documentation/healthkit/hkstateofmind/label Apple Docs}
  */

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

@@ -1,6 +1,6 @@
 import type { CategorySampleTyped } from './CategoryType';
 import type { CategoryTypeIdentifier } from './CategoryTypeIdentifier';
-import type { QuantitySample } from './QuantitySample';
+import type { QuantitySampleTyped } from './QuantitySample';
 import type { QuantityTypeIdentifier } from './QuantityTypeIdentifier';
 import type { SampleTypeIdentifier } from './Shared';
 export interface EmitterSubscription {
@@ -10,21 +10,21 @@ export interface OnChangeCallbackArgs {
     readonly typeIdentifier: SampleTypeIdentifier;
     readonly errorMessage?: string;
 }
-export interface OnQuantitySamplesCallbackError {
-    readonly typeIdentifier: QuantityTypeIdentifier;
+export interface OnQuantitySamplesCallbackError<T extends QuantityTypeIdentifier = QuantityTypeIdentifier> {
+    readonly typeIdentifier: T;
     readonly errorMessage: string;
 }
-export interface OnQuantitySamplesCallbackSuccess {
-    readonly typeIdentifier: QuantityTypeIdentifier;
-    readonly samples: readonly QuantitySample[];
+export interface OnQuantitySamplesCallbackSuccess<T extends QuantityTypeIdentifier = QuantityTypeIdentifier> {
+    readonly typeIdentifier: T;
+    readonly samples: readonly QuantitySampleTyped<T>[];
 }
-export type OnQuantitySamplesCallback = OnQuantitySamplesCallbackError | OnQuantitySamplesCallbackSuccess;
-export interface OnCategorySamplesCallbackError {
-    readonly typeIdentifier: CategoryTypeIdentifier;
+export type OnQuantitySamplesCallback<T extends QuantityTypeIdentifier = QuantityTypeIdentifier> = OnQuantitySamplesCallbackError<T> | OnQuantitySamplesCallbackSuccess<T>;
+export interface OnCategorySamplesCallbackError<T extends CategoryTypeIdentifier = CategoryTypeIdentifier> {
+    readonly typeIdentifier: T;
     readonly errorMessage: string;
 }
 export interface OnCategorySamplesCallbackSuccess<T extends CategoryTypeIdentifier> {
-    readonly typeIdentifier: CategoryTypeIdentifier;
+    readonly typeIdentifier: T;
     readonly samples: readonly CategorySampleTyped<T>[];
 }
-export type OnCategorySamplesCallback<T extends CategoryTypeIdentifier> = OnCategorySamplesCallbackError | OnCategorySamplesCallbackSuccess<T>;
+export type OnCategorySamplesCallback<T extends CategoryTypeIdentifier> = OnCategorySamplesCallbackError<T> | OnCategorySamplesCallbackSuccess<T>;

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

@@ -1,30 +1 @@
-export declare enum WeatherCondition {
-    none = 0,
-    clear = 1,
-    fair = 2,
-    partlyCloudy = 3,
-    mostlyCloudy = 4,
-    cloudy = 5,
-    foggy = 6,
-    haze = 7,
-    windy = 8,
-    blustery = 9,
-    smoky = 10,
-    dust = 11,
-    snow = 12,
-    hail = 13,
-    sleet = 14,
-    freezingDrizzle = 15,
-    freezingRain = 16,
-    mixedRainAndHail = 17,
-    mixedRainAndSnow = 18,
-    mixedRainAndSleet = 19,
-    mixedSnowAndSleet = 20,
-    drizzle = 21,
-    scatteredShowers = 22,
-    showers = 23,
-    thunderstorms = 24,
-    tropicalStorm = 25,
-    hurricane = 26,
-    tornado = 27
-}
+export { WeatherCondition } from '../generated/healthkit.generated';

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

@@ -1,111 +1,19 @@
 import type { AnyMap } from 'react-native-nitro-modules';
+import type { WorkoutEventTypedMetadata, WorkoutTypedMetadata } from '../generated/healthkit.generated';
+import { WorkoutActivityType, WorkoutEventType } from '../generated/healthkit.generated';
 import type { WorkoutProxy } from '../specs/WorkoutProxy.nitro';
 import type { BaseSample, ComparisonPredicateOperator } from '../types';
 import type { Quantity } from './QuantityType';
 import type { FilterForSamplesBase } from './QueryOptions';
-import type { DeletedSample } from './Shared';
-export declare enum WorkoutActivityType {
-    americanFootball = 1,
-    archery = 2,
-    australianFootball = 3,
-    badminton = 4,
-    baseball = 5,
-    basketball = 6,
-    bowling = 7,
-    boxing = 8,// See also HKWorkoutActivityTypeKickboxing.,
-    climbing = 9,
-    cricket = 10,
-    crossTraining = 11,// Any mix of cardio and/or strength training. See also HKWorkoutActivityTypeCoreTraining and HKWorkoutActivityTypeFlexibility.,
-    curling = 12,
-    cycling = 13,
-    dance = 14,
-    danceInspiredTraining = 15,// This enum remains available to access older data.,
-    elliptical = 16,
-    equestrianSports = 17,// Polo, Horse Racing, Horse Riding, etc.,
-    fencing = 18,
-    fishing = 19,
-    functionalStrengthTraining = 20,// Primarily free weights and/or body weight and/or accessories,
-    golf = 21,
-    gymnastics = 22,
-    handball = 23,
-    hiking = 24,
-    hockey = 25,// Ice Hockey, Field Hockey, etc.,
-    hunting = 26,
-    lacrosse = 27,
-    martialArts = 28,
-    mindAndBody = 29,// Qigong, meditation, etc.,
-    mixedMetabolicCardioTraining = 30,// This enum remains available to access older data.,
-    paddleSports = 31,// Canoeing, Kayaking, Outrigger, Stand Up Paddle Board, etc.,
-    play = 32,// Dodge Ball, Hopscotch, Tetherball, Jungle Gym, etc.,
-    preparationAndRecovery = 33,// Foam rolling, stretching, etc.,
-    racquetball = 34,
-    rowing = 35,
-    rugby = 36,
-    running = 37,
-    sailing = 38,
-    skatingSports = 39,// Ice Skating, Speed Skating, Inline Skating, Skateboarding, etc.,
-    snowSports = 40,// Sledding, Snowmobiling, Building a Snowman, etc. See also HKWorkoutActivityTypeCrossCountrySkiing, HKWorkoutActivityTypeSnowboarding, and HKWorkoutActivityTypeDownhillSkiing.,
-    soccer = 41,
-    softball = 42,
-    squash = 43,
-    stairClimbing = 44,// See also HKWorkoutActivityTypeStairs and HKWorkoutActivityTypeStepTraining.,
-    surfingSports = 45,// Traditional Surfing, Kite Surfing, Wind Surfing, etc.,
-    swimming = 46,
-    tableTennis = 47,
-    tennis = 48,
-    trackAndField = 49,// Shot Put, Javelin, Pole Vaulting, etc.,
-    traditionalStrengthTraining = 50,// Primarily machines and/or free weights,
-    volleyball = 51,
-    walking = 52,
-    waterFitness = 53,
-    waterPolo = 54,
-    waterSports = 55,// Water Skiing, Wake Boarding, etc.,
-    wrestling = 56,
-    yoga = 57,
-    barre = 58,// HKWorkoutActivityTypeDanceInspiredTraining,
-    coreTraining = 59,
-    crossCountrySkiing = 60,
-    downhillSkiing = 61,
-    flexibility = 62,
-    highIntensityIntervalTraining = 63,
-    jumpRope = 64,
-    kickboxing = 65,
-    pilates = 66,// HKWorkoutActivityTypeDanceInspiredTraining,
-    snowboarding = 67,
-    stairs = 68,
-    stepTraining = 69,
-    wheelchairWalkPace = 70,
-    wheelchairRunPace = 71,
-    taiChi = 72,
-    mixedCardio = 73,// HKWorkoutActivityTypeMixedMetabolicCardioTraining,
-    handCycling = 74,
-    discSports = 75,
-    fitnessGaming = 76,
-    cardioDance = 77,
-    socialDance = 78,
-    pickleball = 79,
-    cooldown = 80,
-    swimBikeRun = 82,
-    transition = 83,
-    underwaterDiving = 84,
-    other = 3000
-}
+import type { DeletedSample, WithOptionalTypedMetadata, WithTypedMetadata } from './Shared';
+export { WorkoutActivityType, WorkoutEventType };
 export interface WorkoutEvent {
     readonly type: WorkoutEventType;
     readonly startDate: Date;
     readonly endDate: Date;
     readonly metadata?: AnyMap;
 }
-export declare enum WorkoutEventType {
-    pause = 1,
-    resume = 2,
-    lap = 3,
-    marker = 4,
-    motionPaused = 5,
-    motionResumed = 6,
-    segment = 7,
-    pauseOrResumeRequest = 8
-}
+export type WorkoutEventTyped = WithOptionalTypedMetadata<WorkoutEvent, WorkoutEventTypedMetadata>;
 export interface WorkoutActivity {
     readonly startDate: Date;
     readonly endDate: Date;
@@ -122,6 +30,11 @@ export interface QueryWorkoutSamplesWithAnchorResponse {
     readonly deletedSamples: readonly DeletedSample[];
     readonly newAnchor: string;
 }
+export interface QueryWorkoutSamplesWithAnchorResponseTyped {
+    readonly workouts: readonly WorkoutProxyTyped[];
+    readonly deletedSamples: readonly DeletedSample[];
+    readonly newAnchor: string;
+}
 export type WorkoutDurationPredicate = {
     readonly predicateOperator: ComparisonPredicateOperator;
     readonly durationInSeconds: number;
@@ -181,7 +94,7 @@ export interface WorkoutTotals {
     readonly distance?: number;
     readonly energyBurned?: number;
 }
-export interface WorkoutSample extends BaseSample {
+export interface WorkoutSample extends Omit<BaseSample, 'metadata'> {
     readonly workoutActivityType: WorkoutActivityType;
     readonly duration: Quantity;
     readonly totalEnergyBurned?: Quantity;
@@ -190,10 +103,11 @@ export interface WorkoutSample extends BaseSample {
     readonly totalFlightsClimbed?: Quantity;
     readonly events?: readonly WorkoutEvent[];
     readonly activities?: readonly WorkoutActivity[];
-    readonly metadataAverageMETs?: Quantity;
-    readonly metadataElevationAscended?: Quantity;
-    readonly metadataElevationDescended?: Quantity;
-    readonly metadataIndoorWorkout?: boolean;
-    readonly metadataAverageSpeed?: Quantity;
-    readonly metadataMaximumSpeed?: Quantity;
+    readonly metadata: AnyMap;
 }
+export type WorkoutSampleTyped = WithTypedMetadata<Omit<WorkoutSample, 'events'> & {
+    readonly events?: readonly WorkoutEventTyped[];
+}, WorkoutTypedMetadata>;
+export type WorkoutProxyTyped = Omit<WorkoutProxy, keyof WorkoutSample | 'toJSON'> & WorkoutSampleTyped & {
+    toJSON(key?: string): WorkoutSampleTyped;
+};

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

@@ -7,6 +7,8 @@ export * from './Constants';
 export * from './CorrelationType';
 export * from './Device';
 export * from './HeartbeatSeries';
+export * from './Medication';
+export * from './MetadataEnums';
 export * from './QuantitySample';
 export * from './QuantityType';
 export * from './QuantityTypeIdentifier';

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

@@ -1,3 +1,4 @@
+import type { UnitForIdentifier } from '../types/QuantityType';
 import type { QuantityTypeIdentifier } from '../types/QuantityTypeIdentifier';
-declare function getMostRecentQuantitySample(identifier: QuantityTypeIdentifier, unit?: string): Promise<import("..").QuantitySample | undefined>;
+declare function getMostRecentQuantitySample<T extends QuantityTypeIdentifier>(identifier: T, unit?: UnitForIdentifier<T>): Promise<import("..").QuantitySampleTyped<T> | undefined>;
 export default getMostRecentQuantitySample;

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

@@ -1,2 +1,3 @@
-declare const getMostRecentWorkout: () => Promise<import("../specs/WorkoutProxy.nitro").WorkoutProxy | undefined>;
+import type { WorkoutProxyTyped } from '../types/Workouts';
+declare const getMostRecentWorkout: () => Promise<WorkoutProxyTyped | undefined>;
 export default getMostRecentWorkout;

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

@@ -1,3 +1,4 @@
+import type { UnitForIdentifier } from '../types/QuantityType';
 import type { QuantityTypeIdentifier } from '../types/QuantityTypeIdentifier';
-declare const getPreferredUnit: (quantityType: QuantityTypeIdentifier) => Promise<string>;
+declare const getPreferredUnit: <T extends QuantityTypeIdentifier>(quantityType: T) => Promise<UnitForIdentifier<T>>;
 export default getPreferredUnit;

package/lib/typescript/utils/getQuantitySampleById.d.ts

@@ -1,3 +1,4 @@
+import type { UnitForIdentifier } from '../types/QuantityType';
 import type { QuantityTypeIdentifier } from '../types/QuantityTypeIdentifier';
-declare function getQuantitySampleById(identifier: QuantityTypeIdentifier, uuid: string, unit?: string): Promise<import("..").QuantitySample | undefined>;
+declare function getQuantitySampleById<T extends QuantityTypeIdentifier>(identifier: T, uuid: string, unit?: UnitForIdentifier<T>): Promise<import("..").QuantitySampleTyped<T> | undefined>;
 export default getQuantitySampleById;

package/lib/typescript/utils/subscribeToQuantitySamples.d.ts

@@ -1,5 +1,5 @@
 import type { QuantityTypeIdentifier } from '../types';
 import type { OnQuantitySamplesCallback } from '../types/Subscriptions';
-export declare const subscribeToQuantitySamples: (identifier: QuantityTypeIdentifier, callback: (args: OnQuantitySamplesCallback) => void, after?: Date) => {
+export declare const subscribeToQuantitySamples: <TIdentifier extends QuantityTypeIdentifier>(identifier: TIdentifier, callback: (args: OnQuantitySamplesCallback<TIdentifier>) => void, after?: Date) => {
     remove: () => boolean;
 };

package/nitrogen/generated/ios/ReactNativeHealthkit-Swift-Cxx-Bridge.hpp

@@ -62,8 +62,6 @@ namespace margelo::nitro::healthkit { struct FilterForWorkouts; }
 namespace margelo::nitro::healthkit { enum class FitzpatrickSkinType; }
 // Forward declaration of `GeneralForm` to properly resolve imports.
 namespace margelo::nitro::healthkit { enum class GeneralForm; }
-// Forward declaration of `HeartRateMotionContext` to properly resolve imports.
-namespace margelo::nitro::healthkit { enum class HeartRateMotionContext; }
 // Forward declaration of `HeartbeatSeriesSample` to properly resolve imports.
 namespace margelo::nitro::healthkit { struct HeartbeatSeriesSample; }
 // Forward declaration of `HeartbeatSeriesSamplesWithAnchorResponse` to properly resolve imports.
@@ -96,8 +94,6 @@ namespace margelo::nitro::healthkit { class HybridWorkoutProxySpec; }
 namespace margelo::nitro::healthkit { class HybridWorkoutsModuleSpec; }
 // Forward declaration of `IdentifierWithUnit` to properly resolve imports.
 namespace margelo::nitro::healthkit { struct IdentifierWithUnit; }
-// Forward declaration of `InsulinDeliveryReason` to properly resolve imports.
-namespace margelo::nitro::healthkit { enum class InsulinDeliveryReason; }
 // Forward declaration of `LocationForSaving` to properly resolve imports.
 namespace margelo::nitro::healthkit { struct LocationForSaving; }
 // Forward declaration of `MedicationConcept` to properly resolve imports.
@@ -162,12 +158,10 @@ namespace margelo::nitro::healthkit { struct StateOfMindSamplesWithAnchorRespons
 namespace margelo::nitro::healthkit { enum class StateOfMindValenceClassification; }
 // Forward declaration of `StatisticsOptions` to properly resolve imports.
 namespace margelo::nitro::healthkit { enum class StatisticsOptions; }
-// Forward declaration of `StatisticsQueryOptions` to properly resolve imports.
-namespace margelo::nitro::healthkit { struct StatisticsQueryOptions; }
+// Forward declaration of `StatisticsQueryOptionsWithStringUnit` to properly resolve imports.
+namespace margelo::nitro::healthkit { struct StatisticsQueryOptionsWithStringUnit; }
 // Forward declaration of `UserAnnotatedMedication` to properly resolve imports.
 namespace margelo::nitro::healthkit { struct UserAnnotatedMedication; }
-// Forward declaration of `WeatherCondition` to properly resolve imports.
-namespace margelo::nitro::healthkit { enum class WeatherCondition; }
 // Forward declaration of `WheelchairUse` to properly resolve imports.
 namespace margelo::nitro::healthkit { enum class WheelchairUse; }
 // Forward declaration of `WorkoutActivityType` to properly resolve imports.
@@ -247,7 +241,6 @@ namespace ReactNativeHealthkit { class HybridWorkoutsModuleSpec_cxx; }
 #include "FilterForWorkoutsBase.hpp"
 #include "FitzpatrickSkinType.hpp"
 #include "GeneralForm.hpp"
-#include "HeartRateMotionContext.hpp"
 #include "Heartbeat.hpp"
 #include "HeartbeatSeriesSample.hpp"
 #include "HeartbeatSeriesSamplesWithAnchorResponse.hpp"
@@ -264,7 +257,6 @@ namespace ReactNativeHealthkit { class HybridWorkoutsModuleSpec_cxx; }
 #include "HybridWorkoutProxySpec.hpp"
 #include "HybridWorkoutsModuleSpec.hpp"
 #include "IdentifierWithUnit.hpp"
-#include "InsulinDeliveryReason.hpp"
 #include "LocationForSaving.hpp"
 #include "MedicationConcept.hpp"
 #include "MedicationDoseEvent.hpp"
@@ -297,9 +289,8 @@ namespace ReactNativeHealthkit { class HybridWorkoutsModuleSpec_cxx; }
 #include "StateOfMindSamplesWithAnchorResponse.hpp"
 #include "StateOfMindValenceClassification.hpp"
 #include "StatisticsOptions.hpp"
-#include "StatisticsQueryOptions.hpp"
+#include "StatisticsQueryOptionsWithStringUnit.hpp"
 #include "UserAnnotatedMedication.hpp"
-#include "WeatherCondition.hpp"
 #include "WheelchairUse.hpp"
 #include "WorkoutActivity.hpp"
 #include "WorkoutActivityType.hpp"
@@ -332,66 +323,6 @@ namespace ReactNativeHealthkit { class HybridWorkoutsModuleSpec_cxx; }
  */
 namespace margelo::nitro::healthkit::bridge::swift {
 
-  // pragma MARK: std::optional<WeatherCondition>
-  /**
-   * Specialized version of `std::optional<WeatherCondition>`.
-   */
-  using std__optional_WeatherCondition_ = std::optional<WeatherCondition>;
-  inline std::optional<WeatherCondition> create_std__optional_WeatherCondition_(const WeatherCondition& value) noexcept {
-    return std::optional<WeatherCondition>(value);
-  }
-  inline bool has_value_std__optional_WeatherCondition_(const std::optional<WeatherCondition>& optional) noexcept {
-    return optional.has_value();
-  }
-  inline WeatherCondition get_std__optional_WeatherCondition_(const std::optional<WeatherCondition>& optional) noexcept {
-    return optional.value();
-  }
-  
-  // pragma MARK: std::optional<Quantity>
-  /**
-   * Specialized version of `std::optional<Quantity>`.
-   */
-  using std__optional_Quantity_ = std::optional<Quantity>;
-  inline std::optional<Quantity> create_std__optional_Quantity_(const Quantity& value) noexcept {
-    return std::optional<Quantity>(value);
-  }
-  inline bool has_value_std__optional_Quantity_(const std::optional<Quantity>& optional) noexcept {
-    return optional.has_value();
-  }
-  inline Quantity get_std__optional_Quantity_(const std::optional<Quantity>& optional) noexcept {
-    return optional.value();
-  }
-  
-  // pragma MARK: std::optional<InsulinDeliveryReason>
-  /**
-   * Specialized version of `std::optional<InsulinDeliveryReason>`.
-   */
-  using std__optional_InsulinDeliveryReason_ = std::optional<InsulinDeliveryReason>;
-  inline std::optional<InsulinDeliveryReason> create_std__optional_InsulinDeliveryReason_(const InsulinDeliveryReason& value) noexcept {
-    return std::optional<InsulinDeliveryReason>(value);
-  }
-  inline bool has_value_std__optional_InsulinDeliveryReason_(const std::optional<InsulinDeliveryReason>& optional) noexcept {
-    return optional.has_value();
-  }
-  inline InsulinDeliveryReason get_std__optional_InsulinDeliveryReason_(const std::optional<InsulinDeliveryReason>& optional) noexcept {
-    return optional.value();
-  }
-  
-  // pragma MARK: std::optional<HeartRateMotionContext>
-  /**
-   * Specialized version of `std::optional<HeartRateMotionContext>`.
-   */
-  using std__optional_HeartRateMotionContext_ = std::optional<HeartRateMotionContext>;
-  inline std::optional<HeartRateMotionContext> create_std__optional_HeartRateMotionContext_(const HeartRateMotionContext& value) noexcept {
-    return std::optional<HeartRateMotionContext>(value);
-  }
-  inline bool has_value_std__optional_HeartRateMotionContext_(const std::optional<HeartRateMotionContext>& optional) noexcept {
-    return optional.has_value();
-  }
-  inline HeartRateMotionContext get_std__optional_HeartRateMotionContext_(const std::optional<HeartRateMotionContext>& optional) noexcept {
-    return optional.value();
-  }
-  
   // pragma MARK: std::shared_ptr<HybridSourceProxySpec>
   /**
    * Specialized version of `std::shared_ptr<HybridSourceProxySpec>`.
@@ -434,36 +365,6 @@ namespace margelo::nitro::healthkit::bridge::swift {
     return optional.value();
   }
   
-  // pragma MARK: std::optional<bool>
-  /**
-   * Specialized version of `std::optional<bool>`.
-   */
-  using std__optional_bool_ = std::optional<bool>;
-  inline std::optional<bool> create_std__optional_bool_(const bool& value) noexcept {
-    return std::optional<bool>(value);
-  }
-  inline bool has_value_std__optional_bool_(const std::optional<bool>& optional) noexcept {
-    return optional.has_value();
-  }
-  inline bool get_std__optional_bool_(const std::optional<bool>& optional) noexcept {
-    return optional.value();
-  }
-  
-  // pragma MARK: std::optional<double>
-  /**
-   * Specialized version of `std::optional<double>`.
-   */
-  using std__optional_double_ = std::optional<double>;
-  inline std::optional<double> create_std__optional_double_(const double& value) noexcept {
-    return std::optional<double>(value);
-  }
-  inline bool has_value_std__optional_double_(const std::optional<double>& optional) noexcept {
-    return optional.has_value();
-  }
-  inline double get_std__optional_double_(const std::optional<double>& optional) noexcept {
-    return optional.value();
-  }
-  
   // pragma MARK: std::optional<CategorySample>
   /**
    * Specialized version of `std::optional<CategorySample>`.
@@ -595,6 +496,21 @@ namespace margelo::nitro::healthkit::bridge::swift {
     return Func_void_std__vector_CategorySample__Wrapper(std::move(value));
   }
   
+  // pragma MARK: std::optional<bool>
+  /**
+   * Specialized version of `std::optional<bool>`.
+   */
+  using std__optional_bool_ = std::optional<bool>;
+  inline std::optional<bool> create_std__optional_bool_(const bool& value) noexcept {
+    return std::optional<bool>(value);
+  }
+  inline bool has_value_std__optional_bool_(const std::optional<bool>& optional) noexcept {
+    return optional.has_value();
+  }
+  inline bool get_std__optional_bool_(const std::optional<bool>& optional) noexcept {
+    return optional.value();
+  }
+  
   // pragma MARK: std::vector<std::shared_ptr<HybridSourceProxySpec>>
   /**
    * Specialized version of `std::vector<std::shared_ptr<HybridSourceProxySpec>>`.
@@ -1937,6 +1853,21 @@ namespace margelo::nitro::healthkit::bridge::swift {
     return Result<std::shared_ptr<Promise<QueryCorrelationSamplesWithAnchorResponse>>>::withError(error);
   }
   
+  // pragma MARK: std::optional<double>
+  /**
+   * Specialized version of `std::optional<double>`.
+   */
+  using std__optional_double_ = std::optional<double>;
+  inline std::optional<double> create_std__optional_double_(const double& value) noexcept {
+    return std::optional<double>(value);
+  }
+  inline bool has_value_std__optional_double_(const std::optional<double>& optional) noexcept {
+    return optional.has_value();
+  }
+  inline double get_std__optional_double_(const std::optional<double>& optional) noexcept {
+    return optional.value();
+  }
+  
   // pragma MARK: std::vector<ElectrocardiogramVoltage>
   /**
    * Specialized version of `std::vector<ElectrocardiogramVoltage>`.
@@ -2460,6 +2391,21 @@ namespace margelo::nitro::healthkit::bridge::swift {
     return Func_void_std__vector_QuantitySample__Wrapper(std::move(value));
   }
   
+  // pragma MARK: std::optional<Quantity>
+  /**
+   * Specialized version of `std::optional<Quantity>`.
+   */
+  using std__optional_Quantity_ = std::optional<Quantity>;
+  inline std::optional<Quantity> create_std__optional_Quantity_(const Quantity& value) noexcept {
+    return std::optional<Quantity>(value);
+  }
+  inline bool has_value_std__optional_Quantity_(const std::optional<Quantity>& optional) noexcept {
+    return optional.has_value();
+  }
+  inline Quantity get_std__optional_Quantity_(const std::optional<Quantity>& optional) noexcept {
+    return optional.value();
+  }
+  
   // pragma MARK: std::optional<QuantityDateInterval>
   /**
    * Specialized version of `std::optional<QuantityDateInterval>`.
@@ -2520,18 +2466,18 @@ namespace margelo::nitro::healthkit::bridge::swift {
     return vector;
   }
   
-  // pragma MARK: std::optional<StatisticsQueryOptions>
+  // pragma MARK: std::optional<StatisticsQueryOptionsWithStringUnit>
   /**
-   * Specialized version of `std::optional<StatisticsQueryOptions>`.
+   * Specialized version of `std::optional<StatisticsQueryOptionsWithStringUnit>`.
    */
-  using std__optional_StatisticsQueryOptions_ = std::optional<StatisticsQueryOptions>;
-  inline std::optional<StatisticsQueryOptions> create_std__optional_StatisticsQueryOptions_(const StatisticsQueryOptions& value) noexcept {
-    return std::optional<StatisticsQueryOptions>(value);
+  using std__optional_StatisticsQueryOptionsWithStringUnit_ = std::optional<StatisticsQueryOptionsWithStringUnit>;
+  inline std::optional<StatisticsQueryOptionsWithStringUnit> create_std__optional_StatisticsQueryOptionsWithStringUnit_(const StatisticsQueryOptionsWithStringUnit& value) noexcept {
+    return std::optional<StatisticsQueryOptionsWithStringUnit>(value);
   }
-  inline bool has_value_std__optional_StatisticsQueryOptions_(const std::optional<StatisticsQueryOptions>& optional) noexcept {
+  inline bool has_value_std__optional_StatisticsQueryOptionsWithStringUnit_(const std::optional<StatisticsQueryOptionsWithStringUnit>& optional) noexcept {
     return optional.has_value();
   }
-  inline StatisticsQueryOptions get_std__optional_StatisticsQueryOptions_(const std::optional<StatisticsQueryOptions>& optional) noexcept {
+  inline StatisticsQueryOptionsWithStringUnit get_std__optional_StatisticsQueryOptionsWithStringUnit_(const std::optional<StatisticsQueryOptionsWithStringUnit>& optional) noexcept {
     return optional.value();
   }