refactor(query-proxy): simplify infiniteQueryOptions proxy

hi-ogawa · Jul 14, 2023 · 78cd9bb · 78cd9bb
1 parent e4eaac9
commit 78cd9bb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 28 deletions.
diff --git a/packages/query-proxy/package.json b/packages/query-proxy/package.json
@@ -39,7 +39,6 @@
     "zod": "^3.21.4"
   },
   "peerDependencies": {
-    "@tanstack/query-core": "*",
     "@trpc/server": "*"
   },
   "peerDependenciesMeta": {

diff --git a/packages/query-proxy/src/record.test.ts b/packages/query-proxy/src/record.test.ts
@@ -71,21 +71,13 @@ describe(createFnRecordQueryProxy.name, () => {
     // infinite query
     //
 
-    const infiniteQueryObserver = new InfiniteQueryObserver(
-      queryClient,
-      fnRecordQuery.getPage.infiniteQueryOptions(
-        {
-          limit: 5,
-        },
-        {
-          getNextPageParam: (lastPage) => lastPage.nextCursor,
-          setPageParam: (input, pageParam) => ({
-            ...input,
-            cursor: pageParam as any,
-          }),
-        }
-      )
-    );
+    const infiniteQueryObserver = new InfiniteQueryObserver(queryClient, {
+      ...fnRecordQuery.getPage.infiniteQueryOptions((context: any) => ({
+        limit: 5,
+        cursor: context?.pageParam,
+      })),
+      getNextPageParam: (lastPage) => lastPage.nextCursor,
+    });
 
     expect((await infiniteQueryObserver.fetchNextPage()).data)
       .toMatchInlineSnapshot(`
@@ -248,6 +240,7 @@ describe(createFnRecordQueryProxy.name, () => {
           "queryKey": [
             "getPage",
             {
+              "cursor": undefined,
               "limit": 5,
             },
           ],

diff --git a/packages/query-proxy/src/record.ts b/packages/query-proxy/src/record.ts
@@ -1,4 +1,3 @@
-import type { GetNextPageParamFunction } from "@tanstack/query-core";
 import { createGetterProxy } from "./utils";
 
 type FnAny = (...args: any[]) => any;
@@ -22,15 +21,13 @@ export type FnRecordQueryProxy<T extends FnRecord> = {
       queryFn: () => Promise<FnOut<T[K]>>;
     };
     infiniteQueryOptions: (
-      input: FnIn<T[K]>,
-      options: {
-        getNextPageParam: GetNextPageParamFunction<FnOut<T[K]>>;
-        setPageParam: (input: FnIn<T[K]>, pageParam: unknown) => FnIn<T[K]>;
-      }
+      // `context` is supposed to be `import("@tanstack/query-core").QueryFunctionContext`
+      // but we don't exactly specify the type to avoid restricting tanstack query version.
+      // Assuming the use case of infinite query is limited, having "unknown" here won't degrade DX so bad.
+      inputFn: (context?: unknown) => FnIn<T[K]>
     ) => {
       queryKey: unknown[];
       queryFn: (context: unknown) => Promise<FnOut<T[K]>>;
-      getNextPageParam: any;
     };
     mutationKey: unknown[];
     mutationOptions: () => {
@@ -55,11 +52,9 @@ export function createFnRecordQueryProxy<T extends FnRecord>(
         });
       }
       if (prop === "infiniteQueryOptions") {
-        return (input: unknown, options: any) => ({
-          queryKey: [k, input],
-          queryFn: ({ pageParam }: any) =>
-            (fnRecord as any)[k](options.setPageParam(input, pageParam)),
-          getNextPageParam: options.getNextPageParam,
+        return (inputFn: any) => ({
+          queryKey: [k, inputFn()],
+          queryFn: (context: any) => (fnRecord as any)[k](inputFn(context)),
         });
       }
       if (prop === "mutationOptions") {