dicom-curate 0.32.0 → 0.33.0

package/dist/esm/index.js

@@ -81787,6 +81787,29 @@ function dataURLToBlobURL(dataURL) {
   return URL.createObjectURL(blob);
 }
 
+// src/httpHeaders.ts
+async function getHttpInputHeaders(fileInfo) {
+  if (fileInfo.kind === "http" && typeof fileInfo.headers === "function") {
+    const clonedFileInfo = { ...fileInfo };
+    clonedFileInfo.headers = await fileInfo.headers();
+    return clonedFileInfo;
+  }
+  return fileInfo;
+}
+async function getHttpOutputHeaders(outputTarget) {
+  if (outputTarget?.http && typeof outputTarget.http.headers === "function") {
+    const clonedOutputTarget = {
+      ...outputTarget
+    };
+    clonedOutputTarget.http = {
+      ...outputTarget.http,
+      headers: await outputTarget.http.headers()
+    };
+    return clonedOutputTarget;
+  }
+  return outputTarget;
+}
+
 // node_modules/.pnpm/acorn@8.15.0/node_modules/acorn/dist/acorn.mjs
 var astralIdentifierCodes = [509, 0, 227, 0, 150, 4, 294, 9, 1368, 2, 2, 1, 6, 3, 41, 2, 5, 0, 166, 1, 574, 3, 9, 9, 7, 9, 32, 4, 318, 1, 80, 3, 71, 10, 50, 3, 123, 2, 54, 14, 32, 10, 3, 1, 11, 3, 46, 10, 8, 0, 46, 9, 7, 2, 37, 13, 2, 9, 6, 1, 45, 0, 13, 2, 49, 13, 9, 3, 2, 11, 83, 11, 7, 0, 3, 0, 158, 11, 6, 9, 7, 3, 56, 1, 2, 6, 3, 1, 3, 2, 10, 0, 11, 1, 3, 6, 4, 4, 68, 8, 2, 0, 3, 0, 2, 3, 2, 4, 2, 0, 15, 1, 83, 17, 10, 9, 5, 0, 82, 19, 13, 9, 214, 6, 3, 8, 28, 1, 83, 16, 16, 9, 82, 12, 9, 9, 7, 19, 58, 14, 5, 9, 243, 14, 166, 9, 71, 5, 2, 1, 3, 3, 2, 0, 2, 1, 13, 9, 120, 6, 3, 6, 4, 0, 29, 9, 41, 6, 2, 3, 9, 0, 10, 10, 47, 15, 343, 9, 54, 7, 2, 7, 17, 9, 57, 21, 2, 13, 123, 5, 4, 0, 2, 1, 2, 6, 2, 0, 9, 9, 49, 4, 2, 1, 2, 4, 9, 9, 330, 3, 10, 1, 2, 0, 49, 6, 4, 4, 14, 10, 5350, 0, 7, 14, 11465, 27, 2343, 9, 87, 9, 39, 4, 60, 6, 26, 9, 535, 9, 470, 0, 2, 54, 8, 3, 82, 0, 12, 1, 19628, 1, 4178, 9, 519, 45, 3, 22, 543, 4, 4, 5, 9, 7, 3, 6, 31, 3, 149, 2, 1418, 49, 513, 54, 5, 49, 9, 0, 15, 0, 23, 4, 2, 14, 1361, 6, 2, 16, 3, 6, 2, 1, 2, 4, 101, 0, 161, 6, 10, 9, 357, 0, 62, 13, 499, 13, 245, 1, 2, 9, 726, 6, 110, 6, 6, 9, 4759, 9, 787719, 239];
 var astralIdentifierStartCodes = [0, 11, 2, 25, 2, 18, 2, 1, 2, 14, 3, 13, 35, 122, 70, 52, 268, 28, 4, 48, 48, 31, 14, 29, 6, 37, 11, 29, 3, 35, 5, 7, 2, 4, 43, 157, 19, 35, 5, 35, 5, 39, 9, 51, 13, 10, 2, 14, 2, 6, 2, 1, 2, 10, 2, 14, 2, 6, 2, 1, 4, 51, 13, 310, 10, 21, 11, 7, 25, 5, 2, 41, 2, 8, 70, 5, 3, 0, 2, 43, 2, 1, 4, 0, 3, 22, 11, 22, 10, 30, 66, 18, 2, 1, 11, 21, 11, 25, 71, 55, 7, 1, 65, 0, 16, 3, 2, 2, 2, 28, 43, 28, 4, 28, 36, 7, 2, 27, 28, 53, 11, 21, 11, 18, 14, 17, 111, 72, 56, 50, 14, 50, 14, 35, 39, 27, 10, 22, 251, 41, 7, 1, 17, 2, 60, 28, 11, 0, 9, 21, 43, 17, 47, 20, 28, 22, 13, 52, 58, 1, 3, 0, 14, 44, 33, 24, 27, 35, 30, 0, 3, 0, 9, 34, 4, 0, 13, 47, 15, 3, 22, 0, 2, 0, 36, 17, 2, 24, 20, 1, 64, 6, 2, 0, 2, 3, 2, 14, 2, 9, 8, 46, 39, 7, 3, 1, 3, 21, 2, 6, 2, 1, 2, 4, 4, 0, 19, 0, 13, 4, 31, 9, 2, 0, 3, 0, 2, 37, 2, 0, 26, 0, 2, 0, 45, 52, 19, 3, 21, 2, 31, 47, 21, 1, 2, 0, 185, 46, 42, 3, 37, 47, 21, 0, 60, 42, 14, 0, 72, 26, 38, 6, 186, 43, 117, 63, 32, 7, 3, 0, 3, 7, 2, 1, 2, 23, 16, 0, 2, 0, 95, 7, 3, 38, 17, 0, 2, 0, 29, 0, 11, 39, 8, 0, 22, 0, 12, 45, 20, 0, 19, 72, 200, 32, 32, 8, 2, 36, 18, 0, 50, 29, 113, 6, 2, 1, 2, 37, 22, 0, 26, 5, 2, 1, 2, 31, 15, 0, 328, 18, 16, 0, 2, 12, 2, 33, 125, 0, 80, 921, 103, 110, 18, 195, 2637, 96, 16, 1071, 18, 5, 26, 3994, 6, 582, 6842, 29, 1763, 568, 8, 30, 18, 78, 18, 29, 19, 47, 17, 3, 32, 20, 6, 18, 433, 44, 212, 63, 129, 74, 6, 0, 67, 12, 65, 1, 2, 0, 29, 6135, 9, 1237, 42, 9, 8936, 3, 2, 6, 2, 1, 2, 290, 16, 0, 30, 2, 3, 0, 15, 3, 9, 395, 2309, 106, 6, 12, 4, 8, 8, 9, 5991, 84, 2, 70, 2, 1, 3, 0, 3, 1, 3, 3, 2, 11, 2, 0, 2, 6, 2, 64, 2, 3, 3, 7, 2, 6, 2, 27, 2, 3, 2, 4, 2, 0, 4, 6, 2, 339, 3, 24, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 7, 1845, 30, 7, 5, 262, 61, 147, 44, 11, 6, 17, 0, 322, 29, 19, 43, 485, 27, 229, 29, 3, 0, 496, 6, 2, 3, 2, 1, 2, 14, 2, 196, 60, 67, 8, 0, 1205, 3, 2, 26, 2, 1, 2, 0, 3, 0, 2, 9, 2, 3, 2, 0, 2, 0, 7, 0, 5, 0, 2, 0, 2, 0, 2, 2, 2, 1, 2, 0, 3, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 1, 2, 0, 3, 3, 2, 6, 2, 3, 2, 3, 2, 0, 2, 9, 2, 16, 6, 2, 2, 4, 2, 16, 4421, 42719, 33, 4153, 7, 221, 3, 5761, 15, 7472, 16, 621, 2467, 541, 1507, 4938, 6, 4191];
