fix: ensure callback is called only once (#144)

Author: thecodrr

__tests__/fdir.test.ts

@@ -54,7 +54,8 @@ for (const type of apiTypes) {
     const files = await api[type]();
     t.expect(files.every((file) => file.split("/").length <= 2)).toBe(true);
   });
-  -test(`[${type}] crawl multi depth directory with options`, async (t) => {
+
+  test(`[${type}] crawl multi depth directory with options`, async (t) => {
     const api = new fdir({
       maxDepth: 1,
     }).crawl("node_modules");

src/api/functions/walk-directory.ts

@@ -18,11 +18,12 @@ const walkAsync: WalkDirectoryFunction = (
   currentDepth,
   callback
 ) => {
-  if (currentDepth < 0) return state.queue.dequeue(null, state);
+  state.queue.enqueue();
+
+  if (currentDepth <= 0) return state.queue.dequeue(null, state);
 
   state.visited.push(crawlPath);
   state.counts.directories++;
-  state.queue.enqueue();
 
   // Perf: Node >= 10 introduced withFileTypes that helps us
   // skip an extra fs.stat call.
@@ -40,7 +41,7 @@ const walkSync: WalkDirectoryFunction = (
   currentDepth,
   callback
 ) => {
-  if (currentDepth < 0) return;
+  if (currentDepth <= 0) return;
   state.visited.push(crawlPath);
   state.counts.directories++;
 

src/api/queue.ts

@@ -7,14 +7,21 @@ type OnQueueEmptyCallback = (error: Error | null, output: WalkerState) => void;
  * as soon as it completes. When the counter hits 0, it calls onQueueEmpty.
  */
 export class Queue {
-  private count: number = 0;
-  constructor(private readonly onQueueEmpty: OnQueueEmptyCallback) {}
+  count: number = 0;
+  constructor(private onQueueEmpty?: OnQueueEmptyCallback) {}
 
   enqueue() {
     this.count++;
+    return this.count;
   }
 
   dequeue(error: Error | null, output: WalkerState) {
-    if (--this.count <= 0 || error) this.onQueueEmpty(error, output);
+    if (this.onQueueEmpty && (--this.count <= 0 || error)) {
+      this.onQueueEmpty(error, output);
+      if (error) {
+        output.controller.abort();
+        this.onQueueEmpty = undefined;
+      }
+    }
   }
 }

src/api/walker.ts

@@ -48,6 +48,7 @@ export class Walker<TOutput extends Output> {
       ),
       symlinks: new Map(),
       visited: [""].slice(0, 0),
+      controller: new AbortController(),
     };
 
     /*
@@ -65,6 +66,7 @@ export class Walker<TOutput extends Output> {
   }
 
   start(): TOutput | null {
+    this.pushDirectory(this.root, this.state.paths, this.state.options.filters);
     this.walkDirectory(
       this.state,
       this.root,
@@ -88,13 +90,16 @@ export class Walker<TOutput extends Output> {
         useRealPaths,
         pathSeparator,
       },
+      controller,
     } = this.state;
 
-    if ((signal && signal.aborted) || (maxFiles && paths.length > maxFiles))
+    if (
+      controller.signal.aborted ||
+      (signal && signal.aborted) ||
+      (maxFiles && paths.length > maxFiles)
+    )
       return;
 
-    this.pushDirectory(directoryPath, paths, filters);
-
     const files = this.getArray(this.state.paths);
     for (let i = 0; i < entries.length; ++i) {
       const entry = entries[i];
@@ -112,8 +117,9 @@ export class Walker<TOutput extends Output> {
           this.state.options.pathSeparator
         );
         if (exclude && exclude(entry.name, path)) continue;
+        this.pushDirectory(path, paths, filters);
         this.walkDirectory(this.state, path, path, depth - 1, this.walk);
-      } else if (entry.isSymbolicLink() && this.resolveSymlink) {
+      } else if (this.resolveSymlink && entry.isSymbolicLink()) {
         let path = joinPath.joinPathWithBasePath(entry.name, directoryPath);
         this.resolveSymlink(path, this.state, (stat, resolvedPath) => {
           if (stat.isDirectory()) {

src/types.ts

@@ -32,6 +32,7 @@ export type WalkerState = {
   counts: Counts;
   options: Options;
   queue: Queue;
+  controller: AbortController;
 
   symlinks: Map<string, string>;
   visited: string[];