@ovok/native 1.6.0 → 1.6.2

package/lib/module/modules/helpers/utils/telemetry.js

@@ -5,6 +5,8 @@
 
 const INSTRUMENTATION_NAME = "@ovok/native";
 const INSTRUMENTATION_VERSION = "1.6.0";
+const openTelemetryModuleName = "@opentelemetry/api";
+const openTelemetryLogsModuleName = "@opentelemetry/api-logs";
 let configuredOptions = {};
 let openTelemetryApi;
 let openTelemetryLogsApi;
@@ -16,7 +18,7 @@ const loadOpenTelemetryApi = () => {
   }
   try {
     // Optional peer: apps without OpenTelemetry must not need to install it.
-    openTelemetryApi = require("@opentelemetry/api");
+    openTelemetryApi = require(openTelemetryModuleName);
   } catch {
     openTelemetryApi = null;
   }
@@ -28,7 +30,7 @@ const loadOpenTelemetryLogsApi = () => {
   }
   try {
     // Optional peer: the stable logs API is distributed separately.
-    openTelemetryLogsApi = require("@opentelemetry/api-logs");
+    openTelemetryLogsApi = require(openTelemetryLogsModuleName);
   } catch {
     openTelemetryLogsApi = null;
   }
@@ -54,75 +56,160 @@ export const configureOvokTelemetry = (options = {}) => {
   counters.clear();
   histograms.clear();
 };
-const getTracer = () => configuredOptions.tracerProvider?.getTracer(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION) ?? loadOpenTelemetryApi()?.trace?.getTracer(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION);
-const getMeter = () => configuredOptions.meterProvider?.getMeter(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION) ?? loadOpenTelemetryApi()?.metrics?.getMeter(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION);
-const getLogger = () => configuredOptions.loggerProvider?.getLogger(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION) ?? loadOpenTelemetryLogsApi()?.logs?.getLogger(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION);
-export const startOvokSpan = (name, attributes = {}) => getTracer()?.startSpan(name, {
-  attributes: sanitizeOvokTelemetryAttributes(attributes)
-});
+const getTracer = () => {
+  try {
+    const configured = configuredOptions.tracerProvider?.getTracer(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION);
+    if (configured) {
+      return configured;
+    }
+  } catch {
+    return undefined;
+  }
+  try {
+    return loadOpenTelemetryApi()?.trace?.getTracer(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION);
+  } catch {
+    return undefined;
+  }
+};
+const getMeter = () => {
+  try {
+    const configured = configuredOptions.meterProvider?.getMeter(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION);
+    if (configured) {
+      return configured;
+    }
+  } catch {
+    return undefined;
+  }
+  try {
+    return loadOpenTelemetryApi()?.metrics?.getMeter(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION);
+  } catch {
+    return undefined;
+  }
+};
+const getLogger = () => {
+  try {
+    const configured = configuredOptions.loggerProvider?.getLogger(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION);
+    if (configured) {
+      return configured;
+    }
+  } catch {
+    return undefined;
+  }
+  try {
+    return loadOpenTelemetryLogsApi()?.logs?.getLogger(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION);
+  } catch {
+    return undefined;
+  }
+};
+export const startOvokSpan = (name, attributes = {}) => {
+  try {
+    return getTracer()?.startSpan(name, {
+      attributes: sanitizeOvokTelemetryAttributes(attributes)
+    });
+  } catch {
+    return undefined;
+  }
+};
 export const recordOvokMetric = (name, value, attributes = {}) => {
-  const meter = getMeter();
-  if (!meter) {
-    return;
-  }
-  const safeAttributes = sanitizeOvokTelemetryAttributes(attributes);
-  const instrument = counters.get(name) ?? meter.createCounter(name);
-  counters.set(name, instrument);
-  instrument.add(value, safeAttributes);
+  try {
+    const meter = getMeter();
+    if (!meter) {
+      return;
+    }
+    const safeAttributes = sanitizeOvokTelemetryAttributes(attributes);
+    const instrument = counters.get(name) ?? meter.createCounter(name);
+    counters.set(name, instrument);
+    instrument.add(value, safeAttributes);
+  } catch {
+    // Telemetry must never change SDK control flow.
+  }
 };
 export const recordOvokDuration = (name, durationMs, attributes = {}) => {
-  const meter = getMeter();
-  if (!meter) {
-    return;
-  }
-  const safeAttributes = sanitizeOvokTelemetryAttributes(attributes);
-  const instrument = histograms.get(name) ?? meter.createHistogram(name);
-  histograms.set(name, instrument);
-  instrument.record(durationMs, safeAttributes);
+  try {
+    const meter = getMeter();
+    if (!meter) {
+      return;
+    }
+    const safeAttributes = sanitizeOvokTelemetryAttributes(attributes);
+    const instrument = histograms.get(name) ?? meter.createHistogram(name);
+    histograms.set(name, instrument);
+    instrument.record(durationMs, safeAttributes);
+  } catch {
+    // Telemetry must never change SDK control flow.
+  }
 };
