include bqMeta on error so we can use it

Author: EskiMojo14

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

@@ -573,6 +573,7 @@ export function buildThunks<
             argSchema,
             finalQueryArg,
             'argSchema',
+            {}, // we don't have a meta yet, so we can't pass it
           )
         }
 
@@ -636,6 +637,7 @@ export function buildThunks<
             rawResponseSchema,
             result.data,
             'rawResponseSchema',
+            result.meta,
           )
         }
 
@@ -650,6 +652,7 @@ export function buildThunks<
             responseSchema,
             transformedResponse,
             'responseSchema',
+            result.meta,
           )
         }
 
@@ -747,6 +750,7 @@ export function buildThunks<
           metaSchema,
           finalQueryReturnValue.meta,
           'metaSchema',
+          finalQueryReturnValue.meta,
         )
       }
 
@@ -777,11 +781,12 @@ export function buildThunks<
                 rawErrorResponseSchema,
                 value,
                 'rawErrorResponseSchema',
+                meta,
               )
             }
 
             if (metaSchema && !skipSchemaValidation) {
-              meta = await parseWithSchema(metaSchema, meta, 'metaSchema')
+              meta = await parseWithSchema(metaSchema, meta, 'metaSchema', meta)
             }
             let transformedErrorResponse = await transformErrorResponse(
               value,
@@ -793,6 +798,7 @@ export function buildThunks<
                 errorResponseSchema,
                 transformedErrorResponse,
                 'errorResponseSchema',
+                meta,
               )
             }
 
@@ -816,7 +822,7 @@ export function buildThunks<
           if (catchSchemaFailure) {
             return rejectWithValue(
               catchSchemaFailure(caughtError, info),
-              addShouldAutoBatch({ baseQueryMeta: {} }), // TODO: how do we get meta here?
+              addShouldAutoBatch({ baseQueryMeta: caughtError._bqMeta }),
             )
           }
         }

packages/toolkit/src/query/standardSchema.ts

@@ -6,6 +6,7 @@ export class NamedSchemaError extends SchemaError {
     issues: readonly StandardSchemaV1.Issue[],
     public readonly value: any,
     public readonly schemaName: string,
+    public readonly _bqMeta: any,
   ) {
     super(issues)
   }
@@ -15,10 +16,11 @@ export async function parseWithSchema<Schema extends StandardSchemaV1>(
   schema: Schema,
   data: unknown,
   schemaName: string,
+  bqMeta: any,
 ): Promise<StandardSchemaV1.InferOutput<Schema>> {
   const result = await schema['~standard'].validate(data)
   if (result.issues) {
-    throw new NamedSchemaError(result.issues, data, schemaName)
+    throw new NamedSchemaError(result.issues, data, schemaName, bqMeta)
   }
   return result.value
 }