@ovok/core 0.4.36 → 0.4.38

package/dist/client/observation/services/creator.js

@@ -2,27 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObservationServiceCreator = void 0;
 const types_1 = require("../../../types");
-const baby_sleep_1 = require("./baby-sleep");
-const blood_glucose_1 = require("./blood-glucose");
 const blood_oxygen_1 = require("./blood-oxygen");
 const blood_pressure_1 = require("./blood-pressure");
-const body_temperature_1 = require("./body-temperature");
-const body_weight_1 = require("./body-weight");
+const component_observation_services_1 = require("./component-observation-services");
 const ecg_1 = require("./ecg");
-const heart_rate_1 = require("./heart-rate");
-const heart_rate_variability_1 = require("./heart-rate-variability");
 const lipid_panel_1 = require("./lipid-panel");
-const respiratory_rate_1 = require("./respiratory-rate");
-const respiratory_therapy_1 = require("./respiratory-therapy");
-const resting_heart_rate_1 = require("./resting-heart-rate");
+const single_value_services_1 = require("./single-value-services");
 const step_count_1 = require("./step-count");
 const uric_acid_service_1 = require("./uric-acid-service");
-const vo2_max_1 = require("./vo2-max");
-const walking_heart_rate_average_1 = require("./walking-heart-rate-average");
 class ObservationServiceCreator {
     constructor() {
-        this.services = new Map();
-        this.initializeServices();
+        const uricAcid = new uric_acid_service_1.UricAcidService();
+        this.services = new Map([
+            ...(0, single_value_services_1.singleValueObservationServices)(),
+            [types_1.MeasurementTypeKey.bloodPressure, new blood_pressure_1.BloodPressureService()],
+            [types_1.MeasurementTypeKey.bloodOxygenPulseRate, new blood_oxygen_1.BloodOxygenService()],
+            [types_1.MeasurementTypeKey.ecg, new ecg_1.EcgService()],
+            [types_1.MeasurementTypeKey.stepCount, new step_count_1.StepCountService()],
+            [types_1.MeasurementTypeKey.urineAnalysis, uricAcid],
+            [types_1.MeasurementTypeKey.uricAcid, uricAcid],
+            [types_1.MeasurementTypeKey.lipidPanel, new lipid_panel_1.LipidPanelService()],
+            [types_1.MeasurementTypeKey.respiratoryTherapy, (0, component_observation_services_1.respiratoryTherapyService)()],
+            [types_1.MeasurementTypeKey.babySleep, (0, component_observation_services_1.babySleepService)()],
+        ]);
     }
     static getInstance() {
         if (!ObservationServiceCreator.instance) {
@@ -30,26 +32,6 @@ class ObservationServiceCreator {
         }
         return ObservationServiceCreator.instance;
     }
-    initializeServices() {
-        this.services.set(types_1.MeasurementTypeKey.bodyWeight, new body_weight_1.BodyWeightService());
-        this.services.set(types_1.MeasurementTypeKey.bloodPressure, new blood_pressure_1.BloodPressureService());
-        this.services.set(types_1.MeasurementTypeKey.bloodGlucose, new blood_glucose_1.BloodGlucoseService());
-        this.services.set(types_1.MeasurementTypeKey.temperature, new body_temperature_1.BodyTemperatureService());
-        this.services.set(types_1.MeasurementTypeKey.bloodOxygenPulseRate, new blood_oxygen_1.BloodOxygenService());
-        this.services.set(types_1.MeasurementTypeKey.ecg, new ecg_1.EcgService());
-        this.services.set(types_1.MeasurementTypeKey.stepCount, new step_count_1.StepCountService());
-        this.services.set(types_1.MeasurementTypeKey.restingHeartRate, new resting_heart_rate_1.RestingHeartRateService());
-        this.services.set(types_1.MeasurementTypeKey.walkingHeartRateAverage, new walking_heart_rate_average_1.WalkingHeartRateAverageService());
-        this.services.set(types_1.MeasurementTypeKey.heartRateVariability, new heart_rate_variability_1.HeartRateVariabilityService());
-        this.services.set(types_1.MeasurementTypeKey.heartRate, new heart_rate_1.HeartRateService());
-        this.services.set(types_1.MeasurementTypeKey.respiratoryRate, new respiratory_rate_1.RespiratoryRateService());
-        this.services.set(types_1.MeasurementTypeKey.vo2Max, new vo2_max_1.Vo2MaxService());
-        this.services.set(types_1.MeasurementTypeKey.urineAnalysis, new uric_acid_service_1.UricAcidService());
-        this.services.set(types_1.MeasurementTypeKey.uricAcid, new uric_acid_service_1.UricAcidService());
-        this.services.set(types_1.MeasurementTypeKey.lipidPanel, new lipid_panel_1.LipidPanelService());
-        this.services.set(types_1.MeasurementTypeKey.respiratoryTherapy, new respiratory_therapy_1.RespiratoryTherapyService());
-        this.services.set(types_1.MeasurementTypeKey.babySleep, new baby_sleep_1.BabySleepService());
-    }
     getService(type) {
         const service = this.services.get(type);
         if (!service) {

package/dist/client/observation/services/ecg-observation-fragments.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateEcgObservationFragments = void 0;
+const fhir_systems_1 = require("../fhir-systems");
+const measurement_time_1 = require("./measurement-time");
 const MAX_SEGMENT_DURATION_SECONDS = 5 * 60;
 const MAX_SAMPLED_DATA_CHARACTERS = 750000;
 const generateEcgObservationFragments = (measurement, observationCodes) => {
     const fragments = [];
     const diagramPoints = measurement.diagramPoints;
-    const recordedAt = isValidDate(measurement.recordedAt)
-        ? measurement.recordedAt
-        : new Date();
+    const recordedAt = (0, measurement_time_1.recordedAtOrNow)(measurement);
     const duration = typeof measurement.duration === "number" &&
         Number.isFinite(measurement.duration) &&
         measurement.duration > 0
@@ -71,7 +71,7 @@ const generateEcgObservationFragments = (measurement, observationCodes) => {
                     value: Number(measurement.heartRate.toFixed(0)),
                     unit: "bpm",
                     code: "8867-4",
-                    system: "http://loinc.org",
+                    system: fhir_systems_1.LOINC_SYSTEM,
                 },
             },
             additionalProperties: {
@@ -92,7 +92,6 @@ const durationComponent = (duration) => ({
         value: duration,
         unit: "s",
         code: "s",
-        system: "http://unitsofmeasure.org",
+        system: fhir_systems_1.UCUM_SYSTEM,
     },
 });
-const isValidDate = (value) => value instanceof Date && !Number.isNaN(value.getTime());

package/dist/client/observation/services/ecg.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EcgService = void 0;
 const types_1 = require("../../../types");
+const fhir_systems_1 = require("../fhir-systems");
 const base_observation_service_1 = require("./base-observation-service");
 const ecg_observation_fragments_1 = require("./ecg-observation-fragments");
 class EcgService extends base_observation_service_1.BaseObservationService {
@@ -54,7 +55,7 @@ class EcgService extends base_observation_service_1.BaseObservationService {
                     value: Number(fixedValue),
                     unit: "bpm",
                     code: types_1.ObservationCode.ECG_HEART_RATE,
-                    system: "http://loinc.org",
+                    system: fhir_systems_1.LOINC_SYSTEM,
                 },
             });
         }
@@ -90,7 +91,7 @@ class EcgService extends base_observation_service_1.BaseObservationService {
                             value: castedMeasurement.duration,
                             unit: "s",
                             code: "s",
-                            system: "http://unitsofmeasure.org",
+                            system: fhir_systems_1.UCUM_SYSTEM,
                         },
                     },
                 ],

