-
Notifications
You must be signed in to change notification settings - Fork 468
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(useAsyncStorage): make more robust #760
Closed
+227
−20
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -61,3 +61,4 @@ buck-out/ | |
|
||
# builds by bob | ||
lib/ | ||
coverage |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
/** | ||
* @format | ||
*/ | ||
import { renderHook, act } from '@testing-library/react-hooks'; | ||
|
||
import AsyncStorage, { useAsyncStorage } from '../src'; | ||
|
||
afterEach(AsyncStorage.clear); | ||
|
||
function expectStableCallbacks(result: any, rerender: () => void) { | ||
const previousFunctions = Object.values(result.current).filter( | ||
(item) => typeof item === 'function' | ||
); | ||
rerender(); | ||
const nowFunctions = Object.values(result.current).filter( | ||
(item) => typeof item === 'function' | ||
); | ||
expect(nowFunctions).toHaveLength(previousFunctions.length); | ||
expect(nowFunctions).toEqual(previousFunctions); | ||
} | ||
|
||
describe('useAsyncStorage', () => { | ||
it('should export only stable output', async () => { | ||
const { result, rerender } = renderHook(() => useAsyncStorage('key')); | ||
expect(result.error).toBeUndefined(); | ||
expectStableCallbacks(result, rerender); | ||
}); | ||
|
||
it('can read/write data to/from storage', async () => { | ||
const newData = Math.floor(Math.random() * 1000).toString(); | ||
const { result } = renderHook(() => useAsyncStorage('key')); | ||
|
||
await result.current.setItem(newData); | ||
|
||
const data = await result.current.getItem(); | ||
|
||
expect(data).toBe(newData); | ||
}); | ||
|
||
it('can remove from storage', async () => { | ||
await AsyncStorage.setItem('key', 'value'); | ||
const { result } = renderHook(() => useAsyncStorage('key')); | ||
await act(() => result.current.removeItem()); | ||
expect(await AsyncStorage.getItem('key')).toBeNull(); | ||
}); | ||
|
||
it('should throw when mergeItem is not supported', async () => { | ||
const { result } = renderHook(() => useAsyncStorage('key')); | ||
const mergeItem = AsyncStorage.mergeItem; | ||
delete AsyncStorage.mergeItem; | ||
expect(result.current.mergeItem({})).rejects.toThrow(); | ||
AsyncStorage.mergeItem = mergeItem; | ||
}); | ||
|
||
it('can use merge with current data in storage', async () => { | ||
let originalPerson = { | ||
name: 'Jerry', | ||
age: 21, | ||
characteristics: { | ||
hair: 'black', | ||
eyes: 'green', | ||
}, | ||
}; | ||
|
||
const { result } = renderHook(() => useAsyncStorage('person')); | ||
|
||
await result.current.setItem(JSON.stringify(originalPerson)); | ||
|
||
originalPerson.name = 'Harry'; | ||
originalPerson.characteristics.hair = 'red'; | ||
// @ts-expect-error | ||
originalPerson.characteristics.shoeSize = 40; | ||
|
||
await result.current.mergeItem(JSON.stringify(originalPerson)); | ||
|
||
const currentPerson = await result.current.getItem(); | ||
const person = JSON.parse(currentPerson); | ||
|
||
expect(person).toHaveProperty('name', 'Harry'); | ||
expect(person.characteristics).toHaveProperty('hair', 'red'); | ||
expect(person.characteristics).toHaveProperty('shoeSize', 40); | ||
}); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,33 @@ | ||
import React from 'react'; | ||
import AsyncStorage from './AsyncStorage'; | ||
import type { AsyncStorageHook } from './types'; | ||
|
||
export function useAsyncStorage(key: string): AsyncStorageHook { | ||
return { | ||
getItem: (...args) => AsyncStorage.getItem(key, ...args), | ||
setItem: (...args) => AsyncStorage.setItem(key, ...args), | ||
mergeItem: (...args) => | ||
AsyncStorage.mergeItem?.(key, ...args) ?? | ||
export function useAsyncStorage(key: string) { | ||
const getItem = React.useCallback( | ||
(...args) => AsyncStorage.getItem(key, ...args), | ||
[key] | ||
); | ||
|
||
const setItem = React.useCallback( | ||
(...args: any[]) => AsyncStorage.setItem(key, args[0], args[1]), | ||
[key] | ||
); | ||
|
||
const mergeItem = React.useCallback( | ||
(...args) => | ||
AsyncStorage.mergeItem?.(key, args[0], args[1]) ?? | ||
Promise.reject('Not implemented'), | ||
removeItem: (...args) => AsyncStorage.removeItem(key, ...args), | ||
[key] | ||
); | ||
|
||
const removeItem = React.useCallback( | ||
(...args) => AsyncStorage.removeItem(key, ...args), | ||
[key] | ||
); | ||
|
||
return { | ||
getItem, | ||
setItem, | ||
mergeItem, | ||
removeItem, | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we have to create a new array for each of the callbacks? Can we create it once and reuse?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, this doesn't work. Eslint will complain: