fix type issues

Author: KurtGokhan

src/builder/MutationBuilder.ts

@@ -51,11 +51,13 @@ export class MutationBuilderFrozen<T extends BuilderTypeTemplate> {
     meta,
   ) => {
     return async (vars) => {
+      const queryKey = [this.mergeVars([this.config.vars, vars])] as [T['vars']];
       return this.config.queryFn({
-        queryKey: [this.mergeVars([this.config.vars, vars])],
+        queryKey,
         meta,
         client: this.config.queryClient || queryClient,
         signal: new AbortController().signal,
+        originalQueryKey: queryKey,
       });
     };
   };

src/builder/createUpdateMiddleware.ts

@@ -11,12 +11,15 @@ type CreateUpdateMiddleware = <T extends BuilderTypeTemplate>(
 
 export const createUpdateMiddleware: CreateUpdateMiddleware = (tags) =>
   async function updateMiddleware(ctx, next, throwError, config) {
+    type TagObj = QueryUpdateTagObject<any, any, any, any>;
+    type TagCtx = QueryTagContext<any>;
+
     let undos: UpdateTagsUndoer[] | null = null;
-    const invalidates: QueryUpdateTagObject[] = [];
-    const optCtx: QueryTagContext<unknown> = { client: ctx.client, vars: ctx.vars, data: undefined };
+    const invalidates: TagObj[] = [];
+    const optCtx: TagCtx = { client: ctx.client, vars: ctx.vars, data: undefined };
 
     try {
-      const optUpdates = resolveTags<any, QueryUpdateTagObject>({ tags, ...optCtx }).filter((u) => u.optimistic);
+      const optUpdates = resolveTags<any, TagObj>({ tags, ...optCtx }).filter((u) => u.optimistic);
       undos = updateTags({
         queryClient: ctx.client,
         tags: optUpdates.filter((x) => x.updater),
@@ -30,17 +33,17 @@ export const createUpdateMiddleware: CreateUpdateMiddleware = (tags) =>
 
       const data = await next(ctx);
 
-      const pesCtx: QueryTagContext<unknown> = { ...optCtx, data };
-      const pesUpdates = resolveTags<any, QueryUpdateTagObject>({ tags, ...pesCtx }).filter((u) => !u.optimistic);
+      const pesCtx: TagCtx = { ...optCtx, data };
+      const pesUpdates = resolveTags<any, TagObj>({ tags, ...pesCtx }).filter((u) => !u.optimistic);
       updateTags({ queryClient: ctx.client, tags: pesUpdates.filter((x) => x.updater), ctx: pesCtx });
       invalidates.push(...pesUpdates);
 
       return data;
     } catch (error) {
       if (undos?.length) undoUpdateTags(undos, ctx.client);
 
-      const pesCtx: QueryTagContext<unknown> = { ...optCtx, error };
-      const pesUpdates = resolveTags<any, QueryUpdateTagObject>({ tags, ...pesCtx }).filter((u) => !u.optimistic);
+      const pesCtx: TagCtx = { ...optCtx, error };
+      const pesUpdates = resolveTags<any, TagObj>({ tags, ...pesCtx }).filter((u) => !u.optimistic);
       invalidates.push(...pesUpdates);
 
       throw error;

src/tags/updateTags.ts

@@ -16,7 +16,7 @@ export function updateTags({
   ctx,
   optimistic,
 }: {
-  tags: readonly QueryUpdateTag[];
+  tags: readonly QueryUpdateTag<any, any, any>[];
   queryClient: QueryClient;
   ctx: QueryTagContext<unknown>;
   optimistic?: boolean;