use getOrInsert in RTKQ

packages/toolkit/src/query/core/buildInitiate.ts

@@ -16,7 +16,7 @@ import type {
   QueryDefinition,
   ResultTypeFrom,
 } from '../endpointDefinitions'
-import { countObjectKeys, isNotNullish } from '../utils'
+import { countObjectKeys, getOrInsert, isNotNullish } from '../utils'
 import type { SubscriptionOptions } from './apiState'
 import type { QueryResultSelectorResult } from './buildSelectors'
 import type { MutationThunk, QueryThunk, QueryThunkArg } from './buildThunks'
@@ -391,9 +391,8 @@ You must add the middleware for RTK-Query to function correctly!`,
         )
 
         if (!runningQuery && !skippedSynchronously && !forceQueryFn) {
-          const running = runningQueries.get(dispatch) || {}
+          const running = getOrInsert(runningQueries, dispatch, {})
           running[queryCacheKey] = statePromise
-          runningQueries.set(dispatch, running)
 
           statePromise.then(() => {
             delete running[queryCacheKey]

packages/toolkit/src/query/utils/getOrInsert.ts

@@ -0,0 +1,15 @@
+export function getOrInsert<K extends object, V>(
+  map: WeakMap<K, V>,
+  key: K,
+  value: V,
+): V
+export function getOrInsert<K, V>(map: Map<K, V>, key: K, value: V): V
+export function getOrInsert<K extends object, V>(
+  map: Map<K, V> | WeakMap<K, V>,
+  key: K,
+  value: V,
+): V {
+  if (map.has(key)) return map.get(key) as V
+
+  return map.set(key, value).get(key) as V
+}

packages/toolkit/src/query/utils/index.ts

@@ -8,3 +8,4 @@ export * from './isNotNullish'
 export * from './isOnline'
 export * from './isValidUrl'
 export * from './joinUrls'
+export * from './getOrInsert'