From 1c99e4a0fe7a705348ae711c154fedd0b43c55d8 Mon Sep 17 00:00:00 2001
From: jiwlee <53519832+jiwlee97@users.noreply.github.com>
Date: Tue, 19 Nov 2024 20:56:35 +0900
Subject: [PATCH 1/2] fix: Apply UnwrapRef to queryOptions Return Type

---
 packages/vue-query/src/queryOptions.ts | 10 +++++++---
 packages/vue-query/src/useQuery.ts     |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/vue-query/src/queryOptions.ts b/packages/vue-query/src/queryOptions.ts
index 1221222e3c..c37a097aa9 100644
--- a/packages/vue-query/src/queryOptions.ts
+++ b/packages/vue-query/src/queryOptions.ts
@@ -1,8 +1,10 @@
 import type { DataTag, DefaultError, QueryKey } from '@tanstack/query-core'
 import type {
   DefinedInitialQueryOptions,
+  NonUndefinedGuard,
   UndefinedInitialQueryOptions,
 } from './useQuery'
+import type { UnwrapRef } from 'vue-demi'
 
 export function queryOptions<
   TQueryFnData = unknown,
@@ -11,7 +13,7 @@ export function queryOptions<
   TQueryKey extends QueryKey = QueryKey,
 >(
   options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
-): UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
+): UnwrapRef<UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>> & {
   queryKey: DataTag<TQueryKey, TQueryFnData>
 }
 
@@ -22,8 +24,10 @@ export function queryOptions<
   TQueryKey extends QueryKey = QueryKey,
 >(
   options: DefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
-): DefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
-  queryKey: DataTag<TQueryKey, TQueryFnData>
+): UnwrapRef<DefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>> & {
+    queryKey: DataTag<TQueryKey, TQueryFnData>;
+    initialData: | NonUndefinedGuard<TQueryFnData>
+    | (() => NonUndefinedGuard<TQueryFnData>);
 }
 
 export function queryOptions(options: unknown) {
diff --git a/packages/vue-query/src/useQuery.ts b/packages/vue-query/src/useQuery.ts
index af3f1ea31d..65565aa4ab 100644
--- a/packages/vue-query/src/useQuery.ts
+++ b/packages/vue-query/src/useQuery.ts
@@ -15,7 +15,7 @@ import type {
 } from './types'
 import type { QueryClient } from './queryClient'
 
-type NonUndefinedGuard<T> = T extends undefined ? never : T
+export type NonUndefinedGuard<T> = T extends undefined ? never : T
 
 export type UseQueryOptions<
   TQueryFnData = unknown,

From c4dcd3c56bf90e8c2808a39db65a8cd57c62eaae Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 11:07:51 +0000
Subject: [PATCH 2/2] ci: apply automated fixes

---
 packages/vue-query/src/queryOptions.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/vue-query/src/queryOptions.ts b/packages/vue-query/src/queryOptions.ts
index c37a097aa9..5d95fe8192 100644
--- a/packages/vue-query/src/queryOptions.ts
+++ b/packages/vue-query/src/queryOptions.ts
@@ -13,7 +13,9 @@ export function queryOptions<
   TQueryKey extends QueryKey = QueryKey,
 >(
   options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
-): UnwrapRef<UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>> & {
+): UnwrapRef<
+  UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>
+> & {
   queryKey: DataTag<TQueryKey, TQueryFnData>
 }
 
@@ -24,10 +26,13 @@ export function queryOptions<
   TQueryKey extends QueryKey = QueryKey,
 >(
   options: DefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
-): UnwrapRef<DefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>> & {
-    queryKey: DataTag<TQueryKey, TQueryFnData>;
-    initialData: | NonUndefinedGuard<TQueryFnData>
-    | (() => NonUndefinedGuard<TQueryFnData>);
+): UnwrapRef<
+  DefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>
+> & {
+  queryKey: DataTag<TQueryKey, TQueryFnData>
+  initialData:
+    | NonUndefinedGuard<TQueryFnData>
+    | (() => NonUndefinedGuard<TQueryFnData>)
 }
 
 export function queryOptions(options: unknown) {