[C-2465] Improve audius-query cache selection performance (#3687)

AudiusProject · Jun 30, 2023 · dcd67b9 · dcd67b9
1 parent 05b1940
commit dcd67b9
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 27 deletions.
diff --git a/packages/common/src/api/collection.ts b/packages/common/src/api/collection.ts
@@ -1,5 +1,5 @@
+import { createApi } from 'audius-query'
 import { ID, Kind } from 'models'
-import { createApi } from 'src/audius-query/createApi'
 import { Nullable } from 'utils'
 
 const collectionApi = createApi({

diff --git a/packages/common/src/api/developer-apps.ts → packages/common/src/api/developerApps.ts b/packages/common/src/api/developer-apps.ts → packages/common/src/api/developerApps.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod'
 
+import { createApi } from 'audius-query'
 import { ID } from 'models/Identifiers'
-import { createApi } from 'src/audius-query'
 import { encodeHashId } from 'utils/hashIds'
 
 const descriptionMaxLength = 128

diff --git a/packages/common/src/api/index.ts b/packages/common/src/api/index.ts
@@ -2,4 +2,4 @@ export * from './relatedArtists'
 export * from './track'
 export * from './collection'
 export * from './user'
-export * from './developer-apps'
+export * from './developerApps'
diff --git a/packages/common/src/api/reducer.ts b/packages/common/src/api/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from 'redux'
 
 import { collectionApiReducer } from './collection'
-import { developerAppsApiReducer } from './developer-apps'
+import { developerAppsApiReducer } from './developerApps'
 import { relatedArtistsApiReducer } from './relatedArtists'
 import { trackApiReducer } from './track'
 import { userApiReducer } from './user'

diff --git a/packages/common/src/api/relatedArtists.ts b/packages/common/src/api/relatedArtists.ts
@@ -1,5 +1,5 @@
+import { createApi } from 'audius-query'
 import { ID } from 'models/Identifiers'
-import { createApi } from 'src/audius-query/createApi'
 
 const relatedArtistsApi = createApi({
   reducerPath: 'relatedArtistsApi',

diff --git a/packages/common/src/api/track.ts b/packages/common/src/api/track.ts
@@ -1,5 +1,5 @@
+import { createApi } from 'audius-query'
 import { ID, Kind } from 'models'
-import { createApi } from 'src/audius-query/createApi'
 import { parseTrackRouteFromPermalink } from 'utils/stringUtils'
 import { Nullable } from 'utils/typeUtils'
 

diff --git a/packages/common/src/api/user.ts b/packages/common/src/api/user.ts
@@ -1,5 +1,5 @@
+import { createApi } from 'audius-query'
 import { ID, Kind } from 'models'
-import { createApi } from 'src/audius-query/createApi'
 
 const userApi = createApi({
   reducerPath: 'userApi',

diff --git a/packages/common/src/audius-query/createApi.ts b/packages/common/src/audius-query/createApi.ts
@@ -7,7 +7,6 @@ import { denormalize, normalize } from 'normalizr'
 import { useDispatch, useSelector } from 'react-redux'
 import { Dispatch } from 'redux'
 
-import { useProxySelector } from 'hooks/useProxySelector'
 import { ErrorLevel } from 'models/ErrorReporting'
 import { Kind } from 'models/Kind'
 import { Status } from 'models/Status'
@@ -143,7 +142,7 @@ const useQueryState = <Args, Data>(
   reducerPath: string,
   endpointName: string,
   endpoint: EndpointConfig<Args, Data>
-) => {
+): Nullable<PerKeyState<any> & { isInitialValue?: boolean }> => {
   return useSelector((state: CommonState) => {
     if (!state.api[reducerPath]) {
       throw new Error(
@@ -224,7 +223,7 @@ const useQueryState = <Args, Data>(
       }
     }
 
-    return { ...endpointState[key] }
+    return endpointState[key]
   }, isEqual)
 }
 
@@ -234,23 +233,15 @@ const useCacheData = <Args, Data>(
   nonNormalizedData: any,
   hookOptions?: QueryHookOptions
 ) => {
-  return useProxySelector(
-    (state: CommonState) => {
-      if (hookOptions?.shallow && !endpoint.options.kind)
-        return nonNormalizedData
-      const entityMap = selectCommonEntityMap(
-        state,
-        endpoint.options.kind,
-        hookOptions?.shallow
-      )
-      return denormalize(
-        nonNormalizedData,
-        apiResponseSchema,
-        entityMap
-      ) as Data
-    },
-    [nonNormalizedData, apiResponseSchema, endpoint.options.kind]
-  )
+  return useSelector((state: CommonState) => {
+    if (hookOptions?.shallow && !endpoint.options.kind) return nonNormalizedData
+    const entityMap = selectCommonEntityMap(
+      state,
+      endpoint.options.kind,
+      hookOptions?.shallow
+    )
+    return denormalize(nonNormalizedData, apiResponseSchema, entityMap) as Data
+  }, isEqual)
 }
 
 const fetchData = async <Args, Data>(

diff --git a/packages/common/tsconfig.json b/packages/common/tsconfig.json
@@ -3,6 +3,7 @@
     "outDir": "dist",
     "baseUrl": ".",
     "paths": {
+      "audius-query": ["src/audius-query/index.ts"],
       "assets/*": ["src/assets/*"],
       "hooks/*": ["src/hooks/*"],
       "models/*": ["src/models/*"],