@ubercode/dcmtk 0.7.2 → 0.8.0

package/dist/tools.d.cts

@@ -1364,10 +1364,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`. */
@@ -1433,6 +1447,17 @@ declare const ProposedTransferSyntax: {
     readonly J2K_LOSSY: "j2kLossy";
     readonly JLS_LOSSLESS: "jlsLossless";
     readonly JLS_LOSSY: "jlsLossy";
+    readonly MPEG2: "mpeg2";
+    readonly MPEG2_HIGH: "mpeg2High";
+    readonly MPEG4: "mpeg4";
+    readonly MPEG4_BD: "mpeg4Bd";
+    readonly MPEG4_2_2D: "mpeg4_2_2d";
+    readonly MPEG4_2_3D: "mpeg4_2_3d";
+    readonly MPEG4_2_ST: "mpeg4_2_st";
+    readonly HEVC: "hevc";
+    readonly HEVC10: "hevc10";
+    readonly RLE: "rle";
+    readonly DEFLATED: "deflated";
 };
 type ProposedTransferSyntaxValue = (typeof ProposedTransferSyntax)[keyof typeof ProposedTransferSyntax];
 /** Options for {@link storescu}. */
@@ -1451,8 +1476,10 @@ interface StorescuOptions extends ToolBaseOptions {
     readonly scanDirectories?: boolean | undefined;
     /** Recurse into subdirectories (requires scanDirectories). */
     readonly recurse?: boolean | undefined;
-    /** Proposed transfer syntax for the association. */
-    readonly proposedTransferSyntax?: ProposedTransferSyntaxValue | undefined;
+    /** Proposed transfer syntax(es) for the association. Pass an array to propose multiple. */
+    readonly proposedTransferSyntax?: ProposedTransferSyntaxValue | readonly ProposedTransferSyntaxValue[] | undefined;
+    /** Combine proposed transfer syntaxes into fewer presentation contexts. Maps to `+C`/`--combine`. */
+    readonly combineProposedTransferSyntaxes?: boolean | undefined;
     /** Verbosity level for diagnostic output. `'verbose'` maps to `-v`, `'debug'` maps to `-d`. */
     readonly verbosity?: 'verbose' | 'debug' | undefined;
     /** Maximum receive PDU size in bytes (4096–131072). Maps to `--max-pdu`. */

package/dist/tools.d.ts

@@ -1364,10 +1364,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`. */
@@ -1433,6 +1447,17 @@ declare const ProposedTransferSyntax: {
     readonly J2K_LOSSY: "j2kLossy";
     readonly JLS_LOSSLESS: "jlsLossless";
     readonly JLS_LOSSY: "jlsLossy";
+    readonly MPEG2: "mpeg2";
+    readonly MPEG2_HIGH: "mpeg2High";
+    readonly MPEG4: "mpeg4";
+    readonly MPEG4_BD: "mpeg4Bd";
+    readonly MPEG4_2_2D: "mpeg4_2_2d";
+    readonly MPEG4_2_3D: "mpeg4_2_3d";
+    readonly MPEG4_2_ST: "mpeg4_2_st";
+    readonly HEVC: "hevc";
+    readonly HEVC10: "hevc10";
+    readonly RLE: "rle";
+    readonly DEFLATED: "deflated";
 };
 type ProposedTransferSyntaxValue = (typeof ProposedTransferSyntax)[keyof typeof ProposedTransferSyntax];
 /** Options for {@link storescu}. */