package/dist/client/observation/services/lipid-panel.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LipidPanelService = void 0;
 const types_1 = require("../../../types");
+const fhir_systems_1 = require("../fhir-systems");
 const base_observation_service_1 = require("./base-observation-service");
-const UCUM_SYSTEM = "http://unitsofmeasure.org";
-const LOINC_SYSTEM = "http://loinc.org";
+const measurement_time_1 = require("./measurement-time");
 const COMPONENTS = [
     {
         key: "totalCholesterol",
@@ -36,10 +36,6 @@ const COMPONENTS = [
         massCode: types_1.ObservationCode.TOTAL_CHOLESTEROL_HDL_RATIO,
     },
 ];
-const recordedAt = (measurement) => measurement.recordedAt instanceof Date &&
-    !Number.isNaN(measurement.recordedAt.getTime())
-    ? measurement.recordedAt.toISOString()
-    : new Date().toISOString();
 class LipidPanelService extends base_observation_service_1.BaseObservationService {
     constructor() {
         super(...arguments);
@@ -61,14 +57,14 @@ class LipidPanelService extends base_observation_service_1.BaseObservationServic
             const unit = item.key === "totalCholesterolHdlRatio" ? "{ratio}" : lipidPanel.unit;
             return [{
                     code: {
-                        coding: [{ code, display: item.display, system: LOINC_SYSTEM }],
+                        coding: [{ code, display: item.display, system: fhir_systems_1.LOINC_SYSTEM }],
                         text: item.display,
                     },
                     valueQuantity: {
                         value,
                         unit,
                         code: unit,
-                        system: UCUM_SYSTEM,
+                        system: fhir_systems_1.UCUM_SYSTEM,
                     },
                 }];
         });
@@ -80,11 +76,11 @@ class LipidPanelService extends base_observation_service_1.BaseObservationServic
                     coding: [{
                             code: types_1.ObservationCode.LIPID_PANEL,
                             display: "Lipid panel - Serum or Plasma",
-                            system: LOINC_SYSTEM,
+                            system: fhir_systems_1.LOINC_SYSTEM,
                         }],
                 },
                 additionalProperties: {
-                    effectiveDateTime: recordedAt(lipidPanel),
+                    effectiveDateTime: (0, measurement_time_1.recordedAtOrNow)(lipidPanel).toISOString(),
                     component: components,
                 },
             }];
