fixup! lib: disable REPL completion on proxies and getters

improve solution and use ObjectGetOwnPropertyDescriptor primordial

Author: dario-piotrowicz

lib/repl.js

@@ -96,6 +96,10 @@ const {
   globalThis,
 } = primordials;
 
+const {
+  isProxy,
+} = require('internal/util/types');
+
 const { BuiltinModule } = require('internal/bootstrap/realm');
 const {
   makeRequireFunction,
@@ -1640,29 +1644,28 @@ async function includesProxiesOrGetters(fullExpr, evalFn, context) {
   let currentExpr = '';
   for (let i = 0; i < bits.length - 1; i++) {
     currentExpr += `${i === 0 ? '' : '.'}${bits[i]}`;
-    const currentExprIsObject = await evalPromisified(`try { ${currentExpr} !== null && typeof ${currentExpr} === 'object' } catch { false }`);
-    if (!currentExprIsObject) {
-      return false;
-    }
+    const currentResult = await new Promise((resolve) =>
+      evalFn(`try { ${currentExpr} } catch { }`, context, getREPLResourceName(), (_, currentObj) => {
+        if (typeof currentObj !== 'object' || currentObj === null) {
+          return resolve(false);
+        }
 
-    const currentExprIsProxy = await evalPromisified(`require("node:util/types").isProxy(${currentExpr})`);
-    if (currentExprIsProxy) {
-      return true;
-    }
+        if (isProxy(currentObj)) {
+          return resolve(true);
+        }
 
-    const typeOfNextBitGet = await evalPromisified(`typeof Object.getOwnPropertyDescriptor(${currentExpr}, '${bits[i + 1]}')?.get`);
-    const nextBitHasGetter = typeOfNextBitGet === 'function';
-    if (nextBitHasGetter) {
-      return true;
-    }
-  }
+        const nextBitHasGetter = typeof ObjectGetOwnPropertyDescriptor(currentObj, bits[i + 1])?.get === 'function';
+        if (nextBitHasGetter) {
+          return resolve(true);
+        }
 
-  function evalPromisified(evalExpr) {
-    return new Promise((resolve, reject) =>
-      evalFn(evalExpr, context, getREPLResourceName(), (_, res) => {
-        resolve(res);
+        return resolve();
       }));
+    if (currentResult !== undefined) {
+      return currentResult;
+    }
   }
+  return false;
 }
 
 REPLServer.prototype.completeOnEditorMode = (callback) => (err, results) => {