resultSchema -> responseSchema

Author: EskiMojo14

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

@@ -555,7 +555,7 @@ export function buildThunks<
         finalQueryArg: unknown,
       ): Promise<QueryReturnValue> {
         let result: QueryReturnValue
-        const { extraOptions, argSchema, rawResultSchema, resultSchema } =
+        const { extraOptions, argSchema, rawResponseSchema, responseSchema } =
           endpointDefinition
 
         if (argSchema) {
@@ -617,8 +617,8 @@ export function buildThunks<
 
         let { data } = result
 
-        if (rawResultSchema) {
-          data = await parseWithSchema(rawResultSchema, result.data)
+        if (rawResponseSchema) {
+          data = await parseWithSchema(rawResponseSchema, result.data)
         }
 
         let transformedResponse = await transformResponse(
@@ -627,9 +627,9 @@ export function buildThunks<
           finalQueryArg,
         )
 
-        if (resultSchema) {
+        if (responseSchema) {
           transformedResponse = await parseWithSchema(
-            resultSchema,
+            responseSchema,
             transformedResponse,
           )
         }

packages/toolkit/src/query/endpointDefinitions.ts

@@ -105,7 +105,7 @@ type EndpointDefinitionWithQuery<
   ): unknown
 
   /** A schema for the result *before* it's passed to `transformResponse` */
-  rawResultSchema?: StandardSchemaV1<BaseQueryResult<BaseQuery>>
+  rawResponseSchema?: StandardSchemaV1<BaseQueryResult<BaseQuery>>
 
   /** A schema for the error object returned by the `query` or `queryFn`, *before* it's passed to `transformErrorResponse` */
   rawErrorSchema?: StandardSchemaV1<BaseQueryError<BaseQuery>>
@@ -169,7 +169,7 @@ type EndpointDefinitionWithQueryFn<
   query?: never
   transformResponse?: never
   transformErrorResponse?: never
-  rawResultSchema?: never
+  rawResponseSchema?: never
   rawErrorSchema?: never
 }
 
@@ -193,7 +193,7 @@ export type BaseEndpointDefinition<
   argSchema?: StandardSchemaV1<QueryArg>
 
   /** A schema for the result (including `transformResponse` if provided) */
-  resultSchema?: StandardSchemaV1<ResultType>
+  responseSchema?: StandardSchemaV1<ResultType>
 
   /** A schema for the error object returned by the `query` or `queryFn` (including `transformErrorResponse` if provided) */
   errorSchema?: StandardSchemaV1<BaseQueryError<BaseQuery>>

packages/toolkit/src/query/tests/createApi.test-d.ts

@@ -398,7 +398,7 @@ describe('type tests', () => {
             query: build.query<Post, { id: number }>({
               query: ({ id }) => `/post/${id}`,
               argSchema,
-              resultSchema: postSchema,
+              responseSchema: postSchema,
               errorSchema,
               metaSchema,
             }),
@@ -407,7 +407,7 @@ describe('type tests', () => {
               // @ts-expect-error wrong schema
               argSchema: v.object({ id: v.string() }),
               // @ts-expect-error wrong schema
-              resultSchema: v.object({ id: v.string() }),
+              responseSchema: v.object({ id: v.string() }),
               // @ts-expect-error wrong schema
               errorSchema: v.object({ status: v.string() }),
               // @ts-expect-error wrong schema
@@ -420,7 +420,7 @@ describe('type tests', () => {
                 id: v.pipe(v.string(), v.transform(Number), v.number()),
               }),
               // @ts-expect-error can't expect different input
-              resultSchema: v.object({
+              responseSchema: v.object({
                 ...postSchema.entries,
                 id: v.pipe(v.string(), v.transform(Number)),
               }) satisfies v.GenericSchema<any, Post>,
@@ -445,7 +445,7 @@ describe('type tests', () => {
                 id: v.pipe(v.number(), v.transform(String)),
               }),
               // @ts-expect-error can't provide different output
-              resultSchema: v.object({
+              responseSchema: v.object({
                 ...postSchema.entries,
                 id: v.pipe(v.number(), v.transform(String)),
               }) satisfies v.GenericSchema<Post, any>,
@@ -471,9 +471,8 @@ describe('type tests', () => {
           baseQuery: fetchBaseQuery({ baseUrl: 'https://example.com' }),
           endpoints: (build) => ({
             query: build.query({
-              query: ({ id }) => `/post/${id}`,
-              argSchema,
-              resultSchema: postSchema,
+              query: ({ id }: { id: number }) => `/post/${id}`,
+              responseSchema: postSchema,
             }),
           }),
         })

packages/toolkit/src/query/tests/createApi.test.ts

@@ -1233,7 +1233,7 @@ describe('endpoint schemas', () => {
       endpoints: (build) => ({
         query: build.query<{ success: boolean }, void>({
           query: () => '/success',
-          rawResultSchema: v.object({ value: v.literal('success!') }),
+          rawResponseSchema: v.object({ value: v.literal('success!') }),
         }),
       }),
     })
@@ -1250,7 +1250,7 @@ describe('endpoint schemas', () => {
         query: build.query<{ success: boolean }, void>({
           query: () => '/success',
           transformResponse: () => ({ success: false }),
-          resultSchema: v.object({ success: v.literal(true) }),
+          responseSchema: v.object({ success: v.literal(true) }),
         }),
       }),
     })