@ubercode/dcmtk 0.8.0 → 0.8.2

package/dist/dicom.d.cts

@@ -1,5 +1,5 @@
-import { D as DicomTag, a as DicomTagPath } from './DicomInstance-zsmyd7fs.cjs';
-export { C as ChangeSet, b as DicomDataset, d as DicomInstance } from './DicomInstance-zsmyd7fs.cjs';
+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';
 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-BjrSIEGN.js';
-export { C as ChangeSet, b as DicomDataset, d as DicomInstance } from './DicomInstance-BjrSIEGN.js';
+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';
 export { x as xmlToJson } from './dcmodify-CHvwChFu.js';
 import './types-Cgumy1N4.js';
 

package/dist/dicom.js

@@ -30778,6 +30778,7 @@ var Dcm2jsonOptionsSchema = z.object({
   timeoutMs: z.number().int().positive().optional(),
   signal: z.instanceof(AbortSignal).optional(),
   directOnly: z.boolean().optional(),
+  charsetAssume: z.string().min(1).optional(),
   verbosity: z.enum(["verbose", "debug"]).optional()
 }).strict().optional();
 var VERBOSITY_FLAGS = { verbose: "-v", debug: "-d" };
@@ -30787,12 +30788,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);
@@ -30811,7 +30819,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);
@@ -30838,7 +30846,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;
   }
@@ -30967,7 +30975,7 @@ var DicomInstance = class _DicomInstance {
    * Opens a DICOM file and creates a DicomInstance.
    *
    * @param path - Filesystem path to the DICOM file
-   * @param options - Timeout and abort options
+   * @param options - Timeout, abort, and charset options
    * @returns A Result containing the DicomInstance or an error
    */
   static async open(path, options) {
@@ -30975,7 +30983,8 @@ var DicomInstance = class _DicomInstance {
     if (!filePathResult.ok) return err(filePathResult.error);
     const jsonResult = await dcm2json(path, {
       timeoutMs: options?.timeoutMs ?? DEFAULT_TIMEOUT_MS,
-      signal: options?.signal
+      signal: options?.signal,
+      charsetAssume: options?.charsetAssume
     });
     if (!jsonResult.ok) return err(jsonResult.error);
     const datasetResult = DicomDataset.fromJson(jsonResult.value.data);