feat: export RequestHeaders, ResponseHeaders and TypedRequest

danielroe · danielroe · commit dec3d55636a8 · 2025-05-30T10:14:59.000+02:00
diff --git a/src/fetch.ts b/src/fetch.ts
@@ -1,4 +1,5 @@
-// TODO: 'typed' variants of headers
+import type { ResponseHeaderMap } from './http'
+
 export interface TypedHeaders<TypedHeaderValues extends Record<string, string> | unknown> {
   /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/append) */
   append: <Name extends string = keyof TypedHeaderValues & string> (name: Name, value: Name extends string ? Lowercase<Name> extends keyof TypedHeaderValues ? TypedHeaderValues[Lowercase<Name>] : string : string) => void
@@ -23,7 +24,14 @@ export interface TypedHeaders<TypedHeaderValues extends Record<string, string> |
 
 // type TypedHeadersClass<TypedHeaderValues extends Record<string, string>> = new (init?: TypedHeadersInit<TypedHeaderValues>) => TypedHeaders<TypedHeaderValues>
 
-export interface TypedResponse<Body = unknown, Headers extends Record<string, string> | unknown = Record<string, string>> extends Omit<Response, 'json' | 'headers'> {
+export interface TypedResponse<Body = unknown, Headers extends Record<string, string> | unknown = ResponseHeaderMap> extends Omit<Response, 'clone' | 'headers' | 'json'> {
+  clone: () => TypedResponse<Body, Headers>
+  json: () => Promise<Body>
+  headers: TypedHeaders<Headers>
+}
+
+export interface TypedRequest<Body = unknown, Headers extends Record<string, string> | unknown = ResponseHeaderMap> extends Omit<Request, 'clone' | 'headers' | 'json'> {
+  clone: () => TypedRequest<Headers>
   json: () => Promise<Body>
   headers: TypedHeaders<Headers>
 }
diff --git a/src/http/index.ts b/src/http/index.ts
@@ -1,6 +1,13 @@
+import type { TypedHeaders } from '../fetch'
+import type { RequestHeaderMap } from './headers/request'
+import type { ResponseHeaderMap } from './headers/response'
+
 export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS' | 'HEAD' | 'CONNECT' | 'TRACE'
 
 export type { RequestHeaderMap, RequestHeaderName } from './headers/request'
 export type { ResponseHeaderMap, ResponseHeaderName } from './headers/response'
 
 export type { MimeType } from './mimes'
+
+export type RequestHeaders = TypedHeaders<RequestHeaderMap>
+export type ResponseHeaders = TypedHeaders<ResponseHeaderMap>
diff --git a/src/index.ts b/src/index.ts
@@ -1,6 +1,6 @@
-export type { TypedHeaders, TypedResponse } from './fetch'
+export type { TypedHeaders, TypedRequest, TypedResponse } from './fetch'
 
-export type { HTTPMethod, MimeType, RequestHeaderMap, RequestHeaderName, ResponseHeaderMap, ResponseHeaderName } from './http'
+export type { HTTPMethod, MimeType, RequestHeaderMap, RequestHeaderName, RequestHeaders, ResponseHeaderMap, ResponseHeaderName, ResponseHeaders } from './http'
 
 export type { TypedFetchInput, TypedFetchPath, TypedFetchRequestInit, TypedFetchResponse } from './inference'
 
