Skip to content

Commit c44d2f2

Browse files
jasonsaaymanjasonsaayman
authored
Revert "fix(types): export CJS types from ESM (#6218)" (#6729)
This reverts commit c71811b.
1 parent 415ca94 commit c44d2f2

2 files changed

Lines changed: 596 additions & 108 deletions

File tree

‎index.d.cts‎

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@ interface RawAxiosHeaders {
33
}
44

55
type MethodsHeaders = Partial<{
6-
[Key in axios.Method as Lowercase<Key>]: InternalAxiosHeaders;
7-
} & {common: InternalAxiosHeaders}>;
6+
[Key in axios.Method as Lowercase<Key>]: AxiosHeaders;
7+
} & {common: AxiosHeaders}>;
88

9-
type AxiosHeaderMatcher = (this: InternalAxiosHeaders, value: string, name: string, headers: RawAxiosHeaders) => boolean;
9+
type AxiosHeaderMatcher = (this: AxiosHeaders, value: string, name: string, headers: RawAxiosHeaders) => boolean;
1010

11-
type AxiosHeaderParser = (this: InternalAxiosHeaders, value: axios.AxiosHeaderValue, header: string) => any;
11+
type AxiosHeaderParser = (this: AxiosHeaders, value: axios.AxiosHeaderValue, header: string) => any;
1212

1313
type CommonRequestHeadersList = 'Accept' | 'Content-Length' | 'User-Agent'| 'Content-Encoding' | 'Authorization';
1414

1515
type ContentType = axios.AxiosHeaderValue | 'text/html' | 'text/plain' | 'multipart/form-data' | 'application/json' | 'application/x-www-form-urlencoded' | 'application/octet-stream';
1616

1717
type CommonResponseHeadersList = 'Server' | 'Content-Type' | 'Content-Length' | 'Cache-Control'| 'Content-Encoding';
1818

