Skip to content

Commit cfe28b1

Browse files
gurgundayaduh95
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 e147935 commit cfe28b1

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
@@ -958,10 +958,10 @@ function getMaxListeners(emitterOrTarget) {
958958
*/
959959
async function once(emitter, name, options = kEmptyObject) {
960960
validateObject(options, 'options');
961-
const signal = options?.signal;
961+
const { signal } = options;
962962
validateAbortSignal(signal, 'options.signal');
963963
if (signal?.aborted)
964-
throw new AbortError(undefined, { cause: signal?.reason });
964+
throw new AbortError(undefined, { cause: signal.reason });
965965
return new Promise((resolve, reject) => {
966966
const errorListener = (err) => {
967967
emitter.removeListener(name, resolver);
@@ -1049,7 +1049,7 @@ function on(emitter, event, options = kEmptyObject) {
10491049
const signal = options.signal;
10501050
validateAbortSignal(signal, 'options.signal');
10511051
if (signal?.aborted)
1052-
throw new AbortError(undefined, { cause: signal?.reason });
1052+
throw new AbortError(undefined, { cause: signal.reason });
10531053
// Support both highWaterMark and highWatermark for backward compatibility
10541054
const highWatermark = options.highWaterMark ?? options.highWatermark ?? NumberMAX_SAFE_INTEGER;
10551055
validateInteger(highWatermark, 'options.highWaterMark', 1);

lib/fs.js

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

341341
function checkAborted(signal, callback) {
342342
if (signal?.aborted) {
343-
callback(new AbortError(undefined, { cause: signal?.reason }));
343+
callback(new AbortError(undefined, { cause: signal.reason }));
344344
return true;
345345
}
346346
return false;
@@ -2204,7 +2204,7 @@ function lutimesSync(path, atime, mtime) {
22042204

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

lib/internal/fs/promises.js

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

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

477477
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 } = PromiseWithResolvers();

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)