Skip to content

Commit fe3dba6

Browse files
mrlubosmrlubos
authored
Merge branch 'main' into fix/ref-parser-max-stack
2 parents 072a9ae + 11a0f91 commit fe3dba6

73 files changed

Lines changed: 439 additions & 372 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.

‎.changeset/fix-nuxt-async-data-options.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@hey-api/openapi-ts": patch
3+
---
4+
5+
**plugin(@hey-api/client-nuxt)**: fix: forward `asyncDataOptions` to `useFetch` and `useLazyFetch`

‎.changeset/rude-wolves-pump.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@hey-api/openapi-ts": patch
3+
---
4+
5+
**plugin(@angular/common)**: use generics for HttpRequests

‎examples/openapi-ts-angular-common/src/client/@angular/common.gen.ts‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ import type {
4848
*/
4949
export const addPetRequest = <ThrowOnError extends boolean = false>(
5050
options: Options<AddPetData, ThrowOnError>,
51-
): HttpRequest<unknown> =>
52-
(options?.client ?? client).requestOptions({
51+
): HttpRequest<AddPetResponse> =>
52+
(options?.client ?? client).requestOptions<AddPetResponse, ThrowOnError>({
5353
method: 'POST',
5454
responseStyle: 'data',
5555
url: '/pet',
@@ -63,8 +63,8 @@ export const addPetRequest = <ThrowOnError extends boolean = false>(
6363
*/
6464
export const updatePetRequest = <ThrowOnError extends boolean = false>(
6565
options: Options<UpdatePetData, ThrowOnError>,
66-
): HttpRequest<unknown> =>
67-
(options?.client ?? client).requestOptions({
66+
): HttpRequest<UpdatePetResponse> =>
67+
(options?.client ?? client).requestOptions<UpdatePetResponse, ThrowOnError>({
6868
method: 'PUT',
6969
responseStyle: 'data',
7070
url: '/pet',
@@ -78,8 +78,8 @@ export const updatePetRequest = <ThrowOnError extends boolean = false>(
7878
*/
7979
export const findPetsByStatusRequest = <ThrowOnError extends boolean = false>(
8080
options: Options<FindPetsByStatusData, ThrowOnError>,
81-
): HttpRequest<unknown> =>
82-
(options?.client ?? client).requestOptions({
81+
): HttpRequest<FindPetsByStatusResponse> =>
82+
(options?.client ?? client).requestOptions<FindPetsByStatusResponse, ThrowOnError>({
8383
method: 'GET',
8484
responseStyle: 'data',
8585
url: '/pet/findByStatus',
@@ -93,8 +93,8 @@ export const findPetsByStatusRequest = <ThrowOnError extends boolean = false>(
9393
*/
9494
export const findPetsByTagsRequest = <ThrowOnError extends boolean = false>(
9595
options: Options<FindPetsByTagsData, ThrowOnError>,
96-
): HttpRequest<unknown> =>
97-
(options?.client ?? client).requestOptions({
96+
): HttpRequest<FindPetsByTagsResponse> =>
97+
(options?.client ?? client).requestOptions<FindPetsByTagsResponse, ThrowOnError>({
9898
method: 'GET',
9999
responseStyle: 'data',
100100
url: '/pet/findByTags',
@@ -109,7 +109,7 @@ export const findPetsByTagsRequest = <ThrowOnError extends boolean = false>(
109109
export const deletePetRequest = <ThrowOnError extends boolean = false>(
110110
options: Options<DeletePetData, ThrowOnError>,
111111
): HttpRequest<unknown> =>
112-
(options?.client ?? client).requestOptions({
112+
(options?.client ?? client).requestOptions<unknown, ThrowOnError>({
113113
method: 'DELETE',
114114
responseStyle: 'data',
115115
url: '/pet/{petId}',
@@ -123,8 +123,8 @@ export const deletePetRequest = <ThrowOnError extends boolean = false>(
123123
*/
124124
export const getPetByIdRequest = <ThrowOnError extends boolean = false>(
125125
options: Options<GetPetByIdData, ThrowOnError>,
126-
): HttpRequest<unknown> =>
127-
(options?.client ?? client).requestOptions({
126+
): HttpRequest<GetPetByIdResponse> =>
127+
(options?.client ?? client).requestOptions<GetPetByIdResponse, ThrowOnError>({
128128
method: 'GET',
129129
responseStyle: 'data',
130130
url: '/pet/{petId}',
@@ -138,8 +138,8 @@ export const getPetByIdRequest = <ThrowOnError extends boolean = false>(
138138
*/
139139
export const updatePetWithFormRequest = <ThrowOnError extends boolean = false>(
140140
options: Options<UpdatePetWithFormData, ThrowOnError>,
141-
): HttpRequest<unknown> =>
142-
(options?.client ?? client).requestOptions({
141+
): HttpRequest<UpdatePetWithFormResponse> =>
142+
(options?.client ?? client).requestOptions<UpdatePetWithFormResponse, ThrowOnError>({
143143
method: 'POST',
144144
responseStyle: 'data',
145145
url: '/pet/{petId}',
@@ -153,8 +153,8 @@ export const updatePetWithFormRequest = <ThrowOnError extends boolean = false>(
153153
*/
154154
export const uploadFileRequest = <ThrowOnError extends boolean = false>(
155155
options: Options<UploadFileData, ThrowOnError>,
156-
): HttpRequest<unknown> =>
157-
(options?.client ?? client).requestOptions({
156+
): HttpRequest<UploadFileResponse> =>
157+
(options?.client ?? client).requestOptions<UploadFileResponse, ThrowOnError>({
158158
method: 'POST',
159159
responseStyle: 'data',
160160
url: '/pet/{petId}/uploadImage',
@@ -168,8 +168,8 @@ export const uploadFileRequest = <ThrowOnError extends boolean = false>(
168168
*/
169169
export const getInventoryRequest = <ThrowOnError extends boolean = false>(
170170
options?: Options<GetInventoryData, ThrowOnError>,
171-
): HttpRequest<unknown> =>
172-
(options?.client ?? client).requestOptions({
171+
): HttpRequest<GetInventoryResponse> =>
172+
(options?.client ?? client).requestOptions<GetInventoryResponse, ThrowOnError>({
173173
method: 'GET',
174174
responseStyle: 'data',
175175
url: '/store/inventory',
@@ -183,8 +183,8 @@ export const getInventoryRequest = <ThrowOnError extends boolean = false>(
183183
*/
184184
export const placeOrderRequest = <ThrowOnError extends boolean = false>(
185185
options?: Options<PlaceOrderData, ThrowOnError>,
186-
): HttpRequest<unknown> =>
187-
(options?.client ?? client).requestOptions({
186+
): HttpRequest<PlaceOrderResponse> =>
187+
(options?.client ?? client).requestOptions<PlaceOrderResponse, ThrowOnError>({
188188
method: 'POST',
189189
responseStyle: 'data',
190190
url: '/store/order',
@@ -199,7 +199,7 @@ export const placeOrderRequest = <ThrowOnError extends boolean = false>(
199199
export const deleteOrderRequest = <ThrowOnError extends boolean = false>(
200200
options: Options<DeleteOrderData, ThrowOnError>,
201201
): HttpRequest<unknown> =>
202-
(options?.client ?? client).requestOptions({
202+
(options?.client ?? client).requestOptions<unknown, ThrowOnError>({
203203
method: 'DELETE',
204204
responseStyle: 'data',
205205
url: '/store/order/{orderId}',
@@ -213,8 +213,8 @@ export const deleteOrderRequest = <ThrowOnError extends boolean = false>(
213213
*/
214214
export const getOrderByIdRequest = <ThrowOnError extends boolean = false>(
215215
options: Options<GetOrderByIdData, ThrowOnError>,
216-
): HttpRequest<unknown> =>
217-
(options?.client ?? client).requestOptions({
216+
): HttpRequest<GetOrderByIdResponse> =>
217+
(options?.client ?? client).requestOptions<GetOrderByIdResponse, ThrowOnError>({
218218
method: 'GET',
219219
responseStyle: 'data',
220220
url: '/store/order/{orderId}',
@@ -228,8 +228,8 @@ export const getOrderByIdRequest = <ThrowOnError extends boolean = false>(
228228
*/
229229
export const createUserRequest = <ThrowOnError extends boolean = false>(
230230
options?: Options<CreateUserData, ThrowOnError>,
231-
): HttpRequest<unknown> =>
232-
(options?.client ?? client).requestOptions({
231+
): HttpRequest<CreateUserResponse> =>
232+
(options?.client ?? client).requestOptions<CreateUserResponse, ThrowOnError>({
233233
method: 'POST',
234234
responseStyle: 'data',
235235
url: '/user',
@@ -243,8 +243,8 @@ export const createUserRequest = <ThrowOnError extends boolean = false>(
243243
*/
244244
export const createUsersWithListInputRequest = <ThrowOnError extends boolean = false>(
245245
options?: Options<CreateUsersWithListInputData, ThrowOnError>,
246-
): HttpRequest<unknown> =>
247-
(options?.client ?? client).requestOptions({
246+
): HttpRequest<CreateUsersWithListInputResponse> =>
247+
(options?.client ?? client).requestOptions<CreateUsersWithListInputResponse, ThrowOnError>({
248248
method: 'POST',
249249
responseStyle: 'data',
250250
url: '/user/createWithList',
@@ -258,8 +258,8 @@ export const createUsersWithListInputRequest = <ThrowOnError extends boolean = f
258258
*/
259259
export const loginUserRequest = <ThrowOnError extends boolean = false>(
260260
options?: Options<LoginUserData, ThrowOnError>,
261-
): HttpRequest<unknown> =>
262-
(options?.client ?? client).requestOptions({
261+
): HttpRequest<LoginUserResponse> =>
262+
(options?.client ?? client).requestOptions<LoginUserResponse, ThrowOnError>({
263263
method: 'GET',
264264
responseStyle: 'data',
265265
url: '/user/login',
@@ -274,7 +274,7 @@ export const loginUserRequest = <ThrowOnError extends boolean = false>(
274274
export const logoutUserRequest = <ThrowOnError extends boolean = false>(
275275
options?: Options<LogoutUserData, ThrowOnError>,
276276
): HttpRequest<unknown> =>
277-
(options?.client ?? client).requestOptions({
277+
(options?.client ?? client).requestOptions<unknown, ThrowOnError>({
278278
method: 'GET',
279279
responseStyle: 'data',
280280
url: '/user/logout',
@@ -289,7 +289,7 @@ export const logoutUserRequest = <ThrowOnError extends boolean = false>(
289289
export const deleteUserRequest = <ThrowOnError extends boolean = false>(
290290
options: Options<DeleteUserData, ThrowOnError>,
291291
): HttpRequest<unknown> =>
292-
(options?.client ?? client).requestOptions({
292+
(options?.client ?? client).requestOptions<unknown, ThrowOnError>({
293293
method: 'DELETE',
294294
responseStyle: 'data',
295295
url: '/user/{username}',
@@ -303,8 +303,8 @@ export const deleteUserRequest = <ThrowOnError extends boolean = false>(
303303
*/
304304
export const getUserByNameRequest = <ThrowOnError extends boolean = false>(
305305
options: Options<GetUserByNameData, ThrowOnError>,
306-
): HttpRequest<unknown> =>
307-
(options?.client ?? client).requestOptions({
306+
): HttpRequest<GetUserByNameResponse> =>
307+
(options?.client ?? client).requestOptions<GetUserByNameResponse, ThrowOnError>({
308308
method: 'GET',
309309
responseStyle: 'data',
310310
url: '/user/{username}',
@@ -319,7 +319,7 @@ export const getUserByNameRequest = <ThrowOnError extends boolean = false>(
319319
export const updateUserRequest = <ThrowOnError extends boolean = false>(
320320
options: Options<UpdateUserData, ThrowOnError>,
321321
): HttpRequest<unknown> =>
322-
(options?.client ?? client).requestOptions({
322+
(options?.client ?? client).requestOptions<unknown, ThrowOnError>({
323323
method: 'PUT',
324324
responseStyle: 'data',
325325
url: '/user/{username}',

‎examples/openapi-ts-angular-common/src/client/client/client.gen.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
5555
>();
5656

5757
const requestOptions = <
58+
TData = unknown,
5859
ThrowOnError extends boolean = false,
5960
TResponseStyle extends ResponseStyle = 'fields',
6061
>(
61-
options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
62+
options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
6263
) => {
6364
const opts = {
6465
..._config,

‎examples/openapi-ts-angular-common/src/client/client/types.gen.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,12 @@ type RequestFn = <
169169
) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
170170

171171
type RequestOptionsFn = <
172+
T,
172173
ThrowOnError extends boolean = false,
173174
TResponseStyle extends ResponseStyle = 'fields',
174175
>(
175-
options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
176-
) => HttpRequest<unknown>;
176+
options: RequestOptions<T, TResponseStyle, ThrowOnError>,
177+
) => HttpRequest<T>;
177178

178179
type BuildUrlFn = <
179180
TData extends {

‎examples/openapi-ts-angular/src/client/client/client.gen.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
5555
>();
5656

5757
const requestOptions = <
58+
TData = unknown,
5859
ThrowOnError extends boolean = false,
5960
TResponseStyle extends ResponseStyle = 'fields',
6061
>(
61-
options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
62+
options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
6263
) => {
6364
const opts = {
6465
..._config,

‎examples/openapi-ts-angular/src/client/client/types.gen.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,12 @@ type RequestFn = <
169169
) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
170170

171171
type RequestOptionsFn = <
172+
T,
172173
ThrowOnError extends boolean = false,
173174
TResponseStyle extends ResponseStyle = 'fields',
174175
>(
175-
options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
176-
) => HttpRequest<unknown>;
176+
options: RequestOptions<T, TResponseStyle, ThrowOnError>,
177+
) => HttpRequest<T>;
177178

178179
type BuildUrlFn = <
179180
TData extends {

‎examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/client.gen.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
5555
>();
5656

5757
const requestOptions = <
58+
TData = unknown,
5859
ThrowOnError extends boolean = false,
5960
TResponseStyle extends ResponseStyle = 'fields',
6061
>(
61-
options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
62+
options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
6263
) => {
6364
const opts = {
6465
..._config,

‎examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/types.gen.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,12 @@ type RequestFn = <
169169
) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
170170

171171
type RequestOptionsFn = <
172+
T,
172173
ThrowOnError extends boolean = false,
173174
TResponseStyle extends ResponseStyle = 'fields',
174175
>(
175-
options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
176-
) => HttpRequest<unknown>;
176+
options: RequestOptions<T, TResponseStyle, ThrowOnError>,
177+
) => HttpRequest<T>;
177178

178179
type BuildUrlFn = <
179180
TData extends {

‎packages/openapi-ts-tests/main/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"private": true,
55
"type": "module",
66
"scripts": {
7-
"test:types": "tsc -p tsconfig.test.json --noEmit",
87
"typecheck": "tsc --noEmit"
98
},
109
"devDependencies": {

0 commit comments

Comments
 (0)