fetch(HeadersList): s/has/contains (#1775)

nodejs · Nov 17, 2022 · c4803cf · c4803cf
1 parent b041f9a
commit c4803cf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 21 deletions.
diff --git a/lib/fetch/headers.js b/lib/fetch/headers.js
@@ -140,11 +140,6 @@ class HeadersList {
     return this[kHeadersMap].get(name.toLowerCase()) ?? null
   }
 
-  has (name) {
-    name = name.toLowerCase()
-    return this[kHeadersMap].has(name)
-  }
-
   * [Symbol.iterator] () {
     for (const pair of this[kHeadersMap]) {
       yield pair

diff --git a/lib/fetch/index.js b/lib/fetch/index.js
@@ -475,7 +475,7 @@ function fetching ({
   }
 
   // 12. If request’s header list does not contain `Accept`, then:
-  if (!request.headersList.has('accept')) {
+  if (!request.headersList.contains('accept')) {
     // 1. Let value be `*/*`.
     const value = '*/*'
 
@@ -498,7 +498,7 @@ function fetching ({
   // 13. If request’s header list does not contain `Accept-Language`, then
   // user agents should append `Accept-Language`/an appropriate value to
   // request’s header list.
-  if (!request.headersList.has('accept-language')) {
+  if (!request.headersList.contains('accept-language')) {
     request.headersList.append('accept-language', '*')
   }
 
@@ -721,7 +721,7 @@ async function mainFetch (fetchParams, recursive = false) {
     response.type === 'opaque' &&
     internalResponse.status === 206 &&
     internalResponse.rangeRequested &&
-    !request.headers.has('range')
+    !request.headers.contains('range')
   ) {
     response = internalResponse = makeNetworkError()
   }
@@ -1336,7 +1336,7 @@ async function httpNetworkOrCacheFetch (
   //    14. If httpRequest’s header list does not contain `User-Agent`, then
   //    user agents should append `User-Agent`/default `User-Agent` value to
   //    httpRequest’s header list.
-  if (!httpRequest.headersList.has('user-agent')) {
+  if (!httpRequest.headersList.contains('user-agent')) {
     httpRequest.headersList.append('user-agent', 'undici')
   }
 
@@ -1346,11 +1346,11 @@ async function httpNetworkOrCacheFetch (
   //    httpRequest’s cache mode to "no-store".
   if (
     httpRequest.cache === 'default' &&
-    (httpRequest.headersList.has('if-modified-since') ||
-      httpRequest.headersList.has('if-none-match') ||
-      httpRequest.headersList.has('if-unmodified-since') ||
-      httpRequest.headersList.has('if-match') ||
-      httpRequest.headersList.has('if-range'))
+    (httpRequest.headersList.contains('if-modified-since') ||
+      httpRequest.headersList.contains('if-none-match') ||
+      httpRequest.headersList.contains('if-unmodified-since') ||
+      httpRequest.headersList.contains('if-match') ||
+      httpRequest.headersList.contains('if-range'))
   ) {
     httpRequest.cache = 'no-store'
   }
@@ -1362,7 +1362,7 @@ async function httpNetworkOrCacheFetch (
   if (
     httpRequest.cache === 'no-cache' &&
     !httpRequest.preventNoCacheCacheControlHeaderModification &&
-    !httpRequest.headersList.has('cache-control')
+    !httpRequest.headersList.contains('cache-control')
   ) {
     httpRequest.headersList.append('cache-control', 'max-age=0')
   }
@@ -1371,27 +1371,27 @@ async function httpNetworkOrCacheFetch (
   if (httpRequest.cache === 'no-store' || httpRequest.cache === 'reload') {
     // 1. If httpRequest’s header list does not contain `Pragma`, then append
     // `Pragma`/`no-cache` to httpRequest’s header list.
-    if (!httpRequest.headersList.has('pragma')) {
+    if (!httpRequest.headersList.contains('pragma')) {
       httpRequest.headersList.append('pragma', 'no-cache')
     }
 
     // 2. If httpRequest’s header list does not contain `Cache-Control`,
     // then append `Cache-Control`/`no-cache` to httpRequest’s header list.
-    if (!httpRequest.headersList.has('cache-control')) {
+    if (!httpRequest.headersList.contains('cache-control')) {
       httpRequest.headersList.append('cache-control', 'no-cache')
     }
   }
 
   //    18. If httpRequest’s header list contains `Range`, then append
   //    `Accept-Encoding`/`identity` to httpRequest’s header list.
-  if (httpRequest.headersList.has('range')) {
+  if (httpRequest.headersList.contains('range')) {
     httpRequest.headersList.append('accept-encoding', 'identity')
   }
 
   //    19. Modify httpRequest’s header list per HTTP. Do not append a given
   //    header if httpRequest’s header list contains that header’s name.
   //    TODO: https://github.com/whatwg/fetch/issues/1285#issuecomment-896560129
-  if (!httpRequest.headersList.has('accept-encoding')) {
+  if (!httpRequest.headersList.contains('accept-encoding')) {
     if (/^https:/.test(requestCurrentURL(httpRequest).protocol)) {
       httpRequest.headersList.append('accept-encoding', 'br, gzip, deflate')
     } else {
@@ -1480,7 +1480,7 @@ async function httpNetworkOrCacheFetch (
 
   // 12. If httpRequest’s header list contains `Range`, then set response’s
   // range-requested flag.
-  if (httpRequest.headersList.has('range')) {
+  if (httpRequest.headersList.contains('range')) {
     response.rangeRequested = true
   }
 

diff --git a/lib/fetch/response.js b/lib/fetch/response.js
@@ -487,7 +487,7 @@ function initializeResponse (response, init, body) {
 
     // 3. If body's type is non-null and response's header list does not contain
     //    `Content-Type`, then append (`Content-Type`, body's type) to response's header list.
-    if (body.type != null && !response[kState].headersList.has('Content-Type')) {
+    if (body.type != null && !response[kState].headersList.contains('Content-Type')) {
       response[kState].headersList.append('content-type', body.type)
     }
   }