Skip to content

Commit 1dc94db

Browse files
fix: use RequestHeaderMap for TypedRequest (#74)
1 parent a428093 commit 1dc94db

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/fetch.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ResponseHeaderMap } from './http'
1+
import type { RequestHeaderMap, ResponseHeaderMap } from './http'
22

33
export interface TypedHeaders<TypedHeaderValues extends Record<string, string> | unknown> extends Omit<Headers, 'append' | 'delete' | 'get' | 'getSetCookie' | 'has' | 'set' | 'forEach'> {
44
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/append) */
@@ -30,7 +30,7 @@ export interface TypedResponse<Body = unknown, Headers extends Record<string, st
3030
headers: TypedHeaders<Headers>
3131
}
3232

33-
export interface TypedRequest<Body = unknown, Headers extends Record<string, string> | unknown = ResponseHeaderMap> extends Omit<Request, 'clone' | 'headers' | 'json'> {
33+
export interface TypedRequest<Body = unknown, Headers extends Record<string, string> | unknown = RequestHeaderMap> extends Omit<Request, 'clone' | 'headers' | 'json'> {
3434
clone: () => TypedRequest<Body, Headers>
3535
json: () => Promise<Body>
3636
headers: TypedHeaders<Headers>

test/typed-fetch.test-d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ describe('TypedRequest', () => {
203203
expectTypeOf<CreateUserRequest['json']>().returns.toEqualTypeOf<Promise<{ name: string, email: string }>>()
204204

205205
// clone() should return TypedRequest with same header type
206-
expectTypeOf<CreateUserRequest['clone']>().returns.toEqualTypeOf<TypedRequest<{ name: string, email: string }, ResponseHeaderMap>>()
206+
expectTypeOf<CreateUserRequest['clone']>().returns.toEqualTypeOf<TypedRequest<{ name: string, email: string }, RequestHeaderMap>>()
207207
})
208208

209209
it('should type request headers correctly', () => {
@@ -278,7 +278,7 @@ describe('TypedRequest', () => {
278278
type DefaultRequest = TypedRequest
279279

280280
expectTypeOf<DefaultRequest['json']>().returns.toEqualTypeOf<Promise<unknown>>()
281-
expectTypeOf<DefaultRequest['headers']>().toEqualTypeOf<TypedHeaders<ResponseHeaderMap>>()
281+
expectTypeOf<DefaultRequest['headers']>().toEqualTypeOf<TypedHeaders<RequestHeaderMap>>()
282282
})
283283

284284
it('should work with schema-defined request headers', () => {

0 commit comments

Comments
 (0)