From 96a3238455552cef412deb94ae932eb6fd57189a Mon Sep 17 00:00:00 2001
From: novice0840 <magnolia0840@gmail.com>
Date: Thu, 10 Apr 2025 21:26:36 +0900
Subject: [PATCH 1/6] refactor(query-core): make common type more readable

---
 packages/query-core/src/types.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts
index c973b6a758..b743455c86 100644
--- a/packages/query-core/src/types.ts
+++ b/packages/query-core/src/types.ts
@@ -429,14 +429,17 @@ export interface QueryObserverOptions<
   experimental_prefetchInRender?: boolean
 }
 
-export type WithRequired<TTarget, TKey extends keyof TTarget> = TTarget & {
-  [_ in TKey]: {}
-}
+export type WithRequired<TTarget, TKey extends keyof TTarget> = Pick<
+  Required<TTarget>,
+  TKey
+> &
+  Omit<TTarget, TKey>
+
 export type Optional<TTarget, TKey extends keyof TTarget> = Pick<
   Partial<TTarget>,
   TKey
 > &
-  OmitKeyof<TTarget, TKey>
+  Omit<TTarget, TKey>
 
 export type DefaultedQueryObserverOptions<
   TQueryFnData = unknown,

From a9797f0f1c83ac6e7fec8ba897b565b40a805200 Mon Sep 17 00:00:00 2001
From: novice0840 <magnolia0840@gmail.com>
Date: Fri, 11 Apr 2025 00:47:22 +0900
Subject: [PATCH 2/6] fix: revert WithRequired type

---
 packages/query-core/src/types.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts
index b743455c86..35106b242f 100644
--- a/packages/query-core/src/types.ts
+++ b/packages/query-core/src/types.ts
@@ -429,11 +429,9 @@ export interface QueryObserverOptions<
   experimental_prefetchInRender?: boolean
 }
 
-export type WithRequired<TTarget, TKey extends keyof TTarget> = Pick<
-  Required<TTarget>,
-  TKey
-> &
-  Omit<TTarget, TKey>
+export type WithRequired<TTarget, TKey extends keyof TTarget> = TTarget & {
+  [_ in TKey]: {}
+}
 
 export type Optional<TTarget, TKey extends keyof TTarget> = Pick<
   Partial<TTarget>,

From c40e8c85c61f0d7de36cc671fcce6514753832f1 Mon Sep 17 00:00:00 2001
From: novice0840 <magnolia0840@gmail.com>
Date: Fri, 11 Apr 2025 00:54:40 +0900
Subject: [PATCH 3/6] fix: remove blank

---
 packages/query-core/src/types.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts
index 35106b242f..c973b6a758 100644
--- a/packages/query-core/src/types.ts
+++ b/packages/query-core/src/types.ts
@@ -432,12 +432,11 @@ export interface QueryObserverOptions<
 export type WithRequired<TTarget, TKey extends keyof TTarget> = TTarget & {
   [_ in TKey]: {}
 }
-
 export type Optional<TTarget, TKey extends keyof TTarget> = Pick<
   Partial<TTarget>,
   TKey
 > &
-  Omit<TTarget, TKey>
+  OmitKeyof<TTarget, TKey>
 
 export type DefaultedQueryObserverOptions<
   TQueryFnData = unknown,

From 01814f798cd941835ded6ad78e0238f26726c2f8 Mon Sep 17 00:00:00 2001
From: novice0840 <magnolia0840@gmail.com>
Date: Fri, 11 Apr 2025 00:59:05 +0900
Subject: [PATCH 4/6] refactor(query-core): change Omitkeyof to Omit

---
 packages/query-core/src/types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts
index c973b6a758..5237496371 100644
--- a/packages/query-core/src/types.ts
+++ b/packages/query-core/src/types.ts
@@ -436,7 +436,7 @@ export type Optional<TTarget, TKey extends keyof TTarget> = Pick<
   Partial<TTarget>,
   TKey
 > &
-  OmitKeyof<TTarget, TKey>
+  Omit<TTarget, TKey>
 
 export type DefaultedQueryObserverOptions<
   TQueryFnData = unknown,

From 4de190abfe0479cce7f8fba0dc3715a34ee7c6ec Mon Sep 17 00:00:00 2001
From: novice0840 <magnolia0840@gmail.com>
Date: Mon, 21 Apr 2025 00:28:24 +0900
Subject: [PATCH 5/6] refactor: remove unused common type

---
 packages/query-core/src/types.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts
index 5237496371..07eac4527a 100644
--- a/packages/query-core/src/types.ts
+++ b/packages/query-core/src/types.ts
@@ -430,13 +430,8 @@ export interface QueryObserverOptions<
 }
 
 export type WithRequired<TTarget, TKey extends keyof TTarget> = TTarget & {
-  [_ in TKey]: {}
+  [K in TKey]-?: TTarget[K]
 }
-export type Optional<TTarget, TKey extends keyof TTarget> = Pick<
-  Partial<TTarget>,
-  TKey
-> &
-  Omit<TTarget, TKey>
 
 export type DefaultedQueryObserverOptions<
   TQueryFnData = unknown,

From a9ed93c03ad290ff2a7de75a0f6f5a9e2577c4e4 Mon Sep 17 00:00:00 2001
From: novice0840 <magnolia0840@gmail.com>
Date: Mon, 21 Apr 2025 00:54:49 +0900
Subject: [PATCH 6/6] fix: revert type WithRequired

---
 packages/query-core/src/types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts
index 07eac4527a..1c59c74375 100644
--- a/packages/query-core/src/types.ts
+++ b/packages/query-core/src/types.ts
@@ -430,7 +430,7 @@ export interface QueryObserverOptions<
 }
 
 export type WithRequired<TTarget, TKey extends keyof TTarget> = TTarget & {
-  [K in TKey]-?: TTarget[K]
+  [_ in TKey]: {}
 }
 
 export type DefaultedQueryObserverOptions<