fs: remove recursive option from rmdir

doc/api/deprecations.md

@@ -3026,6 +3026,9 @@ The [`crypto.Certificate()` constructor][] is deprecated. Use
 
 <!-- YAML
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/57784
+    description: End-of-Life.
   - version: v16.0.0
     pr-url: https://github.com/nodejs/node/pull/37302
     description: Runtime deprecation.
@@ -3037,10 +3040,10 @@ changes:
     description: Documentation-only deprecation.
 -->
 
-Type: Runtime
+Type: End-of-Life
 
-In future versions of Node.js, `recursive` option will be ignored for
-`fs.rmdir`, `fs.rmdirSync`, and `fs.promises.rmdir`.
+`recursive` option is ignored for `fs.rmdir`, `fs.rmdirSync`,
+and `fs.promises.rmdir`.
 
 Use `fs.rm(path, { recursive: true, force: true })`,
 `fs.rmSync(path, { recursive: true, force: true })` or

doc/api/fs.md

@@ -1575,6 +1575,9 @@ Renames `oldPath` to `newPath`.
 <!-- YAML
 added: v10.0.0
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/57784
+    description: The `recursive` option is removed, use `fsPromises.rm` instead.
   - version: v16.0.0
     pr-url: https://github.com/nodejs/node/pull/37216
     description: "Using `fsPromises.rmdir(path, { recursive: true })` on a `path`
@@ -1614,9 +1617,6 @@ changes:
     backoff wait of `retryDelay` milliseconds longer on each try. This option
     represents the number of retries. This option is ignored if the `recursive`
     option is not `true`. **Default:** `0`.
-  * `recursive` {boolean} If `true`, perform a recursive directory removal. In
-    recursive mode, operations are retried on failure. **Default:** `false`.
-    **Deprecated.**
   * `retryDelay` {integer} The amount of time in milliseconds to wait between
     retries. This option is ignored if the `recursive` option is not `true`.
     **Default:** `100`.
