refactor(http): prepare for noUncheckedIndexedAccess

http/_negotiation/encoding.ts

@@ -52,7 +52,7 @@ function parseEncoding(
     const params = match[2].split(";");
     for (const param of params) {
       const p = param.trim().split("=");
-      if (p[0] === "q") {
+      if (p[0] === "q" && p[1]) {
         q = parseFloat(p[1]);
         break;
       }
@@ -91,8 +91,8 @@ function parseAcceptEncoding(accept: string): EncodingSpecificity[] {
   let hasIdentity = false;
   let minQuality = 1;
 
-  for (let i = 0; i < accepts.length; i++) {
-    const encoding = parseEncoding(accepts[i].trim(), i);
+  for (const [i, accept] of accepts.entries()) {
+    const encoding = parseEncoding(accept.trim(), i);
 
     if (encoding) {
       parsedAccepts.push(encoding);
@@ -158,5 +158,5 @@ export function preferredEncodings(
   return priorities
     .filter(isQuality)
     .sort(compareSpecs)
-    .map((priority) => provided[priorities.indexOf(priority)]);
+    .map((priority) => provided[priorities.indexOf(priority)]!);
 }

http/_negotiation/language.ts

@@ -49,14 +49,18 @@
   }
 
   const [, prefix, suffix] = match;
+  if (!prefix) {
+    return undefined;
+  }
+
   const full = suffix ? `${prefix}-${suffix}` : prefix;
 
   let q = 1;
   if (match[3]) {
     const params = match[3].split(";");
     for (const param of params) {
       const [key, value] = param.trim().split("=");
-      if (key === "q") {
+      if (key === "q" && value) {
         q = parseFloat(value);
         break;
       }
@@ -70,8 +74,8 @@
   const accepts = accept.split(",");
   const result: LanguageSpecificity[] = [];
 
-  for (let i = 0; i < accepts.length; i++) {
-    const language = parseLanguage(accepts[i].trim(), i);
+  for (const [i, accept] of accepts.entries()) {
+    const language = parseLanguage(accept.trim(), i);
     if (language) {
       result.push(language);
     }
@@ -140,5 +144,5 @@
   return priorities
     .filter(isQuality)
     .sort(compareSpecs)
-    .map((priority) => provided[priorities.indexOf(priority)]);
+    .map((priority) => provided[priorities.indexOf(priority)]!);
 }

http/_negotiation/media_type.ts

@@ -39,55 +39,9 @@
 
 const simpleMediaTypeRegExp = /^\s*([^\s\/;]+)\/([^;\s]+)\s*(?:;(.*))?$/;
 
-function quoteCount(str: string): number {
-  let count = 0;
-  let index = 0;
-
-  while ((index = str.indexOf(`"`, index)) !== -1) {
-    count++;
-    index++;
-  }
-
-  return count;
-}
-
-function splitMediaTypes(accept: string): string[] {
-  const accepts = accept.split(",");
-
-  let j = 0;
-  for (let i = 1; i < accepts.length; i++) {
-    if (quoteCount(accepts[j]) % 2 === 0) {
-      accepts[++j] = accepts[i];
-    } else {
-      accepts[j] += `,${accepts[i]}`;
-    }
-  }
-
-  accepts.length = j + 1;
-
-  return accepts;
-}
-
-function splitParameters(str: string): string[] {
-  const parameters = str.split(";");
-
-  let j = 0;
-  for (let i = 1; i < parameters.length; i++) {
-    if (quoteCount(parameters[j]) % 2 === 0) {
-      parameters[++j] = parameters[i];
-    } else {
-      parameters[j] += `;${parameters[i]}`;
-    }
-  }
-
-  parameters.length = j + 1;
-
-  return parameters.map((p) => p.trim());
-}
-
 function splitKeyValuePair(str: string): [string, string | undefined] {
   const [key, value] = str.split("=");
-  return [key.toLowerCase(), value];
+  return [key!.toLowerCase(), value];
 }
 
 function parseMediaType(
@@ -100,12 +54,17 @@
     return;
   }
 
-  const params: { [param: string]: string | undefined } = Object.create(null);
-  let q = 1;
   const [, type, subtype, parameters] = match;
+  if (!type || !subtype) {
+    return;
+  }
 
+  const params: { [param: string]: string | undefined } = Object.create(null);
+  let q = 1;
   if (parameters) {
-    const kvps = splitParameters(parameters).map(splitKeyValuePair);
+    const kvps = parameters.split(";").map((p) => p.trim()).map(
+      splitKeyValuePair,
+    );
 
     for (const [key, val] of kvps) {
       const value = val && val[0] === `"` && val[val.length - 1] === `"`
@@ -125,11 +84,11 @@
 }
 
 function parseAccept(accept: string): MediaTypeSpecificity[] {
-  const accepts = splitMediaTypes(accept);
+  const accepts = accept.split(",").map((p) => p.trim());
 
   const mediaTypes: MediaTypeSpecificity[] = [];
-  for (let i = 0; i < accepts.length; i++) {
-    const mediaType = parseMediaType(accepts[i].trim(), i);
+  for (const [index, accept] of accepts.entries()) {
+    const mediaType = parseMediaType(accept.trim(), index);
 
     if (mediaType) {
       mediaTypes.push(mediaType);
@@ -233,5 +192,5 @@
   return priorities
     .filter(isQuality)
     .sort(compareSpecs)
-    .map((priority) => provided[priorities.indexOf(priority)]);
+    .map((priority) => provided[priorities.indexOf(priority)]!);
 }

http/cookie.ts

@@ -293,8 +293,13 @@
     .split(";")
     .map((attr) => {
       const [key, ...values] = attr.trim().split("=");
-      return [key, values.join("=")];
+      return [key!, values.join("=")] as const;
     });
+
+  if (!attrs[0]) {
+    return null;
+  }
+
   const cookie: Cookie = {
     name: attrs[0][0],
     value: attrs[0][1],

http/file_server.ts

@@ -636,7 +636,7 @@ export async function serveDir(
   if (opts.headers && !isRedirectResponse) {
     for (const header of opts.headers) {
       const headerSplit = header.split(":");
-      const name = headerSplit[0];
+      const name = headerSplit[0]!;
       const value = headerSplit.slice(1).join(":");
       response.headers.append(name, value);
     }

http/server_test.ts

@@ -155,7 +155,7 @@ Deno.test(
 
     try {
       assertEquals(server.addrs.length, 3);
-      assertEquals(server.addrs[0].transport, "tcp");
+      assertEquals(server.addrs[0]!.transport, "tcp");
       assertEquals(
         (server.addrs[0] as Deno.NetAddr).hostname,
         listenerOneOptions.hostname,
@@ -164,7 +164,7 @@ Deno.test(
         (server.addrs[0] as Deno.NetAddr).port,
         listenerOneOptions.port,
       );
-      assertEquals(server.addrs[1].transport, "tcp");
+      assertEquals(server.addrs[1]!.transport, "tcp");
       assertEquals(
         (server.addrs[1] as Deno.NetAddr).hostname,
         listenerTwoOptions.hostname,
@@ -173,7 +173,7 @@ Deno.test(
         (server.addrs[1] as Deno.NetAddr).port,
         listenerTwoOptions.port,
       );
-      assertEquals(server.addrs[2].transport, "tcp");
+      assertEquals(server.addrs[2]!.transport, "tcp");
       assertEquals((server.addrs[2] as Deno.NetAddr).hostname, addrHostname);
       assertEquals((server.addrs[2] as Deno.NetAddr).port, addrPort);
     } finally {
@@ -973,14 +973,14 @@ Deno.test(
     // the expected backoff delay.
     for (let i = 0; i < rejectionCount; i++) {
       assertEquals(
-        listener.acceptCallIntervals[i] >= expectedBackoffDelays[i],
+        listener.acceptCallIntervals[i]! >= expectedBackoffDelays[i]!,
         true,
       );
     }
 
     // Assert that the backoff delay has been reset following successfully
     // accepting a connection, i.e. it doesn't remain at 1000ms.
-    assertEquals(listener.acceptCallIntervals[rejectionCount] < 1000, true);
+    assertEquals(listener.acceptCallIntervals[rejectionCount]! < 1000, true);
   },
 );
 

http/user_agent.ts

@@ -189,11 +189,11 @@ function mapper(
       if (!matchers[j]) {
         break;
       }
-      matches = matchers[j++].exec(ua);
+      matches = matchers[j++]!.exec(ua);
 
       if (matches) {
         for (const processor of processors) {
-          const match = matches[++k];
+          const match = matches[++k]!;
           if (Array.isArray(processor)) {
             if (processor.length === 2) {
               const [prop, value] = processor;