@@ -1451,8 +1476,10 @@ interface StorescuOptions extends ToolBaseOptions {
     readonly scanDirectories?: boolean | undefined;
     /** Recurse into subdirectories (requires scanDirectories). */
     readonly recurse?: boolean | undefined;
-    /** Proposed transfer syntax for the association. */
-    readonly proposedTransferSyntax?: ProposedTransferSyntaxValue | undefined;
+    /** Proposed transfer syntax(es) for the association. Pass an array to propose multiple. */
+    readonly proposedTransferSyntax?: ProposedTransferSyntaxValue | readonly ProposedTransferSyntaxValue[] | undefined;
+    /** Combine proposed transfer syntaxes into fewer presentation contexts. Maps to `+C`/`--combine`. */
+    readonly combineProposedTransferSyntaxes?: boolean | undefined;
     /** Verbosity level for diagnostic output. `'verbose'` maps to `-v`, `'debug'` maps to `-d`. */
     readonly verbosity?: 'verbose' | 'debug' | undefined;
     /** Maximum receive PDU size in bytes (4096–131072). Maps to `--max-pdu`. */

package/dist/tools.js

@@ -2198,6 +2198,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 +2231,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 +2285,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;
@@ -2292,7 +2330,18 @@ var ProposedTransferSyntax = {
   J2K_LOSSLESS: "j2kLossless",
   J2K_LOSSY: "j2kLossy",
   JLS_LOSSLESS: "jlsLossless",
-  JLS_LOSSY: "jlsLossy"
+  JLS_LOSSY: "jlsLossy",
+  MPEG2: "mpeg2",
+  MPEG2_HIGH: "mpeg2High",
+  MPEG4: "mpeg4",
+  MPEG4_BD: "mpeg4Bd",
+  MPEG4_2_2D: "mpeg4_2_2d",
+  MPEG4_2_3D: "mpeg4_2_3d",
+  MPEG4_2_ST: "mpeg4_2_st",
+  HEVC: "hevc",
+  HEVC10: "hevc10",
+  RLE: "rle",
+  DEFLATED: "deflated"
 };
 var PROPOSED_TS_FLAG_MAP = {
   [ProposedTransferSyntax.UNCOMPRESSED]: "-x=",
@@ -2305,8 +2354,20 @@ var PROPOSED_TS_FLAG_MAP = {
   [ProposedTransferSyntax.J2K_LOSSLESS]: "-xv",
   [ProposedTransferSyntax.J2K_LOSSY]: "-xw",
   [ProposedTransferSyntax.JLS_LOSSLESS]: "-xt",
-  [ProposedTransferSyntax.JLS_LOSSY]: "-xu"
+  [ProposedTransferSyntax.JLS_LOSSY]: "-xu",
+  [ProposedTransferSyntax.MPEG2]: "-xm",
+  [ProposedTransferSyntax.MPEG2_HIGH]: "-xh",
+  [ProposedTransferSyntax.MPEG4]: "-xn",
+  [ProposedTransferSyntax.MPEG4_BD]: "-xl",
+  [ProposedTransferSyntax.MPEG4_2_2D]: "-x2",
+  [ProposedTransferSyntax.MPEG4_2_3D]: "-x3",
+  [ProposedTransferSyntax.MPEG4_2_ST]: "-xo",
+  [ProposedTransferSyntax.HEVC]: "-x4",
+  [ProposedTransferSyntax.HEVC10]: "-x5",
+  [ProposedTransferSyntax.RLE]: "-xr",
+  [ProposedTransferSyntax.DEFLATED]: "-xd"
 };
+var PROPOSED_TS_VALUES = Object.values(ProposedTransferSyntax);
 var StorescuOptionsSchema = z.object({
   timeoutMs: z.number().int().positive().optional(),
   signal: z.instanceof(AbortSignal).optional(),
@@ -2325,20 +2386,18 @@ var StorescuOptionsSchema = z.object({
   dimseTimeout: z.number().int().positive().optional(),
   noHostnameLookup: z.boolean().optional(),
   required: z.boolean().optional(),
-  proposedTransferSyntax: z.enum([
-    "uncompressed",
-    "littleEndian",
-    "bigEndian",
-    "implicitVR",
-    "jpegLossless",
-    "jpeg8Bit",
-    "jpeg12Bit",
-    "j2kLossless",
-    "j2kLossy",
-    "jlsLossless",
-    "jlsLossy"
-  ]).optional()
+  proposedTransferSyntax: z.union([z.enum(PROPOSED_TS_VALUES), z.array(z.enum(PROPOSED_TS_VALUES)).min(1)]).optional(),
+  combineProposedTransferSyntaxes: z.boolean().optional()
 }).strict();
+function pushProposedTsArgs(args, ts) {
+  if (typeof ts === "string") {
+    args.push(PROPOSED_TS_FLAG_MAP[ts]);
+  } else {
+    for (let i = 0; i < ts.length; i++) {
+      args.push(PROPOSED_TS_FLAG_MAP[ts[i]]);
+    }
+  }
+}
 var VERBOSITY_FLAGS20 = { verbose: "-v", debug: "-d" };
 var DIMSE_ERROR_PATTERN = /^E:.*(?:DIMSE Failed|Store Failed)/m;
 function pushNetworkArgs3(args, options) {
@@ -2380,7 +2439,10 @@ function buildArgs34(options) {
     args.push("+r");
   }
   if (options.proposedTransferSyntax !== void 0) {
-    args.push(PROPOSED_TS_FLAG_MAP[options.proposedTransferSyntax]);
+    pushProposedTsArgs(args, options.proposedTransferSyntax);
+  }
+  if (options.combineProposedTransferSyntaxes === true) {
+    args.push("+C");
   }
   if (options.required === true) {
     args.push("-R");