effect-start 0.20.1 → 0.22.0

package/src/ContentNegotiation.ts

@@ -3,8 +3,6 @@
  * Based on {@link https://github.com/jshttp/negotiator}
  */
 
-import type * as Headers from "@effect/platform/Headers"
-
 interface ParsedSpec {
   value: string
   q: number
@@ -13,7 +11,7 @@ interface ParsedSpec {
   i: number
 }
 
-const simpleMediaTypeRegExp = /^\s*([^\s\/;]+)\/([^;\s]+)\s*(?:;(.*))?$/
+const simpleMediaTypeRegExp = /^\s*([^\s/;]+)\/([^;\s]+)\s*(?:;(.*))?$/
 const simpleLanguageRegExp = /^\s*([^\s\-;]+)(?:-([^\s;]+))?\s*(?:;(.*))?$/
 const simpleEncodingRegExp = /^\s*([^\s;]+)\s*(?:;(.*))?$/
 const simpleCharsetRegExp = /^\s*([^\s;]+)\s*(?:;(.*))?$/
@@ -26,9 +24,10 @@ function parseQuality(params: string | undefined): number {
   return isNaN(q) ? 1 : Math.min(Math.max(q, 0), 1)
 }
 
-function splitMediaTypeParams(
-  params: string,
-): { params: Record<string, string>; q: number } {
+function splitMediaTypeParams(params: string): {
+  params: Record<string, string>
+  q: number
+} {
   const result: Record<string, string> = {}
   let q = 1
 
@@ -41,7 +40,7 @@ function splitMediaTypeParams(
     const key = trimmed.slice(0, eqIndex).trim().toLowerCase()
     let value = trimmed.slice(eqIndex + 1).trim()
 
-    if (value.startsWith("\"") && value.endsWith("\"")) {
+    if (value.startsWith('"') && value.endsWith('"')) {
       value = value.slice(1, -1)
     }
 
@@ -57,17 +56,13 @@ function splitMediaTypeParams(
   return { params: result, q }
 }
 
-function parseAccept(
-  accept: string,
-): Array<
-  {
-    type: string
-    subtype: string
-    params: Record<string, string>
-    q: number
-    o: number
-  }
-> {
+function parseAccept(accept: string): Array<{
+  type: string
+  subtype: string
+  params: Record<string, string>
+  q: number
+  o: number
+}> {
   const specs: Array<{
     type: string
     subtype: string
@@ -86,9 +81,7 @@ function parseAccept(
 
     const type = match[1].toLowerCase()
     const subtype = match[2].toLowerCase()
-    const { params, q } = match[3]
-      ? splitMediaTypeParams(match[3])
-      : { params: {}, q: 1 }
+    const { params, q } = match[3] ? splitMediaTypeParams(match[3]) : { params: {}, q: 1 }
 
     if (q > 0) {
       specs.push({ type, subtype, params, q, o })
@@ -135,8 +128,7 @@ function specifyMediaType(
   if (specParams.length > 0) {
     if (
       specParams.every(
-        (key) =>
-          spec.params[key].toLowerCase() === (params[key] || "").toLowerCase(),
+        (key) => spec.params[key].toLowerCase() === (params[key] || "").toLowerCase(),
       )
     ) {
       s |= 1
@@ -150,15 +142,13 @@ function specifyMediaType(
 
 function getMediaTypePriority(
   mediaType: string,
-  accepted: Array<
-    {
-      type: string
-      subtype: string
-      params: Record<string, string>
-      q: number
-      o: number
-    }
-  >,
+  accepted: Array<{
+    type: string
+    subtype: string
+    params: Record<string, string>
+    q: number
+    o: number
+  }>,
   index: number,
 ): ParsedSpec {
   let best: { q: number; s: number; o: number } | null = null
@@ -170,18 +160,16 @@ function getMediaTypePriority(
 
   const type = match[1].toLowerCase()
   const subtype = match[2].toLowerCase()
-  const { params } = match[3]
-    ? splitMediaTypeParams(match[3])
-    : { params: {} }
+  const { params } = match[3] ? splitMediaTypeParams(match[3]) : { params: {} }
 
   for (const spec of accepted) {
     const result = specifyMediaType(type, subtype, params, spec)
     if (
-      result
-      && (best === null
-        || result.s > best.s
-        || (result.s === best.s && result.q > best.q)
-        || (result.s === best.s && result.q === best.q && result.o < best.o))
+      result &&
+      (best === null ||
+        result.s > best.s ||
+        (result.s === best.s && result.q > best.q) ||
+        (result.s === best.s && result.q === best.q && result.o < best.o))
     ) {
       best = result
     }
@@ -257,9 +245,12 @@ function specifyLanguage(
 
 function getLanguagePriority(
   language: string,
-  accepted: Array<
-    { prefix: string; suffix: string | undefined; q: number; o: number }
-  >,
+  accepted: Array<{
+    prefix: string
+    suffix: string | undefined
+    q: number
+    o: number
+  }>,
   index: number,
 ): ParsedSpec {
   let best: { q: number; s: number; o: number } | null = null
@@ -267,11 +258,11 @@ function getLanguagePriority(
   for (const spec of accepted) {
     const result = specifyLanguage(language, spec)
     if (
-      result
-      && (best === null
-        || result.s > best.s
-        || (result.s === best.s && result.q > best.q)
-        || (result.s === best.s && result.q === best.q && result.o < best.o))
+      result &&
+      (best === null ||
+        result.s > best.s ||
+        (result.s === best.s && result.q > best.q) ||
+        (result.s === best.s && result.q === best.q && result.o < best.o))
     ) {
       best = result
     }
@@ -286,9 +277,7 @@ function getLanguagePriority(
   }
 }
 
-function parseAcceptEncoding(
-  accept: string,
-): Array<{ encoding: string; q: number; o: number }> {
+function parseAcceptEncoding(accept: string): Array<{ encoding: string; q: number; o: number }> {
   const specs: Array<{ encoding: string; q: number; o: number }> = []
   const parts = accept.split(",")
   let hasIdentity = false
@@ -342,11 +331,11 @@ function getEncodingPriority(
   for (const spec of accepted) {
     const result = specifyEncoding(encoding, spec)
     if (
-      result
-      && (best === null
-        || result.s > best.s
-        || (result.s === best.s && result.q > best.q)
-        || (result.s === best.s && result.q === best.q && result.o < best.o))
+      result &&
+      (best === null ||
+        result.s > best.s ||
+        (result.s === best.s && result.q > best.q) ||
+        (result.s === best.s && result.q === best.q && result.o < best.o))
     ) {
       best = result
     }
@@ -361,9 +350,7 @@ function getEncodingPriority(
   }
 }
 
-function parseAcceptCharset(
-  accept: string,
-): Array<{ charset: string; q: number; o: number }> {
+function parseAcceptCharset(accept: string): Array<{ charset: string; q: number; o: number }> {
   const specs: Array<{ charset: string; q: number; o: number }> = []
   const parts = accept.split(",")
 
@@ -409,11 +396,11 @@ function getCharsetPriority(
   for (const spec of accepted) {
     const result = specifyCharset(charset, spec)
     if (
-      result
-      && (best === null
-        || result.s > best.s
-        || (result.s === best.s && result.q > best.q)
-        || (result.s === best.s && result.q === best.q && result.o < best.o))
+      result &&
+      (best === null ||
+        result.s > best.s ||
+        (result.s === best.s && result.q > best.q) ||
+        (result.s === best.s && result.q === best.q && result.o < best.o))
     ) {
       best = result
     }
@@ -429,24 +416,17 @@ function getCharsetPriority(
 }
 
 function compareSpecs(a: ParsedSpec, b: ParsedSpec): number {
-  return (
-    b.q - a.q
-    || b.s - a.s
-    || a.o - b.o
-    || a.i - b.i
-  )
+  return b.q - a.q || b.s - a.s || a.o - b.o || a.i - b.i
 }
 
-export function media(accept: string, available?: string[]): string[] {
+export function media(accept: string, available?: Array<string>): Array<string> {
   const parsed = parseAccept(accept)
   if (parsed.length === 0) {
     return []
   }
 
   if (!available) {
-    return parsed.sort((a, b) => b.q - a.q || a.o - b.o).map((p) =>
-      `${p.type}/${p.subtype}`
-    )
+    return parsed.sort((a, b) => b.q - a.q || a.o - b.o).map((p) => `${p.type}/${p.subtype}`)
   }
 
   const priorities = available.map((t, i) => getMediaTypePriority(t, parsed, i))
@@ -455,16 +435,16 @@ export function media(accept: string, available?: string[]): string[] {
   return sorted.map((p) => p.value)
 }
 
-export function language(accept: string, available?: string[]): string[] {
+export function language(accept: string, available?: Array<string>): Array<string> {
   const parsed = parseAcceptLanguage(accept)
   if (parsed.length === 0) {
     return []
   }
 
   if (!available) {
-    return parsed.sort((a, b) => b.q - a.q || a.o - b.o).map((p) =>
-      p.suffix ? `${p.prefix}-${p.suffix}` : p.prefix
-    )
+    return parsed
+      .sort((a, b) => b.q - a.q || a.o - b.o)
+      .map((p) => (p.suffix ? `${p.prefix}-${p.suffix}` : p.prefix))
   }
 
   const priorities = available.map((l, i) => getLanguagePriority(l, parsed, i))
@@ -473,7 +453,7 @@ export function language(accept: string, available?: string[]): string[] {
   return sorted.map((p) => p.value)
 }
 
-export function encoding(accept: string, available?: string[]): string[] {
+export function encoding(accept: string, available?: Array<string>): Array<string> {
   const parsed = parseAcceptEncoding(accept)
   if (parsed.length === 0) {
     return []
@@ -489,7 +469,7 @@ export function encoding(accept: string, available?: string[]): string[] {
   return sorted.map((p) => p.value)
 }
 
-export function charset(accept: string, available?: string[]): string[] {
+export function charset(accept: string, available?: Array<string>): Array<string> {
   const parsed = parseAcceptCharset(accept)
   if (parsed.length === 0) {
     return []
@@ -505,38 +485,26 @@ export function charset(accept: string, available?: string[]): string[] {
   return sorted.map((p) => p.value)
 }
 
-export function headerMedia(
-  headers: Headers.Headers,
-  available?: string[],
-): string[] {
-  const accept = headers["accept"]
+export function headerMedia(headers: Headers, available?: Array<string>): Array<string> {
+  const accept = headers.get("accept")
   if (!accept) return []
   return media(accept, available)
 }
 
-export function headerLanguage(
-  headers: Headers.Headers,
-  available?: string[],
-): string[] {
-  const accept = headers["accept-language"]
+export function headerLanguage(headers: Headers, available?: Array<string>): Array<string> {
+  const accept = headers.get("accept-language")
   if (!accept) return []
   return language(accept, available)
 }
 
-export function headerEncoding(
-  headers: Headers.Headers,
-  available?: string[],
-): string[] {
-  const accept = headers["accept-encoding"]
+export function headerEncoding(headers: Headers, available?: Array<string>): Array<string> {
+  const accept = headers.get("accept-encoding")
   if (!accept) return []
   return encoding(accept, available)
 }
 
-export function headerCharset(
-  headers: Headers.Headers,
-  available?: string[],
-): string[] {
-  const accept = headers["accept-charset"]
+export function headerCharset(headers: Headers, available?: Array<string>): Array<string> {
+  const accept = headers.get("accept-charset")
   if (!accept) return []
   return charset(accept, available)
 }