From 61c243f041f2c811d6a79742304b406c9d2fb2bd Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Mon, 1 Feb 2021 11:55:12 -0800
Subject: [PATCH 1/3] fs: use a default callback for fs.close()

The `fs.close()` function requires a callback. Most often the only thing
that callback does is check and rethrow the error if one occurs. To
eliminate common boilerplate, make the callback optional with a default
that checks and rethrows the error as an uncaught exception.

Signed-off-by: James M Snell <jasnell@gmail.com>
---
 doc/api/fs.md | 8 +++++++-
 lib/fs.js     | 6 +++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/api/fs.md b/doc/api/fs.md
index a0a47b14398dd7..71f11a674fdaee 100644
--- a/doc/api/fs.md
+++ b/doc/api/fs.md
@@ -1617,10 +1617,13 @@ This is the synchronous version of [`fs.chown()`][].
 
 See also: chown(2).
 
-## `fs.close(fd, callback)`
+## `fs.close(fd[, callback])`
 <!-- YAML
 added: v0.0.2
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/00000
+    description: A default callback is now use if one is not provided.
   - version: v10.0.0
     pr-url: https://github.com/nodejs/node/pull/12562
     description: The `callback` parameter is no longer optional. Not passing
@@ -1641,6 +1644,9 @@ to the completion callback.
 Calling `fs.close()` on any file descriptor (`fd`) that is currently in use
 through any other `fs` operation may lead to undefined behavior.
 
+If the `callback` argument is omitted, a default callback function that rethrows
+any error as an uncaught exception will be used.
+
 ## `fs.closeSync(fd)`
 <!-- YAML
 added: v0.1.21
diff --git a/lib/fs.js b/lib/fs.js
index d01e99c21b0178..9812fef0a7ebe3 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -438,7 +438,11 @@ function readFileSync(path, options) {
   return buffer;
 }
 
-function close(fd, callback) {
+function defaultCloseCallback(err) {
+  if (err != null) throw err;
+}
+
+function close(fd, callback = defaultCloseCallback) {
   validateInt32(fd, 'fd', 0);
   callback = makeCallback(callback);
 

From 602d8ba79efc43b051d78e051a37b3dc198db577 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Thu, 4 Feb 2021 10:40:17 -0800
Subject: [PATCH 2/3] [Squash] nits

Co-authored-by: Luigi Pinca <luigipinca@gmail.com>
---
 doc/api/fs.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/api/fs.md b/doc/api/fs.md
index 71f11a674fdaee..115f572e1b5883 100644
--- a/doc/api/fs.md
+++ b/doc/api/fs.md
@@ -1622,8 +1622,8 @@ See also: chown(2).
 added: v0.0.2
 changes:
   - version: REPLACEME
-    pr-url: https://github.com/nodejs/node/pull/00000
-    description: A default callback is now use if one is not provided.
+    pr-url: https://github.com/nodejs/node/pull/37174
+    description: A default callback is now used if one is not provided.
   - version: v10.0.0
     pr-url: https://github.com/nodejs/node/pull/12562
     description: The `callback` parameter is no longer optional. Not passing

From e696b4185370de395b0d6913de23f4ea11918471 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Thu, 4 Feb 2021 10:42:08 -0800
Subject: [PATCH 3/3] [Squash] nit

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 lib/fs.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/fs.js b/lib/fs.js
index 9812fef0a7ebe3..38f9b7c74554ed 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -444,7 +444,8 @@ function defaultCloseCallback(err) {
 
 function close(fd, callback = defaultCloseCallback) {
   validateInt32(fd, 'fd', 0);
-  callback = makeCallback(callback);
+  if (callback !== defaultCloseCallback)
+    callback = makeCallback(callback);
 
   const req = new FSReqCallback();
   req.oncomplete = callback;