@@ -4233,6 +4233,9 @@ rename('oldFile.txt', 'newFile.txt', (err) => {
 <!-- YAML
 added: v0.0.2
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/57784
+    description: The `recursive` option is removed, use `fs.rm` instead.
   - version: v18.0.0
     pr-url: https://github.com/nodejs/node/pull/41678
     description: Passing an invalid callback to the `callback` argument
@@ -4289,9 +4292,6 @@ changes:
     backoff wait of `retryDelay` milliseconds longer on each try. This option
     represents the number of retries. This option is ignored if the `recursive`
     option is not `true`. **Default:** `0`.
-  * `recursive` {boolean} If `true`, perform a recursive directory removal. In
-    recursive mode, operations are retried on failure. **Default:** `false`.
-    **Deprecated.**
   * `retryDelay` {integer} The amount of time in milliseconds to wait between
     retries. This option is ignored if the `recursive` option is not `true`.
     **Default:** `100`.
@@ -6209,6 +6209,9 @@ See the POSIX rename(2) documentation for more details.
 <!-- YAML
 added: v0.1.21
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/57784
+    description: The `recursive` option is removed, use `fs.rmSync` instead.
   - version: v16.0.0
     pr-url: https://github.com/nodejs/node/pull/37216
     description: "Using `fs.rmdirSync(path, { recursive: true })` on a `path`
@@ -6252,9 +6255,6 @@ changes:
     backoff wait of `retryDelay` milliseconds longer on each try. This option
     represents the number of retries. This option is ignored if the `recursive`
     option is not `true`. **Default:** `0`.
-  * `recursive` {boolean} If `true`, perform a recursive directory removal. In
-    recursive mode, operations are retried on failure. **Default:** `false`.
-    **Deprecated.**
   * `retryDelay` {integer} The amount of time in milliseconds to wait between
     retries. This option is ignored if the `recursive` option is not `true`.
     **Default:** `100`.

lib/fs.js

@@ -102,7 +102,6 @@ const {
   },
   copyObject,
   Dirent,
-  emitRecursiveRmdirWarning,
   getDirent,
   getDirents,
   getOptions,
@@ -1111,7 +1110,6 @@ function lazyLoadRimraf() {
  * @param {string | Buffer | URL} path
  * @param {{
  *   maxRetries?: number;
- *   recursive?: boolean;
  *   retryDelay?: number;
  *   }} [options]
  * @param {(err?: Error) => any} callback
@@ -1125,57 +1123,25 @@ function rmdir(path, options, callback) {
 
   callback = makeCallback(callback);
   path = getValidatedPath(path);
+  validateRmdirOptions(options);
 
-  if (options?.recursive) {
-    emitRecursiveRmdirWarning();
-    validateRmOptions(
-      path,
-      { ...options, force: false },
-      true,
-      (err, options) => {
-        if (err === false) {
-          const req = new FSReqCallback();
-          req.oncomplete = callback;
-          binding.rmdir(path, req);
-          return;
-        }
-        if (err) {
-          return callback(err);
-        }
-
-        lazyLoadRimraf();
-        rimraf(path, options, callback);
-      });
-  } else {
-    validateRmdirOptions(options);
-    const req = new FSReqCallback();
-    req.oncomplete = callback;
-    binding.rmdir(path, req);
-  }
+  const req = new FSReqCallback();
+  req.oncomplete = callback;
+  binding.rmdir(path, req);
 }
 
 /**
  * Synchronously removes a directory.
  * @param {string | Buffer | URL} path
  * @param {{
  *   maxRetries?: number;
- *   recursive?: boolean;
  *   retryDelay?: number;
  *   }} [options]
  * @returns {void}
  */
 function rmdirSync(path, options) {
   path = getValidatedPath(path);
-
-  if (options?.recursive) {
-    emitRecursiveRmdirWarning();
-    options = validateRmOptionsSync(path, { ...options, force: false }, true);
-    if (options !== false) {
-      return binding.rmSync(path, options.maxRetries, options.recursive, options.retryDelay);
-    }
-  } else {
-    validateRmdirOptions(options);
-  }
+  validateRmdirOptions(options);
 
   binding.rmdir(path);
 }

lib/internal/fs/promises.js

@@ -56,7 +56,6 @@ const {
     kWriteFileMaxChunkSize,
   },
   copyObject,
-  emitRecursiveRmdirWarning,
   getDirents,
   getOptions,
   getStatFsFromBinding,
@@ -808,14 +807,6 @@ async function rmdir(path, options) {
   path = getValidatedPath(path);
   options = validateRmdirOptions(options);
 
-  if (options.recursive) {
-    emitRecursiveRmdirWarning();
-    const stats = await stat(path);
-    if (stats.isDirectory()) {
-      return lazyRimRaf()(path, options);
-    }
-  }
-
   return await PromisePrototypeThen(
     binding.rmdir(path, kUsePromises),
     undefined,

lib/internal/fs/utils.js

@@ -781,7 +781,6 @@ const defaultRmOptions = {
 const defaultRmdirOptions = {
   retryDelay: 100,
   maxRetries: 0,
-  recursive: false,
 };
 
 const validateCpOptions = hideStackFrames((options) => {
@@ -839,6 +838,7 @@ const validateRmOptions = hideStackFrames((path, options, expectDir, cb) => {
 const validateRmOptionsSync = hideStackFrames((path, options, expectDir) => {
   options = validateRmdirOptions.withoutStackTrace(options, defaultRmOptions);
   validateBoolean.withoutStackTrace(options.force, 'options.force');
+  validateBoolean.withoutStackTrace(options.recursive, 'options.recursive');
 
   if (!options.force || expectDir || !options.recursive) {
     const isDirectory = lazyLoadFs()
@@ -862,23 +862,6 @@ const validateRmOptionsSync = hideStackFrames((path, options, expectDir) => {
   return options;
 });
 
-let recursiveRmdirWarned;
-function emitRecursiveRmdirWarning() {
-  if (recursiveRmdirWarned === undefined) {
-    // TODO(joyeecheung): use getOptionValue('--no-deprecation') instead.
-    recursiveRmdirWarned = process.noDeprecation;
-  }
-  if (!recursiveRmdirWarned) {
-    process.emitWarning(
-      'In future versions of Node.js, fs.rmdir(path, { recursive: true }) ' +
-      'will be removed. Use fs.rm(path, { recursive: true }) instead',
-      'DeprecationWarning',
-      'DEP0147',
-    );
-    recursiveRmdirWarned = true;
-  }
-}
-
 const validateRmdirOptions = hideStackFrames(
   (options, defaults = defaultRmdirOptions) => {
     if (options === undefined)
@@ -887,7 +870,6 @@ const validateRmdirOptions = hideStackFrames(
 
     options = { ...defaults, ...options };
 
-    validateBoolean.withoutStackTrace(options.recursive, 'options.recursive');
     validateInt32.withoutStackTrace(options.retryDelay, 'options.retryDelay', 0);
     validateUint32.withoutStackTrace(options.maxRetries, 'options.maxRetries');
 
@@ -950,7 +932,6 @@ module.exports = {
   copyObject,
   Dirent,
   DirentFromStats,
-  emitRecursiveRmdirWarning,
   getDirent,
   getDirents,
   getOptions,