19-
declare class InternalAxiosHeaders {
19+
declare class AxiosHeaders {
2020
constructor(
21-
headers?: RawAxiosHeaders | InternalAxiosHeaders | string
21+
headers?: RawAxiosHeaders | AxiosHeaders | string
2222
);
2323

2424
[key: string]: any;
2525

26-
set(headerName?: string, value?: axios.AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): InternalAxiosHeaders;
27-
set(headers?: RawAxiosHeaders | InternalAxiosHeaders | string, rewrite?: boolean): InternalAxiosHeaders;
26+
set(headerName?: string, value?: axios.AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): AxiosHeaders;
27+
set(headers?: RawAxiosHeaders | AxiosHeaders | string, rewrite?: boolean): AxiosHeaders;
2828

2929
get(headerName: string, parser: RegExp): RegExpExecArray | null;
3030
get(headerName: string, matcher?: true | AxiosHeaderParser): axios.AxiosHeaderValue;
@@ -35,44 +35,44 @@ declare class InternalAxiosHeaders {
3535

3636
clear(matcher?: AxiosHeaderMatcher): boolean;
3737

38-
normalize(format: boolean): InternalAxiosHeaders;
38+
normalize(format: boolean): AxiosHeaders;
3939

40-
concat(...targets: Array<InternalAxiosHeaders | RawAxiosHeaders | string | undefined | null>): InternalAxiosHeaders;
40+
concat(...targets: Array<AxiosHeaders | RawAxiosHeaders | string | undefined | null>): AxiosHeaders;
4141

4242
toJSON(asStrings?: boolean): RawAxiosHeaders;
4343

44-
static from(thing?: InternalAxiosHeaders | RawAxiosHeaders | string): InternalAxiosHeaders;
44+
static from(thing?: AxiosHeaders | RawAxiosHeaders | string): AxiosHeaders;
4545

46-
static accessor(header: string | string[]): InternalAxiosHeaders;
46+
static accessor(header: string | string[]): AxiosHeaders;
4747

48-
static concat(...targets: Array<InternalAxiosHeaders | RawAxiosHeaders | string | undefined | null>): InternalAxiosHeaders;
48+
static concat(...targets: Array<AxiosHeaders | RawAxiosHeaders | string | undefined | null>): AxiosHeaders;
4949

50-
setContentType(value: ContentType, rewrite?: boolean | AxiosHeaderMatcher): InternalAxiosHeaders;
50+
setContentType(value: ContentType, rewrite?: boolean | AxiosHeaderMatcher): AxiosHeaders;
5151
getContentType(parser?: RegExp): RegExpExecArray | null;
5252
getContentType(matcher?: AxiosHeaderMatcher): axios.AxiosHeaderValue;
5353
hasContentType(matcher?: AxiosHeaderMatcher): boolean;
5454

55-
setContentLength(value: axios.AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): InternalAxiosHeaders;
55+
setContentLength(value: axios.AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): AxiosHeaders;
5656
getContentLength(parser?: RegExp): RegExpExecArray | null;
5757
getContentLength(matcher?: AxiosHeaderMatcher): axios.AxiosHeaderValue;
5858
hasContentLength(matcher?: AxiosHeaderMatcher): boolean;
5959

60-
setAccept(value: axios.AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): InternalAxiosHeaders;
60+
setAccept(value: axios.AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): AxiosHeaders;
6161
getAccept(parser?: RegExp): RegExpExecArray | null;
6262
getAccept(matcher?: AxiosHeaderMatcher): axios.AxiosHeaderValue;
6363
hasAccept(matcher?: AxiosHeaderMatcher): boolean;
6464

65-
setUserAgent(value: axios.AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): InternalAxiosHeaders;
65+
setUserAgent(value: axios.AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): AxiosHeaders;
6666
getUserAgent(parser?: RegExp): RegExpExecArray | null;
6767
getUserAgent(matcher?: AxiosHeaderMatcher): axios.AxiosHeaderValue;
6868
hasUserAgent(matcher?: AxiosHeaderMatcher): boolean;
6969

70-
setContentEncoding(value: axios.AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): InternalAxiosHeaders;
70+
setContentEncoding(value: axios.AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): AxiosHeaders;
7171
getContentEncoding(parser?: RegExp): RegExpExecArray | null;
7272
getContentEncoding(matcher?: AxiosHeaderMatcher): axios.AxiosHeaderValue;
7373
hasContentEncoding(matcher?: AxiosHeaderMatcher): boolean;
7474

75-
setAuthorization(value: axios.AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): InternalAxiosHeaders;
75+
setAuthorization(value: axios.AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): AxiosHeaders;
7676
getAuthorization(parser?: RegExp): RegExpExecArray | null;
7777
getAuthorization(matcher?: AxiosHeaderMatcher): axios.AxiosHeaderValue;
7878
hasAuthorization(matcher?: AxiosHeaderMatcher): boolean;
@@ -111,10 +111,10 @@ declare class AxiosError<T = unknown, D = any> extends Error {
111111
static readonly ETIMEDOUT = "ETIMEDOUT";
112112
}
113113

114-
declare class InternalCanceledError<T> extends AxiosError<T> {
114+
declare class CanceledError<T> extends AxiosError<T> {
115115
}
116116

117-
declare class InternalAxios {
117+
declare class Axios {
118118
constructor(config?: axios.AxiosRequestConfig);
119119
defaults: axios.AxiosDefaults;
120120
interceptors: {
@@ -135,7 +135,7 @@ declare class InternalAxios {
135135
patchForm<T = any, R = axios.AxiosResponse<T>, D = any>(url: string, data?: D, config?: axios.AxiosRequestConfig<D>): Promise<R>;
136136
}
137137

138-
declare enum InternalHttpStatusCode {
138+
declare enum HttpStatusCode {
139139
Continue = 100,
140140
SwitchingProtocols = 101,
141141
Processing = 102,
@@ -205,10 +205,6 @@ type InternalAxiosError<T = unknown, D = any> = AxiosError<T, D>;
205205

206206
declare namespace axios {
207207
type AxiosError<T = unknown, D = any> = InternalAxiosError<T, D>;
208-
type Axios = InternalAxios;
209-
type AxiosHeaders = InternalAxiosHeaders;
210-
type CanceledError<T> = InternalCanceledError<T>;
211-
type HttpStatusCode = InternalHttpStatusCode;
212208

213209
type RawAxiosRequestHeaders = Partial<RawAxiosHeaders & {
214210
[Key in CommonRequestHeadersList]: AxiosHeaderValue;
@@ -402,7 +398,7 @@ declare namespace axios {
402398
maxBodyLength?: number;
403399
maxRedirects?: number;
404400
maxRate?: number | [MaxUploadRate, MaxDownloadRate];
405-
beforeRedirect?: (options: Record<string, any>, responseDetails: {headers: Record<string, string>, statusCode: InternalHttpStatusCode}) => void;
401+
beforeRedirect?: (options: Record<string, any>, responseDetails: {headers: Record<string, string>, statusCode: HttpStatusCode}) => void;
406402
socketPath?: string | null;
407403
transport?: any;
408404
httpAgent?: any;
@@ -507,7 +503,7 @@ declare namespace axios {
507503
clear(): void;
508504
}
509505

510-
interface AxiosInstance extends InternalAxios {
506+
interface AxiosInstance extends Axios {
511507
<T = any, R = AxiosResponse<T>, D = any>(config: AxiosRequestConfig<D>): Promise<R>;
512508
<T = any, R = AxiosResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>): Promise<R>;
513509

@@ -529,14 +525,13 @@ declare namespace axios {
529525
}
530526

531527
interface AxiosStatic extends AxiosInstance {
532-
default: AxiosStatic;
533528
create(config?: CreateAxiosDefaults): AxiosInstance;
534529
Cancel: CancelStatic;
535530
CancelToken: CancelTokenStatic;
536-
Axios: typeof InternalAxios;
531+
Axios: typeof Axios;
537532
AxiosError: typeof AxiosError;
538-
CanceledError: typeof InternalCanceledError;
539-
HttpStatusCode: typeof InternalHttpStatusCode;
533+
CanceledError: typeof CanceledError;
534+
HttpStatusCode: typeof HttpStatusCode;
540535
readonly VERSION: string;
541536
isCancel(value: any): value is Cancel;
542537
all<T>(values: Array<T | Promise<T>>): Promise<T[]>;
@@ -545,7 +540,7 @@ declare namespace axios {
545540
toFormData(sourceObj: object, targetFormData?: GenericFormData, options?: FormSerializerOptions): GenericFormData;
546541
formToJSON(form: GenericFormData|GenericHTMLFormElement): object;
547542
getAdapter(adapters: AxiosAdapterConfig | AxiosAdapterConfig[] | undefined): AxiosAdapter;
548-
AxiosHeaders: typeof InternalAxiosHeaders;
543+
AxiosHeaders: typeof AxiosHeaders;
549544
}
550545
}
551546

0 commit comments

Comments
 (0)