Skip to content

Commit 7b34fd4

Browse files
authored
fix(typescript-axios)!: remove unused exports (#281)
- drop some unused exports from the axios runtime package - add explicit return type BREAKING CHANGE: unused symbols `Res` and `StatusCode` dropped from `typescript-axios-runtime`
1 parent 4340caf commit 7b34fd4

File tree

2 files changed

+5
-33
lines changed

2 files changed

+5
-33
lines changed

packages/openapi-code-generator/src/typescript/typescript-axios/typescript-axios-client-builder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {TypescriptClientBuilder} from "../common/client-builder"
22
import type {ClientOperationBuilder} from "../common/client-operation-builder"
33
import type {ImportBuilder} from "../common/import-builder"
4-
import {quotedStringLiteral, union} from "../common/type-utils"
4+
import {union} from "../common/type-utils"
55
import {asyncMethod, routeToTemplateString} from "../common/typescript-common"
66

77
export class TypescriptAxiosClientBuilder extends TypescriptClientBuilder {

packages/typescript-axios-runtime/src/main.ts

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,11 @@ import axios, {
22
AxiosHeaders,
33
type AxiosInstance,
44
type AxiosRequestConfig,
5+
type AxiosResponse,
56
type RawAxiosRequestHeaders,
67
} from "axios"
78
import qs from "qs"
89

9-
// from https://stackoverflow.com/questions/39494689/is-it-possible-to-restrict-number-to-a-certain-range
10-
type Enumerate<
11-
N extends number,
12-
Acc extends number[] = [],
13-
> = Acc["length"] extends N
14-
? Acc[number]
15-
: Enumerate<N, [...Acc, Acc["length"]]>
16-
17-
type IntRange<F extends number, T extends number> = F extends T
18-
? F
19-
: Exclude<Enumerate<T>, Enumerate<F>> extends never
20-
? never
21-
: Exclude<Enumerate<T>, Enumerate<F>> | T
22-
23-
export type StatusCode1xx = IntRange<100, 199>
24-
export type StatusCode2xx = IntRange<200, 299>
25-
export type StatusCode3xx = IntRange<300, 399>
26-
export type StatusCode4xx = IntRange<400, 499>
27-
export type StatusCode5xx = IntRange<500, 599>
28-
export type StatusCode =
29-
| StatusCode1xx
30-
| StatusCode2xx
31-
| StatusCode3xx
32-
| StatusCode4xx
33-
| StatusCode5xx
34-
35-
export type Res<Status extends StatusCode, Type> = {
36-
status: Status
37-
json: () => Promise<Type>
38-
}
39-
4010
export type QueryParams = {
4111
[name: string]:
4212
| string
@@ -77,7 +47,9 @@ export abstract class AbstractAxiosClient {
7747
this.defaultTimeout = config.defaultTimeout
7848
}
7949

80-
protected _request(opts: AxiosRequestConfig) {
50+
protected _request<R extends AxiosResponse>(
51+
opts: AxiosRequestConfig,
52+
): Promise<R> {
8153
const headers = opts.headers ?? this._headers()
8254

8355
return this.axios.request({

0 commit comments

Comments
 (0)