Skip to content

Commit

Permalink
feat(useAsyncState): add initialized
Browse files Browse the repository at this point in the history
  • Loading branch information
Hfutsora committed Apr 20, 2023
1 parent b20aacf commit 47c1829
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
8 changes: 8 additions & 0 deletions packages/core/useAsyncState/index.test.ts
Expand Up @@ -27,6 +27,14 @@ describe('useAsyncState', () => {
expect(state.value).toBe(2)
})

it('should work with initialized', async () => {
const { execute, initialized, isLoading } = useAsyncState(p1, 0, { immediate: false })
execute()
expect(isLoading.value).toBeTruthy()
await initialized.value
expect(isLoading.value).toBeFalsy()
})

it('should work with isLoading', () => {
const { execute, isLoading } = useAsyncState(p1, 0, { immediate: false })
expect(isLoading.value).toBeFalsy()
Expand Down
8 changes: 8 additions & 0 deletions packages/core/useAsyncState/index.ts
Expand Up @@ -5,6 +5,7 @@ import { ref, shallowRef } from 'vue-demi'
export interface UseAsyncStateReturn<Data, Params extends any[], Shallow extends boolean> {
state: Shallow extends true ? Ref<Data> : Ref<UnwrapRef<Data>>
isReady: Ref<boolean>
initialized: Ref<Promise<void> | undefined>
isLoading: Ref<boolean>
error: Ref<unknown>
execute: (delay?: number, ...args: Params) => Promise<Data>
Expand Down Expand Up @@ -92,13 +93,18 @@ export function useAsyncState<Data, Params extends any[] = [], Shallow extends b
const isReady = ref(false)
const isLoading = ref(false)
const error = shallowRef<unknown | undefined>(undefined)
let initialize: CallableFunction
const initialized = shallowRef<Promise<void> | undefined>(undefined)

async function execute(delay = 0, ...args: any[]) {
if (resetOnExecute)
state.value = initialState
error.value = undefined
isReady.value = false
isLoading.value = true
initialized.value = new Promise((resolve) => {
initialize = resolve
})

if (delay > 0)
await promiseTimeout(delay)
Expand All @@ -111,6 +117,7 @@ export function useAsyncState<Data, Params extends any[] = [], Shallow extends b
const data = await _promise
state.value = data
isReady.value = true
initialize()
onSuccess(data)
}
catch (e) {
Expand All @@ -132,6 +139,7 @@ export function useAsyncState<Data, Params extends any[] = [], Shallow extends b
return {
state: state as Shallow extends true ? Ref<Data> : Ref<UnwrapRef<Data>>,
isReady,
initialized,
isLoading,
error,
execute,
Expand Down

0 comments on commit 47c1829

Please sign in to comment.