@ubercode/dcmtk 0.7.3 → 0.8.1

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;
 }
@@ -1364,10 +1368,24 @@ interface DcmsendOptions extends ToolBaseOptions {
     readonly calledAETitle?: string | undefined;
     /** Scan input directory recursively for DICOM files. Defaults to false. */
     readonly scanDirectory?: boolean | undefined;
+    /** Recurse into subdirectories (requires scanDirectory). Maps to `+r`. */
+    readonly recurse?: boolean | undefined;
+    /** Scan pattern for filename filtering (only with scanDirectory). Maps to `--scan-pattern`. */
+    readonly scanPattern?: string | undefined;
     /** Verbosity level for diagnostic output. `'verbose'` maps to `-v`, `'debug'` maps to `-d`. */
     readonly verbosity?: 'verbose' | 'debug' | undefined;
     /** Disable UID validity checking. Maps to `--no-uid-checks`. */
     readonly noUidChecks?: boolean | undefined;
+    /** Do not halt on first invalid input file. Maps to `--no-halt`. */
+    readonly noHalt?: boolean | undefined;
+    /** Do not propose illegal presentation contexts. Maps to `--no-illegal-proposal`. */
+    readonly noIllegalProposal?: boolean | undefined;
+    /** Decompression mode. Maps to `--decompress-never` / `--decompress-lossless` / `--decompress-lossy`. */
+    readonly decompress?: 'never' | 'lossless' | 'lossy' | undefined;
+    /** Use multiple associations (one after the other). Maps to `+ma`. False maps to `-ma`. */
+    readonly multiAssociations?: boolean | undefined;
+    /** Create a detailed report file on the transfer. Maps to `--create-report-file`. */
+    readonly createReportFile?: string | undefined;
     /** Maximum receive PDU size in bytes (4096–131072). Maps to `--max-pdu`. */
     readonly maxPduReceive?: number | undefined;
     /** Maximum send PDU size in bytes (4096–131072). Maps to `--max-send-pdu`. */

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;
 }
@@ -1364,10 +1368,24 @@ interface DcmsendOptions extends ToolBaseOptions {
     readonly calledAETitle?: string | undefined;
     /** Scan input directory recursively for DICOM files. Defaults to false. */
     readonly scanDirectory?: boolean | undefined;
+    /** Recurse into subdirectories (requires scanDirectory). Maps to `+r`. */
+    readonly recurse?: boolean | undefined;
+    /** Scan pattern for filename filtering (only with scanDirectory). Maps to `--scan-pattern`. */
+    readonly scanPattern?: string | undefined;
     /** Verbosity level for diagnostic output. `'verbose'` maps to `-v`, `'debug'` maps to `-d`. */
     readonly verbosity?: 'verbose' | 'debug' | undefined;
     /** Disable UID validity checking. Maps to `--no-uid-checks`. */
     readonly noUidChecks?: boolean | undefined;
+    /** Do not halt on first invalid input file. Maps to `--no-halt`. */
+    readonly noHalt?: boolean | undefined;
+    /** Do not propose illegal presentation contexts. Maps to `--no-illegal-proposal`. */
+    readonly noIllegalProposal?: boolean | undefined;
+    /** Decompression mode. Maps to `--decompress-never` / `--decompress-lossless` / `--decompress-lossy`. */
+    readonly decompress?: 'never' | 'lossless' | 'lossy' | undefined;
+    /** Use multiple associations (one after the other). Maps to `+ma`. False maps to `-ma`. */
+    readonly multiAssociations?: boolean | undefined;
+    /** Create a detailed report file on the transfer. Maps to `--create-report-file`. */
+    readonly createReportFile?: string | undefined;
     /** Maximum receive PDU size in bytes (4096–131072). Maps to `--max-pdu`. */
     readonly maxPduReceive?: number | undefined;
     /** Maximum send PDU size in bytes (4096–131072). Maps to `--max-send-pdu`. */

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);
@@ -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;
   }
@@ -2198,6 +2210,30 @@ async function echoscu(options) {
   return ok({ success: true, stderr: result.value.stderr });
 }
 var VERBOSITY_FLAGS19 = { verbose: "-v", debug: "-d" };
+var DECOMPRESS_FLAGS = {
+  never: "--decompress-never",
+  lossless: "--decompress-lossless",
+  lossy: "--decompress-lossy"
+};
+function pushSendModeArgs(args, options) {
+  if (options.noHalt === true) {
+    args.push("--no-halt");
+  }
+  if (options.noIllegalProposal === true) {
+    args.push("--no-illegal-proposal");
+  }
+  if (options.decompress !== void 0) {
+    args.push(DECOMPRESS_FLAGS[options.decompress]);
+  }
+  if (options.multiAssociations === true) {
+    args.push("+ma");
+  } else if (options.multiAssociations === false) {
+    args.push("-ma");
+  }
+  if (options.createReportFile !== void 0) {
+    args.push("--create-report-file", options.createReportFile);
+  }
+}
 var DcmsendOptionsSchema = z.object({
   timeoutMs: z.number().int().positive().optional(),
   signal: z.instanceof(AbortSignal).optional(),
@@ -2207,8 +2243,15 @@ var DcmsendOptionsSchema = z.object({
   callingAETitle: z.string().min(1).max(16).refine(isValidAETitle, { message: "AE Title contains invalid characters" }).optional(),
   calledAETitle: z.string().min(1).max(16).refine(isValidAETitle, { message: "AE Title contains invalid characters" }).optional(),
   scanDirectory: z.boolean().optional(),
+  recurse: z.boolean().optional(),
+  scanPattern: z.string().min(1).optional(),
   verbosity: z.enum(["verbose", "debug"]).optional(),
   noUidChecks: z.boolean().optional(),
+  noHalt: z.boolean().optional(),
+  noIllegalProposal: z.boolean().optional(),
+  decompress: z.enum(["never", "lossless", "lossy"]).optional(),
+  multiAssociations: z.boolean().optional(),
+  createReportFile: z.string().min(1).optional(),
   maxPduReceive: z.number().int().min(4096).max(131072).optional(),
   maxPduSend: z.number().int().min(4096).max(131072).optional(),
   noHostnameLookup: z.boolean().optional(),
@@ -2254,6 +2297,13 @@ function buildArgs33(options) {
   if (options.scanDirectory === true) {
     args.push("--scan-directories");
   }
+  if (options.recurse === true) {
+    args.push("+r");
+  }
+  if (options.scanPattern !== void 0) {
+    args.push("--scan-pattern", options.scanPattern);
+  }
+  pushSendModeArgs(args, options);
   args.push(options.host, String(options.port));
   args.push(...options.files);
   return args;