@cosyte/dicom 0.1.4 → 0.1.6

package/dist/index.mjs

@@ -9,7 +9,7 @@ var __export = (target, all) => {
 };
 
 // src/version.ts
-var VERSION = "0.1.4";
+var VERSION = "0.1.6";
 
 // src/dictionary/index.ts
 var dictionary_exports = {};
@@ -11139,8 +11139,24 @@ function directoryRecords(source) {
 }
 function csValues(el) {
   if (el === void 0) return void 0;
-  const text = el.rawBytes.toString("latin1").replace(/[\0 ]+$/u, "");
-  return Object.freeze(text === "" ? [] : text.split("\\").map((v) => v.replace(/^ +| +$/gu, "")));
+  const text = stripTrailingPad(el.rawBytes.toString("latin1"));
+  return Object.freeze(text === "" ? [] : text.split("\\").map(trimSpaces));
+}
+function stripTrailingPad(text) {
+  let end = text.length;
+  while (end > 0) {
+    const code = text.charCodeAt(end - 1);
+    if (code !== 0 && code !== 32) break;
+    end--;
+  }
+  return text.slice(0, end);
+}
+function trimSpaces(value) {
+  let start = 0;
+  let end = value.length;
+  while (start < end && value.charCodeAt(start) === 32) start++;
+  while (end > start && value.charCodeAt(end - 1) === 32) end--;
+  return value.slice(start, end);
 }
 function analyzeDirectory(source) {
   if (!isDicomdir(source.fileMeta)) return void 0;
@@ -13799,7 +13815,7 @@ function stripPad(bytes, tag, vr, position, warnings) {
   }
   return bytes.subarray(0, end);
 }
-function trimSpaces(value) {
+function trimSpaces2(value) {
   let start = 0;
   let end = value.length;
   while (start < end && value.charCodeAt(start) === SPACE2) start++;
@@ -13858,7 +13874,7 @@ function decodeElementValue(element) {
   }
   if (vr === "LO" || vr === "SH" || vr === "UC") {
     const text = decodeCharsetString(trimmed, tag, vr, charset, position, warnings);
-    const values = text.split("\\").map(trimSpaces);
+    const values = text.split("\\").map(trimSpaces2);
     return attachWarnings({ kind: "strings", values }, warnings);
   }
   if (vr === "LT" || vr === "ST" || vr === "UT") {
@@ -13871,7 +13887,7 @@ function decodeElementValue(element) {
   }
   if (vr === "AE" || vr === "CS" || vr === "AS" || vr === "UI") {
     const text = decodeAsciiString(trimmed, tag, vr, position, warnings);
-    const values = text.split("\\").map(trimSpaces);
+    const values = text.split("\\").map(trimSpaces2);
     return attachWarnings({ kind: "strings", values }, warnings);
   }
   if (vr === "DS") {
@@ -14941,6 +14957,7 @@ function toDate(value, options) {
   return Number.isNaN(instant.getTime()) ? void 0 : instant;
 }
 var UNDEFINED_LENGTH4 = 4294967295;
+var MAX_SHORT_FORM_LENGTH = 65534;
 var NULL_PAD_VRS = /* @__PURE__ */ new Set(["UI", "OB", "OW", "OF", "OD", "OL", "OV", "UN"]);
 function padValue(value, vr) {
   if (value.length % 2 === 0) return Buffer.from(value);
@@ -14959,6 +14976,19 @@ function uint32(n, littleEndian) {
   else buf.writeUInt32BE(n, 0);
   return buf;
 }
+function littleEndianValue(value, vr, littleEndian) {
+  const stride = BE_VR_STRIDE[vr];
+  if (littleEndian || stride === 0) return value;
+  const swapped = Buffer.from(value);
+  const whole = swapped.subarray(0, swapped.length - swapped.length % stride);
+  if (stride === 2) whole.swap16();
+  else if (stride === 4) whole.swap32();
+  else whole.swap64();
+  return swapped;
+}
+function isPrivateCreator(group, element) {
+  return group % 2 === 1 && element >= 16 && element <= 255;
+}
 function isFullSpanElement(el, encoding) {
   if (el.length === UNDEFINED_LENGTH4) return true;
   return el.vr === "SQ" && encoding !== "implicit";
@@ -14990,6 +15020,17 @@ function encodeDatasetElement(el, encoding, rawBytes = el.rawBytes) {
       value
     ]);
   }
+  if (value.length > MAX_SHORT_FORM_LENGTH && !isPrivateCreator(group, element)) {
+    return Buffer.concat([
+      uint16(group, littleEndian),
+      uint16(element, littleEndian),
+      Buffer.from("UN", "ascii"),
+      Buffer.from([0, 0]),
+      // reserved (PS3.5 §7.1.2)
+      uint32(value.length, littleEndian),
+      littleEndianValue(value, el.vr, littleEndian)
+    ]);
+  }
   return Buffer.concat([
     uint16(group, littleEndian),
     uint16(element, littleEndian),
@@ -16739,14 +16780,19 @@ function dummyBytes(vr) {
   const buf = Buffer.from(text, "latin1");
   return buf.length % 2 === 0 ? buf : Buffer.concat([buf, Buffer.from([32])]);
 }
+function stripTrailingNulls(text) {
+  let end = text.length;
+  while (end > 0 && text.charCodeAt(end - 1) === 0) end--;
+  return text.slice(0, end);
+}
 function remapUidBytes(rawBytes, remap) {
-  const raw = rawBytes.toString("latin1").replace(/\0+$/, "");
+  const raw = stripTrailingNulls(rawBytes.toString("latin1"));
   const remapped = raw.split("\\").map((uid2) => remap(uid2.trim())).join("\\");
   const buf = Buffer.from(remapped, "latin1");
   return buf.length % 2 === 0 ? buf : Buffer.concat([buf, Buffer.from([0])]);
 }
 function uidValueMultiplicity(rawBytes) {
-  const raw = rawBytes.toString("latin1").replace(/\0+$/, "");
+  const raw = stripTrailingNulls(rawBytes.toString("latin1"));
   if (raw.length === 0) return 0;
   return raw.split("\\").length;
 }
@@ -17148,7 +17194,7 @@ function insertedSequence(tag, items, encoding) {
   });
 }
 function decodeCreator(el) {
-  return el.rawBytes.toString("latin1").replace(/[\0 ]+$/, "").trim();
+  return trimTrailingPad(el.rawBytes).toString("latin1").trim();
 }
 function isPrivateCreatorElement(tag) {
   const { element } = splitTag(tag);
@@ -17276,7 +17322,7 @@ function declarationKey(group, creator) {
   return `${String(group)}:${creator}`;
 }
 function decodeEnumerated(el) {
-  return el.rawBytes.toString("latin1").replace(/[\0 ]+$/, "").trim();
+  return trimTrailingPad(el.rawBytes).toString("latin1").trim();
 }
 function readUnsignedShorts(el) {
   const values = [];
@@ -17713,7 +17759,7 @@ function hasUncleanedBurnedIn(ds) {
   if (!ds.has(TAG_PIXEL_DATA)) return false;
   const flag = ds.get(TAG_BURNED_IN_ANNOTATION);
   if (flag === void 0) return true;
-  return flag.rawBytes.toString("latin1").replace(/[\0 ]+$/, "").trim().toUpperCase() !== "NO";
+  return trimTrailingPad(flag.rawBytes).toString("latin1").trim().toUpperCase() !== "NO";
 }
 function deidentify(ds, options = {}) {
   if (isRefusedTransferSyntax(ds.fileMeta?.transferSyntaxUID)) {