Rename to upsertQueryEntries and entry field arg

Author: markerikson

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

@@ -63,7 +63,7 @@ export type NormalizedQueryUpsertEntry<
   EndpointName extends QueryKeys<Definitions>,
 > = {
   endpointName: EndpointName
-  args: QueryArgFrom<Definitions[EndpointName]>
+  arg: QueryArgFrom<Definitions[EndpointName]>
   value: ResultTypeFrom<Definitions[EndpointName]>
 }
 
@@ -72,8 +72,8 @@ export type NormalizedQueryUpsertEntry<
  */
 type NormalizedQueryUpsertEntryPayload = {
   endpointName: string
-  args: any
-  value: any
+  arg: unknown
+  value: unknown
 }
 
 export type ProcessedQueryUpsertEntry = {
@@ -313,14 +313,14 @@ export function buildSlice({
         prepare: (payload: NormalizedQueryUpsertEntryPayload[]) => {
           const queryDescriptions: ProcessedQueryUpsertEntry[] = payload.map(
             (entry) => {
-              const { endpointName, args, value } = entry
+              const { endpointName, arg, value } = entry
               const endpointDefinition = definitions[endpointName]
               const queryDescription: QueryThunkArg = {
                 type: 'query',
                 endpointName: endpointName,
-                originalArgs: entry.args,
+                originalArgs: entry.arg,
                 queryCacheKey: serializeQueryArgs({
-                  queryArgs: args,
+                  queryArgs: arg,
                   endpointDefinition,
                   endpointName,
                 }),

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

@@ -321,7 +321,7 @@ export interface ApiModules<
        */
       resetApiState: SliceActions['resetApiState']
 
-      upsertEntries: UpsertEntries<Definitions>
+      upsertQueryEntries: UpsertEntries<Definitions>
 
       /**
        * A Redux action creator that can be used to manually invalidate cache tags for [automated re-fetching](../../usage/automated-refetching.mdx).
@@ -549,7 +549,7 @@ export const coreModule = ({
       upsertQueryData,
       prefetch,
       resetApiState: sliceActions.resetApiState,
-      upsertEntries: sliceActions.cacheEntriesUpserted as any,
+      upsertQueryEntries: sliceActions.cacheEntriesUpserted as any,
     })
     safeAssign(api.internalActions, sliceActions)
 

packages/toolkit/src/query/tests/optimisticUpserts.test.tsx

@@ -345,7 +345,7 @@ describe('upsertQueryData', () => {
   })
 })
 
-describe('upsertEntries', () => {
+describe('upsertQueryEntries', () => {
   const posts: Post[] = [
     {
       id: '1',
@@ -364,15 +364,15 @@ describe('upsertEntries', () => {
     },
   ]
 
-  const entriesAction = api.util.upsertEntries([
+  const entriesAction = api.util.upsertQueryEntries([
     {
       endpointName: 'getPosts',
-      args: undefined,
+      arg: undefined,
       value: posts,
     },
     ...posts.map((post) => ({
       endpointName: 'postWithSideEffect' as const,
-      args: post.id,
+      arg: post.id,
       value: post,
     })),
   ])