Remove queryClient from UseReqOpts

akiomik · Jun 13, 2023 · 98177ac · 98177ac
1 parent 957b181
commit 98177ac
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 47 deletions.
diff --git a/src/lib/components/Article.svelte b/src/lib/components/Article.svelte
@@ -5,7 +5,6 @@
    */
 
   import type { QueryKey } from '@tanstack/svelte-query';
-  import { useQueryClient } from '@tanstack/svelte-query';
   import type { Nostr } from 'rx-nostr';
 
   import type { ReqStatus, RxReqBase } from '$lib/stores/index.js';
@@ -17,7 +16,7 @@
   export let req: RxReqBase | undefined = undefined;
 
   // TODO: Check if $app.rxNostr is defined
-  $: result = useArticle($app.rxNostr, useQueryClient(), queryKey, pubkey, identifier, req);
+  $: result = useArticle($app.rxNostr, queryKey, pubkey, identifier, req);
   $: data = result.data;
   $: status = result.status;
   $: error = result.error;

diff --git a/src/lib/components/Contacts.svelte b/src/lib/components/Contacts.svelte
@@ -5,7 +5,6 @@
    */
 
   import type { QueryKey } from '@tanstack/svelte-query';
-  import { useQueryClient } from '@tanstack/svelte-query';
   import type { Nostr } from 'rx-nostr';
 
   import type { ReqStatus, RxReqBase } from '$lib/stores/index.js';
@@ -16,7 +15,7 @@
   export let req: RxReqBase | undefined = undefined;
 
   // TODO: Check if $app.rxNostr is defined
-  $: result = useContacts($app.rxNostr, useQueryClient(), queryKey, pubkey, req);
+  $: result = useContacts($app.rxNostr, queryKey, pubkey, req);
   $: data = result.data;
   $: status = result.status;
   $: error = result.error;

diff --git a/src/lib/components/Metadata.svelte b/src/lib/components/Metadata.svelte
@@ -5,7 +5,6 @@
    */
 
   import type { QueryKey } from '@tanstack/svelte-query';
-  import { useQueryClient } from '@tanstack/svelte-query';
   import type { Nostr } from 'rx-nostr';
 
   import type { ReqStatus, RxReqBase } from '$lib/stores/index.js';
@@ -16,7 +15,7 @@
   export let req: RxReqBase | undefined = undefined;
 
   // TODO: Check if $app.rxNostr is defined
-  $: result = useMetadata($app.rxNostr, useQueryClient(), queryKey, pubkey, req);
+  $: result = useMetadata($app.rxNostr, queryKey, pubkey, req);
   $: data = result.data;
   $: status = result.status;
   $: error = result.error;

diff --git a/src/lib/components/Text.svelte b/src/lib/components/Text.svelte
@@ -5,7 +5,6 @@
    */
 
   import type { QueryKey } from '@tanstack/svelte-query';
-  import { useQueryClient } from '@tanstack/svelte-query';
   import type { Nostr } from 'rx-nostr';
 
   import type { ReqStatus, RxReqBase } from '$lib/stores/index.js';
@@ -16,7 +15,7 @@
   export let req: RxReqBase | undefined = undefined;
 
   // TODO: Check if $app.rxNostr is defined
-  $: result = useText($app.rxNostr, useQueryClient(), queryKey, id, req);
+  $: result = useText($app.rxNostr, queryKey, id, req);
   $: data = result.data;
   $: status = result.status;
   $: error = result.error;

diff --git a/src/lib/components/UniqueEventList.svelte b/src/lib/components/UniqueEventList.svelte
@@ -5,7 +5,6 @@
    */
 
   import type { QueryKey } from '@tanstack/svelte-query';
-  import { useQueryClient } from '@tanstack/svelte-query';
   import type { Nostr } from 'rx-nostr';
 
   import type { ReqStatus, RxReqBase } from '$lib/stores/index.js';
@@ -16,7 +15,7 @@
   export let req: RxReqBase | undefined = undefined;
 
   // TODO: Check if $app.rxNostr is defined
-  $: result = useUniqueEventList($app.rxNostr, useQueryClient(), queryKey, filters, req);
+  $: result = useUniqueEventList($app.rxNostr, queryKey, filters, req);
   $: data = result.data;
   $: status = result.status;
   $: error = result.error;

diff --git a/src/lib/components/UserReactionList.svelte b/src/lib/components/UserReactionList.svelte
@@ -5,7 +5,6 @@
    */
 
   import type { QueryKey } from '@tanstack/svelte-query';
-  import { useQueryClient } from '@tanstack/svelte-query';
   import type { Nostr } from 'rx-nostr';
 
   import type { ReqStatus, RxReqBase } from '$lib/stores/index.js';
