Skip to content

Convert all query keys into arrays #66

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
kaciakmaciak merged 1 commit into from
Oct 1, 2022
Merged

Convert all query keys into arrays #66

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
12 changes: 6 additions & 6 deletions src/__tests__/subscription-storage.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ describe('subscription storage', () => {
const observerFn = jest.fn();
const { subscription, next } = subscriptionFactory(observerFn);

storeSubscription(queryClient, 'test', subscription);
storeSubscription(queryClient, ['test'], subscription);

next('value-1');
expect(observerFn).toHaveBeenCalledTimes(1);
expect(observerFn).toHaveBeenCalledWith('value-1');
observerFn.mockClear();

cleanupSubscription(queryClient, 'test');
cleanupSubscription(queryClient, ['test']);

next('value-2');
expect(observerFn).not.toHaveBeenCalled();
Expand All @@ -59,8 +59,8 @@ describe('subscription storage', () => {
const { subscription: subscriptionB, next: nextB } =
subscriptionFactory(observerBFn);

storeSubscription(queryClient, 'testA', subscriptionA);
storeSubscription(queryClient, 'testB', subscriptionB);
storeSubscription(queryClient, ['testA'], subscriptionA);
storeSubscription(queryClient, ['testB'], subscriptionB);

nextA('A1');
expect(observerAFn).toHaveBeenCalledTimes(1);
Expand All @@ -71,7 +71,7 @@ describe('subscription storage', () => {
expect(observerBFn).toHaveBeenCalledWith('B1');
observerBFn.mockClear();

cleanupSubscription(queryClient, 'testA');
cleanupSubscription(queryClient, ['testA']);

nextA('A2');
expect(observerAFn).not.toHaveBeenCalled();
Expand All @@ -82,7 +82,7 @@ describe('subscription storage', () => {

it('should not fail when key does not exist', () => {
expect(() =>
cleanupSubscription(queryClient, 'test-non-existing')
cleanupSubscription(queryClient, ['test-non-existing'])
).not.toThrow();
});
});
2 changes: 1 addition & 1 deletion src/__tests__/use-infinite-subscription.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ describe('useInfiniteSubscription', () => {
};
}

const testSubscriptionKey = 'test-subscription-key';
const testSubscriptionKey = ['test-subscription-key'];

function mapToPages<T>(data: T) {
return { pageParams: [undefined], pages: [data] };
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/use-subscription.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe('useSubscription', () => {
const test$ = interval(testInterval).pipe(finalize(finalizeFn));
const testSubscriptionFn = jest.fn(() => test$);

const testSubscriptionKey = 'test-subscription-key';
const testSubscriptionKey = ['test-subscription-key'];

afterEach(() => {
testSubscriptionFn.mockClear();
Expand Down Expand Up @@ -231,7 +231,7 @@ describe('useSubscription', () => {
firstHookRender = renderHook(
(options: UseSubscriptionOptions) =>
useSubscription(
'first-subscription-key',
['first-subscription-key'],
testSubscriptionFn,
options
),
Expand Down
2 changes: 1 addition & 1 deletion src/subscription-storage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { QueryKey, hashQueryKey, QueryClient } from 'react-query';
import { Subscription } from 'rxjs';

const clientCacheSubscriptionsKey = '__activeSubscriptions__';
const clientCacheSubscriptionsKey = ['__activeSubscriptions__'];
const defaultKey = Symbol('__default__');

type SubscriptionStorageItem = Map<string | typeof defaultKey, Subscription>;
Expand Down