feat: queryOptions utility fn (#2)

Author: js2me

src/index.ts

@@ -3,6 +3,7 @@ export * from './mobx-mutation.types';
 export * from './mobx-query.types';
 export * from './mobx-query';
 export * from './mobx-query-client';
+export * from './mobx-query-client.types';
 export * from './mobx-inifinite-query';
 export * from './mobx-inifinite-query.types';
 export * from './query-options';

src/mobx-inifinite-query.ts

@@ -410,4 +410,9 @@ export class MobxInfiniteQuery<
   [Symbol.dispose](): void {
     this.destroy();
   }
+
+  // Firefox fix (Symbol.dispose is undefined in FF)
+  [Symbol.for('Symbol.dispose')](): void {
+    this.destroy();
+  }
 }

src/mobx-mutation.ts

@@ -208,4 +208,9 @@ export class MobxMutation<
   [Symbol.dispose](): void {
     this.destroy();
   }
+
+  // Firefox fix (Symbol.dispose is undefined in FF)
+  [Symbol.for('Symbol.dispose')](): void {
+    this.destroy();
+  }
 }

src/mobx-query-client.types.ts

@@ -0,0 +1,5 @@
+import type { QueryClient } from '@tanstack/query-core';
+
+import type { MobxQueryClient } from './mobx-query-client';
+
+export type AnyQueryClient = MobxQueryClient | QueryClient;

src/mobx-query.ts

@@ -19,6 +19,7 @@ import {
 } from 'mobx';
 
 import { MobxQueryClient, MobxQueryClientHooks } from './mobx-query-client';
+import { AnyQueryClient } from './mobx-query-client.types';
 import {
   MobxQueryConfig,
   MobxQueryDynamicOptions,
@@ -28,6 +29,7 @@ import {
   MobxQueryStartParams,
   MobxQueryUpdateOptions,
 } from './mobx-query.types';
+import { QueryOptionsParams } from './query-options';
 
 export class MobxQuery<
   TData,
@@ -59,13 +61,26 @@ export class MobxQuery<
   private _observerSubscription?: VoidFunction;
   private hooks?: MobxQueryClientHooks;
 
-  constructor(protected config: MobxQueryConfig<TData, TError, TQueryKey>) {
+  protected config: MobxQueryConfig<TData, TError, TQueryKey>;
+
+  constructor(
+    queryClient: AnyQueryClient,
+    config: QueryOptionsParams<TData, TError, TQueryKey>,
+  );
+  constructor(config: MobxQueryConfig<TData, TError, TQueryKey>);
+
+  constructor(...args: any[]) {
+    const [queryClient, config] =
+      args.length === 2 ? args : [args[0].queryClient, args[0]];
     const {
-      queryClient,
       queryKey: queryKeyOrDynamicQueryKey,
       options: getDynamicOptions,
       ...restOptions
     } = config;
+    this.config = {
+      ...config,
+      queryClient,
+    };
     this.abortController = new LinkedAbortController(config.abortSignal);
     this.queryClient = queryClient;
     this._result = undefined as any;
@@ -371,4 +386,9 @@ export class MobxQuery<
   [Symbol.dispose](): void {
     this.destroy();
   }
+
+  // Firefox fix (Symbol.dispose is undefined in FF)
+  [Symbol.for('Symbol.dispose')](): void {
+    this.destroy();
+  }
 }

src/mobx-query.types.ts

@@ -2,15 +2,14 @@ import {
   DefaultedQueryObserverOptions,
   DefaultError,
   InvalidateQueryFilters,
-  QueryClient,
   QueryFilters,
   QueryKey,
   QueryObserverOptions,
   RefetchOptions,
 } from '@tanstack/query-core';
 
 import type { MobxQuery } from './mobx-query';
-import { MobxQueryClient } from './mobx-query-client';
+import { AnyQueryClient } from './mobx-query-client.types';
 
 export interface MobxQueryInvalidateParams
   extends Partial<Omit<InvalidateQueryFilters, 'queryKey' | 'exact'>> {}
@@ -89,7 +88,7 @@ export interface MobxQueryConfig<
       >
     >,
     MobxQueryFeatures {
-  queryClient: QueryClient | MobxQueryClient;
+  queryClient: AnyQueryClient;
   /**
    * TanStack Query manages query caching for you based on query keys.
    * Query keys have to be an Array at the top level, and can be as simple as an Array with a single string, or as complex as an array of many strings and nested objects.

src/query-options.ts

@@ -2,16 +2,11 @@ import { DefaultError, QueryKey } from '@tanstack/query-core';
 
 import { MobxQueryConfig } from './mobx-query.types';
 
-type PartialKeys<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
-
-interface QueryOptionsParams<
+export interface QueryOptionsParams<
   TData,
   TError = DefaultError,
   TQueryKey extends QueryKey = QueryKey,
-> extends PartialKeys<
-    MobxQueryConfig<TData, TError, TQueryKey>,
-    'queryClient'
-  > {}
+> extends Omit<MobxQueryConfig<TData, TError, TQueryKey>, 'queryClient'> {}
 
 export function queryOptions<
   TData,