@ovok/native 1.10.4 → 1.10.6

package/lib/commonjs/modules/auth/default-translation.js

@@ -15,15 +15,6 @@ const defaultTranslation = exports.defaultTranslation = {
     cancel: "Cancel",
     delete: "Delete"
   },
-  "questionnaire-form": {
-    item: {
-      unsupported: "This question type ({{type}}) is not supported. You can continue without answering it."
-    },
-    picker: {
-      increase: "Increase value",
-      decrease: "Decrease value"
-    }
-  },
   profile: {
     form: {
       error: {

package/lib/commonjs/modules/auth/default-translation.js.map

@@ -1 +1 @@
-{"version":3,"names":["_i18next","_interopRequireDefault","require","e","__esModule","default","defaultTranslation","exports","auth","common","cancel","delete","item","unsupported","picker","increase","decrease","profile","form","error","network","generic","phone","country","invalid","searchCountry","save","register","button","errors","name","subtitle","surname","title","accountType","email","patient","practitioner","success","settings","logout","apple","footer","google","mfa","code","verify","password","unavailable","i18n","addResourceBundle","resources","options","englishResources","Object","assign","en","existingTranslation","translation"],"sourceRoot":"../../../../src","sources":["modules/auth/default-translation.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_i18next","_interopRequireDefault","require","e","__esModule","default","defaultTranslation","exports","auth","common","cancel","delete","profile","form","error","network","generic","phone","country","invalid","searchCountry","save","register","button","errors","name","subtitle","surname","title","accountType","email","patient","practitioner","success","settings","logout","apple","footer","google","mfa","code","verify","password","unavailable","i18n","addResourceBundle","resources","options","englishResources","Object","assign","en","existingTranslation","translation"],"sourceRoot":"../../../../src","sources":["modules/auth/default-translation.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/modules/auth/hooks/use-delete-account.js

@@ -19,8 +19,8 @@ const useDeleteAccount = ({
       wipe
     });
     await client.clearActiveLogin();
-    await (0, _signOutGoogle.signOutGoogleIfNeeded)();
     (0, _events.notifySessionChanged)();
+    await (0, _signOutGoogle.signOutGoogleIfNeeded)();
   });
 };
 exports.useDeleteAccount = useDeleteAccount;

package/lib/commonjs/modules/auth/hooks/use-delete-account.js.map

@@ -1 +1 @@
-{"version":3,"names":["_core","require","_events","_signOutGoogle","_useAuthAction","useDeleteAccount","days","wipe","client","useClient","useAuthAction","requestDeleteUser","clearActiveLogin","signOutGoogleIfNeeded","notifySessionChanged","exports"],"sourceRoot":"../../../../../src","sources":["modules/auth/hooks/use-delete-account.ts"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAEA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AAEA,IAAAG,cAAA,GAAAH,OAAA;AAOO,MAAMI,gBAAgB,GAAGA,CAAC;EAAEC,IAAI,GAAG,EAAE;EAAEC,IAAI,GAAG;AAA2B,CAAC,GAAG,CAAC,CAAC,KAAK;EACzF,MAAMC,MAAM,GAAG,IAAAC,eAAS,EAAC,CAAC;EAE1B,OAAO,IAAAC,4BAAa,EAAC,YAAY;IAC/B,MAAMF,MAAM,CAACG,iBAAiB,CAAC;MAAEL,IAAI;MAAEC;IAAK,CAAC,CAAC;IAC9C,MAAMC,MAAM,CAACI,gBAAgB,CAAC,CAAC;IAC/B,MAAM,IAAAC,oCAAqB,EAAC,CAAC;IAC7B,IAAAC,4BAAoB,EAAC,CAAC;EACxB,CAAC,CAAC;AACJ,CAAC;AAACC,OAAA,CAAAV,gBAAA,GAAAA,gBAAA","ignoreList":[]}
+{"version":3,"names":["_core","require","_events","_signOutGoogle","_useAuthAction","useDeleteAccount","days","wipe","client","useClient","useAuthAction","requestDeleteUser","clearActiveLogin","notifySessionChanged","signOutGoogleIfNeeded","exports"],"sourceRoot":"../../../../../src","sources":["modules/auth/hooks/use-delete-account.ts"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAEA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AAEA,IAAAG,cAAA,GAAAH,OAAA;AAOO,MAAMI,gBAAgB,GAAGA,CAAC;EAAEC,IAAI,GAAG,EAAE;EAAEC,IAAI,GAAG;AAA2B,CAAC,GAAG,CAAC,CAAC,KAAK;EACzF,MAAMC,MAAM,GAAG,IAAAC,eAAS,EAAC,CAAC;EAE1B,OAAO,IAAAC,4BAAa,EAAC,YAAY;IAC/B,MAAMF,MAAM,CAACG,iBAAiB,CAAC;MAAEL,IAAI;MAAEC;IAAK,CAAC,CAAC;IAC9C,MAAMC,MAAM,CAACI,gBAAgB,CAAC,CAAC;IAC/B,IAAAC,4BAAoB,EAAC,CAAC;IACtB,MAAM,IAAAC,oCAAqB,EAAC,CAAC;EAC/B,CAAC,CAAC;AACJ,CAAC;AAACC,OAAA,CAAAV,gBAAA,GAAAA,gBAAA","ignoreList":[]}

package/lib/commonjs/modules/auth/hooks/use-session.js

@@ -34,11 +34,13 @@ const useSession = ({
   }, [refresh, refreshOnForeground]);
   return {
     status: snapshot.status,
+    reason: snapshot.reason,
     isAuthenticated: snapshot.status === "authenticated" || snapshot.status === "offline",
     accounts: snapshot.accounts,
     profile: snapshot.profile,
     sessions: snapshot.sessions,
     loading: snapshot.status === "loading",
+    switching: snapshot.switching === true,
     error: snapshot.error,
     refresh,
     refreshSessions: store.refreshSessions,

package/lib/commonjs/modules/auth/hooks/use-session.js.map

@@ -1 +1 @@
-{"version":3,"names":["_core","require","React","_interopRequireWildcard","_reactNative","_events","_sessionStore","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","useSession","sessions","fetchSessions","refreshOnForeground","client","useClient","store","useMemo","getSessionStore","snapshot","useSyncExternalStore","subscribe","refresh","useCallback","useEffect","subscription","AppState","addEventListener","nextState","undefined","unsubscribe","subscribeSessionChanges","remove","status","isAuthenticated","accounts","profile","loading","error","refreshSessions","switchAccount","removeAccount","logout","revokeSessions","exports"],"sourceRoot":"../../../../../src","sources":["modules/auth/hooks/use-session.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_core","require","React","_interopRequireWildcard","_reactNative","_events","_sessionStore","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","useSession","sessions","fetchSessions","refreshOnForeground","client","useClient","store","useMemo","getSessionStore","snapshot","useSyncExternalStore","subscribe","refresh","useCallback","useEffect","subscription","AppState","addEventListener","nextState","undefined","unsubscribe","subscribeSessionChanges","remove","status","reason","isAuthenticated","accounts","profile","loading","switching","error","refreshSessions","switchAccount","removeAccount","logout","revokeSessions","exports"],"sourceRoot":"../../../../../src","sources":["modules/auth/hooks/use-session.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/modules/auth/session/logout-session.js

@@ -3,18 +3,22 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.logoutSession = void 0;
+exports.logoutSession = exports.isLogoutInProgress = void 0;
 var _signOutGoogle = require("../utils/sign-out-google.js");
 var _events = require("./events.js");
 const logoutRequests = new WeakMap();
+const logoutInProgress = new WeakSet();
+const isLogoutInProgress = client => logoutInProgress.has(client);
 
 /** Uses one native/provider logout path for hooks and the built-in logout control. */
+exports.isLogoutInProgress = isLogoutInProgress;
 const logoutSession = client => {
   const key = client;
   const pending = logoutRequests.get(key);
   if (pending) {
     return pending;
   }
+  logoutInProgress.add(key);
   const request = (async () => {
     try {
       await client.logout();
@@ -24,6 +28,7 @@ const logoutSession = client => {
   })().finally(() => {
     (0, _events.notifySessionChanged)();
     logoutRequests.delete(key);
+    logoutInProgress.delete(key);
   });
   logoutRequests.set(key, request);
   return request;

package/lib/commonjs/modules/auth/session/logout-session.js.map

@@ -1 +1 @@
-{"version":3,"names":["_signOutGoogle","require","_events","logoutRequests","WeakMap","logoutSession","client","key","pending","get","request","logout","signOutGoogleIfNeeded","finally","notifySessionChanged","delete","set","exports"],"sourceRoot":"../../../../../src","sources":["modules/auth/session/logout-session.ts"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAEA,IAAAC,OAAA,GAAAD,OAAA;AAMA,MAAME,cAAc,GAAG,IAAIC,OAAO,CAAwB,CAAC;;AAE3D;AACO,MAAMC,aAAa,GAAIC,MAA2B,IAAoB;EAC3E,MAAMC,GAAG,GAAGD,MAAgB;EAC5B,MAAME,OAAO,GAAGL,cAAc,CAACM,GAAG,CAACF,GAAG,CAAC;EAEvC,IAAIC,OAAO,EAAE;IACX,OAAOA,OAAO;EAChB;EAEA,MAAME,OAAO,GAAG,CAAC,YAAY;IAC3B,IAAI;MACF,MAAMJ,MAAM,CAACK,MAAM,CAAC,CAAC;IACvB,CAAC,SAAS;MACR,MAAM,IAAAC,oCAAqB,EAAC,CAAC;IAC/B;EACF,CAAC,EAAE,CAAC,CAACC,OAAO,CAAC,MAAM;IACjB,IAAAC,4BAAoB,EAAC,CAAC;IACtBX,cAAc,CAACY,MAAM,CAACR,GAAG,CAAC;EAC5B,CAAC,CAAC;EAEFJ,cAAc,CAACa,GAAG,CAACT,GAAG,EAAEG,OAAO,CAAC;EAEhC,OAAOA,OAAO;AAChB,CAAC;AAACO,OAAA,CAAAZ,aAAA,GAAAA,aAAA","ignoreList":[]}
+{"version":3,"names":["_signOutGoogle","require","_events","logoutRequests","WeakMap","logoutInProgress","WeakSet","isLogoutInProgress","client","has","exports","logoutSession","key","pending","get","add","request","logout","signOutGoogleIfNeeded","finally","notifySessionChanged","delete","set"],"sourceRoot":"../../../../../src","sources":["modules/auth/session/logout-session.ts"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAEA,IAAAC,OAAA,GAAAD,OAAA;AAMA,MAAME,cAAc,GAAG,IAAIC,OAAO,CAAwB,CAAC;AAC3D,MAAMC,gBAAgB,GAAG,IAAIC,OAAO,CAAS,CAAC;AAE9C,MAAMC,kBAAkB,GAAIC,MAAc,IACxCH,gBAAgB,CAACI,GAAG,CAACD,MAAM,CAAC;;AAE9B;AAAAE,OAAA,CAAAH,kBAAA,GAAAA,kBAAA;AACA,MAAMI,aAAa,GAAIH,MAA2B,IAAoB;EACpE,MAAMI,GAAG,GAAGJ,MAAgB;EAC5B,MAAMK,OAAO,GAAGV,cAAc,CAACW,GAAG,CAACF,GAAG,CAAC;EAEvC,IAAIC,OAAO,EAAE;IACX,OAAOA,OAAO;EAChB;EAEAR,gBAAgB,CAACU,GAAG,CAACH,GAAG,CAAC;EAEzB,MAAMI,OAAO,GAAG,CAAC,YAAY;IAC3B,IAAI;MACF,MAAMR,MAAM,CAACS,MAAM,CAAC,CAAC;IACvB,CAAC,SAAS;MACR,MAAM,IAAAC,oCAAqB,EAAC,CAAC;IAC/B;EACF,CAAC,EAAE,CAAC,CAACC,OAAO,CAAC,MAAM;IACjB,IAAAC,4BAAoB,EAAC,CAAC;IACtBjB,cAAc,CAACkB,MAAM,CAACT,GAAG,CAAC;IAC1BP,gBAAgB,CAACgB,MAAM,CAACT,GAAG,CAAC;EAC9B,CAAC,CAAC;EAEFT,cAAc,CAACmB,GAAG,CAACV,GAAG,EAAEI,OAAO,CAAC;EAEhC,OAAOA,OAAO;AAChB,CAAC;AAACN,OAAA,CAAAC,aAAA,GAAAA,aAAA","ignoreList":[]}

package/lib/commonjs/modules/auth/session/session-store-refresh.js

@@ -14,6 +14,8 @@ const createSessionRefreshActions = (client, requestState, getStore, notify) =>
       requestState.nextRevision();
       store.snapshot = {
         status: "signed-out",
+        reason: store.snapshot.reason,
+        switching: store.snapshot.switching,
         accounts: requestState.getAccounts(),
         sessions: []
       };
@@ -22,7 +24,7 @@ const createSessionRefreshActions = (client, requestState, getStore, notify) =>
     }
     const revision = requestState.nextRevision();
     const previousSnapshot = store.snapshot;
-    if (store.snapshot.status !== "authenticated" && store.snapshot.status !== "offline") {
+    if (!store.snapshot.switching && store.snapshot.status !== "authenticated" && store.snapshot.status !== "offline") {
       store.snapshot = {
         ...store.snapshot,
         status: "loading",
@@ -66,7 +68,10 @@ const createSessionRefreshActions = (client, requestState, getStore, notify) =>
       sessions: sessions.map(_sessionStoreTypes.normalizeSession),
       error: "error" in sessionsResult ? (0, _sessionErrors.toError)(sessionsResult.error) : undefined
     };
-    store.snapshot = nextSnapshot;
+    store.snapshot = {
+      ...nextSnapshot,
+      switching: previousSnapshot.switching
+    };
     notify();
   };
   const refreshSessions = async () => {

package/lib/commonjs/modules/auth/session/session-store-refresh.js.map

@@ -1 +1 @@
-{"version":3,"names":["_sessionErrors","require","_sessionStoreTypes","createSessionRefreshActions","client","requestState","getStore","notify","refresh","includeSessions","store","syncActiveAccount","getActiveLogin","nextRevision","snapshot","status","accounts","getAccounts","sessions","revision","previousSnapshot","error","undefined","currentProfileRequest","getProfileRequest","currentSessionsRequest","getSessionsRequest","profileResult","sessionsResult","Promise","all","then","profile","resolve","isCurrent","nextSnapshot","getHttpStatus","toError","map","normalizeSession","refreshSessions","cause","exports"],"sourceRoot":"../../../../../src","sources":["modules/auth/session/session-store-refresh.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_sessionErrors","require","_sessionStoreTypes","createSessionRefreshActions","client","requestState","getStore","notify","refresh","includeSessions","store","syncActiveAccount","getActiveLogin","nextRevision","snapshot","status","reason","switching","accounts","getAccounts","sessions","revision","previousSnapshot","error","undefined","currentProfileRequest","getProfileRequest","currentSessionsRequest","getSessionsRequest","profileResult","sessionsResult","Promise","all","then","profile","resolve","isCurrent","nextSnapshot","getHttpStatus","toError","map","normalizeSession","refreshSessions","cause","exports"],"sourceRoot":"../../../../../src","sources":["modules/auth/session/session-store-refresh.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/modules/auth/session/session-store-types.js.map

@@ -1 +1 @@
-{"version":3,"names":["normalizeSession","session","legacy","id","authMethod","remoteAddress","ip","lastUpdated","lastActiveAt","createdAt","exports"],"sourceRoot":"../../../../../src","sources":["modules/auth/session/session-store-types.ts"],"mappings":";;;;;;AAsCA,MAAMA,gBAAgB,GAAIC,OAA0B,IAAwB;EAC1E,MAAMC,MAAM,GAAGD,OAId;EAED,OAAO;IACLE,EAAE,EAAEF,OAAO,CAACE,EAAE;IACdC,UAAU,EAAEH,OAAO,CAACG,UAAU;IAC9BC,aAAa,EAAEJ,OAAO,CAACI,aAAa,IAAIH,MAAM,CAACI,EAAE;IACjDC,WAAW,EAAEN,OAAO,CAACM,WAAW,IAAIL,MAAM,CAACM,YAAY,IAAIN,MAAM,CAACO;EACpE,CAAC;AACH,CAAC;AAACC,OAAA,CAAAV,gBAAA,GAAAA,gBAAA","ignoreList":[]}
+{"version":3,"names":["normalizeSession","session","legacy","id","authMethod","remoteAddress","ip","lastUpdated","lastActiveAt","createdAt","exports"],"sourceRoot":"../../../../../src","sources":["modules/auth/session/session-store-types.ts"],"mappings":";;;;;;AAwCA,MAAMA,gBAAgB,GAAIC,OAA0B,IAAwB;EAC1E,MAAMC,MAAM,GAAGD,OAId;EAED,OAAO;IACLE,EAAE,EAAEF,OAAO,CAACE,EAAE;IACdC,UAAU,EAAEH,OAAO,CAACG,UAAU;IAC9BC,aAAa,EAAEJ,OAAO,CAACI,aAAa,IAAIH,MAAM,CAACI,EAAE;IACjDC,WAAW,EAAEN,OAAO,CAACM,WAAW,IAAIL,MAAM,CAACM,YAAY,IAAIN,MAAM,CAACO;EACpE,CAAC;AACH,CAAC;AAACC,OAAA,CAAAV,gBAAA,GAAAA,gBAAA","ignoreList":[]}

package/lib/commonjs/modules/auth/session/session-store.js

@@ -14,19 +14,51 @@ const createSessionStore = client => {
   const listeners = new Set();
   const requestState = new _sessionStoreRequestState.SessionStoreRequestState(client, sessionClient);
   let unsubscribeNetwork;
+  let unsubscribeClient;
   let wasConnected;
   let logoutRequest;
   const storeRef = {};
   const notify = () => listeners.forEach(listener => listener());
+  const onClientChange = () => {
+    if ((0, _logoutSession.isLogoutInProgress)(client) || storeRef.current?.snapshot.switching) {
+      return;
+    }
+    void Promise.resolve().then(() => {
+      const currentStore = storeRef.current;
+      if (!currentStore || (0, _logoutSession.isLogoutInProgress)(client) || currentStore.snapshot.switching) {
+        return;
+      }
+      if (client.getActiveLogin()) {
+        void currentStore.refresh(false);
+        return;
+      }
+      if (currentStore.snapshot.status !== "authenticated" && currentStore.snapshot.status !== "offline") {
+        return;
+      }
+      requestState.invalidate();
+      currentStore.snapshot = {
+        status: "signed-out",
+        reason: "session-ended",
+        accounts: requestState.getAccounts(),
+        sessions: []
+      };
+      notify();
+    });
+  };
   const refreshActions = (0, _sessionStoreRefresh.createSessionRefreshActions)(client, requestState, () => storeRef.current, notify);
   const store = {
     snapshot: {
       status: "loading",
+      switching: false,
       accounts: requestState.getAccounts(),
       sessions: []
     },
     subscribe: listener => {
       listeners.add(listener);
+      if (!unsubscribeClient) {
+        client.addEventListener?.("change", onClientChange);
+        unsubscribeClient = () => client.removeEventListener?.("change", onClientChange);
+      }
       if (!unsubscribeNetwork) {
         unsubscribeNetwork = (0, _netinfo.addEventListener)(state => {
           const isConnected = state.isConnected === true && state.isInternetReachable !== false;
@@ -40,6 +72,8 @@ const createSessionStore = client => {
       return () => {
         listeners.delete(listener);
         if (listeners.size === 0) {
+          unsubscribeClient?.();
+          unsubscribeClient = undefined;
           unsubscribeNetwork?.();
           unsubscribeNetwork = undefined;
           wasConnected = undefined;
@@ -47,34 +81,8 @@ const createSessionStore = client => {
       };
     },
     ...refreshActions,
-    switchAccount: async accountId => {
-      requestState.invalidate();
-      store.snapshot = {
-        status: "loading",
-        accounts: requestState.getAccounts(),
-        sessions: []
-      };
-      notify();
-      try {
-        await sessionClient.switchAccount(accountId);
-      } finally {
-        await store.refresh(true);
-      }
-    },
-    removeAccount: async accountId => {
-      requestState.invalidate();
-      store.snapshot = {
-        status: "loading",
-        accounts: requestState.getAccounts(),
-        sessions: []
-      };
-      notify();
-      try {
-        await sessionClient.removeAccount(accountId);
-      } finally {
-        await store.refresh(true);
-      }
-    },
+    switchAccount: accountId => runAccountOperation(() => sessionClient.switchAccount(accountId)),
+    removeAccount: accountId => runAccountOperation(() => sessionClient.removeAccount(accountId)),
     logout: async () => {
       if (logoutRequest) {
         return logoutRequest;
@@ -102,6 +110,26 @@ const createSessionStore = client => {
     }
   };
   storeRef.current = store;
+  async function runAccountOperation(operation) {
+    const currentStore = storeRef.current;
+    requestState.invalidate();
+    currentStore.snapshot = {
+      ...currentStore.snapshot,
+      switching: true,
+      accounts: requestState.getAccounts()
+    };
+    notify();
+    try {
+      await operation();
+    } finally {
+      await currentStore.refresh(true);
+      currentStore.snapshot = {
+        ...currentStore.snapshot,
+        switching: false
+      };
+      notify();
+    }
+  }
   return store;
 };
 const getSessionStore = client => {

package/lib/commonjs/modules/auth/session/session-store.js.map

@@ -1 +1 @@
-{"version":3,"names":["_netinfo","require","_logoutSession","_sessionStoreRefresh","_sessionStoreRequestState","stores","WeakMap","createSessionStore","client","sessionClient","listeners","Set","requestState","SessionStoreRequestState","unsubscribeNetwork","wasConnected","logoutRequest","storeRef","notify","forEach","listener","refreshActions","createSessionRefreshActions","current","store","snapshot","status","accounts","getAccounts","sessions","subscribe","add","addNetworkEventListener","state","isConnected","isInternetReachable","shouldRefresh","refresh","delete","size","undefined","switchAccount","accountId","invalidate","removeAccount","logout","logoutSession","revokeSessions","option","getSessionStore","key","existing","get","next","set","exports"],"sourceRoot":"../../../../../src","sources":["modules/auth/session/session-store.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_netinfo","require","_logoutSession","_sessionStoreRefresh","_sessionStoreRequestState","stores","WeakMap","createSessionStore","client","sessionClient","listeners","Set","requestState","SessionStoreRequestState","unsubscribeNetwork","unsubscribeClient","wasConnected","logoutRequest","storeRef","notify","forEach","listener","onClientChange","isLogoutInProgress","current","snapshot","switching","Promise","resolve","then","currentStore","getActiveLogin","refresh","status","invalidate","reason","accounts","getAccounts","sessions","refreshActions","createSessionRefreshActions","store","subscribe","add","addEventListener","removeEventListener","addNetworkEventListener","state","isConnected","isInternetReachable","shouldRefresh","delete","size","undefined","switchAccount","accountId","runAccountOperation","removeAccount","logout","logoutSession","revokeSessions","option","operation","getSessionStore","key","existing","get","next","set","exports"],"sourceRoot":"../../../../../src","sources":["modules/auth/session/session-store.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/modules/helpers/form-items/form-field.js

@@ -28,12 +28,18 @@ const FormField = exports.FormField = /*#__PURE__*/React.memo(({
   const {
     values,
     errors,
-    touched,
+    initialValues,
+    submitCount,
     handleChange,
     handleBlur
   } = React.useContext(context);
+  const [hasChanged, setHasChanged] = React.useState(false);
   const value = React.useMemo(() => (0, _formik.getIn)(values, name), [values, name]);
-  const error = React.useMemo(() => (0, _formik.getIn)(touched, name) && (0, _formik.getIn)(errors, name), [touched, errors, name]);
+  const initialValue = (0, _formik.getIn)(initialValues, name);
+  React.useEffect(() => {
+    setHasChanged(false);
+  }, [initialValue, name]);
+  const error = React.useMemo(() => submitCount > 0 || hasChanged ? (0, _formik.getIn)(errors, name) : undefined, [errors, hasChanged, name, submitCount]);
   const onBlur = e => {
     handleBlur(name)(e);
     props.onBlur?.(e);
@@ -54,7 +60,10 @@ const FormField = exports.FormField = /*#__PURE__*/React.memo(({
         ...props.theme
       },
       error: !!error,
-      onChangeText: onChangeText ?? handleChange(name)
+      onChangeText: nextValue => {
+        setHasChanged(true);
+        (onChangeText ?? handleChange(name))(nextValue);
+      }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       ,
       onBlur: onBlur,

package/lib/commonjs/modules/helpers/form-items/form-field.js.map

@@ -1 +1 @@
-{"version":3,"names":["_formik","require","React","_interopRequireWildcard","_reactI18next","_reactNative","_reactNativePaper","_index","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","FormField","exports","memo","name","context","containerStyle","inputRef","testID","onChangeText","props","useTranslation","theme","useAppTheme","values","errors","touched","handleChange","handleBlur","useContext","value","useMemo","getIn","error","onBlur","jsxs","View","style","gap","spacing","children","jsx","TextInput","autoCapitalize","ref","mode","roundness","borderRadius","onFocus","undefined","HelperText","type"],"sourceRoot":"../../../../../src","sources":["modules/helpers/form-items/form-field.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_formik","require","React","_interopRequireWildcard","_reactI18next","_reactNative","_reactNativePaper","_index","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","FormField","exports","memo","name","context","containerStyle","inputRef","testID","onChangeText","props","useTranslation","theme","useAppTheme","values","errors","initialValues","submitCount","handleChange","handleBlur","useContext","hasChanged","setHasChanged","useState","value","useMemo","getIn","initialValue","useEffect","error","undefined","onBlur","jsxs","View","style","gap","spacing","children","jsx","TextInput","autoCapitalize","ref","mode","roundness","borderRadius","nextValue","onFocus","HelperText","type"],"sourceRoot":"../../../../../src","sources":["modules/helpers/form-items/form-field.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/modules/questionnaire-response-form/README.md

@@ -19,6 +19,8 @@ This README is kept as a source-local contract summary.
 - Provides form validation
 - Supports conditional questions with default values
 - Can create a FHIR-compatible QuestionnaireResponse in the SDK-managed submission mode
+- Accepts `.` or `,` as the decimal separator for decimal text answers
+- Registers English defaults when this module is imported, while preserving existing app translations
 
 ## Usage
 
@@ -80,9 +82,30 @@ const MyComponent = () => {
 
 Choose either the host-owned `onSubmit(values, formikHelpers?)` mode or the SDK-managed
 `onSuccess(response)` mode. `onError(error)` is optional in the SDK-managed mode. The
-SDK-managed path requires the active `@ovok/core` client/profile context, creates a
-completed `QuestionnaireResponse`, adds the patient subject and a stable identifier,
-and persists it with `createResourceIfNoneExist`.
+SDK-managed path requires the active `@ovok/core` client/profile context, adds the
+patient subject and a stable identifier, and persists the `QuestionnaireResponse` with
+`createResourceIfNoneExist`.
+
+When the Questionnaire or one of its items carries the standard SDC
+`sdc-questionnaire-observationExtract` extension set to `true`, SDK-managed submission
+also calls OVOK's `QuestionnaireResponse/$extract` operation. The Questionnaire's
+FHIR mappings define the extracted Observations; the SDK does not infer codes or
+profile mappings from labels. It saves the response as `in-progress`, then submits the
+extracted Observations and changes the response to `completed` in one FHIR transaction.
+The Medplum project must have the `transaction-bundles` feature enabled. If it is not
+enabled, the SDK fails before creating the response rather than leaving partial data.
+The SDK retains the submission identifier for a mapped form instance and adds a
+conditional identifier to extracted Observations, so retrying the same submission does
+not create duplicates. A response is reported as successful only after the transaction
+succeeds and the completed response is reloaded from the server, bypassing the Medplum
+client cache. Unmapped SDK-managed forms keep
+their existing behavior and can create a new response on a later submit.
+
+This orchestration applies only to SDK-managed `onSuccess(response)` submission.
+When `onSubmit` is provided, the host owns persistence and extraction. The extraction
+operation currently persists mapped Observations; it does not imply arbitrary Patient
+demographic fields are updated. Those mappings and any other resource writes must be
+supported by the Questionnaire and backend operation.
 
 Custom `renderItem` controls receive a `constraints` object with `minValue`,
 `maxValue`, `minQuantity`, `maxQuantity`, `step`, `minLength`, `maxLength`,

package/lib/commonjs/modules/questionnaire-response-form/components/fields/questionnaire-text-field.js

@@ -44,8 +44,9 @@ const QuestionnaireTextField = ({
   const handleNumericChange = React.useCallback(numericValue => onChange(String(numericValue)), [onChange]);
   const handleChangeText = React.useCallback(text => {
     if (item.type === "decimal") {
-      if (text === "" || /^-?\d*\.?\d*$/.test(text)) {
-        onChange(text);
+      const normalized = text.replace(",", ".");
+      if (text === "" || /^-?\d*\.?\d*$/.test(normalized)) {
+        onChange(normalized);
       }
     } else if (item.type === "integer") {
       if (text === "" || /^-?\d*$/.test(text)) {

package/lib/commonjs/modules/questionnaire-response-form/components/fields/questionnaire-text-field.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","_interopRequireWildcard","require","_reactI18next","_reactNative","_valueWheelPicker","_index","_index2","_translateFhirText","_index3","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","QuestionnaireTextField","item","value","onChange","testID","keyboardType","constraints","numericOptions","theme","useAppTheme","useTranslation","locale","useQuestionnaireForm","accessibilityHint","minValue","undefined","defaultValue","maxValue","step","filter","Boolean","join","placeholder","translateFhirText","_placeholder","handleNumericChange","useCallback","numericValue","String","handleChangeText","text","type","test","jsx","QuestionnaireFieldWrapper","children","length","ValueWheelPicker","options","Number","accessibilityLabel","_text","accessibilityIncrementLabel","accessibilityDecrementLabel","TextInput","onChangeText","maxLength","style","styles","input","borderColor","colors","outline","backgroundColor","surface","color","onSurface","borderRadius","padding","spacing","exports","StyleSheet","create","fontSize","borderWidth"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/components/fields/questionnaire-text-field.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","_interopRequireWildcard","require","_reactI18next","_reactNative","_valueWheelPicker","_index","_index2","_translateFhirText","_index3","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","QuestionnaireTextField","item","value","onChange","testID","keyboardType","constraints","numericOptions","theme","useAppTheme","useTranslation","locale","useQuestionnaireForm","accessibilityHint","minValue","undefined","defaultValue","maxValue","step","filter","Boolean","join","placeholder","translateFhirText","_placeholder","handleNumericChange","useCallback","numericValue","String","handleChangeText","text","type","normalized","replace","test","jsx","QuestionnaireFieldWrapper","children","length","ValueWheelPicker","options","Number","accessibilityLabel","_text","accessibilityIncrementLabel","accessibilityDecrementLabel","TextInput","onChangeText","maxLength","style","styles","input","borderColor","colors","outline","backgroundColor","surface","color","onSurface","borderRadius","padding","spacing","exports","StyleSheet","create","fontSize","borderWidth"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/components/fields/questionnaire-text-field.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/modules/questionnaire-response-form/components/questionnaire-form-provider.js

@@ -43,6 +43,7 @@ const QuestionnaireFormProvider = exports.QuestionnaireFormProvider = /*#__PURE_
   const [submissionError, setSubmissionError] = _react.default.useState(null);
   const submissionInFlight = _react.default.useRef(false);
   const submissionIdentifier = _react.default.useRef(null);
+  const submissionSignature = _react.default.useRef(null);
   const pages = _react.default.useMemo(() => _formUtils.FormUtils.extractPagesFromQuestionnaire(questionnaire), [questionnaire]);
   const initialValues = _react.default.useMemo(() => _initialValues || _formUtils.FormUtils.initializeDefaultValues(pages), [_initialValues, pages]);
   const handleSubmit = _react.default.useCallback(async (values, formikHelpers) => {
@@ -77,6 +78,15 @@ const QuestionnaireFormProvider = exports.QuestionnaireFormProvider = /*#__PURE_
       response.subject = {
         reference: (0, _core.getReferenceString)(activeProfile)
       };
+      const currentSubmissionSignature = JSON.stringify({
+        questionnaire: response.questionnaire,
+        subject: response.subject.reference,
+        items: response.item
+      });
+      if (submissionSignature.current !== currentSubmissionSignature) {
+        submissionIdentifier.current = null;
+        submissionSignature.current = currentSubmissionSignature;
+      }
       submissionIdentifier.current ??= `${questionnaire.id ?? "unknown"}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
       const identifierValue = submissionIdentifier.current;
       const identifierSystem = "https://sdk.ovok.com/questionnaire-response";
@@ -84,9 +94,12 @@ const QuestionnaireFormProvider = exports.QuestionnaireFormProvider = /*#__PURE_
         system: identifierSystem,
         value: identifierValue
       };
-      const createdResponse = await client.createResourceIfNoneExist(response, `identifier=${identifierSystem}|${identifierValue}`);
+      const extractObservations = _questionnaireSubmitUtils.QuestionnaireSubmitUtils.questionnaireHasObservationExtraction(questionnaire);
+      const createdResponse = await _questionnaireSubmitUtils.QuestionnaireSubmitUtils.persistQuestionnaireResponse(client, response, extractObservations);
       onSuccess?.(createdResponse);
-      submissionIdentifier.current = null;
+      if (!extractObservations) {
+        submissionIdentifier.current = null;
+      }
     } catch (error) {
       const typedError = error;
       onError?.(error);

package/lib/commonjs/modules/questionnaire-response-form/components/questionnaire-form-provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["_core","require","_formik","_react","_interopRequireDefault","_reactI18next","_questionnaireFormContext","_index","_conditionUtils","_formUtils","_formValidation","_questionnaireSubmitUtils","_questionnaireNavigationProvider","_jsxRuntime","e","__esModule","default","QuestionnaireFormProvider","exports","React","memo","children","questionnaire","initialValues","_initialValues","onSubmit","onSuccess","onError","paged","locale","renderItem","resolveQuestionnaireConstraint","resolveQuestionnaireUnitOptions","client","useClient","i18n","useTranslation","resolvedLocale","language","currentPageIndex","setCurrentPageIndex","useState","currentItemIndex","setCurrentItemIndex","errorMessage","setErrorMessage","submissionError","setSubmissionError","submissionInFlight","useRef","submissionIdentifier","pages","useMemo","FormUtils","extractPagesFromQuestionnaire","initializeDefaultValues","handleSubmit","useCallback","values","formikHelpers","current","validationResult","FormValidation","validateRequiredFields","isValid","pageIndex","itemIndex","firstUnansweredLocation","failureReason","currentLinkId","activeProfile","getProfileAsync","Error","response","QuestionnaireSubmitUtils","createQuestionnaireResponse","subject","reference","getReferenceString","id","Date","now","Math","random","toString","slice","identifierValue","identifierSystem","identifier","system","value","createdResponse","createResourceIfNoneExist","error","typedError","message","startsWith","allItems","getAllQuestionnaireItems","formik","useFormik","validateOnBlur","enableReinitialize","validate","cleanedValues","hasChanges","enabledLinkIds","Set","flatMap","page","ConditionUtils","getEnabledItemsForPage","map","item","linkId","forEach","has","undefined","setValues","Object","some","setFieldError","setFieldValue","retrySubmit","submitForm","currentPage","enabledItems","useEffect","length","max","min","useInitialSelectedValues","currentItem","allEnabledItems","contextValue","jsx","QuestionnaireFormContext","Provider","QuestionnaireNavigationProvider"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/components/questionnaire-form-provider.tsx"],"mappings":";;;;;;AAEA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,aAAA,GAAAJ,OAAA;AAEA,IAAAK,yBAAA,GAAAL,OAAA;AACA,IAAAM,MAAA,GAAAN,OAAA;AAGA,IAAAO,eAAA,GAAAP,OAAA;AACA,IAAAQ,UAAA,GAAAR,OAAA;AACA,IAAAS,eAAA,GAAAT,OAAA;AACA,IAAAU,yBAAA,GAAAV,OAAA;AAEA,IAAAW,gCAAA,GAAAX,OAAA;AAAsF,IAAAY,WAAA,GAAAZ,OAAA;AAAA,SAAAG,uBAAAU,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAhBtF;;AAkBO,MAAMG,yBAAyB,GAAAC,OAAA,CAAAD,yBAAA,gBAAGE,cAAK,CAACC,IAAI,CACjD,CAAC;EACCC,QAAQ;EACRC,aAAa;EACbC,aAAa,EAAEC,cAAc;EAC7BC,QAAQ;EACRC,SAAS;EACTC,OAAO;EACPC,KAAK,GAAG,IAAI;EACZC,MAAM;EACNC,UAAU;EACVC,8BAA8B;EAC9BC;AACuD,CAAC,KAAK;EAC7D,MAAMC,MAAM,GAAG,IAAAC,eAAS,EAAC,CAAC;EAC1B,MAAM;IAAEC;EAAK,CAAC,GAAG,IAAAC,4BAAc,EAAC,CAAC;EACjC,MAAMC,cAAc,GAAGR,MAAM,IAAIM,IAAI,EAAEG,QAAQ,IAAIhB,aAAa,CAACgB,QAAQ;EAEzE,MAAM,CAACC,gBAAgB,EAAEC,mBAAmB,CAAC,GAAGrB,cAAK,CAACsB,QAAQ,CAAC,CAAC,CAAC;EACjE,MAAM,CAACC,gBAAgB,EAAEC,mBAAmB,CAAC,GAAGxB,cAAK,CAACsB,QAAQ,CAAC,CAAC,CAAC;EACjE,MAAM,CAACG,YAAY,EAAEC,eAAe,CAAC,GAAG1B,cAAK,CAACsB,QAAQ,CAAgB,IAAI,CAAC;EAE3E,MAAM,CAACK,eAAe,EAAEC,kBAAkB,CAAC,GAAG5B,cAAK,CAACsB,QAAQ,CAC1D,IACF,CAAC;EAED,MAAMO,kBAAkB,GAAG7B,cAAK,CAAC8B,MAAM,CAAC,KAAK,CAAC;EAC9C,MAAMC,oBAAoB,GAAG/B,cAAK,CAAC8B,MAAM,CAAgB,IAAI,CAAC;EAE9D,MAAME,KAAK,GAAGhC,cAAK,CAACiC,OAAO,CACzB,MAAMC,oBAAS,CAACC,6BAA6B,CAAChC,aAAa,CAAC,EAC5D,CAACA,aAAa,CAChB,CAAC;EAED,MAAMC,aAAa,GAAGJ,cAAK,CAACiC,OAAO,CACjC,MAAM5B,cAAc,IAAI6B,oBAAS,CAACE,uBAAuB,CAACJ,KAAK,CAAC,EAChE,CAAC3B,cAAc,EAAE2B,KAAK,CACxB,CAAC;EAED,MAAMK,YAAY,GAAGrC,cAAK,CAACsC,WAAW,CACpC,OACEC,MAA+B,EAC/BC,aAAqD,KAClD;IACH,IAAIX,kBAAkB,CAACY,OAAO,EAAE;MAC9B;IACF;IAEAZ,kBAAkB,CAACY,OAAO,GAAG,IAAI;IACjCb,kBAAkB,CAAC,IAAI,CAAC;IAExB,IAAI;MACF,MAAMc,gBAAgB,GAAGC,8BAAc,CAACC,sBAAsB,CAC5DZ,KAAK,EACLO,MAAM,EACN5B,UAAU,EACVC,8BAA8B,EAC9BC,+BACF,CAAC;MAED,IAAI,CAAC6B,gBAAgB,CAACG,OAAO,EAAE;QAC7B,MAAM;UAAEC,SAAS;UAAEC;QAAU,CAAC,GAC5BL,gBAAgB,CAACM,uBAAwB;QAE3C3B,mBAAmB,CAACyB,SAAS,CAAC;QAC9BtB,mBAAmB,CAACuB,SAAS,CAAC;QAC9BrB,eAAe,CACbgB,gBAAgB,CAACO,aAAa,KAAK,UAAU,GACzC,0CAA0C,GAC1C,yCACN,CAAC;QAED;MACF;MAEA,OAAOV,MAAM,CAACW,aAAa;MAE3B,IAAI5C,QAAQ,EAAE;QACZ,MAAMA,QAAQ,CAACiC,MAAM,EAAEC,aAAa,CAAC;QACrCT,oBAAoB,CAACU,OAAO,GAAG,IAAI;QAEnC;MACF;MAEA,MAAMU,aAAa,GAAG,MAAMrC,MAAM,CAACsC,eAAe,CAAC,CAAC;MAEpD,IAAI,CAACD,aAAa,EAAE;QAClB,MAAM,IAAIE,KAAK,CAAC,4CAA4C,CAAC;MAC/D;MAEA,MAAMC,QAAQ,GAAGC,kDAAwB,CAACC,2BAA2B,CACnEjB,MAAM,EACNP,KAAK,EACL7B,aAAa,EACbQ,UAAU,EACVC,8BAA8B,EAC9BC,+BACF,CAAC;MAEDyC,QAAQ,CAACG,OAAO,GAAG;QACjBC,SAAS,EAAE,IAAAC,wBAAkB,EAACR,aAAa;MAC7C,CAAC;MAEDpB,oBAAoB,CAACU,OAAO,KAAK,GAAGtC,aAAa,CAACyD,EAAE,IAAI,SAAS,IAAIC,IAAI,CAACC,GAAG,CAAC,CAAC,IAAIC,IAAI,CAACC,MAAM,CAAC,CAAC,CAACC,QAAQ,CAAC,EAAE,CAAC,CAACC,KAAK,CAAC,CAAC,CAAC,EAAE;MACxH,MAAMC,eAAe,GAAGpC,oBAAoB,CAACU,OAAO;MAEpD,MAAM2B,gBAAgB,GACpB,6CAA6C;MAE/Cd,QAAQ,CAACe,UAAU,GAAG;QACpBC,MAAM,EAAEF,gBAAgB;QACxBG,KAAK,EAAEJ;MACT,CAAC;MAED,MAAMK,eAAe,GAAG,MAAM1D,MAAM,CAAC2D,yBAAyB,CAC5DnB,QAAQ,EACR,cAAcc,gBAAgB,IAAID,eAAe,EACnD,CAAC;MAED5D,SAAS,GAAGiE,eAAe,CAAC;MAC5BzC,oBAAoB,CAACU,OAAO,GAAG,IAAI;IACrC,CAAC,CAAC,OAAOiC,KAAK,EAAE;MACd,MAAMC,UAAU,GAAGD,KAAc;MAEjClE,OAAO,GAAGkE,KAAc,CAAC;MACzB9C,kBAAkB,CAChB+C,UAAU,CAACC,OAAO,EAAEC,UAAU,CAAC,qBAAqB,CAAC,GACjDF,UAAU,CAACC,OAAO,GAClB,wCACN,CAAC;IACH,CAAC,SAAS;MACR/C,kBAAkB,CAACY,OAAO,GAAG,KAAK;IACpC;EACF,CAAC,EACD,CACEnC,QAAQ,EACRC,SAAS,EACTC,OAAO,EACPwB,KAAK,EACL7B,aAAa,EACbW,MAAM,EACNH,UAAU,EACVC,8BAA8B,EAC9BC,+BAA+B,CAEnC,CAAC;EAED,MAAMiE,QAAQ,GAAG9E,cAAK,CAACiC,OAAO,CAC5B,MAAMC,oBAAS,CAAC6C,wBAAwB,CAAC/C,KAAK,CAAC,EAC/C,CAACA,KAAK,CACR,CAAC;EAED,MAAMgD,MAAM,GAAG,IAAAC,iBAAS,EAA0B;IAChD7E,aAAa;IACbE,QAAQ,EAAE+B,YAAY;IACtB6C,cAAc,EAAE,IAAI;IACpBC,kBAAkB,EAAE,IAAI;IACxBC,QAAQ,EAAG7C,MAAM,IAAK;MACpB,MAAM8C,aAAa,GAAG;QAAE,GAAG9C;MAAO,CAAC;MACnC,IAAI+C,UAAU,GAAG,KAAK;MAEtB,MAAMC,cAAc,GAAG,IAAIC,GAAG,CAC5BxD,KAAK,CAACyD,OAAO,CAAEC,IAAI,IACjBC,8BAAc,CAACC,sBAAsB,CAACF,IAAI,EAAEL,aAAa,CAAC,CAACQ,GAAG,CAC3DC,IAAI,IAAKA,IAAI,CAACC,MAAM,IAAI,EAC3B,CACF,CACF,CAAC;MAEDjB,QAAQ,CAACkB,OAAO,CAAEF,IAAI,IAAK;QACzB,MAAMC,MAAM,GAAGD,IAAI,CAACC,MAAM,IAAI,EAAE;QAEhC,IACEA,MAAM,KAAKxD,MAAM,CAACW,aAAa,IAC/B6C,MAAM,IACN,CAACR,cAAc,CAACU,GAAG,CAACF,MAAM,CAAC,IAC3BV,aAAa,CAACU,MAAM,CAAC,KAAKG,SAAS,EACnC;UACA,OAAOb,aAAa,CAACU,MAAM,CAAC;UAC5BT,UAAU,GAAG,IAAI;QACnB;MACF,CAAC,CAAC;MAEF,IAAIA,UAAU,EAAE;QACdN,MAAM,CAACmB,SAAS,CAACd,aAAa,CAAC;MACjC;MAEA,IAAI,CAAC5E,KAAK,IAAI2F,MAAM,CAAC7D,MAAM,CAAC8C,aAAa,CAAC,CAACgB,IAAI,CAAE9B,KAAK,IAAK,CAACA,KAAK,CAAC,EAAE;QAClES,MAAM,CAACsB,aAAa,CAClB,QAAQ,EACR,0CACF,CAAC;MACH;MAEA,OAAO,CAAC,CAAC;IACX;EACF,CAAC,CAAC;EAEF,MAAM;IAAE/D,MAAM;IAAEgE;EAAc,CAAC,GAAGvB,MAAM;EAExC,MAAMwB,WAAW,GAAGxG,cAAK,CAACsC,WAAW,CAAC,MAAM;IAC1CV,kBAAkB,CAAC,IAAI,CAAC;IACxB,KAAKoD,MAAM,CAACyB,UAAU,CAAC,CAAC;EAC1B,CAAC,EAAE,CAACzB,MAAM,CAAC,CAAC;EAEZ,MAAM0B,WAAW,GAAG1G,cAAK,CAACiC,OAAO,CAC/B,MAAMD,KAAK,CAACZ,gBAAgB,CAAE,EAC9B,CAACY,KAAK,EAAEZ,gBAAgB,CAC1B,CAAC;EAED,MAAMuF,YAAY,GAAG3G,cAAK,CAACiC,OAAO,CAChC,MACEyE,WAAW,GACPf,8BAAc,CAACC,sBAAsB,CAACc,WAAW,EAAEnE,MAAM,CAAC,GAC1D,EAAE,EACR,CAACmE,WAAW,EAAEnE,MAAM,CACtB,CAAC;EAEDvC,cAAK,CAAC4G,SAAS,CAAC,MAAM;IACpB,IAAID,YAAY,CAACE,MAAM,KAAK,CAAC,EAAE;MAC7B,IAAItF,gBAAgB,KAAK,CAAC,EAAE;QAC1BC,mBAAmB,CAAC,CAAC,CAAC;MACxB;MAEA;IACF;IAEA,IAAID,gBAAgB,GAAG,CAAC,IAAIA,gBAAgB,IAAIoF,YAAY,CAACE,MAAM,EAAE;MACnErF,mBAAmB,CACjBuC,IAAI,CAAC+C,GAAG,CAAC,CAAC,EAAE/C,IAAI,CAACgD,GAAG,CAACxF,gBAAgB,EAAEoF,YAAY,CAACE,MAAM,GAAG,CAAC,CAAC,CACjE,CAAC;IACH;EACF,CAAC,EAAE,CAACF,YAAY,CAACE,MAAM,EAAEtF,gBAAgB,EAAEC,mBAAmB,CAAC,CAAC;EAEhE,IAAAwF,+BAAwB,EAAChF,KAAK,EAAEO,MAAM,EAAEgE,aAAa,CAAC;EAEtD,MAAMU,WAAW,GAAGjH,cAAK,CAACiC,OAAO,CAC/B,MAAM0E,YAAY,CAACpF,gBAAgB,CAAC,EACpC,CAACoF,YAAY,EAAEpF,gBAAgB,CACjC,CAAC;EAED,MAAM2F,eAAe,GAAGlH,cAAK,CAACiC,OAAO,CACnC,MACED,KAAK,CAACyD,OAAO,CAAEC,IAAI,IACjBC,8BAAc,CAACC,sBAAsB,CAACF,IAAI,EAAEnD,MAAM,CACpD,CAAC,EACH,CAACP,KAAK,EAAEO,MAAM,CAChB,CAAC;EAEDvC,cAAK,CAAC4G,SAAS,CAAC,MAAM;IACpBL,aAAa,CAAC,eAAe,EAAEU,WAAW,EAAElB,MAAM,IAAI,EAAE,EAAE,KAAK,CAAC;EAClE,CAAC,EAAE,CAACkB,WAAW,EAAElB,MAAM,EAAEQ,aAAa,CAAC,CAAC;EAExC,MAAMY,YAAY,GAAGnH,cAAK,CAACiC,OAAO,CAChC,OAAO;IACL9B,aAAa;IACb8G,WAAW;IACXP,WAAW;IACXtF,gBAAgB;IAChBG,gBAAgB;IAChBE,YAAY;IACZE,eAAe;IACf6E,WAAW;IACXxE,KAAK;IACL8C,QAAQ;IACRtD,mBAAmB;IACnBH,mBAAmB;IACnBK,eAAe;IACfjB,KAAK;IACLC,MAAM,EAAEQ,cAAc;IACtBP,UAAU;IACVC,8BAA8B;IAC9BC,+BAA+B;IAC/B,GAAGmE;EACL,CAAC,CAAC,EACF,CACE7E,aAAa,EACb8G,WAAW,EACXP,WAAW,EACXtF,gBAAgB,EAChBG,gBAAgB,EAChBE,YAAY,EACZE,eAAe,EACf6E,WAAW,EACXxE,KAAK,EACL8C,QAAQ,EACRtD,mBAAmB,EACnBH,mBAAmB,EACnBK,eAAe,EACfjB,KAAK,EACLS,cAAc,EACdP,UAAU,EACVC,8BAA8B,EAC9BC,+BAA+B,EAC/BmE,MAAM,CAEV,CAAC;EAED,oBACE,IAAAtF,WAAA,CAAA0H,GAAA,EAACjI,yBAAA,CAAAkI,wBAAwB,CAACC,QAAQ;IAAC/C,KAAK,EAAE4C,YAAa;IAAAjH,QAAA,eACrD,IAAAR,WAAA,CAAA0H,GAAA,EAAC3H,gCAAA,CAAA8H,+BAA+B;MAC9BN,WAAW,EAAEA,WAAY;MACzBP,WAAW,EAAEA,WAAY;MACzBC,YAAY,EAAEA,YAAa;MAC3BO,eAAe,EAAEA,eAAgB;MACjClF,KAAK,EAAEA,KAAM;MACbO,MAAM,EAAEA,MAAO;MACfhB,gBAAgB,EAAEA,gBAAiB;MACnCH,gBAAgB,EAAEA,gBAAiB;MACnCI,mBAAmB,EAAEA,mBAAoB;MACzCH,mBAAmB,EAAEA,mBAAoB;MACzCK,eAAe,EAAEA,eAAgB;MACjCsD,MAAM,EAAEA,MAAO;MACfrE,UAAU,EAAEA,UAAW;MACvBC,8BAA8B,EAAEA,8BAA+B;MAC/DC,+BAA+B,EAAEA,+BAAgC;MAAAX,QAAA,EAEhEA;IAAQ,CACsB;EAAC,CACD,CAAC;AAExC,CACF,CAAC","ignoreList":[]}
+{"version":3,"names":["_core","require","_formik","_react","_interopRequireDefault","_reactI18next","_questionnaireFormContext","_index","_conditionUtils","_formUtils","_formValidation","_questionnaireSubmitUtils","_questionnaireNavigationProvider","_jsxRuntime","e","__esModule","default","QuestionnaireFormProvider","exports","React","memo","children","questionnaire","initialValues","_initialValues","onSubmit","onSuccess","onError","paged","locale","renderItem","resolveQuestionnaireConstraint","resolveQuestionnaireUnitOptions","client","useClient","i18n","useTranslation","resolvedLocale","language","currentPageIndex","setCurrentPageIndex","useState","currentItemIndex","setCurrentItemIndex","errorMessage","setErrorMessage","submissionError","setSubmissionError","submissionInFlight","useRef","submissionIdentifier","submissionSignature","pages","useMemo","FormUtils","extractPagesFromQuestionnaire","initializeDefaultValues","handleSubmit","useCallback","values","formikHelpers","current","validationResult","FormValidation","validateRequiredFields","isValid","pageIndex","itemIndex","firstUnansweredLocation","failureReason","currentLinkId","activeProfile","getProfileAsync","Error","response","QuestionnaireSubmitUtils","createQuestionnaireResponse","subject","reference","getReferenceString","currentSubmissionSignature","JSON","stringify","items","item","id","Date","now","Math","random","toString","slice","identifierValue","identifierSystem","identifier","system","value","extractObservations","questionnaireHasObservationExtraction","createdResponse","persistQuestionnaireResponse","error","typedError","message","startsWith","allItems","getAllQuestionnaireItems","formik","useFormik","validateOnBlur","enableReinitialize","validate","cleanedValues","hasChanges","enabledLinkIds","Set","flatMap","page","ConditionUtils","getEnabledItemsForPage","map","linkId","forEach","has","undefined","setValues","Object","some","setFieldError","setFieldValue","retrySubmit","submitForm","currentPage","enabledItems","useEffect","length","max","min","useInitialSelectedValues","currentItem","allEnabledItems","contextValue","jsx","QuestionnaireFormContext","Provider","QuestionnaireNavigationProvider"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/components/questionnaire-form-provider.tsx"],"mappings":";;;;;;AAEA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,aAAA,GAAAJ,OAAA;AAEA,IAAAK,yBAAA,GAAAL,OAAA;AACA,IAAAM,MAAA,GAAAN,OAAA;AAGA,IAAAO,eAAA,GAAAP,OAAA;AACA,IAAAQ,UAAA,GAAAR,OAAA;AACA,IAAAS,eAAA,GAAAT,OAAA;AACA,IAAAU,yBAAA,GAAAV,OAAA;AAEA,IAAAW,gCAAA,GAAAX,OAAA;AAAsF,IAAAY,WAAA,GAAAZ,OAAA;AAAA,SAAAG,uBAAAU,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAhBtF;;AAkBO,MAAMG,yBAAyB,GAAAC,OAAA,CAAAD,yBAAA,gBAAGE,cAAK,CAACC,IAAI,CACjD,CAAC;EACCC,QAAQ;EACRC,aAAa;EACbC,aAAa,EAAEC,cAAc;EAC7BC,QAAQ;EACRC,SAAS;EACTC,OAAO;EACPC,KAAK,GAAG,IAAI;EACZC,MAAM;EACNC,UAAU;EACVC,8BAA8B;EAC9BC;AACuD,CAAC,KAAK;EAC7D,MAAMC,MAAM,GAAG,IAAAC,eAAS,EAAC,CAAC;EAC1B,MAAM;IAAEC;EAAK,CAAC,GAAG,IAAAC,4BAAc,EAAC,CAAC;EACjC,MAAMC,cAAc,GAAGR,MAAM,IAAIM,IAAI,EAAEG,QAAQ,IAAIhB,aAAa,CAACgB,QAAQ;EAEzE,MAAM,CAACC,gBAAgB,EAAEC,mBAAmB,CAAC,GAAGrB,cAAK,CAACsB,QAAQ,CAAC,CAAC,CAAC;EACjE,MAAM,CAACC,gBAAgB,EAAEC,mBAAmB,CAAC,GAAGxB,cAAK,CAACsB,QAAQ,CAAC,CAAC,CAAC;EACjE,MAAM,CAACG,YAAY,EAAEC,eAAe,CAAC,GAAG1B,cAAK,CAACsB,QAAQ,CAAgB,IAAI,CAAC;EAE3E,MAAM,CAACK,eAAe,EAAEC,kBAAkB,CAAC,GAAG5B,cAAK,CAACsB,QAAQ,CAC1D,IACF,CAAC;EAED,MAAMO,kBAAkB,GAAG7B,cAAK,CAAC8B,MAAM,CAAC,KAAK,CAAC;EAC9C,MAAMC,oBAAoB,GAAG/B,cAAK,CAAC8B,MAAM,CAAgB,IAAI,CAAC;EAC9D,MAAME,mBAAmB,GAAGhC,cAAK,CAAC8B,MAAM,CAAgB,IAAI,CAAC;EAE7D,MAAMG,KAAK,GAAGjC,cAAK,CAACkC,OAAO,CACzB,MAAMC,oBAAS,CAACC,6BAA6B,CAACjC,aAAa,CAAC,EAC5D,CAACA,aAAa,CAChB,CAAC;EAED,MAAMC,aAAa,GAAGJ,cAAK,CAACkC,OAAO,CACjC,MAAM7B,cAAc,IAAI8B,oBAAS,CAACE,uBAAuB,CAACJ,KAAK,CAAC,EAChE,CAAC5B,cAAc,EAAE4B,KAAK,CACxB,CAAC;EAED,MAAMK,YAAY,GAAGtC,cAAK,CAACuC,WAAW,CACpC,OACEC,MAA+B,EAC/BC,aAAqD,KAClD;IACH,IAAIZ,kBAAkB,CAACa,OAAO,EAAE;MAC9B;IACF;IAEAb,kBAAkB,CAACa,OAAO,GAAG,IAAI;IACjCd,kBAAkB,CAAC,IAAI,CAAC;IAExB,IAAI;MACF,MAAMe,gBAAgB,GAAGC,8BAAc,CAACC,sBAAsB,CAC5DZ,KAAK,EACLO,MAAM,EACN7B,UAAU,EACVC,8BAA8B,EAC9BC,+BACF,CAAC;MAED,IAAI,CAAC8B,gBAAgB,CAACG,OAAO,EAAE;QAC7B,MAAM;UAAEC,SAAS;UAAEC;QAAU,CAAC,GAC5BL,gBAAgB,CAACM,uBAAwB;QAE3C5B,mBAAmB,CAAC0B,SAAS,CAAC;QAC9BvB,mBAAmB,CAACwB,SAAS,CAAC;QAC9BtB,eAAe,CACbiB,gBAAgB,CAACO,aAAa,KAAK,UAAU,GACzC,0CAA0C,GAC1C,yCACN,CAAC;QAED;MACF;MAEA,OAAOV,MAAM,CAACW,aAAa;MAE3B,IAAI7C,QAAQ,EAAE;QACZ,MAAMA,QAAQ,CAACkC,MAAM,EAAEC,aAAa,CAAC;QACrCV,oBAAoB,CAACW,OAAO,GAAG,IAAI;QAEnC;MACF;MAEA,MAAMU,aAAa,GAAG,MAAMtC,MAAM,CAACuC,eAAe,CAAC,CAAC;MAEpD,IAAI,CAACD,aAAa,EAAE;QAClB,MAAM,IAAIE,KAAK,CAAC,4CAA4C,CAAC;MAC/D;MAEA,MAAMC,QAAQ,GAAGC,kDAAwB,CAACC,2BAA2B,CACnEjB,MAAM,EACNP,KAAK,EACL9B,aAAa,EACbQ,UAAU,EACVC,8BAA8B,EAC9BC,+BACF,CAAC;MAED0C,QAAQ,CAACG,OAAO,GAAG;QACjBC,SAAS,EAAE,IAAAC,wBAAkB,EAACR,aAAa;MAC7C,CAAC;MAED,MAAMS,0BAA0B,GAAGC,IAAI,CAACC,SAAS,CAAC;QAChD5D,aAAa,EAAEoD,QAAQ,CAACpD,aAAa;QACrCuD,OAAO,EAAEH,QAAQ,CAACG,OAAO,CAACC,SAAS;QACnCK,KAAK,EAAET,QAAQ,CAACU;MAClB,CAAC,CAAC;MAEF,IAAIjC,mBAAmB,CAACU,OAAO,KAAKmB,0BAA0B,EAAE;QAC9D9B,oBAAoB,CAACW,OAAO,GAAG,IAAI;QACnCV,mBAAmB,CAACU,OAAO,GAAGmB,0BAA0B;MAC1D;MAEA9B,oBAAoB,CAACW,OAAO,KAAK,GAAGvC,aAAa,CAAC+D,EAAE,IAAI,SAAS,IAAIC,IAAI,CAACC,GAAG,CAAC,CAAC,IAAIC,IAAI,CAACC,MAAM,CAAC,CAAC,CAACC,QAAQ,CAAC,EAAE,CAAC,CAACC,KAAK,CAAC,CAAC,CAAC,EAAE;MACxH,MAAMC,eAAe,GAAG1C,oBAAoB,CAACW,OAAO;MAEpD,MAAMgC,gBAAgB,GACpB,6CAA6C;MAE/CnB,QAAQ,CAACoB,UAAU,GAAG;QACpBC,MAAM,EAAEF,gBAAgB;QACxBG,KAAK,EAAEJ;MACT,CAAC;MAED,MAAMK,mBAAmB,GACvBtB,kDAAwB,CAACuB,qCAAqC,CAC5D5E,aACF,CAAC;MAEH,MAAM6E,eAAe,GACnB,MAAMxB,kDAAwB,CAACyB,4BAA4B,CACzDnE,MAAM,EACNyC,QAAQ,EACRuB,mBACF,CAAC;MAEHvE,SAAS,GAAGyE,eAAe,CAAC;MAC5B,IAAI,CAACF,mBAAmB,EAAE;QACxB/C,oBAAoB,CAACW,OAAO,GAAG,IAAI;MACrC;IACF,CAAC,CAAC,OAAOwC,KAAK,EAAE;MACd,MAAMC,UAAU,GAAGD,KAAc;MAEjC1E,OAAO,GAAG0E,KAAc,CAAC;MACzBtD,kBAAkB,CAChBuD,UAAU,CAACC,OAAO,EAAEC,UAAU,CAAC,qBAAqB,CAAC,GACjDF,UAAU,CAACC,OAAO,GAClB,wCACN,CAAC;IACH,CAAC,SAAS;MACRvD,kBAAkB,CAACa,OAAO,GAAG,KAAK;IACpC;EACF,CAAC,EACD,CACEpC,QAAQ,EACRC,SAAS,EACTC,OAAO,EACPyB,KAAK,EACL9B,aAAa,EACbW,MAAM,EACNH,UAAU,EACVC,8BAA8B,EAC9BC,+BAA+B,CAEnC,CAAC;EAED,MAAMyE,QAAQ,GAAGtF,cAAK,CAACkC,OAAO,CAC5B,MAAMC,oBAAS,CAACoD,wBAAwB,CAACtD,KAAK,CAAC,EAC/C,CAACA,KAAK,CACR,CAAC;EAED,MAAMuD,MAAM,GAAG,IAAAC,iBAAS,EAA0B;IAChDrF,aAAa;IACbE,QAAQ,EAAEgC,YAAY;IACtBoD,cAAc,EAAE,IAAI;IACpBC,kBAAkB,EAAE,IAAI;IACxBC,QAAQ,EAAGpD,MAAM,IAAK;MACpB,MAAMqD,aAAa,GAAG;QAAE,GAAGrD;MAAO,CAAC;MACnC,IAAIsD,UAAU,GAAG,KAAK;MAEtB,MAAMC,cAAc,GAAG,IAAIC,GAAG,CAC5B/D,KAAK,CAACgE,OAAO,CAAEC,IAAI,IACjBC,8BAAc,CAACC,sBAAsB,CAACF,IAAI,EAAEL,aAAa,CAAC,CAACQ,GAAG,CAC3DpC,IAAI,IAAKA,IAAI,CAACqC,MAAM,IAAI,EAC3B,CACF,CACF,CAAC;MAEDhB,QAAQ,CAACiB,OAAO,CAAEtC,IAAI,IAAK;QACzB,MAAMqC,MAAM,GAAGrC,IAAI,CAACqC,MAAM,IAAI,EAAE;QAEhC,IACEA,MAAM,KAAK9D,MAAM,CAACW,aAAa,IAC/BmD,MAAM,IACN,CAACP,cAAc,CAACS,GAAG,CAACF,MAAM,CAAC,IAC3BT,aAAa,CAACS,MAAM,CAAC,KAAKG,SAAS,EACnC;UACA,OAAOZ,aAAa,CAACS,MAAM,CAAC;UAC5BR,UAAU,GAAG,IAAI;QACnB;MACF,CAAC,CAAC;MAEF,IAAIA,UAAU,EAAE;QACdN,MAAM,CAACkB,SAAS,CAACb,aAAa,CAAC;MACjC;MAEA,IAAI,CAACpF,KAAK,IAAIkG,MAAM,CAACnE,MAAM,CAACqD,aAAa,CAAC,CAACe,IAAI,CAAE/B,KAAK,IAAK,CAACA,KAAK,CAAC,EAAE;QAClEW,MAAM,CAACqB,aAAa,CAClB,QAAQ,EACR,0CACF,CAAC;MACH;MAEA,OAAO,CAAC,CAAC;IACX;EACF,CAAC,CAAC;EAEF,MAAM;IAAErE,MAAM;IAAEsE;EAAc,CAAC,GAAGtB,MAAM;EAExC,MAAMuB,WAAW,GAAG/G,cAAK,CAACuC,WAAW,CAAC,MAAM;IAC1CX,kBAAkB,CAAC,IAAI,CAAC;IACxB,KAAK4D,MAAM,CAACwB,UAAU,CAAC,CAAC;EAC1B,CAAC,EAAE,CAACxB,MAAM,CAAC,CAAC;EAEZ,MAAMyB,WAAW,GAAGjH,cAAK,CAACkC,OAAO,CAC/B,MAAMD,KAAK,CAACb,gBAAgB,CAAE,EAC9B,CAACa,KAAK,EAAEb,gBAAgB,CAC1B,CAAC;EAED,MAAM8F,YAAY,GAAGlH,cAAK,CAACkC,OAAO,CAChC,MACE+E,WAAW,GACPd,8BAAc,CAACC,sBAAsB,CAACa,WAAW,EAAEzE,MAAM,CAAC,GAC1D,EAAE,EACR,CAACyE,WAAW,EAAEzE,MAAM,CACtB,CAAC;EAEDxC,cAAK,CAACmH,SAAS,CAAC,MAAM;IACpB,IAAID,YAAY,CAACE,MAAM,KAAK,CAAC,EAAE;MAC7B,IAAI7F,gBAAgB,KAAK,CAAC,EAAE;QAC1BC,mBAAmB,CAAC,CAAC,CAAC;MACxB;MAEA;IACF;IAEA,IAAID,gBAAgB,GAAG,CAAC,IAAIA,gBAAgB,IAAI2F,YAAY,CAACE,MAAM,EAAE;MACnE5F,mBAAmB,CACjB6C,IAAI,CAACgD,GAAG,CAAC,CAAC,EAAEhD,IAAI,CAACiD,GAAG,CAAC/F,gBAAgB,EAAE2F,YAAY,CAACE,MAAM,GAAG,CAAC,CAAC,CACjE,CAAC;IACH;EACF,CAAC,EAAE,CAACF,YAAY,CAACE,MAAM,EAAE7F,gBAAgB,EAAEC,mBAAmB,CAAC,CAAC;EAEhE,IAAA+F,+BAAwB,EAACtF,KAAK,EAAEO,MAAM,EAAEsE,aAAa,CAAC;EAEtD,MAAMU,WAAW,GAAGxH,cAAK,CAACkC,OAAO,CAC/B,MAAMgF,YAAY,CAAC3F,gBAAgB,CAAC,EACpC,CAAC2F,YAAY,EAAE3F,gBAAgB,CACjC,CAAC;EAED,MAAMkG,eAAe,GAAGzH,cAAK,CAACkC,OAAO,CACnC,MACED,KAAK,CAACgE,OAAO,CAAEC,IAAI,IACjBC,8BAAc,CAACC,sBAAsB,CAACF,IAAI,EAAE1D,MAAM,CACpD,CAAC,EACH,CAACP,KAAK,EAAEO,MAAM,CAChB,CAAC;EAEDxC,cAAK,CAACmH,SAAS,CAAC,MAAM;IACpBL,aAAa,CAAC,eAAe,EAAEU,WAAW,EAAElB,MAAM,IAAI,EAAE,EAAE,KAAK,CAAC;EAClE,CAAC,EAAE,CAACkB,WAAW,EAAElB,MAAM,EAAEQ,aAAa,CAAC,CAAC;EAExC,MAAMY,YAAY,GAAG1H,cAAK,CAACkC,OAAO,CAChC,OAAO;IACL/B,aAAa;IACbqH,WAAW;IACXP,WAAW;IACX7F,gBAAgB;IAChBG,gBAAgB;IAChBE,YAAY;IACZE,eAAe;IACfoF,WAAW;IACX9E,KAAK;IACLqD,QAAQ;IACR9D,mBAAmB;IACnBH,mBAAmB;IACnBK,eAAe;IACfjB,KAAK;IACLC,MAAM,EAAEQ,cAAc;IACtBP,UAAU;IACVC,8BAA8B;IAC9BC,+BAA+B;IAC/B,GAAG2E;EACL,CAAC,CAAC,EACF,CACErF,aAAa,EACbqH,WAAW,EACXP,WAAW,EACX7F,gBAAgB,EAChBG,gBAAgB,EAChBE,YAAY,EACZE,eAAe,EACfoF,WAAW,EACX9E,KAAK,EACLqD,QAAQ,EACR9D,mBAAmB,EACnBH,mBAAmB,EACnBK,eAAe,EACfjB,KAAK,EACLS,cAAc,EACdP,UAAU,EACVC,8BAA8B,EAC9BC,+BAA+B,EAC/B2E,MAAM,CAEV,CAAC;EAED,oBACE,IAAA9F,WAAA,CAAAiI,GAAA,EAACxI,yBAAA,CAAAyI,wBAAwB,CAACC,QAAQ;IAAChD,KAAK,EAAE6C,YAAa;IAAAxH,QAAA,eACrD,IAAAR,WAAA,CAAAiI,GAAA,EAAClI,gCAAA,CAAAqI,+BAA+B;MAC9BN,WAAW,EAAEA,WAAY;MACzBP,WAAW,EAAEA,WAAY;MACzBC,YAAY,EAAEA,YAAa;MAC3BO,eAAe,EAAEA,eAAgB;MACjCxF,KAAK,EAAEA,KAAM;MACbO,MAAM,EAAEA,MAAO;MACfjB,gBAAgB,EAAEA,gBAAiB;MACnCH,gBAAgB,EAAEA,gBAAiB;MACnCI,mBAAmB,EAAEA,mBAAoB;MACzCH,mBAAmB,EAAEA,mBAAoB;MACzCK,eAAe,EAAEA,eAAgB;MACjC8D,MAAM,EAAEA,MAAO;MACf7E,UAAU,EAAEA,UAAW;MACvBC,8BAA8B,EAAEA,8BAA+B;MAC/DC,+BAA+B,EAAEA,+BAAgC;MAAAX,QAAA,EAEhEA;IAAQ,CACsB;EAAC,CACD,CAAC;AAExC,CACF,CAAC","ignoreList":[]}