Skip to content

feat: dont clear cached data when no observer #599

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 18, 2022
Merged

feat: dont clear cached data when no observer #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions packages/use-dataloader/src/DataLoaderProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import React, {
createContext,
useCallback,
useContext,
useEffect,
useMemo,
useRef,
} from 'react'
Expand Down Expand Up @@ -182,24 +181,6 @@ const DataLoaderProvider = ({
[getRequest],
)

useEffect(() => {
const cleanRequest = () => {
setTimeout(() => {
Object.keys(requestsRef.current).forEach(key => {
if (requestsRef.current[key].getObserversCount() === 0) {
// Worst case there is a memleak
// eslint-disable-next-line @typescript-eslint/no-floating-promises
requestsRef.current[key].destroy()
delete requestsRef.current[key]
}
})
cleanRequest()
}, 300)
}

cleanRequest()
}, [])

const value = useMemo(
() => ({
addRequest,
Expand Down
28 changes: 18 additions & 10 deletions packages/use-dataloader/src/__tests__/DataLoaderProvider.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ import { KEY_IS_NOT_STRING_ERROR, StatusEnum } from '../constants'
const TEST_KEY = 'test'
const PROMISE_TIMEOUT = 5
const fakePromise = () =>
new Promise(resolve => { setTimeout(() => resolve(true), PROMISE_TIMEOUT) })
new Promise(resolve => {
setTimeout(() => resolve(true), PROMISE_TIMEOUT)
})

const fakeNullPromise = () =>
new Promise(resolve => { setTimeout(() => resolve(null), PROMISE_TIMEOUT) })
new Promise(resolve => {
setTimeout(() => resolve(null), PROMISE_TIMEOUT)
})

const wrapper = ({ children }: { children: ReactNode }) => (
<DataLoaderProvider>{children}</DataLoaderProvider>
Expand Down Expand Up @@ -108,7 +112,11 @@ describe('DataLoaderProvider', () => {
wrapper,
})
act(() => {
result.current.addRequest(TEST_KEY, {
result.current.getOrAddRequest(TEST_KEY, {
enabled: true,
method,
})
result.current.getOrAddRequest(TEST_KEY, {
enabled: true,
method,
})
Expand All @@ -125,6 +133,8 @@ describe('DataLoaderProvider', () => {
expect(result.current.getCachedData(TEST_KEY)).toBe(undefined)
expect(result.current.getCachedData()).toStrictEqual({ test: undefined })
expect(result.current.getRequest(TEST_KEY)).toBeDefined()
const unknownReload = result.current.getReloads('unknown')
expect(unknownReload).toBeUndefined()
await act(async () => {
await reloads.test()
})
Expand All @@ -141,20 +151,15 @@ describe('DataLoaderProvider', () => {
expect(result.current.getCachedData(TEST_KEY)).toBeUndefined()
act(() => result.current.clearAllCachedData())
expect(result.current.getCachedData()).toStrictEqual({ test: undefined })
await waitFor(() =>
expect(result.current.getRequest(TEST_KEY)).toBeUndefined(),
)

try {
// @ts-expect-error Should throw an error
result.current.clearCachedData(3)
} catch (e) {
expect((e as Error).message).toBe(KEY_IS_NOT_STRING_ERROR)
}
expect(result.current.getReloads()).not.toHaveProperty(TEST_KEY)
expect(result.current.getReloads(TEST_KEY)).not.toBeDefined()
expect(result.current.getCachedData(TEST_KEY)).toBe(undefined)
expect(result.current.getCachedData()).not.toStrictEqual({
expect(result.current.getCachedData()).toStrictEqual({
test: undefined,
})
try {
Expand Down Expand Up @@ -184,7 +189,10 @@ describe('DataLoaderProvider', () => {

test('should delay max concurrent request', async () => {
const method = jest.fn(
() => new Promise(resolve => { setTimeout(() => resolve(true), 100) }),
() =>
new Promise(resolve => {
setTimeout(() => resolve(true), 100)
}),
)
const { result, waitFor } = renderHook(useDataLoaderContext, {
wrapper: wrapperWith2ConcurrentRequests,
Expand Down