feat(hydration): dehydrate.serialize and hydrate.deserialize

integrations/react-next-15/app/make-query-client.ts

@@ -18,6 +18,7 @@ export function makeQueryClient() {
   return new QueryClient({
     defaultOptions: {
       hydrate: {
+        transformData: (data) => tson.deserialize(data),
         /**
          * Called when the query is rebuilt from a prefetched
          * promise, before the query data is put into the cache.

packages/query-core/src/__tests__/hydration.test.tsx

@@ -943,4 +943,41 @@ describe('dehydration and rehydration', () => {
 
     queryClient.clear()
   })
+
+  test('should transform query data if promise is already resolved', async () => {
+    const queryClient = createQueryClient({
+      defaultOptions: {
+        dehydrate: {
+          shouldDehydrateQuery: () => true,
+        },
+      },
+    })
+
+    const promise = queryClient.prefetchQuery({
+      queryKey: ['transformedStringToDate'],
+      queryFn: () => fetchData('2024-01-01T00:00:00.000Z', 0),
+    })
+    await sleep(20)
+    const dehydrated = dehydrate(queryClient)
+    console.log('de', dehydrated)
+
+    const hydrationClient = createQueryClient({
+      defaultOptions: {
+        hydrate: {
+          transformData: (d) => new Date(d),
+          transformPromise: (p) => p.then((d) => new Date(d)),
+        },
+      },
+    })
+
+    hydrate(hydrationClient, dehydrated)
+    await promise
+    await waitFor(() =>
+      expect(
+        hydrationClient.getQueryData(['transformedStringToDate']),
+      ).toBeInstanceOf(Date),
+    )
+
+    queryClient.clear()
+  })
 })

packages/query-core/src/hydration.ts

@@ -21,6 +21,7 @@ export interface DehydrateOptions {
 
 export interface HydrateOptions {
   defaultOptions?: {
+    transformData?: (data: any) => any
     transformPromise?: (promise: Promise<any>) => Promise<any>
     queries?: QueryOptions
     mutations?: MutationOptions<unknown, DefaultError, unknown, unknown>
@@ -160,6 +161,7 @@ export function hydrate(
       }
     } else {
       // Restore query
+      const transformData = client.getDefaultOptions().hydrate?.transformData
       query = queryCache.build(
         client,
         {
@@ -173,6 +175,9 @@ export function hydrate(
         // query being stuck in fetching state upon hydration
         {
           ...state,
+          ...('data' in state && {
+            data: transformData?.(state.data) ?? state.data,
+          }),
           fetchStatus: 'idle',
         },
       )