From 455f081858a74ec9ee93094bc7094f17bbf12bcc Mon Sep 17 00:00:00 2001 From: Neef Rehman Date: Mon, 13 Jan 2025 11:41:06 +0000 Subject: [PATCH 1/2] fix(types): support both `Array` and `ReadonlyArray` for typed query and mutation keys --- packages/query-core/src/types.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts index 5014cfbf1fa..05166e225d1 100644 --- a/packages/query-core/src/types.ts +++ b/packages/query-core/src/types.ts @@ -45,9 +45,9 @@ export type DefaultError = Register extends { export type QueryKey = Register extends { queryKey: infer TQueryKey } - ? TQueryKey extends Array + ? TQueryKey extends ReadonlyArray ? TQueryKey - : ReadonlyArray + : TQueryKey extends Array ? TQueryKey : ReadonlyArray : ReadonlyArray export const dataTagSymbol = Symbol('dataTagSymbol') @@ -1009,7 +1009,7 @@ export type MutationKey = Register extends { } ? TMutationKey extends Array ? TMutationKey - : ReadonlyArray + : TMutationKey extends Array ? TMutationKey : ReadonlyArray : ReadonlyArray export type MutationStatus = 'idle' | 'pending' | 'success' | 'error' From 35beb72b5ff9a2e3812f42ba0c2050a2717a3c46 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 11:43:59 +0000 Subject: [PATCH 2/2] ci: apply automated fixes --- packages/query-core/src/types.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts index 05166e225d1..26d978b8eec 100644 --- a/packages/query-core/src/types.ts +++ b/packages/query-core/src/types.ts @@ -47,7 +47,9 @@ export type QueryKey = Register extends { } ? TQueryKey extends ReadonlyArray ? TQueryKey - : TQueryKey extends Array ? TQueryKey : ReadonlyArray + : TQueryKey extends Array + ? TQueryKey + : ReadonlyArray : ReadonlyArray export const dataTagSymbol = Symbol('dataTagSymbol') @@ -1009,7 +1011,9 @@ export type MutationKey = Register extends { } ? TMutationKey extends Array ? TMutationKey - : TMutationKey extends Array ? TMutationKey : ReadonlyArray + : TMutationKey extends Array + ? TMutationKey + : ReadonlyArray : ReadonlyArray export type MutationStatus = 'idle' | 'pending' | 'success' | 'error'