@ubercode/dcmtk 0.8.0 → 0.8.2

package/dist/tools.cjs

@@ -257,6 +257,7 @@ var Dcm2xmlOptionsSchema = zod.z.object({
   charset: zod.z.enum(["utf8", "latin1", "ascii"]).optional(),
   writeBinaryData: zod.z.boolean().optional(),
   encodeBinaryBase64: zod.z.boolean().optional(),
+  charsetAssume: zod.z.string().min(1).optional(),
   verbosity: zod.z.enum(["verbose", "debug"]).optional()
 }).strict().optional();
 function pushEncodingArgs(args, options) {
@@ -280,6 +281,9 @@ function buildArgs(inputPath, options) {
   if (options?.namespace === true) {
     args.push("+Xn");
   }
+  if (options?.charsetAssume !== void 0) {
+    args.push("+Ca", options.charsetAssume);
+  }
   pushEncodingArgs(args, options);
   args.push(inputPath);
   return args;
@@ -529,6 +533,7 @@ var Dcm2jsonOptionsSchema = zod.z.object({
   timeoutMs: zod.z.number().int().positive().optional(),
   signal: zod.z.instanceof(AbortSignal).optional(),
   directOnly: zod.z.boolean().optional(),
+  charsetAssume: zod.z.string().min(1).optional(),
   verbosity: zod.z.enum(["verbose", "debug"]).optional()
 }).strict().optional();
 var VERBOSITY_FLAGS2 = { verbose: "-v", debug: "-d" };
@@ -538,12 +543,19 @@ function buildVerbosityArgs(verbosity) {
   }
   return [];
 }
-async function tryXmlPath(inputPath, timeoutMs, signal, verbosity) {
+function buildXmlOpts(options) {
+  const result = {};
+  if (options?.verbosity !== void 0) result["verbosity"] = options.verbosity;
+  if (options?.charsetAssume !== void 0) result["charsetAssume"] = options.charsetAssume;
+  return result;
+}
+async function tryXmlPath(inputPath, timeoutMs, signal, opts) {
   const xmlBinary = resolveBinary("dcm2xml");
   if (!xmlBinary.ok) {
     return err(xmlBinary.error);
   }
-  const xmlArgs = [...buildVerbosityArgs(verbosity), "-nat", inputPath];
+  const charsetArgs = opts?.charsetAssume !== void 0 ? ["+Ca", opts.charsetAssume] : [];
+  const xmlArgs = [...buildVerbosityArgs(opts?.verbosity), ...charsetArgs, "-nat", inputPath];
   const xmlResult = await execCommand(xmlBinary.value, xmlArgs, { timeoutMs, signal });
   if (!xmlResult.ok) {
     return err(xmlResult.error);
@@ -562,7 +574,7 @@ async function tryDirectPath(inputPath, timeoutMs, signal, verbosity) {
   if (!jsonBinary.ok) {
     return err(jsonBinary.error);
   }
-  const directArgs = [...buildVerbosityArgs(verbosity), inputPath];
+  const directArgs = [...buildVerbosityArgs(verbosity), "+b", inputPath];
   const result = await execCommand(jsonBinary.value, directArgs, { timeoutMs, signal });
   if (!result.ok) {
     return err(result.error);
@@ -589,7 +601,7 @@ async function dcm2json(inputPath, options) {
   if (options?.directOnly === true) {
     return tryDirectPath(inputPath, timeoutMs, signal, verbosity);
   }
-  const xmlResult = await tryXmlPath(inputPath, timeoutMs, signal, verbosity);
+  const xmlResult = await tryXmlPath(inputPath, timeoutMs, signal, buildXmlOpts(options));
   if (xmlResult.ok) {
     return xmlResult;
   }