Skip to content

Commit 7e15954

Browse files
razor-xrazor-x
committed
Fix type names with Params vs Body
1 parent 447fc95 commit 7e15954

20 files changed

+93
-79
lines changed

‎generate-routes.ts

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@ const renderClassMethod = ({
316316
}: ${renderRequestType({
317317
name,
318318
namespace,
319-
requestFormat,
320319
})},
321320
): Promise<${
322321
resource === null
@@ -363,7 +362,6 @@ const renderEndpointExports = ({
363362
export type ${renderRequestType({
364363
name,
365364
namespace,
366-
requestFormat,
367365
})} = RouteRequest${pascalCase(requestFormat)}<'${path}'>
368366
369367
export type ${renderResponseType({ name, namespace })}= SetNonNullable<
@@ -374,9 +372,22 @@ export type ${renderResponseType({ name, namespace })}= SetNonNullable<
374372
const renderRequestType = ({
375373
name,
376374
namespace,
377-
requestFormat,
378-
}: Pick<Endpoint, 'name' | 'namespace' | 'requestFormat'>): string =>
379-
[pascalCase(namespace), pascalCase(name), pascalCase(requestFormat)].join('')
375+
}: Pick<Endpoint, 'name' | 'namespace'>): string =>
376+
[
377+
pascalCase(namespace),
378+
pascalCase(name),
379+
pascalCase(requestFormatToRequestType(name, namespace)),
380+
].join('')
381+
382+
// UPSTREAM: Should be just requestFormat, but blocked on https://github.com/seamapi/nextlove/issues/117
383+
const requestFormatToRequestType = (
384+
name: string,
385+
_namespace: string,
386+
): 'params' | 'body' => {
387+
if (['get', 'list', 'view'].includes(name)) return 'params'
388+
if (name.startsWith('list')) return 'params'
389+
return 'body'
390+
}
380391

381392
const renderResponseType = ({
382393
name,

‎src/lib/seam/connect/routes/access-codes-unmanaged.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export class SeamHttpAccessCodesUnmanaged {
101101
}
102102

103103
async get(
104-
body: AccessCodesUnmanagedGetBody,
104+
body: AccessCodesUnmanagedGetParams,
105105
): Promise<AccessCodesUnmanagedGetResponse['access_code']> {
106106
const { data } = await this.client.request<AccessCodesUnmanagedGetResponse>(
107107
{
@@ -114,7 +114,7 @@ export class SeamHttpAccessCodesUnmanaged {
114114
}
115115

116116
async list(
117-
body: AccessCodesUnmanagedListBody,
117+
body: AccessCodesUnmanagedListParams,
118118
): Promise<AccessCodesUnmanagedListResponse['access_codes']> {
119119
const { data } =
120120
await this.client.request<AccessCodesUnmanagedListResponse>({
@@ -148,14 +148,14 @@ export type AccessCodesUnmanagedDeleteResponse = SetNonNullable<
148148
Required<RouteResponse<'/access_codes/unmanaged/delete'>>
149149
>
150150

151-
export type AccessCodesUnmanagedGetBody =
151+
export type AccessCodesUnmanagedGetParams =
152152
RouteRequestBody<'/access_codes/unmanaged/get'>
153153

154154
export type AccessCodesUnmanagedGetResponse = SetNonNullable<
155155
Required<RouteResponse<'/access_codes/unmanaged/get'>>
156156
>
157157

158-
export type AccessCodesUnmanagedListBody =
158+
export type AccessCodesUnmanagedListParams =
159159
RouteRequestBody<'/access_codes/unmanaged/list'>
160160

161161
export type AccessCodesUnmanagedListResponse = SetNonNullable<

‎src/lib/seam/connect/routes/access-codes.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export class SeamHttpAccessCodes {
132132
}
133133

134134
async get(
135-
body: AccessCodesGetBody,
135+
body: AccessCodesGetParams,
136136
): Promise<AccessCodesGetResponse['access_code']> {
137137
const { data } = await this.client.request<AccessCodesGetResponse>({
138138
url: '/access_codes/get',
@@ -143,7 +143,7 @@ export class SeamHttpAccessCodes {
143143
}
144144

145145
async list(
146-
body: AccessCodesListBody,
146+
body: AccessCodesListParams,
147147
): Promise<AccessCodesListResponse['access_codes']> {
148148
const { data } = await this.client.request<AccessCodesListResponse>({
149149
url: '/access_codes/list',
@@ -200,13 +200,13 @@ export type AccessCodesGenerateCodeResponse = SetNonNullable<
200200
Required<RouteResponse<'/access_codes/generate_code'>>
201201
>
202202

203-
export type AccessCodesGetBody = RouteRequestBody<'/access_codes/get'>
203+
export type AccessCodesGetParams = RouteRequestBody<'/access_codes/get'>
204204

205205
export type AccessCodesGetResponse = SetNonNullable<
206206
Required<RouteResponse<'/access_codes/get'>>
207207
>
208208

209-
export type AccessCodesListBody = RouteRequestBody<'/access_codes/list'>
209+
export type AccessCodesListParams = RouteRequestBody<'/access_codes/list'>
210210

211211
export type AccessCodesListResponse = SetNonNullable<
212212
Required<RouteResponse<'/access_codes/list'>>

‎src/lib/seam/connect/routes/acs-access-groups.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export class SeamHttpAcsAccessGroups {
110110
}
111111

112112
async get(
113-
body: AcsAccessGroupsGetBody,
113+
body: AcsAccessGroupsGetParams,
114114
): Promise<AcsAccessGroupsGetResponse['acs_access_group']> {
115115
const { data } = await this.client.request<AcsAccessGroupsGetResponse>({
116116
url: '/acs/access_groups/get',
@@ -121,7 +121,7 @@ export class SeamHttpAcsAccessGroups {
121121
}
122122

123123
async list(
124-
body: AcsAccessGroupsListBody,
124+
body: AcsAccessGroupsListParams,
125125
): Promise<AcsAccessGroupsListResponse['acs_access_groups']> {
126126
const { data } = await this.client.request<AcsAccessGroupsListResponse>({
127127
url: '/acs/access_groups/list',
@@ -132,7 +132,7 @@ export class SeamHttpAcsAccessGroups {
132132
}
133133

134134
async listUsers(
135-
body: AcsAccessGroupsListUsersBody,
135+
body: AcsAccessGroupsListUsersParams,
136136
): Promise<AcsAccessGroupsListUsersResponse['acs_users']> {
137137
const { data } =
138138
await this.client.request<AcsAccessGroupsListUsersResponse>({
@@ -181,20 +181,21 @@ export type AcsAccessGroupsDeleteResponse = SetNonNullable<
181181
Required<RouteResponse<'/acs/access_groups/delete'>>
182182
>
183183

184-
export type AcsAccessGroupsGetBody = RouteRequestBody<'/acs/access_groups/get'>
184+
export type AcsAccessGroupsGetParams =
185+
RouteRequestBody<'/acs/access_groups/get'>
185186

186187
export type AcsAccessGroupsGetResponse = SetNonNullable<
187188
Required<RouteResponse<'/acs/access_groups/get'>>
188189
>
189190

190-
export type AcsAccessGroupsListBody =
191+
export type AcsAccessGroupsListParams =
191192
RouteRequestBody<'/acs/access_groups/list'>
192193

193194
export type AcsAccessGroupsListResponse = SetNonNullable<
194195
Required<RouteResponse<'/acs/access_groups/list'>>
195196
>
196197

197-
export type AcsAccessGroupsListUsersBody =
198+
export type AcsAccessGroupsListUsersParams =
198199
RouteRequestBody<'/acs/access_groups/list_users'>
199200

200201
export type AcsAccessGroupsListUsersResponse = SetNonNullable<

‎src/lib/seam/connect/routes/acs-credentials.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export class SeamHttpAcsCredentials {
102102
}
103103

104104
async get(
105-
body: AcsCredentialsGetBody,
105+
body: AcsCredentialsGetParams,
106106
): Promise<AcsCredentialsGetResponse['acs_credential']> {
107107
const { data } = await this.client.request<AcsCredentialsGetResponse>({
108108
url: '/acs/credentials/get',
@@ -113,7 +113,7 @@ export class SeamHttpAcsCredentials {
113113
}
114114

115115
async list(
116-
body: AcsCredentialsListBody,
116+
body: AcsCredentialsListParams,
117117
): Promise<AcsCredentialsListResponse['acs_credentials']> {
118118
const { data } = await this.client.request<AcsCredentialsListResponse>({
119119
url: '/acs/credentials/list',
@@ -138,13 +138,13 @@ export type AcsCredentialsDeleteResponse = SetNonNullable<
138138
Required<RouteResponse<'/acs/credentials/delete'>>
139139
>
140140

141-
export type AcsCredentialsGetBody = RouteRequestBody<'/acs/credentials/get'>
141+
export type AcsCredentialsGetParams = RouteRequestBody<'/acs/credentials/get'>
142142

143143
export type AcsCredentialsGetResponse = SetNonNullable<
144144
Required<RouteResponse<'/acs/credentials/get'>>
145145
>
146146

147-
export type AcsCredentialsListBody = RouteRequestBody<'/acs/credentials/list'>
147+
export type AcsCredentialsListParams = RouteRequestBody<'/acs/credentials/list'>
148148

149149
export type AcsCredentialsListResponse = SetNonNullable<
150150
Required<RouteResponse<'/acs/credentials/list'>>

‎src/lib/seam/connect/routes/acs-systems.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export class SeamHttpAcsSystems {
8383
}
8484

8585
async get(
86-
body: AcsSystemsGetBody,
86+
body: AcsSystemsGetParams,
8787
): Promise<AcsSystemsGetResponse['acs_system']> {
8888
const { data } = await this.client.request<AcsSystemsGetResponse>({
8989
url: '/acs/systems/get',
@@ -94,7 +94,7 @@ export class SeamHttpAcsSystems {
9494
}
9595

9696
async list(
97-
body: AcsSystemsListBody,
97+
body: AcsSystemsListParams,
9898
): Promise<AcsSystemsListResponse['acs_systems']> {
9999
const { data } = await this.client.request<AcsSystemsListResponse>({
100100
url: '/acs/systems/list',
@@ -105,13 +105,13 @@ export class SeamHttpAcsSystems {
105105
}
106106
}
107107

108-
export type AcsSystemsGetBody = RouteRequestBody<'/acs/systems/get'>
108+
export type AcsSystemsGetParams = RouteRequestBody<'/acs/systems/get'>
109109

110110
export type AcsSystemsGetResponse = SetNonNullable<
111111
Required<RouteResponse<'/acs/systems/get'>>
112112
>
113113

114-
export type AcsSystemsListBody = RouteRequestBody<'/acs/systems/list'>
114+
export type AcsSystemsListParams = RouteRequestBody<'/acs/systems/list'>
115115

116116
export type AcsSystemsListResponse = SetNonNullable<
117117
Required<RouteResponse<'/acs/systems/list'>>

‎src/lib/seam/connect/routes/acs-users.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ export class SeamHttpAcsUsers {
109109
})
110110
}
111111

112-
async get(body: AcsUsersGetBody): Promise<AcsUsersGetResponse['acs_user']> {
112+
async get(body: AcsUsersGetParams): Promise<AcsUsersGetResponse['acs_user']> {
113113
const { data } = await this.client.request<AcsUsersGetResponse>({
114114
url: '/acs/users/get',
115115
method: 'post',
@@ -119,7 +119,7 @@ export class SeamHttpAcsUsers {
119119
}
120120

121121
async list(
122-
body: AcsUsersListBody,
122+
body: AcsUsersListParams,
123123
): Promise<AcsUsersListResponse['acs_users']> {
124124
const { data } = await this.client.request<AcsUsersListResponse>({
125125
url: '/acs/users/list',
@@ -183,13 +183,13 @@ export type AcsUsersDeleteResponse = SetNonNullable<
183183
Required<RouteResponse<'/acs/users/delete'>>
184184
>
185185

186-
export type AcsUsersGetBody = RouteRequestBody<'/acs/users/get'>
186+
export type AcsUsersGetParams = RouteRequestBody<'/acs/users/get'>
187187

188188
export type AcsUsersGetResponse = SetNonNullable<
189189
Required<RouteResponse<'/acs/users/get'>>
190190
>
191191

192-
export type AcsUsersListBody = RouteRequestBody<'/acs/users/list'>
192+
export type AcsUsersListParams = RouteRequestBody<'/acs/users/list'>
193193

194194
export type AcsUsersListResponse = SetNonNullable<
195195
Required<RouteResponse<'/acs/users/list'>>

‎src/lib/seam/connect/routes/action-attempts.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export class SeamHttpActionAttempts {
8383
}
8484

8585
async get(
86-
body: ActionAttemptsGetBody,
86+
body: ActionAttemptsGetParams,
8787
): Promise<ActionAttemptsGetResponse['action_attempt']> {
8888
const { data } = await this.client.request<ActionAttemptsGetResponse>({
8989
url: '/action_attempts/get',
@@ -94,7 +94,7 @@ export class SeamHttpActionAttempts {
9494
}
9595

9696
async list(
97-
body: ActionAttemptsListBody,
97+
body: ActionAttemptsListParams,
9898
): Promise<ActionAttemptsListResponse['action_attempts']> {
9999
const { data } = await this.client.request<ActionAttemptsListResponse>({
100100
url: '/action_attempts/list',
@@ -105,13 +105,13 @@ export class SeamHttpActionAttempts {
105105
}
106106
}
107107

108-
export type ActionAttemptsGetBody = RouteRequestBody<'/action_attempts/get'>
108+
export type ActionAttemptsGetParams = RouteRequestBody<'/action_attempts/get'>
109109

110110
export type ActionAttemptsGetResponse = SetNonNullable<
111111
Required<RouteResponse<'/action_attempts/get'>>
112112
>
113113

114-
export type ActionAttemptsListBody = RouteRequestBody<'/action_attempts/list'>
114+
export type ActionAttemptsListParams = RouteRequestBody<'/action_attempts/list'>
115115

116116
export type ActionAttemptsListResponse = SetNonNullable<
117117
Required<RouteResponse<'/action_attempts/list'>>

‎src/lib/seam/connect/routes/client-sessions.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export class SeamHttpClientSessions {
100100
}
101101

102102
async get(
103-
body: ClientSessionsGetBody,
103+
body: ClientSessionsGetParams,
104104
): Promise<ClientSessionsGetResponse['client_session']> {
105105
const { data } = await this.client.request<ClientSessionsGetResponse>({
106106
url: '/client_sessions/get',
@@ -135,7 +135,7 @@ export class SeamHttpClientSessions {
135135
}
136136

137137
async list(
138-
body: ClientSessionsListBody,
138+
body: ClientSessionsListParams,
139139
): Promise<ClientSessionsListResponse['client_sessions']> {
140140
const { data } = await this.client.request<ClientSessionsListResponse>({
141141
url: '/client_sessions/list',
@@ -160,7 +160,7 @@ export type ClientSessionsDeleteResponse = SetNonNullable<
160160
Required<RouteResponse<'/client_sessions/delete'>>
161161
>
162162

163-
export type ClientSessionsGetBody = RouteRequestBody<'/client_sessions/get'>
163+
export type ClientSessionsGetParams = RouteRequestBody<'/client_sessions/get'>
164164

165165
export type ClientSessionsGetResponse = SetNonNullable<
166166
Required<RouteResponse<'/client_sessions/get'>>
@@ -180,7 +180,7 @@ export type ClientSessionsGrantAccessResponse = SetNonNullable<
180180
Required<RouteResponse<'/client_sessions/grant_access'>>
181181
>
182182

183-
export type ClientSessionsListBody = RouteRequestBody<'/client_sessions/list'>
183+
export type ClientSessionsListParams = RouteRequestBody<'/client_sessions/list'>
184184

185185
export type ClientSessionsListResponse = SetNonNullable<
186186
Required<RouteResponse<'/client_sessions/list'>>

‎src/lib/seam/connect/routes/connect-webviews.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export class SeamHttpConnectWebviews {
106106
}
107107

108108
async get(
109-
body: ConnectWebviewsGetBody,
109+
body: ConnectWebviewsGetParams,
110110
): Promise<ConnectWebviewsGetResponse['connect_webview']> {
111111
const { data } = await this.client.request<ConnectWebviewsGetResponse>({
112112
url: '/connect_webviews/get',
@@ -117,7 +117,7 @@ export class SeamHttpConnectWebviews {
117117
}
118118

119119
async list(
120-
body: ConnectWebviewsListBody,
120+
body: ConnectWebviewsListParams,
121121
): Promise<ConnectWebviewsListResponse['connect_webviews']> {
122122
const { data } = await this.client.request<ConnectWebviewsListResponse>({
123123
url: '/connect_webviews/list',
@@ -150,13 +150,14 @@ export type ConnectWebviewsDeleteResponse = SetNonNullable<
150150
Required<RouteResponse<'/connect_webviews/delete'>>
151151
>
152152

153-
export type ConnectWebviewsGetBody = RouteRequestBody<'/connect_webviews/get'>
153+
export type ConnectWebviewsGetParams = RouteRequestBody<'/connect_webviews/get'>
154154

155155
export type ConnectWebviewsGetResponse = SetNonNullable<
156156
Required<RouteResponse<'/connect_webviews/get'>>
157157
>
158158

159-
export type ConnectWebviewsListBody = RouteRequestBody<'/connect_webviews/list'>
159+
export type ConnectWebviewsListParams =
160+
RouteRequestBody<'/connect_webviews/list'>
160161

161162
export type ConnectWebviewsListResponse = SetNonNullable<
162163
Required<RouteResponse<'/connect_webviews/list'>>

0 commit comments

Comments
 (0)