@depup/reduxjs__toolkit 2.12.0-depup.28 → 2.13.0-depup.0

package/src/query/core/buildMiddleware/types.ts

@@ -86,8 +86,11 @@ export type SubMiddlewareApi = MiddlewareAPI<
   RootState<EndpointDefinitions, string, string>
 >
 
-export interface BuildSubMiddlewareInput
-  extends BuildMiddlewareInput<EndpointDefinitions, string, string> {
+export interface BuildSubMiddlewareInput extends BuildMiddlewareInput<
+  EndpointDefinitions,
+  string,
+  string
+> {
   internalState: InternalMiddlewareState
   refetchQuery(
     querySubState: Exclude<

package/src/query/core/buildSlice.ts

@@ -512,7 +512,7 @@ export function buildSlice({
 
             for (const { type, id } of providedTags) {
               const subscribedQueries = ((draft.tags[type] ??= {})[
-                id || '__internal_without_id'
+                id ?? '__internal_without_id'
               ] ??= [])
               const alreadySubscribed =
                 subscribedQueries.includes(queryCacheKey)
@@ -549,7 +549,7 @@ export function buildSlice({
           )) {
             for (const [id, cacheKeys] of Object.entries(incomingTags)) {
               const subscribedQueries = ((draft.tags[type] ??= {})[
-                id || '__internal_without_id'
+                id ?? '__internal_without_id'
               ] ??= [])
               for (const queryCacheKey of cacheKeys) {
                 const alreadySubscribed =

package/src/query/core/buildThunks.ts

@@ -971,6 +971,25 @@ In the case of an unhandled error, no tags will be "provided" or "invalidated".`
           return false
         }
 
+        if (direction && isInfiniteQueryDefinition(endpointDefinition)) {
+          const cachedData = requestState?.data as
+            | InfiniteData<unknown, unknown>
+            | undefined
+          if (cachedData?.pages.length) {
+            const { infiniteQueryOptions } = endpointDefinition
+            const pageParamFn =
+              direction === 'forward' ? getNextPageParam : getPreviousPageParam
+            const nextParam = pageParamFn(
+              infiniteQueryOptions,
+              cachedData,
+              currentArg,
+            )
+            if (nextParam == null) {
+              return false
+            }
+          }
+        }
+
         return true
       },
       dispatchConditionRejection: true,

package/src/query/core/module.ts

@@ -431,7 +431,9 @@ export interface ApiEndpointQuery<
   Definition extends QueryDefinition<any, any, any, any, any>,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   Definitions extends EndpointDefinitions,
-> extends BuildThunksApiEndpointQuery<Definition>,
+>
+  extends
+    BuildThunksApiEndpointQuery<Definition>,
     BuildInitiateApiEndpointQuery<Definition>,
     BuildSelectorsApiEndpointQuery<Definition, Definitions> {
   name: string
@@ -446,7 +448,9 @@ export interface ApiEndpointInfiniteQuery<
   Definition extends InfiniteQueryDefinition<any, any, any, any, any>,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   Definitions extends EndpointDefinitions,
-> extends BuildThunksApiEndpointInfiniteQuery<Definition>,
+>
+  extends
+    BuildThunksApiEndpointInfiniteQuery<Definition>,
     BuildInitiateApiEndpointInfiniteQuery<Definition>,
     BuildSelectorsApiEndpointInfiniteQuery<Definition, Definitions> {
   name: string
@@ -462,7 +466,9 @@ export interface ApiEndpointMutation<
   Definition extends MutationDefinition<any, any, any, any, any>,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   Definitions extends EndpointDefinitions,
-> extends BuildThunksApiEndpointMutation<Definition>,
+>
+  extends
+    BuildThunksApiEndpointMutation<Definition>,
     BuildInitiateApiEndpointMutation<Definition>,
     BuildSelectorsApiEndpointMutation<Definition, Definitions> {
   name: string

package/src/query/createApi.ts

@@ -365,7 +365,10 @@ export function buildCreateApi<Modules extends [Module<any>, ...Module<any>[]]>(
       extractRehydrationInfo,
       serializeQueryArgs(queryArgsApi) {
         let finalSerializeQueryArgs = defaultSerializeQueryArgs
-        if ('serializeQueryArgs' in queryArgsApi.endpointDefinition) {
+        if (
+          queryArgsApi.endpointDefinition &&
+          'serializeQueryArgs' in queryArgsApi.endpointDefinition
+        ) {
           const endpointSQA =
             queryArgsApi.endpointDefinition.serializeQueryArgs!
           finalSerializeQueryArgs = (queryArgsApi) => {

package/src/query/endpointDefinitions.ts

@@ -614,7 +614,9 @@ export interface QueryExtraOptions<
   BaseQuery extends BaseQueryFn,
   ReducerPath extends string = string,
   RawResultType extends BaseQueryResult<BaseQuery> = BaseQueryResult<BaseQuery>,
-> extends CacheLifecycleQueryExtraOptions<
+>
+  extends
+    CacheLifecycleQueryExtraOptions<
       ResultType,
       QueryArg,
       BaseQuery,
@@ -925,7 +927,9 @@ export interface InfiniteQueryExtraOptions<
   BaseQuery extends BaseQueryFn,
   ReducerPath extends string = string,
   RawResultType extends BaseQueryResult<BaseQuery> = BaseQueryResult<BaseQuery>,
-> extends CacheLifecycleInfiniteQueryExtraOptions<
+>
+  extends
+    CacheLifecycleInfiniteQueryExtraOptions<
       InfiniteData<ResultType, PageParam>,
       QueryArg,
       BaseQuery,
@@ -1140,7 +1144,9 @@ export interface MutationExtraOptions<
   BaseQuery extends BaseQueryFn,
   ReducerPath extends string = string,
   RawResultType extends BaseQueryResult<BaseQuery> = BaseQueryResult<BaseQuery>,
-> extends CacheLifecycleMutationExtraOptions<
+>
+  extends
+    CacheLifecycleMutationExtraOptions<
       ResultType,
       QueryArg,
       BaseQuery,
@@ -1378,8 +1384,8 @@ export type EndpointBuilder<
   query<
     ResultType,
     QueryArg,
-    RawResultType extends
-      BaseQueryResult<BaseQuery> = BaseQueryResult<BaseQuery>,
+    RawResultType extends BaseQueryResult<BaseQuery> =
+      BaseQueryResult<BaseQuery>,
   >(
     definition: OmitFromUnion<
       QueryDefinition<
@@ -1460,8 +1466,8 @@ export type EndpointBuilder<
   mutation<
     ResultType,
     QueryArg,
-    RawResultType extends
-      BaseQueryResult<BaseQuery> = BaseQueryResult<BaseQuery>,
+    RawResultType extends BaseQueryResult<BaseQuery> =
+      BaseQueryResult<BaseQuery>,
   >(
     definition: OmitFromUnion<
       MutationDefinition<
@@ -1487,8 +1493,8 @@ export type EndpointBuilder<
     ResultType,
     QueryArg,
     PageParam,
-    RawResultType extends
-      BaseQueryResult<BaseQuery> = BaseQueryResult<BaseQuery>,
+    RawResultType extends BaseQueryResult<BaseQuery> =
+      BaseQueryResult<BaseQuery>,
   >(
     definition: OmitFromUnion<
       InfiniteQueryDefinition<

package/src/query/fetchBaseQuery.ts

@@ -132,7 +132,7 @@ export type FetchBaseQueryArgs = {
    * in a predicate function for your given api to get the same automatic stringifying behavior
    * @example
    * ```ts
-   * const isJsonContentType = (headers: Headers) => ["application/vnd.api+json", "application/json", "application/vnd.hal+json"].includes(headers.get("content-type")?.trim());
+   * const isJsonContentType = (headers: Headers) => ["application/vnd.api+json", "application/json", "application/vnd.hal+json"].includes((headers.get("content-type") ?? "").trim());
    * ```
    */
   isJsonContentType?: (headers: Headers) => boolean

package/src/query/react/buildHooks.ts

@@ -587,7 +587,7 @@ export type UseQueryStateOptions<
    *
    *   return (
    *     <ul>
-   *       {posts?.data?.map((post) => (
+   *       {posts?.map((post) => (
    *         <PostById key={post.id} id={post.id} />
    *       ))}
    *     </ul>
@@ -1171,7 +1171,7 @@ export type UseInfiniteQueryStateOptions<
    *
    *   return (
    *     <ul>
-   *       {posts?.data?.map((post) => (
+   *       {posts?.map((post) => (
    *         <PostById key={post.id} id={post.id} />
    *       ))}
    *     </ul>
@@ -1286,6 +1286,8 @@ type UseInfiniteQueryStateBaseResult<
   hasPreviousPage: boolean
   isFetchingNextPage: boolean
   isFetchingPreviousPage: boolean
+  isFetchNextPageError: boolean
+  isFetchPreviousPageError: boolean
 }
 
 type UseInfiniteQueryStateDefaultResult<
@@ -1510,7 +1512,7 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
   api,
   moduleOptions: {
     batch,
-    hooks: { useDispatch, useSelector, useStore },
+    hooks: { useDispatch, useSelector },
     unstable__sideEffectsInRender,
     createSelector,
   },
@@ -1527,12 +1529,14 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
     deps?: DependencyList,
   ) => void = unstable__sideEffectsInRender ? (cb) => cb() : useEffect
 
-  type UnsubscribePromiseRef = React.RefObject<
-    { unsubscribe?: () => void } | undefined
-  >
+  type UnsubscribePromiseRef = {
+    current: { unsubscribe?: () => void } | undefined
+  }
 
-  const unsubscribePromiseRef = (ref: UnsubscribePromiseRef) =>
+  const unsubscribePromiseRef = (ref: UnsubscribePromiseRef) => {
     ref.current?.unsubscribe?.()
+    ref.current = undefined
+  }
 
   const endpointDefinitions = context.endpointDefinitions
 
@@ -1570,9 +1574,9 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
         lastResult = undefined
     }
 
-    // data is the last known good request result we have tracked - or if none has been tracked yet the last good result for the current args
-    let data = currentState.isSuccess ? currentState.data : lastResult?.data
-    if (data === undefined) data = currentState.data
+    // data is the latest available cache entry, or the last known good request result we have tracked
+    let data = currentState.data
+    if (data === undefined) data = lastResult?.data
 
     const hasData = data !== undefined
 
@@ -1588,10 +1592,14 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
     // isSuccess = true when data is present and we're not refetching after an error.
     // That includes cases where the _current_ item is either actively
     // fetching or about to fetch due to an uninitialized entry.
+    // The cache entry keeps `error` set through a pending refetch and only
+    // clears it on success, so the entry itself tells us if this is a
+    // refetch-after-error without consulting `lastResult`.
     const isSuccess =
       currentState.isSuccess ||
       (hasData &&
-        ((isFetching && !lastResult?.isError) || currentState.isUninitialized))
+        ((isFetching && currentState.error === undefined) ||
+          currentState.isUninitialized))
 
     return {
       ...currentState,
@@ -1630,9 +1638,9 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
         lastResult = undefined
     }
 
-    // data is the last known good request result we have tracked - or if none has been tracked yet the last good result for the current args
-    let data = currentState.isSuccess ? currentState.data : lastResult?.data
-    if (data === undefined) data = currentState.data
+    // data is the latest available cache entry, or the last known good request result we have tracked
+    let data = currentState.data
+    if (data === undefined) data = lastResult?.data
 
     const hasData = data !== undefined
 
@@ -1646,10 +1654,12 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
     // isSuccess = true when data is present and we're not refetching after an error.
     // That includes cases where the _current_ item is either actively
     // fetching or about to fetch due to an uninitialized entry.
+    // See `queryStatePreSelector` for why this reads `error` from the entry.
     const isSuccess =
       currentState.isSuccess ||
       (hasData &&
-        ((isFetching && !lastResult?.isError) || currentState.isUninitialized))
+        ((isFetching && currentState.error === undefined) ||
+          currentState.isUninitialized))
 
     return {
       ...currentState,
@@ -1703,10 +1713,7 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
     >
     const dispatch = useDispatch<ThunkDispatch<any, any, UnknownAction>>()
 
-    // TODO: Change this to `useRef<SubscriptionSelectors>(undefined)` after upgrading to React 19.
-    const subscriptionSelectorsRef = useRef<SubscriptionSelectors | undefined>(
-      undefined,
-    )
+    const subscriptionSelectorsRef = useRef<SubscriptionSelectors>(undefined)
 
     if (!subscriptionSelectorsRef.current) {
       const returnedValue = dispatch(
@@ -1745,10 +1752,7 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
     ).refetchCachedPages
     const stableRefetchCachedPages = useShallowStableValue(refetchCachedPages)
 
-    /**
-     * @todo Change this to `useRef<QueryActionCreatorResult<any>>(undefined)` after upgrading to React 19.
-     */
-    const promiseRef = useRef<T | undefined>(undefined)
+    const promiseRef = useRef<T>(undefined)
 
     let { queryCacheKey, requestId } = promiseRef.current || {}
 
@@ -1848,6 +1852,7 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
       type ApiRootState = Parameters<ReturnType<typeof select>>[0]
 
       const lastValue = useRef<any>(undefined)
+      const latestDefaultResult = useRef<any>(undefined)
 
       const selectDefaultResult: Selector<ApiRootState, any, [any]> = useMemo(
         () =>
@@ -1862,6 +1867,11 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
               (_: ApiRootState, lastResult: any) => lastResult,
               (_: ApiRootState) => stableArg,
             ],
+            // `preSelector` is a union of the standard/infinite query pre-selectors.
+            // `tsc` attributes the resulting overload error to the `createSelector` call
+            // (suppressed above), but `tsgo` attributes it to this argument line, so it
+            // needs its own directive.
+            // @ts-ignore
             preSelector,
             {
               memoizeOptions: {
@@ -1872,30 +1882,28 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
         [select, stableArg],
       )
 
-      const querySelector: Selector<ApiRootState, any, [any]> = useMemo(
-        () =>
+      const querySelector = useMemo(() => {
+        const selectResult: Selector<ApiRootState, any, [any]> =
           selectFromResult
             ? createSelector([selectDefaultResult], selectFromResult, {
                 devModeChecks: { identityFunctionCheck: 'never' },
               })
-            : selectDefaultResult,
-        [selectDefaultResult, selectFromResult],
-      )
+            : selectDefaultResult
+        return (state: RootState<Definitions, any, any>) => {
+          const lastResult = lastValue.current
+          const result = selectResult(state, lastResult)
+          // Same args as the input selector call that just happened, so this
+          // is a memoized read of the un-narrowed result for the next pass.
+          latestDefaultResult.current = selectDefaultResult(state, lastResult)
+          return result
+        }
+      }, [selectDefaultResult, selectFromResult])
 
-      const currentState = useSelector(
-        (state: RootState<Definitions, any, any>) =>
-          querySelector(state, lastValue.current),
-        shallowEqual,
-      )
+      const currentState = useSelector(querySelector, shallowEqual)
 
-      const store = useStore<RootState<Definitions, any, any>>()
-      const newLastValue = selectDefaultResult(
-        store.getState(),
-        lastValue.current,
-      )
       useIsomorphicLayoutEffect(() => {
-        lastValue.current = newLastValue
-      }, [newLastValue])
+        lastValue.current = latestDefaultResult.current
+      })
 
       return currentState
     }
@@ -1909,8 +1917,6 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
     useEffect(() => {
       return () => {
         unsubscribePromiseRef(promiseRef)
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-        ;(promiseRef.current as any) = undefined
       }
     }, [promiseRef])
   }
@@ -1952,7 +1958,7 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
       refetchOnFocus,
       pollingInterval = 0,
       skipPollingIfUnfocused = false,
-    } = {}) => {
+    }: SubscriptionOptions = {}) => {
       const { initiate } = api.endpoints[endpointName] as ApiEndpointQuery<
         QueryDefinition<any, any, any, any, any>,
         Definitions
@@ -1961,13 +1967,7 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
 
       const [arg, setArg] = useState<any>(UNINITIALIZED_VALUE)
 
-      // TODO: Change this to `useRef<QueryActionCreatorResult<any>>(undefined)` after upgrading to React 19.
-      /**
-       * @todo Change this to `useRef<QueryActionCreatorResult<any>>(undefined)` after upgrading to React 19.
-       */
-      const promiseRef = useRef<QueryActionCreatorResult<any> | undefined>(
-        undefined,
-      )
+      const promiseRef = useRef<QueryActionCreatorResult<any>>(undefined)
 
       const stableSubscriptionOptions = useShallowStableValue({
         refetchOnReconnect,
@@ -2218,7 +2218,10 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
   }
 
   function buildMutationHook(name: string): UseMutation<any> {
-    return ({ selectFromResult, fixedCacheKey } = {}) => {
+    return ({
+      selectFromResult,
+      fixedCacheKey,
+    }: UseMutationStateOptions<any, any> = {}) => {
       const { select, initiate } = api.endpoints[name] as ApiEndpointMutation<
         MutationDefinition<any, any, any, any, any>,
         Definitions

package/src/query/react/namedHooks.ts

@@ -13,41 +13,45 @@ import type {
 } from './buildHooks'
 
 type QueryHookNames<Definitions extends EndpointDefinitions> = {
-  [K in keyof Definitions as Definitions[K] extends {
-    type: DefinitionType.query
-  }
-    ? `use${Capitalize<K & string>}Query`
-    : never]: UseQuery<
-    Extract<Definitions[K], QueryDefinition<any, any, any, any>>
-  >
+  [
+    K in keyof Definitions as Definitions[K] extends {
+      type: DefinitionType.query
+    }
+      ? `use${Capitalize<K & string>}Query`
+      : never
+  ]: UseQuery<Extract<Definitions[K], QueryDefinition<any, any, any, any>>>
 }
 
 type LazyQueryHookNames<Definitions extends EndpointDefinitions> = {
-  [K in keyof Definitions as Definitions[K] extends {
-    type: DefinitionType.query
-  }
-    ? `useLazy${Capitalize<K & string>}Query`
-    : never]: UseLazyQuery<
-    Extract<Definitions[K], QueryDefinition<any, any, any, any>>
-  >
+  [
+    K in keyof Definitions as Definitions[K] extends {
+      type: DefinitionType.query
+    }
+      ? `useLazy${Capitalize<K & string>}Query`
+      : never
+  ]: UseLazyQuery<Extract<Definitions[K], QueryDefinition<any, any, any, any>>>
 }
 
 type InfiniteQueryHookNames<Definitions extends EndpointDefinitions> = {
-  [K in keyof Definitions as Definitions[K] extends {
-    type: DefinitionType.infinitequery
-  }
-    ? `use${Capitalize<K & string>}InfiniteQuery`
-    : never]: UseInfiniteQuery<
+  [
+    K in keyof Definitions as Definitions[K] extends {
+      type: DefinitionType.infinitequery
+    }
+      ? `use${Capitalize<K & string>}InfiniteQuery`
+      : never
+  ]: UseInfiniteQuery<
     Extract<Definitions[K], InfiniteQueryDefinition<any, any, any, any, any>>
   >
 }
 
 type MutationHookNames<Definitions extends EndpointDefinitions> = {
-  [K in keyof Definitions as Definitions[K] extends {
-    type: DefinitionType.mutation
-  }
-    ? `use${Capitalize<K & string>}Mutation`
-    : never]: UseMutation<
+  [
+    K in keyof Definitions as Definitions[K] extends {
+      type: DefinitionType.mutation
+    }
+      ? `use${Capitalize<K & string>}Mutation`
+      : never
+  ]: UseMutation<
     Extract<Definitions[K], MutationDefinition<any, any, any, any>>
   >
 }

package/src/query/utils/isAbsoluteUrl.ts

@@ -1,9 +1,14 @@
 /**
- * If either :// or // is present consider it to be an absolute url
+ * Determines whether a url is absolute: it either starts with a scheme
+ * (`https://example.com`) or is protocol-relative (`//example.com`).
+ *
+ * The test is anchored to the start of the string on purpose. A relative url can
+ * legitimately carry an absolute one inside its query string, as in
+ * `redirect?target=https://example.com`, and treating that as absolute would make
+ * `joinUrls` drop the `baseUrl`.
  *
  * @param url string
  */
-
 export function isAbsoluteUrl(url: string) {
-  return new RegExp(`(^|:)//`).test(url)
+  return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url)
 }

package/src/serializableStateInvariantMiddleware.ts

@@ -243,7 +243,7 @@ export function createSerializableStateInvariantMiddleware(
               value,
               '\nTake a look at the logic that dispatched this action: ',
               action,
-              '\n(See https://redux.js.org/faq/actions#why-should-type-be-a-string-or-at-least-serializable-why-should-my-action-types-be-constants)',
+              '\n(See https://redux.js.org/faq/actions#why-should-type-be-a-string-why-should-my-action-types-be-constants)',
               '\n(To allow non-serializable values see: https://redux-toolkit.js.org/usage/usage-guide#working-with-non-serializable-data)',
             )
           }