@ubercode/dcmtk 0.8.0 → 0.8.2

package/dist/tools.d.cts

@@ -32,6 +32,8 @@ interface Dcm2xmlOptions extends ToolBaseOptions {
     readonly writeBinaryData?: boolean | undefined;
     /** Encode binary data inline instead of referencing external files. Defaults to true when writeBinaryData is true. */
     readonly encodeBinaryBase64?: boolean | undefined;
+    /** Assume the specified character set when SpecificCharacterSet (0008,0005) is absent. Maps to `+Ca`. */
+    readonly charsetAssume?: string | undefined;
     /** Verbosity level for diagnostic output. `'verbose'` maps to `-v`, `'debug'` maps to `-d`. */
     readonly verbosity?: 'verbose' | 'debug' | undefined;
 }
@@ -74,6 +76,8 @@ type Dcm2jsonSource = 'xml' | 'direct';
 interface Dcm2jsonOptions extends ToolBaseOptions {
     /** Skip the XML primary path and use direct dcm2json only. Defaults to false. */
     readonly directOnly?: boolean | undefined;
+    /** Assume the specified character set when SpecificCharacterSet (0008,0005) is absent. Passed to dcm2xml as `+Ca`. Only effective on the XML path (dcm2json binary does not support this flag). */
+    readonly charsetAssume?: string | undefined;
     /** Verbosity level for diagnostic output. `'verbose'` maps to `-v`, `'debug'` maps to `-d`. */
     readonly verbosity?: 'verbose' | 'debug' | undefined;
 }

package/dist/tools.d.ts

@@ -32,6 +32,8 @@ interface Dcm2xmlOptions extends ToolBaseOptions {
     readonly writeBinaryData?: boolean | undefined;
     /** Encode binary data inline instead of referencing external files. Defaults to true when writeBinaryData is true. */
     readonly encodeBinaryBase64?: boolean | undefined;
+    /** Assume the specified character set when SpecificCharacterSet (0008,0005) is absent. Maps to `+Ca`. */
+    readonly charsetAssume?: string | undefined;
     /** Verbosity level for diagnostic output. `'verbose'` maps to `-v`, `'debug'` maps to `-d`. */
     readonly verbosity?: 'verbose' | 'debug' | undefined;
 }
@@ -74,6 +76,8 @@ type Dcm2jsonSource = 'xml' | 'direct';
 interface Dcm2jsonOptions extends ToolBaseOptions {
     /** Skip the XML primary path and use direct dcm2json only. Defaults to false. */
     readonly directOnly?: boolean | undefined;
+    /** Assume the specified character set when SpecificCharacterSet (0008,0005) is absent. Passed to dcm2xml as `+Ca`. Only effective on the XML path (dcm2json binary does not support this flag). */
+    readonly charsetAssume?: string | undefined;
     /** Verbosity level for diagnostic output. `'verbose'` maps to `-v`, `'debug'` maps to `-d`. */
     readonly verbosity?: 'verbose' | 'debug' | undefined;
 }

package/dist/tools.js

@@ -251,6 +251,7 @@ var Dcm2xmlOptionsSchema = z.object({
   charset: z.enum(["utf8", "latin1", "ascii"]).optional(),
   writeBinaryData: z.boolean().optional(),
   encodeBinaryBase64: z.boolean().optional(),
+  charsetAssume: z.string().min(1).optional(),
   verbosity: z.enum(["verbose", "debug"]).optional()
 }).strict().optional();
 function pushEncodingArgs(args, options) {
@@ -274,6 +275,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;
@@ -523,6 +527,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_FLAGS2 = { verbose: "-v", debug: "-d" };
@@ -532,12 +537,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);
@@ -556,7 +568,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);
@@ -583,7 +595,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;
   }