@ovok/core 0.4.35 → 0.4.36

package/dist/client/observation/types/measurement/MeasurementDevice.d.ts

@@ -16,6 +16,15 @@ export type MeasurementDevice = {
     sn: string;
     /** Runtime association key; not written to the FHIR device identifier. */
     id: string;
+    /**
+     * The brand and model the advertised name identified, when one decoder serves several
+     * products (the mobile SDK's `deviceData.variant`). Preferred over `manufacturerName` and
+     * `model`, which often describe the Bluetooth module rather than the product.
+     */
+    variant?: {
+        manufacturer: string;
+        model: string;
+    };
     /**
      * Remaining charge, 0 to 100.
      *

package/dist/client/observation/utils/getDeviceObject.js

@@ -8,6 +8,15 @@ const MANUFACTURER_NAME_URL = `${EXTENSION_BASE_URL}/device-manufacturer-name`;
 const MODEL_URL = `${EXTENSION_BASE_URL}/device-model`;
 const SERIAL_NUMBER_URL = `${EXTENSION_BASE_URL}/device-serial-number`;
 const BATTERY_PERCENTAGE_URL = `${EXTENSION_BASE_URL}/device-battery-percentage`;
+const PARSER_URL = `${EXTENSION_BASE_URL}/device-parser`;
+/** The product's own name: its model, prefixed with the brand unless the model already says it. */
+const variantDisplay = ({ manufacturer, model, }) => {
+    var _a, _b;
+    const brand = (_b = (_a = manufacturer.split(" ")[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : "";
+    return brand && model.toLowerCase().startsWith(brand)
+        ? model
+        : `${manufacturer} ${model}`;
+};
 /**
  * The battery extension is omitted rather than defaulted when the device did not report
  * one, because a placeholder charge level would read as a real reading.
@@ -30,7 +39,7 @@ const getOptionalStringExtension = (url, value) => {
     return [{ url, valueString: value }];
 };
 const getDeviceObject = (measurementDevice) => {
-    var _a;
+    var _a, _b, _c, _d, _e;
     if (!measurementDevice) {
         return {
             identifier: {
@@ -46,7 +55,9 @@ const getDeviceObject = (measurementDevice) => {
                 },
             }
             : {}),
-        display: (_a = measurementDevice.name) !== null && _a !== void 0 ? _a : "no-name",
+        display: measurementDevice.variant
+            ? variantDisplay(measurementDevice.variant)
+            : (_a = measurementDevice.name) !== null && _a !== void 0 ? _a : "no-name",
         extension: [
             {
                 url: LOCAL_NAME_URL,
@@ -56,8 +67,11 @@ const getDeviceObject = (measurementDevice) => {
                 url: MANUFACTURER_DATA_URL,
                 valueString: measurementDevice.manufacturerData || "no-manufacturer-data",
             },
-            ...getOptionalStringExtension(MANUFACTURER_NAME_URL, measurementDevice.manufacturerName),
-            ...getOptionalStringExtension(MODEL_URL, measurementDevice.model),
+            ...getOptionalStringExtension(MANUFACTURER_NAME_URL, (_c = (_b = measurementDevice.variant) === null || _b === void 0 ? void 0 : _b.manufacturer) !== null && _c !== void 0 ? _c : measurementDevice.manufacturerName),
+            ...getOptionalStringExtension(MODEL_URL, (_e = (_d = measurementDevice.variant) === null || _d === void 0 ? void 0 : _d.model) !== null && _e !== void 0 ? _e : measurementDevice.model),
+            ...(measurementDevice.variant
+                ? getOptionalStringExtension(PARSER_URL, measurementDevice.name)
+                : []),
             {
                 url: SERIAL_NUMBER_URL,
                 valueString: measurementDevice.sn || "no-serial-number",

package/dist/conformance/capability-requirements.js

@@ -48,7 +48,7 @@ exports.OVOK_CORE_REQUIREMENTS = {
     description: "The FHIR surface a server must provide for the @ovok/core client library's own methods to function.",
     software: {
         name: "@ovok/core",
-        version: "0.4.35",
+        version: "0.4.36",
     },
     fhirVersion: "4.0.1",
     format: ["json"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ovok/core",
-  "version": "0.4.35",
+  "version": "0.4.36",
   "private": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",