Skip to content

Commit 5f87c91

Browse files
committed
fix: 🐛 removed checking method type
1 parent f4fe511 commit 5f87c91

File tree

3 files changed

+4
-55
lines changed

3 files changed

+4
-55
lines changed

src/__tests__/post-service.spec.ts

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,4 @@ describe('PostService', () => {
3333
expect(data.length).toEqual(1)
3434
expect(item.pagination.page).toEqual(1)
3535
})
36-
it('it should throw exception if method is not inlist', async () => {
37-
const items = {
38-
data: [{ name: 'Chantouch', post_id: 1 }],
39-
meta: {
40-
pagination: { count: 1, page: 1, perPage: 20 },
41-
include: [],
42-
},
43-
}
44-
mockAdapter.onGet('/posts/1/tags').reply(500, items)
45-
try {
46-
await service.throwException(1)
47-
} catch (e: any) {
48-
expect(e.message).toEqual(
49-
'`unlink` is not a valid request type, must be one of: `get`, `GET`, `delete`, `DELETE`, `head`, `HEAD`, `options`, `OPTIONS`, `post`, `POST`, `put`, `PUT`, `patch`, `PATCH`.',
50-
)
51-
}
52-
})
5336
})

src/core/BaseService.ts

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ class BaseService {
6363
const parameter = id && !isObject(id) ? `/${id}` : ''
6464
const body = isObject(id) ? id : payload
6565
const requestType: Method = hasFiles(body) ? 'post' : 'put'
66-
if (hasFiles(body)) {
67-
Object.assign(body, { _method: 'put' })
68-
}
66+
if (hasFiles(body)) Object.assign(body, { _method: 'put' })
6967
return this.submit<T>(requestType, parameter, body, config)
7068
}
7169

@@ -96,7 +94,6 @@ class BaseService {
9694
}
9795

9896
$submit<T = any>(method: Method, param?: string | number, form?: any, config?: AxiosRequestConfig) {
99-
BaseService.__validateRequestType(method)
10097
this.beforeSubmit()
10198
return new Promise<AxiosResponse<T>>((resolve, reject) => {
10299
const data = hasFiles(form) ? objectToFormData(form) : form
@@ -124,39 +121,10 @@ class BaseService {
124121
}
125122

126123
private __getParameterString(url: string) {
127-
const query = qs.stringify(this.parameters, {
128-
encode: false,
129-
skipNulls: true,
130-
addQueryPrefix: true,
131-
})
124+
const query = qs.stringify(this.parameters, { encode: false, skipNulls: true, addQueryPrefix: true })
132125
return `${url}${query}`
133126
}
134127

135-
private static __validateRequestType(requestType: Method) {
136-
const requestTypes: Method[] = [
137-
'get',
138-
'GET',
139-
'delete',
140-
'DELETE',
141-
'head',
142-
'HEAD',
143-
'options',
144-
'OPTIONS',
145-
'post',
146-
'POST',
147-
'put',
148-
'PUT',
149-
'patch',
150-
'PATCH',
151-
]
152-
if (!requestTypes.includes(requestType)) {
153-
throw new Error(
154-
`\`${requestType}\` is not a valid request type, ` + `must be one of: \`${requestTypes.join('`, `')}\`.`,
155-
)
156-
}
157-
return requestType
158-
}
159-
160128
setParameters(parameters: Record<string, any>): this {
161129
Object.keys(parameters).forEach((key) => {
162130
this.parameters[key] = parameters[key]
@@ -182,9 +150,7 @@ class BaseService {
182150
if (!parameters || !parameters.length) {
183151
this.parameters = []
184152
} else if (isArray(parameters)) {
185-
for (const parameter of parameters) {
186-
delete this.parameters[parameter]
187-
}
153+
for (const parameter of parameters) delete this.parameters[parameter]
188154
}
189155
return this
190156
}

src/util/PostService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class PostService extends BaseService {
55
super('posts', parameters)
66
}
77

8-
tags<T>(id: string | number) {
8+
tags<T = any>(id: string | number) {
99
return this.submit<T>('get', `${id}/tags`)
1010
}
1111

0 commit comments

Comments
 (0)