@ubercode/dcmtk 0.12.1 → 0.13.0

package/dist/dicom.d.cts

@@ -1,5 +1,5 @@
-import { D as DicomTag, a as DicomTagPath } from './DicomInstance-CxLKC-oM.cjs';
-export { C as ChangeSet, b as DicomDataset, d as DicomInstance, e as DicomOpenOptions } from './DicomInstance-CxLKC-oM.cjs';
+import { D as DicomTag, a as DicomTagPath } from './DicomInstance-BGXtON9T.cjs';
+export { C as ChangeSet, b as DicomDataset, d as DicomInstance, e as DicomOpenOptions } from './DicomInstance-BGXtON9T.cjs';
 export { x as xmlToJson } from './dcmodify-Cf-RPHF3.cjs';
 import './types-Cgumy1N4.cjs';
 

package/dist/dicom.d.ts

@@ -1,5 +1,5 @@
-import { D as DicomTag, a as DicomTagPath } from './DicomInstance-BKUiir0G.js';
-export { C as ChangeSet, b as DicomDataset, d as DicomInstance, e as DicomOpenOptions } from './DicomInstance-BKUiir0G.js';
+import { D as DicomTag, a as DicomTagPath } from './DicomInstance-DGWB2mfD.js';
+export { C as ChangeSet, b as DicomDataset, d as DicomInstance, e as DicomOpenOptions } from './DicomInstance-DGWB2mfD.js';
 export { x as xmlToJson } from './dcmodify-CHvwChFu.js';
 import './types-Cgumy1N4.js';
 

package/dist/dicom.js

@@ -30786,6 +30786,7 @@ var Dcm2jsonOptionsSchema = z.object({
   signal: z.instanceof(AbortSignal).optional(),
   directOnly: z.boolean().optional(),
   charsetAssume: z.string().min(1).optional(),
+  charsetFallback: z.string().min(1).optional(),
   verbosity: z.enum(["verbose", "debug"]).optional()
 }).strict().optional();
 var VERBOSITY_FLAGS = { verbose: "-v", debug: "-d" };
@@ -30799,27 +30800,34 @@ function buildXmlOpts(options) {
   const result = {};
   if (options?.verbosity !== void 0) result["verbosity"] = options.verbosity;
   if (options?.charsetAssume !== void 0) result["charsetAssume"] = options.charsetAssume;
+  if (options?.charsetFallback !== void 0) result["charsetFallback"] = options.charsetFallback;
   return result;
 }
+function isCharsetError(stderrOutput) {
+  return stderrOutput.includes("convert character encoding") || stderrOutput.includes("Illegal byte sequence");
+}
+async function runXmlAndParse(binary, args, execOpts) {
+  const xmlResult = await execCommand(binary, args, execOpts);
+  if (!xmlResult.ok) return err(xmlResult.error);
+  if (xmlResult.value.exitCode !== 0) {
+    return err(createToolError("dcm2xml", args, xmlResult.value.exitCode, xmlResult.value.stderr));
+  }
+  const jsonResult = xmlToJson(xmlResult.value.stdout);
+  if (!jsonResult.ok) return err(jsonResult.error);
+  return ok({ data: jsonResult.value, source: "xml" });
+}
 async function tryXmlPath(inputPath, timeoutMs, signal, opts) {
   const xmlBinary = resolveBinary("dcm2xml");
-  if (!xmlBinary.ok) {
-    return err(xmlBinary.error);
-  }
+  if (!xmlBinary.ok) return err(xmlBinary.error);
   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);
+  const execOpts = signal !== void 0 ? { timeoutMs, signal } : { timeoutMs };
+  const result = await runXmlAndParse(xmlBinary.value, xmlArgs, execOpts);
+  if (!result.ok && opts?.charsetFallback !== void 0 && isCharsetError(result.error.message)) {
+    const fallbackArgs = [...buildVerbosityArgs(opts.verbosity), "+Ca", opts.charsetFallback, "-nat", inputPath];
+    return runXmlAndParse(xmlBinary.value, fallbackArgs, execOpts);
   }
-  if (xmlResult.value.exitCode !== 0) {
-    return err(createToolError("dcm2xml", xmlArgs, xmlResult.value.exitCode, xmlResult.value.stderr));
-  }
-  const jsonResult = xmlToJson(xmlResult.value.stdout);
-  if (!jsonResult.ok) {
-    return err(jsonResult.error);
-  }
-  return ok({ data: jsonResult.value, source: "xml" });
+  return result;
 }
 async function tryDirectPath(inputPath, timeoutMs, signal, verbosity) {
   const jsonBinary = resolveBinary("dcm2json");
@@ -31004,7 +31012,8 @@ var DicomInstance = class _DicomInstance {
     const jsonResult = await dcm2json(path, {
       timeoutMs: options?.timeoutMs ?? DEFAULT_TIMEOUT_MS,
       signal: options?.signal,
-      charsetAssume: options?.charsetAssume
+      charsetAssume: options?.charsetAssume,
+      charsetFallback: options?.charsetFallback
     });
     if (!jsonResult.ok) return err(jsonResult.error);
     const datasetResult = DicomDataset.fromJson(jsonResult.value.data);