lib: remove unnecessary optional chaining

gurgunday · aduh95 · commit cfe28b161a10 · 2024-11-16T18:00:38.000+01:00
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>
diff --git a/lib/events.js b/lib/events.js
@@ -958,10 +958,10 @@ function getMaxListeners(emitterOrTarget) {
  */
 async function once(emitter, name, options = kEmptyObject) {
   validateObject(options, 'options');
-  const signal = options?.signal;
+  const { signal } = options;
   validateAbortSignal(signal, 'options.signal');
   if (signal?.aborted)
-    throw new AbortError(undefined, { cause: signal?.reason });
+    throw new AbortError(undefined, { cause: signal.reason });
   return new Promise((resolve, reject) => {
     const errorListener = (err) => {
       emitter.removeListener(name, resolver);
@@ -1049,7 +1049,7 @@ function on(emitter, event, options = kEmptyObject) {
   const signal = options.signal;
   validateAbortSignal(signal, 'options.signal');
   if (signal?.aborted)
-    throw new AbortError(undefined, { cause: signal?.reason });
+    throw new AbortError(undefined, { cause: signal.reason });
   // Support both highWaterMark and highWatermark for backward compatibility
   const highWatermark = options.highWaterMark ?? options.highWatermark ?? NumberMAX_SAFE_INTEGER;
   validateInteger(highWatermark, 'options.highWaterMark', 1);
diff --git a/lib/fs.js b/lib/fs.js
@@ -340,7 +340,7 @@ function readFileAfterStat(err, stats) {
 
 function checkAborted(signal, callback) {
   if (signal?.aborted) {
-    callback(new AbortError(undefined, { cause: signal?.reason }));
+    callback(new AbortError(undefined, { cause: signal.reason }));
     return true;
   }
   return false;
@@ -2204,7 +2204,7 @@ function lutimesSync(path, atime, mtime) {
 
 function writeAll(fd, isUserFd, buffer, offset, length, signal, flush, callback) {
   if (signal?.aborted) {
-    const abortError = new AbortError(undefined, { cause: signal?.reason });
+    const abortError = new AbortError(undefined, { cause: signal.reason });
     if (isUserFd) {
       callback(abortError);
     } else {
diff --git a/lib/internal/fs/promises.js b/lib/internal/fs/promises.js
@@ -471,7 +471,7 @@ async function fsCall(fn, handle, ...args) {
 
 function checkAborted(signal) {
   if (signal?.aborted)
-    throw new AbortError(undefined, { cause: signal?.reason });
+    throw new AbortError(undefined, { cause: signal.reason });
 }
 
 async function writeFileHandle(filehandle, data, signal, encoding) {
diff --git a/lib/internal/fs/read/context.js b/lib/internal/fs/read/context.js
@@ -89,7 +89,7 @@ class ReadFileContext {
 
     if (this.signal?.aborted) {
       return this.close(
-        new AbortError(undefined, { cause: this.signal?.reason }));
+        new AbortError(undefined, { cause: this.signal.reason }));
     }
     if (this.size === 0) {
       buffer = Buffer.allocUnsafeSlow(kReadFileUnknownBufferLength);
diff --git a/lib/internal/fs/watchers.js b/lib/internal/fs/watchers.js
@@ -322,7 +322,7 @@ async function* watch(filename, options = kEmptyObject) {
   }
 
   if (signal?.aborted)
-    throw new AbortError(undefined, { cause: signal?.reason });
+    throw new AbortError(undefined, { cause: signal.reason });
 
   const handle = new FSEvent();
   let { promise, resolve, reject } = PromiseWithResolvers();
diff --git a/lib/timers/promises.js b/lib/timers/promises.js
@@ -147,7 +147,7 @@ async function* setInterval(after, value, options = kEmptyObject) {
   const { signal, ref = true } = options;
 
   if (signal?.aborted) {
-    throw new AbortError(undefined, { cause: signal?.reason });
+    throw new AbortError(undefined, { cause: signal.reason });
   }
 
   let onCancel;

Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ async function fsCall(fn, handle, ...args) {`
`471`	`471`
`472`	`472`	`function checkAborted(signal) {`
`473`	`473`	`if (signal?.aborted)`
`474`		`- throw new AbortError(undefined, { cause: signal?.reason });`
	`474`	`+ throw new AbortError(undefined, { cause: signal.reason });`
`475`	`475`	`}`
`476`	`476`
`477`	`477`	`async function writeFileHandle(filehandle, data, signal, encoding) {`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ class ReadFileContext {`
`89`	`89`
`90`	`90`	`if (this.signal?.aborted) {`
`91`	`91`	`return this.close(`
`92`		`- new AbortError(undefined, { cause: this.signal?.reason }));`
	`92`	`+ new AbortError(undefined, { cause: this.signal.reason }));`
`93`	`93`	`}`
`94`	`94`	`if (this.size === 0) {`
`95`	`95`	`buffer = Buffer.allocUnsafeSlow(kReadFileUnknownBufferLength);`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ async function* watch(filename, options = kEmptyObject) {`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`if (signal?.aborted)`
`325`		`- throw new AbortError(undefined, { cause: signal?.reason });`
	`325`	`+ throw new AbortError(undefined, { cause: signal.reason });`
`326`	`326`
`327`	`327`	`const handle = new FSEvent();`
`328`	`328`	`let { promise, resolve, reject } = PromiseWithResolvers();`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ async function* setInterval(after, value, options = kEmptyObject) {`
`147`	`147`	`const { signal, ref = true } = options;`
`148`	`148`
`149`	`149`	`if (signal?.aborted) {`
`150`		`- throw new AbortError(undefined, { cause: signal?.reason });`
	`150`	`+ throw new AbortError(undefined, { cause: signal.reason });`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`let onCancel;`