Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/vuejs/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type {
InfiniteQueryObserverOptions,
} from "@tanstack/query-core";
import { Ref, UnwrapRef } from "vue-demi";
import type { QueryClient } from "vue-query";

export type MaybeRef<T> = Ref<T> | T;
export type MaybeRefDeep<T> = T extends Function
Expand All @@ -16,7 +17,10 @@ export type MaybeRefDeep<T> = T extends Function
: T
>;

export type WithQueryClientKey<T> = T & { queryClientKey?: string };
export type WithQueryClientKey<T> = T & {
queryClientKey?: string;
queryClient?: QueryClient;
};

// A Vue version of QueriesObserverOptions from "@tanstack/query-core"
// Accept refs as options
Expand Down
3 changes: 2 additions & 1 deletion src/vuejs/useBaseQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ export function useBaseQuery<
arg3: UseQueryOptionsGeneric<TQueryFnData, TError, TData, TQueryKey> = {}
): UseQueryReturnType<TData, TError> {
const options = getQueryUnreffedOptions();
const queryClient = useQueryClient(options.queryClientKey);
const queryClient =
options.queryClient ?? useQueryClient(options.queryClientKey);
const defaultedOptions = queryClient.defaultQueryOptions(options);
const observer = new Observer(queryClient, defaultedOptions);
const state = reactive(observer.getCurrentResult());
Expand Down
3 changes: 2 additions & 1 deletion src/vuejs/useIsFetching.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ export function useIsFetching(
arg2?: QueryFilters
): Ref<number> {
const filters = ref(parseFilterArgs(arg1, arg2));
const queryClient = useQueryClient(filters.value.queryClientKey);
const queryClient =
filters.value.queryClient ?? useQueryClient(filters.value.queryClientKey);

const isFetching = ref(queryClient.isFetching(filters));

Expand Down
3 changes: 2 additions & 1 deletion src/vuejs/useIsMutating.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ export function useIsMutating(
arg2?: Omit<MutationFilters, "mutationKey">
): Ref<number> {
const filters = ref(parseMutationFilterArgs(arg1, arg2));
const queryClient = useQueryClient(filters.value.queryClientKey);
const queryClient =
filters.value.queryClient ?? useQueryClient(filters.value.queryClientKey);

const isMutating = ref(queryClient.isMutating(filters));

Expand Down
3 changes: 2 additions & 1 deletion src/vuejs/useMutation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ export function useMutation<
arg3?: UseMutationOptions<TData, TError, TVariables, TContext>
): UseMutationReturnType<TData, TError, TVariables, TContext> {
const options = parseMutationArgs(arg1, arg2, arg3);
const queryClient = useQueryClient(options.queryClientKey);
const queryClient =
options.queryClient ?? useQueryClient(options.queryClientKey);
const defaultedOptions = queryClient.defaultMutationOptions(options);
const observer = new MutationObserver(queryClient, defaultedOptions);

Expand Down
3 changes: 2 additions & 1 deletion src/vuejs/useQueries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ export function useQueries<T extends any[]>({
const unreffedQueries = cloneDeepUnref(queries) as UseQueriesOptionsArg<T>;

const queryClientKey = unreffedQueries[0].queryClientKey;
const queryClient = useQueryClient(queryClientKey);
const optionsQueryClient = unreffedQueries[0].queryClient;
const queryClient = optionsQueryClient ?? useQueryClient(queryClientKey);
const defaultedQueries = unreffedQueries.map((options) => {
return queryClient.defaultQueryOptions(options);
});
Expand Down