diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2024-01-26 23:19:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-26 23:19:00 +0100 |
commit | 6109717c4a4d8139fdbf7165aac3bff2722e16d2 (patch) | |
tree | ed87d3b3daedceb759b5bf376ecd77ae9cc5a35c | |
parent | 942fb5e0388eab02f98c02541a3f90053afd59d1 (diff) |
refactor: make 'rid' properties non-enumerable (#22137)
Now these props will not show up when inspecting objects in console.
-rw-r--r-- | ext/fs/30_fs.js | 7 | ||||
-rw-r--r-- | ext/net/01_net.js | 25 | ||||
-rw-r--r-- | ext/net/02_tls.js | 13 |
3 files changed, 31 insertions, 14 deletions
diff --git a/ext/fs/30_fs.js b/ext/fs/30_fs.js index 35a9d304b..ea89feda1 100644 --- a/ext/fs/30_fs.js +++ b/ext/fs/30_fs.js @@ -83,6 +83,7 @@ const { Function, MathTrunc, ObjectEntries, + ObjectDefineProperty, ObjectPrototypeIsPrototypeOf, ObjectValues, StringPrototypeSlice, @@ -656,14 +657,16 @@ function create(path) { } class FsFile { - [internalRidSymbol] = 0; #rid = 0; #readable; #writable; constructor(rid, symbol) { - this[internalRidSymbol] = rid; + ObjectDefineProperty(this, internalRidSymbol, { + enumerable: false, + value: rid, + }); this.#rid = rid; if (!symbol || symbol !== SymbolFor("Deno.internal.FsFile")) { internals.warnOnDeprecatedApi( diff --git a/ext/net/01_net.js b/ext/net/01_net.js index 8dbf32625..9b13fcf26 100644 --- a/ext/net/01_net.js +++ b/ext/net/01_net.js @@ -34,6 +34,7 @@ const { Error, Number, ObjectPrototypeIsPrototypeOf, + ObjectDefineProperty, PromiseResolve, SafeSet, SetPrototypeAdd, @@ -91,7 +92,6 @@ async function resolveDns(query, recordType, options) { } class Conn { - [internalRidSymbol] = 0; #rid = 0; #remoteAddr = null; #localAddr = null; @@ -102,7 +102,10 @@ class Conn { #writable; constructor(rid, remoteAddr, localAddr) { - this[internalRidSymbol] = rid; + ObjectDefineProperty(this, internalRidSymbol, { + enumerable: false, + value: rid, + }); this.#rid = rid; this.#remoteAddr = remoteAddr; this.#localAddr = localAddr; @@ -201,12 +204,14 @@ class Conn { } class TcpConn extends Conn { - [internalRidSymbol] = 0; #rid = 0; constructor(rid, remoteAddr, localAddr) { super(rid, remoteAddr, localAddr); - this[internalRidSymbol] = rid; + ObjectDefineProperty(this, internalRidSymbol, { + enumerable: false, + value: rid, + }); this.#rid = rid; } @@ -229,12 +234,14 @@ class TcpConn extends Conn { } class UnixConn extends Conn { - [internalRidSymbol] = 0; #rid = 0; constructor(rid, remoteAddr, localAddr) { super(rid, remoteAddr, localAddr); - this[internalRidSymbol] = rid; + ObjectDefineProperty(this, internalRidSymbol, { + enumerable: false, + value: rid, + }); this.#rid = rid; } @@ -249,14 +256,16 @@ class UnixConn extends Conn { } class Listener { - [internalRidSymbol] = 0; #rid = 0; #addr = null; #unref = false; #promise = null; constructor(rid, addr) { - this[internalRidSymbol] = rid; + ObjectDefineProperty(this, internalRidSymbol, { + enumerable: false, + value: rid, + }); this.#rid = rid; this.#addr = addr; } diff --git a/ext/net/02_tls.js b/ext/net/02_tls.js index 17d5240fb..f670f0360 100644 --- a/ext/net/02_tls.js +++ b/ext/net/02_tls.js @@ -11,6 +11,7 @@ const { } = core.ensureFastOps(); const { Number, + ObjectDefineProperty, TypeError, } = primordials; @@ -25,12 +26,14 @@ function opTlsHandshake(rid) { } class TlsConn extends Conn { - [internalRidSymbol] = 0; #rid = 0; constructor(rid, remoteAddr, localAddr) { super(rid, remoteAddr, localAddr); - this[internalRidSymbol] = rid; + ObjectDefineProperty(this, internalRidSymbol, { + enumerable: false, + value: rid, + }); this.#rid = rid; } @@ -78,12 +81,14 @@ async function connectTls({ } class TlsListener extends Listener { - [internalRidSymbol] = 0; #rid = 0; constructor(rid, addr) { super(rid, addr); - this[internalRidSymbol] = rid; + ObjectDefineProperty(this, internalRidSymbol, { + enumerable: false, + value: rid, + }); this.#rid = rid; } |