dicom-curate 0.26.2 → 0.27.0

package/dist/esm/applyMappingsWorker.js

@@ -77997,7 +77997,7 @@ function isPrivateTag(tagId) {
   return false;
 }
 function convertKeywordToTagId(keyword) {
-  const tagId = isPrivateTag(keyword) ? keyword : dcmjs.data.DicomMetaDictionary.nameMap[keyword]?.tag || keyword;
+  const tagId = isPrivateTag(keyword) ? keyword : dcmjs.data.DicomMetaDictionary.nameMap[keyword]?.tag ?? keyword;
   return tagId.replace(/[(),]/g, "").toLowerCase();
 }
 function convertKeywordPathToTagIdPath(keywordPath) {
@@ -78856,7 +78856,7 @@ function getCid7050Codes(options) {
 var import_lodash = __toESM(require_lodash(), 1);
 var nameMap = dcmjs2.data.DicomMetaDictionary.nameMap;
 function getVr(keyword) {
-  const element = nameMap[keyword] || nameMap[`RETIRED_${keyword}`];
+  const element = nameMap[keyword] ?? nameMap[`RETIRED_${keyword}`];
   return element?.vr;
 }
 function temporalVr(vr) {
@@ -78928,7 +78928,7 @@ function deidentifyPS315E({
         }
       }
     }
-    return current2[tagName] || null;
+    return current2[tagName] ?? null;
   }
   const {
     cleanDescriptorsOption,
@@ -79695,9 +79695,9 @@ async function hash(buffer, hashMethod) {
     case "crc32":
       return crc32Hex(buffer);
     case "md5":
+    default:
       return md5Hex(buffer);
     case "crc64":
-    default:
       return crc64Hex(buffer);
   }
 }
@@ -79772,7 +79772,7 @@ async function loadS3Client() {
     const { createRequire } = await import("module");
     const req = createRequire(import.meta.url);
     const mod = req("@aws-sdk/client-s3");
-    cachedS3Client = mod?.default || mod;
+    cachedS3Client = mod?.default ?? mod;
   } else {
     cachedS3Client = await Promise.resolve().then(() => __toESM(require_dist_cjs71(), 1));
   }
@@ -79811,7 +79811,7 @@ async function curateOne({
       );
     }
     file = await resp.blob();
-    const lastModifiedHeader = resp.headers.get("last-modified") || void 0;
+    const lastModifiedHeader = resp.headers.get("last-modified");
     if (lastModifiedHeader) {
       mtime = new Date(lastModifiedHeader).toISOString();
     }
@@ -79877,14 +79877,14 @@ async function curateOne({
     } catch (e4) {
     }
   }
-  const fileArrayBuffer = await file.arrayBuffer();
+  let fileArrayBuffer = await file.arrayBuffer();
   let preMappedHash;
   let postMappedHash;
   const postMappedHashHeader = "x-source-file-hash";
   let canSkip = false;
   if (previousSourceFileInfo?.preMappedHash !== void 0) {
     try {
-      preMappedHash = await hash(fileArrayBuffer, hashMethod || "crc64");
+      preMappedHash = await hash(fileArrayBuffer, hashMethod ?? "md5");
     } catch (e4) {
       console.warn(`Failed to compute preMappedHash for ${fileInfo.name}`, e4);
     }
@@ -79989,7 +79989,7 @@ async function curateOne({
   }
   if (!preMappedHash) {
     try {
-      preMappedHash = await hash(fileArrayBuffer, hashMethod || "crc64");
+      preMappedHash = await hash(fileArrayBuffer, hashMethod ?? "md5");
     } catch (e4) {
       console.warn(`Failed to compute preMappedHash for ${fileInfo.name}`, e4);
     }
@@ -80000,7 +80000,8 @@ async function curateOne({
     const modifiedArrayBuffer = mappedDicomData.write({
       allowInvalidVRLength: true
     });
-    postMappedHash = await hash(modifiedArrayBuffer, hashMethod || "crc64");
+    postMappedHash = await hash(modifiedArrayBuffer, hashMethod ?? "md5");
+    fileArrayBuffer = null;
     const previousPostMappedHash = previousMappedFileInfo ? previousMappedFileInfo(clonedMapResults.outputFilePath)?.postMappedHash : void 0;
     if (previousPostMappedHash !== void 0 && previousPostMappedHash === postMappedHash) {
       return noMapResult(clonedMapResults.outputFilePath);
@@ -80032,26 +80033,23 @@ async function curateOne({
       }
       const fullFilePath = path.join(fullDirPath, fileName);
       await fs.writeFile(fullFilePath, new DataView(modifiedArrayBuffer));
-    } else {
+    } else if (!outputTarget?.http && !outputTarget?.s3) {
       clonedMapResults.mappedBlob = new Blob([modifiedArrayBuffer], {
         type: "application/octet-stream"
       });
     }
-    clonedMapResults.mappedBlob = new Blob([modifiedArrayBuffer], {
-      type: "application/octet-stream"
-    });
     if (outputTarget?.http) {
       try {
         const key = clonedMapResults.outputFilePath.split("/").map(encodeURIComponent).join("/");
         const uploadUrl = `${outputTarget.http.url}/${key}`;
         const headers = {
-          "Content-Type": clonedMapResults.mappedBlob.type || "application/octet-stream",
+          "Content-Type": "application/octet-stream",
           "X-File-Name": fileName,
-          "X-File-Type": clonedMapResults.mappedBlob.type || "application/octet-stream",
+          "X-File-Type": "application/octet-stream",
           "X-File-Size": String(modifiedArrayBuffer.byteLength),
-          "X-Source-File-Size": String(clonedMapResults.fileInfo?.size || ""),
-          "X-Source-File-Modified-Time": mtime || "",
-          "X-Source-File-Hash": preMappedHash || ""
+          "X-Source-File-Size": String(clonedMapResults.fileInfo?.size ?? ""),
+          "X-Source-File-Modified-Time": mtime ?? "",
+          "X-Source-File-Hash": preMappedHash ?? ""
         };
         if (outputTarget.http.headers) {
           Object.assign(headers, outputTarget.http.headers);
@@ -80061,25 +80059,27 @@ async function curateOne({
         const resp = await fetchWithRetry(uploadUrl, {
           method: "PUT",
           headers,
-          body: clonedMapResults.mappedBlob
+          body: new Blob([modifiedArrayBuffer], {
+            type: "application/octet-stream"
+          })
         });
         if (!resp.ok) {
           console.error(
             `Upload failed for ${uploadUrl}: ${resp.status} ${resp.statusText}`
           );
-          clonedMapResults.errors = clonedMapResults.errors || [];
+          clonedMapResults.errors = clonedMapResults.errors ?? [];
           clonedMapResults.errors.push(
             `Upload failed: ${resp.status} ${resp.statusText}`
           );
         } else {
-          clonedMapResults.outputUpload = clonedMapResults.outputUpload || {
+          clonedMapResults.outputUpload = clonedMapResults.outputUpload ?? {
             url: uploadUrl,
             status: resp.status
           };
         }
       } catch (e4) {
         console.error("Upload error", e4);
-        clonedMapResults.errors = clonedMapResults.errors || [];
+        clonedMapResults.errors = clonedMapResults.errors ?? [];
         clonedMapResults.errors.push(
           `Upload error: ${e4 instanceof Error ? e4.message : String(e4)}`
         );
@@ -80099,12 +80099,14 @@ async function curateOne({
           new s32.PutObjectCommand({
             Bucket: outputTarget.s3.bucketName,
             Key: key,
-            Body: await clonedMapResults.mappedBlob.arrayBuffer(),
-            ContentType: clonedMapResults.mappedBlob.type || "application/octet-stream",
+            // Use the ArrayBuffer directly — going through Blob.arrayBuffer()
+            // would create yet another copy of the data in memory.
+            Body: new Uint8Array(modifiedArrayBuffer),
+            ContentType: "application/octet-stream",
             Metadata: {
-              "source-file-size": String(clonedMapResults.fileInfo?.size || ""),
-              "source-file-modified-time": mtime || "",
-              "source-file-hash": preMappedHash || "",
+              "source-file-size": String(clonedMapResults.fileInfo?.size ?? ""),
+              "source-file-modified-time": mtime ?? "",
+              "source-file-hash": preMappedHash ?? "",
               ...postMappedHash ? { "source-file-post-mapped-hash": postMappedHash } : {}
             }
           })
@@ -80116,7 +80118,7 @@ async function curateOne({
         };
       } catch (e4) {
         console.error("S3 Upload error", e4);
-        clonedMapResults.errors = clonedMapResults.errors || [];
+        clonedMapResults.errors = clonedMapResults.errors ?? [];
         clonedMapResults.errors.push(
           `S3 Upload error: ${e4 instanceof Error ? e4.message : String(e4)}`
         );

package/dist/esm/collectMappings.js

@@ -34005,7 +34005,7 @@ function isPrivateTag(tagId) {
   return false;
 }
 function convertKeywordToTagId(keyword) {
-  const tagId = isPrivateTag(keyword) ? keyword : dcmjs.data.DicomMetaDictionary.nameMap[keyword]?.tag || keyword;
+  const tagId = isPrivateTag(keyword) ? keyword : dcmjs.data.DicomMetaDictionary.nameMap[keyword]?.tag ?? keyword;
   return tagId.replace(/[(),]/g, "").toLowerCase();
 }
 
@@ -34850,7 +34850,7 @@ function getCid7050Codes(options) {
 var import_lodash = __toESM(require_lodash(), 1);
 var nameMap = dcmjs2.data.DicomMetaDictionary.nameMap;
 function getVr(keyword) {
-  const element = nameMap[keyword] || nameMap[`RETIRED_${keyword}`];
+  const element = nameMap[keyword] ?? nameMap[`RETIRED_${keyword}`];
   return element?.vr;
 }
 function temporalVr(vr) {
@@ -34922,7 +34922,7 @@ function deidentifyPS315E({
         }
       }
     }
-    return current[tagName] || null;
+    return current[tagName] ?? null;
   }
   const {
     cleanDescriptorsOption,

package/dist/esm/config/dicom/tagConversion.js

@@ -17966,7 +17966,7 @@ function isPrivateTag(tagId) {
   return false;
 }
 function convertKeywordToTagId(keyword) {
-  const tagId = isPrivateTag(keyword) ? keyword : dcmjs.data.DicomMetaDictionary.nameMap[keyword]?.tag || keyword;
+  const tagId = isPrivateTag(keyword) ? keyword : dcmjs.data.DicomMetaDictionary.nameMap[keyword]?.tag ?? keyword;
   return tagId.replace(/[(),]/g, "").toLowerCase();
 }
 function convertKeywordPathToTagIdPath(keywordPath) {

package/dist/esm/config/sampleCompositeSpecification.js

@@ -97,7 +97,7 @@ function composedSpec() {
               ctxIn.hostProps.activityProviderName,
               ctxIn.centerSubjectId(parser),
               ctxIn.timepointName(parser),
-              ctxIn.scanName(parser) + "=" + parser.getDicom("SeriesNumber") || "UNKNOWN",
+              ctxIn.scanName(parser) + "=" + (parser.getDicom("SeriesNumber") ?? "UNKNOWN"),
               parser.getFilePathComp(parser.FILEBASENAME) + ".dcm"
             ];
           },

package/dist/esm/curateDict.js

@@ -34008,7 +34008,7 @@ function isPrivateTag(tagId) {
   return false;
 }
 function convertKeywordToTagId(keyword) {
-  const tagId = isPrivateTag(keyword) ? keyword : dcmjs.data.DicomMetaDictionary.nameMap[keyword]?.tag || keyword;
+  const tagId = isPrivateTag(keyword) ? keyword : dcmjs.data.DicomMetaDictionary.nameMap[keyword]?.tag ?? keyword;
   return tagId.replace(/[(),]/g, "").toLowerCase();
 }
 function convertKeywordPathToTagIdPath(keywordPath) {
@@ -34867,7 +34867,7 @@ function getCid7050Codes(options) {
 var import_lodash = __toESM(require_lodash(), 1);
 var nameMap = dcmjs2.data.DicomMetaDictionary.nameMap;
 function getVr(keyword) {
-  const element = nameMap[keyword] || nameMap[`RETIRED_${keyword}`];
+  const element = nameMap[keyword] ?? nameMap[`RETIRED_${keyword}`];
   return element?.vr;
 }
 function temporalVr(vr) {
@@ -34939,7 +34939,7 @@ function deidentifyPS315E({
         }
       }
     }
-    return current[tagName] || null;
+    return current[tagName] ?? null;
   }
   const {
     cleanDescriptorsOption,

package/dist/esm/curateOne.js

@@ -71706,7 +71706,7 @@ function isPrivateTag(tagId) {
   return false;
 }
 function convertKeywordToTagId(keyword) {
-  const tagId = isPrivateTag(keyword) ? keyword : dcmjs.data.DicomMetaDictionary.nameMap[keyword]?.tag || keyword;
+  const tagId = isPrivateTag(keyword) ? keyword : dcmjs.data.DicomMetaDictionary.nameMap[keyword]?.tag ?? keyword;
   return tagId.replace(/[(),]/g, "").toLowerCase();
 }
 function convertKeywordPathToTagIdPath(keywordPath) {
@@ -72565,7 +72565,7 @@ function getCid7050Codes(options) {
 var import_lodash = __toESM(require_lodash(), 1);
 var nameMap = dcmjs2.data.DicomMetaDictionary.nameMap;
 function getVr(keyword) {
-  const element = nameMap[keyword] || nameMap[`RETIRED_${keyword}`];
+  const element = nameMap[keyword] ?? nameMap[`RETIRED_${keyword}`];
   return element?.vr;
 }
 function temporalVr(vr) {
@@ -72637,7 +72637,7 @@ function deidentifyPS315E({
         }
       }
     }
-    return current[tagName] || null;
+    return current[tagName] ?? null;
   }
   const {
     cleanDescriptorsOption,
@@ -73404,9 +73404,9 @@ async function hash(buffer, hashMethod) {
     case "crc32":
       return crc32Hex(buffer);
     case "md5":
+    default:
       return md5Hex(buffer);
     case "crc64":
-    default:
       return crc64Hex(buffer);
   }
 }
@@ -73481,7 +73481,7 @@ async function loadS3Client() {
     const { createRequire } = await import("module");
     const req = createRequire(import.meta.url);
     const mod = req("@aws-sdk/client-s3");
-    cachedS3Client = mod?.default || mod;
+    cachedS3Client = mod?.default ?? mod;
   } else {
     cachedS3Client = await Promise.resolve().then(() => __toESM(require_dist_cjs71(), 1));
   }
@@ -73520,7 +73520,7 @@ async function curateOne({
       );
     }
     file = await resp.blob();
-    const lastModifiedHeader = resp.headers.get("last-modified") || void 0;
+    const lastModifiedHeader = resp.headers.get("last-modified");
     if (lastModifiedHeader) {
       mtime = new Date(lastModifiedHeader).toISOString();
     }
@@ -73586,14 +73586,14 @@ async function curateOne({
     } catch (e4) {
     }
   }
-  const fileArrayBuffer = await file.arrayBuffer();
+  let fileArrayBuffer = await file.arrayBuffer();
   let preMappedHash;
   let postMappedHash;
   const postMappedHashHeader = "x-source-file-hash";
   let canSkip = false;
   if (previousSourceFileInfo?.preMappedHash !== void 0) {
     try {
-      preMappedHash = await hash(fileArrayBuffer, hashMethod || "crc64");
+      preMappedHash = await hash(fileArrayBuffer, hashMethod ?? "md5");
     } catch (e4) {
       console.warn(`Failed to compute preMappedHash for ${fileInfo.name}`, e4);
     }
@@ -73698,7 +73698,7 @@ async function curateOne({
   }
   if (!preMappedHash) {
     try {
-      preMappedHash = await hash(fileArrayBuffer, hashMethod || "crc64");
+      preMappedHash = await hash(fileArrayBuffer, hashMethod ?? "md5");
     } catch (e4) {
       console.warn(`Failed to compute preMappedHash for ${fileInfo.name}`, e4);
     }
@@ -73709,7 +73709,8 @@ async function curateOne({
     const modifiedArrayBuffer = mappedDicomData.write({
       allowInvalidVRLength: true
     });
-    postMappedHash = await hash(modifiedArrayBuffer, hashMethod || "crc64");
+    postMappedHash = await hash(modifiedArrayBuffer, hashMethod ?? "md5");
+    fileArrayBuffer = null;
     const previousPostMappedHash = previousMappedFileInfo ? previousMappedFileInfo(clonedMapResults.outputFilePath)?.postMappedHash : void 0;
     if (previousPostMappedHash !== void 0 && previousPostMappedHash === postMappedHash) {
       return noMapResult(clonedMapResults.outputFilePath);
@@ -73741,26 +73742,23 @@ async function curateOne({
       }
       const fullFilePath = path.join(fullDirPath, fileName);
       await fs.writeFile(fullFilePath, new DataView(modifiedArrayBuffer));
-    } else {
+    } else if (!outputTarget?.http && !outputTarget?.s3) {
       clonedMapResults.mappedBlob = new Blob([modifiedArrayBuffer], {
         type: "application/octet-stream"
       });
     }
-    clonedMapResults.mappedBlob = new Blob([modifiedArrayBuffer], {
-      type: "application/octet-stream"
-    });
     if (outputTarget?.http) {
       try {
         const key = clonedMapResults.outputFilePath.split("/").map(encodeURIComponent).join("/");
         const uploadUrl = `${outputTarget.http.url}/${key}`;
         const headers = {
-          "Content-Type": clonedMapResults.mappedBlob.type || "application/octet-stream",
+          "Content-Type": "application/octet-stream",
           "X-File-Name": fileName,
-          "X-File-Type": clonedMapResults.mappedBlob.type || "application/octet-stream",
+          "X-File-Type": "application/octet-stream",
           "X-File-Size": String(modifiedArrayBuffer.byteLength),
-          "X-Source-File-Size": String(clonedMapResults.fileInfo?.size || ""),
-          "X-Source-File-Modified-Time": mtime || "",
-          "X-Source-File-Hash": preMappedHash || ""
+          "X-Source-File-Size": String(clonedMapResults.fileInfo?.size ?? ""),
+          "X-Source-File-Modified-Time": mtime ?? "",
+          "X-Source-File-Hash": preMappedHash ?? ""
         };
         if (outputTarget.http.headers) {
           Object.assign(headers, outputTarget.http.headers);
@@ -73770,25 +73768,27 @@ async function curateOne({
         const resp = await fetchWithRetry(uploadUrl, {
           method: "PUT",
           headers,
-          body: clonedMapResults.mappedBlob
+          body: new Blob([modifiedArrayBuffer], {
+            type: "application/octet-stream"
+          })
         });
         if (!resp.ok) {
           console.error(
             `Upload failed for ${uploadUrl}: ${resp.status} ${resp.statusText}`
           );
-          clonedMapResults.errors = clonedMapResults.errors || [];
+          clonedMapResults.errors = clonedMapResults.errors ?? [];
           clonedMapResults.errors.push(
             `Upload failed: ${resp.status} ${resp.statusText}`
           );
         } else {
-          clonedMapResults.outputUpload = clonedMapResults.outputUpload || {
+          clonedMapResults.outputUpload = clonedMapResults.outputUpload ?? {
             url: uploadUrl,
             status: resp.status
           };
         }
       } catch (e4) {
         console.error("Upload error", e4);
-        clonedMapResults.errors = clonedMapResults.errors || [];
+        clonedMapResults.errors = clonedMapResults.errors ?? [];
         clonedMapResults.errors.push(
           `Upload error: ${e4 instanceof Error ? e4.message : String(e4)}`
         );
@@ -73808,12 +73808,14 @@ async function curateOne({
           new s32.PutObjectCommand({
             Bucket: outputTarget.s3.bucketName,
             Key: key,
-            Body: await clonedMapResults.mappedBlob.arrayBuffer(),
-            ContentType: clonedMapResults.mappedBlob.type || "application/octet-stream",
+            // Use the ArrayBuffer directly — going through Blob.arrayBuffer()
+            // would create yet another copy of the data in memory.
+            Body: new Uint8Array(modifiedArrayBuffer),
+            ContentType: "application/octet-stream",
             Metadata: {
-              "source-file-size": String(clonedMapResults.fileInfo?.size || ""),
-              "source-file-modified-time": mtime || "",
-              "source-file-hash": preMappedHash || "",
+              "source-file-size": String(clonedMapResults.fileInfo?.size ?? ""),
+              "source-file-modified-time": mtime ?? "",
+              "source-file-hash": preMappedHash ?? "",
               ...postMappedHash ? { "source-file-post-mapped-hash": postMappedHash } : {}
             }
           })
@@ -73825,7 +73827,7 @@ async function curateOne({
         };
       } catch (e4) {
         console.error("S3 Upload error", e4);
-        clonedMapResults.errors = clonedMapResults.errors || [];
+        clonedMapResults.errors = clonedMapResults.errors ?? [];
         clonedMapResults.errors.push(
           `S3 Upload error: ${e4 instanceof Error ? e4.message : String(e4)}`
         );

package/dist/esm/deidentifyPS315E.js

@@ -33999,7 +33999,7 @@ function isPrivateTag(tagId) {
   return false;
 }
 function convertKeywordToTagId(keyword) {
-  const tagId = isPrivateTag(keyword) ? keyword : dcmjs.data.DicomMetaDictionary.nameMap[keyword]?.tag || keyword;
+  const tagId = isPrivateTag(keyword) ? keyword : dcmjs.data.DicomMetaDictionary.nameMap[keyword]?.tag ?? keyword;
   return tagId.replace(/[(),]/g, "").toLowerCase();
 }
 
@@ -34844,7 +34844,7 @@ function getCid7050Codes(options) {
 var import_lodash = __toESM(require_lodash(), 1);
 var nameMap = dcmjs2.data.DicomMetaDictionary.nameMap;
 function getVr(keyword) {
-  const element = nameMap[keyword] || nameMap[`RETIRED_${keyword}`];
+  const element = nameMap[keyword] ?? nameMap[`RETIRED_${keyword}`];
   return element?.vr;
 }
 function temporalVr(vr) {
@@ -34916,7 +34916,7 @@ function deidentifyPS315E({
         }
       }
     }
-    return current[tagName] || null;
+    return current[tagName] ?? null;
   }
   const {
     cleanDescriptorsOption,

package/dist/esm/hash.js

@@ -647,9 +647,9 @@ async function hash(buffer, hashMethod) {
     case "crc32":
       return crc32Hex(buffer);
     case "md5":
+    default:
       return md5Hex(buffer);
     case "crc64":
-    default:
       return crc64Hex(buffer);
   }
 }