dicom-synth 1.13.0 → 1.14.0

package/dist/esm/describe/describe.js

@@ -607,9 +607,13 @@ var UID_SWEEP_EXCLUDE = /* @__PURE__ */ new Set([
   "SeriesInstanceUID",
   "SOPClassUID"
 ]);
+var vrCache = /* @__PURE__ */ new Map();
 function vrOf(keyword) {
+  if (vrCache.has(keyword)) return vrCache.get(keyword);
   const nm = dcmjsAny.data.DicomMetaDictionary.nameMap;
-  return (nm?.[keyword] ?? nm?.[`RETIRED_${keyword}`])?.vr;
+  const vr = (nm?.[keyword] ?? nm?.[`RETIRED_${keyword}`])?.vr;
+  vrCache.set(keyword, vr);
+  return vr;
 }
 function hashUidVia(map, salt, original) {
   let synthetic = map.get(original);
@@ -619,22 +623,78 @@ function hashUidVia(map, salt, original) {
   }
   return synthetic;
 }
+function isUidLeaf(value) {
+  return typeof value === "string" || Array.isArray(value) && value.every((v) => typeof v === "string");
+}
+function hasHashableUid(value) {
+  const uids = typeof value === "string" ? [value] : value;
+  return uids.some((v) => !v.startsWith(DICOM_ORG_ROOT));
+}
+function pruneUidSequence(value) {
+  const items = Array.isArray(value) ? value : [value];
+  const pruned = [];
+  for (const item of items) {
+    if (typeof item !== "object" || item === null || Array.isArray(item))
+      continue;
+    const skeleton = {};
+    let hashable = false;
+    for (const [keyword, v] of Object.entries(item)) {
+      if (keyword === "_vrMap") continue;
+      const vr = vrOf(keyword);
+      if (vr === "UI") {
+        if (isUidLeaf(v)) {
+          skeleton[keyword] = v;
+          if (hasHashableUid(v)) hashable = true;
+        }
+      } else if (vr === "SQ") {
+        const nested = pruneUidSequence(v);
+        if (nested) {
+          skeleton[keyword] = nested;
+          hashable = true;
+        }
+      }
+    }
+    if (hashable) pruned.push(skeleton);
+  }
+  return pruned.length > 0 ? pruned : void 0;
+}
 function collectUidOriginals(record) {
   const uids = {};
   let found = false;
   for (const [keyword, value] of Object.entries(record)) {
     if (UID_SWEEP_EXCLUDE.has(keyword)) continue;
-    if (typeof value !== "string" || value.startsWith(DICOM_ORG_ROOT)) continue;
-    if (vrOf(keyword) !== "UI") continue;
-    uids[keyword] = value;
-    found = true;
+    const vr = vrOf(keyword);
+    if (vr === "UI") {
+      if (isUidLeaf(value) && hasHashableUid(value)) {
+        uids[keyword] = value;
+        found = true;
+      }
+    } else if (vr === "SQ") {
+      const pruned = pruneUidSequence(value);
+      if (pruned) {
+        uids[keyword] = pruned;
+        found = true;
+      }
+    }
   }
   return found ? uids : void 0;
 }
+function hashUidValue(value, salt, map) {
+  if (typeof value === "string") {
+    return value.startsWith(DICOM_ORG_ROOT) ? value : hashUidVia(map, salt, value);
+  }
+  if (Array.isArray(value)) return value.map((v) => hashUidValue(v, salt, map));
+  return Object.fromEntries(
+    Object.entries(value).map(([k, v]) => [
+      k,
+      hashUidValue(v, salt, map)
+    ])
+  );
+}
 function hashUidTags(uids, salt, map) {
   const tags = {};
   for (const [keyword, original] of Object.entries(uids)) {
-    tags[keyword] = hashUidVia(map, salt, original);
+    tags[keyword] = hashUidValue(original, salt, map);
   }
   return tags;
 }
