undici 6.20.0 → 7.0.0-alpha.2

package/lib/web/fetch/constants.js

@@ -1,27 +1,30 @@
 'use strict'
 
-const corsSafeListedMethods = ['GET', 'HEAD', 'POST']
+const corsSafeListedMethods = /** @type {const} */ (['GET', 'HEAD', 'POST'])
 const corsSafeListedMethodsSet = new Set(corsSafeListedMethods)
 
-const nullBodyStatus = [101, 204, 205, 304]
+const nullBodyStatus = /** @type {const} */ ([101, 204, 205, 304])
 
-const redirectStatus = [301, 302, 303, 307, 308]
+const redirectStatus = /** @type {const} */ ([301, 302, 303, 307, 308])
 const redirectStatusSet = new Set(redirectStatus)
 
-// https://fetch.spec.whatwg.org/#block-bad-port
-const badPorts = [
+/**
+ * @see https://fetch.spec.whatwg.org/#block-bad-port
+ */
+const badPorts = /** @type {const} */ ([
   '1', '7', '9', '11', '13', '15', '17', '19', '20', '21', '22', '23', '25', '37', '42', '43', '53', '69', '77', '79',
   '87', '95', '101', '102', '103', '104', '109', '110', '111', '113', '115', '117', '119', '123', '135', '137',
   '139', '143', '161', '179', '389', '427', '465', '512', '513', '514', '515', '526', '530', '531', '532',
   '540', '548', '554', '556', '563', '587', '601', '636', '989', '990', '993', '995', '1719', '1720', '1723',
   '2049', '3659', '4045', '4190', '5060', '5061', '6000', '6566', '6665', '6666', '6667', '6668', '6669', '6679',
   '6697', '10080'
-]
-
+])
 const badPortsSet = new Set(badPorts)
 