@@ -87448,29 +87471,6 @@ function serializeMappingOptions(mappingOptions) {
   return { ...rest, curationSpecStr };
 }
 
-// src/httpHeaders.ts
-async function getHttpInputHeaders(fileInfo) {
-  if (fileInfo.kind === "http" && typeof fileInfo.headers === "function") {
-    const clonedFileInfo = { ...fileInfo };
-    clonedFileInfo.headers = await fileInfo.headers();
-    return clonedFileInfo;
-  }
-  return fileInfo;
-}
-async function getHttpOutputHeaders(outputTarget) {
-  if (outputTarget?.http && typeof outputTarget.http.headers === "function") {
-    const clonedOutputTarget = {
-      ...outputTarget
-    };
-    clonedOutputTarget.http = {
-      ...outputTarget.http,
-      headers: await outputTarget.http.headers()
-    };
-    return clonedOutputTarget;
-  }
-  return outputTarget;
-}
-
 // src/types.ts
 var OUTPUT_FILE_PREFIX = "output#";
 
@@ -87495,7 +87495,7 @@ var progressCallback = () => {
 };
 var scanResumeCallback = null;
 var scanPaused = false;
-var totalDiscoveredFiles = void 0;
+var totalDiscoveredFiles;
 var LOW_WATER_MARK = 50;
 function setMappingWorkerOptions(opts) {
   mappingWorkerOptions = opts;
@@ -87716,7 +87716,7 @@ async function createMappingWorker() {
           console.log(`Finished mapping ${filesMapped} files`);
         }
         break;
-      case "error":
+      case "error": {
         console.error("Error in mapping worker:", event.data.error);
         availableMappingWorkers.push(mappingWorker);
         const errorMapResults = {
@@ -87739,6 +87739,7 @@ async function createMappingWorker() {
         });
         dispatchMappingJobs();
         break;
+      }
       default:
         console.error(`Unknown response from worker ${event.data.response}`);
     }

