@kingstinct/react-native-healthkit 13.4.0 → 14.0.0

package/src/hooks/useStatisticsForQuantity.ts

@@ -3,6 +3,7 @@ import { QuantityTypes } from '../modules'
 import type {
   QueryStatisticsResponse,
   StatisticsOptions,
+  UnitForIdentifier,
 } from '../types/QuantityType'
 import type { QuantityTypeIdentifier } from '../types/QuantityTypeIdentifier'
 import useSubscribeToChanges from './useSubscribeToChanges'
@@ -14,7 +15,7 @@ export function useStatisticsForQuantity<
   options: readonly StatisticsOptions[],
   from: Date,
   to?: Date,
-  unit?: string,
+  unit?: UnitForIdentifier<TIdentifier>,
 ) {
   const [result, setResult] = useState<QueryStatisticsResponse | null>(null)
 

package/src/hooks/useSubscribeToQuantitySamples.ts

@@ -9,7 +9,7 @@ export function useSubscribeToQuantitySamples<
   TIdentifier extends QuantityTypeIdentifier,
 >(
   identifier: TIdentifier,
-  onChange: (args: OnQuantitySamplesCallback) => void,
+  onChange: (args: OnQuantitySamplesCallback<TIdentifier>) => void,
 ): void {
   const onChangeRef = useRef(onChange)
 

package/src/modules.ts

@@ -9,7 +9,10 @@ import type { CorrelationTypeModule } from './specs/CorrelationTypeModule.nitro'
 import type { ElectrocardiogramModule } from './specs/ElectrocardiogramModule.nitro'
 import type { HeartbeatSeriesModule } from './specs/HeartbeatSeriesModule.nitro'
 import type { MedicationModule } from './specs/MedicationModule.nitro'
-import type { QuantityTypeModule } from './specs/QuantityTypeModule.nitro'
+import type {
+  QuantityTypeModule,
+  QuantityTypeModuleTyped,
+} from './specs/QuantityTypeModule.nitro'
 import type { StateOfMindModule } from './specs/StateOfMindModule.nitro'
 import type { WorkoutsModule } from './specs/WorkoutsModule.nitro'
 
@@ -27,7 +30,9 @@ export const Characteristics =
   )
 
 export const QuantityTypes =
-  NitroModules.createHybridObject<QuantityTypeModule>('QuantityTypeModule')
+  NitroModules.createHybridObject<QuantityTypeModule>(
+    'QuantityTypeModule',
+  ) as QuantityTypeModuleTyped
 
 export const CategoryTypes =
   NitroModules.createHybridObject<CategoryTypeModule>(

package/src/specs/CategoryTypeModule.nitro.ts

@@ -8,7 +8,10 @@ import type {
   CategoryValueForIdentifier,
   MetadataForCategoryIdentifier,
 } from '../types/CategoryType'
-import type { CategoryTypeIdentifier } from '../types/CategoryTypeIdentifier'
+import type {
+  CategoryTypeIdentifier,
+  CategoryTypeIdentifierWriteable,
+} from '../types/CategoryTypeIdentifier'
 import type { InterfaceAssertion } from '../types/InterfaceVerification'
 import type {
   QueryOptionsWithAnchor,
@@ -17,7 +20,7 @@ import type {
 
 export interface CategoryTypeModule extends HybridObject<{ ios: 'swift' }> {
   saveCategorySample(
-    identifier: CategoryTypeIdentifier,
+    identifier: CategoryTypeIdentifierWriteable,
     value: CategoryValueForIdentifier,
     startDate: Date,
     endDate: Date,
@@ -44,13 +47,13 @@ const _interfaceVerification: InterfaceAssertion<
 > = true
 
 export interface CategoryTypeModuleTyped {
-  saveCategorySample<T extends CategoryTypeIdentifier>(
+  saveCategorySample<T extends CategoryTypeIdentifierWriteable>(
     identifier: T,
-    value: CategoryValueForIdentifier,
+    value: CategoryValueForIdentifier<T>,
     startDate: Date,
     endDate: Date,
     metadata?: MetadataForCategoryIdentifier<T>,
-  ): Promise<CategorySample | undefined>
+  ): Promise<CategorySampleTyped<T> | undefined>
 
   queryCategorySamples<T extends CategoryTypeIdentifier>(
     identifier: T,

package/src/specs/CoreModule.nitro.ts

@@ -40,6 +40,26 @@ export interface CoreModule extends HybridObject<{ ios: 'swift' }> {
    */
   disableAllBackgroundDelivery(): Promise<boolean>
 
+  /**
+   * Configure background delivery types that will be registered natively in
+   * AppDelegate.didFinishLaunchingWithOptions — surviving app termination.
+   * Types and frequency are persisted to UserDefaults so they're available
+   * before the JS bridge boots on subsequent cold launches.
+   *
+   * Requires the Expo config plugin with `background: true` (default) or
+   * manual AppDelegate setup: `BackgroundDeliveryManager.shared.setupBackgroundObservers()`
+   */
+  configureBackgroundTypes(
+    typeIdentifiers: string[],
+    updateFrequency: UpdateFrequency,
+  ): Promise<boolean>
+
+  /**
+   * Clear persisted background delivery configuration and stop all observer queries.
+   * After calling this, the app will no longer register observers on cold launch.
+   */
+  clearBackgroundTypes(): Promise<boolean>
+
   /**
    *  @see {@link https://developer.apple.com/documentation/healthkit/hkhealthstore/1614180-ishealthdataavailable Apple Docs }
    */

package/src/specs/QuantityTypeModule.nitro.ts

@@ -1,20 +1,30 @@
 import type { AnyMap, HybridObject } from 'react-native-nitro-modules'
-import type { QuantitySample } from '../types/QuantitySample'
+import type { InterfaceAssertion } from '../types/InterfaceVerification'
+import type {
+  MetadataForQuantityIdentifier,
+  QuantitySample,
+  QuantitySampleTyped,
+} from '../types/QuantitySample'
 import type {
   AggregationStyle,
   IntervalComponents,
   QuantitySamplesWithAnchorResponse,
+  QuantitySamplesWithAnchorResponseTyped,
   QueryStatisticsResponse,
   QueryStatisticsResponseFromSingleSource,
   StatisticsOptions,
   StatisticsQueryOptions,
+  StatisticsQueryOptionsWithStringUnit,
+  UnitForIdentifier,
 } from '../types/QuantityType'
 import type {
   QuantityTypeIdentifier,
   QuantityTypeIdentifierWriteable,
 } from '../types/QuantityTypeIdentifier'
 import type {
+  QueryOptionsWithAnchorAndStringUnit,
   QueryOptionsWithAnchorAndUnit,
+  QueryOptionsWithSortOrderAndStringUnit,
   QueryOptionsWithSortOrderAndUnit,
 } from '../types/QueryOptions'
 
@@ -37,13 +47,13 @@ export interface QuantityTypeModule extends HybridObject<{ ios: 'swift' }> {
 
   queryQuantitySamples(
     identifier: QuantityTypeIdentifier,
-    options: QueryOptionsWithSortOrderAndUnit,
+    options: QueryOptionsWithSortOrderAndStringUnit,
   ): Promise<readonly QuantitySample[]>
 
   queryStatisticsForQuantity(
     identifier: QuantityTypeIdentifier,
     statistics: readonly StatisticsOptions[],
-    options?: StatisticsQueryOptions,
+    options?: StatisticsQueryOptionsWithStringUnit,
   ): Promise<QueryStatisticsResponse>
 
   queryStatisticsCollectionForQuantity(
@@ -51,13 +61,13 @@ export interface QuantityTypeModule extends HybridObject<{ ios: 'swift' }> {
     statistics: readonly StatisticsOptions[],
     anchorDate: Date,
     intervalComponents: IntervalComponents,
-    options?: StatisticsQueryOptions,
+    options?: StatisticsQueryOptionsWithStringUnit,
   ): Promise<readonly QueryStatisticsResponse[]>
 
   queryStatisticsForQuantitySeparateBySource(
     identifier: QuantityTypeIdentifier,
     statistics: readonly StatisticsOptions[],
-    options?: StatisticsQueryOptions,
+    options?: StatisticsQueryOptionsWithStringUnit,
   ): Promise<QueryStatisticsResponseFromSingleSource[]>
 
   queryStatisticsCollectionForQuantitySeparateBySource(
@@ -65,11 +75,75 @@ export interface QuantityTypeModule extends HybridObject<{ ios: 'swift' }> {
     statistics: readonly StatisticsOptions[],
     anchorDate: Date,
     intervalComponents: IntervalComponents,
-    options?: StatisticsQueryOptions,
+    options?: StatisticsQueryOptionsWithStringUnit,
   ): Promise<readonly QueryStatisticsResponseFromSingleSource[]>
 
   queryQuantitySamplesWithAnchor(
     identifier: QuantityTypeIdentifier,
-    options: QueryOptionsWithAnchorAndUnit,
+    options: QueryOptionsWithAnchorAndStringUnit,
   ): Promise<QuantitySamplesWithAnchorResponse>
 }
+
+const _interfaceVerification: InterfaceAssertion<
+  QuantityTypeModule,
+  QuantityTypeModuleTyped,
+  keyof HybridObject<{ ios: 'swift' }>
+> = true
+
+export interface QuantityTypeModuleTyped {
+  isQuantityCompatibleWithUnit<T extends QuantityTypeIdentifier>(
+    identifier: T,
+    unit: UnitForIdentifier<T>,
+  ): boolean
+
+  aggregationStyle(identifier: QuantityTypeIdentifier): AggregationStyle
+
+  saveQuantitySample<T extends QuantityTypeIdentifierWriteable>(
+    identifier: T,
+    unit: UnitForIdentifier<T>,
+    value: number,
+    start: Date,
+    end: Date,
+    metadata?: MetadataForQuantityIdentifier<T>,
+  ): Promise<QuantitySampleTyped<T> | undefined>
+
+  queryQuantitySamples<T extends QuantityTypeIdentifier>(
+    identifier: T,
+    options: QueryOptionsWithSortOrderAndUnit<UnitForIdentifier<T>>,
+  ): Promise<readonly QuantitySampleTyped<T>[]>
+
+  queryStatisticsForQuantity<T extends QuantityTypeIdentifier>(
+    identifier: T,
+    statistics: readonly StatisticsOptions[],
+    options?: StatisticsQueryOptions<UnitForIdentifier<T>>,
+  ): Promise<QueryStatisticsResponse>
+
+  queryStatisticsCollectionForQuantity<T extends QuantityTypeIdentifier>(
+    identifier: T,
+    statistics: readonly StatisticsOptions[],
+    anchorDate: Date,
+    intervalComponents: IntervalComponents,
+    options?: StatisticsQueryOptions<UnitForIdentifier<T>>,
+  ): Promise<readonly QueryStatisticsResponse[]>
+
+  queryStatisticsForQuantitySeparateBySource<T extends QuantityTypeIdentifier>(
+    identifier: T,
+    statistics: readonly StatisticsOptions[],
+    options?: StatisticsQueryOptions<UnitForIdentifier<T>>,
+  ): Promise<QueryStatisticsResponseFromSingleSource[]>
+
+  queryStatisticsCollectionForQuantitySeparateBySource<
+    T extends QuantityTypeIdentifier,
+  >(
+    identifier: T,
+    statistics: readonly StatisticsOptions[],
+    anchorDate: Date,
+    intervalComponents: IntervalComponents,
+    options?: StatisticsQueryOptions<UnitForIdentifier<T>>,
+  ): Promise<readonly QueryStatisticsResponseFromSingleSource[]>
+
+  queryQuantitySamplesWithAnchor<T extends QuantityTypeIdentifier>(
+    identifier: T,
+    options: QueryOptionsWithAnchorAndUnit<UnitForIdentifier<T>>,
+  ): Promise<QuantitySamplesWithAnchorResponseTyped<T>>
+}

package/src/test-setup.ts

@@ -14,6 +14,8 @@ const mockModule = {
   disableAllBackgroundDelivery: jest.fn(),
   disableBackgroundDelivery: jest.fn(),
   enableBackgroundDelivery: jest.fn(),
+  configureBackgroundTypes: jest.fn(),
+  clearBackgroundTypes: jest.fn(),
   queryCategorySamplesWithAnchor: jest.fn(),
   queryQuantitySamplesWithAnchor: jest.fn(),
   getBiologicalSex: jest.fn(),

package/src/type-tests/generated-typing.ts

@@ -0,0 +1,133 @@
+import type {
+  BloodGlucoseUnit,
+  CategorySampleTyped,
+  CategoryTypeIdentifier,
+  CategoryTypeIdentifierWriteable,
+  CategoryValueForIdentifier,
+  CategoryValueSleepAnalysis,
+  CorrelationSampleTyped,
+  HeartRateMotionContext,
+  Quantity,
+  QuantitySampleTyped,
+  QueryOptionsWithAnchorAndUnit,
+  QueryOptionsWithSortOrderAndUnit,
+  StateOfMindSampleTyped,
+  StatisticsQueryOptions,
+  SwimmingStrokeStyle,
+  WorkoutEventTyped,
+  WorkoutSampleTyped,
+} from '../types'
+
+type Equal<A, B> =
+  (<T>() => T extends A ? 1 : 2) extends <T>() => T extends B ? 1 : 2
+    ? true
+    : false
+
+type Assert<T extends true> = T
+
+type _sleepAnalysisValuesAreTyped = Assert<
+  Equal<
+    CategoryValueForIdentifier<'HKCategoryTypeIdentifierSleepAnalysis'>,
+    CategoryValueSleepAnalysis
+  >
+>
+
+type _newCategoryIdentifierFromSdkIsPresent = Assert<
+  'HKCategoryTypeIdentifierHypertensionEvent' extends CategoryTypeIdentifier
+    ? true
+    : false
+>
+
+type _heartRateMetadataNarrowsToEnum = Assert<
+  Equal<
+    QuantitySampleTyped<'HKQuantityTypeIdentifierHeartRate'>['metadata']['HKHeartRateMotionContext'],
+    HeartRateMotionContext | undefined
+  >
+>
+
+type _categoryMetadataIncludesKnownSampleFields = Assert<
+  Equal<
+    CategorySampleTyped<'HKCategoryTypeIdentifierSleepAnalysis'>['metadata']['HKWasUserEntered'],
+    boolean | undefined
+  >
+>
+
+type _heartRateEventMetadataIsTypedOnMetadata = Assert<
+  Equal<
+    QuantitySampleTyped<'HKQuantityTypeIdentifierHeartRate'>['metadata']['HKAppleDeviceCalibrated'],
+    boolean | undefined
+  >
+>
+
+type _quantityMetadataIncludesEstimateDate = Assert<
+  Equal<
+    QuantitySampleTyped<'HKQuantityTypeIdentifierVO2Max'>['metadata']['HKDateOfEarliestDataUsedForEstimate'],
+    string | undefined
+  >
+>
+
+type _heartRateEventThresholdMetadataIsTyped = Assert<
+  Equal<
+    CategorySampleTyped<'HKCategoryTypeIdentifierHighHeartRateEvent'>['metadata']['HKHeartRateEventThreshold'],
+    Quantity | undefined
+  >
+>
+
+type _bloodGlucoseUnitNarrows = Assert<
+  Equal<
+    QuantitySampleTyped<'HKQuantityTypeIdentifierBloodGlucose'>['unit'],
+    BloodGlucoseUnit
+  >
+>
+
+type _quantityQueryOptionsUnitNarrows = Assert<
+  Equal<
+    QueryOptionsWithSortOrderAndUnit<BloodGlucoseUnit>['unit'],
+    BloodGlucoseUnit | undefined
+  >
+>
+
+type _quantityAnchorQueryOptionsUnitNarrows = Assert<
+  Equal<
+    QueryOptionsWithAnchorAndUnit<BloodGlucoseUnit>['unit'],
+    BloodGlucoseUnit | undefined
+  >
+>
+
+type _quantityStatisticsOptionsUnitNarrows = Assert<
+  Equal<
+    StatisticsQueryOptions<BloodGlucoseUnit>['unit'],
+    BloodGlucoseUnit | undefined
+  >
+>
+
+type _categorySaveIdentifierIsWriteableOnly = Assert<
+  'HKCategoryTypeIdentifierHighHeartRateEvent' extends CategoryTypeIdentifierWriteable
+    ? false
+    : true
+>
+
+type _stateOfMindMetadataIsTyped = Assert<
+  Equal<
+    StateOfMindSampleTyped['metadata']['HKWasUserEntered'],
+    boolean | undefined
+  >
+>
+
+type _correlationMetadataIsTyped = Assert<
+  Equal<CorrelationSampleTyped['metadata']['HKFoodType'], string | undefined>
+>
+
+type _workoutMetadataIsTypedOnMetadata = Assert<
+  Equal<
+    WorkoutSampleTyped['metadata']['HKWorkoutBrandName'],
+    string | undefined
+  >
+>
+
+type _workoutEventMetadataIsTypedOnMetadata = Assert<
+  Equal<
+    NonNullable<WorkoutEventTyped['metadata']>['HKSwimmingStrokeStyle'],
+    SwimmingStrokeStyle | undefined
+  >
+>

package/src/types/CategoryType.ts

@@ -1,26 +1,62 @@
 import type { AnyMap } from 'react-native-nitro-modules'
+import type {
+  CategoryTypedMetadataForIdentifierGenerated,
+  CategoryValueForIdentifierGenerated,
+} from '../generated/healthkit.generated'
+import {
+  CategoryValueAppetiteChanges,
+  CategoryValueAppleStandHour,
+  CategoryValueAppleWalkingSteadinessEvent,
+  CategoryValueCervicalMucusQuality,
+  CategoryValueContraceptive,
+  CategoryValueEnvironmentalAudioExposureEvent,
+  CategoryValueHeadphoneAudioExposureEvent,
+  CategoryValueLowCardioFitnessEvent,
+  CategoryValueMenstrualFlow,
+  CategoryValue as CategoryValueNotApplicable,
+  CategoryValueOvulationTestResult,
+  CategoryValuePregnancyTestResult,
+  CategoryValuePresence,
+  CategoryValueProgesteroneTestResult,
+  CategoryValueSeverity,
+  CategoryValueSleepAnalysis,
+  CategoryValueVaginalBleeding,
+} from '../generated/healthkit.generated'
 import type { CategoryTypeIdentifier } from './CategoryTypeIdentifier'
 import type { BaseSample, DeletedSample, GenericMetadata } from './Shared'
 import type { SourceRevision } from './Source'
 
+export {
+  CategoryValueAppetiteChanges,
+  CategoryValueAppleStandHour,
+  CategoryValueAppleWalkingSteadinessEvent,
+  CategoryValueCervicalMucusQuality,
+  CategoryValueContraceptive,
+  CategoryValueEnvironmentalAudioExposureEvent,
+  CategoryValueHeadphoneAudioExposureEvent,
+  CategoryValueLowCardioFitnessEvent,
+  CategoryValueMenstrualFlow,
+  CategoryValueNotApplicable,
+  CategoryValueOvulationTestResult,
+  CategoryValuePregnancyTestResult,
+  CategoryValuePresence,
+  CategoryValueProgesteroneTestResult,
+  CategoryValueSeverity,
+  CategoryValueSleepAnalysis,
+  CategoryValueVaginalBleeding,
+}
+
 export type CategoryTypePresenceIdentifier =
   | 'HKCategoryTypeIdentifierAppetiteChanges'
   | 'HKCategoryTypeIdentifierSleepChanges'
 
 export type CategoryTypeValueNotApplicableIdentifier =
   | 'HKCategoryTypeIdentifierHighHeartRateEvent'
+  | 'HKCategoryTypeIdentifierHypertensionEvent'
   | 'HKCategoryTypeIdentifierIntermenstrualBleeding'
   | 'HKCategoryTypeIdentifierMindfulSession'
   | 'HKCategoryTypeIdentifierSexualActivity'
-
-/**
- * @see {@link https://developer.apple.com/documentation/healthkit/hkcategoryvaluepregnancytestresult Apple Docs }
- */
-enum CategoryValuePregnancyTestResult {
-  positive = 2,
-  negative = 1,
-  indeterminate = 3,
-}
+  | 'HKCategoryTypeIdentifierSleepApneaEvent'
 
 export type CategoryTypeSeverityIdentifier =
   | 'HKCategoryTypeIdentifierAbdominalCramps'
@@ -47,7 +83,6 @@ export type CategoryTypeSeverityIdentifier =
   | 'HKCategoryTypeIdentifierLossOfTaste'
   | 'HKCategoryTypeIdentifierLowerBackPain'
   | 'HKCategoryTypeIdentifierMemoryLapse'
-  | 'HKCategoryTypeIdentifierMoodChanges'
   | 'HKCategoryTypeIdentifierNausea'
   | 'HKCategoryTypeIdentifierNightSweats'
   | 'HKCategoryTypeIdentifierPelvicPain'
@@ -61,109 +96,10 @@ export type CategoryTypeSeverityIdentifier =
   | 'HKCategoryTypeIdentifierVomiting'
   | 'HKCategoryTypeIdentifierWheezing'
 
-/**
- * @see {@link https://developer.apple.com/documentation/healthkit/hkcategoryvaluecervicalmucusquality Apple Docs }
- */
-export enum CategoryValueCervicalMucusQuality {
-  dry = 1,
-  sticky = 2,
-  creamy = 3,
-  watery = 4,
-  eggWhite = 5,
-}
-
-/**
- * @see {@link https://developer.apple.com/documentation/healthkit/hkcategoryvaluemenstrualflow Apple Docs }
- */
-export enum CategoryValueMenstrualFlow {
-  unspecified = 1,
-  none = 5,
-  light = 2,
-  medium = 3,
-  heavy = 4,
-}
-
-/**
- * @see {@link https://developer.apple.com/documentation/healthkit/hkcategoryvalueovulationtestresult Apple Docs }
- */
-export enum CategoryValueOvulationTestResult {
-  negative = 1,
-  luteinizingHormoneSurge = 2,
-  indeterminate = 3,
-  estrogenSurge = 4,
-}
-
-/**
- * @see {@link https://developer.apple.com/documentation/healthkit/hkcategoryvaluesleepanalysis Apple Docs }
- */
-export enum CategoryValueSleepAnalysis {
-  inBed = 0,
-  asleepUnspecified = 1,
-  awake = 2,
-  asleepCore = 3,
-  asleepDeep = 4,
-  asleepREM = 5,
-}
-
-/**
- * @see {@link https://developer.apple.com/documentation/healthkit/hkcategoryvalueappetitechanges Apple Docs}
- */
-export enum CategoryValueAppetiteChanges {
-  decreased = 2,
-  increased = 3,
-  noChange = 1,
-  unspecified = 0,
-}
-
-/**
- * @see {@link https://developer.apple.com/documentation/healthkit/hkcategoryvaluepresence Apple Docs}
- */
-export enum CategoryValuePresence {
-  notPresent = 1,
-  present = 0,
-}
-
-/**
- * @see {@link https://developer.apple.com/documentation/healthkit/hkcategoryvalueseverity Apple Docs }
- */
-export enum CategoryValueSeverity {
-  notPresent = 1,
-  mild = 2,
-  moderate = 3,
-  severe = 4,
-  unspecified = 0,
-}
-
-/**
- * @see {@link https://developer.apple.com/documentation/healthkit/hkcategoryvalue/notapplicable Apple Docs }
- */
-export enum CategoryValueNotApplicable {
-  notApplicable = 0,
-}
-
-export enum CategoryValueLowCardioFitnessEvent {
-  lowFitness = 1,
-}
-
-/**
- * @see {@link https://developer.apple.com/documentation/healthkit/hkcategoryvalue Apple Docs }
- */
 export type CategoryValue =
-  | CategoryValueAppetiteChanges
-  | CategoryValueCervicalMucusQuality
-  | CategoryValueLowCardioFitnessEvent
-  | CategoryValueMenstrualFlow
-  | CategoryValueOvulationTestResult
-  | CategoryValuePresence
-  | CategoryValueSeverity
-  | CategoryValueSleepAnalysis
+  | CategoryValueForIdentifierGenerated<CategoryTypeIdentifier>
   | number
 
-export enum CategoryValueAppleStandHour {
-  stood = 0,
-  idle = 1,
-}
-
 export interface CategorySampleForSaving {
   readonly start: Date
   readonly end: Date
@@ -194,49 +130,17 @@ export interface CategorySamplesWithAnchorResponseTyped<
 
 export type MetadataForCategoryIdentifier<
   T extends CategoryTypeIdentifier = CategoryTypeIdentifier,
-> = T extends 'HKCategoryTypeIdentifierSexualActivity'
-  ? GenericMetadata & {
-      readonly HKSexualActivityProtectionUsed?: boolean
-    }
-  : T extends 'HKCategoryTypeIdentifierMenstrualFlow'
-    ? GenericMetadata & {
-        readonly HKMenstrualCycleStart?: boolean
-      }
-    : GenericMetadata
+> = GenericMetadata & CategoryTypedMetadataForIdentifierGenerated<T>
 
-export interface CategorySampleTyped<T extends CategoryTypeIdentifier>
-  extends Omit<BaseSample, 'metadata'> {
+export type CategorySampleTyped<T extends CategoryTypeIdentifier> = Omit<
+  CategorySample,
+  'categoryType' | 'value' | 'metadata'
+> & {
   readonly categoryType: T
   readonly value: CategoryValueForIdentifier<T>
-
   readonly metadata: MetadataForCategoryIdentifier<T>
-
-  readonly metadataSexualActivityProtectionUsed?: boolean
-  readonly metadataMenstrualCycleStart?: boolean
 }
 
 export type CategoryValueForIdentifier<
   T extends CategoryTypeIdentifier = CategoryTypeIdentifier,
-> = T extends 'HKCategoryTypeIdentifierCervicalMucusQuality'
-  ? CategoryValueCervicalMucusQuality
-  : T extends 'CategoryTypeIdentifierMenstrualFlow'
-    ? CategoryValueMenstrualFlow
-    : T extends 'HKCategoryTypeIdentifierOvulationTestResult'
-      ? CategoryValueOvulationTestResult
-      : T extends 'HKCategoryTypeIdentifierSleepAnalysis'
-        ? CategoryValueSleepAnalysis
-        : T extends CategoryTypeValueNotApplicableIdentifier
-          ? CategoryValueNotApplicable
-          : T extends CategoryTypeSeverityIdentifier
-            ? CategoryValueSeverity
-            : T extends CategoryTypePresenceIdentifier
-              ? CategoryValuePresence
-              : T extends 'HKCategoryTypeIdentifierLowCardioFitnessEvent'
-                ? CategoryValueLowCardioFitnessEvent
-                : T extends 'HKCategoryTypeIdentifierPregnancyTestResult'
-                  ? CategoryValuePregnancyTestResult
-                  : T extends 'HKCategoryTypeIdentifierPregnancyTestResult'
-                    ? CategoryValuePregnancyTestResult
-                    : T extends 'HKCategoryTypeIdentifierAppleStandHour'
-                      ? CategoryValueAppleStandHour
-                      : number
+> = CategoryValueForIdentifierGenerated<T>