@ubercode/dcmtk 0.4.0 → 0.6.0

package/dist/tools.cjs

@@ -407,15 +407,32 @@ function convertSequence(attr, element) {
   }
   if (values.length > 0) element.Value = values;
 }
-function convertRegularValue(attr, element) {
+var NUMERIC_JSON_VRS = /* @__PURE__ */ new Set(["DS", "FL", "FD", "IS", "SL", "SS", "SV", "UL", "US", "UV"]);
+function unwrapValue(v) {
+  if (typeof v !== "object" || v === null) return v;
+  const obj = v;
+  if ("#text" in obj) return obj["#text"];
+  const keys = Object.keys(obj);
+  if (keys.length === 1 && keys[0] !== void 0 && keys[0].startsWith("@_")) {
+    return obj[keys[0]];
+  }
+  return v;
+}
+function coerceNumeric(value) {
+  if (typeof value === "number") return value;
+  if (typeof value !== "string") return value;
+  const trimmed = value.trim();
+  if (trimmed.length === 0) return value;
+  const num = Number(trimmed);
+  return Number.isNaN(num) ? value : num;
+}
+function convertRegularValue(attr, element, vr) {
   const valArray = toArray(attr.Value);
   const values = [];
+  const isNumeric = NUMERIC_JSON_VRS.has(vr);
   for (const v of valArray) {
-    if (typeof v === "object" && v !== null && "#text" in v) {
-      values.push(v["#text"]);
-    } else {
-      values.push(v);
-    }
+    const unwrapped = unwrapValue(v);
+    values.push(isNumeric ? coerceNumeric(unwrapped) : unwrapped);
   }
   if (values.length > 0) element.Value = values;
 }
@@ -432,7 +449,7 @@ function convertElement(attr) {
   } else if (element.vr === "SQ" && attr.Item !== void 0) {
     convertSequence(attr, element);
   } else if (attr.Value !== void 0) {
-    convertRegularValue(attr, element);
+    convertRegularValue(attr, element, vr);
   }
   return Object.freeze(element);
 }