From 55d864462600d681de5526e7b1cdea080ed7993d Mon Sep 17 00:00:00 2001
From: Anatoly <af-komrad2011@yandex.ru>
Date: Mon, 7 Nov 2022 12:18:23 +0300
Subject: [PATCH] fix(vue-query): useQueries options allow empty array and
 setup queryClient

---
 packages/vue-query/src/useQueries.ts | 41 ++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/packages/vue-query/src/useQueries.ts b/packages/vue-query/src/useQueries.ts
index 6879bcd2cb..0b7c5f5a9c 100644
--- a/packages/vue-query/src/useQueries.ts
+++ b/packages/vue-query/src/useQueries.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { QueriesObserver } from '@tanstack/query-core'
+import type { QueryClient } from '@tanstack/query-core'
 import { onScopeDispose, reactive, readonly, watch } from 'vue-demi'
 import type { Ref } from 'vue-demi'
 
@@ -125,15 +126,45 @@ export type UseQueriesResults<
 
 type UseQueriesOptionsArg<T extends any[]> = readonly [...UseQueriesOptions<T>]
 
+export type UseQueriesItem<T extends any[]> = Omit<
+  UseQueriesOptionsArg<T>,
+  'queryClient' | 'queryClientKey'
+>
+
+type DefaultUseQueriesOptions<T extends any[]> = {
+  queries: Ref<UseQueriesItem<T>> | UseQueriesItem<T>
+}
+
+interface UseQueriesOptionsWithQueryClient<T extends any[]>
+  extends DefaultUseQueriesOptions<T> {
+  queryClient?: QueryClient
+}
+interface UseQueriesOptionsWithQueryClientKey<T extends any[]>
+  extends DefaultUseQueriesOptions<T> {
+  queryClientKey?: string
+}
+
+export function useQueries<T extends any[]>(
+  options: UseQueriesOptionsWithQueryClient<T>,
+): Readonly<UseQueriesResults<T>>
+export function useQueries<T extends any[]>(
+  options: UseQueriesOptionsWithQueryClientKey<T>,
+): Readonly<UseQueriesResults<T>>
 export function useQueries<T extends any[]>({
   queries,
-}: {
-  queries: Ref<UseQueriesOptionsArg<T>> | UseQueriesOptionsArg<T>
-}): Readonly<UseQueriesResults<T>> {
+  ...queriesOptions
+}:
+  | UseQueriesOptionsWithQueryClientKey<T>
+  | UseQueriesOptionsWithQueryClient<T>): Readonly<UseQueriesResults<T>> {
   const unreffedQueries = cloneDeepUnref(queries) as UseQueriesOptionsArg<T>
 
-  const queryClientKey = unreffedQueries[0].queryClientKey
-  const optionsQueryClient = unreffedQueries[0].queryClient
+  const optionsQueryClient =
+    'queryClient' in queriesOptions ? queriesOptions.queryClient : undefined
+  const queryClientKey =
+    'queryClientKey' in queriesOptions
+      ? queriesOptions.queryClientKey
+      : undefined
+
   const queryClient = optionsQueryClient ?? useQueryClient(queryClientKey)
   const defaultedQueries = unreffedQueries.map((options) => {
     return queryClient.defaultQueryOptions(options)