remove unneccessary optionalPromise (#1077)

Author: phryneas

src/query/core/buildMiddleware/cacheLifecycle.ts

@@ -3,10 +3,6 @@ import type { AnyAction } from 'redux'
 import type { ThunkDispatch } from 'redux-thunk'
 import type { BaseQueryFn } from '../../baseQueryTypes'
 import { DefinitionType } from '../../endpointDefinitions'
-import {
-  OptionalPromise,
-  toOptionalPromise,
-} from '../../utils/toOptionalPromise'
 import type { RootState } from '../apiState'
 import type {
   MutationResultSelectorResult,
@@ -89,8 +85,10 @@ declare module '../../endpointDefinitions' {
      * to prevent memory leaks.
      * You can just re-throw that error (or not handle it at all) -
      * it will be caught outside of `cacheEntryAdded`.
+     *
+     * If you don't interact with this promise, it will not throw.
      */
-    cacheDataLoaded: OptionalPromise<ResultType>
+    cacheDataLoaded: Promise<ResultType>
     /**
      * Promise that allows you to wait for the point in time when the cache entry
      * has been removed from the cache, by not being used/subscribed to any more
@@ -254,16 +252,17 @@ export const build: SubMiddlewareBuilder = ({
       const cacheEntryRemoved = new Promise<void>((resolve) => {
         lifecycle.cacheEntryRemoved = resolve
       })
-      const cacheDataLoaded = toOptionalPromise(
-        Promise.race([
-          new Promise<void>((resolve) => {
-            lifecycle.valueResolved = resolve
-          }),
-          cacheEntryRemoved.then(() => {
-            throw neverResolvedError
-          }),
-        ])
-      )
+      const cacheDataLoaded = Promise.race([
+        new Promise<void>((resolve) => {
+          lifecycle.valueResolved = resolve
+        }),
+        cacheEntryRemoved.then(() => {
+          throw neverResolvedError
+        }),
+      ])
+      // prevent uncaught promise rejections from happening.
+      // if the original promise is used in any way, that will create a new promise that will throw again
+      cacheDataLoaded.catch(() => {})
       lifecycleMap[queryCacheKey] = lifecycle
       const selector = (api.endpoints[endpointName] as any).select(
         endpointDefinition.type === DefinitionType.query

src/query/core/buildMiddleware/queryLifecycle.ts

@@ -1,10 +1,6 @@
 import { isPending, isRejected, isFulfilled } from '@reduxjs/toolkit'
 import { BaseQueryFn } from '../../baseQueryTypes'
 import { DefinitionType } from '../../endpointDefinitions'
-import {
-  OptionalPromise,
-  toOptionalPromise,
-} from '../../utils/toOptionalPromise'
 import { Recipe } from '../buildThunks'
 import { SubMiddlewareBuilder } from './types'
 
@@ -14,12 +10,14 @@ declare module '../../endpointDefinitions' {
   export interface QueryLifecyclePromises<ResultType> {
     /**
      * Promise that will resolve with the (transformed) query result.
-     
+     *
      * If the query fails, this promise will reject with the error.
      *
      * This allows you to `await` for the query to finish.
+     *
+     * If you don't interact with this promise, it will not throw.
      */
-    queryFulfilled: OptionalPromise<ResultType>
+    queryFulfilled: Promise<ResultType>
   }
 
   interface QueryExtraOptions<
@@ -99,12 +97,13 @@ export const build: SubMiddlewareBuilder = ({
         const onQueryStarted = endpointDefinition?.onQueryStarted
         if (onQueryStarted) {
           const lifecycle = {} as CacheLifecycle
-          const queryFulfilled = toOptionalPromise(
-            new Promise((resolve, reject) => {
-              lifecycle.resolve = resolve
-              lifecycle.reject = reject
-            })
-          )
+          const queryFulfilled = new Promise((resolve, reject) => {
+            lifecycle.resolve = resolve
+            lifecycle.reject = reject
+          })
+          // prevent uncaught promise rejections from happening.
+          // if the original promise is used in any way, that will create a new promise that will throw again
+          queryFulfilled.catch(() => {})
           lifecycleMap[requestId] = lifecycle
           const selector = (api.endpoints[endpointName] as any).select(
             endpointDefinition.type === DefinitionType.query