@@ -94,12 +90,12 @@ class LipidPanelService extends base_observation_service_1.BaseObservationServic
                 coding: [{
                         code: types_1.ObservationCode.LIPID_PANEL,
                         display: "Lipid panel - Serum or Plasma",
-                        system: LOINC_SYSTEM,
+                        system: fhir_systems_1.LOINC_SYSTEM,
                     }],
             }];
     }
     getAdditionalProperties(measurement) {
-        return [{ effectiveDateTime: recordedAt(this.getCastedMeasurement(measurement)) }];
+        return [{ effectiveDateTime: (0, measurement_time_1.recordedAtOrNow)(this.getCastedMeasurement(measurement)).toISOString() }];
     }
     generateValues(_measurement) {
         return [];

package/dist/client/observation/services/measurement-time.d.ts

@@ -0,0 +1,4 @@
+/** The measurement's `recordedAt` when it is a valid date, else now. */
+export declare const recordedAtOrNow: ({ recordedAt }: {
+    recordedAt?: Date;
+}) => Date;

package/dist/client/observation/services/measurement-time.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.recordedAtOrNow = void 0;
+/** The measurement's `recordedAt` when it is a valid date, else now. */
+const recordedAtOrNow = ({ recordedAt }) => recordedAt instanceof Date && !Number.isNaN(recordedAt.getTime()) ? recordedAt : new Date();
+exports.recordedAtOrNow = recordedAtOrNow;

package/dist/client/observation/services/single-value-services.d.ts

@@ -0,0 +1,36 @@
+import { MeasurementTypeKey } from "../../../types";
+import { RecordResult, RecordType } from "../types/generate-measurement/HealthConnectTypes";
+import { Sample } from "../types/generate-measurement/Sample";
+import { Measurement } from "../types/measurement/Measurement";
+import { ObservationMetadata } from "../types/service/ObservationMetadata";
+/** A measurement whose one value sits under the spec's `valueKey`. */
+type SingleValueMeasurement = Measurement & {
+    [value: string]: unknown;
+};
+import { BaseObservationService } from "./base-observation-service";
+type SingleValueSpec = {
+    measurementTypeKey: MeasurementTypeKey;
+    measurementTypeName: string;
+    metadata: Omit<ObservationMetadata<SingleValueMeasurement>, "additionalCodes">;
+    /** HealthKit quantity type to read; the first sample is used when omitted. */
+    sampleType?: string;
+    fromRecord: (record: RecordResult<RecordType>) => number | undefined;
+};
+/** An observation with one value: what varies per measurement is data, not code. */
+declare class SingleValueObservationService extends BaseObservationService<SingleValueMeasurement> {
+    private readonly spec;
+    protected measurementTypeKey: MeasurementTypeKey;
+    protected measurementTypeName: string;
+    protected observationMetadata: ObservationMetadata<SingleValueMeasurement>[];
+    constructor(spec: SingleValueSpec);
+    convertSamplesToMeasurement(samples: Sample[]): SingleValueMeasurement;
+    convertRecordToMeasurement(record: RecordResult<RecordType>): SingleValueMeasurement;
+    private measurement;
+}
+export declare const singleValueObservationServices: () => [MeasurementTypeKey, SingleValueObservationService][];
+/** Value key and LOINC code of each single-value type, for reading observations back into measurements. */
+export declare const singleValueFields: ReadonlyMap<MeasurementTypeKey, {
+    valueKey: string;
+    code: string;
+}>;
+export {};

package/dist/client/observation/services/single-value-services.js

@@ -0,0 +1,100 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.singleValueFields = exports.singleValueObservationServices = void 0;
+const types_1 = require("../../../types");
+const base_observation_service_1 = require("./base-observation-service");
+/** An observation with one value: what varies per measurement is data, not code. */
+class SingleValueObservationService extends base_observation_service_1.BaseObservationService {
+    constructor(spec) {
+        super();
+        this.spec = spec;
+        this.measurementTypeKey = spec.measurementTypeKey;
+        this.measurementTypeName = spec.measurementTypeName;
+        this.observationMetadata = [{ ...spec.metadata, additionalCodes: [] }];
+    }
+    convertSamplesToMeasurement(samples) {
+        const sample = this.spec.sampleType
+            ? samples.find((x) => x.quantityType === this.spec.sampleType)
+            : samples[0];
+        return this.measurement(sample === null || sample === void 0 ? void 0 : sample.quantity);
+    }
+    convertRecordToMeasurement(record) {
+        return this.measurement(this.spec.fromRecord(record));
+    }
+    measurement(value) {
+        return {
+            [this.spec.metadata.valueKey]: value,
+            measurementTypeKey: this.measurementTypeKey,
+        };
+    }
+}
+const specs = [
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.bloodGlucose,
+        measurementTypeName: "blood glucose",
+        metadata: { primaryCode: types_1.ObservationCode.BLOOD_GLUCOSE, display: "Blood Glucose", unit: "mg/dL", valueKey: "bloodGlucose", toFixed: 1 },
+        fromRecord: (record) => record.level.inMilligramsPerDeciliter,
+    },
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.temperature,
+        measurementTypeName: "body temperature",
+        metadata: { primaryCode: types_1.ObservationCode.BODY_TEMPERATURE, display: "Body Temperature", unit: "°C", valueKey: "bodyTemp", toFixed: 2 },
+        fromRecord: (record) => record.temperature.inCelsius,
+    },
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.bodyWeight,
+        measurementTypeName: "body weight",
+        metadata: { primaryCode: types_1.ObservationCode.BODY_WEIGHT, display: "Body Weight", unit: "kg", valueKey: "bodyWeight", toFixed: 2 },
+        fromRecord: (record) => record.weight.inKilograms,
+    },
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.heartRateVariability,
+        measurementTypeName: "heart rate variability",
+        metadata: { primaryCode: types_1.ObservationCode.HEART_RATE_VARIABILITY, display: "Heart Rate Variability", unit: "ms", valueKey: "heartRateVariability", toFixed: 1 },
+        sampleType: "HKQuantityTypeIdentifierHeartRateVariabilitySDNN",
+        fromRecord: (record) => record.heartRateVariabilityMillis,
+    },
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.heartRate,
+        measurementTypeName: "heart rate",
+        metadata: { primaryCode: types_1.ObservationCode.HEART_RATE, display: "Heart Rate", unit: "bpm", valueKey: "heartRate", toFixed: 0 },
+        sampleType: "HKQuantityTypeIdentifierHeartRate",
+        fromRecord: (record) => { var _a, _b; return (_b = (_a = record.samples) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.beatsPerMinute; },
+    },
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.respiratoryRate,
+        measurementTypeName: "respiratory rate",
+        metadata: { primaryCode: types_1.ObservationCode.RESPIRATORY_RATE, display: "Respiratory Rate", unit: "breaths/min", valueKey: "respiratoryRate", toFixed: 1 },
+        sampleType: "HKQuantityTypeIdentifierRespiratoryRate",
+        fromRecord: (record) => record.rate,
+    },
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.restingHeartRate,
+        measurementTypeName: "resting heart rate",
+        metadata: { primaryCode: types_1.ObservationCode.RESTING_HEART_RATE, display: "Resting Heart Rate", unit: "bpm", valueKey: "restingHeartRate", toFixed: 0 },
+        sampleType: "HKQuantityTypeIdentifierRestingHeartRate",
+        fromRecord: (record) => record.beatsPerMinute,
+    },
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.vo2Max,
+        measurementTypeName: "VO2 max",
+        metadata: { primaryCode: types_1.ObservationCode.VO2_MAX, display: "VO2 Max", unit: "mL/kg/min", valueKey: "vo2Max", toFixed: 1 },
+        sampleType: "HKQuantityTypeIdentifierVO2Max",
+        fromRecord: (record) => record.vo2MillilitersPerMinuteKilogram,
+    },
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.walkingHeartRateAverage,
+        measurementTypeName: "walking heart rate average",
+        metadata: { primaryCode: types_1.ObservationCode.WALKING_HEART_RATE_AVERAGE, display: "Walking Heart Rate Average", unit: "bpm", valueKey: "walkingHeartRateAverage", toFixed: 0 },
+        sampleType: "HKQuantityTypeIdentifierWalkingHeartRateAverage",
+        // Health Connect has no walking-heart-rate-average record.
+        fromRecord: () => 0,
+    },
+];
+const singleValueObservationServices = () => specs.map((spec) => [spec.measurementTypeKey, new SingleValueObservationService(spec)]);
+exports.singleValueObservationServices = singleValueObservationServices;
+/** Value key and LOINC code of each single-value type, for reading observations back into measurements. */
+exports.singleValueFields = new Map(specs.map(({ measurementTypeKey, metadata }) => [
+    measurementTypeKey,
+    { valueKey: String(metadata.valueKey), code: metadata.primaryCode },
+]));

