fix(react-query): Override queryKey instead of queryHashKey (#78)

Author: Embraser01

.yarn/versions/3bb1dcfd.yml

@@ -0,0 +1,2 @@
+releases:
+  "@typoas/react-query": patch

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 ---
 
+## 4.2.2 - 2025-02-12
+
+> Only @typoas/react-query was updated to 4.2.2
+
+- fix(react-query): Override queryKey instead of queryHashKey [#78](https://github.com/Embraser01/typoas/pull/78)
+
 ## 4.2.1 - 2025-02-12
 
 > Only @typoas/react-query was updated to 4.2.1

packages/typoas-react-query/src/infinite-query-factory.ts

@@ -1,7 +1,6 @@
 import {
   DefaultError,
   QueryClient,
-  hashKey,
   useInfiniteQuery,
   UseInfiniteQueryOptions,
   UndefinedInitialDataInfiniteOptions,
@@ -127,15 +126,8 @@ export function createInfiniteQueryHook<
         ...options,
         getNextPageParam,
         initialPageParam,
-        // Override the query key hash function to include the name of the query
-        // This is the main way to ensure that the query key is unique
-        // Note that if a user provides a custom queryKeyHashFn,
-        // they will receive the name as the first argument.
-        queryKeyHashFn: (queryKey) => {
-          const hashFn =
-            options.queryKeyHashFn || baseOptions.queryKeyHashFn || hashKey;
-          return hashFn([name, ...queryKey]);
-        },
+        // Override the query key to differentiate between multiple typoas functions
+        queryKey: [name, ...options.queryKey],
         queryFn: ({ pageParam }) => {
           const ctx = localContext || context;
           if (!ctx) {

packages/typoas-react-query/src/mutation-factory.ts

@@ -13,6 +13,7 @@ import {
 } from '@typoas/runtime';
 import { useApiContext } from './api-context';
 import { TypoasFuncStatusType, TypoasReturnType } from './types';
+import { getQueryFunctionKey } from './func-names';
 
 export type TypoasMutationVariables<
   Func extends TypoasMutationFunction<FetcherData>,
@@ -94,6 +95,10 @@ export function createMutationHook<
       {
         ...baseOptions,
         ...options,
+        // Override the mutation key to differentiate between multiple typoas functions
+        mutationKey: options.mutationKey
+          ? [getQueryFunctionKey(func), ...options.mutationKey]
+          : undefined,
         mutationFn: ([params, body]) => {
           const ctx = localContext || context;
           if (!ctx) {

packages/typoas-react-query/src/query-factory.ts

@@ -5,7 +5,6 @@ import {
   useQuery,
   UseQueryOptions,
   UseQueryResult,
-  hashKey,
   DefaultError,
 } from '@tanstack/react-query';
 import {
@@ -94,15 +93,8 @@ export function createQueryHook<
       {
         ...baseOptions,
         ...options,
-        // Override the query key hash function to include the name of the query
-        // This is the main way to ensure that the query key is unique
-        // Note that if a user provides a custom queryKeyHashFn,
-        // they will receive the name as the first argument.
-        queryKeyHashFn: (queryKey) => {
-          const hashFn =
-            options.queryKeyHashFn || baseOptions.queryKeyHashFn || hashKey;
-          return hashFn([name, ...queryKey]);
-        },
+        // Override the query key to differentiate between multiple typoas functions
+        queryKey: [name, ...options.queryKey],
         queryFn: () => {
           const ctx = localContext || context;
           if (!ctx) {