diff options
Diffstat (limited to 'op_crates')
| -rw-r--r-- | op_crates/fetch/11_streams.js | 25 | ||||
| -rw-r--r-- | op_crates/web/01_event.js | 35 | ||||
| -rw-r--r-- | op_crates/web/11_url.js | 9 | ||||
| -rw-r--r-- | op_crates/web/12_location.js | 18 |
4 files changed, 29 insertions, 58 deletions
diff --git a/op_crates/fetch/11_streams.js b/op_crates/fetch/11_streams.js index af9cc321f..5ddb1902a 100644 --- a/op_crates/fetch/11_streams.js +++ b/op_crates/fetch/11_streams.js @@ -7,8 +7,6 @@ "use strict"; ((window) => { - const customInspect = Symbol.for("Deno.customInspect"); - class AssertionError extends Error { constructor(msg) { super(msg); @@ -3224,10 +3222,8 @@ return iterator; } - [customInspect]() { - return `${this.constructor.name} ${ - Deno.inspect({ locked: this.locked }) - }`; + [Symbol.for("Deno.customInspect")](inspect) { + return `${this.constructor.name} ${inspect({ locked: this.locked })}`; } } @@ -3308,8 +3304,8 @@ readableStreamReaderGenericRelease(this); } - [customInspect]() { - return `${this.constructor.name} { closed: ${String(this.closed)} }`; + [Symbol.for("Deno.customInspect")](inspect) { + return `${this.constructor.name} ${inspect({ closed: this.closed })}`; } } @@ -3597,12 +3593,9 @@ return this[_writable]; } - [customInspect]() { + [Symbol.for("Deno.customInspect")](inspect) { return `${this.constructor.name} ${ - Deno.inspect( - { readable: this.readable, writable: this.writable }, - { depth: 1 }, - ) + inspect({ readable: this.readable, writable: this.writable }) }`; } } @@ -3736,10 +3729,8 @@ return acquireWritableStreamDefaultWriter(this); } - [customInspect]() { - return `${this.constructor.name} ${ - Deno.inspect({ locked: this.locked }) - }`; + [Symbol.for("Deno.customInspect")](inspect) { + return `${this.constructor.name} ${inspect({ locked: this.locked })}`; } } diff --git a/op_crates/web/01_event.js b/op_crates/web/01_event.js index 3fd4841a8..91ae2ef68 100644 --- a/op_crates/web/01_event.js +++ b/op_crates/web/01_event.js @@ -143,8 +143,8 @@ }); } - [Symbol.for("Deno.customInspect")]() { - return buildCustomInspectOutput(this, EVENT_PROPS); + [Symbol.for("Deno.customInspect")](inspect) { + return buildCustomInspectOutput(this, EVENT_PROPS, inspect); } get bubbles() { @@ -387,14 +387,9 @@ } } - function buildCustomInspectOutput(obj, props) { - const inspectObj = {}; - - for (const prop of props) { - inspectObj[prop] = obj[prop]; - } - - return `${obj.constructor.name} ${Deno.inspect(inspectObj)}`; + function buildCustomInspectOutput(object, keys, inspect) { + const inspectObject = Object.fromEntries(keys.map((k) => [k, object[k]])); + return `${object.constructor.name} ${inspect(inspectObject)}`; } function defineEnumerableProps( @@ -1041,7 +1036,7 @@ return "ErrorEvent"; } - [Symbol.for("Deno.customInspect")]() { + [Symbol.for("Deno.customInspect")](inspect) { return buildCustomInspectOutput(this, [ ...EVENT_PROPS, "message", @@ -1049,7 +1044,7 @@ "lineno", "colno", "error", - ]); + ], inspect); } } @@ -1095,13 +1090,13 @@ this.#reason = reason; } - [Symbol.for("Deno.customInspect")]() { + [Symbol.for("Deno.customInspect")](inspect) { return buildCustomInspectOutput(this, [ ...EVENT_PROPS, "wasClean", "code", "reason", - ]); + ], inspect); } } @@ -1118,13 +1113,13 @@ this.lastEventId = eventInitDict?.lastEventId ?? ""; } - [Symbol.for("Deno.customInspect")]() { + [Symbol.for("Deno.customInspect")](inspect) { return buildCustomInspectOutput(this, [ ...EVENT_PROPS, "data", "origin", "lastEventId", - ]); + ], inspect); } } @@ -1146,11 +1141,11 @@ return "CustomEvent"; } - [Symbol.for("Deno.customInspect")]() { + [Symbol.for("Deno.customInspect")](inspect) { return buildCustomInspectOutput(this, [ ...EVENT_PROPS, "detail", - ]); + ], inspect); } } @@ -1169,13 +1164,13 @@ this.total = eventInitDict?.total ?? 0; } - [Symbol.for("Deno.customInspect")]() { + [Symbol.for("Deno.customInspect")](inspect) { return buildCustomInspectOutput(this, [ ...EVENT_PROPS, "lengthComputable", "loaded", "total", - ]); + ], inspect); } } diff --git a/op_crates/web/11_url.js b/op_crates/web/11_url.js index d5474727b..eac679549 100644 --- a/op_crates/web/11_url.js +++ b/op_crates/web/11_url.js @@ -522,7 +522,7 @@ class URL { #searchParams = null; - [Symbol.for("Deno.customInspect")]() { + [Symbol.for("Deno.customInspect")](inspect) { const object = { href: this.href, origin: this.origin, @@ -536,12 +536,7 @@ hash: this.hash, search: this.search, }; - if (typeof globalThis?.Deno?.inspect == "function") { - return `URL ${Deno.inspect(object)}`; - } - return `URL { ${ - Object.entries(object).map(([k, v]) => `${k}: ${v}`).join(", ") - } }`; + return `${this.constructor.name} ${inspect(object)}`; } #updateSearchParams = () => { diff --git a/op_crates/web/12_location.js b/op_crates/web/12_location.js index add2e0e38..6c99bc23a 100644 --- a/op_crates/web/12_location.js +++ b/op_crates/web/12_location.js @@ -166,7 +166,7 @@ enumerable: true, }, [Symbol.for("Deno.customInspect")]: { - value: function () { + value: function (inspect) { const object = { hash: this.hash, host: this.host, @@ -178,12 +178,7 @@ protocol: this.protocol, search: this.search, }; - if (typeof globalThis?.Deno?.inspect == "function") { - return `Location ${Deno.inspect(object)}`; - } - return `Location { ${ - Object.entries(object).map(([k, v]) => `${k}: ${v}`).join(", ") - } }`; + return `${this.constructor.name} ${inspect(object)}`; }, }, }); @@ -328,7 +323,7 @@ configurable: true, }, [Symbol.for("Deno.customInspect")]: { - value: function () { + value: function (inspect) { const object = { hash: this.hash, host: this.host, @@ -340,12 +335,7 @@ protocol: this.protocol, search: this.search, }; - if (typeof globalThis?.Deno?.inspect == "function") { - return `WorkerLocation ${Deno.inspect(object)}`; - } - return `WorkerLocation { ${ - Object.entries(object).map(([k, v]) => `${k}: ${v}`).join(", ") - } }`; + return `${this.constructor.name} ${inspect(object)}`; }, }, }); |