Skip to content

Commit 953e9e5

Browse files
patrick91patrick91
authored
♻️ Remove modify id script in favor of openapi-ts config (#1434)
1 parent b7d2df2 commit 953e9e5

File tree

5 files changed

+133
-157
lines changed

5 files changed

+133
-157
lines changed

‎frontend/modify-openapi-operationids.js‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎frontend/openapi-ts.config.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,19 @@ export default defineConfig({
1010
name: "@hey-api/sdk",
1111
// NOTE: this doesn't allow tree-shaking
1212
asClass: true,
13+
operationId: true,
14+
methodNameBuilder: (operation) => {
15+
// @ts-ignore
16+
let name: string = operation.name
17+
// @ts-ignore
18+
let service: string = operation.service
19+
20+
if (service && name.toLowerCase().startsWith(service.toLowerCase())) {
21+
name = name.slice(service.length)
22+
}
23+
24+
return name.charAt(0).toLowerCase() + name.slice(1)
25+
},
1326
},
1427
],
1528
})

‎frontend/src/client/sdk.gen.ts‎

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -4,46 +4,46 @@ import type { CancelablePromise } from "./core/CancelablePromise"
44
import { OpenAPI } from "./core/OpenAPI"
55
import { request as __request } from "./core/request"
66
import type {
7-
ReadItemsData,
8-
ReadItemsResponse,
9-
CreateItemData,
10-
CreateItemResponse,
11-
ReadItemData,
12-
ReadItemResponse,
13-
UpdateItemData,
14-
UpdateItemResponse,
15-
DeleteItemData,
16-
DeleteItemResponse,
17-
LoginAccessTokenData,
18-
LoginAccessTokenResponse,
19-
TestTokenResponse,
20-
RecoverPasswordData,
21-
RecoverPasswordResponse,
22-
ResetPasswordData,
23-
ResetPasswordResponse,
24-
RecoverPasswordHtmlContentData,
25-
RecoverPasswordHtmlContentResponse,
26-
ReadUsersData,
27-
ReadUsersResponse,
28-
CreateUserData,
29-
CreateUserResponse,
30-
ReadUserMeResponse,
31-
DeleteUserMeResponse,
32-
UpdateUserMeData,
33-
UpdateUserMeResponse,
34-
UpdatePasswordMeData,
35-
UpdatePasswordMeResponse,
36-
RegisterUserData,
37-
RegisterUserResponse,
38-
ReadUserByIdData,
39-
ReadUserByIdResponse,
40-
UpdateUserData,
41-
UpdateUserResponse,
42-
DeleteUserData,
43-
DeleteUserResponse,
44-
TestEmailData,
45-
TestEmailResponse,
46-
HealthCheckResponse,
7+
ItemsReadItemsData,
8+
ItemsReadItemsResponse,
9+
ItemsCreateItemData,
10+
ItemsCreateItemResponse,
11+
ItemsReadItemData,
12+
ItemsReadItemResponse,
13+
ItemsUpdateItemData,
14+
ItemsUpdateItemResponse,
15+
ItemsDeleteItemData,
16+
ItemsDeleteItemResponse,
17+
LoginLoginAccessTokenData,
18+
LoginLoginAccessTokenResponse,
19+
LoginTestTokenResponse,
20+
LoginRecoverPasswordData,
21+
LoginRecoverPasswordResponse,
22+
LoginResetPasswordData,
23+
LoginResetPasswordResponse,
24+
LoginRecoverPasswordHtmlContentData,
25+
LoginRecoverPasswordHtmlContentResponse,
26+
UsersReadUsersData,
27+
UsersReadUsersResponse,
28+
UsersCreateUserData,
29+
UsersCreateUserResponse,
30+
UsersReadUserMeResponse,
31+
UsersDeleteUserMeResponse,
32+
UsersUpdateUserMeData,
33+
UsersUpdateUserMeResponse,
34+
UsersUpdatePasswordMeData,
35+
UsersUpdatePasswordMeResponse,
36+
UsersRegisterUserData,
37+
UsersRegisterUserResponse,
38+
UsersReadUserByIdData,
39+
UsersReadUserByIdResponse,
40+
UsersUpdateUserData,
41+
UsersUpdateUserResponse,
42+
UsersDeleteUserData,
43+
UsersDeleteUserResponse,
44+
UtilsTestEmailData,
45+
UtilsTestEmailResponse,
46+
UtilsHealthCheckResponse,
4747
} from "./types.gen"
4848