@@ -17,7 +16,7 @@
   export let limit = 100;
 
   // TODO: Check if $app.rxNostr is defined
-  $: result = useUserReactionList($app.rxNostr, useQueryClient(), queryKey, pubkey, limit, req);
+  $: result = useUserReactionList($app.rxNostr, queryKey, pubkey, limit, req);
   $: data = result.data;
   $: status = result.status;
   $: error = result.error;

diff --git a/src/lib/stores/types.ts b/src/lib/stores/types.ts
@@ -3,7 +3,7 @@
  * @copyright 2023 Akiomi Kamakura
  */
 
-import type { QueryClient, QueryKey } from '@tanstack/svelte-query';
+import type { QueryKey } from '@tanstack/svelte-query';
 import type { EventPacket, Nostr, Relay, RxNostr, RxReq, RxReqController } from 'rx-nostr';
 import type { OperatorFunction } from 'rxjs';
 import type { Readable } from 'svelte/store';
@@ -25,7 +25,6 @@ export interface UseConnectionsOpts {
 
 export interface UseReqOpts<A> {
   rxNostr: RxNostr;
-  queryClient: QueryClient;
   queryKey: QueryKey;
   filters: Nostr.Filter[];
   operator: OperatorFunction<EventPacket, A>;

diff --git a/src/lib/stores/useArticle.ts b/src/lib/stores/useArticle.ts
@@ -3,7 +3,7 @@
  * @copyright 2023 Akiomi Kamakura
  */
 
-import type { QueryClient, QueryKey } from '@tanstack/svelte-query';
+import type { QueryKey } from '@tanstack/svelte-query';
 import type { EventPacket, RxNostr } from 'rx-nostr';
 import { latest, Nostr, verify } from 'rx-nostr';
 import { pipe } from 'rxjs';
@@ -14,7 +14,6 @@ import { useReq } from './useReq.js';
 
 export function useArticle(
   rxNostr: RxNostr,
-  queryClient: QueryClient,
   queryKey: QueryKey,
   pubkey: string,
   identifier: string,
@@ -24,5 +23,5 @@ export function useArticle(
     { kinds: [Nostr.Kind.Article], authors: [pubkey], '#d': [identifier], limit: 1 }
   ];
   const operator = pipe(filterNaddr(Nostr.Kind.Article, pubkey, identifier), verify(), latest());
-  return useReq({ rxNostr, queryClient, queryKey, filters, operator, req });
+  return useReq({ rxNostr, queryKey, filters, operator, req });
 }
diff --git a/src/lib/stores/useArticleList.ts b/src/lib/stores/useArticleList.ts
@@ -3,7 +3,7 @@
  * @copyright 2023 Akiomi Kamakura
  */
 
-import type { QueryClient, QueryKey } from '@tanstack/svelte-query';
+import type { QueryKey } from '@tanstack/svelte-query';
 import type { EventPacket, RxNostr } from 'rx-nostr';
 import { filterKind, Nostr, verify } from 'rx-nostr';
 import { pipe } from 'rxjs';
@@ -14,7 +14,6 @@ import { useReq } from './useReq.js';
 
 export function useUserArticleList(
   rxNostr: RxNostr,
-  queryClient: QueryClient,
   queryKey: QueryKey,
   pubkey: string,
   limit: number,
@@ -28,5 +27,5 @@ export function useUserArticleList(
     latestEachNaddr(),
     scanArray()
   );
-  return useReq({ rxNostr, queryClient, queryKey, filters, operator, req, initData: [] });
+  return useReq({ rxNostr, queryKey, filters, operator, req, initData: [] });
 }
diff --git a/src/lib/stores/useContacts.ts b/src/lib/stores/useContacts.ts
@@ -3,7 +3,7 @@
  * @copyright 2023 Akiomi Kamakura
  */
 
-import type { QueryClient, QueryKey } from '@tanstack/svelte-query';
+import type { QueryKey } from '@tanstack/svelte-query';
 import type { EventPacket, RxNostr } from 'rx-nostr';
 import { filterKind, latest, Nostr, verify } from 'rx-nostr';
 import { pipe } from 'rxjs';
@@ -14,13 +14,12 @@ import { useReq } from './useReq.js';
 
 export function useContacts(
   rxNostr: RxNostr,
-  queryClient: QueryClient,
   queryKey: QueryKey,
   pubkey: string,
   req?: RxReqBase | undefined
 ): ReqResult<EventPacket> {
   // TODO: Add npub support
   const filters = [{ kinds: [Nostr.Kind.Contacts], authors: [pubkey], limit: 1 }];
   const operator = pipe(filterKind(Nostr.Kind.Contacts), filterPubkey(pubkey), verify(), latest());
-  return useReq({ rxNostr, queryClient, queryKey, filters, operator, req });
+  return useReq({ rxNostr, queryKey, filters, operator, req });
 }
diff --git a/src/lib/stores/useLatestEvent.ts b/src/lib/stores/useLatestEvent.ts
@@ -3,7 +3,7 @@
  * @copyright 2023 Akiomi Kamakura
  */
 
-import type { QueryClient, QueryKey } from '@tanstack/svelte-query';
+import type { QueryKey } from '@tanstack/svelte-query';
 import type { EventPacket, RxNostr } from 'rx-nostr';
 import { latest, Nostr, verify } from 'rx-nostr';
 import { pipe } from 'rxjs';
@@ -13,11 +13,10 @@ import { useReq } from './useReq.js';
 
 export function useLatestEvent(
   rxNostr: RxNostr,
-  queryClient: QueryClient,
   queryKey: QueryKey,
   filters: Nostr.Filter[],
   req?: RxReqBase | undefined
 ): ReqResult<EventPacket> {
   const operator = pipe(verify(), latest());
-  return useReq({ rxNostr, queryClient, queryKey, filters, operator, req });
+  return useReq({ rxNostr, queryKey, filters, operator, req });
 }
diff --git a/src/lib/stores/useMetadata.ts b/src/lib/stores/useMetadata.ts
@@ -3,7 +3,7 @@
  * @copyright 2023 Akiomi Kamakura
  */
 
-import type { QueryClient, QueryKey } from '@tanstack/svelte-query';
+import type { QueryKey } from '@tanstack/svelte-query';
 import type { EventPacket, RxNostr } from 'rx-nostr';
 import { filterKind, latest, Nostr, verify } from 'rx-nostr';
 import { pipe } from 'rxjs';
@@ -14,13 +14,12 @@ import { useReq } from './useReq.js';
 
 export function useMetadata(
   rxNostr: RxNostr,
-  queryClient: QueryClient,
   queryKey: QueryKey,
   pubkey: string,
   req?: RxReqBase | undefined
 ): ReqResult<EventPacket> {
   // TODO: Add npub support
   const filters = [{ kinds: [Nostr.Kind.Metadata], authors: [pubkey], limit: 1 }];
   const operator = pipe(filterKind(Nostr.Kind.Metadata), filterPubkey(pubkey), verify(), latest());
-  return useReq({ rxNostr, queryClient, queryKey, filters, operator, req });
+  return useReq({ rxNostr, queryKey, filters, operator, req });
 }
diff --git a/src/lib/stores/useMetadataList.ts b/src/lib/stores/useMetadataList.ts
@@ -3,7 +3,7 @@
  * @copyright 2023 Akiomi Kamakura
  */
 
-import type { QueryClient, QueryKey } from '@tanstack/svelte-query';
+import type { QueryKey } from '@tanstack/svelte-query';
 import type { EventPacket, RxNostr } from 'rx-nostr';
 import { Nostr, verify } from 'rx-nostr';
 import { pipe } from 'rxjs';
@@ -14,13 +14,12 @@ import { useReq } from './useReq.js';
 
 export function useMetadataList(
   rxNostr: RxNostr,
-  queryClient: QueryClient,
   queryKey: QueryKey,
   pubkeys: string[],
   req?: RxReqBase | undefined
 ): ReqResult<EventPacket[]> {
   // TODO: Add npub support
   const filters = [{ kinds: [Nostr.Kind.Metadata], authors: pubkeys, limit: pubkeys.length }];
   const operator = pipe(filterMetadataList(pubkeys), verify(), latestEachPubkey(), scanArray());
-  return useReq({ rxNostr, queryClient, queryKey, filters, operator, req, initData: [] });
+  return useReq({ rxNostr, queryKey, filters, operator, req, initData: [] });
 }
diff --git a/src/lib/stores/useText.ts b/src/lib/stores/useText.ts
@@ -3,7 +3,7 @@
  * @copyright 2023 Akiomi Kamakura
  */
 
-import type { QueryClient, QueryKey } from '@tanstack/svelte-query';
+import type { QueryKey } from '@tanstack/svelte-query';
 import type { EventPacket, RxNostr } from 'rx-nostr';
 import { filterKind, Nostr, uniq, verify } from 'rx-nostr';
 import { pipe } from 'rxjs';
@@ -14,13 +14,12 @@ import { useReq } from './useReq.js';
 
 export function useText(
   rxNostr: RxNostr,
-  queryClient: QueryClient,
   queryKey: QueryKey,
   id: string,
   req?: RxReqBase | undefined
 ): ReqResult<EventPacket> {
   // TODO: Add note1 support
   const filters = [{ kinds: [Nostr.Kind.Text], ids: [id], limit: 1 }];
   const operator = pipe(filterKind(Nostr.Kind.Text), filterId(id), uniq(), verify());
-  return useReq({ rxNostr, queryClient, queryKey, filters, operator, req });
+  return useReq({ rxNostr, queryKey, filters, operator, req });
 }
diff --git a/src/lib/stores/useTextList.ts b/src/lib/stores/useTextList.ts
@@ -3,7 +3,7 @@
  * @copyright 2023 Akiomi Kamakura
  */
 
-import type { QueryClient, QueryKey } from '@tanstack/svelte-query';
+import type { QueryKey } from '@tanstack/svelte-query';
 import type { EventPacket, RxNostr } from 'rx-nostr';
 import { Nostr, uniq, verify } from 'rx-nostr';
 import { pipe } from 'rxjs';
@@ -14,13 +14,12 @@ import { useReq } from './useReq.js';
 
 export function useTextList(
   rxNostr: RxNostr,
-  queryClient: QueryClient,
   queryKey: QueryKey,
   ids: string[],
   req?: RxReqBase | undefined
 ): ReqResult<EventPacket[]> {
   // TODO: Add note1 support
   const filters = [{ kinds: [Nostr.Kind.Text], ids }];
   const operator = pipe(filterTextList(ids), uniq(), verify(), scanArray());
-  return useReq({ rxNostr, queryClient, queryKey, filters, operator, req, initData: [] });
+  return useReq({ rxNostr, queryKey, filters, operator, req, initData: [] });
 }
diff --git a/src/lib/stores/useUniqueEventList.ts b/src/lib/stores/useUniqueEventList.ts
@@ -3,7 +3,7 @@
  * @copyright 2023 Akiomi Kamakura
  */
 
-import type { QueryClient, QueryKey } from '@tanstack/svelte-query';
+import type { QueryKey } from '@tanstack/svelte-query';
 import type { EventPacket, RxNostr } from 'rx-nostr';
 import { Nostr, uniq, verify } from 'rx-nostr';
 import { pipe } from 'rxjs';
@@ -14,11 +14,10 @@ import { useReq } from './useReq.js';
 
 export function useUniqueEventList(
   rxNostr: RxNostr,
-  queryClient: QueryClient,
   queryKey: QueryKey,
   filters: Nostr.Filter[],
   req?: RxReqBase | undefined
 ): ReqResult<EventPacket[]> {
   const operator = pipe(uniq(), verify(), scanArray());
-  return useReq({ rxNostr, queryClient, queryKey, filters, operator, req });
+  return useReq({ rxNostr, queryKey, filters, operator, req });
 }
diff --git a/src/lib/stores/useUserReactionList.ts b/src/lib/stores/useUserReactionList.ts
@@ -3,7 +3,7 @@
  * @copyright 2023 Akiomi Kamakura
  */
 
-import type { QueryClient, QueryKey } from '@tanstack/svelte-query';
+import type { QueryKey } from '@tanstack/svelte-query';
 import type { EventPacket, RxNostr } from 'rx-nostr';
 import { filterKind, Nostr, verify } from 'rx-nostr';
 import { pipe } from 'rxjs';
@@ -14,7 +14,6 @@ import { useReq } from './useReq.js';
 
 export function useUserReactionList(
   rxNostr: RxNostr,
-  queryClient: QueryClient,
   queryKey: QueryKey,
   pubkey: string,
   limit: number,
@@ -28,5 +27,5 @@ export function useUserReactionList(
     latestEachNaddr(),
     scanArray()
   );
-  return useReq({ rxNostr, queryClient, queryKey, filters, operator, req, initData: [] });
+  return useReq({ rxNostr, queryKey, filters, operator, req, initData: [] });
 }
diff --git a/src/lib/stores/useUserTextList.ts b/src/lib/stores/useUserTextList.ts
@@ -3,7 +3,7 @@
  * @copyright 2023 Akiomi Kamakura
  */
 
-import type { QueryClient, QueryKey } from '@tanstack/svelte-query';
+import type { QueryKey } from '@tanstack/svelte-query';
 import type { EventPacket, RxNostr } from 'rx-nostr';
 import { filterKind, Nostr, uniq, verify } from 'rx-nostr';
 import { pipe } from 'rxjs';
@@ -14,7 +14,6 @@ import { useReq } from './useReq.js';
 
 export function useUserTextList(
   rxNostr: RxNostr,
-  queryClient: QueryClient,
   queryKey: QueryKey,
   pubkey: string,
   limit: number,
@@ -29,5 +28,5 @@ export function useUserTextList(
     verify(),
     scanArray()
   );
-  return useReq({ rxNostr, queryClient, queryKey, filters, operator, req, initData: [] });
+  return useReq({ rxNostr, queryKey, filters, operator, req, initData: [] });
 }