@ovok/native 1.16.1-dev.2093 → 1.16.1-dev.2097

package/lib/module/modules/data-sync/services/base-health-sync-service.js.map

@@ -1 +1 @@
-{"version":3,"names":["recordOvokDuration","recordOvokMetric","withOvokSpan","DEFAULT_HEALTH_SYNC_CHUNK_SIZE","toHealthSyncError","getHealthDataMode","isSyncRetryCancelled","withSyncRetries","DataProcessor","StorageManager","SyncProgressManager","SyncStateManager","BaseHealthSyncService","constructor","props","adapter","client","patientId","dataToSync","onSyncError","progressManager","updateProgress","stateManager","storageManager","provider","dataProcessor","chunkSize","getTotalCount","getData","convert","startSync","once","runSync","isInitialized","Error","resume","setNotStartedStatuses","initialDataFetched","initializeSync","processAllDataTypes","setPauseStatuses","pauseReason","error","stopSync","resetAll","reset","shouldStopSync","pauseSync","reason","pause","latestObservationDates","getLatestObservationDates","calculateTotalCounts","key","Object","keys","measurementTypeKey","data","getDataForMeasurementType","latestValidStartDate","getLatestValidStartDate","mode","totalCount","getTotalRecordsCountForType","setTotalObservations","setStatus","syncDataByType","hasMore","observationBodies","observationSyncIds","observationRecordIds","deletedRecordIds","currentHasMore","anchors","getObservationBodiesForType","groups","identifyObservations","observationCount","flat","length","startedAt","Date","now","result","saveObservations","responseEntries","entry","savedCount","filter","response","status","startsWith","createdCount","addResult","incrementSyncedObservations","deleteObservations","saveAnchors"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/services/base-health-sync-service.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["recordOvokDuration","recordOvokMetric","withOvokSpan","DEFAULT_HEALTH_SYNC_CHUNK_SIZE","toHealthSyncError","getHealthDataMode","isSyncRetryCancelled","withSyncRetries","DataProcessor","StorageManager","SyncProgressManager","SyncStateManager","BaseHealthSyncService","constructor","props","adapter","patientId","dataToSync","onSyncError","progressManager","updateProgress","stateManager","storageManager","client","provider","ownerKey","dataProcessor","chunkSize","getTotalCount","getData","convert","startSync","once","runSync","Error","requireOwner","resume","setNotStartedStatuses","initialDataFetched","initializeSync","processAllDataTypes","setPauseStatuses","pauseReason","error","stopSync","resetAll","reset","shouldStopSync","pauseSync","reason","pause","latestObservationDates","getLatestObservationDates","calculateTotalCounts","key","Object","keys","measurementTypeKey","data","getDataForMeasurementType","latestValidStartDate","getLatestValidStartDate","mode","totalCount","getTotalRecordsCountForType","setTotalObservations","setStatus","syncDataByType","hasMore","observationBodies","observationSyncIds","observationRecordIds","deletedRecordIds","currentHasMore","anchors","getObservationBodiesForType","groups","identifyObservations","observationCount","flat","length","startedAt","Date","now","result","saveObservations","responseEntries","entry","savedCount","filter","response","status","startsWith","createdCount","addResult","incrementSyncedObservations","deleteObservations","saveAnchors"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/services/base-health-sync-service.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/data-sync/services/managers/data-processor.js

@@ -2,7 +2,7 @@
 
 /* eslint-disable max-lines */
 
-import { MeasurementTypeKey } from "@ovok/core";
+import { MeasurementTypeKey } from "@ovok/core/next";
 import { getHealthDataMode, HealthDataType } from "../../types/health-sync-keys.js";
 import { getHealthRecordSourceId, getHealthRecordSyncId } from "../../utils/get-health-record-sync-id.js";
 import { getLatestObservationDatesByCode } from "../../utils/get-latest-observation-dates-by-code.js";
@@ -43,7 +43,7 @@ export class DataProcessor {
     const totalCounts = await Promise.all(data.typeIdentifiers?.map(async ({
       typeIdentifier
     }) => {
-      const anchor = this.storageManager.getAnchor(typeIdentifier);
+      const anchor = await this.storageManager.getAnchor(typeIdentifier);
       return this.getTotalCountsFunction({
         typeIdentifier: typeIdentifier,
         startDate: latestValidStartDate?.toISOString(),
@@ -84,7 +84,7 @@ export class DataProcessor {
     const results = await Promise.all(data.typeIdentifiers?.map(async ({
       typeIdentifier
     }) => {
-      const anchor = this.storageManager.getAnchor(typeIdentifier);
+      const anchor = await this.storageManager.getAnchor(typeIdentifier);
       return {
         typeIdentifier,
         result: await this.getDataFromProviderFunction({

package/lib/module/modules/data-sync/services/managers/data-processor.js.map

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","getHealthDataMode","HealthDataType","getHealthRecordSourceId","getHealthRecordSyncId","getLatestObservationDatesByCode","getLatestValidStartDate","groupSamplesByInterval","groupSleepSamples","getHealthDataCoding","identifyImportedObservations","DataProcessor","constructor","client","patientId","provider","chunkSize","storageManager","getTotalCountsFunction","getDataFromProviderFunction","getConverterFunction","extractCodes","dataToSync","entries","Object","flatMap","key","data","typeIdentifiers","map","typeIdentifier","code","String","mode","getLatestObservationDates","codes","getTotalRecordsCountForType","measurementTypeKey","latestValidStartDate","totalCounts","Promise","all","anchor","getAnchor","startDate","toISOString","reduce","acc","count","getObservationBodiesForType","configuredCodings","system","display","catalogCoding","undefined","typeIdentifierCodes","fromEntries","typeIdentifierCodeSystems","typeIdentifierCodeDisplays","results","result","newAnchors","flat","filter","Boolean","allData","deletedRecordIds","dataGroups","sleep","bloodPressure","observationBodies","group","length","observationSyncIds","observationRecordIds","hasMore","some","anchors","identifyObservations","groupedObservationBodies","groupedObservationSyncIds","groupedRecordIds","latestObservationDates","resolvedMode","resolvedData"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/data-processor.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["MeasurementTypeKey","getHealthDataMode","HealthDataType","getHealthRecordSourceId","getHealthRecordSyncId","getLatestObservationDatesByCode","getLatestValidStartDate","groupSamplesByInterval","groupSleepSamples","getHealthDataCoding","identifyImportedObservations","DataProcessor","constructor","client","patientId","provider","chunkSize","storageManager","getTotalCountsFunction","getDataFromProviderFunction","getConverterFunction","extractCodes","dataToSync","entries","Object","flatMap","key","data","typeIdentifiers","map","typeIdentifier","code","String","mode","getLatestObservationDates","codes","getTotalRecordsCountForType","measurementTypeKey","latestValidStartDate","totalCounts","Promise","all","anchor","getAnchor","startDate","toISOString","reduce","acc","count","getObservationBodiesForType","configuredCodings","system","display","catalogCoding","undefined","typeIdentifierCodes","fromEntries","typeIdentifierCodeSystems","typeIdentifierCodeDisplays","results","result","newAnchors","flat","filter","Boolean","allData","deletedRecordIds","dataGroups","sleep","bloodPressure","observationBodies","group","length","observationSyncIds","observationRecordIds","hasMore","some","anchors","identifyObservations","groupedObservationBodies","groupedObservationSyncIds","groupedRecordIds","latestObservationDates","resolvedMode","resolvedData"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/data-processor.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/data-sync/services/managers/instance-manager.js

@@ -5,16 +5,18 @@
 export class InstanceManager {
   static instanceMaps = new Map();
   static MAX_INSTANCES_PER_TYPE = 3;
+  static clientIds = new WeakMap();
+  static nextClientId = 0;
   static getInstanceInternal(serviceTypeName, props, createInstance) {
     if (!this.instanceMaps.has(serviceTypeName)) {
       this.instanceMaps.set(serviceTypeName, new Map());
     }
     const instances = this.instanceMaps.get(serviceTypeName);
     const instanceKey = this.generateInstanceKey(props, serviceTypeName);
-    if (instances.size >= this.MAX_INSTANCES_PER_TYPE) {
-      this.cleanupOldestInstance(instances);
-    }
     if (!instances.has(instanceKey)) {
+      if (instances.size >= this.MAX_INSTANCES_PER_TYPE) {
+        this.cleanupOldestInstance(instances);
+      }
       const newInstance = createInstance();
       instances.set(instanceKey, newInstance);
     }
@@ -23,8 +25,10 @@ export class InstanceManager {
     return existingInstance;
   }
   static generateInstanceKey(props, serviceTypeName) {
-    const clientId = `${props.client.isInitialized}-${JSON.stringify(props.client.clientStorage)}`;
-    return `${serviceTypeName}-${props.patientId}-${JSON.stringify(props.dataToSync)}-${props.chunkSize}-${clientId}`;
+    if (!this.clientIds.has(props.client)) {
+      this.clientIds.set(props.client, ++this.nextClientId);
+    }
+    return `${serviceTypeName}-${props.ownerKey}-${props.patientId}-${JSON.stringify(props.dataToSync)}-${props.chunkSize}-${this.clientIds.get(props.client)}`;
   }
   static cleanupOldestInstance(instances) {
     const [oldestKey] = instances.keys();

package/lib/module/modules/data-sync/services/managers/instance-manager.js.map

@@ -1 +1 @@
-{"version":3,"names":["InstanceManager","instanceMaps","Map","MAX_INSTANCES_PER_TYPE","getInstanceInternal","serviceTypeName","props","createInstance","has","set","instances","get","instanceKey","generateInstanceKey","size","cleanupOldestInstance","newInstance","existingInstance","startSync","clientId","client","isInitialized","JSON","stringify","clientStorage","patientId","dataToSync","chunkSize","oldestKey","keys","instance","stopSync","delete"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/instance-manager.ts"],"mappings":";;AAAA;;AAIA,OAAO,MAAMA,eAAe,CAAC;EAC3B,OAAeC,YAAY,GAAG,IAAIC,GAAG,CAGnC,CAAC;EACH,OAAwBC,sBAAsB,GAAG,CAAC;EAElD,OAAcC,mBAAmBA,CAG/BC,eAAuB,EACvBC,KAA4B,EAC5BC,cAAuB,EACpB;IACH,IAAI,CAAC,IAAI,CAACN,YAAY,CAACO,GAAG,CAACH,eAAe,CAAC,EAAE;MAC3C,IAAI,CAACJ,YAAY,CAACQ,GAAG,CAACJ,eAAe,EAAE,IAAIH,GAAG,CAAC,CAAC,CAAC;IACnD;IAEA,MAAMQ,SAAS,GAAG,IAAI,CAACT,YAAY,CAACU,GAAG,CAACN,eAAe,CAAE;IACzD,MAAMO,WAAW,GAAG,IAAI,CAACC,mBAAmB,CAACP,KAAK,EAAED,eAAe,CAAC;IAEpE,IAAIK,SAAS,CAACI,IAAI,IAAI,IAAI,CAACX,sBAAsB,EAAE;MACjD,IAAI,CAACY,qBAAqB,CAACL,SAAS,CAAC;IACvC;IAEA,IAAI,CAACA,SAAS,CAACF,GAAG,CAACI,WAAW,CAAC,EAAE;MAC/B,MAAMI,WAAW,GAAGT,cAAc,CAAC,CAAC;MAEpCG,SAAS,CAACD,GAAG,CAACG,WAAW,EAAEI,WAAW,CAAC;IACzC;IAEA,MAAMC,gBAAgB,GAAGP,SAAS,CAACC,GAAG,CAACC,WAAW,CAAM;IAExDK,gBAAgB,EAAEC,SAAS,CAAC,CAAC;IAE7B,OAAOD,gBAAgB;EACzB;EAEA,OAAeJ,mBAAmBA,CAChCP,KAA4B,EAC5BD,eAAuB,EACf;IACR,MAAMc,QAAQ,GAAG,GAAGb,KAAK,CAACc,MAAM,CAACC,aAAa,IAAIC,IAAI,CAACC,SAAS,CAACjB,KAAK,CAACc,MAAM,CAACI,aAAa,CAAC,EAAE;IAE9F,OAAO,GAAGnB,eAAe,IAAIC,KAAK,CAACmB,SAAS,IAAIH,IAAI,CAACC,SAAS,CAACjB,KAAK,CAACoB,UAAU,CAAC,IAAIpB,KAAK,CAACqB,SAAS,IAAIR,QAAQ,EAAE;EACnH;EAEA,OAAeJ,qBAAqBA,CAClCL,SAA4D,EAC5D;IACA,MAAM,CAACkB,SAAS,CAAC,GAAGlB,SAAS,CAACmB,IAAI,CAAC,CAAC;IAEpC,IAAI,CAACD,SAAS,EAAE;MACd;IACF;IAEA,MAAME,QAAQ,GAAGpB,SAAS,CAACC,GAAG,CAACiB,SAAS,CAAC;IAEzC,IAAIE,QAAQ,EAAE;MACZA,QAAQ,CAACC,QAAQ,CAAC,CAAC;MACnBrB,SAAS,CAACsB,MAAM,CAACJ,SAAS,CAAC;IAC7B;EACF;AACF","ignoreList":[]}
+{"version":3,"names":["InstanceManager","instanceMaps","Map","MAX_INSTANCES_PER_TYPE","clientIds","WeakMap","nextClientId","getInstanceInternal","serviceTypeName","props","createInstance","has","set","instances","get","instanceKey","generateInstanceKey","size","cleanupOldestInstance","newInstance","existingInstance","startSync","client","ownerKey","patientId","JSON","stringify","dataToSync","chunkSize","oldestKey","keys","instance","stopSync","delete"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/instance-manager.ts"],"mappings":";;AAAA;;AAMA,OAAO,MAAMA,eAAe,CAAC;EAC3B,OAAeC,YAAY,GAAG,IAAIC,GAAG,CAGnC,CAAC;EACH,OAAwBC,sBAAsB,GAAG,CAAC;EAClD,OAAwBC,SAAS,GAAG,IAAIC,OAAO,CAAe,CAAC;EAC/D,OAAeC,YAAY,GAAG,CAAC;EAE/B,OAAcC,mBAAmBA,CAG/BC,eAAuB,EACvBC,KAA4B,EAC5BC,cAAuB,EACpB;IACH,IAAI,CAAC,IAAI,CAACT,YAAY,CAACU,GAAG,CAACH,eAAe,CAAC,EAAE;MAC3C,IAAI,CAACP,YAAY,CAACW,GAAG,CAACJ,eAAe,EAAE,IAAIN,GAAG,CAAC,CAAC,CAAC;IACnD;IAEA,MAAMW,SAAS,GAAG,IAAI,CAACZ,YAAY,CAACa,GAAG,CAACN,eAAe,CAAE;IACzD,MAAMO,WAAW,GAAG,IAAI,CAACC,mBAAmB,CAACP,KAAK,EAAED,eAAe,CAAC;IAEpE,IAAI,CAACK,SAAS,CAACF,GAAG,CAACI,WAAW,CAAC,EAAE;MAC/B,IAAIF,SAAS,CAACI,IAAI,IAAI,IAAI,CAACd,sBAAsB,EAAE;QACjD,IAAI,CAACe,qBAAqB,CAACL,SAAS,CAAC;MACvC;MAEA,MAAMM,WAAW,GAAGT,cAAc,CAAC,CAAC;MAEpCG,SAAS,CAACD,GAAG,CAACG,WAAW,EAAEI,WAAW,CAAC;IACzC;IAEA,MAAMC,gBAAgB,GAAGP,SAAS,CAACC,GAAG,CAACC,WAAW,CAAM;IAExDK,gBAAgB,EAAEC,SAAS,CAAC,CAAC;IAE7B,OAAOD,gBAAgB;EACzB;EAEA,OAAeJ,mBAAmBA,CAChCP,KAA4B,EAC5BD,eAAuB,EACf;IACR,IAAI,CAAC,IAAI,CAACJ,SAAS,CAACO,GAAG,CAACF,KAAK,CAACa,MAAM,CAAC,EAAE;MACrC,IAAI,CAAClB,SAAS,CAACQ,GAAG,CAACH,KAAK,CAACa,MAAM,EAAE,EAAE,IAAI,CAAChB,YAAY,CAAC;IACvD;IAEA,OAAO,GAAGE,eAAe,IAAIC,KAAK,CAACc,QAAQ,IAAId,KAAK,CAACe,SAAS,IAAIC,IAAI,CAACC,SAAS,CAACjB,KAAK,CAACkB,UAAU,CAAC,IAAIlB,KAAK,CAACmB,SAAS,IAAI,IAAI,CAACxB,SAAS,CAACU,GAAG,CAACL,KAAK,CAACa,MAAM,CAAC,EAAE;EAC7J;EAEA,OAAeJ,qBAAqBA,CAClCL,SAA4D,EAC5D;IACA,MAAM,CAACgB,SAAS,CAAC,GAAGhB,SAAS,CAACiB,IAAI,CAAC,CAAC;IAEpC,IAAI,CAACD,SAAS,EAAE;MACd;IACF;IAEA,MAAME,QAAQ,GAAGlB,SAAS,CAACC,GAAG,CAACe,SAAS,CAAC;IAEzC,IAAIE,QAAQ,EAAE;MACZA,QAAQ,CAACC,QAAQ,CAAC,CAAC;MACnBnB,SAAS,CAACoB,MAAM,CAACJ,SAAS,CAAC;IAC7B;EACF;AACF","ignoreList":[]}

package/lib/module/modules/data-sync/services/managers/storage-manager.js

@@ -1,30 +1,22 @@
 "use strict";
 
+import CryptoJS from "crypto-js";
 import { OBSERVATION_SYNC_ID_SYSTEM } from "../../utils/fhir-systems.js";
 import { getHealthRecordIdentifier } from "../../utils/get-health-record-sync-id.js";
 import { replacesSavedObservation } from "../../utils/replaces-saved-observation.js";
+import { healthSyncOwner } from "../../utils/session-owner.js";
 export class StorageManager {
-  /**
-   * Where an anchor goes when the host client has no storage.
-   *
-   * `clientStorage` is assigned from `OvokClient`'s `storage` option and from
-   * nowhere else, so a host that constructs its client without one leaves it
-   * `undefined` — and the `?.` below then swallowed every write while
-   * `getAnchor` answered `undefined` for ever. That is not a lost
-   * optimisation: `getObservationBodiesForType` continues only when a full
-   * provider page includes an anchor, and `syncDataByType` loops while that is
-   * true. A full page without an anchor is the provider's final page, and a
-   * daily aggregate read has no cursor at all.
-   *
-   * The sync must not depend on what the host passed. This map keeps the
-   * anchor for the life of the service instance, which is what lets the loop
-   * end; when the host DOES provide storage the anchor also survives a
-   * restart, which is what keeps the next cold start short.
-   */
-  inMemoryAnchors = new Map();
-  constructor(client, provider) {
+  constructor(client, provider, ownerKey, patientId) {
     this.client = client;
     this.provider = provider;
+    this.ownerKey = ownerKey;
+    this.patientId = patientId;
+  }
+  async requireOwner(patientId) {
+    const owner = healthSyncOwner(this.client, await this.client.session.current());
+    if (!owner || owner.patientId !== patientId || owner.ownerKey !== this.ownerKey) {
+      throw new Error("Health sync session changed");
+    }
   }
 
   /**
@@ -33,7 +25,8 @@ export class StorageManager {
    * out of that check: all of a reading's observations share it.
    */
   async saveObservations(groups, mode) {
-    return this.client.saveObservationGroups(groups, {
+    await this.requireOwner(this.patientId);
+    return this.client.measurements.saveObservationGroups(groups, {
       identifierSystems: [OBSERVATION_SYNC_ID_SYSTEM],
       replace: replacesSavedObservation(mode)
     });
@@ -41,43 +34,46 @@ export class StorageManager {
 
   /** Deletes the observations imported from records the provider reports deleted. */
   async deleteObservations(recordIds, patientId) {
+    await this.requireOwner(patientId);
     for (const recordId of new Set(recordIds)) {
       const {
         system,
         value
       } = getHealthRecordIdentifier(this.provider, recordId);
       const observations = [];
-      for await (const page of this.client.searchResourcePages("Observation", {
+      for await (const observation of this.client.fhir.search("Observation", {
         subject: `Patient/${patientId}`,
         identifier: `${system}|${value}`
       })) {
-        observations.push(...page);
+        observations.push(observation);
+      }
+      for (const observation of observations) {
+        if (observation.id) {
+          await this.requireOwner(patientId);
+          await this.client.fhir.delete("Observation", observation.id);
+        }
       }
-      await Promise.all(observations.filter(observation => observation.id).map(observation => this.client.deleteResource("Observation", observation.id)));
     }
   }
-  saveAnchor(typeIdentifier, anchor) {
-    const key = this.anchorKey(typeIdentifier);
-    if (this.client.clientStorage) {
-      this.client.clientStorage.setString(key, anchor);
-      return;
-    }
-    this.inMemoryAnchors.set(key, anchor);
+  async saveAnchor(typeIdentifier, anchor) {
+    await this.requireOwner(this.patientId);
+    await this.client.storage.setItem(this.anchorKey(typeIdentifier), anchor);
   }
-  getAnchor(typeIdentifier) {
-    const key = this.anchorKey(typeIdentifier);
-    return this.client.clientStorage ? this.client.clientStorage.getString(key) : this.inMemoryAnchors.get(key);
+  async getAnchor(typeIdentifier) {
+    await this.requireOwner(this.patientId);
+    return (await this.client.storage.getItem(this.anchorKey(typeIdentifier))) ?? undefined;
   }
   anchorKey(typeIdentifier) {
-    return `${this.provider}-sync-${typeIdentifier}-anchor`;
+    const identity = CryptoJS.SHA256(JSON.stringify([this.ownerKey, this.provider, typeIdentifier])).toString();
+    return `health-sync.${identity}`;
   }
-  saveAnchors(anchors) {
-    anchors.forEach(({
+  async saveAnchors(anchors) {
+    for (const {
       typeIdentifier,
       anchor
-    }) => {
-      this.saveAnchor(typeIdentifier, anchor);
-    });
+    } of anchors) {
+      await this.saveAnchor(typeIdentifier, anchor);
+    }
   }
 }
 //# sourceMappingURL=storage-manager.js.map

package/lib/module/modules/data-sync/services/managers/storage-manager.js.map

@@ -1 +1 @@
-{"version":3,"names":["OBSERVATION_SYNC_ID_SYSTEM","getHealthRecordIdentifier","replacesSavedObservation","StorageManager","inMemoryAnchors","Map","constructor","client","provider","saveObservations","groups","mode","saveObservationGroups","identifierSystems","replace","deleteObservations","recordIds","patientId","recordId","Set","system","value","observations","page","searchResourcePages","subject","identifier","push","Promise","all","filter","observation","id","map","deleteResource","saveAnchor","typeIdentifier","anchor","key","anchorKey","clientStorage","setString","set","getAnchor","getString","get","saveAnchors","anchors","forEach"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/storage-manager.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["CryptoJS","OBSERVATION_SYNC_ID_SYSTEM","getHealthRecordIdentifier","replacesSavedObservation","healthSyncOwner","StorageManager","constructor","client","provider","ownerKey","patientId","requireOwner","owner","session","current","Error","saveObservations","groups","mode","measurements","saveObservationGroups","identifierSystems","replace","deleteObservations","recordIds","recordId","Set","system","value","observations","observation","fhir","search","subject","identifier","push","id","delete","saveAnchor","typeIdentifier","anchor","storage","setItem","anchorKey","getAnchor","getItem","undefined","identity","SHA256","JSON","stringify","toString","saveAnchors","anchors"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/storage-manager.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/data-sync/services/managers/sync-state-manager.js.map

@@ -1 +1 @@
-{"version":3,"names":["SyncStateManager","rerunRequested","shouldStopSync","initialDataFetched","latestObservationDates","results","addResult","result","push","once","sync","inFlight","finally","undefined","reset","pauseReason","pause","reason","resume"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/sync-state-manager.ts"],"mappings":";;AAIA,OAAO,MAAMA,gBAAgB,CAAC;EAC5B;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;EAEUC,cAAc,GAAG,KAAK;EAEvBC,cAAc,GAAG,KAAK;EAEtBC,kBAAkB,GAAG,KAAK;EAC1BC,sBAAsB,GAGxB,EAAE;EACAC,OAAO,GAA0B,EAAE;EAE1CC,SAASA,CAACC,MAA2B,EAAQ;IAC3C,IAAI,CAACF,OAAO,CAACG,IAAI,CAACD,MAAM,CAAC;EAC3B;;EAEA;EACA,MAAME,IAAIA,CAACC,IAAyB,EAAiB;IACnD,IAAI,IAAI,CAACC,QAAQ,EAAE;MACjB,IAAI,IAAI,CAACT,cAAc,EAAE;QACvB,IAAI,CAACD,cAAc,GAAG,IAAI;MAC5B;MAEA,MAAMU,QAAQ,GAAG,IAAI,CAACA,QAAQ;MAE9B,MAAMA,QAAQ;MAEd,IAAI,IAAI,CAACV,cAAc,IAAI,CAAC,IAAI,CAACU,QAAQ,EAAE;QACzC,IAAI,CAACV,cAAc,GAAG,KAAK;QAE3B,OAAO,IAAI,CAACQ,IAAI,CAACC,IAAI,CAAC;MACxB;MAEA;IACF;IAEA,IAAI,CAACC,QAAQ,GAAGD,IAAI,CAAC,CAAC,CAACE,OAAO,CAAC,MAAM;MACnC,IAAI,CAACD,QAAQ,GAAGE,SAAS;IAC3B,CAAC,CAAC;IAEF,OAAO,IAAI,CAACF,QAAQ;EACtB;EAEAG,KAAKA,CAAA,EAAS;IACZ,IAAI,CAACZ,cAAc,GAAG,KAAK;IAC3B,IAAI,CAACa,WAAW,GAAGF,SAAS;IAC5B,IAAI,CAACV,kBAAkB,GAAG,KAAK;IAC/B,IAAI,CAACC,sBAAsB,GAAG,EAAE;IAChC,IAAI,CAACC,OAAO,GAAG,EAAE;IACjB,IAAI,CAACJ,cAAc,GAAG,KAAK;EAC7B;EAEAe,KAAKA,CAACC,MAAwB,EAAQ;IACpC,IAAI,CAACf,cAAc,GAAG,IAAI;IAC1B,IAAI,CAACa,WAAW,GAAGE,MAAM;EAC3B;EAEAC,MAAMA,CAAA,EAAS;IACb,IAAI,CAAChB,cAAc,GAAG,KAAK;IAC3B,IAAI,CAACa,WAAW,GAAGF,SAAS;EAC9B;AACF","ignoreList":[]}
+{"version":3,"names":["SyncStateManager","rerunRequested","shouldStopSync","initialDataFetched","latestObservationDates","results","addResult","result","push","once","sync","inFlight","finally","undefined","reset","pauseReason","pause","reason","resume"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/sync-state-manager.ts"],"mappings":";;AAIA,OAAO,MAAMA,gBAAgB,CAAC;EAC5B;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;EAEUC,cAAc,GAAG,KAAK;EAEvBC,cAAc,GAAG,KAAK;EAEtBC,kBAAkB,GAAG,KAAK;EAC1BC,sBAAsB,GAGxB,EAAE;EACAC,OAAO,GAAa,EAAE;EAE7BC,SAASA,CAACC,MAAc,EAAQ;IAC9B,IAAI,CAACF,OAAO,CAACG,IAAI,CAACD,MAAM,CAAC;EAC3B;;EAEA;EACA,MAAME,IAAIA,CAACC,IAAyB,EAAiB;IACnD,IAAI,IAAI,CAACC,QAAQ,EAAE;MACjB,IAAI,IAAI,CAACT,cAAc,EAAE;QACvB,IAAI,CAACD,cAAc,GAAG,IAAI;MAC5B;MAEA,MAAMU,QAAQ,GAAG,IAAI,CAACA,QAAQ;MAE9B,MAAMA,QAAQ;MAEd,IAAI,IAAI,CAACV,cAAc,IAAI,CAAC,IAAI,CAACU,QAAQ,EAAE;QACzC,IAAI,CAACV,cAAc,GAAG,KAAK;QAE3B,OAAO,IAAI,CAACQ,IAAI,CAACC,IAAI,CAAC;MACxB;MAEA;IACF;IAEA,IAAI,CAACC,QAAQ,GAAGD,IAAI,CAAC,CAAC,CAACE,OAAO,CAAC,MAAM;MACnC,IAAI,CAACD,QAAQ,GAAGE,SAAS;IAC3B,CAAC,CAAC;IAEF,OAAO,IAAI,CAACF,QAAQ;EACtB;EAEAG,KAAKA,CAAA,EAAS;IACZ,IAAI,CAACZ,cAAc,GAAG,KAAK;IAC3B,IAAI,CAACa,WAAW,GAAGF,SAAS;IAC5B,IAAI,CAACV,kBAAkB,GAAG,KAAK;IAC/B,IAAI,CAACC,sBAAsB,GAAG,EAAE;IAChC,IAAI,CAACC,OAAO,GAAG,EAAE;IACjB,IAAI,CAACJ,cAAc,GAAG,KAAK;EAC7B;EAEAe,KAAKA,CAACC,MAAwB,EAAQ;IACpC,IAAI,CAACf,cAAc,GAAG,IAAI;IAC1B,IAAI,CAACa,WAAW,GAAGE,MAAM;EAC3B;EAEAC,MAAMA,CAAA,EAAS;IACb,IAAI,CAAChB,cAAc,GAAG,KAAK;IAC3B,IAAI,CAACa,WAAW,GAAGF,SAAS;EAC9B;AACF","ignoreList":[]}

package/lib/module/modules/data-sync/types/health-sync-keys.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { MeasurementTypeKey } from "@ovok/core";
+import { MeasurementTypeKey } from "@ovok/core/next";
 /** Health data that is not represented by a core measurement service. */
 var HealthDataType = /*#__PURE__*/function (HealthDataType) {
   HealthDataType["height"] = "height";

package/lib/module/modules/data-sync/types/health-sync-keys.js.map

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","HealthDataType","getHealthDataMode","key","configuredMode","stepCount","distance","activeEnergy","flightsClimbed","exerciseMinutes","heartRate","heartRateSummary","sleep","workout"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/types/health-sync-keys.ts"],"mappings":";;AAAA,SAASA,kBAAkB,QAAQ,YAAY;AAO/C;AAAA,IACKC,cAAc,0BAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA,EAAdA,cAAc;AAyBnB,MAAMC,iBAAiB,GAAGA,CACxBC,GAAkB,EAClBC,cAA+B,KACZ;EACnB,IAAIA,cAAc,EAAE;IAClB,OAAOA,cAAc;EACvB;EAEA,QAAQD,GAAG;IACT,KAAKH,kBAAkB,CAACK,SAAS;IACjC,KAAKJ,cAAc,CAACK,QAAQ;IAC5B,KAAKL,cAAc,CAACM,YAAY;IAChC,KAAKN,cAAc,CAACO,cAAc;IAClC,KAAKP,cAAc,CAACQ,eAAe;MACjC,OAAO,aAAa;IACtB,KAAKT,kBAAkB,CAACU,SAAS;IACjC,KAAKT,cAAc,CAACU,gBAAgB;MAClC,OAAO,eAAe;IACxB,KAAKV,cAAc,CAACW,KAAK;IACzB,KAAKX,cAAc,CAACY,OAAO;MACzB,OAAO,SAAS;IAClB;MACE,OAAO,OAAO;EAClB;AACF,CAAC;AAED,SACEZ,cAAc,EACdC,iBAAiB","ignoreList":[]}
+{"version":3,"names":["MeasurementTypeKey","HealthDataType","getHealthDataMode","key","configuredMode","stepCount","distance","activeEnergy","flightsClimbed","exerciseMinutes","heartRate","heartRateSummary","sleep","workout"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/types/health-sync-keys.ts"],"mappings":";;AAAA,SAASA,kBAAkB,QAAQ,iBAAiB;AAOpD;AAAA,IACKC,cAAc,0BAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA,EAAdA,cAAc;AAyBnB,MAAMC,iBAAiB,GAAGA,CACxBC,GAAkB,EAClBC,cAA+B,KACZ;EACnB,IAAIA,cAAc,EAAE;IAClB,OAAOA,cAAc;EACvB;EAEA,QAAQD,GAAG;IACT,KAAKH,kBAAkB,CAACK,SAAS;IACjC,KAAKJ,cAAc,CAACK,QAAQ;IAC5B,KAAKL,cAAc,CAACM,YAAY;IAChC,KAAKN,cAAc,CAACO,cAAc;IAClC,KAAKP,cAAc,CAACQ,eAAe;MACjC,OAAO,aAAa;IACtB,KAAKT,kBAAkB,CAACU,SAAS;IACjC,KAAKT,cAAc,CAACU,gBAAgB;MAClC,OAAO,eAAe;IACxB,KAAKV,cAAc,CAACW,KAAK;IACzB,KAAKX,cAAc,CAACY,OAAO;MACzB,OAAO,SAAS;IAClB;MACE,OAAO,OAAO;EAClB;AACF,CAAC;AAED,SACEZ,cAAc,EACdC,iBAAiB","ignoreList":[]}

package/lib/module/modules/data-sync/utils/convert-records-to-observation.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { ObservationServiceCreator } from "@ovok/core";
+import { ObservationServiceCreator } from "@ovok/core/dist/client/observation/services/creator";
 import { convertGenericHealthDataToObservation } from "./convert-generic-health-data.js";
 import { getHealthObservationDevice } from "./health-observation-device.js";
 import { hasConfiguredNonLoincCoding } from "./normalize-core-health-observation.js";
@@ -40,7 +40,7 @@ export const convertRecordsToObservation = async props => {
   if (!measurement) {
     return [];
   }
-  const observationBody = await client.generateObservationBodiesByMeasurement({
+  const observationBody = await client.measurements.build({
     measurement
   });
   const typedRecordTiming = record;

package/lib/module/modules/data-sync/utils/convert-records-to-observation.js.map

@@ -1 +1 @@
-{"version":3,"names":["ObservationServiceCreator","convertGenericHealthDataToObservation","getHealthObservationDevice","hasConfiguredNonLoincCoding","isCoreMeasurementTypeKey","toCoreHealthObservations","convertRecordsToObservation","props","data","client","measurementTypeKey","mode","record","service","getInstance","getService","typedRecord","measurement","convertRecordToMeasurement","observationBody","generateObservationBodiesByMeasurement","typedRecordTiming","device","manufacturer","metadata","model","sourceApp","dataOrigin","recordingMethod","timing","time","undefined","point","start","startTime","end","endTime"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/convert-records-to-observation.ts"],"mappings":";;AACA,SAASA,yBAAyB,QAAQ,YAAY;AAKtD,SAASC,qCAAqC,QAAQ,kCAA+B;AACrF,SAASC,0BAA0B,QAAQ,gCAA6B;AACxE,SAASC,2BAA2B,QAAQ,wCAAqC;AACjF,SACEC,wBAAwB,EACxBC,wBAAwB,QACnB,kCAA+B;AAEtC,OAAO,MAAMC,2BAA2B,GAAG,MACzCC,KAAgC,IACL;EAC3B,MAAM;IAAEC,IAAI;IAAEC,MAAM;IAAEC,kBAAkB;IAAEC,IAAI,GAAG;EAAQ,CAAC,GAAGJ,KAAK;EAElE,IAAII,IAAI,KAAK,OAAO,EAAE;IACpB,OAAOV,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,MAAMC,MAAM,GAAGJ,IAAI,CAAC,CAAC,CAAC;EAEtB,IAAI,CAACI,MAAM,EAAE;IACX,OAAO,EAAE;EACX;EAEA,IAAIT,2BAA2B,CAACI,KAAK,CAAC,EAAE;IACtC,OAAON,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,IAAI,CAACP,wBAAwB,CAACM,kBAAkB,CAAC,EAAE;IACjD,OAAOT,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,MAAME,OAAO,GAAGb,yBAAyB,CAACc,WAAW,CAAC,CAAC,CAACC,UAAU,CAChEL,kBACF,CAAC;EAED,MAAMM,WAAW,GAAGJ,MAAkC;EACtD,MAAMK,WAAW,GAAGJ,OAAO,EAAEK,0BAA0B,GAAGF,WAAW,CAAC;EAEtE,IAAI,CAACC,WAAW,EAAE;IAChB,OAAO,EAAE;EACX;EAEA,MAAME,eAAe,GAAG,MAAMV,MAAM,CAACW,sCAAsC,CAAC;IAC1EH;EACF,CAAC,CAAC;EAEF,MAAMI,iBAAiB,GAAGT,MAIzB;EAED,MAAMU,MAAM,GAAGpB,0BAA0B,CAAC;IACxCqB,YAAY,EAAEP,WAAW,CAACQ,QAAQ,EAAEF,MAAM,EAAEC,YAAY;IACxDE,KAAK,EAAET,WAAW,CAACQ,QAAQ,EAAEF,MAAM,EAAEG,KAAK;IAC1CC,SAAS,EAAEV,WAAW,CAACQ,QAAQ,EAAEG,UAAU;IAC3CC,eAAe,EAAEZ,WAAW,CAACQ,QAAQ,EAAEI;EACzC,CAAC,CAAC;EAEF,MAAMC,MAAM,GACVR,iBAAiB,CAACS,IAAI,KAAKC,SAAS,GAChC;IAAEC,KAAK,EAAEX,iBAAiB,CAACS;EAAK,CAAC,GACjC;IAAEG,KAAK,EAAEZ,iBAAiB,CAACa,SAAS;IAAEC,GAAG,EAAEd,iBAAiB,CAACe;EAAQ,CAAC;EAE5E,OAAO/B,wBAAwB,CAACc,eAAe,EAAEZ,KAAK,EAAE,OAAO;IAAEe,MAAM;IAAEO;EAAO,CAAC,CAAC,CAAC;AACrF,CAAC","ignoreList":[]}
+{"version":3,"names":["ObservationServiceCreator","convertGenericHealthDataToObservation","getHealthObservationDevice","hasConfiguredNonLoincCoding","isCoreMeasurementTypeKey","toCoreHealthObservations","convertRecordsToObservation","props","data","client","measurementTypeKey","mode","record","service","getInstance","getService","typedRecord","measurement","convertRecordToMeasurement","observationBody","measurements","build","typedRecordTiming","device","manufacturer","metadata","model","sourceApp","dataOrigin","recordingMethod","timing","time","undefined","point","start","startTime","end","endTime"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/convert-records-to-observation.ts"],"mappings":";;AACA,SAASA,yBAAyB,QAAQ,qDAAqD;AAK/F,SAASC,qCAAqC,QAAQ,kCAA+B;AACrF,SAASC,0BAA0B,QAAQ,gCAA6B;AACxE,SAASC,2BAA2B,QAAQ,wCAAqC;AACjF,SACEC,wBAAwB,EACxBC,wBAAwB,QACnB,kCAA+B;AAEtC,OAAO,MAAMC,2BAA2B,GAAG,MACzCC,KAAgC,IACL;EAC3B,MAAM;IAAEC,IAAI;IAAEC,MAAM;IAAEC,kBAAkB;IAAEC,IAAI,GAAG;EAAQ,CAAC,GAAGJ,KAAK;EAElE,IAAII,IAAI,KAAK,OAAO,EAAE;IACpB,OAAOV,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,MAAMC,MAAM,GAAGJ,IAAI,CAAC,CAAC,CAAC;EAEtB,IAAI,CAACI,MAAM,EAAE;IACX,OAAO,EAAE;EACX;EAEA,IAAIT,2BAA2B,CAACI,KAAK,CAAC,EAAE;IACtC,OAAON,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,IAAI,CAACP,wBAAwB,CAACM,kBAAkB,CAAC,EAAE;IACjD,OAAOT,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,MAAME,OAAO,GAAGb,yBAAyB,CAACc,WAAW,CAAC,CAAC,CAACC,UAAU,CAChEL,kBACF,CAAC;EAED,MAAMM,WAAW,GAAGJ,MAAkC;EACtD,MAAMK,WAAW,GAAGJ,OAAO,EAAEK,0BAA0B,GAAGF,WAAW,CAAC;EAEtE,IAAI,CAACC,WAAW,EAAE;IAChB,OAAO,EAAE;EACX;EAEA,MAAME,eAAe,GAAG,MAAMV,MAAM,CAACW,YAAY,CAACC,KAAK,CAAC;IACtDJ;EACF,CAAC,CAAC;EAEF,MAAMK,iBAAiB,GAAGV,MAIzB;EAED,MAAMW,MAAM,GAAGrB,0BAA0B,CAAC;IACxCsB,YAAY,EAAER,WAAW,CAACS,QAAQ,EAAEF,MAAM,EAAEC,YAAY;IACxDE,KAAK,EAAEV,WAAW,CAACS,QAAQ,EAAEF,MAAM,EAAEG,KAAK;IAC1CC,SAAS,EAAEX,WAAW,CAACS,QAAQ,EAAEG,UAAU;IAC3CC,eAAe,EAAEb,WAAW,CAACS,QAAQ,EAAEI;EACzC,CAAC,CAAC;EAEF,MAAMC,MAAM,GACVR,iBAAiB,CAACS,IAAI,KAAKC,SAAS,GAChC;IAAEC,KAAK,EAAEX,iBAAiB,CAACS;EAAK,CAAC,GACjC;IAAEG,KAAK,EAAEZ,iBAAiB,CAACa,SAAS;IAAEC,GAAG,EAAEd,iBAAiB,CAACe;EAAQ,CAAC;EAE5E,OAAOhC,wBAAwB,CAACc,eAAe,EAAEZ,KAAK,EAAE,OAAO;IAAEgB,MAAM;IAAEO;EAAO,CAAC,CAAC,CAAC;AACrF,CAAC","ignoreList":[]}

package/lib/module/modules/data-sync/utils/convert-samples-to-observation.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { ObservationServiceCreator } from "@ovok/core";
+import { ObservationServiceCreator } from "@ovok/core/dist/client/observation/services/creator";
 import { convertGenericHealthDataToObservation } from "./convert-generic-health-data.js";
 import { getHealthObservationDevice } from "./health-observation-device.js";
 import { hasConfiguredNonLoincCoding } from "./normalize-core-health-observation.js";
@@ -38,7 +38,7 @@ export const convertSamplesToObservation = async props => {
   if (!measurement) {
     return [];
   }
-  const observationBody = await client.generateObservationBodiesByMeasurement({
+  const observationBody = await client.measurements.build({
     measurement
   });
   return toCoreHealthObservations(observationBody, props, index => {

package/lib/module/modules/data-sync/utils/convert-samples-to-observation.js.map

@@ -1 +1 @@
-{"version":3,"names":["ObservationServiceCreator","convertGenericHealthDataToObservation","getHealthObservationDevice","hasConfiguredNonLoincCoding","isCoreMeasurementTypeKey","toCoreHealthObservations","convertSamplesToObservation","props","data","client","measurementTypeKey","mode","length","service","getInstance","getService","measurement","convertSamplesToMeasurement","observationBody","generateObservationBodiesByMeasurement","index","sample","device","manufacturer","model","sourceApp","sourceRevision","source","name","undefined","timing","start","startDate","end","endDate"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/convert-samples-to-observation.ts"],"mappings":";;AAKA,SAASA,yBAAyB,QAAgB,YAAY;AAI9D,SAASC,qCAAqC,QAAQ,kCAA+B;AACrF,SAASC,0BAA0B,QAAQ,gCAA6B;AACxE,SAASC,2BAA2B,QAAQ,wCAAqC;AACjF,SACEC,wBAAwB,EACxBC,wBAAwB,QACnB,kCAA+B;AAEtC,OAAO,MAAMC,2BAA2B,GAAG,MACzCC,KAAgC,IACL;EAC3B,MAAM;IAAEC,IAAI;IAAEC,MAAM;IAAEC,kBAAkB;IAAEC,IAAI,GAAG;EAAQ,CAAC,GAAGJ,KAAK;EAElE,IAAII,IAAI,KAAK,OAAO,EAAE;IACpB,OAAOV,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,IAAIH,IAAI,CAACI,MAAM,KAAK,CAAC,EAAE;IACrB,OAAO,EAAE;EACX;EAEA,IAAIT,2BAA2B,CAACI,KAAK,CAAC,EAAE;IACtC,OAAON,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,IAAI,CAACP,wBAAwB,CAACM,kBAAkB,CAAC,EAAE;IACjD,OAAOT,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,MAAME,OAAO,GAAGb,yBAAyB,CAACc,WAAW,CAAC,CAAC,CAACC,UAAU,CAChEL,kBACF,CAAC;EAED,MAAMM,WAAW,GAAGH,OAAO,CAACI,2BAA2B,CACrDT,IACF,CAAC;EAED,IAAI,CAACQ,WAAW,EAAE;IAChB,OAAO,EAAE;EACX;EAEA,MAAME,eAAe,GAAG,MAAMT,MAAM,CAACU,sCAAsC,CAAC;IAC1EH;EACF,CAAC,CAAC;EAEF,OAAOX,wBAAwB,CAACa,eAAe,EAAEX,KAAK,EAAGa,KAAK,IAAK;IACjE,MAAMC,MAAM,GAAGb,IAAI,GAAGY,KAAK,CAA2D;IAEtF,OAAO;MACLE,MAAM,EAAED,MAAM,GACVnB,0BAA0B,CAAC;QACzBqB,YAAY,EAAEF,MAAM,CAACC,MAAM,EAAEC,YAAY;QACzCC,KAAK,EAAEH,MAAM,CAACC,MAAM,EAAEE,KAAK;QAC3BC,SAAS,EAAEJ,MAAM,CAACK,cAAc,EAAEC,MAAM,EAAEC;MAC5C,CAAC,CAAC,GACFC,SAAS;MACbC,MAAM,EAAE;QAAEC,KAAK,EAAEV,MAAM,EAAEW,SAAS;QAAEC,GAAG,EAAEZ,MAAM,EAAEa;MAAQ;IAC3D,CAAC;EACH,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["ObservationServiceCreator","convertGenericHealthDataToObservation","getHealthObservationDevice","hasConfiguredNonLoincCoding","isCoreMeasurementTypeKey","toCoreHealthObservations","convertSamplesToObservation","props","data","client","measurementTypeKey","mode","length","service","getInstance","getService","measurement","convertSamplesToMeasurement","observationBody","measurements","build","index","sample","device","manufacturer","model","sourceApp","sourceRevision","source","name","undefined","timing","start","startDate","end","endDate"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/convert-samples-to-observation.ts"],"mappings":";;AAKA,SAASA,yBAAyB,QAAQ,qDAAqD;AAM/F,SAASC,qCAAqC,QAAQ,kCAA+B;AACrF,SAASC,0BAA0B,QAAQ,gCAA6B;AACxE,SAASC,2BAA2B,QAAQ,wCAAqC;AACjF,SACEC,wBAAwB,EACxBC,wBAAwB,QACnB,kCAA+B;AAEtC,OAAO,MAAMC,2BAA2B,GAAG,MACzCC,KAAgC,IACL;EAC3B,MAAM;IAAEC,IAAI;IAAEC,MAAM;IAAEC,kBAAkB;IAAEC,IAAI,GAAG;EAAQ,CAAC,GAAGJ,KAAK;EAElE,IAAII,IAAI,KAAK,OAAO,EAAE;IACpB,OAAOV,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,IAAIH,IAAI,CAACI,MAAM,KAAK,CAAC,EAAE;IACrB,OAAO,EAAE;EACX;EAEA,IAAIT,2BAA2B,CAACI,KAAK,CAAC,EAAE;IACtC,OAAON,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,IAAI,CAACP,wBAAwB,CAACM,kBAAkB,CAAC,EAAE;IACjD,OAAOT,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,MAAME,OAAO,GAAGb,yBAAyB,CAACc,WAAW,CAAC,CAAC,CAACC,UAAU,CAChEL,kBACF,CAAC;EAED,MAAMM,WAAW,GAAGH,OAAO,CAACI,2BAA2B,CACrDT,IACF,CAAC;EAED,IAAI,CAACQ,WAAW,EAAE;IAChB,OAAO,EAAE;EACX;EAEA,MAAME,eAAe,GAAG,MAAMT,MAAM,CAACU,YAAY,CAACC,KAAK,CAAC;IACtDJ;EACF,CAAC,CAAC;EAEF,OAAOX,wBAAwB,CAACa,eAAe,EAAEX,KAAK,EAAGc,KAAK,IAAK;IACjE,MAAMC,MAAM,GAAGd,IAAI,GAAGa,KAAK,CAA2D;IAEtF,OAAO;MACLE,MAAM,EAAED,MAAM,GACVpB,0BAA0B,CAAC;QACzBsB,YAAY,EAAEF,MAAM,CAACC,MAAM,EAAEC,YAAY;QACzCC,KAAK,EAAEH,MAAM,CAACC,MAAM,EAAEE,KAAK;QAC3BC,SAAS,EAAEJ,MAAM,CAACK,cAAc,EAAEC,MAAM,EAAEC;MAC5C,CAAC,CAAC,GACFC,SAAS;MACbC,MAAM,EAAE;QAAEC,KAAK,EAAEV,MAAM,EAAEW,SAAS;QAAEC,GAAG,EAAEZ,MAAM,EAAEa;MAAQ;IAC3D,CAAC;EACH,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}

package/lib/module/modules/data-sync/utils/get-latest-observation-dates-by-code.js

@@ -23,7 +23,7 @@ export const getLatestObservationDatesByCode = async ({
   provider
 }) => {
   const entries = codes.map(code => generateObservationSearchEntry(code, patientId, provider));
-  const bundle = await client.executeBatch({
+  const bundle = await client.fhir.batch({
     resourceType: "Bundle",
     type: "batch",
     entry: entries

package/lib/module/modules/data-sync/utils/get-latest-observation-dates-by-code.js.map

@@ -1 +1 @@
-{"version":3,"names":["OBSERVATION_SYNC_PROVIDER_SYSTEM","generateObservationSearchEntry","code","patientId","provider","searchParams","URLSearchParams","set","encodeURIComponent","request","method","url","toString","getLatestObservationDatesByCode","codes","client","entries","map","bundle","executeBatch","resourceType","type","entry","idx","observationResource","resource","observation","date","effectivePeriod","end","effectiveDateTime"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/get-latest-observation-dates-by-code.ts"],"mappings":";;AAKA,SAASA,gCAAgC,QAAQ,mBAAgB;AAEjE,MAAMC,8BAA8B,GAAGA,CACrCC,IAAY,EACZC,SAAiB,EACjBC,QAAgB,KACA;EAChB,MAAMC,YAAY,GAAG,IAAIC,eAAe,CAAC,CAAC;EAE1CD,YAAY,CAACE,GAAG,CAAC,MAAM,EAAEL,IAAI,CAAC;EAC9BG,YAAY,CAACE,GAAG,CACd,YAAY,EACZ,GAAGP,gCAAgC,IAAII,QAAQ,EACjD,CAAC;EACDC,YAAY,CAACE,GAAG,CAAC,SAAS,EAAE,WAAWC,kBAAkB,CAACL,SAAS,CAAC,EAAE,CAAC;EACvEE,YAAY,CAACE,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC;EAC1CF,YAAY,CAACE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC;EAClCF,YAAY,CAACE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC;EAE/B,OAAO;IACLE,OAAO,EAAE;MACPC,MAAM,EAAE,KAAK;MACbC,GAAG,EAAE,eAAeN,YAAY,CAACO,QAAQ,CAAC,CAAC;IAC7C;EACF,CAAC;AACH,CAAC;AASD,OAAO,MAAMC,+BAA+B,GAAG,MAAAA,CAAO;EACpDC,KAAK;EACLX,SAAS;EACTY,MAAM;EACNX;AACoC,CAAC,KAAK;EAC1C,MAAMY,OAAO,GAAGF,KAAK,CAACG,GAAG,CAAEf,IAAI,IAC7BD,8BAA8B,CAACC,IAAI,EAAEC,SAAS,EAAEC,QAAQ,CAC1D,CAAC;EAED,MAAMc,MAAM,GAAG,MAAMH,MAAM,CAACI,YAAY,CAAC;IACvCC,YAAY,EAAE,QAAQ;IACtBC,IAAI,EAAE,OAAO;IACbC,KAAK,EAAEN;EACT,CAAC,CAAC;EAEF,OAAO,CAACE,MAAM,CAACI,KAAK,IAAI,EAAE,EAAEL,GAAG,CAAC,CAACK,KAAK,EAAEC,GAAG,KAAK;IAC9C,MAAMC,mBAAmB,GAAGF,KAAK,CAACG,QAAkB;IAEpD,MAAMC,WAAW,GAAGF,mBAAmB,EAAEF,KAAK,GAAG,CAAC,CAAC,EAAEG,QAExC;IAEb,MAAME,IAAI,GACRD,WAAW,EAAEE,eAAe,EAAEC,GAAG,IAAIH,WAAW,EAAEI,iBAAiB;IAErE,OAAO;MACL5B,IAAI,EAAEY,KAAK,CAACS,GAAG,CAAC;MAChBI,IAAI,EAAEA;IACR,CAAC;EACH,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["OBSERVATION_SYNC_PROVIDER_SYSTEM","generateObservationSearchEntry","code","patientId","provider","searchParams","URLSearchParams","set","encodeURIComponent","request","method","url","toString","getLatestObservationDatesByCode","codes","client","entries","map","bundle","fhir","batch","resourceType","type","entry","idx","observationResource","resource","observation","date","effectivePeriod","end","effectiveDateTime"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/get-latest-observation-dates-by-code.ts"],"mappings":";;AAMA,SAASA,gCAAgC,QAAQ,mBAAgB;AAEjE,MAAMC,8BAA8B,GAAGA,CACrCC,IAAY,EACZC,SAAiB,EACjBC,QAAgB,KACA;EAChB,MAAMC,YAAY,GAAG,IAAIC,eAAe,CAAC,CAAC;EAE1CD,YAAY,CAACE,GAAG,CAAC,MAAM,EAAEL,IAAI,CAAC;EAC9BG,YAAY,CAACE,GAAG,CACd,YAAY,EACZ,GAAGP,gCAAgC,IAAII,QAAQ,EACjD,CAAC;EACDC,YAAY,CAACE,GAAG,CAAC,SAAS,EAAE,WAAWC,kBAAkB,CAACL,SAAS,CAAC,EAAE,CAAC;EACvEE,YAAY,CAACE,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC;EAC1CF,YAAY,CAACE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC;EAClCF,YAAY,CAACE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC;EAE/B,OAAO;IACLE,OAAO,EAAE;MACPC,MAAM,EAAE,KAAK;MACbC,GAAG,EAAE,eAAeN,YAAY,CAACO,QAAQ,CAAC,CAAC;IAC7C;EACF,CAAC;AACH,CAAC;AASD,OAAO,MAAMC,+BAA+B,GAAG,MAAAA,CAAO;EACpDC,KAAK;EACLX,SAAS;EACTY,MAAM;EACNX;AACoC,CAAC,KAAK;EAC1C,MAAMY,OAAO,GAAGF,KAAK,CAACG,GAAG,CAAEf,IAAI,IAC7BD,8BAA8B,CAACC,IAAI,EAAEC,SAAS,EAAEC,QAAQ,CAC1D,CAAC;EAED,MAAMc,MAAM,GAAG,MAAMH,MAAM,CAACI,IAAI,CAACC,KAAK,CAAC;IACrCC,YAAY,EAAE,QAAQ;IACtBC,IAAI,EAAE,OAAO;IACbC,KAAK,EAAEP;EACT,CAAC,CAAC;EAEF,OAAO,CAACE,MAAM,CAACK,KAAK,IAAI,EAAE,EAAEN,GAAG,CAAC,CAACM,KAAK,EAAEC,GAAG,KAAK;IAC9C,MAAMC,mBAAmB,GAAGF,KAAK,CAACG,QAAkB;IAEpD,MAAMC,WAAW,GAAGF,mBAAmB,EAAEF,KAAK,GAAG,CAAC,CAAC,EAAEG,QAExC;IAEb,MAAME,IAAI,GACRD,WAAW,EAAEE,eAAe,EAAEC,GAAG,IAAIH,WAAW,EAAEI,iBAAiB;IAErE,OAAO;MACL7B,IAAI,EAAEY,KAAK,CAACU,GAAG,CAAC;MAChBI,IAAI,EAAEA;IACR,CAAC;EACH,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}

package/lib/module/modules/data-sync/utils/retry-save.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { isRateLimitError, readOvokError } from "@ovok/core";
+import { OvokRateLimitError } from "@ovok/core/next";
 const RETRY_DELAYS_MS = [1000, 4000, 16000];
 
 // A throttle or a passing server or upstream fault; 501 (not set up) and every refusal fail fast.
@@ -33,7 +33,7 @@ const getNestedRecords = error => {
   return records;
 };
 const getResponseStatuses = record => [record.status, record.statusCode, asRecord(record.response)?.status, ...(Array.isArray(record.entry) ? record.entry.map(entry => asRecord(asRecord(entry)?.response)?.status) : [])];
-const getStatuses = error => [...getNestedRecords(error).flatMap(getResponseStatuses), readOvokError(error).status].map(statusNumber).filter(status => status !== undefined);
+const getStatuses = error => [...getNestedRecords(error).flatMap(getResponseStatuses)].map(statusNumber).filter(status => status !== undefined);
 class SyncRetryCancelledError extends Error {
   constructor() {
     super("Health sync retry cancelled");
@@ -63,8 +63,7 @@ const parseRateLimitReset = value => {
   return reset > nowInSeconds - 60 ? Math.max(0, reset * 1000 - Date.now()) : reset * 1000;
 };
 function getRetryAfterMs(error) {
-  const ovokRetryAfter = readOvokError(error).retryAfterMs;
-  const values = typeof ovokRetryAfter === "number" && ovokRetryAfter >= 0 ? [ovokRetryAfter] : [];
+  const values = [];
   for (const record of getNestedRecords(error)) {
     const retryAfter = record.retryAfterMs;
     if (typeof retryAfter === "number" && retryAfter >= 0) {
@@ -92,7 +91,7 @@ function getRetryAfterMs(error) {
   return values.length > 0 ? Math.max(...values) : undefined;
 }
 function isRetryableSyncError(error) {
-  if (isRateLimitError(error)) {
+  if (error instanceof OvokRateLimitError) {
     return true;
   }
   const statuses = getStatuses(error);

package/lib/module/modules/data-sync/utils/retry-save.js.map

@@ -1 +1 @@
-{"version":3,"names":["isRateLimitError","readOvokError","RETRY_DELAYS_MS","RETRYABLE_STATUSES","Set","asRecord","value","undefined","statusNumber","parsed","Number","parseInt","isInteger","getNestedRecords","error","records","pending","seen","length","record","shift","has","add","push","key","nested","getResponseStatuses","status","statusCode","response","Array","isArray","entry","map","getStatuses","flatMap","filter","SyncRetryCancelledError","Error","constructor","name","isSyncRetryCancelled","getHeader","headers","lowerName","toLowerCase","Object","entries","find","String","parseRetryAfter","seconds","isFinite","date","Date","parse","Math","max","now","parseRateLimitReset","reset","nowInSeconds","getRetryAfterMs","ovokRetryAfter","retryAfterMs","values","retryAfter","responseRetryAfter","retryAfterHeader","rateLimitReset","rateLimitResetMs","rateLimit","embeddedReset","match","embeddedResetMs","isRetryableSyncError","statuses","some","message","TypeError","test","getSyncRetryDelayMs","retryIndex","at","withSyncRetries","operation","shouldCancel","Promise","resolve","reject","timers","poll","setInterval","timer","clearTimeout","clearInterval","setTimeout"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/retry-save.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["OvokRateLimitError","RETRY_DELAYS_MS","RETRYABLE_STATUSES","Set","asRecord","value","undefined","statusNumber","parsed","Number","parseInt","isInteger","getNestedRecords","error","records","pending","seen","length","record","shift","has","add","push","key","nested","getResponseStatuses","status","statusCode","response","Array","isArray","entry","map","getStatuses","flatMap","filter","SyncRetryCancelledError","Error","constructor","name","isSyncRetryCancelled","getHeader","headers","lowerName","toLowerCase","Object","entries","find","String","parseRetryAfter","seconds","isFinite","date","Date","parse","Math","max","now","parseRateLimitReset","reset","nowInSeconds","getRetryAfterMs","values","retryAfter","retryAfterMs","responseRetryAfter","retryAfterHeader","rateLimitReset","rateLimitResetMs","rateLimit","embeddedReset","match","embeddedResetMs","isRetryableSyncError","statuses","some","message","TypeError","test","getSyncRetryDelayMs","retryIndex","at","withSyncRetries","operation","shouldCancel","Promise","resolve","reject","timers","poll","setInterval","timer","clearTimeout","clearInterval","setTimeout"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/retry-save.ts"],"mappings":";;AAAA,SAASA,kBAAkB,QAAQ,iBAAiB;AAEpD,MAAMC,eAAe,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAU;;AAEpD;AACA,MAAMC,kBAAkB,GAAG,IAAIC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAI7D,SAASC,QAAQA,CAACC,KAAc,EAA2B;EACzD,OAAO,OAAOA,KAAK,KAAK,QAAQ,IAAIA,KAAK,KAAK,IAAI,GAC7CA,KAAK,GACNC,SAAS;AACf;AAEA,MAAMC,YAAY,GAAIF,KAAc,IAAyB;EAC3D,MAAMG,MAAM,GAAG,OAAOH,KAAK,KAAK,QAAQ,GAAGI,MAAM,CAACC,QAAQ,CAACL,KAAK,EAAE,EAAE,CAAC,GAAGI,MAAM,CAACJ,KAAK,CAAC;EAErF,OAAOI,MAAM,CAACE,SAAS,CAACH,MAAM,CAAC,IAAIA,MAAM,GAAG,CAAC,GAAGA,MAAM,GAAGF,SAAS;AACpE,CAAC;AAED,MAAMM,gBAAgB,GAAIC,KAAc,IAAoB;EAC1D,MAAMC,OAAsB,GAAG,EAAE;EACjC,MAAMC,OAAO,GAAG,CAACX,QAAQ,CAACS,KAAK,CAAC,CAAC;EACjC,MAAMG,IAAI,GAAG,IAAIb,GAAG,CAAc,CAAC;EAEnC,OAAOY,OAAO,CAACE,MAAM,GAAG,CAAC,EAAE;IACzB,MAAMC,MAAM,GAAGH,OAAO,CAACI,KAAK,CAAC,CAAC;IAE9B,IAAI,CAACD,MAAM,IAAIF,IAAI,CAACI,GAAG,CAACF,MAAM,CAAC,EAAE;MAC/B;IACF;IAEAF,IAAI,CAACK,GAAG,CAACH,MAAM,CAAC;IAChBJ,OAAO,CAACQ,IAAI,CAACJ,MAAM,CAAC;IAEpB,KAAK,MAAMK,GAAG,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE;MACjD,MAAMC,MAAM,GAAGpB,QAAQ,CAACc,MAAM,CAACK,GAAG,CAAC,CAAC;MAEpC,IAAIC,MAAM,EAAE;QACVT,OAAO,CAACO,IAAI,CAACE,MAAM,CAAC;MACtB;IACF;EACF;EAEA,OAAOV,OAAO;AAChB,CAAC;AAED,MAAMW,mBAAmB,GAAIP,MAAmB,IAAgB,CAC9DA,MAAM,CAACQ,MAAM,EACbR,MAAM,CAACS,UAAU,EACjBvB,QAAQ,CAACc,MAAM,CAACU,QAAQ,CAAC,EAAEF,MAAM,EACjC,IAAIG,KAAK,CAACC,OAAO,CAACZ,MAAM,CAACa,KAAK,CAAC,GAC3Bb,MAAM,CAACa,KAAK,CAACC,GAAG,CAAED,KAAK,IACrB3B,QAAQ,CAACA,QAAQ,CAAC2B,KAAK,CAAC,EAAEH,QAAQ,CAAC,EAAEF,MACvC,CAAC,GACD,EAAE,CAAC,CACR;AAED,MAAMO,WAAW,GAAIpB,KAAc,IACjC,CACE,GAAGD,gBAAgB,CAACC,KAAK,CAAC,CAACqB,OAAO,CAACT,mBAAmB,CAAC,CACxD,CACEO,GAAG,CAACzB,YAAY,CAAC,CACjB4B,MAAM,CAAET,MAAM,IAAuBA,MAAM,KAAKpB,SAAS,CAAC;AAE/D,MAAM8B,uBAAuB,SAASC,KAAK,CAAC;EAC1CC,WAAWA,CAAA,EAAG;IACZ,KAAK,CAAC,6BAA6B,CAAC;IACpC,IAAI,CAACC,IAAI,GAAG,yBAAyB;EACvC;AACF;AAEA,MAAMC,oBAAoB,GAAI3B,KAAc,IAC1CA,KAAK,YAAYuB,uBAAuB;AAE1C,MAAMK,SAAS,GAAGA,CAChBC,OAAgC,EAChCH,IAAY,KACW;EACvB,MAAMI,SAAS,GAAGJ,IAAI,CAACK,WAAW,CAAC,CAAC;EAEpC,MAAMb,KAAK,GAAGc,MAAM,CAACC,OAAO,CAACJ,OAAO,IAAI,CAAC,CAAC,CAAC,CAACK,IAAI,CAC9C,CAAC,CAACxB,GAAG,CAAC,KAAKA,GAAG,CAACqB,WAAW,CAAC,CAAC,KAAKD,SACnC,CAAC,GAAG,CAAC,CAAC;EAEN,OAAO,OAAOZ,KAAK,KAAK,QAAQ,IAAI,OAAOA,KAAK,KAAK,QAAQ,GACzDiB,MAAM,CAACjB,KAAK,CAAC,GACbzB,SAAS;AACf,CAAC;AAED,MAAM2C,eAAe,GAAI5C,KAAa,IAAyB;EAC7D,MAAM6C,OAAO,GAAGzC,MAAM,CAACJ,KAAK,CAAC;EAE7B,IAAII,MAAM,CAAC0C,QAAQ,CAACD,OAAO,CAAC,IAAIA,OAAO,IAAI,CAAC,EAAE;IAC5C,OAAOA,OAAO,GAAG,IAAI;EACvB;EAEA,MAAME,IAAI,GAAGC,IAAI,CAACC,KAAK,CAACjD,KAAK,CAAC;EAE9B,OAAOI,MAAM,CAAC0C,QAAQ,CAACC,IAAI,CAAC,GAAGG,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEJ,IAAI,GAAGC,IAAI,CAACI,GAAG,CAAC,CAAC,CAAC,GAAGnD,SAAS;AAC3E,CAAC;AAED,MAAMoD,mBAAmB,GAAIrD,KAAa,IAAyB;EACjE,MAAMsD,KAAK,GAAGlD,MAAM,CAACJ,KAAK,CAAC;EAE3B,IAAI,CAACI,MAAM,CAAC0C,QAAQ,CAACQ,KAAK,CAAC,IAAIA,KAAK,GAAG,CAAC,EAAE;IACxC,OAAOrD,SAAS;EAClB;EAEA,MAAMsD,YAAY,GAAGP,IAAI,CAACI,GAAG,CAAC,CAAC,GAAG,IAAI;EAEtC,OAAOE,KAAK,GAAGC,YAAY,GAAG,EAAE,GAC5BL,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEG,KAAK,GAAG,IAAI,GAAGN,IAAI,CAACI,GAAG,CAAC,CAAC,CAAC,GACtCE,KAAK,GAAG,IAAI;AAClB,CAAC;AAED,SAASE,eAAeA,CAAChD,KAAc,EAAsB;EAC3D,MAAMiD,MAAgB,GAAG,EAAE;EAE3B,KAAK,MAAM5C,MAAM,IAAIN,gBAAgB,CAACC,KAAK,CAAC,EAAE;IAC5C,MAAMkD,UAAU,GAAG7C,MAAM,CAAC8C,YAAY;IAEtC,IAAI,OAAOD,UAAU,KAAK,QAAQ,IAAIA,UAAU,IAAI,CAAC,EAAE;MACrDD,MAAM,CAACxC,IAAI,CAACyC,UAAU,CAAC;IACzB;IAEA,MAAMnC,QAAQ,GAAGxB,QAAQ,CAACc,MAAM,CAACU,QAAQ,CAAC;IAC1C,MAAMqC,kBAAkB,GAAGrC,QAAQ,EAAEoC,YAAY;IAEjD,IAAI,OAAOC,kBAAkB,KAAK,QAAQ,IAAIA,kBAAkB,IAAI,CAAC,EAAE;MACrEH,MAAM,CAACxC,IAAI,CAAC2C,kBAAkB,CAAC;IACjC;IAEA,MAAMvB,OAAO,GAAGtC,QAAQ,CAACwB,QAAQ,EAAEc,OAAO,CAAC,IAAItC,QAAQ,CAACc,MAAM,CAACwB,OAAO,CAAC;IACvE,MAAMwB,gBAAgB,GAAGzB,SAAS,CAACC,OAAO,EAAE,aAAa,CAAC;IAE1D,MAAMsB,YAAY,GAAGE,gBAAgB,GACjCjB,eAAe,CAACiB,gBAAgB,CAAC,GACjC5D,SAAS;IAEb,MAAM6D,cAAc,GAAG1B,SAAS,CAACC,OAAO,EAAE,iBAAiB,CAAC;IAE5D,MAAM0B,gBAAgB,GAAGD,cAAc,GACnCT,mBAAmB,CAACS,cAAc,CAAC,GACnC7D,SAAS;IAEb,MAAM+D,SAAS,GAAG5B,SAAS,CAACC,OAAO,EAAE,WAAW,CAAC;IACjD,MAAM4B,aAAa,GAAGD,SAAS,EAAEE,KAAK,CAAC,mCAAmC,CAAC,GAAG,CAAC,CAAC;IAEhF,MAAMC,eAAe,GAAGF,aAAa,GACjCZ,mBAAmB,CAACY,aAAa,CAAC,GAClChE,SAAS;IAEb,KAAK,MAAMD,KAAK,IAAI,CAAC2D,YAAY,EAAEI,gBAAgB,EAAEI,eAAe,CAAC,EAAE;MACrE,IAAInE,KAAK,KAAKC,SAAS,EAAE;QACvBwD,MAAM,CAACxC,IAAI,CAACjB,KAAK,CAAC;MACpB;IACF;EACF;EAEA,OAAOyD,MAAM,CAAC7C,MAAM,GAAG,CAAC,GAAGsC,IAAI,CAACC,GAAG,CAAC,GAAGM,MAAM,CAAC,GAAGxD,SAAS;AAC5D;AAEA,SAASmE,oBAAoBA,CAAC5D,KAAc,EAAW;EACrD,IAAIA,KAAK,YAAYb,kBAAkB,EAAE;IACvC,OAAO,IAAI;EACb;EAEA,MAAM0E,QAAQ,GAAGzC,WAAW,CAACpB,KAAK,CAAC;EAEnC,IAAI6D,QAAQ,CAACzD,MAAM,GAAG,CAAC,EAAE;IACvB,OAAOyD,QAAQ,CAACC,IAAI,CAAEjD,MAAM,IAAKxB,kBAAkB,CAACkB,GAAG,CAACM,MAAM,CAAC,CAAC;EAClE;EAEA,MAAMkD,OAAO,GAAG/D,KAAK,YAAYwB,KAAK,GAAGxB,KAAK,CAAC+D,OAAO,GAAG5B,MAAM,CAACnC,KAAK,CAAC;EAEtE,OACEA,KAAK,YAAYgE,SAAS,IAC1B,uDAAuD,CAACC,IAAI,CAACF,OAAO,CAAC;AAEzE;AAEA,SAASG,mBAAmBA,CAAClE,KAAc,EAAEmE,UAAkB,EAAU;EACvE,OAAOzB,IAAI,CAACC,GAAG,CACbvD,eAAe,CAAC+E,UAAU,CAAC,IAAI/E,eAAe,CAACgF,EAAE,CAAC,CAAC,CAAC,CAAE,EACtDpB,eAAe,CAAChD,KAAK,CAAC,IAAI,CAC5B,CAAC;AACH;AAEA,eAAeqE,eAAeA,CAC5BC,SAA2B,EAC3BC,YAA2B,GAAGA,CAAA,KAAM,KAAK,EAC7B;EACZ,KAAK,IAAIJ,UAAU,GAAG,CAAC,GAAIA,UAAU,IAAI,CAAC,EAAE;IAC1C,IAAI;MACF,OAAO,MAAMG,SAAS,CAAC,CAAC;IAC1B,CAAC,CAAC,OAAOtE,KAAK,EAAE;MACd,IAAIuE,YAAY,CAAC,CAAC,EAAE;QAClB,MAAM,IAAIhD,uBAAuB,CAAC,CAAC;MACrC;MAEA,IACE,CAACqC,oBAAoB,CAAC5D,KAAK,CAAC,IAC5BmE,UAAU,IAAI/E,eAAe,CAACgB,MAAM,EACpC;QACA,MAAMJ,KAAK;MACb;MAEA,MAAM,IAAIwE,OAAO,CAAO,CAACC,OAAO,EAAEC,MAAM,KAAK;QAC3C,MAAMC,MAGL,GAAG,CAAC,CAAC;QAENA,MAAM,CAACC,IAAI,GAAGC,WAAW,CAAC,MAAM;UAC9B,IAAI,CAACN,YAAY,CAAC,CAAC,EAAE;YACnB;UACF;UAEA,IAAII,MAAM,CAACG,KAAK,EAAE;YAChBC,YAAY,CAACJ,MAAM,CAACG,KAAK,CAAC;UAC5B;UAEA,IAAIH,MAAM,CAACC,IAAI,EAAE;YACfI,aAAa,CAACL,MAAM,CAACC,IAAI,CAAC;UAC5B;UAEAF,MAAM,CAAC,IAAInD,uBAAuB,CAAC,CAAC,CAAC;QACvC,CAAC,EAAE,EAAE,CAAC;QAENoD,MAAM,CAACG,KAAK,GAAGG,UAAU,CAAC,MAAM;UAC9B,IAAIN,MAAM,CAACC,IAAI,EAAE;YACfI,aAAa,CAACL,MAAM,CAACC,IAAI,CAAC;UAC5B;UAEAH,OAAO,CAAC,CAAC;QACX,CAAC,EAAEP,mBAAmB,CAAClE,KAAK,EAAEmE,UAAU,CAAC,CAAC;MAC5C,CAAC,CAAC;IACJ;EACF;AACF;AAEA,SAASD,mBAAmB,EAAEN,oBAAoB,EAAEjC,oBAAoB,EAAE0C,eAAe","ignoreList":[]}

package/lib/module/modules/data-sync/utils/session-owner.js

@@ -0,0 +1,13 @@
+"use strict";
+
+export const healthSyncOwner = (client, session) => {
+  const patientId = session?.profile.reference.match(/^Patient\/([^/]+)$/)?.[1];
+  if (!session || !patientId) {
+    return null;
+  }
+  return {
+    patientId,
+    ownerKey: JSON.stringify([client.baseUrl, client.tenantCode, session.project.reference, session.profile.reference])
+  };
+};
+//# sourceMappingURL=session-owner.js.map

package/lib/module/modules/data-sync/utils/session-owner.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["healthSyncOwner","client","session","patientId","profile","reference","match","ownerKey","JSON","stringify","baseUrl","tenantCode","project"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/session-owner.ts"],"mappings":";;AAIA,OAAO,MAAMA,eAAe,GAAGA,CAC7BC,MAAY,EACZC,OAAuB,KAC4B;EACnD,MAAMC,SAAS,GAAGD,OAAO,EAAEE,OAAO,CAACC,SAAS,CAACC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;EAE7E,IAAI,CAACJ,OAAO,IAAI,CAACC,SAAS,EAAE;IAC1B,OAAO,IAAI;EACb;EAEA,OAAO;IACLA,SAAS;IACTI,QAAQ,EAAEC,IAAI,CAACC,SAAS,CAAC,CACvBR,MAAM,CAACS,OAAO,EACdT,MAAM,CAACU,UAAU,EACjBT,OAAO,CAACU,OAAO,CAACP,SAAS,EACzBH,OAAO,CAACE,OAAO,CAACC,SAAS,CAC1B;EACH,CAAC;AACH,CAAC","ignoreList":[]}

package/lib/module/modules/data-sync/utils/to-core-health-observations.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { MeasurementTypeKey } from "@ovok/core";
+import { MeasurementTypeKey } from "@ovok/core/next";
 import { withHealthRecordTiming } from "./health-record-timing.js";
 import { normalizeCoreHealthObservation } from "./normalize-core-health-observation.js";
 const isCoreMeasurementTypeKey = value => Object.values(MeasurementTypeKey).includes(value);

package/lib/module/modules/data-sync/utils/to-core-health-observations.js.map

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","withHealthRecordTiming","normalizeCoreHealthObservation","isCoreMeasurementTypeKey","value","Object","values","includes","toCoreHealthObservations","observations","props","sourceAt","map","observation","index","device","timing","applyCatalogCoding","length","data"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/to-core-health-observations.ts"],"mappings":";;AACA,SAASA,kBAAkB,QAAQ,YAAY;AAI/C,SAASC,sBAAsB,QAAQ,2BAAwB;AAC/D,SAASC,8BAA8B,QAAQ,wCAAqC;AAOpF,MAAMC,wBAAwB,GAC5BC,KAAa,IAEbC,MAAM,CAACC,MAAM,CAACN,kBAAkB,CAAC,CAACO,QAAQ,CAACH,KAA2B,CAAC;;AAEzE;AACA,MAAMI,wBAAwB,GAAGA,CAC/BC,YAA2B,EAC3BC,KAAgC,EAChCC,QAA8C,KAE9CF,YAAY,CAACG,GAAG,CAAC,CAACC,WAAW,EAAEC,KAAK,KAAK;EACvC,MAAM;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGL,QAAQ,CAACG,KAAK,CAAC;EAE1C,OAAOZ,8BAA8B,CACnCD,sBAAsB,CACpB;IACE,GAAGY,WAAW;IACd,IAAIE,MAAM,GACN;MAAEA,MAAM,EAAE;QAAE,IAAIF,WAAW,CAACE,MAAM,IAAI,CAAC,CAAC,CAAC;QAAE,GAAGA;MAAO;IAAE,CAAC,GACxD,CAAC,CAAC;EACR,CAAC,EACDC,MACF,CAAC,EACD;IACE,GAAGN,KAAK;IACRO,kBAAkB,EAAER,YAAY,CAACS,MAAM,KAAK,CAAC,IAAIR,KAAK,CAACS,IAAI,CAACD,MAAM,KAAK;EACzE,CACF,CAAC;AACH,CAAC,CAAC;AAEJ,SAASf,wBAAwB,EAAEK,wBAAwB","ignoreList":[]}
+{"version":3,"names":["MeasurementTypeKey","withHealthRecordTiming","normalizeCoreHealthObservation","isCoreMeasurementTypeKey","value","Object","values","includes","toCoreHealthObservations","observations","props","sourceAt","map","observation","index","device","timing","applyCatalogCoding","length","data"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/to-core-health-observations.ts"],"mappings":";;AACA,SAASA,kBAAkB,QAAQ,iBAAiB;AAIpD,SAASC,sBAAsB,QAAQ,2BAAwB;AAC/D,SAASC,8BAA8B,QAAQ,wCAAqC;AAOpF,MAAMC,wBAAwB,GAC5BC,KAAa,IAEbC,MAAM,CAACC,MAAM,CAACN,kBAAkB,CAAC,CAACO,QAAQ,CAACH,KAA2B,CAAC;;AAEzE;AACA,MAAMI,wBAAwB,GAAGA,CAC/BC,YAA2B,EAC3BC,KAAgC,EAChCC,QAA8C,KAE9CF,YAAY,CAACG,GAAG,CAAC,CAACC,WAAW,EAAEC,KAAK,KAAK;EACvC,MAAM;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGL,QAAQ,CAACG,KAAK,CAAC;EAE1C,OAAOZ,8BAA8B,CACnCD,sBAAsB,CACpB;IACE,GAAGY,WAAW;IACd,IAAIE,MAAM,GACN;MAAEA,MAAM,EAAE;QAAE,IAAIF,WAAW,CAACE,MAAM,IAAI,CAAC,CAAC,CAAC;QAAE,GAAGA;MAAO;IAAE,CAAC,GACxD,CAAC,CAAC;EACR,CAAC,EACDC,MACF,CAAC,EACD;IACE,GAAGN,KAAK;IACRO,kBAAkB,EAAER,YAAY,CAACS,MAAM,KAAK,CAAC,IAAIR,KAAK,CAACS,IAAI,CAACD,MAAM,KAAK;EACzE,CACF,CAAC;AACH,CAAC,CAAC;AAEJ,SAASf,wBAAwB,EAAEK,wBAAwB","ignoreList":[]}

package/lib/module/modules/image/components/optimized-image.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import { useClient } from "@ovok/core";
 import { Image as ExpoImage, useImage } from "expo-image";
 import * as React from "react";
 import { StyleSheet, View } from "react-native";
 import { SvgXml } from "react-native-svg";
+import { useNativeOvok } from "../../next/use-native-ovok.js";
 import { calculateDimension } from "../utils/calculate-dimension.js";
 import { getOptimizedImageUrl } from "../utils/get-optimized-image-url.js";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -23,7 +23,7 @@ export const OptimizedImage = /*#__PURE__*/React.memo(({
   aspectRatio: providedAspectRatio,
   ...rest
 }) => {
-  const client = useClient();
+  const client = useNativeOvok();
   const retryCount = React.useRef(0);
   const [failedUri, setFailedUri] = React.useState(null);
   const [containerSize, setContainerSize] = React.useState({
@@ -39,7 +39,7 @@ export const OptimizedImage = /*#__PURE__*/React.memo(({
     width: calculatedWidth,
     height: calculatedHeight,
     fit,
-    baseUrl: client.getBaseUrl()
+    baseUrl: client.baseUrl
   }), [uri, calculatedWidth, calculatedHeight, fit, client]);
   React.useEffect(() => {
     retryCount.current = 0;