4949
export class ItemsService {
@@ -57,8 +57,8 @@ export class ItemsService {
5757
* @throws ApiError
5858
*/
5959
public static readItems(
60-
data: ReadItemsData = {},
61-
): CancelablePromise<ReadItemsResponse> {
60+
data: ItemsReadItemsData = {},
61+
): CancelablePromise<ItemsReadItemsResponse> {
6262
return __request(OpenAPI, {
6363
method: "GET",
6464
url: "/api/v1/items/",
@@ -81,8 +81,8 @@ export class ItemsService {
8181
* @throws ApiError
8282
*/
8383
public static createItem(
84-
data: CreateItemData,
85-
): CancelablePromise<CreateItemResponse> {
84+
data: ItemsCreateItemData,
85+
): CancelablePromise<ItemsCreateItemResponse> {
8686
return __request(OpenAPI, {
8787
method: "POST",
8888
url: "/api/v1/items/",
@@ -103,8 +103,8 @@ export class ItemsService {
103103
* @throws ApiError
104104
*/
105105
public static readItem(
106-
data: ReadItemData,
107-
): CancelablePromise<ReadItemResponse> {
106+
data: ItemsReadItemData,
107+
): CancelablePromise<ItemsReadItemResponse> {
108108
return __request(OpenAPI, {
109109
method: "GET",
110110
url: "/api/v1/items/{id}",
@@ -127,8 +127,8 @@ export class ItemsService {
127127
* @throws ApiError
128128
*/
129129
public static updateItem(
130-
data: UpdateItemData,
131-
): CancelablePromise<UpdateItemResponse> {
130+
data: ItemsUpdateItemData,
131+
): CancelablePromise<ItemsUpdateItemResponse> {
132132
return __request(OpenAPI, {
133133
method: "PUT",
134134
url: "/api/v1/items/{id}",
@@ -152,8 +152,8 @@ export class ItemsService {
152152
* @throws ApiError
153153
*/
154154
public static deleteItem(
155-
data: DeleteItemData,
156-
): CancelablePromise<DeleteItemResponse> {
155+
data: ItemsDeleteItemData,
156+
): CancelablePromise<ItemsDeleteItemResponse> {
157157
return __request(OpenAPI, {
158158
method: "DELETE",
159159
url: "/api/v1/items/{id}",
@@ -177,8 +177,8 @@ export class LoginService {
177177
* @throws ApiError
178178
*/
179179
public static loginAccessToken(
180-
data: LoginAccessTokenData,
181-
): CancelablePromise<LoginAccessTokenResponse> {
180+
data: LoginLoginAccessTokenData,
181+
): CancelablePromise<LoginLoginAccessTokenResponse> {
182182
return __request(OpenAPI, {
183183
method: "POST",
184184
url: "/api/v1/login/access-token",
@@ -196,7 +196,7 @@ export class LoginService {
196196
* @returns UserPublic Successful Response
197197
* @throws ApiError
198198
*/
199-
public static testToken(): CancelablePromise<TestTokenResponse> {
199+
public static testToken(): CancelablePromise<LoginTestTokenResponse> {
200200
return __request(OpenAPI, {
201201
method: "POST",
202202
url: "/api/v1/login/test-token",
@@ -212,8 +212,8 @@ export class LoginService {
212212
* @throws ApiError
213213
*/
214214
public static recoverPassword(
215-
data: RecoverPasswordData,
216-
): CancelablePromise<RecoverPasswordResponse> {
215+
data: LoginRecoverPasswordData,
216+
): CancelablePromise<LoginRecoverPasswordResponse> {
217217
return __request(OpenAPI, {
218218
method: "POST",
219219
url: "/api/v1/password-recovery/{email}",
@@ -235,8 +235,8 @@ export class LoginService {
235235
* @throws ApiError
236236
*/
237237
public static resetPassword(
238-
data: ResetPasswordData,
239-
): CancelablePromise<ResetPasswordResponse> {
238+
data: LoginResetPasswordData,
239+
): CancelablePromise<LoginResetPasswordResponse> {
240240
return __request(OpenAPI, {
241241
method: "POST",
242242
url: "/api/v1/reset-password/",
@@ -257,8 +257,8 @@ export class LoginService {
257257
* @throws ApiError
258258
*/
259259
public static recoverPasswordHtmlContent(
260-
data: RecoverPasswordHtmlContentData,
261-
): CancelablePromise<RecoverPasswordHtmlContentResponse> {
260+
data: LoginRecoverPasswordHtmlContentData,
261+
): CancelablePromise<LoginRecoverPasswordHtmlContentResponse> {
262262
return __request(OpenAPI, {
263263
method: "POST",
264264
url: "/api/v1/password-recovery-html-content/{email}",
@@ -283,8 +283,8 @@ export class UsersService {
283283
* @throws ApiError
284284
*/
285285
public static readUsers(
286-
data: ReadUsersData = {},
287-
): CancelablePromise<ReadUsersResponse> {
286+
data: UsersReadUsersData = {},
287+
): CancelablePromise<UsersReadUsersResponse> {
288288
return __request(OpenAPI, {
289289
method: "GET",
290290
url: "/api/v1/users/",
@@ -307,8 +307,8 @@ export class UsersService {
307307
* @throws ApiError
308308
*/
309309
public static createUser(
310-
data: CreateUserData,
311-
): CancelablePromise<CreateUserResponse> {
310+
data: UsersCreateUserData,
311+
): CancelablePromise<UsersCreateUserResponse> {
312312
return __request(OpenAPI, {
313313
method: "POST",
314314
url: "/api/v1/users/",
@@ -326,7 +326,7 @@ export class UsersService {
326326
* @returns UserPublic Successful Response
327327
* @throws ApiError
328328
*/
329-
public static readUserMe(): CancelablePromise<ReadUserMeResponse> {
329+
public static readUserMe(): CancelablePromise<UsersReadUserMeResponse> {
330330
return __request(OpenAPI, {
331331
method: "GET",
332332
url: "/api/v1/users/me",
@@ -339,7 +339,7 @@ export class UsersService {
339339
* @returns Message Successful Response
340340
* @throws ApiError
341341
*/
342-
public static deleteUserMe(): CancelablePromise<DeleteUserMeResponse> {
342+
public static deleteUserMe(): CancelablePromise<UsersDeleteUserMeResponse> {
343343
return __request(OpenAPI, {
344344
method: "DELETE",
345345
url: "/api/v1/users/me",
@@ -355,8 +355,8 @@ export class UsersService {
355355
* @throws ApiError
356356
*/
357357
public static updateUserMe(
358-
data: UpdateUserMeData,
359-
): CancelablePromise<UpdateUserMeResponse> {
358+
data: UsersUpdateUserMeData,
359+
): CancelablePromise<UsersUpdateUserMeResponse> {
360360
return __request(OpenAPI, {
361361
method: "PATCH",
362362
url: "/api/v1/users/me",
@@ -377,8 +377,8 @@ export class UsersService {
377377
* @throws ApiError
378378
*/
379379
public static updatePasswordMe(
380-
data: UpdatePasswordMeData,
381-
): CancelablePromise<UpdatePasswordMeResponse> {
380+
data: UsersUpdatePasswordMeData,
381+
): CancelablePromise<UsersUpdatePasswordMeResponse> {
382382
return __request(OpenAPI, {
383383
method: "PATCH",
384384
url: "/api/v1/users/me/password",
@@ -399,8 +399,8 @@ export class UsersService {
399399
* @throws ApiError
400400
*/
401401
public static registerUser(
402-
data: RegisterUserData,
403-
): CancelablePromise<RegisterUserResponse> {
402+
data: UsersRegisterUserData,
403+
): CancelablePromise<UsersRegisterUserResponse> {
404404
return __request(OpenAPI, {
405405
method: "POST",
406406
url: "/api/v1/users/signup",
@@ -421,8 +421,8 @@ export class UsersService {
421421
* @throws ApiError
422422
*/
423423
public static readUserById(
424-
data: ReadUserByIdData,
425-
): CancelablePromise<ReadUserByIdResponse> {
424+
data: UsersReadUserByIdData,
425+
): CancelablePromise<UsersReadUserByIdResponse> {
426426
return __request(OpenAPI, {
427427
method: "GET",
428428
url: "/api/v1/users/{user_id}",
@@ -445,8 +445,8 @@ export class UsersService {
445445
* @throws ApiError
446446
*/
447447
public static updateUser(
448-
data: UpdateUserData,
449-
): CancelablePromise<UpdateUserResponse> {
448+
data: UsersUpdateUserData,
449+
): CancelablePromise<UsersUpdateUserResponse> {
450450
return __request(OpenAPI, {
451451
method: "PATCH",
452452
url: "/api/v1/users/{user_id}",
@@ -470,8 +470,8 @@ export class UsersService {
470470
* @throws ApiError
471471
*/
472472
public static deleteUser(
473-
data: DeleteUserData,
474-
): CancelablePromise<DeleteUserResponse> {
473+
data: UsersDeleteUserData,
474+
): CancelablePromise<UsersDeleteUserResponse> {
475475
return __request(OpenAPI, {
476476
method: "DELETE",
477477
url: "/api/v1/users/{user_id}",
@@ -495,8 +495,8 @@ export class UtilsService {
495495
* @throws ApiError
496496
*/
497497
public static testEmail(
498-
data: TestEmailData,
499-
): CancelablePromise<TestEmailResponse> {
498+
data: UtilsTestEmailData,
499+
): CancelablePromise<UtilsTestEmailResponse> {
500500
return __request(OpenAPI, {
501501
method: "POST",
502502
url: "/api/v1/utils/test-email/",
@@ -514,7 +514,7 @@ export class UtilsService {
514514
* @returns boolean Successful Response
515515
* @throws ApiError
516516
*/
517-
public static healthCheck(): CancelablePromise<HealthCheckResponse> {
517+
public static healthCheck(): CancelablePromise<UtilsHealthCheckResponse> {
518518
return __request(OpenAPI, {
519519
method: "GET",
520520
url: "/api/v1/utils/health-check/",

0 commit comments

Comments
 (0)