code cleaner

Author: mertcanaltin

lib/fs.js

@@ -1630,47 +1630,46 @@ function lstat(path, options = { bigint: false }, callback) {
 function stat(path, options, callback) {
   if (typeof options === 'function') {
     callback = options;
-    options = kEmptyObject;
-  } else if (options === null || typeof options !== 'object') {
-    options = kEmptyObject;
-  } else {
-    options = getOptions(options, { __proto__: null, bigint: false, signal: undefined });
+    options = {};
   }
 
+  if (options === null || typeof options !== 'object') {
+    options = {};
+  }
+
+  options = {
+    bigint: false,
+    signal: undefined,
+    ...options
+  };
+
   if (typeof callback !== 'function') {
     throw new ERR_INVALID_ARG_TYPE('callback', 'Function', callback);
   }
 
-  const req = new FSReqCallback(options.bigint);
-
   if (options.signal?.aborted) {
-    const abortErr = new AbortError('The operation was aborted', { __proto__: null, cause: options.signal.reason });
-    return process.nextTick(() => callback(abortErr));
+    process.nextTick(() => {
+      callback(new AbortError(undefined, { cause: options.signal.reason }));
+    });
+    return;
   }
 
-  let aborted = false;
-  const onAbort = () => {
-    aborted = true;
-    callback(new AbortError(undefined, { __proto__: null, cause: options.signal.reason }));
-  };
+  const req = new FSReqCallback(options.bigint, callback);
 
   if (options.signal) {
-    options.signal.addEventListener('abort', onAbort, { __proto__: null, once: true });
-  }
-
-  // TODO(mertcanaltin): Refactor callback handling to avoid double-wrapping and redundant validations.
-  // The current implementation validates and wraps the callback twice in the happy path; optimize when possible.
-  req.oncomplete = (err, stats) => {
-    if (options.signal) {
-      options.signal.removeEventListener('abort', onAbort);
-    }
-
-    if (aborted) return;
+    const onAbort = () => {
+      req.close();
+      callback(new AbortError(undefined, { cause: options.signal.reason }));
+    };
 
-    const wrappedCallback = makeStatsCallback(callback);
+    options.signal.addEventListener('abort', onAbort, { once: true });
 
-    wrappedCallback(err, stats);
-  };
+    const originalCallback = req.callback;
+    req.callback = (err, stats) => {
+      options.signal.removeEventListener('abort', onAbort);
+      originalCallback(err, stats);
+    };
+  }
 
   binding.stat(getValidatedPath(path), options.bigint, req);
 }