-// https://w3c.github.io/webappsec-referrer-policy/#referrer-policies
-const referrerPolicy = [
+/**
+ * @see https://w3c.github.io/webappsec-referrer-policy/#referrer-policies
+ */
+const referrerPolicy = /** @type {const} */ ([
   '',
   'no-referrer',
   'no-referrer-when-downgrade',
@@ -31,29 +34,31 @@ const referrerPolicy = [
   'origin-when-cross-origin',
   'strict-origin-when-cross-origin',
   'unsafe-url'
-]
+])
 const referrerPolicySet = new Set(referrerPolicy)
 
-const requestRedirect = ['follow', 'manual', 'error']
+const requestRedirect = /** @type {const} */ (['follow', 'manual', 'error'])
 
-const safeMethods = ['GET', 'HEAD', 'OPTIONS', 'TRACE']
+const safeMethods = /** @type {const} */ (['GET', 'HEAD', 'OPTIONS', 'TRACE'])
 const safeMethodsSet = new Set(safeMethods)
 
-const requestMode = ['navigate', 'same-origin', 'no-cors', 'cors']
+const requestMode = /** @type {const} */ (['navigate', 'same-origin', 'no-cors', 'cors'])
 
-const requestCredentials = ['omit', 'same-origin', 'include']
+const requestCredentials = /** @type {const} */ (['omit', 'same-origin', 'include'])
 
-const requestCache = [
+const requestCache = /** @type {const} */ ([
   'default',
   'no-store',
   'reload',
   'no-cache',
   'force-cache',
   'only-if-cached'
-]
+])
 
-// https://fetch.spec.whatwg.org/#request-body-header-name
-const requestBodyHeader = [
+/**
+ * @see https://fetch.spec.whatwg.org/#request-body-header-name
+ */
+const requestBodyHeader = /** @type {const} */ ([
   'content-encoding',
   'content-language',
   'content-location',
@@ -63,18 +68,22 @@ const requestBodyHeader = [
   // removed in the Headers implementation. However, undici doesn't
   // filter out headers, so we add it here.
   'content-length'
-]
+])
 
-// https://fetch.spec.whatwg.org/#enumdef-requestduplex
-const requestDuplex = [
+/**
+ * @see https://fetch.spec.whatwg.org/#enumdef-requestduplex
+ */
+const requestDuplex = /** @type {const} */ ([
   'half'
-]
+])
 
-// http://fetch.spec.whatwg.org/#forbidden-method
-const forbiddenMethods = ['CONNECT', 'TRACE', 'TRACK']
+/**
+ * @see http://fetch.spec.whatwg.org/#forbidden-method
+ */
+const forbiddenMethods = /** @type {const} */ (['CONNECT', 'TRACE', 'TRACK'])
 const forbiddenMethodsSet = new Set(forbiddenMethods)
 
-const subresource = [
+const subresource = /** @type {const} */ ([
   'audio',
   'audioworklet',
   'font',
@@ -87,7 +96,7 @@ const subresource = [
   'video',
   'xslt',
   ''
-]
+])
 const subresourceSet = new Set(subresource)
 
 module.exports = {

package/lib/web/fetch/data-url.js

@@ -431,7 +431,7 @@ function parseMIMEType (input) {
 /** @param {string} data */
 function forgivingBase64 (data) {
   // 1. Remove all ASCII whitespace from data.
-  data = data.replace(ASCII_WHITESPACE_REPLACE_REGEX, '')  // eslint-disable-line
+  data = data.replace(ASCII_WHITESPACE_REPLACE_REGEX, '')
 
   let dataLength = data.length
   // 2. If data’s code point length divides by 4 leaving

package/lib/web/fetch/formdata-parser.js

@@ -3,8 +3,8 @@
 const { isUSVString, bufferToLowerCasedHeaderName } = require('../../core/util')
 const { utf8DecodeBytes } = require('./util')
 const { HTTP_TOKEN_CODEPOINTS, isomorphicDecode } = require('./data-url')
-const { isFileLike } = require('./file')
 const { makeEntry } = require('./formdata')
+const { webidl } = require('./webidl')
 const assert = require('node:assert')
 const { File: NodeFile } = require('node:buffer')
 
@@ -205,7 +205,7 @@ function multipartFormDataParser (input, mimeType) {
 
     // 5.12. Assert: name is a scalar value string and value is either a scalar value string or a File object.
     assert(isUSVString(name))
-    assert((typeof value === 'string' && isUSVString(value)) || isFileLike(value))
+    assert((typeof value === 'string' && isUSVString(value)) || webidl.is.File(value))
 
     // 5.13. Create an entry with name and value, and append it to entry list.
     entryList.push(makeEntry(name, value, filename))

package/lib/web/fetch/formdata.js

@@ -1,9 +1,7 @@
 'use strict'
 
-const { isBlobLike, iteratorMixin } = require('./util')
-const { kState } = require('./symbols')
+const { iteratorMixin } = require('./util')
 const { kEnumerableProperty } = require('../../core/util')
-const { FileLike, isFileLike } = require('./file')
 const { webidl } = require('./webidl')
 const { File: NativeFile } = require('node:buffer')
 const nodeUtil = require('node:util')
@@ -13,6 +11,8 @@ const File = globalThis.File ?? NativeFile
 
 // https://xhr.spec.whatwg.org/#formdata
 class FormData {
+  #state = []
+
   constructor (form) {
     if (form !== undefined) {
       throw webidl.errors.conversionFailed({
@@ -21,8 +21,6 @@ class FormData {
         types: ['undefined']
       })
     }
-
-    this[kState] = []
   }
 
   append (name, value, filename = undefined) {
@@ -31,28 +29,26 @@ class FormData {
     const prefix = 'FormData.append'
     webidl.argumentLengthCheck(arguments, 2, prefix)
 
-    if (arguments.length === 3 && !isBlobLike(value)) {
-      throw new TypeError(
-        "Failed to execute 'append' on 'FormData': parameter 2 is not of type 'Blob'"
-      )
+    name = webidl.converters.USVString(name)
+
+    if (arguments.length === 3 || webidl.is.Blob(value)) {
+      value = webidl.converters.Blob(value, prefix, 'value')
+
+      if (filename !== undefined) {
+        filename = webidl.converters.USVString(filename)
+      }
+    } else {
+      value = webidl.converters.USVString(value)
     }
 
     // 1. Let value be value if given; otherwise blobValue.
 
-    name = webidl.converters.USVString(name, prefix, 'name')
-    value = isBlobLike(value)
-      ? webidl.converters.Blob(value, prefix, 'value', { strict: false })
-      : webidl.converters.USVString(value, prefix, 'value')
-    filename = arguments.length === 3
-      ? webidl.converters.USVString(filename, prefix, 'filename')
-      : undefined
-
     // 2. Let entry be the result of creating an entry with
     // name, value, and filename if given.
     const entry = makeEntry(name, value, filename)
 
     // 3. Append entry to this’s entry list.
-    this[kState].push(entry)
+    this.#state.push(entry)
   }
 
   delete (name) {
@@ -61,11 +57,11 @@ class FormData {
     const prefix = 'FormData.delete'
     webidl.argumentLengthCheck(arguments, 1, prefix)
 
-    name = webidl.converters.USVString(name, prefix, 'name')
+    name = webidl.converters.USVString(name)
 
     // The delete(name) method steps are to remove all entries whose name
     // is name from this’s entry list.
-    this[kState] = this[kState].filter(entry => entry.name !== name)
+    this.#state = this.#state.filter(entry => entry.name !== name)
   }
 
   get (name) {
@@ -74,18 +70,18 @@ class FormData {
     const prefix = 'FormData.get'
     webidl.argumentLengthCheck(arguments, 1, prefix)
 
-    name = webidl.converters.USVString(name, prefix, 'name')
+    name = webidl.converters.USVString(name)
 
     // 1. If there is no entry whose name is name in this’s entry list,
     // then return null.
-    const idx = this[kState].findIndex((entry) => entry.name === name)
+    const idx = this.#state.findIndex((entry) => entry.name === name)
     if (idx === -1) {
       return null
     }
 
     // 2. Return the value of the first entry whose name is name from
     // this’s entry list.
-    return this[kState][idx].value
+    return this.#state[idx].value
   }
 
   getAll (name) {
@@ -94,13 +90,13 @@ class FormData {
     const prefix = 'FormData.getAll'
     webidl.argumentLengthCheck(arguments, 1, prefix)
 
-    name = webidl.converters.USVString(name, prefix, 'name')
+    name = webidl.converters.USVString(name)
 
     // 1. If there is no entry whose name is name in this’s entry list,
     // then return the empty list.
     // 2. Return the values of all entries whose name is name, in order,
     // from this’s entry list.
-    return this[kState]
+    return this.#state
       .filter((entry) => entry.name === name)
       .map((entry) => entry.value)
   }
@@ -111,11 +107,11 @@ class FormData {
     const prefix = 'FormData.has'
     webidl.argumentLengthCheck(arguments, 1, prefix)
 
-    name = webidl.converters.USVString(name, prefix, 'name')
+    name = webidl.converters.USVString(name)
 
     // The has(name) method steps are to return true if there is an entry
     // whose name is name in this’s entry list; otherwise false.
-    return this[kState].findIndex((entry) => entry.name === name) !== -1
+    return this.#state.findIndex((entry) => entry.name === name) !== -1
   }
 
   set (name, value, filename = undefined) {
@@ -124,10 +120,16 @@ class FormData {
     const prefix = 'FormData.set'
     webidl.argumentLengthCheck(arguments, 2, prefix)
 
-    if (arguments.length === 3 && !isBlobLike(value)) {
-      throw new TypeError(
-        "Failed to execute 'set' on 'FormData': parameter 2 is not of type 'Blob'"
-      )
+    name = webidl.converters.USVString(name)
+
+    if (arguments.length === 3 || webidl.is.Blob(value)) {
+      value = webidl.converters.Blob(value, prefix, 'value')
+
+      if (filename !== undefined) {
+        filename = webidl.converters.USVString(filename)
+      }
+    } else {
+      value = webidl.converters.USVString(value)
     }
 
     // The set(name, value) and set(name, blobValue, filename) method steps
@@ -135,35 +137,27 @@ class FormData {
 
     // 1. Let value be value if given; otherwise blobValue.
 
-    name = webidl.converters.USVString(name, prefix, 'name')
-    value = isBlobLike(value)
-      ? webidl.converters.Blob(value, prefix, 'name', { strict: false })
-      : webidl.converters.USVString(value, prefix, 'name')
-    filename = arguments.length === 3
-      ? webidl.converters.USVString(filename, prefix, 'name')
-      : undefined
-
     // 2. Let entry be the result of creating an entry with name, value, and
     // filename if given.
     const entry = makeEntry(name, value, filename)
 
     // 3. If there are entries in this’s entry list whose name is name, then
     // replace the first such entry with entry and remove the others.
-    const idx = this[kState].findIndex((entry) => entry.name === name)
+    const idx = this.#state.findIndex((entry) => entry.name === name)
     if (idx !== -1) {
-      this[kState] = [
-        ...this[kState].slice(0, idx),
+      this.#state = [
+        ...this.#state.slice(0, idx),
         entry,
-        ...this[kState].slice(idx + 1).filter((entry) => entry.name !== name)
+        ...this.#state.slice(idx + 1).filter((entry) => entry.name !== name)
       ]
     } else {
       // 4. Otherwise, append entry to this’s entry list.
-      this[kState].push(entry)
+      this.#state.push(entry)
     }
   }
 
   [nodeUtil.inspect.custom] (depth, options) {
-    const state = this[kState].reduce((a, b) => {
+    const state = this.#state.reduce((a, b) => {
       if (a[b.name]) {
         if (Array.isArray(a[b.name])) {
           a[b.name].push(b.value)
@@ -185,9 +179,28 @@ class FormData {
     // remove [Object null prototype]
     return `FormData ${output.slice(output.indexOf(']') + 2)}`
   }
+
+  /**
+   * @param {FormData} formData
+   */
+  static getFormDataState (formData) {
+    return formData.#state
+  }
+
+  /**
+   * @param {FormData} formData
+   * @param {any[]} newState
+   */
+  static setFormDataState (formData, newState) {
+    formData.#state = newState
+  }
 }
 
-iteratorMixin('FormData', FormData, kState, 'name', 'value')
+const { getFormDataState, setFormDataState } = FormData
+Reflect.deleteProperty(FormData, 'getFormDataState')
+Reflect.deleteProperty(FormData, 'setFormDataState')
+
+iteratorMixin('FormData', FormData, getFormDataState, 'name', 'value')
 
 Object.defineProperties(FormData.prototype, {
   append: kEnumerableProperty,
@@ -222,10 +235,8 @@ function makeEntry (name, value, filename) {
 
     // 1. If value is not a File object, then set value to a new File object,
     //    representing the same bytes, whose name attribute value is "blob"
-    if (!isFileLike(value)) {
-      value = value instanceof Blob
-        ? new File([value], 'blob', { type: value.type })
-        : new FileLike(value, 'blob', { type: value.type })
+    if (!webidl.is.File(value)) {
+      value = new File([value], 'blob', { type: value.type })
     }
 
     // 2. If filename is given, then set value to a new File object,
@@ -237,9 +248,7 @@ function makeEntry (name, value, filename) {
         lastModified: value.lastModified
       }
 
-      value = value instanceof NativeFile
-        ? new File([value], filename, options)
-        : new FileLike(value, filename, options)
+      value = new File([value], filename, options)
     }
   }
 
@@ -247,4 +256,6 @@ function makeEntry (name, value, filename) {
   return { name, value }
 }
 
-module.exports = { FormData, makeEntry }
+webidl.is.FormData = webidl.util.MakeTypeAssertion(FormData.prototype)
+
+module.exports = { FormData, makeEntry, setFormDataState }