@@ -820,11 +880,17 @@ function describeDirectory(dir, options = {}) {
   }
   const salt = preserveUids ? options.uidSalt ?? deriveSalt([...studies.keys()]) : void 0;
   if (salt !== void 0) {
+    const sweptKeepTags = /* @__PURE__ */ new Set();
     for (const study of studies.values()) {
       for (const series of study.values()) {
         if (!Array.isArray(series)) continue;
         for (const rec of series) {
           if (rec.uidOriginals) {
+            if (rec.tags) {
+              for (const keyword of Object.keys(rec.uidOriginals)) {
+                if (keyword in rec.tags) sweptKeepTags.add(keyword);
+              }
+            }
             rec.tags = mergeTags(
               rec.tags,
               hashUidTags(rec.uidOriginals, salt, uidMap)
@@ -833,6 +899,11 @@ function describeDirectory(dir, options = {}) {
         }
       }
     }
+    for (const keyword of sweptKeepTags) {
+      console.warn(
+        `describe: keep-tag "${keyword}" contains UID references \u2014 kept as its hashed UID skeleton, not verbatim (disable with preserveUids: false)`
+      );
+    }
   }
   const withGroupUid = (spec2, seriesUid) => salt === void 0 ? spec2 : {
     ...spec2,

package/dist/esm/index.js

@@ -1562,9 +1562,13 @@ var UID_SWEEP_EXCLUDE = /* @__PURE__ */ new Set([
   "SeriesInstanceUID",
   "SOPClassUID"
 ]);
+var vrCache = /* @__PURE__ */ new Map();
 function vrOf(keyword) {
+  if (vrCache.has(keyword)) return vrCache.get(keyword);
   const nm = dcmjsAny2.data.DicomMetaDictionary.nameMap;
-  return (nm?.[keyword] ?? nm?.[`RETIRED_${keyword}`])?.vr;
+  const vr = (nm?.[keyword] ?? nm?.[`RETIRED_${keyword}`])?.vr;
+  vrCache.set(keyword, vr);
+  return vr;
 }
 function hashUidVia(map, salt, original) {
   let synthetic = map.get(original);
@@ -1574,22 +1578,78 @@ function hashUidVia(map, salt, original) {
   }
   return synthetic;
 }
+function isUidLeaf(value) {
+  return typeof value === "string" || Array.isArray(value) && value.every((v) => typeof v === "string");
+}
+function hasHashableUid(value) {
+  const uids = typeof value === "string" ? [value] : value;
+  return uids.some((v) => !v.startsWith(DICOM_ORG_ROOT));
+}
+function pruneUidSequence(value) {
+  const items = Array.isArray(value) ? value : [value];
+  const pruned = [];
+  for (const item of items) {
+    if (typeof item !== "object" || item === null || Array.isArray(item))
+      continue;
+    const skeleton = {};
+    let hashable = false;
+    for (const [keyword, v] of Object.entries(item)) {
+      if (keyword === "_vrMap") continue;
+      const vr = vrOf(keyword);
+      if (vr === "UI") {
+        if (isUidLeaf(v)) {
+          skeleton[keyword] = v;
+          if (hasHashableUid(v)) hashable = true;
+        }
+      } else if (vr === "SQ") {
+        const nested = pruneUidSequence(v);
+        if (nested) {
+          skeleton[keyword] = nested;
+          hashable = true;
+        }
+      }
+    }
+    if (hashable) pruned.push(skeleton);
+  }
+  return pruned.length > 0 ? pruned : void 0;
+}
 function collectUidOriginals(record) {
   const uids = {};
   let found = false;
   for (const [keyword, value] of Object.entries(record)) {
     if (UID_SWEEP_EXCLUDE.has(keyword)) continue;
-    if (typeof value !== "string" || value.startsWith(DICOM_ORG_ROOT)) continue;
-    if (vrOf(keyword) !== "UI") continue;
-    uids[keyword] = value;
-    found = true;
+    const vr = vrOf(keyword);
+    if (vr === "UI") {
+      if (isUidLeaf(value) && hasHashableUid(value)) {
+        uids[keyword] = value;
+        found = true;
+      }
+    } else if (vr === "SQ") {
+      const pruned = pruneUidSequence(value);
+      if (pruned) {
+        uids[keyword] = pruned;
+        found = true;
+      }
+    }
   }
   return found ? uids : void 0;
 }
+function hashUidValue(value, salt, map) {
+  if (typeof value === "string") {
+    return value.startsWith(DICOM_ORG_ROOT) ? value : hashUidVia(map, salt, value);
+  }
+  if (Array.isArray(value)) return value.map((v) => hashUidValue(v, salt, map));
+  return Object.fromEntries(
+    Object.entries(value).map(([k, v]) => [
+      k,
+      hashUidValue(v, salt, map)
+    ])
+  );
+}
 function hashUidTags(uids, salt, map) {
   const tags = {};
   for (const [keyword, original] of Object.entries(uids)) {
-    tags[keyword] = hashUidVia(map, salt, original);
+    tags[keyword] = hashUidValue(original, salt, map);
   }
   return tags;
 }
@@ -1775,11 +1835,17 @@ function describeDirectory(dir, options = {}) {
   }
   const salt = preserveUids ? options.uidSalt ?? deriveSalt([...studies.keys()]) : void 0;
   if (salt !== void 0) {
+    const sweptKeepTags = /* @__PURE__ */ new Set();
     for (const study of studies.values()) {
       for (const series of study.values()) {
         if (!Array.isArray(series)) continue;
         for (const rec of series) {
           if (rec.uidOriginals) {
+            if (rec.tags) {
+              for (const keyword of Object.keys(rec.uidOriginals)) {
+                if (keyword in rec.tags) sweptKeepTags.add(keyword);
+              }
+            }
             rec.tags = mergeTags(
               rec.tags,
               hashUidTags(rec.uidOriginals, salt, uidMap)
@@ -1788,6 +1854,11 @@ function describeDirectory(dir, options = {}) {
         }
       }
     }
+    for (const keyword of sweptKeepTags) {
+      console.warn(
+        `describe: keep-tag "${keyword}" contains UID references \u2014 kept as its hashed UID skeleton, not verbatim (disable with preserveUids: false)`
+      );
+    }
   }
   const withGroupUid = (spec2, seriesUid) => salt === void 0 ? spec2 : {
     ...spec2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dicom-synth",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "Toolkit for synthetic DICOM fixtures and public fixture fetch/cache.",
   "license": "Apache-2.0",
   "type": "module",