Skip to content

Commit b650b88

Browse files
Katarina Antonkaciakmaciak
authored andcommitted
refactor: convert all query keys into arrays
resolves #65
1 parent 812cf45 commit b650b88

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/__tests__/subscription-storage.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ describe('subscription storage', () => {
3838
const observerFn = jest.fn();
3939
const { subscription, next } = subscriptionFactory(observerFn);
4040

41-
storeSubscription(queryClient, 'test', subscription);
41+
storeSubscription(queryClient, ['test'], subscription);
4242

4343
next('value-1');
4444
expect(observerFn).toHaveBeenCalledTimes(1);
4545
expect(observerFn).toHaveBeenCalledWith('value-1');
4646
observerFn.mockClear();
4747

48-
cleanupSubscription(queryClient, 'test');
48+
cleanupSubscription(queryClient, ['test']);
4949

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

62-
storeSubscription(queryClient, 'testA', subscriptionA);
63-
storeSubscription(queryClient, 'testB', subscriptionB);
62+
storeSubscription(queryClient, ['testA'], subscriptionA);
63+
storeSubscription(queryClient, ['testB'], subscriptionB);
6464

6565
nextA('A1');
6666
expect(observerAFn).toHaveBeenCalledTimes(1);
@@ -71,7 +71,7 @@ describe('subscription storage', () => {
7171
expect(observerBFn).toHaveBeenCalledWith('B1');
7272
observerBFn.mockClear();
7373

74-
cleanupSubscription(queryClient, 'testA');
74+
cleanupSubscription(queryClient, ['testA']);
7575

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

8383
it('should not fail when key does not exist', () => {
8484
expect(() =>
85-
cleanupSubscription(queryClient, 'test-non-existing')
85+
cleanupSubscription(queryClient, ['test-non-existing'])
8686
).not.toThrow();
8787
});
8888
});

src/__tests__/use-infinite-subscription.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ describe('useInfiniteSubscription', () => {
4949
};
5050
}
5151

52-
const testSubscriptionKey = 'test-subscription-key';
52+
const testSubscriptionKey = ['test-subscription-key'];
5353

5454
function mapToPages<T>(data: T) {
5555
return { pageParams: [undefined], pages: [data] };

src/__tests__/use-subscription.spec.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe('useSubscription', () => {
4141
const test$ = interval(testInterval).pipe(finalize(finalizeFn));
4242
const testSubscriptionFn = jest.fn(() => test$);
4343

44-
const testSubscriptionKey = 'test-subscription-key';
44+
const testSubscriptionKey = ['test-subscription-key'];
4545

4646
afterEach(() => {
4747
testSubscriptionFn.mockClear();
@@ -231,7 +231,7 @@ describe('useSubscription', () => {
231231
firstHookRender = renderHook(
232232
(options: UseSubscriptionOptions) =>
233233
useSubscription(
234-
'first-subscription-key',
234+
['first-subscription-key'],
235235
testSubscriptionFn,
236236
options
237237
),

src/subscription-storage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { QueryKey, hashQueryKey, QueryClient } from 'react-query';
22
import { Subscription } from 'rxjs';
33

4-
const clientCacheSubscriptionsKey = '__activeSubscriptions__';
4+
const clientCacheSubscriptionsKey = ['__activeSubscriptions__'];
55
const defaultKey = Symbol('__default__');
66

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

0 commit comments

Comments
 (0)