package/dist/esm/mappingWorkerPool.js

@@ -6315,6 +6315,29 @@ var require_acorn_globals = __commonJS({
   }
 });
 
+// src/httpHeaders.ts
+async function getHttpInputHeaders(fileInfo) {
+  if (fileInfo.kind === "http" && typeof fileInfo.headers === "function") {
+    const clonedFileInfo = { ...fileInfo };
+    clonedFileInfo.headers = await fileInfo.headers();
+    return clonedFileInfo;
+  }
+  return fileInfo;
+}
+async function getHttpOutputHeaders(outputTarget) {
+  if (outputTarget?.http && typeof outputTarget.http.headers === "function") {
+    const clonedOutputTarget = {
+      ...outputTarget
+    };
+    clonedOutputTarget.http = {
+      ...outputTarget.http,
+      headers: await outputTarget.http.headers()
+    };
+    return clonedOutputTarget;
+  }
+  return outputTarget;
+}
+
 // node_modules/.pnpm/acorn@8.15.0/node_modules/acorn/dist/acorn.mjs
 var astralIdentifierCodes = [509, 0, 227, 0, 150, 4, 294, 9, 1368, 2, 2, 1, 6, 3, 41, 2, 5, 0, 166, 1, 574, 3, 9, 9, 7, 9, 32, 4, 318, 1, 80, 3, 71, 10, 50, 3, 123, 2, 54, 14, 32, 10, 3, 1, 11, 3, 46, 10, 8, 0, 46, 9, 7, 2, 37, 13, 2, 9, 6, 1, 45, 0, 13, 2, 49, 13, 9, 3, 2, 11, 83, 11, 7, 0, 3, 0, 158, 11, 6, 9, 7, 3, 56, 1, 2, 6, 3, 1, 3, 2, 10, 0, 11, 1, 3, 6, 4, 4, 68, 8, 2, 0, 3, 0, 2, 3, 2, 4, 2, 0, 15, 1, 83, 17, 10, 9, 5, 0, 82, 19, 13, 9, 214, 6, 3, 8, 28, 1, 83, 16, 16, 9, 82, 12, 9, 9, 7, 19, 58, 14, 5, 9, 243, 14, 166, 9, 71, 5, 2, 1, 3, 3, 2, 0, 2, 1, 13, 9, 120, 6, 3, 6, 4, 0, 29, 9, 41, 6, 2, 3, 9, 0, 10, 10, 47, 15, 343, 9, 54, 7, 2, 7, 17, 9, 57, 21, 2, 13, 123, 5, 4, 0, 2, 1, 2, 6, 2, 0, 9, 9, 49, 4, 2, 1, 2, 4, 9, 9, 330, 3, 10, 1, 2, 0, 49, 6, 4, 4, 14, 10, 5350, 0, 7, 14, 11465, 27, 2343, 9, 87, 9, 39, 4, 60, 6, 26, 9, 535, 9, 470, 0, 2, 54, 8, 3, 82, 0, 12, 1, 19628, 1, 4178, 9, 519, 45, 3, 22, 543, 4, 4, 5, 9, 7, 3, 6, 31, 3, 149, 2, 1418, 49, 513, 54, 5, 49, 9, 0, 15, 0, 23, 4, 2, 14, 1361, 6, 2, 16, 3, 6, 2, 1, 2, 4, 101, 0, 161, 6, 10, 9, 357, 0, 62, 13, 499, 13, 245, 1, 2, 9, 726, 6, 110, 6, 6, 9, 4759, 9, 787719, 239];
 var astralIdentifierStartCodes = [0, 11, 2, 25, 2, 18, 2, 1, 2, 14, 3, 13, 35, 122, 70, 52, 268, 28, 4, 48, 48, 31, 14, 29, 6, 37, 11, 29, 3, 35, 5, 7, 2, 4, 43, 157, 19, 35, 5, 35, 5, 39, 9, 51, 13, 10, 2, 14, 2, 6, 2, 1, 2, 10, 2, 14, 2, 6, 2, 1, 4, 51, 13, 310, 10, 21, 11, 7, 25, 5, 2, 41, 2, 8, 70, 5, 3, 0, 2, 43, 2, 1, 4, 0, 3, 22, 11, 22, 10, 30, 66, 18, 2, 1, 11, 21, 11, 25, 71, 55, 7, 1, 65, 0, 16, 3, 2, 2, 2, 28, 43, 28, 4, 28, 36, 7, 2, 27, 28, 53, 11, 21, 11, 18, 14, 17, 111, 72, 56, 50, 14, 50, 14, 35, 39, 27, 10, 22, 251, 41, 7, 1, 17, 2, 60, 28, 11, 0, 9, 21, 43, 17, 47, 20, 28, 22, 13, 52, 58, 1, 3, 0, 14, 44, 33, 24, 27, 35, 30, 0, 3, 0, 9, 34, 4, 0, 13, 47, 15, 3, 22, 0, 2, 0, 36, 17, 2, 24, 20, 1, 64, 6, 2, 0, 2, 3, 2, 14, 2, 9, 8, 46, 39, 7, 3, 1, 3, 21, 2, 6, 2, 1, 2, 4, 4, 0, 19, 0, 13, 4, 31, 9, 2, 0, 3, 0, 2, 37, 2, 0, 26, 0, 2, 0, 45, 52, 19, 3, 21, 2, 31, 47, 21, 1, 2, 0, 185, 46, 42, 3, 37, 47, 21, 0, 60, 42, 14, 0, 72, 26, 38, 6, 186, 43, 117, 63, 32, 7, 3, 0, 3, 7, 2, 1, 2, 23, 16, 0, 2, 0, 95, 7, 3, 38, 17, 0, 2, 0, 29, 0, 11, 39, 8, 0, 22, 0, 12, 45, 20, 0, 19, 72, 200, 32, 32, 8, 2, 36, 18, 0, 50, 29, 113, 6, 2, 1, 2, 37, 22, 0, 26, 5, 2, 1, 2, 31, 15, 0, 328, 18, 16, 0, 2, 12, 2, 33, 125, 0, 80, 921, 103, 110, 18, 195, 2637, 96, 16, 1071, 18, 5, 26, 3994, 6, 582, 6842, 29, 1763, 568, 8, 30, 18, 78, 18, 29, 19, 47, 17, 3, 32, 20, 6, 18, 433, 44, 212, 63, 129, 74, 6, 0, 67, 12, 65, 1, 2, 0, 29, 6135, 9, 1237, 42, 9, 8936, 3, 2, 6, 2, 1, 2, 290, 16, 0, 30, 2, 3, 0, 15, 3, 9, 395, 2309, 106, 6, 12, 4, 8, 8, 9, 5991, 84, 2, 70, 2, 1, 3, 0, 3, 1, 3, 3, 2, 11, 2, 0, 2, 6, 2, 64, 2, 3, 3, 7, 2, 6, 2, 27, 2, 3, 2, 4, 2, 0, 4, 6, 2, 339, 3, 24, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 7, 1845, 30, 7, 5, 262, 61, 147, 44, 11, 6, 17, 0, 322, 29, 19, 43, 485, 27, 229, 29, 3, 0, 496, 6, 2, 3, 2, 1, 2, 14, 2, 196, 60, 67, 8, 0, 1205, 3, 2, 26, 2, 1, 2, 0, 3, 0, 2, 9, 2, 3, 2, 0, 2, 0, 7, 0, 5, 0, 2, 0, 2, 0, 2, 2, 2, 1, 2, 0, 3, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 1, 2, 0, 3, 3, 2, 6, 2, 3, 2, 3, 2, 0, 2, 9, 2, 16, 6, 2, 2, 4, 2, 16, 4421, 42719, 33, 4153, 7, 221, 3, 5761, 15, 7472, 16, 621, 2467, 541, 1507, 4938, 6, 4191];
