Skip to content

Commit c406e68

Browse files
committed
refactor: remove throwOnError option
it duplicate of the onError and the error state
1 parent 1a26496 commit c406e68

File tree

4 files changed

+4
-36
lines changed

4 files changed

+4
-36
lines changed

src/__tests__/index.test.tsx

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ describe('useRequest', () => {
244244
defineComponent({
245245
setup() {
246246
const { run } = useRequest(failedRequest, { manual: true });
247-
const handleClick = () => run().catch(() => {}); // catch is needed or the node.js will be crash
247+
const handleClick = () => run();
248248
return () => <button onClick={handleClick}></button>;
249249
},
250250
}),
@@ -254,31 +254,6 @@ describe('useRequest', () => {
254254
expect(console.error).toHaveBeenCalledWith(new Error('fail'));
255255
});
256256

257-
test('request error can be handle by user', async () => {
258-
let errorText = '';
259-
260-
const wrapper = shallowMount(
261-
defineComponent({
262-
setup() {
263-
const { run } = useRequest(failedRequest, { manual: true, throwOnError: true });
264-
265-
return () => (
266-
<button
267-
onClick={() =>
268-
run().catch((err: Error) => {
269-
errorText = err.message;
270-
})
271-
}
272-
></button>
273-
);
274-
},
275-
}),
276-
);
277-
await wrapper.find('button').trigger('click');
278-
await waitForAll();
279-
expect(errorText).toBe('fail');
280-
});
281-
282257
test('onSuccess should work', async () => {
283258
const mockSuccessCallback = jest.fn();
284259

@@ -289,7 +264,7 @@ describe('useRequest', () => {
289264
manual: true,
290265
onSuccess: mockSuccessCallback,
291266
});
292-
const handleClick = () => run().catch(() => {}); // catch is needed or the node.js will be crash
267+
const handleClick = () => run();
293268
return () => <button onClick={handleClick}></button>;
294269
},
295270
}),
@@ -310,7 +285,7 @@ describe('useRequest', () => {
310285
manual: true,
311286
onError: mockErrorCallback,
312287
});
313-
const handleClick = () => run().catch(() => {}); // catch is needed or the node.js will be crash
288+
const handleClick = () => run();
314289
return () => <button onClick={handleClick}></button>;
315290
},
316291
}),

src/core/config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export type GlobalOptions = {
2929
cacheTime?: number;
3030
// -1 means the cache is always valid
3131
staleTime?: number;
32-
throwOnError?: boolean;
3332
manual?: boolean;
3433
};
3534

src/core/createQuery.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ const createQuery = <R, P extends unknown[]>(
5656
): InnerQueryState<R, P> => {
5757
const {
5858
initialAutoRunFlag,
59-
throwOnError,
6059
initialData,
6160
loadingDelay,
6261
pollingInterval,
@@ -159,17 +158,14 @@ const createQuery = <R, P extends unknown[]>(
159158
onError(error, args);
160159
}
161160

162-
if (throwOnError) {
163-
throw error;
164-
}
165161
console.error(error);
166-
return Promise.reject('已处理的错误');
167162
}
168163
return resolvedPromise;
169164
})
170165
.finally(() => {
171166
if (currentCount === count.value) {
172167
cb?.();
168+
173169
// clear delayLoadingTimer
174170
delayLoadingTimer.value();
175171
// run for polling

src/core/useAsyncQuery.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ function useAsyncQuery<R, P extends unknown[], FR>(
4444
manual = false,
4545
ready = ref(true),
4646
refreshDeps = [],
47-
throwOnError = false,
4847
loadingDelay = 0,
4948
pollingWhenHidden = false,
5049
refreshOnWindowFocus = false,
@@ -89,7 +88,6 @@ function useAsyncQuery<R, P extends unknown[], FR>(
8988
initialAutoRunFlag,
9089
initialData,
9190
loadingDelay,
92-
throwOnError,
9391
pollingInterval,
9492
debounceInterval,
9593
throttleInterval,

0 commit comments

Comments
 (0)