fs: make processReadResult() and readSyncRecursive() private

LiviaMedeiros · web-flow · commit 823ca6991f29 · 2025-06-14T17:23:47.000Z
PR-URL: #58672 Fixes: #58671 Refs: #41439 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Darshan Sen <raisinten@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Ulises Gascón <ulisesgascongonzalez@gmail.com>
diff --git a/lib/internal/fs/dir.js b/lib/internal/fs/dir.js
@@ -82,7 +82,7 @@ class Dir {
       );
 
       if (result !== null) {
-        this.processReadResult(path, result);
+        this.#processReadResult(path, result);
         if (result.length > 0) {
           ArrayPrototypePush(this.#handlerQueue, handler);
         }
@@ -125,7 +125,7 @@ class Dir {
         const dirent = ArrayPrototypeShift(this.#bufferedEntries);
 
         if (this.#options.recursive && dirent.isDirectory()) {
-          this.readSyncRecursive(dirent);
+          this.#readSyncRecursive(dirent);
         }
 
         if (maybeSync)
@@ -151,10 +151,10 @@ class Dir {
       }
 
       try {
-        this.processReadResult(this.#path, result);
+        this.#processReadResult(this.#path, result);
         const dirent = ArrayPrototypeShift(this.#bufferedEntries);
         if (this.#options.recursive && dirent.isDirectory()) {
-          this.readSyncRecursive(dirent);
+          this.#readSyncRecursive(dirent);
         }
         callback(null, dirent);
       } catch (error) {
@@ -170,7 +170,7 @@ class Dir {
     );
   }
 
-  processReadResult(path, result) {
+  #processReadResult(path, result) {
     for (let i = 0; i < result.length; i += 2) {
       ArrayPrototypePush(
         this.#bufferedEntries,
@@ -183,7 +183,7 @@ class Dir {
     }
   }
 
-  readSyncRecursive(dirent) {
+  #readSyncRecursive(dirent) {
     const path = pathModule.join(dirent.parentPath, dirent.name);
     const handle = dirBinding.opendir(
       path,
@@ -209,7 +209,7 @@ class Dir {
     if (this.#processHandlerQueue()) {
       const dirent = ArrayPrototypeShift(this.#bufferedEntries);
       if (this.#options.recursive && dirent.isDirectory()) {
-        this.readSyncRecursive(dirent);
+        this.#readSyncRecursive(dirent);
       }
       return dirent;
     }
@@ -223,11 +223,11 @@ class Dir {
       return result;
     }
 
-    this.processReadResult(this.#path, result);
+    this.#processReadResult(this.#path, result);
 
     const dirent = ArrayPrototypeShift(this.#bufferedEntries);
     if (this.#options.recursive && dirent.isDirectory()) {
-      this.readSyncRecursive(dirent);
+      this.#readSyncRecursive(dirent);
     }
     return dirent;
   }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ class Dir {`
`82`	`82`	`);`
`83`	`83`
`84`	`84`	`if (result !== null) {`
`85`		`- this.processReadResult(path, result);`
	`85`	`+ this.#processReadResult(path, result);`
`86`	`86`	`if (result.length > 0) {`
`87`	`87`	`ArrayPrototypePush(this.#handlerQueue, handler);`
`88`	`88`	`}`
`@@ -125,7 +125,7 @@ class Dir {`
`125`	`125`	`const dirent = ArrayPrototypeShift(this.#bufferedEntries);`
`126`	`126`
`127`	`127`	`if (this.#options.recursive && dirent.isDirectory()) {`
`128`		`- this.readSyncRecursive(dirent);`
	`128`	`+ this.#readSyncRecursive(dirent);`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`if (maybeSync)`
`@@ -151,10 +151,10 @@ class Dir {`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`try {`
`154`		`- this.processReadResult(this.#path, result);`
	`154`	`+ this.#processReadResult(this.#path, result);`
`155`	`155`	`const dirent = ArrayPrototypeShift(this.#bufferedEntries);`
`156`	`156`	`if (this.#options.recursive && dirent.isDirectory()) {`
`157`		`- this.readSyncRecursive(dirent);`
	`157`	`+ this.#readSyncRecursive(dirent);`
`158`	`158`	`}`
`159`	`159`	`callback(null, dirent);`
`160`	`160`	`} catch (error) {`
`@@ -170,7 +170,7 @@ class Dir {`
`170`	`170`	`);`
`171`	`171`	`}`
`172`	`172`
`173`		`- processReadResult(path, result) {`
	`173`	`+ #processReadResult(path, result) {`
`174`	`174`	`for (let i = 0; i < result.length; i += 2) {`
`175`	`175`	`ArrayPrototypePush(`
`176`	`176`	`this.#bufferedEntries,`
`@@ -183,7 +183,7 @@ class Dir {`
`183`	`183`	`}`
`184`	`184`	`}`
`185`	`185`
`186`		`- readSyncRecursive(dirent) {`
	`186`	`+ #readSyncRecursive(dirent) {`
`187`	`187`	`const path = pathModule.join(dirent.parentPath, dirent.name);`
`188`	`188`	`const handle = dirBinding.opendir(`
`189`	`189`	`path,`
`@@ -209,7 +209,7 @@ class Dir {`
`209`	`209`	`if (this.#processHandlerQueue()) {`
`210`	`210`	`const dirent = ArrayPrototypeShift(this.#bufferedEntries);`
`211`	`211`	`if (this.#options.recursive && dirent.isDirectory()) {`
`212`		`- this.readSyncRecursive(dirent);`
	`212`	`+ this.#readSyncRecursive(dirent);`
`213`	`213`	`}`
`214`	`214`	`return dirent;`
`215`	`215`	`}`
`@@ -223,11 +223,11 @@ class Dir {`
`223`	`223`	`return result;`
`224`	`224`	`}`
`225`	`225`
`226`		`- this.processReadResult(this.#path, result);`
	`226`	`+ this.#processReadResult(this.#path, result);`
`227`	`227`
`228`	`228`	`const dirent = ArrayPrototypeShift(this.#bufferedEntries);`
`229`	`229`	`if (this.#options.recursive && dirent.isDirectory()) {`
`230`		`- this.readSyncRecursive(dirent);`
	`230`	`+ this.#readSyncRecursive(dirent);`
`231`	`231`	`}`
`232`	`232`	`return dirent;`
`233`	`233`	`}`