@cosyte/dicom 0.1.3 → 0.1.5

package/dist/index.mjs

@@ -9,7 +9,7 @@ var __export = (target, all) => {
 };
 
 // src/version.ts
-var VERSION = "0.1.3";
+var VERSION = "0.1.5";
 
 // src/dictionary/index.ts
 var dictionary_exports = {};
@@ -13221,7 +13221,18 @@ var MULTIBYTE_LABELS = /* @__PURE__ */ new Set([
 ]);
 function parseSpecificCharacterSet(bytes) {
   const raw = bytes.toString("latin1");
-  return raw.split("\\").map((t) => t.replace(/[ ]+$/u, "").replace(/^[ ]+/u, "")).map((t) => t === "" || TERM_TO_LABEL.has(t) ? t : WITHHELD);
+  return raw.split("\\").map(trimTermPad).map((t) => t === "" || TERM_TO_LABEL.has(t) ? t : WITHHELD);
+}
+function trimTermPad(term) {
+  let end = term.length;
+  while (end > 0) {
+    const code = term.charCodeAt(end - 1);
+    if (code !== 0 && code !== 32) break;
+    end--;
+  }
+  let start = 0;
+  while (start < end && term.charCodeAt(start) === 32) start++;
+  return term.slice(start, end);
 }
 function isKnownCharsetTerm(term) {
   return TERM_TO_LABEL.has(term);
@@ -13788,6 +13799,14 @@ function stripPad(bytes, tag, vr, position, warnings) {
   }
   return bytes.subarray(0, end);
 }
+function trimSpaces(value) {
+  let start = 0;
+  let end = value.length;
+  while (start < end && value.charCodeAt(start) === SPACE2) start++;
+  while (end > start && value.charCodeAt(end - 1) === SPACE2) end--;
+  return value.slice(start, end);
+}
+var DECIMAL_STRING = /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?$/u;
 function attachWarnings(value, warnings) {
   return warnings.length > 0 ? { ...value, warnings } : value;
 }
@@ -13839,7 +13858,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((v) => v.replace(/^ +| +$/gu, ""));
+    const values = text.split("\\").map(trimSpaces);
     return attachWarnings({ kind: "strings", values }, warnings);
   }
   if (vr === "LT" || vr === "ST" || vr === "UT") {
@@ -13852,7 +13871,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((v) => v.replace(/^ +| +$/gu, ""));
+    const values = text.split("\\").map(trimSpaces);
     return attachWarnings({ kind: "strings", values }, warnings);
   }
   if (vr === "DS") {
@@ -13860,7 +13879,7 @@ function decodeElementValue(element) {
     const values = text.split("\\").map((v) => {
       const t = v.trim();
       if (t.length === 0) return null;
-      if (!/^[+-]?(\d+\.?\d*|\.\d+)([eE][+-]?\d+)?$/u.test(t)) return null;
+      if (!DECIMAL_STRING.test(t)) return null;
       const n = Number(t);
       return Number.isFinite(n) ? n : null;
     });
@@ -14922,6 +14941,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);
@@ -14940,6 +14960,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";
@@ -14971,6 +15004,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),
@@ -16693,7 +16737,7 @@ function effectiveCode(action, active) {
   return action.basicProfile;
 }
 function resolveAction(code) {
-  const first = code.split("/", 1)[0]?.replace("*", "") ?? "K";
+  const first = code.split("/", 1)[0]?.replaceAll("*", "") ?? "K";
   return first;
 }
 var TEXT_DUMMIES = {