Skip to content

Commit

Permalink
fix(fetch): add missing ReadableStream interface to response.body (#1308
Browse files Browse the repository at this point in the history
)

refactor: remove ControlledAsyncIterable
  • Loading branch information
fraxken committed Mar 30, 2022
1 parent dc63a4d commit ae9b890
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
2 changes: 2 additions & 0 deletions test/types/fetch.test-d.ts
@@ -1,5 +1,6 @@
import { URL } from 'url'
import { Blob } from 'buffer'
import { ReadableStream } from 'stream/web'
import { expectType, expectError } from 'tsd'
import {
BodyInit,
Expand Down Expand Up @@ -141,6 +142,7 @@ expectType<string>(response.statusText)
expectType<ResponseType>(response.type)
expectType<string>(response.url)
expectType<boolean>(response.redirected)
expectType<ReadableStream | null>(response.body)
expectType<boolean>(response.bodyUsed)
expectType<Promise<ArrayBuffer>>(response.arrayBuffer())
expectType<Promise<Blob>>(response.blob())
Expand Down
14 changes: 4 additions & 10 deletions types/fetch.d.ts
Expand Up @@ -4,6 +4,7 @@

import { Blob } from 'buffer'
import { URL, URLSearchParams } from 'url'
import { ReadableStream } from 'stream/web'
import { FormData } from './formdata'

export type RequestInfo = string | URL | Request
Expand All @@ -13,13 +14,6 @@ export declare function fetch (
init?: RequestInit
): Promise<Response>

declare class ControlledAsyncIterable implements AsyncIterable<Uint8Array> {
constructor (input: AsyncIterable<Uint8Array> | Iterable<Uint8Array>)
data: AsyncIterable<Uint8Array>
disturbed: boolean
readonly [Symbol.asyncIterator]: () => AsyncIterator<Uint8Array>
}

export type BodyInit =
| ArrayBuffer
| AsyncIterable<Uint8Array>
Expand All @@ -32,7 +26,7 @@ export type BodyInit =
| string

export interface BodyMixin {
readonly body: ControlledAsyncIterable | null
readonly body: ReadableStream | null
readonly bodyUsed: boolean

readonly arrayBuffer: () => Promise<ArrayBuffer>
Expand Down Expand Up @@ -139,7 +133,7 @@ export declare class Request implements BodyMixin {
readonly keepalive: boolean
readonly signal: AbortSignal

readonly body: ControlledAsyncIterable | null
readonly body: ReadableStream | null
readonly bodyUsed: boolean

readonly arrayBuffer: () => Promise<ArrayBuffer>
Expand Down Expand Up @@ -178,7 +172,7 @@ export declare class Response implements BodyMixin {
readonly url: string
readonly redirected: boolean

readonly body: ControlledAsyncIterable | null
readonly body: ReadableStream | null
readonly bodyUsed: boolean

readonly arrayBuffer: () => Promise<ArrayBuffer>
Expand Down

0 comments on commit ae9b890

Please sign in to comment.