@ubercode/dcmtk 0.5.0 → 0.6.0

package/dist/servers.cjs

@@ -1557,6 +1557,45 @@ var ChangeSet = class _ChangeSet {
     return result;
   }
 };
+
+// src/dicom/walkTags.ts
+var DEFAULT_MAX_DEPTH = 16;
+function walkTags(data, options) {
+  const ctx = {
+    maxDepth: options?.maxDepth ?? DEFAULT_MAX_DEPTH,
+    vrSet: options?.vrFilter !== void 0 ? new Set(options.vrFilter) : void 0,
+    results: []
+  };
+  walkLevel(data, 0, "", ctx);
+  return ctx.results;
+}
+function walkLevel(data, depth, pathPrefix, ctx) {
+  const keys = Object.keys(data);
+  for (let i = 0; i < keys.length; i++) {
+    const tag = keys[i];
+    if (tag === void 0) continue;
+    const element = data[tag];
+    if (element === void 0) continue;
+    const vr = element.vr;
+    const path2 = pathPrefix.length > 0 ? `${pathPrefix}.${tag}` : tag;
+    if (ctx.vrSet === void 0 || ctx.vrSet.has(vr)) {
+      ctx.results.push({ tag, element, vr, depth, path: path2 });
+    }
+    if (vr === "SQ" && element.Value !== void 0 && depth < ctx.maxDepth) {
+      walkSequenceItems(element.Value, depth, path2, ctx);
+    }
+  }
+}
+function walkSequenceItems(items, depth, parentPath, ctx) {
+  for (let idx = 0; idx < items.length; idx++) {
+    const item = items[idx];
+    if (typeof item !== "object" || item === null) continue;
+    const itemPath = `${parentPath}[${idx}]`;
+    walkLevel(item, depth + 1, itemPath, ctx);
+  }
+}
+
+// src/dicom/DicomDataset.ts
 var HEX_TAG_KEY = /^[0-9A-Fa-f]{8}$/;
 function isDicomJsonElement(value) {
   return typeof value === "object" && value !== null && "vr" in value && typeof value["vr"] === "string";
@@ -1885,6 +1924,15 @@ var DicomDataset = class _DicomDataset {
     const result = collectWildcard(this.data, segments);
     return result.values;
   }
+  /**
+   * Walks all tags in this dataset, optionally filtering by VR and recursing into sequences.
+   *
+   * @param options - Optional VR filter and max depth
+   * @returns A readonly array of all matching tag entries
+   */
+  walkTags(options) {
+    return walkTags(this.data, options);
+  }
   // -----------------------------------------------------------------------
   // Convenience readonly getters
   // -----------------------------------------------------------------------
@@ -2097,15 +2145,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;
 }
@@ -2122,7 +2187,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);
 }