fs: add to Dir support for explicit resource management

PR-URL: #58206
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: LiviaMedeiros <[email protected]>

Author: aduh95

doc/api/fs.md

@@ -6728,6 +6728,26 @@ provided by the operating system's underlying directory mechanisms.
 Entries added or removed while iterating over the directory might not be
 included in the iteration results.
 
+#### `dir[Symbol.asyncDispose]()`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+> Stability: 1 - Experimental
+
+An alias for `dir.close()`.
+
+#### `dir[Symbol.Dispose]()`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+> Stability: 1 - Experimental
+
+An alias for `dir.closeSync()`.
+
 ### Class: `fs.Dirent`
 
 <!-- YAML

lib/internal/fs/dir.js

@@ -4,7 +4,7 @@ const {
   ArrayPrototypePush,
   ArrayPrototypeShift,
   FunctionPrototypeBind,
-  ObjectDefineProperty,
+  ObjectDefineProperties,
   PromiseReject,
   SymbolAsyncIterator,
 } = primordials;
@@ -31,6 +31,10 @@ const {
   validateFunction,
   validateUint32,
 } = require('internal/validators');
+const {
+  SymbolAsyncDispose,
+  SymbolDispose,
+} = internalUtil;
 
 class Dir {
   #handle;
@@ -293,12 +297,27 @@ class Dir {
   }
 }
 
-ObjectDefineProperty(Dir.prototype, SymbolAsyncIterator, {
-  __proto__: null,
-  value: Dir.prototype.entries,
+const nonEnumerableDescriptor = {
   enumerable: false,
   writable: true,
   configurable: true,
+};
+ObjectDefineProperties(Dir.prototype, {
+  [SymbolDispose]: {
+    __proto__: null,
+    ...nonEnumerableDescriptor,
+    value: Dir.prototype.closeSync,
+  },
+  [SymbolAsyncDispose]: {
+    __proto__: null,
+    ...nonEnumerableDescriptor,
+    value: Dir.prototype.close,
+  },
+  [SymbolAsyncIterator]: {
+    __proto__: null,
+    ...nonEnumerableDescriptor,
+    value: Dir.prototype.entries,
+  },
 });
 
 function opendir(path, options, callback) {

test/parallel/test-fs-promises-file-handle-dispose.js

@@ -1,12 +1,22 @@
 'use strict';
 
 const common = require('../common');
-const { promises: fs } = require('fs');
+const assert = require('assert');
+const { opendirSync, promises: fs } = require('fs');
 
-async function doOpen() {
+async function explicitCall() {
   const fh = await fs.open(__filename);
   fh.on('close', common.mustCall());
   await fh[Symbol.asyncDispose]();
+
+  const dh = await fs.opendir(__dirname);
+  await dh[Symbol.asyncDispose]();
+  await assert.rejects(dh.read(), { code: 'ERR_DIR_CLOSED' });
+
+  const dhSync = opendirSync(__dirname);
+  dhSync[Symbol.dispose]();
+  assert.throws(() => dhSync.readSync(), { code: 'ERR_DIR_CLOSED' });
 }
 
-doOpen().then(common.mustCall());
+explicitCall().then(common.mustCall());
+// TODO(aduh95): add test for implicit calls, with `await using` syntax.