diff --git a/mod.ts b/mod.ts index e6b9e7b..91b759e 100644 --- a/mod.ts +++ b/mod.ts @@ -53,7 +53,7 @@ export type { PromptOptions, SelectOptions, } from "./src/console/mod.ts"; -export { RequestBuilder, RequestResult } from "./src/request.ts"; +export { RequestBuilder, RequestResponse } from "./src/request.ts"; // these are used when registering commands export type { CdChange, diff --git a/src/request.ts b/src/request.ts index 1a00782..1483184 100644 --- a/src/request.ts +++ b/src/request.ts @@ -27,7 +27,7 @@ export const withProgressBarFactorySymbol: unique symbol = Symbol(); /** * Builder API for downloading files. */ -export class RequestBuilder implements PromiseLike { +export class RequestBuilder implements PromiseLike { #state: Readonly | undefined = undefined; #getClonedState(): RequestBuilderState { @@ -86,15 +86,15 @@ export class RequestBuilder implements PromiseLike { return builder; } - then( - onfulfilled?: ((value: RequestResult) => TResult1 | PromiseLike) | null | undefined, + then( + onfulfilled?: ((value: RequestResponse) => TResult1 | PromiseLike) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike) | null | undefined, ): PromiseLike { return this.fetch().then(onfulfilled).catch(onrejected); } /** Fetches and gets the response. */ - fetch(): Promise { + fetch(): Promise { return makeRequest(this.#getClonedState()); } @@ -342,8 +342,8 @@ interface Timeout { clear(): void; } -/** Result of making a request. */ -export class RequestResult { +/** Response of making a request where the body can be read. */ +export class RequestResponse { #response: Response; #downloadResponse: Response; #originalUrl: string; @@ -647,7 +647,7 @@ export async function makeRequest(state: RequestBuilderState) { referrerPolicy: state.referrerPolicy, signal: timeout?.signal, }); - const result = new RequestResult({ + const result = new RequestResponse({ response, originalUrl: state.url.toString(), progressBar: getProgressBar(),