-export const addOvokSpanEvent = (name, attributes = {}) => {
-  const span = loadOpenTelemetryApi()?.trace?.getActiveSpan?.();
-  span?.addEvent?.(name, sanitizeOvokTelemetryAttributes(attributes));
+export const addOvokSpanEvent = (name, attributes = {}, span) => {
+  try {
+    const targetSpan = span ?? configuredOptions.tracerProvider?.getActiveSpan?.() ?? loadOpenTelemetryApi()?.trace?.getActiveSpan?.();
+    targetSpan?.addEvent?.(name, sanitizeOvokTelemetryAttributes(attributes));
+  } catch {
+    // Telemetry must never change SDK control flow.
+  }
 };
 export const emitOvokLog = (severityText, body, attributes = {}) => {
-  getLogger()?.emit({
-    severityText,
-    body,
-    attributes: sanitizeOvokTelemetryAttributes(attributes)
-  });
+  try {
+    getLogger()?.emit({
+      severityText,
+      body,
+      attributes
+    });
+  } catch {
+    // Telemetry must never change SDK control flow.
+  }
 };
 export const withOvokSpan = async (name, attributes, operation) => {
   const tracer = getTracer();
   const finishSpan = async span => {
     try {
       const result = await operation();
-      span.setStatus?.({
-        code: 1
-      });
+      try {
+        span.setStatus?.({
+          code: 1
+        });
+      } catch {
+        // Telemetry must never change SDK control flow.
+      }
       return result;
     } catch (error) {
       const normalized = error instanceof Error ? error : new Error(String(error));
-      span.recordException?.(normalized);
-      span.setStatus?.({
-        code: 2,
-        message: normalized.message
-      });
+      try {
+        span.recordException?.(normalized);
+        span.setStatus?.({
+          code: 2,
+          message: normalized.message
+        });
+      } catch {
+        // Telemetry must never change SDK control flow.
+      }
       recordOvokMetric("ovok.errors", 1, {
         errorCode: normalized.name
       });
       throw error;
     } finally {
-      span.end();
+      try {
+        span.end();
+      } catch {
+        // Telemetry must never change SDK control flow.
+      }
     }
   };
   if (tracer?.startActiveSpan) {
-    return tracer.startActiveSpan(name, {
+    try {
+      return tracer.startActiveSpan(name, {
+        attributes: sanitizeOvokTelemetryAttributes(attributes)
+      }, span => finishSpan(span));
+    } catch {
+      return operation();
+    }
+  }
+  let span;
+  try {
+    span = tracer?.startSpan(name, {
       attributes: sanitizeOvokTelemetryAttributes(attributes)
-    }, span => finishSpan(span));
+    });
+  } catch {
+    return operation();
   }
-  const span = tracer?.startSpan(name, {
-    attributes: sanitizeOvokTelemetryAttributes(attributes)
-  });
   if (!span) {
     return operation();
   }

package/lib/module/modules/helpers/utils/telemetry.js.map

@@ -1 +1 @@
-{"version":3,"names":["INSTRUMENTATION_NAME","INSTRUMENTATION_VERSION","configuredOptions","openTelemetryApi","openTelemetryLogsApi","counters","Map","histograms","loadOpenTelemetryApi","undefined","require","loadOpenTelemetryLogsApi","allowedAttributeKeys","Set","sanitizeOvokTelemetryAttributes","attributes","safe","key","value","Object","entries","has","configureOvokTelemetry","options","clear","getTracer","tracerProvider","trace","getMeter","meterProvider","metrics","getLogger","loggerProvider","logs","startOvokSpan","name","startSpan","recordOvokMetric","meter","safeAttributes","instrument","get","createCounter","set","add","recordOvokDuration","durationMs","createHistogram","record","addOvokSpanEvent","span","getActiveSpan","addEvent","emitOvokLog","severityText","body","emit","withOvokSpan","operation","tracer","finishSpan","result","setStatus","code","error","normalized","Error","String","recordException","message","errorCode","end","startActiveSpan"],"sourceRoot":"../../../../../src","sources":["modules/helpers/utils/telemetry.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["INSTRUMENTATION_NAME","INSTRUMENTATION_VERSION","openTelemetryModuleName","openTelemetryLogsModuleName","configuredOptions","openTelemetryApi","openTelemetryLogsApi","counters","Map","histograms","loadOpenTelemetryApi","undefined","require","loadOpenTelemetryLogsApi","allowedAttributeKeys","Set","sanitizeOvokTelemetryAttributes","attributes","safe","key","value","Object","entries","has","configureOvokTelemetry","options","clear","getTracer","configured","tracerProvider","trace","getMeter","meterProvider","metrics","getLogger","loggerProvider","logs","startOvokSpan","name","startSpan","recordOvokMetric","meter","safeAttributes","instrument","get","createCounter","set","add","recordOvokDuration","durationMs","createHistogram","record","addOvokSpanEvent","span","targetSpan","getActiveSpan","addEvent","emitOvokLog","severityText","body","emit","withOvokSpan","operation","tracer","finishSpan","result","setStatus","code","error","normalized","Error","String","recordException","message","errorCode","end","startActiveSpan"],"sourceRoot":"../../../../../src","sources":["modules/helpers/utils/telemetry.ts"],"mappings":";;AAAA;AACA;;AAsFA,MAAMA,oBAAoB,GAAG,cAAc;AAC3C,MAAMC,uBAAuB,GAAG,OAAO;AACvC,MAAMC,uBAAuB,GAAG,oBAAoB;AACpD,MAAMC,2BAA2B,GAAG,yBAAyB;AAE7D,IAAIC,iBAAuC,GAAG,CAAC,CAAC;AAChD,IAAIC,gBAAqD;AACzD,IAAIC,oBAA6D;AACjE,MAAMC,QAAQ,GAAG,IAAIC,GAAG,CAAiD,CAAC;AAC1E,MAAMC,UAAU,GAAG,IAAID,GAAG,CAAmD,CAAC;AAE9E,MAAME,oBAAoB,GAAGA,CAAA,KAAoC;EAC/D,IAAIL,gBAAgB,KAAKM,SAAS,EAAE;IAClC,OAAON,gBAAgB,IAAIM,SAAS;EACtC;EAEA,IAAI;IACF;IACAN,gBAAgB,GAAGO,OAAO,CAACV,uBAAuB,CAAqB;EACzE,CAAC,CAAC,MAAM;IACNG,gBAAgB,GAAG,IAAI;EACzB;EAEA,OAAOA,gBAAgB,IAAIM,SAAS;AACtC,CAAC;AAED,MAAME,wBAAwB,GAAGA,CAAA,KAAwC;EACvE,IAAIP,oBAAoB,KAAKK,SAAS,EAAE;IACtC,OAAOL,oBAAoB,IAAIK,SAAS;EAC1C;EAEA,IAAI;IACF;IACAL,oBAAoB,GAAGM,OAAO,CAACT,2BAA2B,CAAyB;EACrF,CAAC,CAAC,MAAM;IACNG,oBAAoB,GAAG,IAAI;EAC7B;EAEA,OAAOA,oBAAoB,IAAIK,SAAS;AAC1C,CAAC;AAED,MAAMG,oBAAoB,GAAG,IAAIC,GAAG,CAAC,CACnC,UAAU,EACV,YAAY,EACZ,OAAO,EACP,cAAc,EACd,oBAAoB,EACpB,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,WAAW,EACX,WAAW,EACX,cAAc,EACd,UAAU,EACV,aAAa,CACd,CAAC;;AAEF;AACA,OAAO,MAAMC,+BAA+B,GAAGA,CAC7CC,UAAmC,GAAG,CAAC,CAAC,KACZ;EAC5B,MAAMC,IAA6B,GAAG,CAAC,CAAC;EAExC,KAAK,MAAM,CAACC,GAAG,EAAEC,KAAK,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACL,UAAU,CAAC,EAAE;IACrD,IAAI,CAACH,oBAAoB,CAACS,GAAG,CAACJ,GAAG,CAAC,EAAE;MAClC;IACF;IAEA,IACE,OAAOC,KAAK,KAAK,QAAQ,IACzB,OAAOA,KAAK,KAAK,QAAQ,IACzB,OAAOA,KAAK,KAAK,SAAS,EAC1B;MACAF,IAAI,CAACC,GAAG,CAAC,GAAGC,KAAK;IACnB;EACF;EAEA,OAAOF,IAAI;AACb,CAAC;AAED,OAAO,MAAMM,sBAAsB,GAAGA,CACpCC,OAA6B,GAAG,CAAC,CAAC,KACzB;EACTrB,iBAAiB,GAAGqB,OAAO;EAC3BlB,QAAQ,CAACmB,KAAK,CAAC,CAAC;EAChBjB,UAAU,CAACiB,KAAK,CAAC,CAAC;AACpB,CAAC;AAED,MAAMC,SAAS,GAAGA,CAAA,KAA8B;EAC9C,IAAI;IACF,MAAMC,UAAU,GAAGxB,iBAAiB,CAACyB,cAAc,EAAEF,SAAS,CAC5D3B,oBAAoB,EACpBC,uBACF,CAAC;IAED,IAAI2B,UAAU,EAAE;MACd,OAAOA,UAAU;IACnB;EACF,CAAC,CAAC,MAAM;IACN,OAAOjB,SAAS;EAClB;EAEA,IAAI;IACF,OAAOD,oBAAoB,CAAC,CAAC,EAAEoB,KAAK,EAAEH,SAAS,CAC7C3B,oBAAoB,EACpBC,uBACF,CAAC;EACH,CAAC,CAAC,MAAM;IACN,OAAOU,SAAS;EAClB;AACF,CAAC;AAED,MAAMoB,QAAQ,GAAGA,CAAA,KAA6B;EAC5C,IAAI;IACF,MAAMH,UAAU,GAAGxB,iBAAiB,CAAC4B,aAAa,EAAED,QAAQ,CAC1D/B,oBAAoB,EACpBC,uBACF,CAAC;IAED,IAAI2B,UAAU,EAAE;MACd,OAAOA,UAAU;IACnB;EACF,CAAC,CAAC,MAAM;IACN,OAAOjB,SAAS;EAClB;EAEA,IAAI;IACF,OAAOD,oBAAoB,CAAC,CAAC,EAAEuB,OAAO,EAAEF,QAAQ,CAC9C/B,oBAAoB,EACpBC,uBACF,CAAC;EACH,CAAC,CAAC,MAAM;IACN,OAAOU,SAAS;EAClB;AACF,CAAC;AAED,MAAMuB,SAAS,GAAGA,CAAA,KAAkC;EAClD,IAAI;IACF,MAAMN,UAAU,GAAGxB,iBAAiB,CAAC+B,cAAc,EAAED,SAAS,CAC5DlC,oBAAoB,EACpBC,uBACF,CAAC;IAED,IAAI2B,UAAU,EAAE;MACd,OAAOA,UAAU;IACnB;EACF,CAAC,CAAC,MAAM;IACN,OAAOjB,SAAS;EAClB;EAEA,IAAI;IACF,OAAOE,wBAAwB,CAAC,CAAC,EAAEuB,IAAI,EAAEF,SAAS,CAChDlC,oBAAoB,EACpBC,uBACF,CAAC;EACH,CAAC,CAAC,MAAM;IACN,OAAOU,SAAS;EAClB;AACF,CAAC;AAED,OAAO,MAAM0B,aAAa,GAAGA,CAC3BC,IAAY,EACZrB,UAAmC,GAAG,CAAC,CAAC,KACf;EACzB,IAAI;IACF,OAAOU,SAAS,CAAC,CAAC,EAAEY,SAAS,CAACD,IAAI,EAAE;MAClCrB,UAAU,EAAED,+BAA+B,CAACC,UAAU;IACxD,CAAC,CAAC;EACJ,CAAC,CAAC,MAAM;IACN,OAAON,SAAS;EAClB;AACF,CAAC;AAED,OAAO,MAAM6B,gBAAgB,GAAGA,CAC9BF,IAAY,EACZlB,KAAa,EACbH,UAAmC,GAAG,CAAC,CAAC,KAC/B;EACT,IAAI;IACF,MAAMwB,KAAK,GAAGV,QAAQ,CAAC,CAAC;IAExB,IAAI,CAACU,KAAK,EAAE;MACV;IACF;IAEA,MAAMC,cAAc,GAAG1B,+BAA+B,CAACC,UAAU,CAAC;IAClE,MAAM0B,UAAU,GAAGpC,QAAQ,CAACqC,GAAG,CAACN,IAAI,CAAC,IAAIG,KAAK,CAACI,aAAa,CAACP,IAAI,CAAC;IAElE/B,QAAQ,CAACuC,GAAG,CAACR,IAAI,EAAEK,UAAU,CAAC;IAC9BA,UAAU,CAACI,GAAG,CAAC3B,KAAK,EAAEsB,cAAc,CAAC;EACvC,CAAC,CAAC,MAAM;IACN;EAAA;AAEJ,CAAC;AAED,OAAO,MAAMM,kBAAkB,GAAGA,CAChCV,IAAY,EACZW,UAAkB,EAClBhC,UAAmC,GAAG,CAAC,CAAC,KAC/B;EACT,IAAI;IACF,MAAMwB,KAAK,GAAGV,QAAQ,CAAC,CAAC;IAExB,IAAI,CAACU,KAAK,EAAE;MACV;IACF;IAEA,MAAMC,cAAc,GAAG1B,+BAA+B,CAACC,UAAU,CAAC;IAClE,MAAM0B,UAAU,GAAGlC,UAAU,CAACmC,GAAG,CAACN,IAAI,CAAC,IAAIG,KAAK,CAACS,eAAe,CAACZ,IAAI,CAAC;IAEtE7B,UAAU,CAACqC,GAAG,CAACR,IAAI,EAAEK,UAAU,CAAC;IAChCA,UAAU,CAACQ,MAAM,CAACF,UAAU,EAAEP,cAAc,CAAC;EAC/C,CAAC,CAAC,MAAM;IACN;EAAA;AAEJ,CAAC;AAED,OAAO,MAAMU,gBAAgB,GAAGA,CAC9Bd,IAAY,EACZrB,UAAmC,GAAG,CAAC,CAAC,EACxCoC,IAAe,KACN;EACT,IAAI;IACF,MAAMC,UAAU,GACdD,IAAI,IACJjD,iBAAiB,CAACyB,cAAc,EAAE0B,aAAa,GAAG,CAAC,IACnD7C,oBAAoB,CAAC,CAAC,EAAEoB,KAAK,EAAEyB,aAAa,GAAG,CAAC;IAElDD,UAAU,EAAEE,QAAQ,GAAGlB,IAAI,EAAEtB,+BAA+B,CAACC,UAAU,CAAC,CAAC;EAC3E,CAAC,CAAC,MAAM;IACN;EAAA;AAEJ,CAAC;AAED,OAAO,MAAMwC,WAAW,GAAGA,CACzBC,YAAoB,EACpBC,IAAY,EACZ1C,UAAmC,GAAG,CAAC,CAAC,KAC/B;EACT,IAAI;IACFiB,SAAS,CAAC,CAAC,EAAE0B,IAAI,CAAC;MAAEF,YAAY;MAAEC,IAAI;MAAE1C;IAAW,CAAC,CAAC;EACvD,CAAC,CAAC,MAAM;IACN;EAAA;AAEJ,CAAC;AAED,OAAO,MAAM4C,YAAY,GAAG,MAAAA,CAC1BvB,IAAY,EACZrB,UAAmC,EACnC6C,SAA+B,KAChB;EACf,MAAMC,MAAM,GAAGpC,SAAS,CAAC,CAAC;EAE1B,MAAMqC,UAAU,GAAG,MAAOX,IAAc,IAAiB;IACvD,IAAI;MACF,MAAMY,MAAM,GAAG,MAAMH,SAAS,CAAC,CAAC;MAEhC,IAAI;QACFT,IAAI,CAACa,SAAS,GAAG;UAAEC,IAAI,EAAE;QAAE,CAAC,CAAC;MAC/B,CAAC,CAAC,MAAM;QACN;MAAA;MAGF,OAAOF,MAAM;IACf,CAAC,CAAC,OAAOG,KAAK,EAAE;MACd,MAAMC,UAAU,GAAGD,KAAK,YAAYE,KAAK,GAAGF,KAAK,GAAG,IAAIE,KAAK,CAACC,MAAM,CAACH,KAAK,CAAC,CAAC;MAE5E,IAAI;QACFf,IAAI,CAACmB,eAAe,GAAGH,UAAU,CAAC;QAClChB,IAAI,CAACa,SAAS,GAAG;UAAEC,IAAI,EAAE,CAAC;UAAEM,OAAO,EAAEJ,UAAU,CAACI;QAAQ,CAAC,CAAC;MAC5D,CAAC,CAAC,MAAM;QACN;MAAA;MAEFjC,gBAAgB,CAAC,aAAa,EAAE,CAAC,EAAE;QAAEkC,SAAS,EAAEL,UAAU,CAAC/B;MAAK,CAAC,CAAC;MAClE,MAAM8B,KAAK;IACb,CAAC,SAAS;MACR,IAAI;QACFf,IAAI,CAACsB,GAAG,CAAC,CAAC;MACZ,CAAC,CAAC,MAAM;QACN;MAAA;IAEJ;EACF,CAAC;EAED,IAAIZ,MAAM,EAAEa,eAAe,EAAE;IAC3B,IAAI;MACF,OAAOb,MAAM,CAACa,eAAe,CAC3BtC,IAAI,EACJ;QAAErB,UAAU,EAAED,+BAA+B,CAACC,UAAU;MAAE,CAAC,EAC1DoC,IAAI,IAAKW,UAAU,CAACX,IAAI,CAC3B,CAAC;IACH,CAAC,CAAC,MAAM;MACN,OAAOS,SAAS,CAAC,CAAC;IACpB;EACF;EAEA,IAAIT,IAA0B;EAE9B,IAAI;IACFA,IAAI,GAAGU,MAAM,EAAExB,SAAS,CAACD,IAAI,EAAE;MAC7BrB,UAAU,EAAED,+BAA+B,CAACC,UAAU;IACxD,CAAC,CAAC;EACJ,CAAC,CAAC,MAAM;IACN,OAAO6C,SAAS,CAAC,CAAC;EACpB;EAEA,IAAI,CAACT,IAAI,EAAE;IACT,OAAOS,SAAS,CAAC,CAAC;EACpB;EAEA,OAAOE,UAAU,CAACX,IAAI,CAAC;AACzB,CAAC","ignoreList":[]}

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

@@ -4,6 +4,7 @@ import { useClient } from "@ovok/core";
 import { Image as ExpoImage, useImage } from "expo-image";
 import * as React from "react";
 import { StyleSheet, View } from "react-native";
+import { SvgXml } from "react-native-svg";
 import { calculateDimension } from "../utils/calculate-dimension.js";
 import { getOptimizedImageUrl } from "../utils/get-optimized-image-url.js";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -45,15 +46,18 @@ export const OptimizedImage = /*#__PURE__*/React.memo(({
     setFailedUri(null);
   }, [optimizedUri]);
   const image = useImage(optimizedUri, {
-    onError: (_error, retry) => {
+    onError: (error, retry) => {
       if (retryCount.current >= maxRetries) {
         setFailedUri(optimizedUri);
+        onError?.({
+          error: error instanceof Error ? error.message : String(error)
+        });
         return;
       }
       retryCount.current += 1;
       retry();
     }
-  }, [optimizedUri]);
+  }, [optimizedUri, maxRetries, onError]);
   const imageStyle = React.useMemo(() => [styles.base, {
     width: calculatedWidth,
     height: calculatedHeight,
@@ -70,19 +74,36 @@ export const OptimizedImage = /*#__PURE__*/React.memo(({
     if (!providedAspectRatio) {
       setCalculatedAspectRatio(imageWidth / imageHeight);
     }
-    onLoad?.(event);
-  }, [onLoad, providedAspectRatio]);
+    if (failedUri !== optimizedUri) {
+      onLoad?.(event);
+    }
+  }, [failedUri, onLoad, optimizedUri, providedAspectRatio]);
+  if (uri.startsWith("data:image/svg+xml")) {
+    const [, payload = ""] = uri.split(",", 2);
+    const xml = uri.includes(";base64") ? globalThis.atob?.(payload) : decodeURIComponent(payload);
+    return /*#__PURE__*/_jsx(View, {
+      style: [styles.container, containerStyle],
+      onLayout: handleLayout,
+      children: /*#__PURE__*/_jsx(SvgXml, {
+        xml: xml ?? payload,
+        width: calculatedWidth,
+        height: calculatedHeight,
+        style: [styles.base, {
+          width: calculatedWidth,
+          height: calculatedHeight
+        }, style]
+      })
+    });
+  }
   return /*#__PURE__*/_jsx(View, {
     style: [styles.container, containerStyle],
     onLayout: handleLayout,
     children: /*#__PURE__*/_jsx(ExpoImage, {
-      source: failedUri === optimizedUri ? fallback ?? placeholder ?? null : image ?? {
-        uri: optimizedUri
-      },
+      source: failedUri === optimizedUri ? fallback ?? placeholder ?? null : image ?? placeholder ?? null,
       style: imageStyle,
       placeholder: placeholder,
       onLoad: handleLoad,
-      onError: onError,
+      onError: image && failedUri !== optimizedUri ? onError : undefined,
       ...rest,
       contentFit: fit
     }, `${optimizedUri}:${retryCount.current}`)

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

@@ -1 +1 @@
-{"version":3,"names":["useClient","Image","ExpoImage","useImage","React","StyleSheet","View","calculateDimension","getOptimizedImageUrl","jsx","_jsx","OptimizedImage","memo","uri","width","height","fit","style","onLoad","onError","placeholder","fallback","maxRetries","containerStyle","aspectRatio","providedAspectRatio","rest","client","retryCount","useRef","failedUri","setFailedUri","useState","containerSize","setContainerSize","calculatedAspectRatio","setCalculatedAspectRatio","useMemo","calculatedWidth","calculatedHeight","undefined","optimizedUri","baseUrl","getBaseUrl","useEffect","current","image","_error","retry","imageStyle","styles","base","contentFit","handleLayout","useCallback","event","nativeEvent","layout","handleLoad","imageWidth","imageHeight","source","container","onLayout","children","create","overflow"],"sourceRoot":"../../../../../src","sources":["modules/image/components/optimized-image.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useClient","Image","ExpoImage","useImage","React","StyleSheet","View","SvgXml","calculateDimension","getOptimizedImageUrl","jsx","_jsx","OptimizedImage","memo","uri","width","height","fit","style","onLoad","onError","placeholder","fallback","maxRetries","containerStyle","aspectRatio","providedAspectRatio","rest","client","retryCount","useRef","failedUri","setFailedUri","useState","containerSize","setContainerSize","calculatedAspectRatio","setCalculatedAspectRatio","useMemo","calculatedWidth","calculatedHeight","undefined","optimizedUri","baseUrl","getBaseUrl","useEffect","current","image","error","retry","Error","message","String","imageStyle","styles","base","contentFit","handleLayout","useCallback","event","nativeEvent","layout","handleLoad","imageWidth","imageHeight","source","startsWith","payload","split","xml","includes","globalThis","atob","decodeURIComponent","container","onLayout","children","create","overflow"],"sourceRoot":"../../../../../src","sources":["modules/image/components/optimized-image.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/journal/past-journal/components/title.js

@@ -21,7 +21,6 @@ export const Title = ({
 };
 const styles = StyleSheet.create({
   title: {
-    fontFamily: "DMSans_700Bold",
     fontSize: 18,
     fontWeight: "600"
   }

package/lib/module/modules/journal/past-journal/components/title.js.map

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","Text","jsx","_jsx","Title","children","style","variant","testID","props","numberOfLines","styles","title","create","fontFamily","fontSize","fontWeight"],"sourceRoot":"../../../../../../src","sources":["modules/journal/past-journal/components/title.tsx"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SAASC,IAAI,QAAmB,oBAAoB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAErD,OAAO,MAAMC,KAAK,GAAGA,CAAC;EACpBC,QAAQ;EACRC,KAAK;EACLC,OAAO,GAAG,YAAY;EACtBC,MAAM;EACN,GAAGC;AACoB,CAAC,KAAK;EAC7B,oBACEN,IAAA,CAACF,IAAI;IACHS,aAAa,EAAE,CAAE;IAAA,GACbD,KAAK;IACTF,OAAO,EAAEA,OAAQ;IACjBD,KAAK,EAAE,CAACK,MAAM,CAACC,KAAK,EAAEN,KAAK,CAAE;IAC7BE,MAAM,EAAEA,MAAO;IAAAH,QAAA,EAEdA;EAAQ,CACL,CAAC;AAEX,CAAC;AAED,MAAMM,MAAM,GAAGX,UAAU,CAACa,MAAM,CAAC;EAC/BD,KAAK,EAAE;IACLE,UAAU,EAAE,gBAAgB;IAC5BC,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE;EACd;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["StyleSheet","Text","jsx","_jsx","Title","children","style","variant","testID","props","numberOfLines","styles","title","create","fontSize","fontWeight"],"sourceRoot":"../../../../../../src","sources":["modules/journal/past-journal/components/title.tsx"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SAASC,IAAI,QAAmB,oBAAoB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAErD,OAAO,MAAMC,KAAK,GAAGA,CAAC;EACpBC,QAAQ;EACRC,KAAK;EACLC,OAAO,GAAG,YAAY;EACtBC,MAAM;EACN,GAAGC;AACoB,CAAC,KAAK;EAC7B,oBACEN,IAAA,CAACF,IAAI;IACHS,aAAa,EAAE,CAAE;IAAA,GACbD,KAAK;IACTF,OAAO,EAAEA,OAAQ;IACjBD,KAAK,EAAE,CAACK,MAAM,CAACC,KAAK,EAAEN,KAAK,CAAE;IAC7BE,MAAM,EAAEA,MAAO;IAAAH,QAAA,EAEdA;EAAQ,CACL,CAAC;AAEX,CAAC;AAED,MAAMM,MAAM,GAAGX,UAAU,CAACa,MAAM,CAAC;EAC/BD,KAAK,EAAE;IACLE,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE;EACd;AACF,CAAC,CAAC","ignoreList":[]}

package/lib/module/modules/language-switcher/components/option/label.js

@@ -15,7 +15,6 @@ export const Label = ({
 };
 const style = StyleSheet.create({
   label: {
-    fontFamily: "DMSans_700Bold",
     flex: 1,
     fontSize: 16
   }

package/lib/module/modules/language-switcher/components/option/label.js.map

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","Text","jsx","_jsx","Label","children","props","style","label","create","fontFamily","flex","fontSize"],"sourceRoot":"../../../../../../src","sources":["modules/language-switcher/components/option/label.tsx"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SAA0BC,IAAI,QAAmB,oBAAoB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEtE,OAAO,MAAMC,KAAK,GAAGA,CAA4B;EAC/CC,QAAQ;EACR,GAAGC;AACS,CAAC,KAAK;EAClB,oBACEH,IAAA,CAACF,IAAI;IAAA,GAAKK,KAAK;IAAEC,KAAK,EAAE,CAACA,KAAK,CAACC,KAAK,EAAEF,KAAK,CAACC,KAAK,CAAE;IAAAF,QAAA,EAChDA;EAAQ,CACL,CAAC;AAEX,CAAC;AAED,MAAME,KAAK,GAAGP,UAAU,CAACS,MAAM,CAAC;EAC9BD,KAAK,EAAE;IACLE,UAAU,EAAE,gBAAgB;IAC5BC,IAAI,EAAE,CAAC;IACPC,QAAQ,EAAE;EACZ;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["StyleSheet","Text","jsx","_jsx","Label","children","props","style","label","create","flex","fontSize"],"sourceRoot":"../../../../../../src","sources":["modules/language-switcher/components/option/label.tsx"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SAA0BC,IAAI,QAAmB,oBAAoB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEtE,OAAO,MAAMC,KAAK,GAAGA,CAA4B;EAC/CC,QAAQ;EACR,GAAGC;AACS,CAAC,KAAK;EAClB,oBACEH,IAAA,CAACF,IAAI;IAAA,GAAKK,KAAK;IAAEC,KAAK,EAAE,CAACA,KAAK,CAACC,KAAK,EAAEF,KAAK,CAACC,KAAK,CAAE;IAAAF,QAAA,EAChDA;EAAQ,CACL,CAAC;AAEX,CAAC;AAED,MAAME,KAAK,GAAGP,UAAU,CAACS,MAAM,CAAC;EAC9BD,KAAK,EAAE;IACLE,IAAI,EAAE,CAAC;IACPC,QAAQ,EAAE;EACZ;AACF,CAAC,CAAC","ignoreList":[]}

package/lib/module/modules/measurement/components/date-range.js

@@ -86,7 +86,9 @@ export const DateRange = /*#__PURE__*/React.memo(({
       })
     }), /*#__PURE__*/_jsx(Text, {
       testID: `${testID}-date-text`,
-      style: [styles.dateText],
+      style: [styles.dateText, {
+        fontFamily: theme.fonts.bodyMedium.fontFamily
+      }],
       children: formattedDateText
     }), /*#__PURE__*/_jsx(TouchableOpacity, {
       disabled: disabledNext,
@@ -107,8 +109,7 @@ const styles = StyleSheet.create({
     justifyContent: "space-between"
   },
   dateText: {
-    fontSize: 16,
-    fontFamily: "DMSans_400Regular"
+    fontSize: 16
   }
 });
 //# sourceMappingURL=date-range.js.map

package/lib/module/modules/measurement/components/date-range.js.map

@@ -1 +1 @@
-{"version":3,"names":["add","format","isSameMonth","isSameYear","startOfDay","sub","ArrowLeft2","ArrowRight2","React","StyleSheet","TouchableOpacity","View","Text","useAppTheme","getEndDate","jsx","_jsx","jsxs","_jsxs","DateRange","memo","startDate","variant","style","disabledNext","disabledPrevious","testID","onDateChange","theme","variantRef","useRef","formattedDateText","useMemo","endDate","isSameYearValue","isSameMonthValue","startFormat","endFormat","disabledIconColor","colors","onSurfaceDisabled","activeIconColor","onSurface","handlePreviousPress","useCallback","previousDate","newStartDate","newEndDate","toISOString","handleNextPress","nextDate","useEffect","current","styles","container","backgroundColor","surface","gap","spacing","padding","children","disabled","onPress","hitSlop","color","dateText","create","flexDirection","alignItems","justifyContent","fontSize","fontFamily"],"sourceRoot":"../../../../../src","sources":["modules/measurement/components/date-range.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["add","format","isSameMonth","isSameYear","startOfDay","sub","ArrowLeft2","ArrowRight2","React","StyleSheet","TouchableOpacity","View","Text","useAppTheme","getEndDate","jsx","_jsx","jsxs","_jsxs","DateRange","memo","startDate","variant","style","disabledNext","disabledPrevious","testID","onDateChange","theme","variantRef","useRef","formattedDateText","useMemo","endDate","isSameYearValue","isSameMonthValue","startFormat","endFormat","disabledIconColor","colors","onSurfaceDisabled","activeIconColor","onSurface","handlePreviousPress","useCallback","previousDate","newStartDate","newEndDate","toISOString","handleNextPress","nextDate","useEffect","current","styles","container","backgroundColor","surface","gap","spacing","padding","children","disabled","onPress","hitSlop","color","dateText","fontFamily","fonts","bodyMedium","create","flexDirection","alignItems","justifyContent","fontSize"],"sourceRoot":"../../../../../src","sources":["modules/measurement/components/date-range.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/measurement/components/measurement-list-item.js

@@ -20,13 +20,16 @@ export const MeasurementListItem = props => {
       style: [styles.centerRow, {
         gap: theme.spacing(1)
       }],
-      children: [/*#__PURE__*/_jsx(Text, {
-        variant: "titleLarge",
-        style: [styles.value, {
-          color: theme.colors.primary
-        }],
-        testID: `${props.testID}-value`,
-        children: props.data.value
+      children: [/*#__PURE__*/_jsxs(View, {
+        style: styles.centerRow,
+        children: [/*#__PURE__*/_jsx(Text, {
+          variant: "titleLarge",
+          style: [styles.value, {
+            color: theme.colors.primary
+          }],
+          testID: `${props.testID}-value`,
+          children: props.data.value
+        }), props.badge]
       }), /*#__PURE__*/_jsx(Text, {
         style: [styles.unit, {
           color: theme.colors.onSurfaceDisabled
@@ -60,15 +63,12 @@ const styles = StyleSheet.create({
     alignItems: "center"
   },
   value: {
-    fontFamily: "DMSans_700Bold",
     fontSize: 24
   },
   unit: {
-    fontFamily: "DMSans_400Regular",
     fontSize: 14
   },
   date: {
-    fontFamily: "DMSans_400Regular",
     fontSize: 12
   }
 });

package/lib/module/modules/measurement/components/measurement-list-item.js.map

@@ -1 +1 @@
-{"version":3,"names":["format","ArrowRight2","StyleSheet","TouchableOpacity","View","Text","useAppTheme","jsx","_jsx","jsxs","_jsxs","MeasurementListItem","props","theme","style","styles","container","centerRow","backgroundColor","colors","surface","padding","spacing","borderRadius","testID","onPress","children","gap","variant","value","color","primary","data","unit","onSurfaceDisabled","date","size","create","justifyContent","flexDirection","alignItems","fontFamily","fontSize"],"sourceRoot":"../../../../../src","sources":["modules/measurement/components/measurement-list-item.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["format","ArrowRight2","StyleSheet","TouchableOpacity","View","Text","useAppTheme","jsx","_jsx","jsxs","_jsxs","MeasurementListItem","props","theme","style","styles","container","centerRow","backgroundColor","colors","surface","padding","spacing","borderRadius","testID","onPress","children","gap","variant","value","color","primary","data","badge","unit","onSurfaceDisabled","date","size","create","justifyContent","flexDirection","alignItems","fontSize"],"sourceRoot":"../../../../../src","sources":["modules/measurement/components/measurement-list-item.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/components/fields/questionnaire-date-field.js

@@ -32,7 +32,7 @@ export const QuestionnaireDateField = /*#__PURE__*/React.memo(({
         }
       },
       date: () => {
-        const dateString = selectedDate.toISOString().split("T")[0];
+        const dateString = `${selectedDate.getFullYear()}-${String(selectedDate.getMonth() + 1).padStart(2, "0")}-${String(selectedDate.getDate()).padStart(2, "0")}`;
         if (dateString) {
           onChange(dateString);
         }

package/lib/module/modules/questionnaire-response-form/components/fields/questionnaire-date-field.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useState","StyleSheet","TouchableOpacity","DateTimePickerModal","Text","useAppTheme","useQuestionnaireForm","QuestionnaireFieldWrapper","jsx","_jsx","jsxs","_jsxs","QuestionnaireDateField","memo","item","value","onChange","testID","theme","isPickerVisible","setPickerVisible","paged","showPicker","useCallback","hidePicker","handleConfirm","selectedDate","actionMap","dateTime","dateTimeString","toISOString","date","dateString","split","time","timeString","toLocaleTimeString","hour","minute","type","formattedDate","useMemo","dateObj","Date","dateFormatted","toLocaleDateString","timeFormatted","children","onPress","style","styles","datePickerContainer","borderColor","colors","outline","backgroundColor","surface","borderRadius","padding","spacing","variant","color","onSurface","isVisible","mode","toLowerCase","onConfirm","onCancel","display","create","borderWidth","alignItems"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/components/fields/questionnaire-date-field.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useState","StyleSheet","TouchableOpacity","DateTimePickerModal","Text","useAppTheme","useQuestionnaireForm","QuestionnaireFieldWrapper","jsx","_jsx","jsxs","_jsxs","QuestionnaireDateField","memo","item","value","onChange","testID","theme","isPickerVisible","setPickerVisible","paged","showPicker","useCallback","hidePicker","handleConfirm","selectedDate","actionMap","dateTime","dateTimeString","toISOString","date","dateString","getFullYear","String","getMonth","padStart","getDate","time","timeString","toLocaleTimeString","hour","minute","type","formattedDate","useMemo","dateObj","Date","dateFormatted","toLocaleDateString","timeFormatted","children","onPress","style","styles","datePickerContainer","borderColor","colors","outline","backgroundColor","surface","borderRadius","padding","spacing","variant","color","onSurface","isVisible","mode","toLowerCase","onConfirm","onCancel","display","create","borderWidth","alignItems"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/components/fields/questionnaire-date-field.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -52,6 +52,7 @@ export const QuestionnaireFormProvider = /*#__PURE__*/React.memo(({
       delete values.currentLinkId;
       if (onSubmit) {
         await onSubmit(values, formikHelpers);
+        submissionIdentifier.current = null;
         return;
       }
       const activeProfile = await client.getProfileAsync();
@@ -71,10 +72,11 @@ export const QuestionnaireFormProvider = /*#__PURE__*/React.memo(({
       };
       const createdResponse = await client.createResourceIfNoneExist(response, `identifier=${identifierSystem}|${identifierValue}`);
       onSuccess?.(createdResponse);
+      submissionIdentifier.current = null;
     } catch (error) {
       const typedError = error;
       onError?.(error);
-      setSubmissionError(typedError.message || "questionnaire-form.error.submit-failed");
+      setSubmissionError(typedError.message?.startsWith("questionnaire-form.") ? typedError.message : "questionnaire-form.error.submit-failed");
     } finally {
       submissionInFlight.current = false;
     }