@kingstinct/react-native-healthkit 12.1.2 → 12.2.0

package/src/specs/MedicationModule.nitro.ts

@@ -0,0 +1,140 @@
+import type { AnyMap, HybridObject } from 'react-native-nitro-modules'
+import type {
+  BaseSample,
+  DeletedSample,
+  Device,
+  SourceRevision,
+} from '../types'
+import type {
+  QueryOptionsWithAnchor,
+  QueryOptionsWithSortOrder,
+} from '../types/QueryOptions'
+
+enum MedicationDoseEventScheduleType {
+  asNeeded = 1,
+  /// The person logged this dose event in response to a scheduled medication reminder.
+  schedule = 2,
+}
+enum MedicationDoseEventLogStatus {
+  notInteracted = 1,
+  /// The system assigns this status when it fails to deliver a scheduled medication notification.
+  ///
+  /// The system can generate this status because of a person's notification
+  /// restrictions or issues with notification delivery.
+  notificationNotSent = 2,
+  /// The person snoozes a scheduled medication notification.
+  snoozed = 3,
+  /// The person logs that they took the medication dose.
+  taken = 4,
+  /// The person logs that they skipped the medication dose.
+  skipped = 5,
+  /// The person undoes a previously logged medication status.
+  ///
+  /// The system clears the prior status.
+  notLogged = 6,
+}
+
+interface RelatedCoding {
+  system: string
+  code: string
+  version?: string
+}
+
+type GeneralForm =
+  /// The medication comes in capsule form, such as a hard-shell capsule or softgel.
+  | 'capsule'
+
+  /// The medication is applied as a cream.
+  | 'cream'
+
+  /// The medication is administered through a device, such as an infusion pump for controlled fluid delivery.
+  | 'device'
+
+  /// The medication is taken as drops, for example eye drops or ear drops.
+  | 'drops'
+
+  /// The medication is applied as a foam.
+  | 'foam'
+
+  /// The medication is applied as a gel.
+  | 'gel'
+
+  /// The medication is delivered through an inhaler.
+  | 'inhaler'
+
+  /// The medication is given as an injection.
+  | 'injection'
+
+  /// The medication is taken as a liquid, such as a syrup.
+  | 'liquid'
+
+  /// The medication is applied as a lotion.
+  | 'lotion'
+
+  /// The medication is applied as an ointment.
+  | 'ointment'
+
+  /// The medication is applied as a patch worn on the skin.
+  | 'patch'
+
+  /// The medication is taken as a powder.
+  | 'powder'
+
+  /// The medication is delivered as a spray, for example a nasal spray or throat spray.
+  | 'spray'
+
+  /// The medication is delivered as a suppository.
+  | 'suppository'
+
+  /// The medication is taken as a tablet.
+  | 'tablet'
+
+  /// The medication is applied topically in a form that wasn't specified.
+  | 'topical'
+
+  /// The system doesn't know the general form of the medication.
+  | 'unknown'
+
+interface MedicationConcept {
+  identifier: string
+  displayText: string
+  generalForm: GeneralForm
+  relatedCodings: RelatedCoding[]
+}
+
+export interface UserAnnotatedMedication {
+  isArchived: boolean
+  hasSchedule: boolean
+  nickname?: string
+  medication: MedicationConcept
+}
+
+export interface MedicationDoseEvent extends BaseSample {
+  scheduleType: MedicationDoseEventScheduleType
+  medicationConceptIdentifier: string // not sure here
+  scheduledDate?: Date
+  scheduledDoseQuantity?: number
+  doseQuantity?: number
+  logStatus: MedicationDoseEventLogStatus
+  unit: string
+}
+
+export interface MedicationDoseEventsWithAnchorResponse {
+  readonly samples: readonly MedicationDoseEvent[]
+  readonly deletedSamples: readonly DeletedSample[]
+  readonly newAnchor: string
+}
+
+export interface MedicationModule extends HybridObject<{ ios: 'swift' }> {
+  queryMedications(): Promise<readonly UserAnnotatedMedication[]>
+
+  requestMedicationsAuthorization(): Promise<boolean>
+
+  queryMedicationEvents(
+    options: QueryOptionsWithSortOrder,
+  ): Promise<readonly MedicationDoseEvent[]>
+
+  queryMedicationEventsWithAnchor(
+    options: QueryOptionsWithAnchor,
+  ): Promise<MedicationDoseEventsWithAnchorResponse>
+}

package/src/specs/QuantityTypeModule.nitro.ts

