diff options
Diffstat (limited to 'ext/web')
-rw-r--r-- | ext/web/01_dom_exception.js | 18 | ||||
-rw-r--r-- | ext/web/02_event.js | 31 | ||||
-rw-r--r-- | ext/web/03_abort_signal.js | 11 | ||||
-rw-r--r-- | ext/web/05_base64.js | 10 | ||||
-rw-r--r-- | ext/web/06_streams.js | 157 | ||||
-rw-r--r-- | ext/web/08_text_encoding.js | 63 | ||||
-rw-r--r-- | ext/web/09_file.js | 58 | ||||
-rw-r--r-- | ext/web/10_filereader.js | 5 | ||||
-rw-r--r-- | ext/web/11_blob_url.js | 10 | ||||
-rw-r--r-- | ext/web/13_message_port.js | 16 | ||||
-rw-r--r-- | ext/web/14_compression.js | 20 | ||||
-rw-r--r-- | ext/web/15_performance.js | 103 |
12 files changed, 236 insertions, 266 deletions
diff --git a/ext/web/01_dom_exception.js b/ext/web/01_dom_exception.js index c465a06fd..31d2cdc29 100644 --- a/ext/web/01_dom_exception.js +++ b/ext/web/01_dom_exception.js @@ -94,14 +94,16 @@ class DOMException { // https://webidl.spec.whatwg.org/#dom-domexception-domexception constructor(message = "", name = "Error") { - message = webidl.converters.DOMString(message, { - prefix: "Failed to construct 'DOMException'", - context: "Argument 1", - }); - name = webidl.converters.DOMString(name, { - prefix: "Failed to construct 'DOMException'", - context: "Argument 2", - }); + message = webidl.converters.DOMString( + message, + "Failed to construct 'DOMException'", + "Argument 1", + ); + name = webidl.converters.DOMString( + name, + "Failed to construct 'DOMException'", + "Argument 2", + ); const code = nameToCodeMapping[name] ?? 0; this[_message] = message; diff --git a/ext/web/02_event.js b/ext/web/02_event.js index 0372293cf..e7553ea89 100644 --- a/ext/web/02_event.js +++ b/ext/web/02_event.js @@ -122,7 +122,7 @@ const isTrusted = ObjectGetOwnPropertyDescriptor({ }, }, "isTrusted").get; -const eventInitConverter = webidl.createDictionaryConverter("EventInit", [{ +webidl.converters.EventInit = webidl.createDictionaryConverter("EventInit", [{ key: "bubbles", defaultValue: false, converter: webidl.converters.boolean, @@ -167,14 +167,16 @@ class Event { 1, "Failed to construct 'Event'", ); - type = webidl.converters.DOMString(type, { - prefix: "Failed to construct 'Event'", - context: "Argument 1", - }); - const eventInit = eventInitConverter(eventInitDict, { - prefix: "Failed to construct 'Event'", - context: "Argument 2", - }); + type = webidl.converters.DOMString( + type, + "Failed to construct 'Event'", + "Argument 1", + ); + const eventInit = webidl.converters.EventInit( + eventInitDict, + "Failed to construct 'Event'", + "Argument 2", + ); this[_attributes] = { type, ...eventInit, @@ -947,13 +949,13 @@ function lazyAddEventListenerOptionsConverter() { ); } -webidl.converters.AddEventListenerOptions = (V, opts) => { +webidl.converters.AddEventListenerOptions = (V, prefix, context, opts) => { if (webidl.type(V) !== "Object" || V === null) { V = { capture: Boolean(V) }; } lazyAddEventListenerOptionsConverter(); - return addEventListenerOptionsConverter(V, opts); + return addEventListenerOptionsConverter(V, prefix, context, opts); }; class EventTarget { @@ -973,10 +975,11 @@ class EventTarget { webidl.requiredArguments(arguments.length, 2, prefix); - options = webidl.converters.AddEventListenerOptions(options, { + options = webidl.converters.AddEventListenerOptions( + options, prefix, - context: "Argument 3", - }); + "Argument 3", + ); if (callback === null) { return; diff --git a/ext/web/03_abort_signal.js b/ext/web/03_abort_signal.js index 2122d642e..8857eb550 100644 --- a/ext/web/03_abort_signal.js +++ b/ext/web/03_abort_signal.js @@ -46,9 +46,14 @@ class AbortSignal extends EventTarget { static timeout(millis) { const prefix = "Failed to call 'AbortSignal.timeout'"; webidl.requiredArguments(arguments.length, 1, prefix); - millis = webidl.converters["unsigned long long"](millis, { - enforceRange: true, - }); + millis = webidl.converters["unsigned long long"]( + millis, + prefix, + "Argument 1", + { + enforceRange: true, + }, + ); const signal = new AbortSignal(illegalConstructorKey); signal[timerId] = setTimeout( diff --git a/ext/web/05_base64.js b/ext/web/05_base64.js index 05dd1431c..3971b2e58 100644 --- a/ext/web/05_base64.js +++ b/ext/web/05_base64.js @@ -23,10 +23,7 @@ const { function atob(data) { const prefix = "Failed to execute 'atob'"; webidl.requiredArguments(arguments.length, 1, prefix); - data = webidl.converters.DOMString(data, { - prefix, - context: "Argument 1", - }); + data = webidl.converters.DOMString(data, prefix, "Argument 1"); try { return ops.op_base64_atob(data); } catch (e) { @@ -47,10 +44,7 @@ function atob(data) { function btoa(data) { const prefix = "Failed to execute 'btoa'"; webidl.requiredArguments(arguments.length, 1, prefix); - data = webidl.converters.DOMString(data, { - prefix, - context: "Argument 1", - }); + data = webidl.converters.DOMString(data, prefix, "Argument 1"); try { return ops.op_base64_btoa(data); } catch (e) { diff --git a/ext/web/06_streams.js b/ext/web/06_streams.js index c8a7b9c47..6d390308d 100644 --- a/ext/web/06_streams.js +++ b/ext/web/06_streams.js @@ -4666,10 +4666,7 @@ class ByteLengthQueuingStrategy { constructor(init) { const prefix = "Failed to construct 'ByteLengthQueuingStrategy'"; webidl.requiredArguments(arguments.length, 1, prefix); - init = webidl.converters.QueuingStrategyInit(init, { - prefix, - context: "Argument 1", - }); + init = webidl.converters.QueuingStrategyInit(init, prefix, "Argument 1"); this[webidl.brand] = webidl.brand; this[_globalObject] = globalThis; this[_highWaterMark] = init.highWaterMark; @@ -4723,10 +4720,7 @@ class CountQueuingStrategy { constructor(init) { const prefix = "Failed to construct 'CountQueuingStrategy'"; webidl.requiredArguments(arguments.length, 1, prefix); - init = webidl.converters.QueuingStrategyInit(init, { - prefix, - context: "Argument 1", - }); + init = webidl.converters.QueuingStrategyInit(init, prefix, "Argument 1"); this[webidl.brand] = webidl.brand; this[_globalObject] = globalThis; this[_highWaterMark] = init.highWaterMark; @@ -4803,18 +4797,20 @@ class ReadableStream { constructor(underlyingSource = undefined, strategy = undefined) { const prefix = "Failed to construct 'ReadableStream'"; if (underlyingSource !== undefined) { - underlyingSource = webidl.converters.object(underlyingSource, { + underlyingSource = webidl.converters.object( + underlyingSource, prefix, - context: "Argument 1", - }); + "Argument 1", + ); } else { underlyingSource = null; } if (strategy !== undefined) { - strategy = webidl.converters.QueuingStrategy(strategy, { + strategy = webidl.converters.QueuingStrategy( + strategy, prefix, - context: "Argument 2", - }); + "Argument 2", + ); } else { strategy = {}; } @@ -4823,7 +4819,8 @@ class ReadableStream { if (underlyingSource !== undefined) { underlyingSourceDict = webidl.converters.UnderlyingSource( underlyingSource, - { prefix, context: "underlyingSource" }, + prefix, + "underlyingSource", ); } initializeReadableStream(this); @@ -4890,10 +4887,11 @@ class ReadableStream { webidl.assertBranded(this, ReadableStreamPrototype); const prefix = "Failed to execute 'getReader' on 'ReadableStream'"; if (options !== undefined) { - options = webidl.converters.ReadableStreamGetReaderOptions(options, { + options = webidl.converters.ReadableStreamGetReaderOptions( + options, prefix, - context: "Argument 1", - }); + "Argument 1", + ); } else { options = {}; } @@ -4915,14 +4913,16 @@ class ReadableStream { webidl.assertBranded(this, ReadableStreamPrototype); const prefix = "Failed to execute 'pipeThrough' on 'ReadableStream'"; webidl.requiredArguments(arguments.length, 1, prefix); - transform = webidl.converters.ReadableWritablePair(transform, { + transform = webidl.converters.ReadableWritablePair( + transform, prefix, - context: "Argument 1", - }); - options = webidl.converters.StreamPipeOptions(options, { + "Argument 1", + ); + options = webidl.converters.StreamPipeOptions( + options, prefix, - context: "Argument 2", - }); + "Argument 2", + ); const { readable, writable } = transform; const { preventClose, preventAbort, preventCancel, signal } = options; if (isReadableStreamLocked(this)) { @@ -4953,14 +4953,16 @@ class ReadableStream { webidl.assertBranded(this, ReadableStreamPrototype); const prefix = "Failed to execute 'pipeTo' on 'ReadableStream'"; webidl.requiredArguments(arguments.length, 1, prefix); - destination = webidl.converters.WritableStream(destination, { + destination = webidl.converters.WritableStream( + destination, prefix, - context: "Argument 1", - }); - options = webidl.converters.StreamPipeOptions(options, { + "Argument 1", + ); + options = webidl.converters.StreamPipeOptions( + options, prefix, - context: "Argument 2", - }); + "Argument 2", + ); } catch (err) { return PromiseReject(err); } @@ -4999,10 +5001,11 @@ class ReadableStream { values(options = {}) { webidl.assertBranded(this, ReadableStreamPrototype); const prefix = "Failed to execute 'values' on 'ReadableStream'"; - options = webidl.converters.ReadableStreamIteratorOptions(options, { + options = webidl.converters.ReadableStreamIteratorOptions( + options, prefix, - context: "Argument 1", - }); + "Argument 1", + ); /** @type {AsyncIterableIterator<R>} */ const iterator = ObjectCreate(readableStreamAsyncIteratorPrototype); const reader = acquireReadableStreamDefaultReader(this); @@ -5044,10 +5047,7 @@ class ReadableStreamDefaultReader { constructor(stream) { const prefix = "Failed to construct 'ReadableStreamDefaultReader'"; webidl.requiredArguments(arguments.length, 1, prefix); - stream = webidl.converters.ReadableStream(stream, { - prefix, - context: "Argument 1", - }); + stream = webidl.converters.ReadableStream(stream, prefix, "Argument 1"); this[webidl.brand] = webidl.brand; setUpReadableStreamDefaultReader(this, stream); } @@ -5144,10 +5144,7 @@ class ReadableStreamBYOBReader { constructor(stream) { const prefix = "Failed to construct 'ReadableStreamBYOBReader'"; webidl.requiredArguments(arguments.length, 1, prefix); - stream = webidl.converters.ReadableStream(stream, { - prefix, - context: "Argument 1", - }); + stream = webidl.converters.ReadableStream(stream, prefix, "Argument 1"); this[webidl.brand] = webidl.brand; setUpReadableStreamBYOBReader(this, stream); } @@ -5160,10 +5157,7 @@ class ReadableStreamBYOBReader { try { webidl.assertBranded(this, ReadableStreamBYOBReaderPrototype); const prefix = "Failed to execute 'read' on 'ReadableStreamBYOBReader'"; - view = webidl.converters.ArrayBufferView(view, { - prefix, - context: "Argument 1", - }); + view = webidl.converters.ArrayBufferView(view, prefix, "Argument 1"); } catch (err) { return PromiseReject(err); } @@ -5286,11 +5280,14 @@ class ReadableStreamBYOBRequest { webidl.assertBranded(this, ReadableStreamBYOBRequestPrototype); const prefix = "Failed to execute 'respond' on 'ReadableStreamBYOBRequest'"; webidl.requiredArguments(arguments.length, 1, prefix); - bytesWritten = webidl.converters["unsigned long long"](bytesWritten, { - enforceRange: true, + bytesWritten = webidl.converters["unsigned long long"]( + bytesWritten, prefix, - context: "Argument 1", - }); + "Argument 1", + { + enforceRange: true, + }, + ); if (this[_controller] === undefined) { throw new TypeError("This BYOB request has been invalidated"); @@ -5319,10 +5316,7 @@ class ReadableStreamBYOBRequest { const prefix = "Failed to execute 'respondWithNewView' on 'ReadableStreamBYOBRequest'"; webidl.requiredArguments(arguments.length, 1, prefix); - view = webidl.converters.ArrayBufferView(view, { - prefix, - context: "Argument 1", - }); + view = webidl.converters.ArrayBufferView(view, prefix, "Argument 1"); if (this[_controller] === undefined) { throw new TypeError("This BYOB request has been invalidated"); @@ -5414,10 +5408,7 @@ class ReadableByteStreamController { "Failed to execute 'enqueue' on 'ReadableByteStreamController'"; webidl.requiredArguments(arguments.length, 1, prefix); const arg1 = "Argument 1"; - chunk = webidl.converters.ArrayBufferView(chunk, { - prefix, - context: arg1, - }); + chunk = webidl.converters.ArrayBufferView(chunk, prefix, arg1); let buffer, byteLength; if (TypedArrayPrototypeGetSymbolToStringTag(chunk) === undefined) { buffer = DataViewPrototypeGetBuffer(/** @type {DataView} */ (chunk)); @@ -5700,27 +5691,27 @@ class TransformStream { ) { const prefix = "Failed to construct 'TransformStream'"; if (transformer !== undefined) { - transformer = webidl.converters.object(transformer, { - prefix, - context: "Argument 1", - }); + transformer = webidl.converters.object(transformer, prefix, "Argument 1"); } - writableStrategy = webidl.converters.QueuingStrategy(writableStrategy, { + writableStrategy = webidl.converters.QueuingStrategy( + writableStrategy, prefix, - context: "Argument 2", - }); - readableStrategy = webidl.converters.QueuingStrategy(readableStrategy, { + "Argument 2", + ); + readableStrategy = webidl.converters.QueuingStrategy( + readableStrategy, prefix, - context: "Argument 2", - }); + "Argument 3", + ); this[webidl.brand] = webidl.brand; if (transformer === undefined) { transformer = null; } - const transformerDict = webidl.converters.Transformer(transformer, { + const transformerDict = webidl.converters.Transformer( + transformer, prefix, - context: "transformer", - }); + "transformer", + ); if (transformerDict.readableType !== undefined) { throw new RangeError( `${prefix}: readableType transformers not supported.`, @@ -5887,22 +5878,25 @@ class WritableStream { constructor(underlyingSink = undefined, strategy = {}) { const prefix = "Failed to construct 'WritableStream'"; if (underlyingSink !== undefined) { - underlyingSink = webidl.converters.object(underlyingSink, { + underlyingSink = webidl.converters.object( + underlyingSink, prefix, - context: "Argument 1", - }); + "Argument 1", + ); } - strategy = webidl.converters.QueuingStrategy(strategy, { + strategy = webidl.converters.QueuingStrategy( + strategy, prefix, - context: "Argument 2", - }); + "Argument 2", + ); this[webidl.brand] = webidl.brand; if (underlyingSink === undefined) { underlyingSink = null; } const underlyingSinkDict = webidl.converters.UnderlyingSink( underlyingSink, - { prefix, context: "underlyingSink" }, + prefix, + "underlyingSink", ); if (underlyingSinkDict.type != null) { throw new RangeError( @@ -6003,10 +5997,7 @@ class WritableStreamDefaultWriter { constructor(stream) { const prefix = "Failed to construct 'WritableStreamDefaultWriter'"; webidl.requiredArguments(arguments.length, 1, prefix); - stream = webidl.converters.WritableStream(stream, { - prefix, - context: "Argument 1", - }); + stream = webidl.converters.WritableStream(stream, prefix, "Argument 1"); this[webidl.brand] = webidl.brand; setUpWritableStreamDefaultWriter(this, stream); } @@ -6251,8 +6242,8 @@ webidl.converters.UnderlyingSource = webidl }, { key: "autoAllocateChunkSize", - converter: (V, opts) => - webidl.converters["unsigned long long"](V, { + converter: (V, prefix, context, opts) => + webidl.converters["unsigned long long"](V, prefix, context, { ...opts, enforceRange: true, }), diff --git a/ext/web/08_text_encoding.js b/ext/web/08_text_encoding.js index 2e19c3d1f..e7e535f90 100644 --- a/ext/web/08_text_encoding.js +++ b/ext/web/08_text_encoding.js @@ -53,14 +53,12 @@ class TextDecoder { */ constructor(label = "utf-8", options = {}) { const prefix = "Failed to construct 'TextDecoder'"; - label = webidl.converters.DOMString(label, { + label = webidl.converters.DOMString(label, prefix, "Argument 1"); + options = webidl.converters.TextDecoderOptions( + options, prefix, - context: "Argument 1", - }); - options = webidl.converters.TextDecoderOptions(options, { - prefix, - context: "Argument 2", - }); + "Argument 2", + ); const encoding = ops.op_encoding_normalize_label(label); this.#encoding = encoding; this.#fatal = options.fatal; @@ -95,18 +93,17 @@ class TextDecoder { webidl.assertBranded(this, TextDecoderPrototype); const prefix = "Failed to execute 'decode' on 'TextDecoder'"; if (input !== undefined) { - input = webidl.converters.BufferSource(input, { - prefix, - context: "Argument 1", + input = webidl.converters.BufferSource(input, prefix, "Argument 1", { allowShared: true, }); } let stream = false; if (options !== undefined) { - options = webidl.converters.TextDecodeOptions(options, { + options = webidl.converters.TextDecodeOptions( + options, prefix, - context: "Argument 2", - }); + "Argument 2", + ); stream = options.stream; } @@ -215,13 +212,13 @@ class TextEncoder { */ encode(input = "") { webidl.assertBranded(this, TextEncoderPrototype); - const prefix = "Failed to execute 'encode' on 'TextEncoder'"; // The WebIDL type of `input` is `USVString`, but `core.encode` already // converts lone surrogates to the replacement character. - input = webidl.converters.DOMString(input, { - prefix, - context: "Argument 1", - }); + input = webidl.converters.DOMString( + input, + "Failed to execute 'encode' on 'TextEncoder'", + "Argument 1", + ); return core.encode(input); } @@ -235,15 +232,15 @@ class TextEncoder { const prefix = "Failed to execute 'encodeInto' on 'TextEncoder'"; // The WebIDL type of `source` is `USVString`, but the ops bindings // already convert lone surrogates to the replacement character. - source = webidl.converters.DOMString(source, { + source = webidl.converters.DOMString(source, prefix, "Argument 1"); + destination = webidl.converters.Uint8Array( + destination, prefix, - context: "Argument 1", - }); - destination = webidl.converters.Uint8Array(destination, { - prefix, - context: "Argument 2", - allowShared: true, - }); + "Argument 2", + { + allowShared: true, + }, + ); ops.op_encoding_encode_into(source, destination, encodeIntoBuf); return { read: encodeIntoBuf[0], @@ -269,21 +266,19 @@ class TextDecoderStream { */ constructor(label = "utf-8", options = {}) { const prefix = "Failed to construct 'TextDecoderStream'"; - label = webidl.converters.DOMString(label, { + label = webidl.converters.DOMString(label, prefix, "Argument 1"); + options = webidl.converters.TextDecoderOptions( + options, prefix, - context: "Argument 1", - }); - options = webidl.converters.TextDecoderOptions(options, { - prefix, - context: "Argument 2", - }); + "Argument 2", + ); this.#decoder = new TextDecoder(label, options); this.#transform = new TransformStream({ // The transform and flush functions need access to TextDecoderStream's // `this`, so they are defined as functions rather than methods. transform: (chunk, controller) => { try { - chunk = webidl.converters.BufferSource(chunk, { + chunk = webidl.converters.BufferSource(chunk, prefix, "chunk", { allowShared: true, }); const decoded = this.#decoder.decode(chunk, { stream: true }); diff --git a/ext/web/09_file.js b/ext/web/09_file.js index 8f0072e05..a81176b38 100644 --- a/ext/web/09_file.js +++ b/ext/web/09_file.js @@ -218,14 +218,16 @@ class Blob { */ constructor(blobParts = [], options = {}) { const prefix = "Failed to construct 'Blob'"; - blobParts = webidl.converters["sequence<BlobPart>"](blobParts, { - context: "Argument 1", + blobParts = webidl.converters["sequence<BlobPart>"]( + blobParts, prefix, - }); - options = webidl.converters["BlobPropertyBag"](options, { - context: "Argument 2", + "Argument 1", + ); + options = webidl.converters["BlobPropertyBag"]( + options, prefix, - }); + "Argument 2", + ); this[webidl.brand] = webidl.brand; @@ -261,24 +263,21 @@ class Blob { webidl.assertBranded(this, BlobPrototype); const prefix = "Failed to execute 'slice' on 'Blob'"; if (start !== undefined) { - start = webidl.converters["long long"](start, { + start = webidl.converters["long long"](start, prefix, "Argument 1", { clamp: true, - context: "Argument 1", - prefix, }); } if (end !== undefined) { - end = webidl.converters["long long"](end, { + end = webidl.converters["long long"](end, prefix, "Argument 2", { clamp: true, - context: "Argument 2", - prefix, }); } if (contentType !== undefined) { - contentType = webidl.converters["DOMString"](contentType, { - context: "Argument 3", + contentType = webidl.converters["DOMString"]( + contentType, prefix, - }); + "Argument 3", + ); } // deno-lint-ignore no-this-alias @@ -430,27 +429,27 @@ webidl.converters["Blob"] = webidl.createInterfaceConverter( "Blob", Blob.prototype, ); -webidl.converters["BlobPart"] = (V, opts) => { +webidl.converters["BlobPart"] = (V, prefix, context, opts) => { // Union for ((ArrayBuffer or ArrayBufferView) or Blob or USVString) if (typeof V == "object") { if (ObjectPrototypeIsPrototypeOf(BlobPrototype, V)) { - return webidl.converters["Blob"](V, opts); + return webidl.converters["Blob"](V, prefix, context, opts); } if ( ObjectPrototypeIsPrototypeOf(ArrayBufferPrototype, V) || // deno-lint-ignore prefer-primordials ObjectPrototypeIsPrototypeOf(SharedArrayBuffer.prototype, V) ) { - return webidl.converters["ArrayBuffer"](V, opts); + return webidl.converters["ArrayBuffer"](V, prefix, context, opts); } if (ArrayBufferIsView(V)) { - return webidl.converters["ArrayBufferView"](V, opts); + return webidl.converters["ArrayBufferView"](V, prefix, context, opts); } } // BlobPart is passed to processBlobParts after conversion, which calls core.encode() // on the string. // core.encode() is equivalent to USVString normalization. - return webidl.converters["DOMString"](V, opts); + return webidl.converters["DOMString"](V, prefix, context, opts); }; webidl.converters["sequence<BlobPart>"] = webidl.createSequenceConverter( webidl.converters["BlobPart"], @@ -494,18 +493,17 @@ class File extends Blob { const prefix = "Failed to construct 'File'"; webidl.requiredArguments(arguments.length, 2, prefix); - fileBits = webidl.converters["sequence<BlobPart>"](fileBits, { - context: "Argument 1", - prefix, - }); - fileName = webidl.converters["USVString"](fileName, { - context: "Argument 2", + fileBits = webidl.converters["sequence<BlobPart>"]( + fileBits, prefix, - }); - options = webidl.converters["FilePropertyBag"](options, { - context: "Argument 3", + "Argument 1", + ); + fileName = webidl.converters["USVString"](fileName, prefix, "Argument 2"); + options = webidl.converters["FilePropertyBag"]( + options, prefix, - }); + "Argument 3", + ); super(fileBits, options); diff --git a/ext/web/10_filereader.js b/ext/web/10_filereader.js index 897ac7e93..fe5dbb915 100644 --- a/ext/web/10_filereader.js +++ b/ext/web/10_filereader.js @@ -383,10 +383,7 @@ class FileReader extends EventTarget { const prefix = "Failed to execute 'readAsText' on 'FileReader'"; webidl.requiredArguments(arguments.length, 1, prefix); if (encoding !== undefined) { - encoding = webidl.converters["DOMString"](encoding, { - prefix, - context: "Argument 2", - }); + encoding = webidl.converters["DOMString"](encoding, prefix, "Argument 2"); } // alias for readAsArrayBuffer this.#readOperation(blob, { kind: "Text", encoding }); diff --git a/ext/web/11_blob_url.js b/ext/web/11_blob_url.js index 7c4adf4e9..3ac240d90 100644 --- a/ext/web/11_blob_url.js +++ b/ext/web/11_blob_url.js @@ -24,10 +24,7 @@ import { URL } from "ext:deno_url/00_url.js"; function createObjectURL(blob) { const prefix = "Failed to execute 'createObjectURL' on 'URL'"; webidl.requiredArguments(arguments.length, 1, prefix); - blob = webidl.converters["Blob"](blob, { - context: "Argument 1", - prefix, - }); + blob = webidl.converters["Blob"](blob, prefix, "Argument 1"); return ops.op_blob_create_object_url(blob.type, getParts(blob)); } @@ -39,10 +36,7 @@ function createObjectURL(blob) { function revokeObjectURL(url) { const prefix = "Failed to execute 'revokeObjectURL' on 'URL'"; webidl.requiredArguments(arguments.length, 1, prefix); - url = webidl.converters["DOMString"](url, { - context: "Argument 1", - prefix, - }); + url = webidl.converters["DOMString"](url, prefix, "Argument 1"); ops.op_blob_revoke_object_url(url); } diff --git a/ext/web/13_message_port.js b/ext/web/13_message_port.js index 39820a52f..fdc678a4f 100644 --- a/ext/web/13_message_port.js +++ b/ext/web/13_message_port.js @@ -110,16 +110,15 @@ class MessagePort extends EventTarget { ) { const transfer = webidl.converters["sequence<object>"]( transferOrOptions, - { prefix, context: "Argument 2" }, + prefix, + "Argument 2", ); options = { transfer }; } else { options = webidl.converters.StructuredSerializeOptions( transferOrOptions, - { - prefix, - context: "Argument 2", - }, + prefix, + "Argument 2", ); } const { transfer } = options; @@ -330,10 +329,11 @@ webidl.converters.StructuredSerializeOptions = webidl function structuredClone(value, options) { const prefix = "Failed to execute 'structuredClone'"; webidl.requiredArguments(arguments.length, 1, prefix); - options = webidl.converters.StructuredSerializeOptions(options, { + options = webidl.converters.StructuredSerializeOptions( + options, prefix, - context: "Argument 2", - }); + "Argument 2", + ); const messageData = serializeJsMessageData(value, options.transfer); return deserializeJsMessageData(messageData)[0]; } diff --git a/ext/web/14_compression.js b/ext/web/14_compression.js index 1731b3bf3..2ba7746bd 100644 --- a/ext/web/14_compression.js +++ b/ext/web/14_compression.js @@ -29,19 +29,13 @@ class CompressionStream { constructor(format) { const prefix = "Failed to construct 'CompressionStream'"; webidl.requiredArguments(arguments.length, 1, prefix); - format = webidl.converters.CompressionFormat(format, { - prefix, - context: "Argument 1", - }); + format = webidl.converters.CompressionFormat(format, prefix, "Argument 1"); const rid = ops.op_compression_new(format, false); this.#transform = new TransformStream({ transform(chunk, controller) { - chunk = webidl.converters.BufferSource(chunk, { - prefix, - context: "chunk", - }); + chunk = webidl.converters.BufferSource(chunk, prefix, "chunk"); const output = ops.op_compression_write( rid, chunk, @@ -77,19 +71,13 @@ class DecompressionStream { constructor(format) { const prefix = "Failed to construct 'DecompressionStream'"; webidl.requiredArguments(arguments.length, 1, prefix); - format = webidl.converters.CompressionFormat(format, { - prefix, - context: "Argument 1", - }); + format = webidl.converters.CompressionFormat(format, prefix, "Argument 1"); const rid = ops.op_compression_new(format, true); this.#transform = new TransformStream({ transform(chunk, controller) { - chunk = webidl.converters.BufferSource(chunk, { - prefix, - context: "chunk", - }); + chunk = webidl.converters.BufferSource(chunk, prefix, "chunk"); const output = ops.op_compression_write( rid, chunk, diff --git a/ext/web/15_performance.js b/ext/web/15_performance.js index d494a5328..72f4d3a7e 100644 --- a/ext/web/15_performance.js +++ b/ext/web/15_performance.js @@ -41,11 +41,16 @@ webidl.converters["PerformanceMarkOptions"] = webidl ], ); -webidl.converters["DOMString or DOMHighResTimeStamp"] = (V, opts) => { +webidl.converters["DOMString or DOMHighResTimeStamp"] = ( + V, + prefix, + context, + opts, +) => { if (webidl.type(V) === "Number" && V !== null) { - return webidl.converters.DOMHighResTimeStamp(V, opts); + return webidl.converters.DOMHighResTimeStamp(V, prefix, context, opts); } - return webidl.converters.DOMString(V, opts); + return webidl.converters.DOMString(V, prefix, context, opts); }; webidl.converters["PerformanceMeasureOptions"] = webidl @@ -71,11 +76,21 @@ webidl.converters["PerformanceMeasureOptions"] = webidl ], ); -webidl.converters["DOMString or PerformanceMeasureOptions"] = (V, opts) => { +webidl.converters["DOMString or PerformanceMeasureOptions"] = ( + V, + prefix, + context, + opts, +) => { if (webidl.type(V) === "Object" && V !== null) { - return webidl.converters["PerformanceMeasureOptions"](V, opts); + return webidl.converters["PerformanceMeasureOptions"]( + V, + prefix, + context, + opts, + ); } - return webidl.converters.DOMString(V, opts); + return webidl.converters.DOMString(V, prefix, context, opts); }; function setTimeOrigin(origin) { @@ -221,15 +236,13 @@ class PerformanceMark extends PerformanceEntry { const prefix = "Failed to construct 'PerformanceMark'"; webidl.requiredArguments(arguments.length, 1, prefix); - name = webidl.converters.DOMString(name, { - prefix, - context: "Argument 1", - }); + name = webidl.converters.DOMString(name, prefix, "Argument 1"); - options = webidl.converters.PerformanceMarkOptions(options, { + options = webidl.converters.PerformanceMarkOptions( + options, prefix, - context: "Argument 2", - }); + "Argument 2", + ); const { detail = null, startTime = now() } = options; @@ -345,10 +358,11 @@ class Performance extends EventTarget { clearMarks(markName = undefined) { webidl.assertBranded(this, PerformancePrototype); if (markName !== undefined) { - markName = webidl.converters.DOMString(markName, { - prefix: "Failed to execute 'clearMarks' on 'Performance'", - context: "Argument 1", - }); + markName = webidl.converters.DOMString( + markName, + "Failed to execute 'clearMarks' on 'Performance'", + "Argument 1", + ); performanceEntries = ArrayPrototypeFilter( performanceEntries, @@ -365,10 +379,11 @@ class Performance extends EventTarget { clearMeasures(measureName = undefined) { webidl.assertBranded(this, PerformancePrototype); if (measureName !== undefined) { - measureName = webidl.converters.DOMString(measureName, { - prefix: "Failed to execute 'clearMeasures' on 'Performance'", - context: "Argument 1", - }); + measureName = webidl.converters.DOMString( + measureName, + "Failed to execute 'clearMeasures' on 'Performance'", + "Argument 1", + ); performanceEntries = ArrayPrototypeFilter( performanceEntries, @@ -396,16 +411,10 @@ class Performance extends EventTarget { const prefix = "Failed to execute 'getEntriesByName' on 'Performance'"; webidl.requiredArguments(arguments.length, 1, prefix); - name = webidl.converters.DOMString(name, { - prefix, - context: "Argument 1", - }); + name = webidl.converters.DOMString(name, prefix, "Argument 1"); if (type !== undefined) { - type = webidl.converters.DOMString(type, { - prefix, - context: "Argument 2", - }); + type = webidl.converters.DOMString(type, prefix, "Argument 2"); } return filterByNameType(name, type); @@ -416,10 +425,7 @@ class Performance extends EventTarget { const prefix = "Failed to execute 'getEntriesByName' on 'Performance'"; webidl.requiredArguments(arguments.length, 1, prefix); - type = webidl.converters.DOMString(type, { - prefix, - context: "Argument 1", - }); + type = webidl.converters.DOMString(type, prefix, "Argument 1"); return filterByNameType(undefined, type); } @@ -432,15 +438,13 @@ class Performance extends EventTarget { const prefix = "Failed to execute 'mark' on 'Performance'"; webidl.requiredArguments(arguments.length, 1, prefix); - markName = webidl.converters.DOMString(markName, { - prefix, - context: "Argument 1", - }); + markName = webidl.converters.DOMString(markName, prefix, "Argument 1"); - markOptions = webidl.converters.PerformanceMarkOptions(markOptions, { + markOptions = webidl.converters.PerformanceMarkOptions( + markOptions, prefix, - context: "Argument 2", - }); + "Argument 2", + ); // 3.1.1.1 If the global object is a Window object and markName uses the // same name as a read only attribute in the PerformanceTiming interface, @@ -460,22 +464,21 @@ class Performance extends EventTarget { const prefix = "Failed to execute 'measure' on 'Performance'"; webidl.requiredArguments(arguments.length, 1, prefix); - measureName = webidl.converters.DOMString(measureName, { + measureName = webidl.converters.DOMString( + measureName, prefix, - context: "Argument 1", - }); + "Argument 1", + ); startOrMeasureOptions = webidl.converters - ["DOMString or PerformanceMeasureOptions"](startOrMeasureOptions, { + ["DOMString or PerformanceMeasureOptions"]( + startOrMeasureOptions, prefix, - context: "Argument 2", - }); + "Argument 2", + ); if (endMark !== undefined) { - endMark = webidl.converters.DOMString(endMark, { - prefix, - context: "Argument 3", - }); + endMark = webidl.converters.DOMString(endMark, prefix, "Argument 3"); } if ( |