Skip to content

Commit cefce4c

Browse files
gurgundayruyadorno
authored andcommitted
lib: remove unnecessary optional chaining
PR-URL: #55728 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: LiviaMedeiros <livia@cirno.name> Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 948a88d commit cefce4c

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

lib/events.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -969,10 +969,10 @@ function getMaxListeners(emitterOrTarget) {
969969
*/
970970
async function once(emitter, name, options = kEmptyObject) {
971971
validateObject(options, 'options');
972-
const signal = options?.signal;
972+
const { signal } = options;
973973
validateAbortSignal(signal, 'options.signal');
974974
if (signal?.aborted)
975-
throw new AbortError(undefined, { cause: signal?.reason });
975+
throw new AbortError(undefined, { cause: signal.reason });
976976
return new Promise((resolve, reject) => {
977977
const errorListener = (err) => {
978978
emitter.removeListener(name, resolver);
@@ -1060,7 +1060,7 @@ function on(emitter, event, options = kEmptyObject) {
10601060
const signal = options.signal;
10611061
validateAbortSignal(signal, 'options.signal');
10621062
if (signal?.aborted)
1063-
throw new AbortError(undefined, { cause: signal?.reason });
1063+
throw new AbortError(undefined, { cause: signal.reason });
10641064
// Support both highWaterMark and highWatermark for backward compatibility
10651065
const highWatermark = options.highWaterMark ?? options.highWatermark ?? NumberMAX_SAFE_INTEGER;
10661066
validateInteger(highWatermark, 'options.highWaterMark', 1);

lib/fs.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ function readFileAfterStat(err, stats) {
339339

340340
function checkAborted(signal, callback) {
341341
if (signal?.aborted) {
342-
callback(new AbortError(undefined, { cause: signal?.reason }));
342+
callback(new AbortError(undefined, { cause: signal.reason }));
343343
return true;
344344
}
345345
return false;
@@ -2203,7 +2203,7 @@ function lutimesSync(path, atime, mtime) {
22032203

22042204
function writeAll(fd, isUserFd, buffer, offset, length, signal, flush, callback) {
22052205
if (signal?.aborted) {
2206-
const abortError = new AbortError(undefined, { cause: signal?.reason });
2206+
const abortError = new AbortError(undefined, { cause: signal.reason });
22072207
if (isUserFd) {
22082208
callback(abortError);
22092209
} else {

lib/internal/fs/promises.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ async function fsCall(fn, handle, ...args) {
470470

471471
function checkAborted(signal) {
472472
if (signal?.aborted)
473-
throw new AbortError(undefined, { cause: signal?.reason });
473+
throw new AbortError(undefined, { cause: signal.reason });
474474
}
475475

476476
async function writeFileHandle(filehandle, data, signal, encoding) {

lib/internal/fs/read/context.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class ReadFileContext {
8989

9090
if (this.signal?.aborted) {
9191
return this.close(
92-
new AbortError(undefined, { cause: this.signal?.reason }));
92+
new AbortError(undefined, { cause: this.signal.reason }));
9393
}
9494
if (this.size === 0) {
9595
buffer = Buffer.allocUnsafeSlow(kReadFileUnknownBufferLength);

lib/internal/fs/watchers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ async function* watch(filename, options = kEmptyObject) {
322322
}
323323

324324
if (signal?.aborted)
325-
throw new AbortError(undefined, { cause: signal?.reason });
325+
throw new AbortError(undefined, { cause: signal.reason });
326326

327327
const handle = new FSEvent();
328328
let { promise, resolve, reject } = createDeferredPromise();

lib/timers/promises.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ async function* setInterval(after, value, options = kEmptyObject) {
147147
const { signal, ref = true } = options;
148148

149149
if (signal?.aborted) {
150-
throw new AbortError(undefined, { cause: signal?.reason });
150+
throw new AbortError(undefined, { cause: signal.reason });
151151
}
152152

153153
let onCancel;

0 commit comments

Comments
 (0)