refactor(query-core): move Override type to core (#7916)

* type(react-query, svelte-query): remove unnecessary Override type * feat(query-core): add Override Co-authored-by: Lee HyunJae (whale) <[email protected]> * chore: update * chore: update --------- Co-authored-by: Lee HyunJae (whale) <[email protected]> Co-authored-by: Dominik Dorfmeister <[email protected]>
TanStack · Sep 8, 2024 · f0c5022 · f0c5022
1 parent 4df469a
commit f0c5022
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 24 deletions.
diff --git a/packages/angular-query-experimental/src/types.ts b/packages/angular-query-experimental/src/types.ts
@@ -10,6 +10,7 @@ import type {
   MutationObserverOptions,
   MutationObserverResult,
   OmitKeyof,
+  Override,
   QueryKey,
   QueryObserverOptions,
   QueryObserverResult,
@@ -321,12 +322,6 @@ export type CreateMutationResult<
 > = BaseMutationNarrowing<TData, TError, TVariables, TContext> &
   MapToSignals<OmitKeyof<TState, keyof BaseMutationNarrowing, 'safely'>>
 
-type Override<TTargetA, TTargetB> = {
-  [AKey in keyof TTargetA]: AKey extends keyof TTargetB
-    ? TTargetB[AKey]
-    : TTargetA[AKey]
-}
-
 /**
  * @public
  */

diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts
@@ -20,6 +20,12 @@ export type OmitKeyof<
   TStrictly extends 'strictly' | 'safely' = 'strictly',
 > = Omit<TObject, TKey>
 
+export type Override<TTargetA, TTargetB> = {
+  [AKey in keyof TTargetA]: AKey extends keyof TTargetB
+    ? TTargetB[AKey]
+    : TTargetA[AKey]
+}
+
 export type NoInfer<T> = [T][T extends any ? 0 : never]
 
 export interface Register {

diff --git a/packages/react-query/src/types.ts b/packages/react-query/src/types.ts
@@ -10,6 +10,7 @@ import type {
   MutationObserverOptions,
   MutationObserverResult,
   OmitKeyof,
+  Override,
   QueryKey,
   QueryObserverOptions,
   QueryObserverResult,
@@ -167,9 +168,3 @@ export type UseMutationResult<
   TVariables = unknown,
   TContext = unknown,
 > = UseBaseMutationResult<TData, TError, TVariables, TContext>
-
-type Override<TTargetA, TTargetB> = {
-  [AKey in keyof TTargetA]: AKey extends keyof TTargetB
-    ? TTargetB[AKey]
-    : TTargetA[AKey]
-}
diff --git a/packages/solid-query/src/types.ts b/packages/solid-query/src/types.ts
@@ -9,6 +9,7 @@ import type {
   MutationObserverOptions,
   MutationObserverResult,
   OmitKeyof,
+  Override,
   QueryKey,
   QueryObserverResult,
 } from '@tanstack/query-core'
@@ -200,9 +201,3 @@ export type CreateMutationResult<
   TVariables = unknown,
   TContext = unknown,
 > = CreateBaseMutationResult<TData, TError, TVariables, TContext>
-
-type Override<TTargetA, TTargetB> = {
-  [AKey in keyof TTargetA]: AKey extends keyof TTargetB
-    ? TTargetB[AKey]
-    : TTargetA[AKey]
-}
diff --git a/packages/svelte-query/src/types.ts b/packages/svelte-query/src/types.ts
@@ -10,6 +10,7 @@ import type {
   MutationObserverResult,
   MutationState,
   OmitKeyof,
+  Override,
   QueryKey,
   QueryObserverOptions,
   QueryObserverResult,
@@ -130,12 +131,6 @@ export type CreateMutationResult<
   TContext = unknown,
 > = Readable<CreateBaseMutationResult<TData, TError, TVariables, TContext>>
 
-type Override<TTargetA, TTargetB> = {
-  [AKey in keyof TTargetA]: AKey extends keyof TTargetB
-    ? TTargetB[AKey]
-    : TTargetA[AKey]
-}
-
 /** Options for useMutationState */
 export type MutationStateOptions<TResult = MutationState> = {
   filters?: MutationFilters