@@ -11976,28 +11999,8 @@ function serializeMappingOptions(mappingOptions) {
   return { ...rest, curationSpecStr };
 }
 
-// src/httpHeaders.ts
-async function getHttpInputHeaders(fileInfo) {
-  if (fileInfo.kind === "http" && typeof fileInfo.headers === "function") {
-    const clonedFileInfo = { ...fileInfo };
-    clonedFileInfo.headers = await fileInfo.headers();
-    return clonedFileInfo;
-  }
-  return fileInfo;
-}
-async function getHttpOutputHeaders(outputTarget) {
-  if (outputTarget?.http && typeof outputTarget.http.headers === "function") {
-    const clonedOutputTarget = {
-      ...outputTarget
-    };
-    clonedOutputTarget.http = {
-      ...outputTarget.http,
-      headers: await outputTarget.http.headers()
-    };
-    return clonedOutputTarget;
-  }
-  return outputTarget;
-}
+// src/types.ts
+var OUTPUT_FILE_PREFIX = "output#";
 
 // src/worker.ts
 var wt = null;
@@ -12043,9 +12046,6 @@ function dataURLToBlobURL(dataURL) {
   return URL.createObjectURL(blob);
 }
 
-// src/types.ts
-var OUTPUT_FILE_PREFIX = "output#";
-
 // src/mappingWorkerPool.ts
 var mappingWorkerOptions = {};
 var availableMappingWorkers = [];
