Skip to content

Commit b1ee820

Browse files
tomvdvtomvdv
committed
fix(client-axios): preserve beforeRequest generics and simplify buildUrl typing
1 parent 9f0f385 commit b1ee820

70 files changed

Lines changed: 420 additions & 175 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/client/client.gen.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@ export const createClient = (config: Config = {}): Client => {
3535
return getConfig();
3636
};
3737

38-
const beforeRequest = async <TData = unknown, Url extends string = string>(
39-
options: RequestOptions<TData, boolean, Url>,
38+
const beforeRequest = async <
39+
TData = unknown,
40+
ThrowOnError extends boolean = boolean,
41+
Url extends string = string,
42+
>(
43+
options: RequestOptions<TData, ThrowOnError, Url>,
4044
) => {
4145
const opts = {
4246
..._config,
@@ -60,7 +64,7 @@ export const createClient = (config: Config = {}): Client => {
6064
opts.body = opts.bodySerializer(opts.body);
6165
}
6266

63-
const url = buildUrl(opts as RequestOptions<unknown, boolean, string>);
67+
const url = buildUrl(opts);
6468

6569
return { opts, url };
6670
};

‎packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/client/types.gen.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,16 @@ type RequestFn = <TData = unknown, TError = unknown, ThrowOnError extends boolea
118118

119119
type BuildUrlFn = <
120120
TData extends {
121-
body?: unknown;
122121
path?: Record<string, unknown>;
123122
query?: Record<string, unknown>;
124123
url: string;
125124
},
126125
>(
127-
options: TData & Options<TData>,
126+
options: TData &
127+
Pick<
128+
RequestOptions<unknown, boolean>,
129+
'axios' | 'baseURL' | 'paramsSerializer' | 'querySerializer'
130+
>,
128131
) => string;
129132

130133
export type Client = CoreClient<RequestFn, Config, MethodFn, BuildUrlFn, SseFn> & {

‎packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/preact-query/axios/client/client.gen.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@ export const createClient = (config: Config = {}): Client => {
3535
return getConfig();
3636
};
3737

38-
const beforeRequest = async <TData = unknown, Url extends string = string>(
39-
options: RequestOptions<TData, boolean, Url>,
38+
const beforeRequest = async <
39+
TData = unknown,
40+
ThrowOnError extends boolean = boolean,
41+
Url extends string = string,
42+
>(
43+
options: RequestOptions<TData, ThrowOnError, Url>,
4044
) => {
4145
const opts = {
4246
..._config,
@@ -60,7 +64,7 @@ export const createClient = (config: Config = {}): Client => {
6064
opts.body = opts.bodySerializer(opts.body);
6165
}
6266

63-
const url = buildUrl(opts as RequestOptions<unknown, boolean, string>);
67+
const url = buildUrl(opts);
6468

6569
return { opts, url };
6670
};

‎packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/preact-query/axios/client/types.gen.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,16 @@ type RequestFn = <TData = unknown, TError = unknown, ThrowOnError extends boolea
118118

119119
type BuildUrlFn = <
120120
TData extends {
121-
body?: unknown;
122121
path?: Record<string, unknown>;
123122
query?: Record<string, unknown>;
124123
url: string;
125124
},
126125
>(
127-
options: TData & Options<TData>,
126+
options: TData &
127+
Pick<
128+
RequestOptions<unknown, boolean>,
129+
'axios' | 'baseURL' | 'paramsSerializer' | 'querySerializer'
130+
>,
128131
) => string;
129132

130133
export type Client = CoreClient<RequestFn, Config, MethodFn, BuildUrlFn, SseFn> & {

‎packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/client/client.gen.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@ export const createClient = (config: Config = {}): Client => {
3535
return getConfig();
3636
};
3737

38-
const beforeRequest = async <TData = unknown, Url extends string = string>(
39-
options: RequestOptions<TData, boolean, Url>,
38+
const beforeRequest = async <
39+
TData = unknown,
40+
ThrowOnError extends boolean = boolean,
41+
Url extends string = string,
42+
>(
43+
options: RequestOptions<TData, ThrowOnError, Url>,
4044
) => {
4145
const opts = {
4246
..._config,
@@ -60,7 +64,7 @@ export const createClient = (config: Config = {}): Client => {
6064
opts.body = opts.bodySerializer(opts.body);
6165
}
6266

63-
const url = buildUrl(opts as RequestOptions<unknown, boolean, string>);
67+
const url = buildUrl(opts);
6468

6569
return { opts, url };
6670
};

‎packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/client/types.gen.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,16 @@ type RequestFn = <TData = unknown, TError = unknown, ThrowOnError extends boolea
118118

119119
type BuildUrlFn = <
120120
TData extends {
121-
body?: unknown;
122121
path?: Record<string, unknown>;
123122
query?: Record<string, unknown>;
124123
url: string;
125124
},
126125
>(
127-
options: TData & Options<TData>,
126+
options: TData &
127+
Pick<
128+
RequestOptions<unknown, boolean>,
129+
'axios' | 'baseURL' | 'paramsSerializer' | 'querySerializer'
130+
>,
128131
) => string;
129132

130133
export type Client = CoreClient<RequestFn, Config, MethodFn, BuildUrlFn, SseFn> & {

‎packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/client/client.gen.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@ export const createClient = (config: Config = {}): Client => {
3535
return getConfig();
3636
};
3737

38-
const beforeRequest = async <TData = unknown, Url extends string = string>(
39-
options: RequestOptions<TData, boolean, Url>,
38+
const beforeRequest = async <
39+
TData = unknown,
40+
ThrowOnError extends boolean = boolean,
41+
Url extends string = string,
42+
>(
43+
options: RequestOptions<TData, ThrowOnError, Url>,
4044
) => {
4145
const opts = {
4246
..._config,
@@ -60,7 +64,7 @@ export const createClient = (config: Config = {}): Client => {
6064
opts.body = opts.bodySerializer(opts.body);
6165
}
6266

63-
const url = buildUrl(opts as RequestOptions<unknown, boolean, string>);
67+
const url = buildUrl(opts);
6468

6569
return { opts, url };
6670
};

‎packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/client/types.gen.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,16 @@ type RequestFn = <TData = unknown, TError = unknown, ThrowOnError extends boolea
118118

119119
type BuildUrlFn = <
120120
TData extends {
121-
body?: unknown;
122121
path?: Record<string, unknown>;
123122
query?: Record<string, unknown>;
124123
url: string;
125124
},
126125
>(
127-
options: TData & Options<TData>,
126+
options: TData &
127+
Pick<
128+
RequestOptions<unknown, boolean>,
129+
'axios' | 'baseURL' | 'paramsSerializer' | 'querySerializer'
130+
>,
128131
) => string;
129132

130133
export type Client = CoreClient<RequestFn, Config, MethodFn, BuildUrlFn, SseFn> & {

‎packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/client/client.gen.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@ export const createClient = (config: Config = {}): Client => {
3535
return getConfig();
3636
};
3737

38-
const beforeRequest = async <TData = unknown, Url extends string = string>(
39-
options: RequestOptions<TData, boolean, Url>,
38+
const beforeRequest = async <
39+
TData = unknown,
40+
ThrowOnError extends boolean = boolean,
41+
Url extends string = string,
42+
>(
43+
options: RequestOptions<TData, ThrowOnError, Url>,
4044
) => {
4145
const opts = {
4246
..._config,
@@ -60,7 +64,7 @@ export const createClient = (config: Config = {}): Client => {
6064
opts.body = opts.bodySerializer(opts.body);
6165
}
6266

63-
const url = buildUrl(opts as RequestOptions<unknown, boolean, string>);
67+
const url = buildUrl(opts);
6468

6569
return { opts, url };
6670
};

‎packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/client/types.gen.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,16 @@ type RequestFn = <TData = unknown, TError = unknown, ThrowOnError extends boolea
118118

119119
type BuildUrlFn = <
120120
TData extends {
121-
body?: unknown;
122121
path?: Record<string, unknown>;
123122
query?: Record<string, unknown>;
124123
url: string;
125124
},
126125
>(
127-
options: TData & Options<TData>,
126+
options: TData &
127+
Pick<
128+
RequestOptions<unknown, boolean>,
129+
'axios' | 'baseURL' | 'paramsSerializer' | 'querySerializer'
130+
>,
128131
) => string;
129132

130133
export type Client = CoreClient<RequestFn, Config, MethodFn, BuildUrlFn, SseFn> & {

0 commit comments

Comments
 (0)