feat: move default options from client constructor to observer constructor

Author: DanielGiljam

libs/core/src/LiveInfiniteQueryObserver.ts

@@ -6,6 +6,7 @@ import {
 } from "@tanstack/query-core";
 
 import {LiveQueryClient} from "./LiveQueryClient";
+import {normalizeRecordQueryResult} from "./utils";
 
 export class LiveInfiniteQueryObserver<
     TQueryFnData extends InitializedRecord[] = InitializedRecord[],
@@ -31,6 +32,32 @@ export class LiveInfiniteQueryObserver<
         >,
     ) {
         super(client, {
+            // eslint-disable-next-line @typescript-eslint/promise-function-async
+            queryFn: (ctx) => {
+                const getQueryOrExpressions = ctx.meta?.getQueryOrExpressions;
+                if (getQueryOrExpressions == null) {
+                    // eslint-disable-next-line prefer-promise-reject-errors
+                    return Promise.reject("Missing meta.getQueryOrExpressions");
+                }
+                const memorySource = client.getMemorySource();
+                return memorySource.activated.then(async () => {
+                    const result = await memorySource.query(
+                        getQueryOrExpressions(
+                            memorySource.queryBuilder,
+                            ctx.queryKey,
+                            ctx.pageParam ?? 0,
+                        ),
+                    );
+                    const normalizedResult = normalizeRecordQueryResult(result);
+                    if (normalizedResult.length > 0) {
+                        return result;
+                    }
+                    if (Array.isArray(result)) {
+                        return [];
+                    }
+                    return undefined;
+                }) as Promise<TQueryFnData>;
+            },
             initialData: () => {
                 const enabled = options.enabled;
                 if (enabled === false) {
@@ -68,6 +95,8 @@ export class LiveInfiniteQueryObserver<
                 }
                 return undefined;
             },
+            staleTime: Infinity,
+            cacheTime: 0,
             ...options,
             meta: {
                 isInfinite: true,

libs/core/src/LiveQueryClient.ts

@@ -3,7 +3,6 @@ import {RecordQueryBuilder} from "@orbit/records";
 import {QueryClient, QueryClientConfig, QueryKey} from "@tanstack/query-core";
 
 import {LiveQueryAdapterCache} from "./LiveQueryAdapterCache";
-import {normalizeRecordQueryResult} from "./utils";
 
 export type GetQueryOrExpressions<TQueryKey extends QueryKey = QueryKey> = (
     queryBuilder: RecordQueryBuilder,
@@ -21,46 +20,6 @@ declare module "@tanstack/query-core" {
 
 export type {QueryMeta} from "@tanstack/query-core";
 
-const mergeLiveQueryClientConfig = (
-    config: LiveQueryClientConfig,
-): QueryClientConfig => ({
-    ...config,
-    defaultOptions: {
-        ...config.defaultOptions,
-        queries: {
-            // eslint-disable-next-line @typescript-eslint/promise-function-async
-            queryFn: (ctx) => {
-                const getQueryOrExpressions = ctx.meta?.getQueryOrExpressions;
-                if (getQueryOrExpressions == null) {
-                    // eslint-disable-next-line prefer-promise-reject-errors
-                    return Promise.reject("Missing meta.getQueryOrExpressions");
-                }
-                const memorySource = config.memorySource;
-                return memorySource.activated.then(async () => {
-                    const result = await memorySource.query(
-                        getQueryOrExpressions(
-                            memorySource.queryBuilder,
-                            ctx.queryKey,
-                            ctx.pageParam ?? 0,
-                        ),
-                    );
-                    const normalizedResult = normalizeRecordQueryResult(result);
-                    if (normalizedResult.length > 0) {
-                        return result;
-                    }
-                    if (Array.isArray(result)) {
-                        return [];
-                    }
-                    return undefined;
-                });
-            },
-            staleTime: Infinity,
-            cacheTime: 0,
-            ...config.defaultOptions?.queries,
-        },
-    },
-});
-
 export interface LiveQueryClientConfig extends QueryClientConfig {
     memorySource: MemorySource;
 }
@@ -72,7 +31,7 @@ export class LiveQueryClient extends QueryClient {
     private memorySourceIsActivated = false;
 
     constructor(config: LiveQueryClientConfig) {
-        super(mergeLiveQueryClientConfig(config));
+        super(config);
         const memorySource = (this.memorySource = config.memorySource);
         this.liveQueryAdapterCache = new LiveQueryAdapterCache({
             client: this,

libs/core/src/LiveQueryObserver.ts

@@ -29,6 +29,32 @@ export class LiveQueryObserver<
         >,
     ) {
         super(client, {
+            // eslint-disable-next-line @typescript-eslint/promise-function-async
+            queryFn: (ctx) => {
+                const getQueryOrExpressions = ctx.meta?.getQueryOrExpressions;
+                if (getQueryOrExpressions == null) {
+                    // eslint-disable-next-line prefer-promise-reject-errors
+                    return Promise.reject("Missing meta.getQueryOrExpressions");
+                }
+                const memorySource = client.getMemorySource();
+                return memorySource.activated.then(async () => {
+                    const result = await memorySource.query(
+                        getQueryOrExpressions(
+                            memorySource.queryBuilder,
+                            ctx.queryKey,
+                            ctx.pageParam ?? 0,
+                        ),
+                    );
+                    const normalizedResult = normalizeRecordQueryResult(result);
+                    if (normalizedResult.length > 0) {
+                        return result;
+                    }
+                    if (Array.isArray(result)) {
+                        return [];
+                    }
+                    return undefined;
+                }) as Promise<TQueryFnData>;
+            },
             initialData: () => {
                 const enabled = options.enabled;
                 if (enabled === false) {
@@ -59,6 +85,8 @@ export class LiveQueryObserver<
                 }
                 return undefined;
             },
+            staleTime: Infinity,
+            cacheTime: 0,
             ...options,
         });
     }