@@ -12067,7 +12067,7 @@ var progressCallback = () => {
 };
 var scanResumeCallback = null;
 var scanPaused = false;
-var totalDiscoveredFiles = void 0;
+var totalDiscoveredFiles;
 var LOW_WATER_MARK = 50;
 function setMappingWorkerOptions(opts) {
   mappingWorkerOptions = opts;
@@ -12291,7 +12291,7 @@ async function createMappingWorker() {
           console.log(`Finished mapping ${filesMapped} files`);
         }
         break;
-      case "error":
+      case "error": {
         console.error("Error in mapping worker:", event.data.error);
         availableMappingWorkers.push(mappingWorker);
         const errorMapResults = {
@@ -12314,6 +12314,7 @@ async function createMappingWorker() {
         });
         dispatchMappingJobs();
         break;
+      }
       default:
         console.error(`Unknown response from worker ${event.data.response}`);
     }

package/dist/esm/scanDirectoryWorker.js

@@ -37140,11 +37140,8 @@ var keepScanning = true;
 var pauseResolve = null;
 var pausePromise = null;
 var totalDiscovered = 0;
-var countingMode = false;
-var fileBuffer = [];
 function pauseScanning() {
   if (!pausePromise) {
-    countingMode = true;
     pausePromise = new Promise((resolve) => {
       pauseResolve = resolve;
     });
@@ -37152,7 +37149,6 @@ function pauseScanning() {
 }
 function resumeScanning() {
   if (pauseResolve) {
-    countingMode = false;
     pauseResolve();
     pauseResolve = null;
     pausePromise = null;
@@ -37286,7 +37282,7 @@ async function shouldProcessFileNode(filePath, fileName, fileSize, fileAnomalies
     return true;
   }
 }
-function cheapFilter(fileName, fileSize, filePath) {
+function cheapFilterNameOnly(fileName, filePath) {
   const allExcludedFiletypes = [
     ...noDefaultExclusions ? [] : DEFAULT_EXCLUDED_FILETYPES,
     ...excludedFiletypes
@@ -37299,100 +37295,8 @@ function cheapFilter(fileName, fileSize, filePath) {
   )) {
     return false;
   }
-  if (noDicomSignatureCheck) {
-    return true;
-  }
-  if (fileSize < 132) {
-    return false;
-  }
   return true;
 }
-async function drainBuffer() {
-  while (fileBuffer.length > 0 && keepScanning) {
-    const item = fileBuffer.shift();
-    const fileAnomalies = [];
-    if (item.kind === "handle") {
-      const filePath = `${item.prefix}/${item.name}`;
-      if (await shouldProcessFile(item.file, fileAnomalies, filePath)) {
-        globalThis.postMessage({
-          response: "file",
-          fileInfo: {
-            path: item.prefix,
-            name: item.name,
-            size: item.size,
-            kind: "handle",
-            fileHandle: item.entry
-          },
-          previousFileInfo: item.prev
-        });
-      } else {
-        totalDiscovered--;
-        globalThis.postMessage({
-          response: "count",
-          totalDiscovered
-        });
-        if (fileAnomalies.length > 0) {
-          globalThis.postMessage({
-            response: "scanAnomalies",
-            fileInfo: {
-              path: item.prefix,
-              name: item.name,
-              size: item.size,
-              kind: "handle",
-              fileHandle: item.entry
-            },
-            anomalies: fileAnomalies,
-            previousFileInfo: item.prev
-          });
-        }
-      }
-    } else {
-      if (await shouldProcessFileNode(
-        item.filePath,
-        item.name,
-        item.size,
-        fileAnomalies,
-        `${item.prefix}/${item.name}`
-      )) {
-        globalThis.postMessage({
-          response: "file",
-          fileInfo: {
-            path: item.prefix,
-            name: item.name,
-            size: item.size,
-            kind: "path",
-            fullPath: item.filePath
-          },
-          previousFileInfo: item.prev
-        });
-      } else {
-        totalDiscovered--;
-        globalThis.postMessage({
-          response: "count",
-          totalDiscovered
-        });
-        if (fileAnomalies.length > 0) {
-          globalThis.postMessage({
-            response: "scanAnomalies",
-            fileInfo: {
-              path: item.prefix,
-              name: item.name,
-              size: item.size,
-              kind: "path",
-              fullPath: item.filePath
-            },
-            anomalies: fileAnomalies,
-            previousFileInfo: item.prev
-          });
-        }
-      }
-    }
-    if (!await waitIfPaused())
-      return;
-    if (countingMode)
-      return;
-  }
-}
 fixupNodeWorkerEnvironment().then(() => {
   globalThis.addEventListener("message", (event) => {
     switch (event.data.request) {
@@ -37417,8 +37321,6 @@ fixupNodeWorkerEnvironment().then(() => {
         noDefaultExclusions = event.data.noDefaultExclusions ?? false;
         keepScanning = true;
         totalDiscovered = 0;
-        countingMode = false;
-        fileBuffer.length = 0;
         if ("path" in eventData) {
           scanDirectoryNode(eventData.path);
         } else if ("directoryHandle" in eventData) {
@@ -37452,7 +37354,7 @@ async function scanS3Bucket(bucketOptions) {
       endpoint: bucketOptions.endpoint,
       forcePathStyle: bucketOptions.forcePathStyle
     });
-    let continuationToken = void 0;
+    let continuationToken;
     do {
       const listCommand = new s32.ListObjectsV2Command({
         Bucket: bucketOptions.bucketName,
@@ -37496,8 +37398,16 @@ async function scanS3Bucket(bucketOptions) {
           }
         }
       }
+      globalThis.postMessage({
+        response: "count",
+        totalDiscovered
+      });
       continuationToken = data2.NextContinuationToken;
     } while (continuationToken);
+    globalThis.postMessage({
+      response: "count",
+      totalDiscovered
+    });
     globalThis.postMessage({ response: "done" });
   } catch (error2) {
     globalThis.postMessage({
@@ -37509,58 +37419,37 @@ async function scanS3Bucket(bucketOptions) {
   }
 }
 async function scanDirectory(dir) {
-  async function traverse(dir2, prefix) {
-    for await (const entry of dir2.values()) {
+  async function counter(dirHandle, prefix) {
+    for await (const entry of dirHandle.values()) {
+      if (!keepScanning)
+        return;
+      if (entry.kind === "file") {
+        const key = `${prefix}/${entry.name}`;
+        if (cheapFilterNameOnly(entry.name, key)) {
+          totalDiscovered++;
+          globalThis.postMessage({
+            response: "count",
+            totalDiscovered
+          });
+        }
+      } else if (entry.kind === "directory") {
+        await counter(
+          entry,
+          prefix + "/" + entry.name
+        );
+      }
+    }
+  }
+  async function feeder(dirHandle, prefix) {
+    for await (const entry of dirHandle.values()) {
       if (!keepScanning)
         return;
       if (entry.kind === "file") {
         const file = await entry.getFile();
         const key = `${prefix}/${entry.name}`;
         const prev = previousIndex ? previousIndex[key] : void 0;
-        if (countingMode) {
-          if (cheapFilter(entry.name, file.size, key)) {
-            totalDiscovered++;
-            fileBuffer.push({
-              kind: "handle",
-              entry,
-              file,
-              prefix,
-              name: entry.name,
-              size: file.size,
-              prev
-            });
-            globalThis.postMessage({
-              response: "count",
-              totalDiscovered
-            });
-          }
-          continue;
-        }
-        if (fileBuffer.length > 0) {
-          await drainBuffer();
-          if (countingMode) {
-            if (cheapFilter(entry.name, file.size, key)) {
-              totalDiscovered++;
-              fileBuffer.push({
-                kind: "handle",
-                entry,
-                file,
-                prefix,
-                name: entry.name,
-                size: file.size,
-                prev
-              });
-              globalThis.postMessage({
-                response: "count",
-                totalDiscovered
-              });
-            }
-            continue;
-          }
-        }
         const fileAnomalies = [];
         if (await shouldProcessFile(file, fileAnomalies, key)) {
-          totalDiscovered++;
           globalThis.postMessage({
             response: "file",
             fileInfo: {
@@ -37572,24 +37461,33 @@ async function scanDirectory(dir) {
             },
             previousFileInfo: prev
           });
-        } else if (fileAnomalies.length > 0) {
-          globalThis.postMessage({
-            response: "scanAnomalies",
-            fileInfo: {
-              path: prefix,
-              name: entry.name,
-              size: file.size,
-              kind: "handle",
-              fileHandle: entry
-            },
-            anomalies: fileAnomalies,
-            previousFileInfo: prev
-          });
+        } else {
+          if (cheapFilterNameOnly(entry.name, key)) {
+            totalDiscovered--;
+            globalThis.postMessage({
+              response: "count",
+              totalDiscovered
+            });
+          }
+          if (fileAnomalies.length > 0) {
+            globalThis.postMessage({
+              response: "scanAnomalies",
+              fileInfo: {
+                path: prefix,
+                name: entry.name,
+                size: file.size,
+                kind: "handle",
+                fileHandle: entry
+              },
+              anomalies: fileAnomalies,
+              previousFileInfo: prev
+            });
+          }
         }
         if (!await waitIfPaused())
           return;
       } else if (entry.kind === "directory") {
-        await traverse(
+        await feeder(
           entry,
           prefix + "/" + entry.name
         );
@@ -37597,11 +37495,11 @@ async function scanDirectory(dir) {
     }
   }
   try {
-    await traverse(dir, dir.name);
-    if (fileBuffer.length > 0) {
-      countingMode = false;
-      await drainBuffer();
-    }
+    await Promise.all([counter(dir, dir.name), feeder(dir, dir.name)]);
+    globalThis.postMessage({
+      response: "count",
+      totalDiscovered
+    });
     globalThis.postMessage({ response: "done" });
   } catch (error2) {
     globalThis.postMessage({
@@ -37616,7 +37514,30 @@ async function scanDirectoryNode(dirPath) {
   try {
     const fs = await import("fs/promises");
     const path = await import("path");
-    async function traverse(currentPath, prefix) {
+    async function counter(currentPath, prefix) {
+      const entries = await fs.readdir(currentPath, { withFileTypes: true });
+      entries.sort((a4, b4) => a4.name.localeCompare(b4.name));
+      for (const entry of entries) {
+        if (!keepScanning)
+          return;
+        if (entry.isFile()) {
+          const key = `${prefix}/${entry.name}`;
+          if (cheapFilterNameOnly(entry.name, key)) {
+            totalDiscovered++;
+            globalThis.postMessage({
+              response: "count",
+              totalDiscovered
+            });
+          }
+        } else if (entry.isDirectory()) {
+          await counter(
+            path.join(currentPath, entry.name),
+            prefix + "/" + entry.name
+          );
+        }
+      }
+    }
+    async function feeder(currentPath, prefix) {
       const entries = await fs.readdir(currentPath, { withFileTypes: true });
       entries.sort((a4, b4) => a4.name.localeCompare(b4.name));
       for (const entry of entries) {
@@ -37627,45 +37548,6 @@ async function scanDirectoryNode(dirPath) {
           const stats = await fs.stat(filePath);
           const key = `${prefix}/${entry.name}`;
           const prev = previousIndex ? previousIndex[key] : void 0;
-          if (countingMode) {
-            if (cheapFilter(entry.name, stats.size, key)) {
-              totalDiscovered++;
-              fileBuffer.push({
-                kind: "path",
-                filePath,
-                name: entry.name,
-                size: stats.size,
-                prefix,
-                prev
-              });
-              globalThis.postMessage({
-                response: "count",
-                totalDiscovered
-              });
-            }
-            continue;
-          }
-          if (fileBuffer.length > 0) {
-            await drainBuffer();
-            if (countingMode) {
-              if (cheapFilter(entry.name, stats.size, key)) {
-                totalDiscovered++;
-                fileBuffer.push({
-                  kind: "path",
-                  filePath,
-                  name: entry.name,
-                  size: stats.size,
-                  prefix,
-                  prev
-                });
-                globalThis.postMessage({
-                  response: "count",
-                  totalDiscovered
-                });
-              }
-              continue;
-            }
-          }
           const fileAnomalies = [];
           if (await shouldProcessFileNode(
             filePath,
@@ -37674,7 +37556,6 @@ async function scanDirectoryNode(dirPath) {
             fileAnomalies,
             key
           )) {
-            totalDiscovered++;
             globalThis.postMessage({
               response: "file",
               fileInfo: {
@@ -37686,36 +37567,45 @@ async function scanDirectoryNode(dirPath) {
               },
               previousFileInfo: prev
             });
-          } else if (fileAnomalies.length > 0) {
-            globalThis.postMessage({
-              response: "scanAnomalies",
-              fileInfo: {
-                path: prefix,
-                name: entry.name,
-                size: stats.size,
-                kind: "path",
-                fullPath: filePath
-              },
-              anomalies: fileAnomalies,
-              previousFileInfo: prev
-            });
+          } else {
+            if (cheapFilterNameOnly(entry.name, key)) {
+              totalDiscovered--;
+              globalThis.postMessage({
+                response: "count",
+                totalDiscovered
+              });
+            }
+            if (fileAnomalies.length > 0) {
+              globalThis.postMessage({
+                response: "scanAnomalies",
+                fileInfo: {
+                  path: prefix,
+                  name: entry.name,
+                  size: stats.size,
+                  kind: "path",
+                  fullPath: filePath
+                },
+                anomalies: fileAnomalies,
+                previousFileInfo: prev
+              });
+            }
           }
           if (!await waitIfPaused())
             return;
         } else if (entry.isDirectory()) {
-          await traverse(
+          await feeder(
             path.join(currentPath, entry.name),
             prefix + "/" + entry.name
           );
         }
       }
     }
-    const dirName = await import("path").then((p4) => p4.basename(dirPath));
-    await traverse(dirPath, dirName);
-    if (fileBuffer.length > 0) {
-      countingMode = false;
-      await drainBuffer();
-    }
+    const dirName = path.basename(dirPath);
+    await Promise.all([counter(dirPath, dirName), feeder(dirPath, dirName)]);
+    globalThis.postMessage({
+      response: "count",
+      totalDiscovered
+    });
     globalThis.postMessage({ response: "done" });
   } catch (error2) {
     globalThis.postMessage({

package/dist/types/mappingWorkerPool.d.ts

@@ -5,7 +5,7 @@
  * Handles worker creation, crash recovery, replacement spawning, dispatch, and
  * the stall watchdog. Extracted from index.ts for maintainability.
  */
-import type { TMappingOptions, TFileInfo, TProgressMessage, TOutputTarget, TFileInfoIndex, THashMethod } from './types';
+import type { TFileInfo, TFileInfoIndex, THashMethod, TMappingOptions, TOutputTarget, TProgressMessage } from './types';
 export type TMappingWorkerOptions = TMappingOptions & {
     outputTarget?: TOutputTarget;
     hashMethod?: THashMethod;

package/dist/types/scanDirectoryWorker.d.ts

@@ -1,5 +1,4 @@
 import type { TFileInfo, TFileInfoIndex, TS3BucketOptions } from './types';
-export {};
 export type FileScanMsg = {
     response: 'file';
     fileInfo: TFileInfo;
@@ -47,3 +46,4 @@ export type FileScanRequest = ({
 } | {
     request: 'resume';
 };
+export {};