package/dist/client/observation/services/uric-acid-service.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UricAcidService = void 0;
 const types_1 = require("../../../types");
+const fhir_systems_1 = require("../fhir-systems");
 const base_observation_service_1 = require("./base-observation-service");
+const measurement_time_1 = require("./measurement-time");
 class UricAcidService extends base_observation_service_1.BaseObservationService {
     constructor() {
         super(...arguments);
@@ -36,7 +38,7 @@ class UricAcidService extends base_observation_service_1.BaseObservationService
                 value: problemCount,
                 unit: "problems",
                 code: types_1.ObservationCode.URIC_ACID,
-                system: "http://loinc.org",
+                system: fhir_systems_1.LOINC_SYSTEM,
             },
         });
         return values;
@@ -63,10 +65,7 @@ class UricAcidService extends base_observation_service_1.BaseObservationService
      */
     generateObservationFragments(measurement) {
         const castedMeasurement = this.getCastedMeasurement(measurement);
-        const effectiveDateTime = castedMeasurement.recordedAt instanceof Date &&
-            !Number.isNaN(castedMeasurement.recordedAt.getTime())
-            ? castedMeasurement.recordedAt.toISOString()
-            : new Date().toISOString();
+        const effectiveDateTime = (0, measurement_time_1.recordedAtOrNow)(castedMeasurement).toISOString();
         return types_1.URINE_ANALYTE_DEFINITIONS.flatMap((analyte) => {
             const value = castedMeasurement[analyte.key];
             if (value === undefined || value === null || !Number.isFinite(value)) {
@@ -79,7 +78,7 @@ class UricAcidService extends base_observation_service_1.BaseObservationService
                             {
                                 code: analyte.code,
                                 display: analyte.display,
-                                system: "http://loinc.org",
+                                system: fhir_systems_1.LOINC_SYSTEM,
                             },
                         ],
                         text: analyte.display,
@@ -91,7 +90,7 @@ class UricAcidService extends base_observation_service_1.BaseObservationService
                             ...(analyte.unitCode
                                 ? {
                                     code: analyte.unitCode,
-                                    system: "http://unitsofmeasure.org",
+                                    system: fhir_systems_1.UCUM_SYSTEM,
                                 }
                                 : {}),
                         },