webidl: small changes (nodejs#1754)

crysmags · Feb 27, 2024 · 99fb8b7 · 99fb8b7
1 parent 6fbc57e
commit 99fb8b7
Show file tree

Hide file tree

Showing 10 changed files with 332 additions and 317 deletions.
diff --git a/lib/fetch/body.js b/lib/fetch/body.js
@@ -331,9 +331,7 @@ function bodyMixinMethods (instance) {
     },
 
     async formData () {
-      if (!(this instanceof instance)) {
-        throw new TypeError('Illegal invocation')
-      }
+      webidl.brandCheck(this, instance)
 
       throwIfAborted(this[kState])
 
@@ -435,7 +433,7 @@ function bodyMixinMethods (instance) {
         throwIfAborted(this[kState])
 
         // Otherwise, throw a TypeError.
-        webidl.errors.exception({
+        throw webidl.errors.exception({
           header: `${instance.name}.formData`,
           message: 'Could not parse content as FormData.'
         })
@@ -452,11 +450,8 @@ function mixinBody (prototype) {
 
 // https://fetch.spec.whatwg.org/#concept-body-consume-body
 async function specConsumeBody (object, type, instance) {
-  if (!(object instanceof instance)) {
-    throw new TypeError('Illegal invocation')
-  }
+  webidl.brandCheck(object, instance)
 
-  // TODO: why is this needed?
   throwIfAborted(object[kState])
 
   // 1. If object is unusable, then return a promise rejected

diff --git a/lib/fetch/file.js b/lib/fetch/file.js
@@ -76,25 +76,19 @@ class File extends Blob {
   }
 
   get name () {
-    if (!(this instanceof File)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, File)
 
     return this[kState].name
   }
 
   get lastModified () {
-    if (!(this instanceof File)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, File)
 
     return this[kState].lastModified
   }
 
   get type () {
-    if (!(this instanceof File)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, File)
 
     return this[kState].type
   }
@@ -149,65 +143,49 @@ class FileLike {
   }
 
   stream (...args) {
-    if (!(this instanceof FileLike)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FileLike)
 
     return this[kState].blobLike.stream(...args)
   }
 
   arrayBuffer (...args) {
-    if (!(this instanceof FileLike)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FileLike)
 
     return this[kState].blobLike.arrayBuffer(...args)
   }
 
   slice (...args) {
-    if (!(this instanceof FileLike)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FileLike)
 
     return this[kState].blobLike.slice(...args)
   }
 
   text (...args) {
-    if (!(this instanceof FileLike)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FileLike)
 
     return this[kState].blobLike.text(...args)
   }
 
   get size () {
-    if (!(this instanceof FileLike)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FileLike)
 
     return this[kState].blobLike.size
   }
 
   get type () {
-    if (!(this instanceof FileLike)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FileLike)
 
     return this[kState].blobLike.type
   }
 
   get name () {
-    if (!(this instanceof FileLike)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FileLike)
 
     return this[kState].name
   }
 
   get lastModified () {
-    if (!(this instanceof FileLike)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FileLike)
 
     return this[kState].lastModified
   }

diff --git a/lib/fetch/formdata.js b/lib/fetch/formdata.js
@@ -10,7 +10,7 @@ const { Blob } = require('buffer')
 class FormData {
   constructor (form) {
     if (form !== undefined) {
-      webidl.errors.conversionFailed({
+      throw webidl.errors.conversionFailed({
         prefix: 'FormData constructor',
         argument: 'Argument 1',
         types: ['undefined']
@@ -21,9 +21,7 @@ class FormData {
   }
 
   append (name, value, filename = undefined) {
-    if (!(this instanceof FormData)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FormData)
 
     if (arguments.length < 2) {
       throw new TypeError(
@@ -56,9 +54,7 @@ class FormData {
   }
 
   delete (name) {
-    if (!(this instanceof FormData)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FormData)
 
     if (arguments.length < 1) {
       throw new TypeError(
@@ -81,9 +77,7 @@ class FormData {
   }
 
   get (name) {
-    if (!(this instanceof FormData)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FormData)
 
     if (arguments.length < 1) {
       throw new TypeError(
@@ -106,9 +100,7 @@ class FormData {
   }
 
   getAll (name) {
-    if (!(this instanceof FormData)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FormData)
 
     if (arguments.length < 1) {
       throw new TypeError(
@@ -128,9 +120,7 @@ class FormData {
   }
 
   has (name) {
-    if (!(this instanceof FormData)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FormData)
 
     if (arguments.length < 1) {
       throw new TypeError(
@@ -146,9 +136,7 @@ class FormData {
   }
 
   set (name, value, filename = undefined) {
-    if (!(this instanceof FormData)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FormData)
 
     if (arguments.length < 2) {
       throw new TypeError(
@@ -195,9 +183,7 @@ class FormData {
   }
 
   entries () {
-    if (!(this instanceof FormData)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FormData)
 
     return makeIterator(
       () => this[kState].map(pair => [pair.name, pair.value]),
@@ -207,9 +193,7 @@ class FormData {
   }
 
   keys () {
-    if (!(this instanceof FormData)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FormData)
 
     return makeIterator(
       () => this[kState].map(pair => [pair.name, pair.value]),
@@ -219,9 +203,7 @@ class FormData {
   }
 
   values () {
-    if (!(this instanceof FormData)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FormData)
 
     return makeIterator(
       () => this[kState].map(pair => [pair.name, pair.value]),
@@ -235,9 +217,7 @@ class FormData {
    * @param {unknown} thisArg
    */
   forEach (callbackFn, thisArg = globalThis) {
-    if (!(this instanceof FormData)) {
-      throw new TypeError('Illegal invocation')
-    }
+    webidl.brandCheck(this, FormData)
 
     if (arguments.length < 1) {
       throw new TypeError(