@ubercode/dcmtk 0.14.0 → 0.15.1

package/dist/tools.cjs

@@ -14,7 +14,54 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var kill__default = /*#__PURE__*/_interopDefault(kill);
 
-// src/tools/dcm2xml.ts
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+
+// src/tools/_toolError.ts
+var MAX_ARGS_LENGTH = 200;
+var MAX_STDERR_LENGTH = 500;
+function truncate(value, maxLength) {
+  if (value.length <= maxLength) {
+    return value;
+  }
+  return `${value.substring(0, maxLength)}...`;
+}
+var ToolExecutionError = class extends Error {
+  constructor(message, details) {
+    super(message);
+    __publicField(this, "stdout");
+    __publicField(this, "stderr");
+    __publicField(this, "exitCode");
+    this.name = "ToolExecutionError";
+    this.stdout = details.stdout;
+    this.stderr = details.stderr;
+    this.exitCode = details.exitCode;
+  }
+};
+function createToolError(toolName, args, exitCode, stderr3, stdout = "") {
+  const argsStr = truncate(args.join(" "), MAX_ARGS_LENGTH);
+  const stderrStr = truncate(stderr3.trim(), MAX_STDERR_LENGTH);
+  const parts = [`${toolName} failed (exit code ${String(exitCode)})`];
+  if (argsStr.length > 0) {
+    parts.push(`args: ${argsStr}`);
+  }
+  if (stderrStr.length > 0) {
+    parts.push(`stderr: ${stderrStr}`);
+  }
+  return new ToolExecutionError(parts.join(" | "), { stdout, stderr: stderr3, exitCode });
+}
+function createValidationError(toolName, zodError) {
+  const parts = [];
+  for (let i = 0; i < zodError.issues.length; i++) {
+    const issue = zodError.issues[i];
+    if (issue === void 0) continue;
+    const path = issue.path.length > 0 ? issue.path.map(String).join(".") : "(root)";
+    parts.push(`${path}: ${issue.message}`);
+  }
+  const detail = parts.length > 0 ? parts.join("; ") : "unknown validation error";
+  return new Error(`${toolName}: invalid options \u2014 ${detail}`);
+}
 
 // src/types.ts
 function ok(value) {
@@ -210,39 +257,6 @@ function resolveBinary(toolName) {
   return ok(path.join(pathResult.value, binaryName2));
 }
 
-// src/tools/_toolError.ts
-var MAX_ARGS_LENGTH = 200;
-var MAX_STDERR_LENGTH = 500;
-function truncate(value, maxLength) {
-  if (value.length <= maxLength) {
-    return value;
-  }
-  return `${value.substring(0, maxLength)}...`;
-}
-function createToolError(toolName, args, exitCode, stderr3) {
-  const argsStr = truncate(args.join(" "), MAX_ARGS_LENGTH);
-  const stderrStr = truncate(stderr3.trim(), MAX_STDERR_LENGTH);
-  const parts = [`${toolName} failed (exit code ${String(exitCode)})`];
-  if (argsStr.length > 0) {
-    parts.push(`args: ${argsStr}`);
-  }
-  if (stderrStr.length > 0) {
-    parts.push(`stderr: ${stderrStr}`);
-  }
-  return new Error(parts.join(" | "));
-}
-function createValidationError(toolName, zodError) {
-  const parts = [];
-  for (let i = 0; i < zodError.issues.length; i++) {
-    const issue = zodError.issues[i];
-    if (issue === void 0) continue;
-    const path = issue.path.length > 0 ? issue.path.map(String).join(".") : "(root)";
-    parts.push(`${path}: ${issue.message}`);
-  }
-  const detail = parts.length > 0 ? parts.join("; ") : "unknown validation error";
-  return new Error(`${toolName}: invalid options \u2014 ${detail}`);
-}
-
 // src/tools/dcm2xml.ts
 var Dcm2xmlCharset = {
   /** Use UTF-8 encoding (default). */
@@ -352,8 +366,14 @@ var KNOWN_VR_CODES = /* @__PURE__ */ new Set([
   "UT",
   "UV"
 ]);
+function decodeXmlEntities(value) {
+  return value.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&amp;/g, "&");
+}
+function decodeIfString(value) {
+  return typeof value === "string" ? decodeXmlEntities(value) : value;
+}
 function buildPnString(comp) {
-  const parts = [comp.FamilyName ?? "", comp.GivenName ?? "", comp.MiddleName ?? "", comp.NamePrefix ?? "", comp.NameSuffix ?? ""];
+  const parts = [comp.FamilyName ?? "", comp.GivenName ?? "", comp.MiddleName ?? "", comp.NamePrefix ?? "", comp.NameSuffix ?? ""].map(decodeXmlEntities);
   let last = parts.length - 1;
   for (; last >= 0; last--) {
     if (parts[last] !== "") break;
@@ -392,9 +412,9 @@ function convertBulkDataURI(attr, element) {
   const bulkArray = toArray(attr.BulkDataURI);
   const firstBulk = bulkArray[0];
   if (typeof firstBulk === "object" && firstBulk !== null && "@_uri" in firstBulk) {
-    element.BulkDataURI = safeString(firstBulk["@_uri"]);
+    element.BulkDataURI = decodeXmlEntities(safeString(firstBulk["@_uri"]));
   } else {
-    element.BulkDataURI = safeString(firstBulk);
+    element.BulkDataURI = decodeXmlEntities(safeString(firstBulk));
   }
 }
 function convertPNValue(attr, element) {
@@ -438,7 +458,7 @@ function convertRegularValue(attr, element, vr) {
   const values = [];
   const isNumeric = NUMERIC_JSON_VRS.has(vr);
   for (const v of valArray) {
-    const unwrapped = unwrapValue(v);
+    const unwrapped = decodeIfString(unwrapValue(v));
     values.push(isNumeric ? coerceNumeric(unwrapped) : unwrapped);
   }
   if (values.length > 0) element.Value = values;
@@ -2364,7 +2384,7 @@ async function dcmsend(options) {
     return err(result.error);
   }
   if (result.value.exitCode !== 0) {
-    return err(createToolError("dcmsend", args, result.value.exitCode, result.value.stderr));
+    return err(createToolError("dcmsend", args, result.value.exitCode, result.value.stderr, result.value.stdout));
   }
   return ok({ success: true, stdout: result.value.stdout, stderr: result.value.stderr });
 }
@@ -2519,10 +2539,10 @@ async function storescu(options) {
     return err(result.error);
   }
   if (result.value.exitCode !== 0) {
-    return err(createToolError("storescu", args, result.value.exitCode, result.value.stderr));
+    return err(createToolError("storescu", args, result.value.exitCode, result.value.stderr, result.value.stdout));
   }
   if (DIMSE_ERROR_PATTERN.test(result.value.stderr)) {
-    return err(createToolError("storescu", args, 0, result.value.stderr));
+    return err(createToolError("storescu", args, 0, result.value.stderr, result.value.stdout));
   }
   return ok({ success: true, stdout: result.value.stdout, stderr: result.value.stderr });
 }
@@ -3426,6 +3446,7 @@ exports.LutType = LutType;
 exports.MoveQueryModel = MoveQueryModel;
 exports.ProposedTransferSyntax = ProposedTransferSyntax;
 exports.QueryModel = QueryModel;
+exports.ToolExecutionError = ToolExecutionError;
 exports.TransferSyntax = TransferSyntax;
 exports.cda2dcm = cda2dcm;
 exports.dcm2cda = dcm2cda;