fs: ensure dir.read() does not throw synchronously

aduh95 · aduh95 · commit cff62e3265b0 · 2025-06-10T11:51:08.000+02:00
PR-URL: #58228 Reviewed-By: LiviaMedeiros <livia@cirno.name> Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/lib/internal/fs/dir.js b/lib/internal/fs/dir.js
@@ -94,7 +94,7 @@ class Dir {
   }
 
   read(callback) {
-    return this.#readImpl(true, callback);
+    return arguments.length === 0 ? this.#readPromisified() : this.#readImpl(true, callback);
   }
 
   #readImpl(maybeSync, callback) {
diff --git a/test/parallel/test-fs-opendir.js b/test/parallel/test-fs-opendir.js
@@ -161,7 +161,7 @@ async function doAsyncIterBreakTest() {
     break;
   }
 
-  await assert.rejects(async () => dir.read(), dirclosedError);
+  await assert.rejects(dir.read(), dirclosedError);
 }
 doAsyncIterBreakTest().then(common.mustCall());
 
@@ -173,7 +173,7 @@ async function doAsyncIterReturnTest() {
     }
   })();
 
-  await assert.rejects(async () => dir.read(), dirclosedError);
+  await assert.rejects(dir.read(), dirclosedError);
 }
 doAsyncIterReturnTest().then(common.mustCall());
 
@@ -189,7 +189,7 @@ async function doAsyncIterThrowTest() {
     }
   }
 
-  await assert.rejects(async () => dir.read(), dirclosedError);
+  await assert.rejects(dir.read(), dirclosedError);
 }
 doAsyncIterThrowTest().then(common.mustCall());
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ class Dir {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`read(callback) {`
`97`		`- return this.#readImpl(true, callback);`
	`97`	`+ return arguments.length === 0 ? this.#readPromisified() : this.#readImpl(true, callback);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`#readImpl(maybeSync, callback) {`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ async function doAsyncIterBreakTest() {`
`161`	`161`	`break;`
`162`	`162`	`}`
`163`	`163`
`164`		`- await assert.rejects(async () => dir.read(), dirclosedError);`
	`164`	`+ await assert.rejects(dir.read(), dirclosedError);`
`165`	`165`	`}`
`166`	`166`	`doAsyncIterBreakTest().then(common.mustCall());`
`167`	`167`
`@@ -173,7 +173,7 @@ async function doAsyncIterReturnTest() {`
`173`	`173`	`}`
`174`	`174`	`})();`
`175`	`175`
`176`		`- await assert.rejects(async () => dir.read(), dirclosedError);`
	`176`	`+ await assert.rejects(dir.read(), dirclosedError);`
`177`	`177`	`}`
`178`	`178`	`doAsyncIterReturnTest().then(common.mustCall());`
`179`	`179`
`@@ -189,7 +189,7 @@ async function doAsyncIterThrowTest() {`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`
`192`		`- await assert.rejects(async () => dir.read(), dirclosedError);`
	`192`	`+ await assert.rejects(dir.read(), dirclosedError);`
`193`	`193`	`}`
`194`	`194`	`doAsyncIterThrowTest().then(common.mustCall());`
`195`	`195`