@ubercode/dcmtk 0.2.0 → 0.4.0

package/dist/servers.cjs

@@ -410,7 +410,7 @@ var LineParser = class extends events.EventEmitter {
 
 // src/patterns.ts
 var DICOM_TAG_PATTERN = /^\([0-9A-Fa-f]{4},[0-9A-Fa-f]{4}\)$/;
-var AE_TITLE_PATTERN = /^[A-Za-z0-9 -]+$/;
+var AE_TITLE_PATTERN = /^[\x20-\x5b\x5d-\x7e]+$/;
 var UID_PATTERN = /^[0-9]+(\.[0-9]+)*$/;
 var UID_MAX_LENGTH = 64;
 var PATH_TRAVERSAL_PATTERN = /(?:^|[\\/])\.\.(?:[\\/]|$)/;
@@ -2201,19 +2201,28 @@ function repairJson(raw) {
 var Dcm2jsonOptionsSchema = zod.z.object({
   timeoutMs: zod.z.number().int().positive().optional(),
   signal: zod.z.instanceof(AbortSignal).optional(),
-  directOnly: zod.z.boolean().optional()
+  directOnly: zod.z.boolean().optional(),
+  verbosity: zod.z.enum(["verbose", "debug"]).optional()
 }).strict().optional();
-async function tryXmlPath(inputPath, timeoutMs, signal) {
+var VERBOSITY_FLAGS = { verbose: "-v", debug: "-d" };
+function buildVerbosityArgs(verbosity) {
+  if (verbosity !== void 0) {
+    return [VERBOSITY_FLAGS[verbosity]];
+  }
+  return [];
+}
+async function tryXmlPath(inputPath, timeoutMs, signal, verbosity) {
   const xmlBinary = resolveBinary("dcm2xml");
   if (!xmlBinary.ok) {
     return err(xmlBinary.error);
   }
-  const xmlResult = await execCommand(xmlBinary.value, ["-nat", inputPath], { timeoutMs, signal });
+  const xmlArgs = [...buildVerbosityArgs(verbosity), "-nat", inputPath];
+  const xmlResult = await execCommand(xmlBinary.value, xmlArgs, { timeoutMs, signal });
   if (!xmlResult.ok) {
     return err(xmlResult.error);
   }
   if (xmlResult.value.exitCode !== 0) {
-    return err(createToolError("dcm2xml", ["-nat", inputPath], xmlResult.value.exitCode, xmlResult.value.stderr));
+    return err(createToolError("dcm2xml", xmlArgs, xmlResult.value.exitCode, xmlResult.value.stderr));
   }
   const jsonResult = xmlToJson(xmlResult.value.stdout);
   if (!jsonResult.ok) {
@@ -2221,17 +2230,18 @@ async function tryXmlPath(inputPath, timeoutMs, signal) {
   }
   return ok({ data: jsonResult.value, source: "xml" });
 }
-async function tryDirectPath(inputPath, timeoutMs, signal) {
+async function tryDirectPath(inputPath, timeoutMs, signal, verbosity) {
   const jsonBinary = resolveBinary("dcm2json");
   if (!jsonBinary.ok) {
     return err(jsonBinary.error);
   }
-  const result = await execCommand(jsonBinary.value, [inputPath], { timeoutMs, signal });
+  const directArgs = [...buildVerbosityArgs(verbosity), inputPath];
+  const result = await execCommand(jsonBinary.value, directArgs, { timeoutMs, signal });
   if (!result.ok) {
     return err(result.error);
   }
   if (result.value.exitCode !== 0) {
-    return err(createToolError("dcm2json", [inputPath], result.value.exitCode, result.value.stderr));
+    return err(createToolError("dcm2json", directArgs, result.value.exitCode, result.value.stderr));
   }
   try {
     const repaired = repairJson(result.value.stdout);
@@ -2248,20 +2258,22 @@ async function dcm2json(inputPath, options) {
   }
   const timeoutMs = options?.timeoutMs ?? DEFAULT_TIMEOUT_MS;
   const signal = options?.signal;
+  const verbosity = options?.verbosity;
   if (options?.directOnly === true) {
-    return tryDirectPath(inputPath, timeoutMs, signal);
+    return tryDirectPath(inputPath, timeoutMs, signal, verbosity);
   }
-  const xmlResult = await tryXmlPath(inputPath, timeoutMs, signal);
+  const xmlResult = await tryXmlPath(inputPath, timeoutMs, signal, verbosity);
   if (xmlResult.ok) {
     return xmlResult;
   }
-  return tryDirectPath(inputPath, timeoutMs, signal);
+  return tryDirectPath(inputPath, timeoutMs, signal, verbosity);
 }
 var TAG_OR_PATH_PATTERN = /^\([0-9A-Fa-f]{4},[0-9A-Fa-f]{4}\)(\[\d+\](\.\([0-9A-Fa-f]{4},[0-9A-Fa-f]{4}\)(\[\d+\])?)*)?$/;
 var TagModificationSchema = zod.z.object({
   tag: zod.z.string().regex(TAG_OR_PATH_PATTERN),
   value: zod.z.string()
 });
+var VERBOSITY_FLAGS2 = { verbose: "-v", debug: "-d" };
 var DcmodifyOptionsSchema = zod.z.object({
   timeoutMs: zod.z.number().int().positive().optional(),
   signal: zod.z.instanceof(AbortSignal).optional(),
@@ -2270,12 +2282,16 @@ var DcmodifyOptionsSchema = zod.z.object({
   erasePrivateTags: zod.z.boolean().optional(),
   noBackup: zod.z.boolean().optional(),
   insertIfMissing: zod.z.boolean().optional(),
-  ignoreMissingTags: zod.z.boolean().optional()
+  ignoreMissingTags: zod.z.boolean().optional(),
+  verbosity: zod.z.enum(["verbose", "debug"]).optional()
 }).strict().refine((data) => data.modifications.length > 0 || data.erasures !== void 0 && data.erasures.length > 0 || data.erasePrivateTags === true, {
   message: "At least one of modifications, erasures, or erasePrivateTags is required"
 });
 function buildArgs3(inputPath, options) {
   const args = [];
+  if (options.verbosity !== void 0) {
+    args.push(VERBOSITY_FLAGS2[options.verbosity]);
+  }
   if (options.noBackup !== false) {
     args.push("-nb");
   }