@ovok/native 1.16.1-dev.2095 → 1.16.1-dev.2099

package/lib/module/modules/cms/hooks/use-cms-content.js

@@ -1,13 +1,7 @@
 "use strict";
 
-import { useCmsDocument as useCoreCmsDocument, useCmsDocuments as useCoreCmsDocuments, useLegalPage as useCoreLegalPage, useReleaseNotes as useCoreReleaseNotes } from "@ovok/core";
+import { useOvokQuery } from "@ovok/core/next/react";
 import { useCmsLocale } from "./use-cms-locale.js";
-
-/*
- * The @ovok/core CMS hooks, reading in the app's i18next language unless
- * `options.locale` is set, and again when that language changes.
- */
-
 const useLocalized = options => {
   const locale = useCmsLocale();
   return {
@@ -15,13 +9,39 @@ const useLocalized = options => {
     locale: options.locale || locale
   };
 };
-const useCmsDocument = (collection, slug, options = {}) => useCoreCmsDocument(collection, slug, useLocalized(options));
-const useCmsDocuments = (collection, options = {}) => useCoreCmsDocuments(collection, useLocalized(options));
-
-/** With `tenantCode`, readable before sign-in. */
-const useLegalPage = (slug, options = {}) => useCoreLegalPage(slug, useLocalized(options));
-
-/** Newest first unless `sort` says otherwise. Needs a session. */
-const useReleaseNotes = (options = {}) => useCoreReleaseNotes(useLocalized(options));
+const useCmsDocument = (collection, slug, options = {}) => {
+  const params = useLocalized(options);
+  return useOvokQuery((client, signal) => client.cms.documents.retrieve(collection, slug, params, {
+    signal
+  }), {
+    queryKey: ["cms-document", collection, slug, params],
+    enabled: Boolean(slug)
+  });
+};
+const useCmsDocuments = (collection, options = {}) => {
+  const params = useLocalized(options);
+  return useOvokQuery((client, signal) => client.cms.documents.list(collection, params, {
+    signal
+  }), {
+    queryKey: ["cms-documents", collection, params]
+  });
+};
+const useLegalPage = (slug, options = {}) => {
+  const params = useLocalized(options);
+  return useOvokQuery((client, signal) => client.cms.legalPage(slug, params, {
+    signal
+  }), {
+    queryKey: ["cms-legal", slug, params],
+    enabled: Boolean(slug)
+  });
+};
+const useReleaseNotes = (options = {}) => {
+  const params = useLocalized(options);
+  return useOvokQuery((client, signal) => client.cms.releaseNotes.list(params, {
+    signal
+  }), {
+    queryKey: ["cms-release-notes", params]
+  });
+};
 export { useCmsDocument, useCmsDocuments, useLegalPage, useReleaseNotes };
 //# sourceMappingURL=use-cms-content.js.map

package/lib/module/modules/cms/hooks/use-cms-content.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCmsDocument","useCoreCmsDocument","useCmsDocuments","useCoreCmsDocuments","useLegalPage","useCoreLegalPage","useReleaseNotes","useCoreReleaseNotes","useCmsLocale","useLocalized","options","locale","collection","slug"],"sourceRoot":"../../../../../src","sources":["modules/cms/hooks/use-cms-content.ts"],"mappings":";;AAAA,SAMEA,cAAc,IAAIC,kBAAkB,EACpCC,eAAe,IAAIC,mBAAmB,EACtCC,YAAY,IAAIC,gBAAgB,EAChCC,eAAe,IAAIC,mBAAmB,QACjC,YAAY;AAEnB,SAASC,YAAY,QAAQ,qBAAkB;;AAE/C;AACA;AACA;AACA;;AAEA,MAAMC,YAAY,GAAmCC,OAAU,IAAQ;EACrE,MAAMC,MAAM,GAAGH,YAAY,CAAC,CAAC;EAE7B,OAAO;IAAE,GAAGE,OAAO;IAAEC,MAAM,EAAED,OAAO,CAACC,MAAM,IAAIA;EAAO,CAAC;AACzD,CAAC;AAED,MAAMX,cAAc,GAAGA,CACrBY,UAAkB,EAClBC,IAAwB,EACxBH,OAAuB,GAAG,CAAC,CAAC,KAE5BT,kBAAkB,CAAIW,UAAU,EAAEC,IAAI,EAAEJ,YAAY,CAACC,OAAO,CAAC,CAAC;AAEhE,MAAMR,eAAe,GAAGA,CACtBU,UAAkB,EAClBF,OAA2B,GAAG,CAAC,CAAC,KAEhCP,mBAAmB,CAAIS,UAAU,EAAEH,YAAY,CAACC,OAAO,CAAC,CAAC;;AAE3D;AACA,MAAMN,YAAY,GAAGA,CACnBS,IAAwB,EACxBH,OAAuB,GAAG,CAAC,CAAC,KAE5BL,gBAAgB,CAACQ,IAAI,EAAEJ,YAAY,CAACC,OAAO,CAAC,CAAC;;AAE/C;AACA,MAAMJ,eAAe,GAAGA,CACtBI,OAA2B,GAAG,CAAC,CAAC,KACEH,mBAAmB,CAACE,YAAY,CAACC,OAAO,CAAC,CAAC;AAE9E,SAASV,cAAc,EAAEE,eAAe,EAAEE,YAAY,EAAEE,eAAe","ignoreList":[]}
+{"version":3,"names":["useOvokQuery","useCmsLocale","useLocalized","options","locale","useCmsDocument","collection","slug","params","client","signal","cms","documents","retrieve","queryKey","enabled","Boolean","useCmsDocuments","list","useLegalPage","legalPage","useReleaseNotes","releaseNotes"],"sourceRoot":"../../../../../src","sources":["modules/cms/hooks/use-cms-content.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,uBAAuB;AAKpD,SAASC,YAAY,QAAQ,qBAAkB;AAE/C,MAAMC,YAAY,GAAmCC,OAAU,IAAQ;EACrE,MAAMC,MAAM,GAAGH,YAAY,CAAC,CAAC;EAE7B,OAAO;IAAE,GAAGE,OAAO;IAAEC,MAAM,EAAED,OAAO,CAACC,MAAM,IAAIA;EAAO,CAAC;AACzD,CAAC;AAED,MAAMC,cAAc,GAAGA,CACrBC,UAAkB,EAClBC,IAAwB,EACxBJ,OAAsB,GAAG,CAAC,CAAC,KACL;EACtB,MAAMK,MAAM,GAAGN,YAAY,CAACC,OAAO,CAAC;EAEpC,OAAOH,YAAY,CACjB,CAACS,MAAM,EAAEC,MAAM,KAAKD,MAAM,CAACE,GAAG,CAACC,SAAS,CAACC,QAAQ,CAAIP,UAAU,EAAEC,IAAI,EAAGC,MAAM,EAAE;IAAEE;EAAO,CAAC,CAAC,EAC3F;IAAEI,QAAQ,EAAE,CAAC,cAAc,EAAER,UAAU,EAAEC,IAAI,EAAEC,MAAM,CAAC;IAAEO,OAAO,EAAEC,OAAO,CAACT,IAAI;EAAE,CACjF,CAAC;AACH,CAAC;AAED,MAAMU,eAAe,GAAGA,CACtBX,UAAkB,EAClBH,OAAsB,GAAG,CAAC,CAAC,KACxB;EACH,MAAMK,MAAM,GAAGN,YAAY,CAACC,OAAO,CAAC;EAEpC,OAAOH,YAAY,CACjB,CAACS,MAAM,EAAEC,MAAM,KAAKD,MAAM,CAACE,GAAG,CAACC,SAAS,CAACM,IAAI,CAAIZ,UAAU,EAAEE,MAAM,EAAE;IAAEE;EAAO,CAAC,CAAC,EAChF;IAAEI,QAAQ,EAAE,CAAC,eAAe,EAAER,UAAU,EAAEE,MAAM;EAAE,CACpD,CAAC;AACH,CAAC;AAED,MAAMW,YAAY,GAAGA,CAACZ,IAAwB,EAAEJ,OAAsB,GAAG,CAAC,CAAC,KAAK;EAC9E,MAAMK,MAAM,GAAGN,YAAY,CAACC,OAAO,CAAC;EAEpC,OAAOH,YAAY,CACjB,CAACS,MAAM,EAAEC,MAAM,KAAKD,MAAM,CAACE,GAAG,CAACS,SAAS,CAACb,IAAI,EAAGC,MAAM,EAAE;IAAEE;EAAO,CAAC,CAAC,EACnE;IAAEI,QAAQ,EAAE,CAAC,WAAW,EAAEP,IAAI,EAAEC,MAAM,CAAC;IAAEO,OAAO,EAAEC,OAAO,CAACT,IAAI;EAAE,CAClE,CAAC;AACH,CAAC;AAED,MAAMc,eAAe,GAAGA,CAAClB,OAAsB,GAAG,CAAC,CAAC,KAAK;EACvD,MAAMK,MAAM,GAAGN,YAAY,CAACC,OAAO,CAAC;EAEpC,OAAOH,YAAY,CACjB,CAACS,MAAM,EAAEC,MAAM,KAAKD,MAAM,CAACE,GAAG,CAACW,YAAY,CAACJ,IAAI,CAACV,MAAM,EAAE;IAAEE;EAAO,CAAC,CAAC,EACpE;IAAEI,QAAQ,EAAE,CAAC,mBAAmB,EAAEN,MAAM;EAAE,CAC5C,CAAC;AACH,CAAC;AAED,SAASH,cAAc,EAAEY,eAAe,EAAEE,YAAY,EAAEE,eAAe","ignoreList":[]}

package/lib/module/modules/cms/hooks/use-cms-locale.js

@@ -1,12 +1,7 @@
 "use strict";
 
-import { toCmsLocale } from "@ovok/core";
 import { useTranslation } from "react-i18next";
-
-/**
- * The app's i18next language as an Ovok CMS locale ("de-DE" reads "de"; a
- * language the CMS doesn't carry reads "en"). Follows `i18n.changeLanguage`.
- */
+import { toCmsLocale } from "../cms-locale.js";
 export const useCmsLocale = () => {
   const {
     i18n

package/lib/module/modules/cms/hooks/use-cms-locale.js.map

@@ -1 +1 @@
-{"version":3,"names":["toCmsLocale","useTranslation","useCmsLocale","i18n","resolvedLanguage","language"],"sourceRoot":"../../../../../src","sources":["modules/cms/hooks/use-cms-locale.ts"],"mappings":";;AAAA,SAAwBA,WAAW,QAAQ,YAAY;AACvD,SAASC,cAAc,QAAQ,eAAe;;AAE9C;AACA;AACA;AACA;AACA,OAAO,MAAMC,YAAY,GAAGA,CAAA,KAAqB;EAC/C,MAAM;IAAEC;EAAK,CAAC,GAAGF,cAAc,CAAC,CAAC;EAEjC,OAAOD,WAAW,CAACG,IAAI,CAACC,gBAAgB,IAAID,IAAI,CAACE,QAAQ,CAAC;AAC5D,CAAC","ignoreList":[]}
+{"version":3,"names":["useTranslation","toCmsLocale","useCmsLocale","i18n","resolvedLanguage","language"],"sourceRoot":"../../../../../src","sources":["modules/cms/hooks/use-cms-locale.ts"],"mappings":";;AAAA,SAASA,cAAc,QAAQ,eAAe;AAE9C,SAASC,WAAW,QAAQ,kBAAe;AAE3C,OAAO,MAAMC,YAAY,GAAGA,CAAA,KAAc;EACxC,MAAM;IAAEC;EAAK,CAAC,GAAGH,cAAc,CAAC,CAAC;EAEjC,OAAOC,WAAW,CAACE,IAAI,CAACC,gBAAgB,IAAID,IAAI,CAACE,QAAQ,CAAC;AAC5D,CAAC","ignoreList":[]}

package/lib/module/modules/cms/hooks/use-cms-translations.js

@@ -1,45 +1,32 @@
 "use strict";
 
-import { toCmsLocale, useTranslations } from "@ovok/core";
+import { useOvokQuery } from "@ovok/core/next/react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import { toCmsLocale } from "../cms-locale.js";
 import { mergeCmsTranslations } from "../merge-cms-translations.js";
 import { useCmsLocale } from "./use-cms-locale.js";
-
-/**
- * Loads the CMS `translations` collection into the app's i18next instance:
- * read in the i18next language unless `options.locale` is set, and added under
- * its CMS locale ("de", which a "de-DE" language still resolves through). The
- * app's own strings still win; the CMS replaces the SDK's built-in English.
- * Call it once, near the root; signed out, pass `tenantCode`.
- */
 export const useCmsTranslations = (options = {}) => {
   const {
     i18n
   } = useTranslation();
   const cmsLocale = useCmsLocale();
   const locale = toCmsLocale(options.locale || cmsLocale);
-  const state = useTranslations({
-    ...options,
-    locale
+  const state = useOvokQuery((client, signal) => client.cms.translations(locale, {
+    signal
+  }), {
+    queryKey: ["cms-translations", locale]
   });
-  const {
-    data
-  } = state;
   const merged = React.useRef(undefined);
   React.useEffect(() => {
-    // A language switch first renders with the previous language's tree still in `data`.
-    if (!data || data === merged.current) {
+    if (!state.data || state.data === merged.current) {
       return;
     }
-    merged.current = data;
-
-    // Re-render through the event react-i18next listens to. Not changeLanguage: during a
-    // pending switch, changing back to the old language would revert the user's switch.
-    if (mergeCmsTranslations(i18n, locale, data)) {
+    merged.current = state.data;
+    if (mergeCmsTranslations(i18n, locale, state.data)) {
       i18n.emit("languageChanged", i18n.language);
     }
-  }, [data, i18n, locale]);
+  }, [state.data, i18n, locale]);
   return state;
 };
 //# sourceMappingURL=use-cms-translations.js.map

package/lib/module/modules/cms/hooks/use-cms-translations.js.map

@@ -1 +1 @@
-{"version":3,"names":["toCmsLocale","useTranslations","React","useTranslation","mergeCmsTranslations","useCmsLocale","useCmsTranslations","options","i18n","cmsLocale","locale","state","data","merged","useRef","undefined","useEffect","current","emit","language"],"sourceRoot":"../../../../../src","sources":["modules/cms/hooks/use-cms-translations.ts"],"mappings":";;AAAA,SAIEA,WAAW,EACXC,eAAe,QACV,YAAY;AACnB,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,cAAc,QAAQ,eAAe;AAE9C,SAASC,oBAAoB,QAAQ,8BAA2B;AAEhE,SAASC,YAAY,QAAQ,qBAAkB;;AAE/C;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,kBAAkB,GAAGA,CAACC,OAAuB,GAAG,CAAC,CAAC,KAAyC;EACtG,MAAM;IAAEC;EAAK,CAAC,GAAGL,cAAc,CAAC,CAAC;EACjC,MAAMM,SAAS,GAAGJ,YAAY,CAAC,CAAC;EAChC,MAAMK,MAAM,GAAGV,WAAW,CAACO,OAAO,CAACG,MAAM,IAAID,SAAS,CAAC;EACvD,MAAME,KAAK,GAAGV,eAAe,CAAC;IAAE,GAAGM,OAAO;IAAEG;EAAO,CAAC,CAAC;EACrD,MAAM;IAAEE;EAAK,CAAC,GAAGD,KAAK;EACtB,MAAME,MAAM,GAAGX,KAAK,CAACY,MAAM,CAA+BC,SAAS,CAAC;EAEpEb,KAAK,CAACc,SAAS,CAAC,MAAM;IACpB;IACA,IAAI,CAACJ,IAAI,IAAIA,IAAI,KAAKC,MAAM,CAACI,OAAO,EAAE;MACpC;IACF;IACAJ,MAAM,CAACI,OAAO,GAAGL,IAAI;;IAErB;IACA;IACA,IAAIR,oBAAoB,CAACI,IAAI,EAAEE,MAAM,EAAEE,IAAI,CAAC,EAAE;MAC5CJ,IAAI,CAACU,IAAI,CAAC,iBAAiB,EAAEV,IAAI,CAACW,QAAQ,CAAC;IAC7C;EACF,CAAC,EAAE,CAACP,IAAI,EAAEJ,IAAI,EAAEE,MAAM,CAAC,CAAC;EAExB,OAAOC,KAAK;AACd,CAAC","ignoreList":[]}
+{"version":3,"names":["useOvokQuery","React","useTranslation","toCmsLocale","mergeCmsTranslations","useCmsLocale","useCmsTranslations","options","i18n","cmsLocale","locale","state","client","signal","cms","translations","queryKey","merged","useRef","undefined","useEffect","data","current","emit","language"],"sourceRoot":"../../../../../src","sources":["modules/cms/hooks/use-cms-translations.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,uBAAuB;AACpD,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,cAAc,QAAQ,eAAe;AAI9C,SAASC,WAAW,QAAQ,kBAAe;AAC3C,SAASC,oBAAoB,QAAQ,8BAA2B;AAEhE,SAASC,YAAY,QAAQ,qBAAkB;AAE/C,OAAO,MAAMC,kBAAkB,GAAGA,CAACC,OAAsB,GAAG,CAAC,CAAC,KAAK;EACjE,MAAM;IAAEC;EAAK,CAAC,GAAGN,cAAc,CAAC,CAAC;EACjC,MAAMO,SAAS,GAAGJ,YAAY,CAAC,CAAC;EAChC,MAAMK,MAAM,GAAGP,WAAW,CAACI,OAAO,CAACG,MAAM,IAAID,SAAS,CAAC;EAEvD,MAAME,KAAK,GAAGX,YAAY,CACxB,CAACY,MAAM,EAAEC,MAAM,KAAKD,MAAM,CAACE,GAAG,CAACC,YAAY,CAACL,MAAM,EAAE;IAAEG;EAAO,CAAC,CAAC,EAC/D;IAAEG,QAAQ,EAAE,CAAC,kBAAkB,EAAEN,MAAM;EAAE,CAC3C,CAAC;EAED,MAAMO,MAAM,GAAGhB,KAAK,CAACiB,MAAM,CAA+BC,SAAS,CAAC;EAEpElB,KAAK,CAACmB,SAAS,CAAC,MAAM;IACpB,IAAI,CAACT,KAAK,CAACU,IAAI,IAAIV,KAAK,CAACU,IAAI,KAAKJ,MAAM,CAACK,OAAO,EAAE;MAChD;IACF;IAEAL,MAAM,CAACK,OAAO,GAAGX,KAAK,CAACU,IAAI;IAE3B,IAAIjB,oBAAoB,CAACI,IAAI,EAAEE,MAAM,EAAEC,KAAK,CAACU,IAAI,CAAC,EAAE;MAClDb,IAAI,CAACe,IAAI,CAAC,iBAAiB,EAAEf,IAAI,CAACgB,QAAQ,CAAC;IAC7C;EACF,CAAC,EAAE,CAACb,KAAK,CAACU,IAAI,EAAEb,IAAI,EAAEE,MAAM,CAAC,CAAC;EAE9B,OAAOC,KAAK;AACd,CAAC","ignoreList":[]}

package/lib/module/modules/cms/merge-cms-translations.js.map

@@ -1 +1 @@
-{"version":3,"names":["defaultTranslation","written","WeakMap","leaves","tree","prefix","Object","entries","flatMap","key","value","sdkDefault","path","split","reduce","node","mergeCmsTranslations","i18n","lng","translations","byLanguage","get","store","Map","own","changed","set","text","current","getResource","writable","undefined","addResource","silent"],"sourceRoot":"../../../../src","sources":["modules/cms/merge-cms-translations.ts"],"mappings":";;AAGA,SAASA,kBAAkB,QAAQ,gCAA6B;;AAEhE;AACA;AACA;AACA;AACA;AACA,MAAMC,OAAO,GAAG,IAAIC,OAAO,CAAkD,CAAC;;AAE9E;AACA,MAAMC,MAAM,GAAGA,CAACC,IAAyB,EAAEC,MAAM,GAAG,EAAE,KACpDC,MAAM,CAACC,OAAO,CAACH,IAAI,CAAC,CAACI,OAAO,CAAC,CAAC,CAACC,GAAG,EAAEC,KAAK,CAAC,KACxC,OAAOA,KAAK,KAAK,QAAQ,GAAG,CAAC,CAAC,GAAGL,MAAM,GAAGI,GAAG,EAAE,EAAEC,KAAK,CAAC,CAAC,GAAGP,MAAM,CAACO,KAAK,EAAE,GAAGL,MAAM,GAAGI,GAAG,GAAG,CAC7F,CAAC;;AAEH;AACA,MAAME,UAAU,GAAIC,IAAY,IAC9BA,IAAI,CACDC,KAAK,CAAC,GAAG,CAAC,CACVC,MAAM,CAAU,CAACC,IAAI,EAAEN,GAAG,KAAMM,IAAI,GAA2CN,GAAG,CAAC,EAAET,kBAAkB,CAAC;;AAE7G;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMgB,oBAAoB,GAAGA,CAACC,IAAU,EAAEC,GAAW,EAAEC,YAA8B,KAAc;EACjG,MAAMC,UAAU,GAAGnB,OAAO,CAACoB,GAAG,CAACJ,IAAI,CAACK,KAAK,CAAC,IAAI,IAAIC,GAAG,CAA8B,CAAC;EACpF,MAAMC,GAAG,GAAGJ,UAAU,CAACC,GAAG,CAACH,GAAG,CAAC,IAAI,IAAIK,GAAG,CAAiB,CAAC;EAC5D,IAAIE,OAAO,GAAG,KAAK;EAEnBL,UAAU,CAACM,GAAG,CAACR,GAAG,EAAEM,GAAG,CAAC;EACxBvB,OAAO,CAACyB,GAAG,CAACT,IAAI,CAACK,KAAK,EAAEF,UAAU,CAAC;EAEnC,KAAK,MAAM,CAACR,IAAI,EAAEe,IAAI,CAAC,IAAIxB,MAAM,CAACgB,YAAY,CAAC,EAAE;IAC/C,MAAMS,OAAgB,GAAGX,IAAI,CAACY,WAAW,CAACX,GAAG,EAAE,aAAa,EAAEN,IAAI,CAAC;IAEnE,MAAMkB,QAAQ,GACZF,OAAO,KAAKG,SAAS,IAAKb,GAAG,KAAK,IAAI,IAAIU,OAAO,KAAKjB,UAAU,CAACC,IAAI,CAAE,IAAIgB,OAAO,KAAKJ,GAAG,CAACH,GAAG,CAACT,IAAI,CAAC;IAEtG,IAAIkB,QAAQ,IAAIF,OAAO,KAAKD,IAAI,EAAE;MAChCV,IAAI,CAACe,WAAW,CAACd,GAAG,EAAE,aAAa,EAAEN,IAAI,EAAEe,IAAI,EAAE;QAAEM,MAAM,EAAE;MAAK,CAAC,CAAC;MAClET,GAAG,CAACE,GAAG,CAACd,IAAI,EAAEe,IAAI,CAAC;MACnBF,OAAO,GAAG,IAAI;IAChB;EACF;EAEA,OAAOA,OAAO;AAChB,CAAC;AAED,SAAST,oBAAoB","ignoreList":[]}
+{"version":3,"names":["defaultTranslation","written","WeakMap","leaves","tree","prefix","Object","entries","flatMap","key","value","sdkDefault","path","split","reduce","node","mergeCmsTranslations","i18n","lng","translations","byLanguage","get","store","Map","own","changed","set","text","current","getResource","writable","undefined","addResource","silent"],"sourceRoot":"../../../../src","sources":["modules/cms/merge-cms-translations.ts"],"mappings":";;AAIA,SAASA,kBAAkB,QAAQ,gCAA6B;;AAEhE;AACA;AACA;AACA;AACA;AACA,MAAMC,OAAO,GAAG,IAAIC,OAAO,CAAkD,CAAC;;AAE9E;AACA,MAAMC,MAAM,GAAGA,CAACC,IAAyB,EAAEC,MAAM,GAAG,EAAE,KACpDC,MAAM,CAACC,OAAO,CAACH,IAAI,CAAC,CAACI,OAAO,CAAC,CAAC,CAACC,GAAG,EAAEC,KAAK,CAAC,KACxC,OAAOA,KAAK,KAAK,QAAQ,GAAG,CAAC,CAAC,GAAGL,MAAM,GAAGI,GAAG,EAAE,EAAEC,KAAK,CAAC,CAAC,GAAGP,MAAM,CAACO,KAAK,EAAE,GAAGL,MAAM,GAAGI,GAAG,GAAG,CAC7F,CAAC;;AAEH;AACA,MAAME,UAAU,GAAIC,IAAY,IAC9BA,IAAI,CACDC,KAAK,CAAC,GAAG,CAAC,CACVC,MAAM,CAAU,CAACC,IAAI,EAAEN,GAAG,KAAMM,IAAI,GAA2CN,GAAG,CAAC,EAAET,kBAAkB,CAAC;;AAE7G;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMgB,oBAAoB,GAAGA,CAACC,IAAU,EAAEC,GAAW,EAAEC,YAA8B,KAAc;EACjG,MAAMC,UAAU,GAAGnB,OAAO,CAACoB,GAAG,CAACJ,IAAI,CAACK,KAAK,CAAC,IAAI,IAAIC,GAAG,CAA8B,CAAC;EACpF,MAAMC,GAAG,GAAGJ,UAAU,CAACC,GAAG,CAACH,GAAG,CAAC,IAAI,IAAIK,GAAG,CAAiB,CAAC;EAC5D,IAAIE,OAAO,GAAG,KAAK;EAEnBL,UAAU,CAACM,GAAG,CAACR,GAAG,EAAEM,GAAG,CAAC;EACxBvB,OAAO,CAACyB,GAAG,CAACT,IAAI,CAACK,KAAK,EAAEF,UAAU,CAAC;EAEnC,KAAK,MAAM,CAACR,IAAI,EAAEe,IAAI,CAAC,IAAIxB,MAAM,CAACgB,YAAY,CAAC,EAAE;IAC/C,MAAMS,OAAgB,GAAGX,IAAI,CAACY,WAAW,CAACX,GAAG,EAAE,aAAa,EAAEN,IAAI,CAAC;IAEnE,MAAMkB,QAAQ,GACZF,OAAO,KAAKG,SAAS,IAAKb,GAAG,KAAK,IAAI,IAAIU,OAAO,KAAKjB,UAAU,CAACC,IAAI,CAAE,IAAIgB,OAAO,KAAKJ,GAAG,CAACH,GAAG,CAACT,IAAI,CAAC;IAEtG,IAAIkB,QAAQ,IAAIF,OAAO,KAAKD,IAAI,EAAE;MAChCV,IAAI,CAACe,WAAW,CAACd,GAAG,EAAE,aAAa,EAAEN,IAAI,EAAEe,IAAI,EAAE;QAAEM,MAAM,EAAE;MAAK,CAAC,CAAC;MAClET,GAAG,CAACE,GAAG,CAACd,IAAI,EAAEe,IAAI,CAAC;MACnBF,OAAO,GAAG,IAAI;IAChB;EACF;EAEA,OAAOA,OAAO;AAChB,CAAC;AAED,SAAST,oBAAoB","ignoreList":[]}

package/lib/module/modules/data-sync/hooks/use-health-sync-runner.js

@@ -1,9 +1,11 @@
 "use strict";
 
-import { useClient, useMedplumProfile } from "@ovok/core";
+import { useSession } from "@ovok/core/next/react";
 import { useNetInfo } from "@react-native-community/netinfo";
 import * as React from "react";
+import { useNativeOvok } from "../../next/use-native-ovok.js";
 import { createProgressCollector } from "../utils/create-progress-collector.js";
+import { healthSyncOwner } from "../utils/session-owner.js";
 /**
  * The lifecycle both platform components share: the initial sync, pause and
  * resume on network changes, and a teardown that never throws.
@@ -17,9 +19,13 @@ export const useHealthSyncRunner = ({
   onError,
   onProgress
 }) => {
-  const client = useClient();
-  const patient = useMedplumProfile();
+  const client = useNativeOvok();
+  const session = useSession();
+  const owner = healthSyncOwner(client, session.data ?? null);
+  const patientId = owner?.patientId;
+  const ownerKey = owner?.ownerKey;
   const serviceRef = React.useRef(null);
+  const generation = React.useRef(0);
   const {
     isConnected,
     type
@@ -28,13 +34,21 @@ export const useHealthSyncRunner = ({
   const onProgressRef = React.useRef(onProgress);
   const [updateProgress] = React.useState(() => createProgressCollector(progress => onProgressRef.current?.(progress)));
   const syncData = React.useCallback(async () => {
-    if (skip) {
+    if (skip || !patientId || !ownerKey) {
       return;
     }
     try {
+      const requestGeneration = ++generation.current;
+      if (serviceRef.current) {
+        await serviceRef.current.stopSync();
+      }
+      if (requestGeneration !== generation.current) {
+        return;
+      }
       serviceRef.current = getInstance({
         client,
-        patientId: patient?.id ?? "",
+        patientId,
+        ownerKey,
         dataToSync,
         chunkSize,
         onSyncError: error => onErrorRef.current?.(error),
@@ -44,7 +58,7 @@ export const useHealthSyncRunner = ({
     } catch (error) {
       onErrorRef.current?.(error);
     }
-  }, [skip, getInstance, client, dataToSync, chunkSize, patient?.id, updateProgress]);
+  }, [skip, getInstance, client, dataToSync, chunkSize, patientId, ownerKey, updateProgress]);
 
   /*
    * The first sync. `startSync` reads the per-code watermark off the server and
@@ -55,6 +69,16 @@ export const useHealthSyncRunner = ({
    */
   React.useEffect(() => {
     syncData();
+    const currentGeneration = generation;
+    return () => {
+      ++currentGeneration.current;
+      try {
+        Promise.resolve(serviceRef.current?.stopSync()).catch(error => onErrorRef.current?.(error));
+      } catch (error) {
+        onErrorRef.current?.(error);
+      }
+      serviceRef.current = null;
+    };
   }, [syncData]);
   React.useEffect(() => {
     if (!serviceRef.current) {
@@ -71,22 +95,6 @@ export const useHealthSyncRunner = ({
     onErrorRef.current = onError;
     onProgressRef.current = onProgress;
   }, [onError, onProgress]);
-  React.useEffect(() => {
-    return () => {
-      /*
-       * A teardown that throws takes the unmount with it, and React has no
-       * boundary for a cleanup function — so a sync that fails to stop
-       * became a crash on the way out of a screen. The error goes to the
-       * app's own handler, which is what `onError` is for.
-       */
-      try {
-        serviceRef.current?.stopSync();
-      } catch (error) {
-        onErrorRef.current?.(error);
-      }
-      serviceRef.current = null;
-    };
-  }, []);
   return {
     syncData,
     onErrorRef

package/lib/module/modules/data-sync/hooks/use-health-sync-runner.js.map

@@ -1 +1 @@
-{"version":3,"names":["useClient","useMedplumProfile","useNetInfo","React","createProgressCollector","useHealthSyncRunner","getInstance","dataToSync","chunkSize","wifiOnly","skip","onError","onProgress","client","patient","serviceRef","useRef","isConnected","type","onErrorRef","onProgressRef","updateProgress","useState","progress","current","syncData","useCallback","patientId","id","onSyncError","error","startSync","useEffect","pauseReason","undefined","pauseSync","stopSync"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/hooks/use-health-sync-runner.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useSession","useNetInfo","React","useNativeOvok","createProgressCollector","healthSyncOwner","useHealthSyncRunner","getInstance","dataToSync","chunkSize","wifiOnly","skip","onError","onProgress","client","session","owner","data","patientId","ownerKey","serviceRef","useRef","generation","isConnected","type","onErrorRef","onProgressRef","updateProgress","useState","progress","current","syncData","useCallback","requestGeneration","stopSync","onSyncError","error","startSync","useEffect","currentGeneration","Promise","resolve","catch","pauseReason","undefined","pauseSync"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/hooks/use-health-sync-runner.ts"],"mappings":"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","ignoreList":[]}

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

@@ -17,13 +17,12 @@ import { SyncStateManager } from "./managers/sync-state-manager.js";
 export class BaseHealthSyncService {
   constructor(props, adapter) {
     this.adapter = adapter;
-    this.client = props.client;
     this.patientId = props.patientId;
     this.dataToSync = props.dataToSync;
     this.onSyncError = props.onSyncError;
     this.progressManager = new SyncProgressManager(props.updateProgress, props.dataToSync);
     this.stateManager = new SyncStateManager();
-    this.storageManager = new StorageManager(props.client, adapter.provider);
+    this.storageManager = new StorageManager(props.client, adapter.provider, props.ownerKey, props.patientId);
     this.dataProcessor = new DataProcessor(props.client, props.patientId, this.adapter.provider, props.chunkSize ?? DEFAULT_HEALTH_SYNC_CHUNK_SIZE, this.storageManager, adapter.getTotalCount, adapter.getData, adapter.convert);
   }
 
@@ -35,14 +34,11 @@ export class BaseHealthSyncService {
   }
   async runSync() {
     try {
-      if (!this.client.isInitialized) {
-        this.onSyncError(new Error("Client not initialized"));
-        return;
-      }
       if (!this.patientId) {
         this.onSyncError(new Error("Patient not found"));
         return;
       }
+      await this.storageManager.requireOwner(this.patientId);
       this.stateManager.resume();
       this.progressManager.setNotStartedStatuses();
       if (!this.stateManager.initialDataFetched) {
@@ -139,7 +135,7 @@ export class BaseHealthSyncService {
           if (deletedRecordIds.length !== 0) {
             await this.storageManager.deleteObservations(deletedRecordIds, this.patientId);
           }
-          this.storageManager.saveAnchors(anchors);
+          await this.storageManager.saveAnchors(anchors);
         } catch (error) {
           if (isSyncRetryCancelled(error) || this.stateManager.shouldStopSync) {
             return;
@@ -149,7 +145,7 @@ export class BaseHealthSyncService {
           return;
         }
       } else {
-        this.storageManager.saveAnchors(anchors);
+        await this.storageManager.saveAnchors(anchors);
       }
     }
     this.progressManager.setStatus(measurementTypeKey, this.stateManager.shouldStopSync ? "idle" : "completed");

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":";;AAAA;;AAIA,SACEA,kBAAkB,EAClBC,gBAAgB,EAChBC,YAAY,QACP,kCAA+B;AACtC,SAASC,8BAA8B,QAAQ,iBAAc;AAS7D,SAASC,iBAAiB,QAAQ,qCAAkC;AACpE,SAASC,iBAAiB,QAAuB,8BAA2B;AAE5E,SAASC,oBAAoB,EAAEC,eAAe,QAAQ,wBAAqB;AAE3E,SAASC,aAAa,QAAQ,8BAA2B;AACzD,SAASC,cAAc,QAAQ,+BAA4B;AAC3D,SAASC,mBAAmB,QAAQ,qCAAkC;AACtE,SAASC,gBAAgB,QAAQ,kCAA+B;;AAEhE;;AAUA,OAAO,MAAeC,qBAAqB,CAKzC;EAcAC,WAAWA,CACTC,KAAoC,EACnBC,OAA8D,EAC/E;IAAA,KADiBA,OAA8D,GAA9DA,OAA8D;IAE/E,IAAI,CAACC,SAAS,GAAGF,KAAK,CAACE,SAAS;IAChC,IAAI,CAACC,UAAU,GAAGH,KAAK,CAACG,UAAU;IAClC,IAAI,CAACC,WAAW,GAAGJ,KAAK,CAACI,WAAW;IAEpC,IAAI,CAACC,eAAe,GAAG,IAAIT,mBAAmB,CAC5CI,KAAK,CAACM,cAAc,EACpBN,KAAK,CAACG,UACR,CAAC;IACD,IAAI,CAACI,YAAY,GAAG,IAAIV,gBAAgB,CAAC,CAAC;IAC1C,IAAI,CAACW,cAAc,GAAG,IAAIb,cAAc,CACtCK,KAAK,CAACS,MAAM,EACZR,OAAO,CAACS,QAAQ,EAChBV,KAAK,CAACW,QAAQ,EACdX,KAAK,CAACE,SACR,CAAC;IACD,IAAI,CAACU,aAAa,GAAG,IAAIlB,aAAa,CACpCM,KAAK,CAACS,MAAM,EACZT,KAAK,CAACE,SAAS,EACf,IAAI,CAACD,OAAO,CAACS,QAAQ,EACrBV,KAAK,CAACa,SAAS,IAAIxB,8BAA8B,EACjD,IAAI,CAACmB,cAAc,EACnBP,OAAO,CAACa,aAAa,EACrBb,OAAO,CAACc,OAAO,EACfd,OAAO,CAACe,OACV,CAAC;EACH;;EAEA;EACA,MAAaC,SAASA,CAAA,EAAkB;IACtC,OAAO,IAAI,CAACV,YAAY,CAACW,IAAI,CAAC,MAC5B9B,YAAY,CAAC,eAAe,EAAE;MAAEsB,QAAQ,EAAE,IAAI,CAACT,OAAO,CAACS;IAAS,CAAC,EAAE,MACjE,IAAI,CAACS,OAAO,CAAC,CACf,CACF,CAAC;EACH;EAEA,MAAcA,OAAOA,CAAA,EAAkB;IACrC,IAAI;MACF,IAAI,CAAC,IAAI,CAACjB,SAAS,EAAE;QACnB,IAAI,CAACE,WAAW,CAAC,IAAIgB,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAEhD;MACF;MAEA,MAAM,IAAI,CAACZ,cAAc,CAACa,YAAY,CAAC,IAAI,CAACnB,SAAS,CAAC;MAEtD,IAAI,CAACK,YAAY,CAACe,MAAM,CAAC,CAAC;MAC1B,IAAI,CAACjB,eAAe,CAACkB,qBAAqB,CAAC,CAAC;MAE5C,IAAI,CAAC,IAAI,CAAChB,YAAY,CAACiB,kBAAkB,EAAE;QACzC,MAAM,IAAI,CAACC,cAAc,CAAC,CAAC;MAC7B;MAEA,MAAM,IAAI,CAACC,mBAAmB,CAAC,CAAC;MAEhC,IAAI,CAACrB,eAAe,CAACsB,gBAAgB,CAAC,IAAI,CAACpB,YAAY,CAACqB,WAAW,CAAC;IACtE,CAAC,CAAC,OAAOC,KAAK,EAAE;MACd,IAAI,CAACzB,WAAW,CAACyB,KAAc,CAAC;IAClC;EACF;EAEA,MAAaC,QAAQA,CAAA,EAAkB;IACrC,IAAI,CAACzB,eAAe,CAAC0B,QAAQ,CAAC,CAAC;IAC/B,IAAI,CAACxB,YAAY,CAACyB,KAAK,CAAC,CAAC;IACzB,IAAI,CAACzB,YAAY,CAAC0B,cAAc,GAAG,IAAI;EACzC;EAEA,MAAaC,SAASA,CAACC,MAAwB,EAAiB;IAC9D,IAAI,CAAC5B,YAAY,CAAC6B,KAAK,CAACD,MAAM,CAAC;IAC/B,IAAI,CAAC9B,eAAe,CAACsB,gBAAgB,CAACQ,MAAM,CAAC;EAC/C;EAEA,MAAcV,cAAcA,CAAA,EAAkB;IAC5C,MAAMY,sBAAsB,GAC1B,MAAM,IAAI,CAACzB,aAAa,CAAC0B,yBAAyB,CAAC,IAAI,CAACnC,UAAU,CAAC;IAErE,IAAI,CAACI,YAAY,CAAC8B,sBAAsB,GAAGA,sBAAsB;IAEjE,MAAM,IAAI,CAACE,oBAAoB,CAAC,CAAC;IACjC,IAAI,CAAChC,YAAY,CAACiB,kBAAkB,GAAG,IAAI;EAC7C;EAEA,MAAce,oBAAoBA,CAAA,EAAkB;IAClD,KAAK,MAAMC,GAAG,IAAIC,MAAM,CAACC,IAAI,CAAC,IAAI,CAACvC,UAAqC,CAAC,EAAE;MACzE,MAAMwC,kBAAkB,GAAGH,GAAoB;MAC/C,MAAMI,IAAI,GAAG,IAAI,CAACC,yBAAyB,CAACF,kBAAkB,CAAC;MAE/D,IAAI,CAACC,IAAI,EAAE;QACT;MACF;MAEA,MAAME,oBAAoB,GAAG,IAAI,CAAClC,aAAa,CAACmC,uBAAuB,CACrE,IAAI,CAACxC,YAAY,CAAC8B,sBAAsB,EACxCO,IAAI,EACJD,kBAAkB,EAClBpD,iBAAiB,CAACoD,kBAAkB,EAAEC,IAAI,CAACI,IAAI,CACjD,CAAC;MAED,MAAMC,UAAU,GAAG,MAAM,IAAI,CAACrC,aAAa,CAACsC,2BAA2B,CACrEP,kBAAkB,EAClBC,IAAI,EACJE,oBACF,CAAC;MAED,IAAI,CAACzC,eAAe,CAAC8C,oBAAoB,CAACR,kBAAkB,EAAEM,UAAU,CAAC;IAC3E;EACF;EAEA,MAAcvB,mBAAmBA,CAAA,EAAkB;IACjD,KAAK,MAAMc,GAAG,IAAIC,MAAM,CAACC,IAAI,CAC3B,IAAI,CAACvC,UACP,CAAC,EAAE;MACD,IAAI,IAAI,CAACI,YAAY,CAAC0B,cAAc,EAAE;QACpC;MACF;MAEA,MAAMU,kBAAkB,GAAGH,GAAoB;MAC/C,MAAMI,IAAI,GAAG,IAAI,CAACC,yBAAyB,CAACF,kBAAkB,CAAC;MAE/D,IAAI,CAACC,IAAI,EAAE;QACT,IAAI,CAACvC,eAAe,CAAC+C,SAAS,CAACT,kBAAkB,EAAE,MAAM,CAAC;QAC1D;MACF;MAEA,IAAI,CAACtC,eAAe,CAAC+C,SAAS,CAACT,kBAAkB,EAAE,SAAS,CAAC;MAC7D,MAAM,IAAI,CAACU,cAAc,CAACV,kBAAkB,EAAEC,IAAI,CAAC;IACrD;EACF;EAEA,MAAcS,cAAcA,CAC1BV,kBAAiC,EACjCC,IAA6C,EAC9B;IACf,MAAME,oBAAoB,GAAG,IAAI,CAAClC,aAAa,CAACmC,uBAAuB,CACrE,IAAI,CAACxC,YAAY,CAAC8B,sBAAsB,EACxCO,IAAI,EACJD,kBAAkB,EAClBpD,iBAAiB,CAACoD,kBAAkB,EAAEC,IAAI,CAACI,IAAI,CACjD,CAAC;IAED,IAAIM,OAAO,GAAG,IAAI;IAElB,OAAOA,OAAO,IAAI,CAAC,IAAI,CAAC/C,YAAY,CAAC0B,cAAc,EAAE;MACnD,MAAM;QACJsB,iBAAiB;QACjBC,kBAAkB;QAClBC,oBAAoB;QACpBC,gBAAgB;QAChBJ,OAAO,EAAEK,cAAc;QACvBC;MACF,CAAC,GAAG,MAAM,IAAI,CAAChD,aAAa,CAACiD,2BAA2B,CACtDlB,kBAAkB,EAClBC,IAAI,EACJE,oBACF,CAAC;MAEDQ,OAAO,GAAGK,cAAc;MAExB,IAAI,IAAI,CAACpD,YAAY,CAAC0B,cAAc,EAAE;QACpC;MACF;MAEA,MAAMe,IAAI,GAAGzD,iBAAiB,CAACoD,kBAAkB,EAAEC,IAAI,CAACI,IAAI,CAAC;MAE7D,MAAMc,MAAM,GAAG,IAAI,CAAClD,aAAa,CAACmD,oBAAoB,CACpDR,iBAAiB,EACjBC,kBAAkB,EAClBC,oBAAoB,EACpBT,IACF,CAAC;MAED,MAAMgB,gBAAgB,GAAGF,MAAM,CAACG,IAAI,CAAC,CAAC,CAACC,MAAM;MAE7C,IACE,CAACF,gBAAgB,KAAK,CAAC,IAAIN,gBAAgB,CAACQ,MAAM,KAAK,CAAC,KACxD,CAAC,IAAI,CAAC3D,YAAY,CAAC0B,cAAc,EACjC;QACA,IAAI;UACF,IAAI+B,gBAAgB,KAAK,CAAC,EAAE;YAC1B,MAAMG,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC;YAE5B,MAAMC,MAAM,GAAG,MAAM7E,eAAe,CAClC,MAAM,IAAI,CAACe,cAAc,CAAC+D,gBAAgB,CAACT,MAAM,EAAEd,IAAI,CAAC,EACxD,MAAM,IAAI,CAACzC,YAAY,CAAC0B,cAC1B,CAAC;YAED,IAAI,IAAI,CAAC1B,YAAY,CAAC0B,cAAc,EAAE;cACpC;YACF;YAEA,MAAMuC,eAAe,GAAGF,MAAM,CAACG,KAAK,IAAI,EAAE;YAE1C,MAAMC,UAAU,GAAGF,eAAe,CAACN,MAAM,GACrCM,eAAe,CAACG,MAAM,CAAEF,KAAK,IAC3BA,KAAK,CAACG,QAAQ,EAAEC,MAAM,CAACC,UAAU,CAAC,GAAG,CACvC,CAAC,CAACZ,MAAM,GACRF,gBAAgB;YAEpB,MAAMe,YAAY,GAAGP,eAAe,CAACG,MAAM,CAAEF,KAAK,IAChDA,KAAK,CAACG,QAAQ,EAAEC,MAAM,CAACC,UAAU,CAAC,KAAK,CACzC,CAAC,CAACZ,MAAM;YAER/E,gBAAgB,CAAC,8BAA8B,EAAE4F,YAAY,EAAE;cAC7DrE,QAAQ,EAAE,IAAI,CAACT,OAAO,CAACS,QAAQ;cAC/BiC;YACF,CAAC,CAAC;YACFzD,kBAAkB,CAChB,gCAAgC,EAChCkF,IAAI,CAACC,GAAG,CAAC,CAAC,GAAGF,SAAS,EACtB;cACEzD,QAAQ,EAAE,IAAI,CAACT,OAAO,CAACS;YACzB,CACF,CAAC;YAED,IAAI,CAACH,YAAY,CAACyE,SAAS,CAACV,MAAM,CAAC;YACnC,IAAI,CAACjE,eAAe,CAAC4E,2BAA2B,CAC9CtC,kBAAkB,EAClB+B,UAAU,EACVK,YACF,CAAC;UACH;UAEA,IAAIrB,gBAAgB,CAACQ,MAAM,KAAK,CAAC,EAAE;YACjC,MAAM,IAAI,CAAC1D,cAAc,CAAC0E,kBAAkB,CAC1CxB,gBAAgB,EAChB,IAAI,CAACxD,SACP,CAAC;UACH;UAEA,MAAM,IAAI,CAACM,cAAc,CAAC2E,WAAW,CAACvB,OAAO,CAAC;QAChD,CAAC,CAAC,OAAO/B,KAAK,EAAE;UACd,IAAIrC,oBAAoB,CAACqC,KAAK,CAAC,IAAI,IAAI,CAACtB,YAAY,CAAC0B,cAAc,EAAE;YACnE;UACF;UAEA,IAAI,CAAC5B,eAAe,CAAC+C,SAAS,CAACT,kBAAkB,EAAE,QAAQ,CAAC;UAC5D,IAAI,CAACvC,WAAW,CAACd,iBAAiB,CAACuC,KAAK,CAAC,CAAC;UAE1C;QACF;MACF,CAAC,MAAM;QACL,MAAM,IAAI,CAACrB,cAAc,CAAC2E,WAAW,CAACvB,OAAO,CAAC;MAChD;IACF;IAEA,IAAI,CAACvD,eAAe,CAAC+C,SAAS,CAC5BT,kBAAkB,EAClB,IAAI,CAACpC,YAAY,CAAC0B,cAAc,GAAG,MAAM,GAAG,WAC9C,CAAC;EACH;EAEQY,yBAAyBA,CAACF,kBAAiC,EAAE;IACnE,OAAO,IAAI,CAACxC,UAAU,CAACwC,kBAAkB,CAAC;EAC5C;AACF","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":[]}