@cosyte/dicom 0.0.7 → 0.0.10

package/dist/index.cjs

@@ -11,7 +11,7 @@ var __export = (target, all) => {
 };
 
 // src/version.ts
-var VERSION = "0.0.7";
+var VERSION = "0.0.10";
 
 // src/dictionary/index.ts
 var dictionary_exports = {};
@@ -11703,6 +11703,12 @@ var BE_VR_STRIDE = Object.freeze({
   UT: 0,
   SQ: 0
 });
+var KNOWN_VRS = Object.freeze(
+  new Set(Object.keys(BE_VR_STRIDE))
+);
+function isRecognizedVr(vr) {
+  return KNOWN_VRS.has(vr);
+}
 
 // src/parser/warnings.ts
 var WARNING_CODES = {
@@ -11753,7 +11759,11 @@ var WARNING_MESSAGES = Object.freeze({
   DICOM_VR_MISMATCH: "Element ({tag}) on-wire VR is {vr2}; dictionary lists {vr}. Trusting on-wire VR.",
   DICOM_PRIVATE_TAG_NO_CREATOR: "Private element ({tag}) has no Private Creator registered for its block; treating as VR=UN.",
   DICOM_GROUP_LENGTH_IN_DATASET: "Retired Group Length element ({tag}) encountered in dataset; preserved as-is.",
-  DICOM_NONZERO_RESERVED_BYTES: "Element ({tag}) has non-zero reserved bytes between VR and length (first byte {n}, second byte {n2}); ignoring.",
+  // The tag is deliberately absent, and this is the only *parser* message where
+  // that is true. See `nonzeroReservedBytes`. Kept terse for the same reason the
+  // de-identify messages are: it is emitted once per element, and element count
+  // is attacker-chosen.
+  DICOM_NONZERO_RESERVED_BYTES: "Non-zero reserved bytes between VR and length (first byte {n}, second byte {n2}); ignoring. Tag withheld; the byte offset identifies the element.",
   DICOM_SQ_NOT_DESCENDED: "Element ({tag}) resolved to VR=SQ from the dictionary but its defined-length value is not a valid item stream; kept as opaque bytes and NOT descended, so nothing nested inside it is visible to navigation, and deidentify() cannot audit it. See DICOM_DEIDENT_SEQUENCE_NOT_AUDITABLE.",
   DICOM_UN_PARSED_AS_SQ: "Element ({tag}) has VR=UN with undefined length; descended as Implicit VR LE sequence per CP-246.",
   DICOM_EMPTY_ITEM_IN_SEQUENCE: "Sequence ({tag}) contains an empty item (length=0); tolerated.",
@@ -11788,7 +11798,6 @@ var WARNING_MESSAGES = Object.freeze({
   DICOM_UNSUPPORTED_CHARSET: "(0008,0005) Specific Character Set value {n} names a defined term this build does not support; decoding text as UTF-8 best-effort. The term is not reproduced here - read the element if you need it.",
   DICOM_CHARSET_AMBIGUOUS_SEPARATOR: "(0008,0005) Specific Character Set value {n} is ambiguous under the active code extensions; decoding text as UTF-8 best-effort."
 });
-var KNOWN_VRS = new Set(Object.keys(BE_VR_STRIDE));
 var TAG_SHAPE = /^[0-9A-F]{8}$/u;
 function renderTag(tag) {
   return tag !== void 0 && TAG_SHAPE.test(tag) ? tag : WITHHELD;
@@ -11830,9 +11839,8 @@ function privateTagNoCreator(position, tag) {
 function groupLengthInDataset(position, tag) {
   return build(WARNING_CODES.DICOM_GROUP_LENGTH_IN_DATASET, position, { tag });
 }
-function nonzeroReservedBytes(position, tag, first, second) {
+function nonzeroReservedBytes(position, first, second) {
   return build(WARNING_CODES.DICOM_NONZERO_RESERVED_BYTES, position, {
-    tag,
     n: first,
     n2: second
   });
@@ -12036,12 +12044,12 @@ function readExplicitElementHeader(cursor, _ctx, emit) {
   const vr = vrSlice.toString("ascii");
   let length;
   let headerLength;
-  if (LONG_FORM_VRS.has(vr)) {
+  if (LONG_FORM_VRS.has(vr) || !isRecognizedVr(vr)) {
     const reserved0 = cursor.buffer[cursor.position];
     const reserved1 = cursor.buffer[cursor.position + 1];
     cursor.position += 2;
     if ((reserved0 ?? 0) !== 0 || (reserved1 ?? 0) !== 0) {
-      emit(nonzeroReservedBytes({ byteOffset: headerStart }, tag, reserved0 ?? 0, reserved1 ?? 0));
+      emit(nonzeroReservedBytes({ byteOffset: headerStart }, reserved0 ?? 0, reserved1 ?? 0));
     }
     length = cursor.readUInt32();
     headerLength = 12;
@@ -12179,7 +12187,7 @@ function readExplicitLeElement(cursor) {
   const vr = cursor.slice(2).toString("ascii");
   let length;
   let headerLength;
-  if (LONG_FORM_VRS.has(vr)) {
+  if (LONG_FORM_VRS.has(vr) || !isRecognizedVr(vr)) {
     cursor.slice(2);
     length = cursor.readUInt32();
     headerLength = 12;
@@ -13453,7 +13461,7 @@ function encodeDatasetElement(el, encoding) {
   }
   const littleEndian = encoding === "explicitLE";
   const vrBuf = buffer.Buffer.from(el.vr, "ascii");
-  if (LONG_FORM_VRS.has(el.vr)) {
+  if (LONG_FORM_VRS.has(el.vr) || !isRecognizedVr(el.vr)) {
     return buffer.Buffer.concat([
       uint16(group, littleEndian),
       uint16(element, littleEndian),
@@ -13504,7 +13512,7 @@ function encodeMetaElement(tag, vr, rawValue) {
   const elementBuf = buffer.Buffer.alloc(2);
   elementBuf.writeUInt16LE(element, 0);
   const vrBuf = buffer.Buffer.from(vr, "ascii");
-  if (LONG_FORM_VRS.has(vr)) {
+  if (LONG_FORM_VRS.has(vr) || !isRecognizedVr(vr)) {
     const lengthBuf2 = buffer.Buffer.alloc(4);
     lengthBuf2.writeUInt32LE(value.length, 0);
     return buffer.Buffer.concat([
@@ -14699,7 +14707,6 @@ function uidValueMultiplicity(rawBytes) {
 }
 
 // src/deident/embedded.ts
-var KNOWN_VRS2 = new Set(Object.keys(BE_VR_STRIDE));
 var UNDEFINED_LENGTH4 = 4294967295;
 var FFFE_GROUP = 65534;
 var SCANNABLE_CARRIER_VRS = /* @__PURE__ */ new Set([
@@ -14760,7 +14767,7 @@ function decodeAt(value, off, encoding) {
     return next2 > value.length ? void 0 : { next: next2, tag };
   }
   const vr = value.toString("latin1", off + 4, off + 6);
-  if (!KNOWN_VRS2.has(vr)) return void 0;
+  if (!KNOWN_VRS.has(vr)) return void 0;
   if (LONG_FORM_VRS.has(vr)) {
     if (off + 12 > value.length) return void 0;
     if (value[off + 6] !== 0 || value[off + 7] !== 0) return void 0;
@@ -14897,7 +14904,6 @@ var BODY_ENCODING2 = {
 };
 var MAX_UNAUDITABLE_SEQUENCE_FINDINGS = 64;
 var MAX_UNDEFINED_VR_FINDINGS = 64;
-var KNOWN_VRS3 = new Set(Object.keys(BE_VR_STRIDE));
 function validateRetain(retain) {
   const valid = new Set(DEIDENTIFY_OPTIONS);
   const active = /* @__PURE__ */ new Set();
@@ -15018,7 +15024,7 @@ function actsOnTag(tag, ctx) {
   return resolveAction(effectiveCode(action, ctx.active)) !== "K";
 }
 function hasUndefinedVr(el) {
-  return !KNOWN_VRS3.has(el.vr);
+  return !KNOWN_VRS.has(el.vr);
 }
 function keepOrEmpty(el, ctx, contextPath, out) {
   if (hasUndefinedVr(el)) {
@@ -15082,6 +15088,13 @@ function creatorFor(tag, creators) {
   const { group, element } = splitTag(tag);
   return creators.get(`${String(group)}:${String(element >> 8 & 255)}`);
 }
+var UNDEFINED_LENGTH5 = 4294967295;
+var EXPLICIT_SQ_HEADER_BYTES = 12;
+function itemStreamOverrunsSequence(el, encoding) {
+  if (el.vr !== "SQ" || el.length === UNDEFINED_LENGTH5) return false;
+  const headerBytes = encoding === "implicit" ? 0 : EXPLICIT_SQ_HEADER_BYTES;
+  return el.rawBytes.length - headerBytes > el.length;
+}
 function keepsPrivate(el, ctx, creators) {
   if (!ctx.active.has("RetainSafePrivate") || ctx.profile === void 0) return false;
   if (isPrivateCreatorElement(el.tag)) {
@@ -15091,7 +15104,7 @@ function keepsPrivate(el, ctx, creators) {
   if (creator === void 0) return false;
   return resolvePrivateTag(ctx.profile, el.tag, creator) !== void 0;
 }
-function processElements(source, ctx, contextPath) {
+function processElements(source, ctx, contextPath, reservationsUsable) {
   const out = {
     elements: /* @__PURE__ */ new Map(),
     attributes: [],
@@ -15104,7 +15117,8 @@ function processElements(source, ctx, contextPath) {
   const creators = creatorsInScope(source);
   for (const el of source) {
     if (isPrivateTag(el.tag)) {
-      if (keepsPrivate(el, ctx, creators)) keepOrEmpty(el, ctx, contextPath, out);
+      if (reservationsUsable && keepsPrivate(el, ctx, creators))
+        keepOrEmpty(el, ctx, contextPath, out);
       else out.removedPrivateTags.push(el.tag);
       continue;
     }
@@ -15112,7 +15126,8 @@ function processElements(source, ctx, contextPath) {
     if (action === void 0) {
       if (el.vr === "SQ") {
         if (isUnauditableSequence(el)) emptyUnauditableSequence(el, ctx, contextPath, out);
-        else out.elements.set(el.tag, descendSequence(el, ctx, contextPath, out));
+        else
+          out.elements.set(el.tag, descendSequence(el, ctx, contextPath, out, reservationsUsable));
       } else {
         keepOrEmpty(el, ctx, contextPath, out);
       }
@@ -15120,7 +15135,7 @@ function processElements(source, ctx, contextPath) {
     }
     const resolved = resolveAction(effectiveCode(action, ctx.active));
     if (el.vr === "SQ") {
-      applySequenceAction(el, resolved, action, ctx, contextPath, out);
+      applySequenceAction(el, resolved, action, ctx, contextPath, out, reservationsUsable);
       continue;
     }
     let applied;
@@ -15161,11 +15176,12 @@ function processElements(source, ctx, contextPath) {
   }
   return out;
 }
-function descendSequence(el, ctx, contextPath, out) {
+function descendSequence(el, ctx, contextPath, out, reservationsUsable) {
+  const childReservationsUsable = reservationsUsable && !itemStreamOverrunsSequence(el, ctx.encoding);
   const newItems = [];
   (el.items ?? []).forEach((item, index) => {
     const childPath = [...contextPath, `${el.tag}[${String(index)}]`];
-    const inner = processElements(item.elements(), ctx, childPath);
+    const inner = processElements(item.elements(), ctx, childPath, childReservationsUsable);
     out.attributes.push(...inner.attributes);
     out.removedPrivateTags.push(...inner.removedPrivateTags);
     out.embeddedAttributes.push(...inner.embeddedAttributes);
@@ -15176,7 +15192,7 @@ function descendSequence(el, ctx, contextPath, out) {
   });
   return rebuildSequence(el, newItems, ctx.encoding);
 }
-function applySequenceAction(el, resolved, action, ctx, contextPath, out) {
+function applySequenceAction(el, resolved, action, ctx, contextPath, out, reservationsUsable) {
   let applied;
   switch (resolved) {
     case "X":
@@ -15192,7 +15208,7 @@ function applySequenceAction(el, resolved, action, ctx, contextPath, out) {
         emptyUnauditableSequence(el, ctx, contextPath, out);
         applied = "emptied";
       } else {
-        out.elements.set(el.tag, descendSequence(el, ctx, contextPath, out));
+        out.elements.set(el.tag, descendSequence(el, ctx, contextPath, out, reservationsUsable));
         applied = "cleaned";
       }
       break;
@@ -15202,7 +15218,7 @@ function applySequenceAction(el, resolved, action, ctx, contextPath, out) {
         emptyUnauditableSequence(el, ctx, contextPath, out);
         applied = "emptied";
       } else {
-        out.elements.set(el.tag, descendSequence(el, ctx, contextPath, out));
+        out.elements.set(el.tag, descendSequence(el, ctx, contextPath, out, reservationsUsable));
         applied = "kept";
       }
       break;
@@ -15253,7 +15269,7 @@ function deidentify(ds, options = {}) {
     encoding,
     budget: { unauditableSequences: 0, undefinedVrElements: 0 }
   };
-  const processed = processElements(ds.elements(), ctx, []);
+  const processed = processElements(ds.elements(), ctx, [], true);
   const {
     elements,
     attributes,