@tanstack/query-core 5.90.5 → 5.90.7

package/src/hydration.ts

@@ -79,25 +79,29 @@ function dehydrateQuery(
   serializeData: TransformerFn,
   shouldRedactErrors: (error: unknown) => boolean,
 ): DehydratedQuery {
-  const promise = query.promise?.then(serializeData).catch((error) => {
-    if (!shouldRedactErrors(error)) {
-      // Reject original error if it should not be redacted
-      return Promise.reject(error)
-    }
-    // If not in production, log original error before rejecting redacted error
-    if (process.env.NODE_ENV !== 'production') {
-      console.error(
-        `A query that was dehydrated as pending ended up rejecting. [${query.queryHash}]: ${error}; The error will be redacted in production builds`,
-      )
-    }
-    return Promise.reject(new Error('redacted'))
-  })
+  const dehydratePromise = () => {
+    const promise = query.promise?.then(serializeData).catch((error) => {
+      if (!shouldRedactErrors(error)) {
+        // Reject original error if it should not be redacted
+        return Promise.reject(error)
+      }
+      // If not in production, log original error before rejecting redacted error
+      if (process.env.NODE_ENV !== 'production') {
+        console.error(
+          `A query that was dehydrated as pending ended up rejecting. [${query.queryHash}]: ${error}; The error will be redacted in production builds`,
+        )
+      }
+      return Promise.reject(new Error('redacted'))
+    })
+
+    // Avoid unhandled promise rejections
+    // We need the promise we dehydrate to reject to get the correct result into
+    // the query cache, but we also want to avoid unhandled promise rejections
+    // in whatever environment the prefetches are happening in.
+    promise?.catch(noop)
 
-  // Avoid unhandled promise rejections
-  // We need the promise we dehydrate to reject to get the correct result into
-  // the query cache, but we also want to avoid unhandled promise rejections
-  // in whatever environment the prefetches are happening in.
-  promise?.catch(noop)
+    return promise
+  }
 
   return {
     dehydratedAt: Date.now(),
@@ -110,7 +114,7 @@ function dehydrateQuery(
     queryKey: query.queryKey,
     queryHash: query.queryHash,
     ...(query.state.status === 'pending' && {
-      promise,
+      promise: dehydratePromise(),
     }),
     ...(query.meta && { meta: query.meta }),
   }

package/src/query.ts

@@ -210,10 +210,9 @@ export class Query<
     if (this.state && this.state.data === undefined) {
       const defaultState = getDefaultState(this.options)
       if (defaultState.data !== undefined) {
-        this.setData(defaultState.data, {
-          updatedAt: defaultState.dataUpdatedAt,
-          manual: true,
-        })
+        this.setState(
+          successState(defaultState.data, defaultState.dataUpdatedAt),
+        )
         this.#initialState = defaultState
       }
     }
@@ -635,12 +634,8 @@ export class Query<
         case 'success':
           const newState = {
             ...state,
-            data: action.data,
+            ...successState(action.data, action.dataUpdatedAt),
             dataUpdateCount: state.dataUpdateCount + 1,
-            dataUpdatedAt: action.dataUpdatedAt ?? Date.now(),
-            error: null,
-            isInvalidated: false,
-            status: 'success' as const,
             ...(!action.manual && {
               fetchStatus: 'idle' as const,
               fetchFailureCount: 0,
@@ -710,6 +705,16 @@ export function fetchState<
   } as const
 }
 
+function successState<TData>(data: TData | undefined, dataUpdatedAt?: number) {
+  return {
+    data,
+    dataUpdatedAt: dataUpdatedAt ?? Date.now(),
+    error: null,
+    isInvalidated: false,
+    status: 'success' as const,
+  }
+}
+
 function getDefaultState<
   TQueryFnData,
   TError,