effect 4.0.0-beta.94 → 4.0.0-beta.98

package/src/unstable/httpapi/HttpApiEndpoint.ts

@@ -1,7 +1,7 @@
 /**
  * Defines endpoint declarations used inside an HTTP API group.
  *
- * An endpoint records a stable name, HTTP method, router path, request schemas,
+ * An endpoint records a stable identifier, HTTP method, router path, request schemas,
  * response schemas, declared errors, middleware, and annotations. Endpoint
  * values are declarations, not handlers: builders use them to decode requests,
  * type handler input, encode responses, generate OpenAPI metadata, and derive
@@ -21,6 +21,7 @@ import * as Predicate from "../../Predicate.ts"
 import * as Schema from "../../Schema.ts"
 import * as AST from "../../SchemaAST.ts"
 import type * as Stream from "../../Stream.ts"
+import type { Simplify } from "../../Struct.ts"
 import type * as Types from "../../Types.ts"
 import type { HttpMethod } from "../http/HttpMethod.ts"
 import * as HttpRouter from "../http/HttpRouter.ts"
@@ -30,6 +31,7 @@ import type * as Multipart from "../http/Multipart.ts"
 import type * as HttpApiGroup from "./HttpApiGroup.ts"
 import type * as HttpApiMiddleware from "./HttpApiMiddleware.ts"
 import * as HttpApiSchema from "./HttpApiSchema.ts"
+import * as MediaType from "./internal/mediaType.ts"
 
 const TypeId = "~effect/httpapi/HttpApiEndpoint"
 
@@ -40,19 +42,7 @@ const TypeId = "~effect/httpapi/HttpApiEndpoint"
  * @category guards
  * @since 4.0.0
  */
-export const isHttpApiEndpoint = (u: unknown): u is HttpApiEndpoint<any, any, any> => Predicate.hasProperty(u, TypeId)
-
-/**
- * Maps content types to the payload encoding strategy and one or more schemas that
- * can decode or encode payloads for that content type.
- *
- * @category models
- * @since 4.0.0
- */
-export type PayloadMap = ReadonlyMap<string, {
-  readonly encoding: HttpApiSchema.PayloadEncoding
-  readonly schemas: [Schema.Top, ...Array<Schema.Top>]
-}>
+export const isHttpApiEndpoint = (u: unknown): u is Top => Predicate.hasProperty(u, TypeId)
 
 type SuccessType<S> = S extends HttpApiSchema.StreamSse<
   infer _Events,
@@ -81,20 +71,64 @@ type SuccessDecodingServices<S> = S extends HttpApiSchema.StreamSse<
   : S extends Schema.Constraint ? S["DecodingServices"]
   : never
 
-type ExtractSuccessOrArray<S extends SuccessConstraint> = S extends ReadonlyArray<Schema.Constraint> ? S[number] : S
+type UnwrapReadonlyArray<S> = S extends ReadonlyArray<infer A> ? A : S
 
 type ExtractBufferedSuccess<S extends SuccessConstraint> = Exclude<
-  Extract<ExtractSuccessOrArray<S>, Schema.Top>,
+  Extract<UnwrapReadonlyArray<S>, Schema.Top>,
   HttpApiSchema.StreamSchema
 >
 
-type ExtractStreamSuccess<S extends SuccessConstraint> = ExtractSuccessOrArray<S> extends infer Success ?
+type ExtractStreamSuccess<S extends SuccessConstraint> = UnwrapReadonlyArray<S> extends infer Success ?
   Success extends HttpApiSchema.StreamSchema ? Success : never
   : never
 
-type JsonSuccessOrArray<S extends SuccessConstraint> = [ExtractBufferedSuccess<S>] extends [never] ?
-  ExtractStreamSuccess<S>
-  : Json<ExtractBufferedSuccess<S>> | ExtractStreamSuccess<S>
+type ToSuccessCodec<S extends SuccessConstraint> = [ExtractBufferedSuccess<S>] extends [never] ? ExtractStreamSuccess<S>
+  : Schema.toCodecJson<ExtractBufferedSuccess<S>> | ExtractStreamSuccess<S>
+
+type ToJsonCodec<S> = [S] extends [never] ? never
+  : [S] extends [Schema.Constraint] ? Schema.toCodecJson<S>
+  : never
+
+type ToStringTreeCodec<S> = [S] extends [never] ? never
+  : [S] extends [Schema.Struct.Fields] ? Schema.toCodecStringTree<Schema.Struct<S>>
+  : [S] extends [Schema.Constraint] ? Schema.toCodecStringTree<S>
+  : never
+
+type RequestFromParts<Endpoint, ParamsType, QueryType, PayloadType, HeadersType> =
+  & ([ParamsType] extends [never] ? {} : { readonly params: Simplify<ParamsType> })
+  & ([QueryType] extends [never] ? {} : { readonly query: Simplify<QueryType> })
+  & ([PayloadType] extends [never] ? {}
+    : PayloadType extends Brand<HttpApiSchema.MultipartStreamTypeId> ?
+      { readonly payload: Stream.Stream<Multipart.Part, Multipart.MultipartError> }
+    : { readonly payload: Simplify<PayloadType> })
+  & ([HeadersType] extends [never] ? {} : { readonly headers: Simplify<HeadersType> })
+  & {
+    readonly request: HttpServerRequest
+    readonly endpoint: Endpoint
+    readonly group: HttpApiGroup.Top
+  }
+
+type RequestRawFromParts<Endpoint, ParamsType, QueryType, HeadersType> =
+  & ([ParamsType] extends [never] ? {} : { readonly params: Simplify<ParamsType> })
+  & ([QueryType] extends [never] ? {} : { readonly query: Simplify<QueryType> })
+  & ([HeadersType] extends [never] ? {} : { readonly headers: Simplify<HeadersType> })
+  & {
+    readonly request: HttpServerRequest
+    readonly endpoint: Endpoint
+    readonly group: HttpApiGroup.Top
+  }
+
+/**
+ * Maps normalized media types to a payload encoding strategy and one or more
+ * schemas. Each schema retains its declared content type in its encoding annotation.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type PayloadMap = ReadonlyMap<string, {
+  readonly encoding: HttpApiSchema.PayloadEncoding
+  readonly schemas: readonly [Schema.Top, ...Array<Schema.Top>]
+}>
 
 /**
  * Represents an API endpoint. An API endpoint is mapped to a single route on
@@ -104,7 +138,7 @@ type JsonSuccessOrArray<S extends SuccessConstraint> = [ExtractBufferedSuccess<S
  * @since 4.0.0
  */
 export interface HttpApiEndpoint<