@@ -1,6 +1,7 @@
 import type { AnyMap, HybridObject } from 'react-native-nitro-modules'
 import type { QuantitySample } from '../types/QuantitySample'
 import type {
+  AggregationStyle,
   IntervalComponents,
   QuantitySamplesWithAnchorResponse,
   QueryStatisticsResponse,
@@ -9,7 +10,6 @@ import type {
 } from '../types/QuantityType'
 import type { QuantityTypeIdentifier } from '../types/QuantityTypeIdentifier'
 import type {
-  FilterForSamples,
   QueryOptionsWithAnchorAndUnit,
   QueryOptionsWithSortOrderAndUnit,
 } from '../types/QueryOptions'
@@ -20,6 +20,8 @@ export interface QuantityTypeModule extends HybridObject<{ ios: 'swift' }> {
     unit: string,
   ): boolean
 
+  aggregationStyle(identifier: QuantityTypeIdentifier): AggregationStyle
+
   saveQuantitySample(
     identifier: QuantityTypeIdentifier,
     unit: string,
@@ -29,14 +31,9 @@ export interface QuantityTypeModule extends HybridObject<{ ios: 'swift' }> {
     metadata: AnyMap,
   ): Promise<boolean>
 
-  deleteQuantitySamples(
-    identifier: QuantityTypeIdentifier,
-    filter: FilterForSamples,
-  ): Promise<boolean>
-
   queryQuantitySamples(
     identifier: QuantityTypeIdentifier,
-    options?: QueryOptionsWithSortOrderAndUnit,
+    options: QueryOptionsWithSortOrderAndUnit,
   ): Promise<readonly QuantitySample[]>
 
   queryStatisticsForQuantity(

package/src/specs/StateOfMindModule.nitro.ts

@@ -1,17 +1,25 @@
 import type { AnyMap, HybridObject } from 'react-native-nitro-modules'
-import type { QueryOptionsWithSortOrder } from '../types/QueryOptions'
+import type {
+  QueryOptionsWithAnchor,
+  QueryOptionsWithSortOrder,
+} from '../types/QueryOptions'
 import type {
   StateOfMindAssociation,
   StateOfMindKind,
   StateOfMindLabel,
   StateOfMindSample,
+  StateOfMindSamplesWithAnchorResponse,
 } from '../types/StateOfMind'
 
 export interface StateOfMindModule extends HybridObject<{ ios: 'swift' }> {
   queryStateOfMindSamples(
-    options?: QueryOptionsWithSortOrder,
+    options: QueryOptionsWithSortOrder,
   ): Promise<readonly StateOfMindSample[]>
 
+  queryStateOfMindSamplesWithAnchor(
+    options: QueryOptionsWithAnchor,
+  ): Promise<StateOfMindSamplesWithAnchorResponse>
+
   saveStateOfMindSample(
     date: Date,
     kind: StateOfMindKind,

package/src/types/CategoryType.ts

@@ -1,7 +1,6 @@
 import type { AnyMap } from 'react-native-nitro-modules'
 import type { CategoryTypeIdentifier } from './CategoryTypeIdentifier'
-import type { Device } from './Device'
-import type { DeletedSample, GenericMetadata } from './Shared'
+import type { BaseSample, DeletedSample, GenericMetadata } from './Shared'
 import type { SourceRevision } from './Source'
 
 export type CategoryTypePresenceIdentifier =
@@ -180,15 +179,9 @@ export interface CategorySamplesWithAnchorResponse {
   readonly newAnchor: string
 }
 
-export interface CategorySample {
-  readonly uuid: string
-  readonly device?: Device
+export interface CategorySample extends BaseSample {
   readonly categoryType: CategoryTypeIdentifier
-  readonly startDate: Date
-  readonly endDate: Date
   readonly value: CategoryValueForIdentifier
-  readonly metadata: AnyMap
-  readonly sourceRevision?: SourceRevision
 }
 
 export interface CategorySamplesWithAnchorResponseTyped<
@@ -199,29 +192,29 @@ export interface CategorySamplesWithAnchorResponseTyped<
   readonly newAnchor: string
 }
 
-export interface CategorySampleTyped<T extends CategoryTypeIdentifier> {
-  readonly uuid: string
-  readonly device?: Device
-  readonly categoryType: T
-  readonly startDate: Date
-  readonly endDate: Date
-  readonly value: CategoryValueForIdentifier<T>
-  readonly metadata: MetadataForCategoryIdentifier<T>
-  readonly sourceRevision?: SourceRevision
-}
-
 export type MetadataForCategoryIdentifier<
   T extends CategoryTypeIdentifier = CategoryTypeIdentifier,
 > = T extends 'HKCategoryTypeIdentifierSexualActivity'
   ? GenericMetadata & {
-      readonly HKSexualActivityProtectionUsed: boolean
+      readonly HKSexualActivityProtectionUsed?: boolean
     }
   : T extends 'HKCategoryTypeIdentifierMenstrualFlow'
     ? GenericMetadata & {
-        readonly HKMenstrualCycleStart: boolean
+        readonly HKMenstrualCycleStart?: boolean
       }
     : GenericMetadata
 
+export interface CategorySampleTyped<T extends CategoryTypeIdentifier>
+  extends Omit<BaseSample, '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'

package/src/types/Constants.ts

@@ -30,3 +30,6 @@ export const HeartbeatSeriesTypeIdentifier =
  */
 export const ElectrocardiogramTypeIdentifier =
   'HKElectrocardiogramType' as const
+
+export const UserAnnotatedMedicationTypeIdentifier =
+  'HKUserAnnotatedMedicationTypeIdentifier'

package/src/types/CorrelationType.ts

@@ -1,7 +1,6 @@
-import type { AnyMap } from 'react-native-nitro-modules'
 import type { CategorySample, CategorySampleForSaving } from './CategoryType'
 import type { QuantitySample, QuantitySampleForSaving } from './QuantitySample'
-import type { GenericMetadata } from './Shared'
+import type { BaseSample, DeletedSample } from './Shared'
 
 /**
  * @see {@link https://developer.apple.com/documentation/healthkit/hkcorrelationtypeidentifier Apple Docs }
@@ -12,21 +11,17 @@ export type CorrelationTypeIdentifier =
 
 type CorrelationObject = CategorySample | QuantitySample
 
-export interface CorrelationSample {
-  readonly uuid: string
+export interface CorrelationSample extends BaseSample {
   readonly correlationType: CorrelationTypeIdentifier
   readonly objects: readonly CorrelationObject[]
-  readonly metadata: AnyMap
-  readonly startDate: Date
-  readonly endDate: Date
-}
 
-export type MetadataMapperForCorrelationIdentifier<
-  TCorrelationTypeIdentifier = CorrelationTypeIdentifier,
-> = TCorrelationTypeIdentifier extends 'CorrelationTypeIdentifierFood'
-  ? GenericMetadata & {
-      readonly HKFoodType?: string
-    }
-  : GenericMetadata
+  readonly metadataFoodType?: string
+}
 
 export type SampleForSaving = CategorySampleForSaving | QuantitySampleForSaving
+
+export interface QueryCorrelationSamplesWithAnchorResponse {
+  readonly correlations: readonly CorrelationSample[]
+  readonly deletedSamples: readonly DeletedSample[]
+  readonly newAnchor: string
+}

package/src/types/ElectrocardiogramSample.ts

@@ -1,11 +1,8 @@
-import type { AnyMap } from 'react-native-nitro-modules'
 import type {
   QueryOptionsWithAnchor,
   QueryOptionsWithSortOrder,
 } from '../types/QueryOptions'
-import type { Device } from './Device'
-import type { DeletedSample } from './Shared'
-import type { SourceRevision } from './Source'
+import type { BaseSample, DeletedSample } from './Shared'
 
 // Enums mirror HealthKit; keep the union literal names stable.
 export type ElectrocardiogramClassification =
@@ -26,23 +23,14 @@ export interface ElectrocardiogramVoltage {
   readonly lead: ElectrocardiogramLead
 }
 
-export interface ElectrocardiogramSample {
-  readonly uuid: string
-  readonly device?: Device
-  readonly startDate: Date
-  readonly endDate: Date
-
+export interface ElectrocardiogramSample extends BaseSample {
   readonly classification: ElectrocardiogramClassification
   readonly symptomsStatus: ElectrocardiogramSymptomsStatus
 
   readonly averageHeartRateBpm?: number // HKQuantity (count/min)
   readonly samplingFrequencyHz?: number // HKQuantity (Hz)
   readonly numberOfVoltageMeasurements: number
-  readonly algorithmVersion?: string
   readonly voltages?: readonly ElectrocardiogramVoltage[]
-
-  readonly metadata?: AnyMap
-  readonly sourceRevision?: SourceRevision
 }
 
 export interface ElectrocardiogramSamplesWithAnchorResponse {

package/src/types/HeartbeatSeries.ts

@@ -1,25 +1,12 @@
-import type { AnyMap } from 'react-native-nitro-modules'
-import type { Device } from './Device'
-import type { DeletedSample, GenericMetadata } from './Shared'
-import type { SourceRevision } from './Source'
-
-export interface HeartbeatSeriesSampleMetadata extends GenericMetadata {
-  readonly HKMetadataKeyAlgorithmVersion: string
-}
+import type { BaseSample, DeletedSample } from './Shared'
 
 export interface Heartbeat {
   readonly timeSinceSeriesStart: number
   readonly precededByGap: boolean
 }
 
-export interface HeartbeatSeriesSample {
-  readonly uuid: string
-  readonly device?: Device
-  readonly startDate: Date
-  readonly endDate: Date
+export interface HeartbeatSeriesSample extends BaseSample {
   readonly heartbeats: readonly Heartbeat[]
-  readonly metadata?: AnyMap
-  readonly sourceRevision?: SourceRevision
 }
 
 export interface HeartbeatSeriesSamplesWithAnchorResponse {

package/src/types/QuantitySample.ts

@@ -1,22 +1,16 @@
 import type { AnyMap } from 'react-native-nitro-modules'
 
-import type { Device } from './Device'
 import type { QuantityTypeIdentifier } from './QuantityTypeIdentifier'
+import type { BaseSample } from './Shared'
 import type { SourceRevision } from './Source'
 
 /**
  * @see {@link https://developer.apple.com/documentation/healthkit/hkquantitysample Apple Docs }
  */
-export interface QuantitySample {
-  readonly uuid: string
-  readonly device?: Device
+export interface QuantitySample extends BaseSample {
   readonly quantityType: QuantityTypeIdentifier
-  readonly startDate: Date
-  readonly endDate: Date
   readonly quantity: number
   readonly unit: string
-  readonly metadata: AnyMap
-  readonly sourceRevision?: SourceRevision
 }
 
 export interface QuantitySampleForSaving {

package/src/types/QuantityType.ts

@@ -1,7 +1,7 @@
 import type { QuantitySample } from './QuantitySample'
 import type { QuantityTypeIdentifier } from './QuantityTypeIdentifier'
 import type { FilterForSamples } from './QueryOptions'
-import type { DeletedSample, GenericMetadata } from './Shared'
+import type { DeletedSample } from './Shared'
 import type {
   BloodGlucoseUnit,
   CountPerTime,
@@ -32,6 +32,13 @@ export interface QueryStatisticsResponse {
   readonly endDate?: Date
 }
 
+export enum AggregationStyle {
+  cumulative = 0,
+  discreteArithmetic = 1,
+  discreteTemporallyWeighted = 2,
+  discreteEquivalentContinuousLevel = 3,
+}
+
 export interface QuantitySamplesWithAnchorResponse {
   readonly samples: readonly QuantitySample[]
   readonly deletedSamples: readonly DeletedSample[]
@@ -82,22 +89,6 @@ export type StatisticsOptions =
   | 'mostRecent'
   | 'separateBySource'
 
-export type MetadataMapperForQuantityIdentifier<
-  TQuantityTypeIdentifier = QuantityTypeIdentifier,
-> = TQuantityTypeIdentifier extends 'QuantityTypeIdentifierInsulinDelivery'
-  ? GenericMetadata & {
-      readonly HKInsulinDeliveryReason: InsulinDeliveryReason
-    }
-  : TQuantityTypeIdentifier extends 'QuantityTypeIdentifierBloodGlucose'
-    ? GenericMetadata & {
-        readonly HKBloodGlucoseMealTime?: number
-      }
-    : TQuantityTypeIdentifier extends 'QuantityTypeIdentifierHeartRate'
-      ? GenericMetadata & {
-          readonly HKHeartRateMotionContext?: HeartRateMotionContext
-        }
-      : GenericMetadata
-
 export type UnitForIdentifier<
   T extends QuantityTypeIdentifier = QuantityTypeIdentifier,
 > = T extends 'QuantityTypeIdentifierBloodGlucose'

package/src/types/QuantityTypeIdentifier.ts

@@ -8,7 +8,31 @@ export type QuantityTypeIdentifierReadOnly =
    * @see {@link https://developer.apple.com/documentation/healthkit/hkquantitytypeidentifierwalkingheartrateaverage Apple Docs HKQuantityTypeIdentifierWalkingHeartRateAverage}
    * @since iOS 11.0
    */
-  'HKQuantityTypeIdentifierWalkingHeartRateAverage'
+  | 'HKQuantityTypeIdentifierWalkingHeartRateAverage'
+
+  /**
+   * Atrial Fibrillation Burden
+   * @see {@link https://developer.apple.com/documentation/healthkit/hkquantitytypeidentifieratrialfibrillationburden Apple Docs HKQuantityTypeIdentifierAtrialFibrillationBurden}
+   * @since iOS 16
+   */
+  | 'HKQuantityTypeIdentifierAtrialFibrillationBurden' // Scalar(Percent, 0.0 - 1.0), Discrete
+  /**
+   * Apple Exercise Time
+   * @see {@link https://developer.apple.com/documentation/healthkit/hkquantitytypeidentifierappleexercisetime Apple Docs HKQuantityTypeIdentifierAppleExerciseTime}
+   */
+  | 'HKQuantityTypeIdentifierAppleExerciseTime'
+  /**
+   * Apple Stand Time
+   * @see {@link https://developer.apple.com/documentation/healthkit/hkquantitytypeidentifierapplestandtime Apple Docs HKQuantityTypeIdentifierAppleStandTime}
+   */
+  | 'HKQuantityTypeIdentifierAppleStandTime'
+
+  /**
+   * Apple Walking Steadiness
+   * @see {@link https://developer.apple.com/documentation/healthkit/hkquantitytypeidentifierapplewalkingsteadiness Apple Docs HKQuantityTypeIdentifierAppleWalkingSteadiness}
+   * @since iOS 15
+   */
+  | 'HKQuantityTypeIdentifierAppleWalkingSteadiness' // Scalar(Percent, 0.0 - 1.0), Discrete
 
 /**
  * Represents a quantity type identifier.
@@ -94,11 +118,6 @@ export type QuantityTypeIdentifierWriteable =
    * @see {@link https://developer.apple.com/documentation/healthkit/hkquantitytypeidentifiernikefuel Apple Docs HKQuantityTypeIdentifierNikeFuel}
    */
   | 'HKQuantityTypeIdentifierNikeFuel'
-  /**
-   * Apple Exercise Time
-   * @see {@link https://developer.apple.com/documentation/healthkit/hkquantitytypeidentifierappleexercisetime Apple Docs HKQuantityTypeIdentifierAppleExerciseTime}
-   */
-  | 'HKQuantityTypeIdentifierAppleExerciseTime'
   /**
    * Push Count
    * @see {@link https://developer.apple.com/documentation/healthkit/hkquantitytypeidentifierpushcount Apple Docs HKQuantityTypeIdentifierPushCount}
@@ -125,11 +144,6 @@ export type QuantityTypeIdentifierWriteable =
    */
   | 'HKQuantityTypeIdentifierDistanceDownhillSnowSports'
 
-  /**
-   * Apple Stand Time
-   * @see {@link https://developer.apple.com/documentation/healthkit/hkquantitytypeidentifierapplestandtime Apple Docs HKQuantityTypeIdentifierAppleStandTime}
-   */
-  | 'HKQuantityTypeIdentifierAppleStandTime'
   // Vitals
   /**
    * Heart Rate
@@ -557,13 +571,6 @@ export type QuantityTypeIdentifierWriteable =
    */
   | 'HKQuantityTypeIdentifierAppleMoveTime' // Time, Cumulative
 
-  /**
-   * Apple Walking Steadiness
-   * @see {@link https://developer.apple.com/documentation/healthkit/hkquantitytypeidentifierapplewalkingsteadiness Apple Docs HKQuantityTypeIdentifierAppleWalkingSteadiness}
-   * @since iOS 15
-   */
-  | 'HKQuantityTypeIdentifierAppleWalkingSteadiness' // Scalar(Percent, 0.0 - 1.0), Discrete
-
   /**
    * Number Of Alcoholic Beverages
    * @see {@link https://developer.apple.com/documentation/healthkit/hkquantitytypeidentifiernumberofalcoholicbeverages Apple Docs HKQuantityTypeIdentifierNumberOfAlcoholicBeverages}
@@ -571,13 +578,6 @@ export type QuantityTypeIdentifierWriteable =
    */
   | 'HKQuantityTypeIdentifierNumberOfAlcoholicBeverages' // Scalar(Count), Cumulative
 
-  /**
-   * Atrial Fibrillation Burden
-   * @see {@link https://developer.apple.com/documentation/healthkit/hkquantitytypeidentifieratrialfibrillationburden Apple Docs HKQuantityTypeIdentifierAtrialFibrillationBurden}
-   * @since iOS 16
-   */
-  | 'HKQuantityTypeIdentifierAtrialFibrillationBurden' // Scalar(Percent, 0.0 - 1.0), Discrete
-
   /**
    * Underwater Depth
    * @see {@link https://developer.apple.com/documentation/healthkit/hkquantitytypeidentifierunderwaterdepth Apple Docs HKQuantityTypeIdentifierUnderwaterDepth}

package/src/types/QueryOptions.ts

@@ -1,46 +1,43 @@
+import type { SourceProxy } from '../specs/SourceProxy.nitro'
 import type { WorkoutProxy } from '../specs/WorkoutProxy.nitro'
 
-type PredicateWithUUID = {
-  readonly uuid: string
-}
+export enum ComparisonPredicateOperator {
+  lessThan = 0,
 
-type PredicateWithUUIDs = {
-  readonly uuids: readonly string[]
-}
+  lessThanOrEqualTo = 1,
 
-type PredicateWithStartAndEnd = {
-  readonly startDate?: Date
-  readonly endDate?: Date
-  readonly strictEndDate?: boolean
-  readonly strictStartDate?: boolean
-}
+  greaterThan = 2,
 
-type PredicateWithMetadataOperator =
-  | 'equalTo'
-  | 'notEqualTo'
-  | 'greaterThan'
-  | 'lessThan'
+  greaterThanOrEqualTo = 3,
 
-type PredicateWithMetadataValue = string | number | Date | boolean
+  equalTo = 4,
 
-type PredicateWithMetadataKey = {
-  readonly withMetadataKey: string
-  readonly operatorType?: PredicateWithMetadataOperator
-  readonly value?: PredicateWithMetadataValue
-}
+  notEqualTo = 5,
 
-export type FilterForSamplesAnd = {
-  readonly AND: PredicateForSamples[]
-}
+  matches = 6,
 
-export type FilterForSamplesOr = {
-  readonly OR: PredicateForSamples[]
-}
+  like = 7,
+
+  beginsWith = 8,
+
+  endsWith = 9,
+
+  IN = 10,
+
+  customSelector = 11,
 
-export type PredicateFromWorkout = {
-  readonly workout: WorkoutProxy
+  contains = 99,
+
+  between = 100,
 }
 
+type PredicateWithMetadataValue = string | number | Date | boolean
+
+export interface PredicateWithMetadataKey {
+  readonly withMetadataKey: string
+  readonly operatorType?: ComparisonPredicateOperator
+  readonly value?: PredicateWithMetadataValue
+}
 // Computes and flattens object types
 // biome-ignore lint/complexity/noBannedTypes: it works
 type ComputeRaw<A> = A extends Function ? A : { [K in keyof A]: A[K] } & {}
@@ -63,23 +60,37 @@ type _Strict<U, UAll extends U = U> = U extends any
 // The exported type you can copy into your codebase
 export type StrictUnion<U extends object> = _Strict<U>
 
-export type FilterForSamples =
-  | PredicateForSamples
-  | FilterForSamplesAnd
-  | FilterForSamplesOr
-
-export type PredicateForSamples =
-  | PredicateWithUUID
-  | PredicateWithUUIDs
-  | PredicateWithMetadataKey
-  | PredicateWithStartAndEnd
-  | PredicateFromWorkout
+export interface DateFilter {
+  readonly startDate?: Date
+  readonly endDate?: Date
+  readonly strictEndDate?: boolean
+  readonly strictStartDate?: boolean
+}
+
+export interface FilterForSamplesBase {
+  readonly uuid?: string
+  readonly uuids?: string[]
+  readonly metadata?: PredicateWithMetadataKey
+  readonly date?: DateFilter
+  readonly workout?: WorkoutProxy
+  readonly sources?: SourceProxy[]
+}
+
+export interface FilterForSamples extends FilterForSamplesBase {
+  readonly OR?: FilterForSamplesBase[]
+  readonly NOT?: FilterForSamplesBase[]
+  readonly AND?: FilterForSamplesBase[]
+}
+
 /**
  * Generic options for querying.
  */
 export interface GenericQueryOptions {
   filter?: FilterForSamples
-  readonly limit?: number
+  /**
+   * Specify -1, 0 or any non-positive number for fetching all samples
+   * */
+  readonly limit: number
 }
 
 export interface QueryOptionsWithAnchor extends GenericQueryOptions {