dicom-curate 0.15.1 → 0.16.1

package/dist/esm/applyMappingsWorker.js

@@ -79841,10 +79841,9 @@ async function curateOne({
       canSkip = previousSourceFileInfo.size === fileInfo.size && previousSourceFileInfo.mtime === mtime;
     }
   }
-  const noMapResult = () => {
+  const noMapResult = (outputFilePath) => {
     const retval = {
       sourceInstanceUID: `unchanged_${fileInfo.name.replace(/[^a-zA-Z0-9]/g, "_")}`,
-      outputFilePath: `${fileInfo.path}/${fileInfo.name}`,
       mappings: {},
       anomalies: [],
       errors: [],
@@ -79858,7 +79857,8 @@ async function curateOne({
         preMappedHash
       },
       // include curationTime even when skipped to measure hashing/check time
-      curationTime: performance.now() - startTime
+      curationTime: performance.now() - startTime,
+      outputFilePath
     };
     return retval;
   };
@@ -79883,7 +79883,6 @@ async function curateOne({
         `File ${fileInfo.name} is not a valid DICOM file or is corrupted`
       ],
       sourceInstanceUID: `invalid_${fileInfo.name.replace(/[^a-zA-Z0-9]/g, "_")}`,
-      outputFilePath: `${fileInfo.path}/${fileInfo.name}`,
       fileInfo: {
         name: fileInfo.name,
         size: fileInfo.size,
@@ -79919,7 +79918,7 @@ async function curateOne({
     postMappedHash = await hash(modifiedArrayBuffer, hashMethod || "crc64");
     const previousPostMappedHash = previousMappedFileInfo ? previousMappedFileInfo(clonedMapResults.outputFilePath)?.postMappedHash : void 0;
     if (previousPostMappedHash !== void 0 && previousPostMappedHash === postMappedHash) {
-      return noMapResult();
+      return noMapResult(clonedMapResults.outputFilePath);
     }
     if (typeof outputTarget?.directory === "object" && "getFileHandle" in outputTarget.directory) {
       const subDirectoryHandle = await createNestedDirectories(

package/dist/esm/curateOne.js

@@ -73550,10 +73550,9 @@ async function curateOne({
       canSkip = previousSourceFileInfo.size === fileInfo.size && previousSourceFileInfo.mtime === mtime;
     }
   }
-  const noMapResult = () => {
+  const noMapResult = (outputFilePath) => {
     const retval = {
       sourceInstanceUID: `unchanged_${fileInfo.name.replace(/[^a-zA-Z0-9]/g, "_")}`,
-      outputFilePath: `${fileInfo.path}/${fileInfo.name}`,
       mappings: {},
       anomalies: [],
       errors: [],
@@ -73567,7 +73566,8 @@ async function curateOne({
         preMappedHash
       },
       // include curationTime even when skipped to measure hashing/check time
-      curationTime: performance.now() - startTime
+      curationTime: performance.now() - startTime,
+      outputFilePath
     };
     return retval;
   };
@@ -73592,7 +73592,6 @@ async function curateOne({
         `File ${fileInfo.name} is not a valid DICOM file or is corrupted`
       ],
       sourceInstanceUID: `invalid_${fileInfo.name.replace(/[^a-zA-Z0-9]/g, "_")}`,
-      outputFilePath: `${fileInfo.path}/${fileInfo.name}`,
       fileInfo: {
         name: fileInfo.name,
         size: fileInfo.size,
@@ -73628,7 +73627,7 @@ async function curateOne({
     postMappedHash = await hash(modifiedArrayBuffer, hashMethod || "crc64");
     const previousPostMappedHash = previousMappedFileInfo ? previousMappedFileInfo(clonedMapResults.outputFilePath)?.postMappedHash : void 0;
     if (previousPostMappedHash !== void 0 && previousPostMappedHash === postMappedHash) {
-      return noMapResult();
+      return noMapResult(clonedMapResults.outputFilePath);
     }
     if (typeof outputTarget?.directory === "object" && "getFileHandle" in outputTarget.directory) {
       const subDirectoryHandle = await createNestedDirectories(

package/dist/esm/index.js

@@ -79867,10 +79867,9 @@ async function curateOne({
       canSkip = previousSourceFileInfo.size === fileInfo.size && previousSourceFileInfo.mtime === mtime;
     }
   }
-  const noMapResult = () => {
+  const noMapResult = (outputFilePath) => {
     const retval = {
       sourceInstanceUID: `unchanged_${fileInfo.name.replace(/[^a-zA-Z0-9]/g, "_")}`,
-      outputFilePath: `${fileInfo.path}/${fileInfo.name}`,
       mappings: {},
       anomalies: [],
       errors: [],
@@ -79884,7 +79883,8 @@ async function curateOne({
         preMappedHash
       },
       // include curationTime even when skipped to measure hashing/check time
-      curationTime: performance.now() - startTime
+      curationTime: performance.now() - startTime,
+      outputFilePath
     };
     return retval;
   };
@@ -79909,7 +79909,6 @@ async function curateOne({
         `File ${fileInfo.name} is not a valid DICOM file or is corrupted`
       ],
       sourceInstanceUID: `invalid_${fileInfo.name.replace(/[^a-zA-Z0-9]/g, "_")}`,
-      outputFilePath: `${fileInfo.path}/${fileInfo.name}`,
       fileInfo: {
         name: fileInfo.name,
         size: fileInfo.size,
@@ -79945,7 +79944,7 @@ async function curateOne({
     postMappedHash = await hash(modifiedArrayBuffer, hashMethod || "crc64");
     const previousPostMappedHash = previousMappedFileInfo ? previousMappedFileInfo(clonedMapResults.outputFilePath)?.postMappedHash : void 0;
     if (previousPostMappedHash !== void 0 && previousPostMappedHash === postMappedHash) {
-      return noMapResult();
+      return noMapResult(clonedMapResults.outputFilePath);
     }
     if (typeof outputTarget?.directory === "object" && "getFileHandle" in outputTarget.directory) {
       const subDirectoryHandle = await createNestedDirectories(
@@ -85890,28 +85889,28 @@ async function initializeMappingWorkers(skipCollectingMappings, fileInfoIndex) {
     availableMappingWorkers.push(mappingWorker);
   }
 }
-function getHttpInputHeaders(fileInfo) {
+async function getHttpInputHeaders(fileInfo) {
   if (fileInfo.kind === "http" && typeof fileInfo.headers === "function") {
     const clonedFileInfo = { ...fileInfo };
-    clonedFileInfo.headers = fileInfo.headers();
+    clonedFileInfo.headers = await fileInfo.headers();
     return clonedFileInfo;
   }
   return fileInfo;
 }
-function getHttpOutputHeaders(outputTarget) {
+async function getHttpOutputHeaders(outputTarget) {
   if (outputTarget?.http && typeof outputTarget.http.headers === "function") {
     const clonedOutputTarget = {
       ...outputTarget
     };
     clonedOutputTarget.http = {
       ...outputTarget.http,
-      headers: outputTarget.http.headers()
+      headers: await outputTarget.http.headers()
     };
     return clonedOutputTarget;
   }
   return outputTarget;
 }
-function dispatchMappingJobs() {
+async function dispatchMappingJobs() {
   while (filesToProcess.length > 0 && availableMappingWorkers.length > 0) {
     const { fileInfo, fileIndex, previousFileInfo } = filesToProcess.pop();
     const mappingWorker = availableMappingWorkers.pop();
@@ -85921,9 +85920,9 @@ function dispatchMappingJobs() {
     );
     mappingWorker.postMessage({
       request: "apply",
-      fileInfo: getHttpInputHeaders(fileInfo),
+      fileInfo: await getHttpInputHeaders(fileInfo),
       fileIndex,
-      outputTarget: getHttpOutputHeaders(outputTarget),
+      outputTarget: await getHttpOutputHeaders(outputTarget),
       previousFileInfo,
       hashMethod,
       serializedMappingOptions: serializeMappingOptions(mappingOptions)

package/dist/types/types.d.ts

@@ -48,7 +48,7 @@ export type OrganizeOptions = {
     inputS3Bucket: TS3BucketOptions;
 });
 export type THashMethod = 'crc64' | 'crc32' | 'sha256' | 'md5';
-export type THTTPHeaderProvider = () => Record<string, string>;
+export type THTTPHeaderProvider = () => Promise<Record<string, string>> | Record<string, string>;
 export type THTTPOptions = {
     url: string;
     headers?: Record<string, string> | THTTPHeaderProvider;
@@ -106,7 +106,7 @@ type TAttr = {
 };
 export type TMapResults = {
     sourceInstanceUID: string;
-    outputFilePath: string;
+    outputFilePath?: string;
     fileInfo?: {
         name: string;
         size: number;

package/dist/umd/dicom-curate.umd.js

@@ -48789,10 +48789,9 @@
                           previousSourceFileInfo.mtime === mtime;
               }
           }
-          const noMapResult = () => {
+          const noMapResult = (outputFilePath) => {
               const retval = {
                   sourceInstanceUID: `unchanged_${fileInfo.name.replace(/[^a-zA-Z0-9]/g, '_')}`,
-                  outputFilePath: `${fileInfo.path}/${fileInfo.name}`,
                   mappings: {},
                   anomalies: [],
                   errors: [],
@@ -48807,6 +48806,7 @@
                   },
                   // include curationTime even when skipped to measure hashing/check time
                   curationTime: performance.now() - startTime,
+                  outputFilePath,
               };
               return retval;
           };
@@ -48830,7 +48830,6 @@
                       `File ${fileInfo.name} is not a valid DICOM file or is corrupted`,
                   ],
                   sourceInstanceUID: `invalid_${fileInfo.name.replace(/[^a-zA-Z0-9]/g, '_')}`,
-                  outputFilePath: `${fileInfo.path}/${fileInfo.name}`,
                   fileInfo: {
                       name: fileInfo.name,
                       size: fileInfo.size,
@@ -48862,8 +48861,8 @@
           }
           // 7) write output if requested
           if (!mappingOptions.skipWrite) {
-              const dirPath = clonedMapResults.outputFilePath
-                  .split('/')
+              const dirPath = clonedMapResults
+                  .outputFilePath.split('/')
                   .slice(0, -1)
                   .join('/');
               const fileName = clonedMapResults.outputFilePath.split('/').slice(-1)[0];
@@ -48877,7 +48876,7 @@
                   : undefined;
               if (previousPostMappedHash !== undefined &&
                   previousPostMappedHash === postMappedHash) {
-                  return noMapResult();
+                  return noMapResult(clonedMapResults.outputFilePath);
               }
               // Check if outputTarget.directory is a FileSystemDirectoryHandle (browser) or string (Node.js)
               if (typeof outputTarget?.directory === 'object' &&
@@ -48923,8 +48922,8 @@
               if (outputTarget?.http) {
                   try {
                       // Encode each part of the path, but not the slashes
-                      const key = clonedMapResults.outputFilePath
-                          .split('/')
+                      const key = clonedMapResults
+                          .outputFilePath.split('/')
                           .map(encodeURIComponent)
                           .join('/');
                       // Combine the full upload URL by appending the bucket URL + optional prefix + file name (key)
@@ -110668,10 +110667,9 @@
                         previousSourceFileInfo.mtime === mtime;
             }
         }
-        const noMapResult = () => {
+        const noMapResult = (outputFilePath) => {
             const retval = {
                 sourceInstanceUID: `unchanged_${fileInfo.name.replace(/[^a-zA-Z0-9]/g, '_')}`,
-                outputFilePath: `${fileInfo.path}/${fileInfo.name}`,
                 mappings: {},
                 anomalies: [],
                 errors: [],
@@ -110686,6 +110684,7 @@
                 },
                 // include curationTime even when skipped to measure hashing/check time
                 curationTime: performance.now() - startTime,
+                outputFilePath,
             };
             return retval;
         };
@@ -110709,7 +110708,6 @@
                     `File ${fileInfo.name} is not a valid DICOM file or is corrupted`,
                 ],
                 sourceInstanceUID: `invalid_${fileInfo.name.replace(/[^a-zA-Z0-9]/g, '_')}`,
-                outputFilePath: `${fileInfo.path}/${fileInfo.name}`,
                 fileInfo: {
                     name: fileInfo.name,
                     size: fileInfo.size,
@@ -110741,8 +110739,8 @@
         }
         // 7) write output if requested
         if (!mappingOptions.skipWrite) {
-            const dirPath = clonedMapResults.outputFilePath
-                .split('/')
+            const dirPath = clonedMapResults
+                .outputFilePath.split('/')
                 .slice(0, -1)
                 .join('/');
             const fileName = clonedMapResults.outputFilePath.split('/').slice(-1)[0];
@@ -110756,7 +110754,7 @@
                 : undefined;
             if (previousPostMappedHash !== undefined &&
                 previousPostMappedHash === postMappedHash) {
-                return noMapResult();
+                return noMapResult(clonedMapResults.outputFilePath);
             }
             // Check if outputTarget.directory is a FileSystemDirectoryHandle (browser) or string (Node.js)
             if (typeof outputTarget?.directory === 'object' &&
@@ -110802,8 +110800,8 @@
             if (outputTarget?.http) {
                 try {
                     // Encode each part of the path, but not the slashes
-                    const key = clonedMapResults.outputFilePath
-                        .split('/')
+                    const key = clonedMapResults
+                        .outputFilePath.split('/')
                         .map(encodeURIComponent)
                         .join('/');
                     // Combine the full upload URL by appending the bucket URL + optional prefix + file name (key)
@@ -124293,30 +124291,30 @@
     }
     // If the TFileInfo represents an HTTP resource with dynamic headers,
     // resolve the headers by calling the provider function.
-    function getHttpInputHeaders(fileInfo) {
+    async function getHttpInputHeaders(fileInfo) {
         if (fileInfo.kind === 'http' && typeof fileInfo.headers === 'function') {
             const clonedFileInfo = { ...fileInfo };
-            clonedFileInfo.headers = fileInfo.headers();
+            clonedFileInfo.headers = await fileInfo.headers();
             return clonedFileInfo;
         }
         return fileInfo;
     }
     // If the outputTarget includes HTTP with dynamic headers,
     // resolve the headers by calling the provider function.
-    function getHttpOutputHeaders(outputTarget) {
+    async function getHttpOutputHeaders(outputTarget) {
         if (outputTarget?.http && typeof outputTarget.http.headers === 'function') {
             const clonedOutputTarget = {
                 ...outputTarget,
             };
             clonedOutputTarget.http = {
                 ...outputTarget.http,
-                headers: outputTarget.http.headers(),
+                headers: await outputTarget.http.headers(),
             };
             return clonedOutputTarget;
         }
         return outputTarget;
     }
-    function dispatchMappingJobs() {
+    async function dispatchMappingJobs() {
         while (filesToProcess.length > 0 && availableMappingWorkers.length > 0) {
             const { fileInfo, fileIndex, previousFileInfo } = filesToProcess.pop();
             const mappingWorker = availableMappingWorkers.pop();
@@ -124325,9 +124323,9 @@
             mappingWorkerOptions;
             mappingWorker.postMessage({
                 request: 'apply',
-                fileInfo: getHttpInputHeaders(fileInfo),
+                fileInfo: await getHttpInputHeaders(fileInfo),
                 fileIndex,
-                outputTarget: getHttpOutputHeaders(outputTarget),
+                outputTarget: await getHttpOutputHeaders(outputTarget),
                 previousFileInfo,
                 hashMethod,
                 serializedMappingOptions: serializeMappingOptions(mappingOptions),