-  out Name extends string,
+  out Identifier extends string,
   out Method extends HttpMethod,
   out Path extends string,
   out Params extends Schema.Top = never,
@@ -114,19 +148,22 @@ export interface HttpApiEndpoint<
   out Success extends Schema.Top = typeof HttpApiSchema.NoContent,
   out Error extends Schema.Top = never,
   in out Middleware = never,
-  out MiddlewareR = never
+  out MiddlewareServices = never
 > extends Pipeable {
-  readonly [TypeId]: {
-    readonly _MiddlewareR: Types.Covariant<MiddlewareR>
-  }
+  new(_: never): {}
+  readonly [TypeId]: typeof TypeId
   readonly "~Params": Params
   readonly "~Query": Query
   readonly "~Headers": Headers
   readonly "~Payload": Payload
   readonly "~Success": Success
   readonly "~Error": Error
+  readonly "~Middleware": Middleware
+  readonly "~MiddlewareServices": MiddlewareServices
+  readonly "~Request": RequestFromParts<this, Params["Type"], Query["Type"], Payload["Type"], Headers["Type"]>
+  readonly "~RequestRaw": RequestRawFromParts<this, Params["Type"], Query["Type"], Headers["Type"]>
 
-  readonly name: Name
+  readonly identifier: Identifier
   readonly path: Path
   readonly method: Method
   readonly params: Schema.Top | undefined
@@ -144,7 +181,7 @@ export interface HttpApiEndpoint<
   prefix<const Prefix extends HttpRouter.PathInput>(
     prefix: Prefix
   ): HttpApiEndpoint<
-    Name,
+    Identifier,
     Method,
     `${Prefix}${Path}`,
     Params,
@@ -154,14 +191,14 @@ export interface HttpApiEndpoint<
     Success,
     Error,
     Middleware,
-    MiddlewareR
+    MiddlewareServices
   >
 
   /**
    * Add an `HttpApiMiddleware` to the endpoint.
    */
   middleware<I extends HttpApiMiddleware.AnyId, S>(middleware: Context.Key<I, S>): HttpApiEndpoint<
-    Name,
+    Identifier,
     Method,
     Path,
     Params,
@@ -171,7 +208,7 @@ export interface HttpApiEndpoint<
     Success,
     Error,
     Middleware | I,
-    HttpApiMiddleware.ApplyServices<I, MiddlewareR>
+    HttpApiMiddleware.ApplyServices<I, MiddlewareServices>
   >
 
   /**
@@ -181,7 +218,7 @@ export interface HttpApiEndpoint<
     key: Context.Key<I, S>,
     value: Types.NoInfer<S>
   ): HttpApiEndpoint<
-    Name,
+    Identifier,
     Method,
     Path,
     Params,
@@ -191,7 +228,7 @@ export interface HttpApiEndpoint<
     Success,
     Error,
     Middleware,
-    MiddlewareR
+    MiddlewareServices
   >
 
   /**
@@ -200,7 +237,7 @@ export interface HttpApiEndpoint<
   annotateMerge<I>(
     annotations: Context.Context<I>
   ): HttpApiEndpoint<
-    Name,
+    Identifier,
     Method,
     Path,
     Params,
@@ -210,12 +247,12 @@ export interface HttpApiEndpoint<
     Success,
     Error,
     Middleware,
-    MiddlewareR
+    MiddlewareServices
   >
 }
 
 /** @internal */
-export function getPayloadSchemas(endpoint: AnyWithProps): Array<Schema.Top> {
+export function getPayloadSchemas(endpoint: Top): Array<Schema.Top> {
   const result: Array<Schema.Top> = []
   for (const { schemas } of endpoint.payload.values()) {
     result.push(...schemas)
@@ -224,13 +261,13 @@ export function getPayloadSchemas(endpoint: AnyWithProps): Array<Schema.Top> {
 }
 
 /** @internal */
-export function getSuccessSchemas(endpoint: AnyWithProps): [Schema.Top, ...Array<Schema.Top>] {
+export function getSuccessSchemas(endpoint: Top): [Schema.Top, ...Array<Schema.Top>] {
   const schemas = Array.from(endpoint.success)
   return Arr.isArrayNonEmpty(schemas) ? schemas : [HttpApiSchema.NoContent]
 }
 
 /** @internal */
-export function getErrorSchemas(endpoint: AnyWithProps): Array<Schema.Top> {
+export function getErrorSchemas(endpoint: Top): Array<Schema.Top> {
   const schemas = new Set<Schema.Top>(endpoint.error)
   for (const middleware of endpoint.middlewares) {
     const key = middleware as any as HttpApiMiddleware.AnyService
@@ -248,11 +285,27 @@ export function getErrorSchemas(endpoint: AnyWithProps): Array<Schema.Top> {
  * @category models
  * @since 4.0.0
  */
-export interface Any extends Pipeable {
-  readonly [TypeId]: any
-  readonly name: string
-  readonly ["~Success"]: Schema.Top
-  readonly ["~Error"]: Schema.Top
+export interface Constraint {
+  readonly [TypeId]: typeof TypeId
+  readonly identifier: string
+  readonly ["~Success"]: Schema.Constraint
+  readonly ["~Error"]: Schema.Constraint
+  readonly ["~Request"]: unknown
+  readonly ["~RequestRaw"]: unknown
+}
+
+/**
+ * A widened endpoint type that preserves request and middleware pipeline phantom fields.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface ConstraintRequest extends Constraint {
+  readonly ["~Params"]: Schema.Constraint
+  readonly ["~Query"]: Schema.Constraint
+  readonly ["~Payload"]: Schema.Constraint
+  readonly ["~Headers"]: Schema.Constraint
+  readonly ["~Middleware"]: unknown
 }
 
 /**
@@ -262,7 +315,7 @@ export interface Any extends Pipeable {
  * @category models
  * @since 4.0.0
  */
-export interface AnyWithProps extends
+export interface Top extends
   HttpApiEndpoint<
     string,
     HttpMethod,
@@ -271,31 +324,20 @@ export interface AnyWithProps extends
     Schema.Top,
     Schema.Top,
     Schema.Top,
+    Schema.Top,
+    Schema.Top,
     any,
-    any
+    unknown
   >
 {}
 
 /**
- * Extracts the name literal from an `HttpApiEndpoint`.
+ * Extracts the endpoint identifier literal from an `HttpApiEndpoint`.
  *
  * @category models
  * @since 4.0.0
  */
-export type Name<Endpoint> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ? _Name
-  : never
+export type Identifier<Endpoint> = Endpoint extends Constraint ? Endpoint["identifier"] : never
 
 /**
  * Extracts the success schema associated with an endpoint.
@@ -303,20 +345,7 @@ export type Name<Endpoint> = Endpoint extends HttpApiEndpoint<
  * @category models
  * @since 4.0.0
  */
-export type Success<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ? _Success
-  : never
+export type Success<Endpoint> = Endpoint extends Constraint ? Endpoint["~Success"] : never
 
 /**
  * Extracts the error schema associated with an endpoint.
@@ -324,20 +353,7 @@ export type Success<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
  * @category models
  * @since 4.0.0
  */
-export type Error<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ? _Error
-  : never
+export type Error<Endpoint> = Endpoint extends Constraint ? Endpoint["~Error"] : never
 
 /**
  * Extracts the schema used for an endpoint's path parameters.
@@ -345,19 +361,7 @@ export type Error<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
  * @category models
  * @since 4.0.0
  */
-export type Params<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ? _Params
+export type Params<Endpoint> = Endpoint extends ConstraintRequest ? Endpoint["~Params"]
   : never
 
 /**
@@ -366,19 +370,7 @@ export type Params<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
  * @category models
  * @since 4.0.0
  */
-export type Query<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ? _Query
+export type Query<Endpoint> = Endpoint extends ConstraintRequest ? Endpoint["~Query"]
   : never
 
 /**
@@ -387,19 +379,7 @@ export type Query<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
  * @category models
  * @since 4.0.0
  */
-export type Payload<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ? _Payload
+export type Payload<Endpoint> = Endpoint extends ConstraintRequest ? Endpoint["~Payload"]
   : never
 
 /**
@@ -408,19 +388,7 @@ export type Payload<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
  * @category models
  * @since 4.0.0
  */
-export type Headers<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ? _Headers
+export type Headers<Endpoint> = Endpoint extends ConstraintRequest ? Endpoint["~Headers"]
   : never
 
 /**
@@ -429,19 +397,7 @@ export type Headers<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
  * @category models
  * @since 4.0.0
  */
-export type Middleware<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ? _M
+export type Middleware<Endpoint> = Endpoint extends { readonly "~Middleware": infer M } ? M
   : never
 
 /**
@@ -450,7 +406,7 @@ export type Middleware<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
  * @category models
  * @since 4.0.0
  */
-export type MiddlewareProvides<Endpoint extends Any> = HttpApiMiddleware.Provides<Middleware<Endpoint>>
+export type MiddlewareProvides<Endpoint> = HttpApiMiddleware.Provides<Middleware<Endpoint>>
 
 /**
  * Computes the client-side middleware services required by an endpoint.
@@ -458,7 +414,7 @@ export type MiddlewareProvides<Endpoint extends Any> = HttpApiMiddleware.Provide
  * @category models
  * @since 4.0.0
  */
-export type MiddlewareClient<Endpoint extends Any> = HttpApiMiddleware.MiddlewareClient<Middleware<Endpoint>>
+export type MiddlewareClient<Endpoint> = HttpApiMiddleware.MiddlewareClient<Middleware<Endpoint>>
 
 /**
  * Computes the error types that can be produced by the middleware attached to an
@@ -467,7 +423,7 @@ export type MiddlewareClient<Endpoint extends Any> = HttpApiMiddleware.Middlewar
  * @category models
  * @since 4.0.0
  */
-export type MiddlewareError<Endpoint extends Any> = HttpApiMiddleware.Error<Middleware<Endpoint>>
+export type MiddlewareError<Endpoint> = HttpApiMiddleware.Error<Middleware<Endpoint>>
 
 /**
  * Computes the full error value union for an endpoint, including the endpoint
@@ -476,19 +432,8 @@ export type MiddlewareError<Endpoint extends Any> = HttpApiMiddleware.Error<Midd
  * @category models
  * @since 4.0.0
  */
-export type Errors<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ? _Error["Type"] | HttpApiMiddleware.Error<Middleware<Endpoint>>
+export type Errors<Endpoint> = Endpoint extends ConstraintRequest ?
+  Endpoint["~Error"]["Type"] | HttpApiMiddleware.Error<Endpoint["~Middleware"]>
   : never
 
 /**
@@ -498,19 +443,9 @@ export type Errors<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
  * @category models
  * @since 4.0.0
  */
-export type ErrorServicesEncode<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ? _Error["EncodingServices"] | HttpApiMiddleware.ErrorServicesEncode<Middleware<Endpoint>>
+export type ErrorServicesEncode<Endpoint> = Endpoint extends ConstraintRequest ?
+    | Endpoint["~Error"]["EncodingServices"]
+    | HttpApiMiddleware.ErrorServicesEncode<Endpoint["~Middleware"]>
   : never
 
 /**
@@ -521,31 +456,7 @@ export type ErrorServicesEncode<Endpoint extends Any> = Endpoint extends HttpApi
  * @category models
  * @since 4.0.0
  */
-export type Request<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ?
-    & ([_Params["Type"]] extends [never] ? {} : { readonly params: _Params["Type"] })
-    & ([_Query["Type"]] extends [never] ? {} : { readonly query: _Query["Type"] })
-    & ([_Payload["Type"]] extends [never] ? {}
-      : _Payload["Type"] extends Brand<HttpApiSchema.MultipartStreamTypeId> ?
-        { readonly payload: Stream.Stream<Multipart.Part, Multipart.MultipartError> }
-      : { readonly payload: _Payload["Type"] })
-    & ([_Headers] extends [never] ? {} : { readonly headers: _Headers["Type"] })
-    & {
-      readonly request: HttpServerRequest
-      readonly endpoint: Endpoint
-      readonly group: HttpApiGroup.AnyWithProps
-    }
+export type Request<Endpoint> = Endpoint extends ConstraintRequest ? Endpoint["~Request"]
   : {}
 
 /**
@@ -556,27 +467,7 @@ export type Request<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
  * @category models
  * @since 4.0.0
  */
-export type RequestRaw<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ?
-    & ([_Params["Type"]] extends [never] ? {} : { readonly params: _Params["Type"] })
-    & ([_Query["Type"]] extends [never] ? {} : { readonly query: _Query["Type"] })
-    & ([_Headers["Type"]] extends [never] ? {} : { readonly headers: _Headers["Type"] })
-    & {
-      readonly request: HttpServerRequest
-      readonly endpoint: Endpoint
-      readonly group: HttpApiGroup.AnyWithProps
-    }
+export type RequestRaw<Endpoint> = Endpoint extends ConstraintRequest ? Endpoint["~RequestRaw"]
   : {}
 
 /**
@@ -623,26 +514,14 @@ export type ClientResponseMode = "decoded-only" | "decoded-and-response" | "resp
  * @category models
  * @since 4.0.0
  */
-export type ServerServices<Endpoint> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ?
-    | _Params["DecodingServices"]
-    | _Query["DecodingServices"]
-    | _Payload["DecodingServices"]
-    | _Headers["DecodingServices"]
-    | SuccessEncodingServices<_Success>
-    | _Error["EncodingServices"]
-    | HttpApiMiddleware.ErrorServicesEncode<_M>
+export type ServerServices<Endpoint> = Endpoint extends ConstraintRequest ?
+    | Endpoint["~Params"]["DecodingServices"]
+    | Endpoint["~Query"]["DecodingServices"]
+    | Endpoint["~Payload"]["DecodingServices"]
+    | Endpoint["~Headers"]["DecodingServices"]
+    | SuccessEncodingServices<Endpoint["~Success"]>
+    | Endpoint["~Error"]["EncodingServices"]
+    | HttpApiMiddleware.ErrorServicesEncode<Endpoint["~Middleware"]>
   : never
 
 /**
@@ -652,25 +531,13 @@ export type ServerServices<Endpoint> = Endpoint extends HttpApiEndpoint<
  * @category models
  * @since 4.0.0
  */
-export type ClientServices<Endpoint> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ?
-    | _Params["EncodingServices"]
-    | _Query["EncodingServices"]
-    | _Payload["EncodingServices"]
-    | _Headers["EncodingServices"]
-    | SuccessDecodingServices<_Success>
-    | _Error["DecodingServices"]
+export type ClientServices<Endpoint> = Endpoint extends ConstraintRequest ?
+    | Endpoint["~Params"]["EncodingServices"]
+    | Endpoint["~Query"]["EncodingServices"]
+    | Endpoint["~Payload"]["EncodingServices"]
+    | Endpoint["~Headers"]["EncodingServices"]
+    | SuccessDecodingServices<Endpoint["~Success"]>
+    | Endpoint["~Error"]["DecodingServices"]
   : never
 
 /**
@@ -679,19 +546,7 @@ export type ClientServices<Endpoint> = Endpoint extends HttpApiEndpoint<
  * @category models
  * @since 4.0.0
  */
-export type MiddlewareServices<Endpoint> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ? _MR
+export type MiddlewareServices<Endpoint> = Endpoint extends { readonly "~MiddlewareServices": infer R } ? R
   : never
 
 /**
@@ -701,19 +556,9 @@ export type MiddlewareServices<Endpoint> = Endpoint extends HttpApiEndpoint<
  * @category models
  * @since 4.0.0
  */
-export type ErrorServicesDecode<Endpoint> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ? _Error["DecodingServices"] | HttpApiMiddleware.ErrorServicesDecode<Middleware<Endpoint>>
+export type ErrorServicesDecode<Endpoint> = Endpoint extends ConstraintRequest ?
+    | Endpoint["~Error"]["DecodingServices"]
+    | HttpApiMiddleware.ErrorServicesDecode<Endpoint["~Middleware"]>
   : never
 
 /**
@@ -723,8 +568,8 @@ export type ErrorServicesDecode<Endpoint> = Endpoint extends HttpApiEndpoint<
  * @category models
  * @since 4.0.0
  */
-export type Handler<Endpoint extends Any, E, R> = (
-  request: Types.Simplify<Request<Endpoint>>
+export type Handler<Endpoint extends Constraint, E, R> = (
+  request: Simplify<Endpoint["~Request"]>
 ) => Effect<SuccessType<Endpoint["~Success"]> | HttpServerResponse, Endpoint["~Error"]["Type"] | E, R>
 
 /**
@@ -734,112 +579,121 @@ export type Handler<Endpoint extends Any, E, R> = (
  * @category models
  * @since 4.0.0
  */
-export type HandlerRaw<Endpoint extends Any, E, R> = (
-  request: Types.Simplify<RequestRaw<Endpoint>>
+export type HandlerRaw<Endpoint extends Constraint, E, R> = (
+  request: Simplify<Endpoint["~RequestRaw"]>
 ) => Effect<SuccessType<Endpoint["~Success"]> | HttpServerResponse, Endpoint["~Error"]["Type"] | E, R>
 
 /**
- * Selects the endpoint with the specified name from a union of endpoints.
+ * Selects the endpoint with the specified identifier from a union of endpoints.
  *
  * @category models
  * @since 4.0.0
  */
-export type WithName<Endpoints extends Any, Name extends string> = Extract<Endpoints, { readonly name: Name }>
+export type WithIdentifier<Endpoints, Identifier extends string> = Extract<
+  Endpoints,
+  { readonly identifier: Identifier }
+>
 
 /**
- * Removes endpoints with the specified name from a union of endpoints.
+ * Removes endpoints with the specified identifier from a union of endpoints.
  *
  * @category models
  * @since 4.0.0
  */
-export type ExcludeName<Endpoints extends Any, Name extends string> = Exclude<Endpoints, { readonly name: Name }>
+export type ExcludeIdentifier<Endpoints, Identifier extends string> = Exclude<
+  Endpoints,
+  { readonly identifier: Identifier }
+>
 
 /**
- * Derives the normal handler type for the endpoint with the specified name in an
- * endpoint union.
+ * Derives the normal handler type for the endpoint with the specified identifier
+ * in an endpoint union.
  *
  * @category models
  * @since 4.0.0
  */
-export type HandlerWithName<Endpoints extends Any, Name extends string, E, R> = Handler<
-  WithName<Endpoints, Name>,
+export type HandlerWithIdentifier<Endpoints extends Constraint, Identifier extends string, E, R> = Handler<
+  WithIdentifier<Endpoints, Identifier>,
   E,
   R
 >
 
 /**
- * Derives the raw handler type for the endpoint with the specified name in an
- * endpoint union.
+ * Derives the raw handler type for the endpoint with the specified identifier in
+ * an endpoint union.
  *
  * @category models
  * @since 4.0.0
  */
-export type HandlerRawWithName<Endpoints extends Any, Name extends string, E, R> = HandlerRaw<
-  WithName<Endpoints, Name>,
+export type HandlerRawWithIdentifier<Endpoints extends Constraint, Identifier extends string, E, R> = HandlerRaw<
+  WithIdentifier<Endpoints, Identifier>,
   E,
   R
 >
 
 /**
- * Extracts the decoded success value type for the endpoint with the specified name
- * in an endpoint union.
+ * Extracts the decoded success value type for the endpoint with the specified
+ * identifier in an endpoint union.
  *
  * @category models
  * @since 4.0.0
  */
-export type SuccessWithName<Endpoints extends Any, Name extends string> = Success<
-  WithName<Endpoints, Name>
+export type SuccessWithIdentifier<Endpoints extends Constraint, Identifier extends string> = Success<
+  WithIdentifier<Endpoints, Identifier>
 > extends infer S ? SuccessType<S> : never
 
 /**
- * Computes the full error value union for the endpoint with the specified name in
- * an endpoint union.
+ * Computes the full error value union for the endpoint with the specified
+ * identifier in an endpoint union.
  *
  * @category models
  * @since 4.0.0
  */
-export type ErrorsWithName<Endpoints extends Any, Name extends string> = Errors<WithName<Endpoints, Name>>
+export type ErrorsWithIdentifier<Endpoints extends Constraint, Identifier extends string> = Errors<
+  WithIdentifier<Endpoints, Identifier>
+>
 
 /**
  * Computes the server-side service requirements for the endpoint with the
- * specified name in an endpoint union.
+ * specified identifier in an endpoint union.
  *
  * @category models
  * @since 4.0.0
  */
-export type ServerServicesWithName<Endpoints extends Any, Name extends string> = ServerServices<
-  WithName<Endpoints, Name>
+export type ServerServicesWithIdentifier<Endpoints extends Constraint, Identifier extends string> = ServerServices<
+  WithIdentifier<Endpoints, Identifier>
 >
 
 /**
- * Extracts the middleware identifiers for the endpoint with the specified name in
- * an endpoint union.
+ * Extracts the middleware identifiers for the endpoint with the specified
+ * identifier in an endpoint union.
  *
  * @category models
  * @since 4.0.0
  */
-export type MiddlewareWithName<Endpoints extends Any, Name extends string> = Middleware<WithName<Endpoints, Name>>
+export type MiddlewareWithIdentifier<Endpoints extends Constraint, Identifier extends string> = Middleware<
+  WithIdentifier<Endpoints, Identifier>
+>
 
 /**
- * Extracts the middleware service requirements for the endpoint with the specified
- * name in an endpoint union.
+ * Extracts the middleware service requirements for the endpoint with the
+ * specified identifier in an endpoint union.
  *
  * @category models
  * @since 4.0.0
  */
-export type MiddlewareServicesWithName<Endpoints extends Any, Name extends string> = MiddlewareServices<
-  WithName<Endpoints, Name>
->
+export type MiddlewareServicesWithIdentifier<Endpoints extends Constraint, Identifier extends string> =
+  MiddlewareServices<WithIdentifier<Endpoints, Identifier>>
 
 /**
- * Removes services provided by the HTTP router and the named endpoint's middleware
- * from a service requirement union.
+ * Removes services provided by the HTTP router and the selected endpoint's
+ * middleware from a service requirement union.
  *
  * @category models
  * @since 4.0.0
  */
-export type ExcludeProvidedWithName<Endpoints extends Any, Name extends string, R> = ExcludeProvided<
-  WithName<Endpoints, Name>,
+export type ExcludeProvidedWithIdentifier<Endpoints extends Constraint, Identifier extends string, R> = ExcludeProvided<
+  WithIdentifier<Endpoints, Identifier>,
   R
 >
 
@@ -850,7 +704,7 @@ export type ExcludeProvidedWithName<Endpoints extends Any, Name extends string,
  * @category models
  * @since 4.0.0
  */
-export type ExcludeProvided<Endpoint extends Any, R> = Exclude<
+export type ExcludeProvided<Endpoint extends Constraint, R> = Exclude<
   R,
   | HttpRouter.Provided
   | HttpApiMiddleware.Provides<Middleware<Endpoint>>
@@ -863,8 +717,8 @@ export type ExcludeProvided<Endpoint extends Any, R> = Exclude<
  * @category models
  * @since 4.0.0
  */
-export type AddPrefix<Endpoint extends Any, Prefix extends HttpRouter.PathInput> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
+export type AddPrefix<Endpoint, Prefix extends HttpRouter.PathInput> = Endpoint extends HttpApiEndpoint<
+  infer _Identifier,
   infer _Method,
   infer _Path,
   infer _Params,
@@ -876,7 +730,7 @@ export type AddPrefix<Endpoint extends Any, Prefix extends HttpRouter.PathInput>
   infer _M,
   infer _MR
 > ? HttpApiEndpoint<
-    _Name,
+    _Identifier,
     _Method,
     `${Prefix}${_Path}`,
     _Params,
@@ -890,40 +744,6 @@ export type AddPrefix<Endpoint extends Any, Prefix extends HttpRouter.PathInput>
   > :
   never
 
-/**
- * Returns an endpoint type with an additional error schema added to the endpoint's
- * existing error schema union.
- *
- * @category models
- * @since 4.0.0
- */
-export type AddError<Endpoint extends Any, E extends Schema.Top> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
-  infer _Method,
-  infer _Path,
-  infer _Params,
-  infer _Query,
-  infer _Payload,
-  infer _Headers,
-  infer _Success,
-  infer _Error,
-  infer _M,
-  infer _MR
-> ? HttpApiEndpoint<
-    _Name,
-    _Method,
-    _Path,
-    _Params,
-    _Query,
-    _Payload,
-    _Headers,
-    _Success,
-    _Error | E,
-    _M,
-    _MR
-  > :
-  never
-
 /**
  * Returns an endpoint type with additional middleware applied and the endpoint's
  * middleware service requirements updated accordingly.
@@ -931,8 +751,8 @@ export type AddError<Endpoint extends Any, E extends Schema.Top> = Endpoint exte
  * @category models
  * @since 4.0.0
  */
-export type AddMiddleware<Endpoint extends Any, M extends HttpApiMiddleware.AnyId> = Endpoint extends HttpApiEndpoint<
-  infer _Name,
+export type AddMiddleware<Endpoint, M extends HttpApiMiddleware.AnyId> = Endpoint extends HttpApiEndpoint<
+  infer _Identifier,
   infer _Method,
   infer _Path,
   infer _Params,
@@ -944,7 +764,7 @@ export type AddMiddleware<Endpoint extends Any, M extends HttpApiMiddleware.AnyI
   infer _M,
   infer _MR
 > ? HttpApiEndpoint<
-    _Name,
+    _Identifier,
     _Method,
     _Path,
     _Params,
@@ -963,34 +783,48 @@ const Proto = {
   pipe() {
     return pipeArguments(this, arguments)
   },
-  prefix(this: AnyWithProps, prefix: HttpRouter.PathInput) {
+  prefix(this: Top, prefix: HttpRouter.PathInput) {
     return makeProto({
-      ...this,
+      ...optionsFromEndpoint(this),
       path: HttpRouter.prefixPath(this.path, prefix)
     })
   },
-  middleware(this: AnyWithProps, middleware: HttpApiMiddleware.AnyService) {
+  middleware(this: Top, middleware: HttpApiMiddleware.AnyService) {
     return makeProto({
-      ...this,
+      ...optionsFromEndpoint(this),
       middlewares: new Set([...this.middlewares, middleware as any])
     })
   },
-  annotate(this: AnyWithProps, key: Context.Key<any, any>, value: any) {
+  annotate(this: Top, key: Context.Key<any, any>, value: any) {
     return makeProto({
-      ...this,
+      ...optionsFromEndpoint(this),
       annotations: Context.add(this.annotations, key, value)
     })
   },
-  annotateMerge(this: AnyWithProps, annotations: Context.Context<any>) {
+  annotateMerge(this: Top, annotations: Context.Context<any>) {
     return makeProto({
-      ...this,
+      ...optionsFromEndpoint(this),
       annotations: Context.merge(this.annotations, annotations)
     })
   }
 }
 
+const optionsFromEndpoint = (endpoint: Top) => ({
+  identifier: endpoint.identifier,
+  path: endpoint.path,
+  method: endpoint.method,
+  params: endpoint.params,
+  query: endpoint.query,
+  headers: endpoint.headers,
+  payload: endpoint.payload,
+  success: endpoint.success,
+  error: endpoint.error,
+  annotations: endpoint.annotations,
+  middlewares: endpoint.middlewares
+})
+
 function makeProto<
-  Name extends string,
+  Identifier extends string,
   Method extends HttpMethod,
   const Path extends string,
   Params extends Schema.Top,
@@ -1002,7 +836,7 @@ function makeProto<
   Middleware,
   MiddlewareR
 >(options: {
-  readonly name: Name
+  readonly identifier: Identifier
   readonly path: Path
   readonly method: Method
   readonly params: Schema.Top | undefined
@@ -1014,7 +848,7 @@ function makeProto<
   readonly annotations: Context.Context<never>
   readonly middlewares: ReadonlySet<Context.Key<Middleware, any>>
 }): HttpApiEndpoint<
-  Name,
+  Identifier,
   Method,
   Path,
   Params,
@@ -1026,7 +860,9 @@ function makeProto<
   Middleware,
   MiddlewareR
 > {
-  return Object.assign(Object.create(Proto), options)
+  function HttpApiEndpoint() {}
+  Object.setPrototypeOf(HttpApiEndpoint, Proto)
+  return Object.assign(HttpApiEndpoint, options) as any
 }
 
 /**
@@ -1118,7 +954,7 @@ type ErrorNoStream<S extends ErrorConstraint> = [
 
 /**
  * Creates endpoint constructors for a specific HTTP method. The resulting
- * constructor builds an `HttpApiEndpoint` from a name, path, and optional request
+ * constructor builds an `HttpApiEndpoint` from an identifier, path, and optional request
  * and response schemas, applying automatic JSON or string-tree codecs unless
  * `disableCodecs` is enabled.
  *
@@ -1127,7 +963,7 @@ type ErrorNoStream<S extends ErrorConstraint> = [
  */
 export const make = <Method extends HttpMethod>(method: Method): {
   <
-    const Name extends string,
+    const Identifier extends string,
     const Path extends HttpRouter.PathInput,
     Params extends Schema.Top | Schema.Struct.Fields = never,
     Query extends Schema.Top | Schema.Struct.Fields = never,
@@ -1136,7 +972,7 @@ export const make = <Method extends HttpMethod>(method: Method): {
     const Success extends SuccessConstraint = HttpApiSchema.NoContent,
     const Error extends Schema.Top | ReadonlyArray<Schema.Top> = never
   >(
-    name: Name,
+    identifier: Identifier,
     path: Path,
     options?: {
       readonly disableCodecs?: false | undefined
@@ -1148,19 +984,19 @@ export const make = <Method extends HttpMethod>(method: Method): {
       readonly error?: (Error & ErrorNoStream<Types.NoInfer<Error>>) | undefined
     }
   ): HttpApiEndpoint<
-    Name,
+    Identifier,
     Method,
     Path,
-    StringTree<Params extends Schema.Struct.Fields ? Schema.Struct<Params> : Params>,
-    StringTree<Query extends Schema.Struct.Fields ? Schema.Struct<Query> : Query>,
-    Method extends HttpMethod.WithBody ? Json<ExtractSchemaOrArray<Payload>>
-      : StringTree<ExtractSchemaOrArray<Payload>>,
-    StringTree<Headers extends Schema.Struct.Fields ? Schema.Struct<Headers> : Headers>,
-    JsonSuccessOrArray<Success>,
-    Json<Error extends ReadonlyArray<Schema.Constraint> ? Error[number] : Error>
+    ToStringTreeCodec<Params>,
+    ToStringTreeCodec<Query>,
+    Method extends HttpMethod.WithBody ? ToJsonCodec<ToSchema<Payload>>
+      : ToStringTreeCodec<ToSchema<Payload>>,
+    ToStringTreeCodec<Headers>,
+    ToSuccessCodec<Success>,
+    ToJsonCodec<Error extends ReadonlyArray<Schema.Constraint> ? Error[number] : Error>
   >
   <
-    const Name extends string,
+    const Identifier extends string,
     const Path extends HttpRouter.PathInput,
     Params extends ParamsConstraint = never,
     Query extends QueryConstraint = never,
@@ -1169,7 +1005,7 @@ export const make = <Method extends HttpMethod>(method: Method): {
     const Success extends SuccessConstraint = HttpApiSchema.NoContent,
     const Error extends ErrorConstraint = never
   >(
-    name: Name,
+    identifier: Identifier,
     path: Path,
     options?: {
       readonly disableCodecs: true
@@ -1181,19 +1017,19 @@ export const make = <Method extends HttpMethod>(method: Method): {
       readonly error?: (Error & ErrorNoStream<Types.NoInfer<Error>>) | undefined
     }
   ): HttpApiEndpoint<
-    Name,
+    Identifier,
     Method,
     Path,
     Params extends Schema.Struct.Fields ? Schema.Struct<Params> : Params,
     Query extends Schema.Struct.Fields ? Schema.Struct<Query> : Query,
-    ExtractSchemaOrArray<Payload>,
-    ExtractSchemaOrArray<Headers>,
-    ExtractSuccessOrArray<Success>,
+    ToSchema<Payload>,
+    ToSchema<Headers>,
+    UnwrapReadonlyArray<Success>,
     Error extends ReadonlyArray<Schema.Constraint> ? Error[number] : Error
   >
 } =>
 <
-  const Name extends string,
+  const Identifier extends string,
   const Path extends HttpRouter.PathInput,
   Params extends ParamsConstraint = never,
   Query extends QueryConstraint = never,
@@ -1202,7 +1038,7 @@ export const make = <Method extends HttpMethod>(method: Method): {
   const Success extends SuccessConstraint = HttpApiSchema.NoContent,
   const Error extends ErrorConstraint = never
 >(
-  name: Name,
+  identifier: Identifier,
   path: Path,
   options?: {
     readonly disableCodecs?: boolean | undefined
@@ -1214,7 +1050,7 @@ export const make = <Method extends HttpMethod>(method: Method): {
     readonly error?: (Error & ErrorNoStream<Types.NoInfer<Error>>) | undefined
   }
 ): HttpApiEndpoint<
-  Name,
+  Identifier,
   Method,
   Path,
   Params extends Schema.Struct.Fields ? Schema.Struct<Params> : Params,
@@ -1223,13 +1059,13 @@ export const make = <Method extends HttpMethod>(method: Method): {
     : Payload extends ReadonlyArray<Schema.Constraint> ? Payload[number]
     : Payload,
   Headers extends Schema.Struct.Fields ? Schema.Struct<Headers> : Headers,
-  ExtractSuccessOrArray<Success>,
+  UnwrapReadonlyArray<Success>,
   Error extends ReadonlyArray<Schema.Constraint> ? Error[number] : Error
 > => {
   const disableCodecs = options?.disableCodecs ?? false
   const transformStringTree = disableCodecs ? identity : Schema.toCodecStringTree
   return makeProto({
-    name,
+    identifier,
     path,
     method,
     params: ensureStruct(options?.params, transformStringTree),
@@ -1243,37 +1079,10 @@ export const make = <Method extends HttpMethod>(method: Method): {
   })
 }
 
-type ExtractSchemaOrArray<S extends Schema.Struct.Fields | Schema.Constraint | ReadonlyArray<Schema.Constraint>> =
-  S extends Schema.Struct.Fields ? Schema.Struct<S>
-    : S extends ReadonlyArray<Schema.Constraint> ? S[number]
-    : S
-
-/**
- * A schema codec that decodes and encodes the schema's value type through JSON
- * transport values.
- *
- * @category Codecs
- * @since 4.0.0
- */
-export interface Json<S extends Schema.Constraint>
-  extends Schema.Codec<S["Type"], Schema.Json, S["DecodingServices"], S["EncodingServices"]>
-{}
-
-/**
- * A schema codec that decodes and encodes the schema's value type through
- * `Schema.StringTree` transport values.
- *
- * @category Codecs
- * @since 4.0.0
- */
-export interface StringTree<S extends Schema.Constraint> extends
-  Schema.Codec<
-    S["Type"],
-    Schema.StringTree,
-    S["DecodingServices"],
-    S["EncodingServices"]
-  >
-{}
+type ToSchema<S extends Schema.Struct.Fields | Schema.Constraint | ReadonlyArray<Schema.Constraint>> = S extends
+  Schema.Struct.Fields ? Schema.Struct<S>
+  : S extends ReadonlyArray<Schema.Constraint> ? S[number]
+  : S
 
 function ensureStruct(
   params: Schema.Struct.Fields | Schema.Top | undefined,
@@ -1303,7 +1112,8 @@ function getPayload(
 
   for (const schema of schemas) {
     const encoding = HttpApiSchema.getPayloadEncoding(schema.ast, method)
-    const existing = result.get(encoding.contentType)
+    const contentType = MediaType.normalize(encoding.contentType)
+    const existing = result.get(contentType)
     if (existing) {
       if (existing.encoding._tag !== encoding._tag) {
         throw new Error(`Multiple payload encodings for content-type: ${encoding.contentType}`)
@@ -1313,7 +1123,7 @@ function getPayload(
       }
       existing.schemas.push(transform(schema, method))
     } else {
-      result.set(encoding.contentType, { encoding, schemas: [transform(schema, method)] })
+      result.set(contentType, { encoding, schemas: [transform(schema, method)] })
     }
   }
   return result
@@ -1368,7 +1178,7 @@ function validateSuccessResponse(schemas: ReadonlyArray<Schema.Constraint>, meth
       if (entry.noContent) {
         throw new Error(`Cannot combine no-content and streaming success responses for status: ${status}`)
       }
-      if (entry.bufferedContentTypes.has(normalizeResponseContentType(schema.contentType))) {
+      if (entry.bufferedContentTypes.has(MediaType.normalize(schema.contentType))) {
         throw new Error(
           `Cannot combine buffered and streaming success responses for status ${status} and content-type: ${schema.contentType}`
         )
@@ -1384,7 +1194,7 @@ function validateSuccessResponse(schemas: ReadonlyArray<Schema.Constraint>, meth
         }
         const encoding = HttpApiSchema.getResponseEncoding(schema.ast)
         if (
-          normalizeResponseContentType(encoding.contentType) === normalizeResponseContentType(entry.stream.contentType)
+          MediaType.normalize(encoding.contentType) === MediaType.normalize(entry.stream.contentType)
         ) {
           throw new Error(
             `Cannot combine buffered and streaming success responses for status ${status} and content-type: ${encoding.contentType}`
@@ -1393,7 +1203,7 @@ function validateSuccessResponse(schemas: ReadonlyArray<Schema.Constraint>, meth
       }
       if (!noContent) {
         entry.bufferedContentTypes.add(
-          normalizeResponseContentType(HttpApiSchema.getResponseEncoding(schema.ast).contentType)
+          MediaType.normalize(HttpApiSchema.getResponseEncoding(schema.ast).contentType)
         )
       }
       entry.noContent = entry.noContent || noContent
@@ -1401,12 +1211,6 @@ function validateSuccessResponse(schemas: ReadonlyArray<Schema.Constraint>, meth
   }
 }
 
-function normalizeResponseContentType(contentType: string): string {
-  const normalized = contentType.toLowerCase().trim()
-  const index = normalized.indexOf(";")
-  return index === -1 ? normalized : normalized.slice(0, index).trim()
-}
-
 function getStatusEntry(
   statuses: Map<number, {
     readonly stream?: HttpApiSchema.StreamSchema | undefined