feat: support 5.90.2 tanstack query core; fix: transformError feature work

Author: js2me

.changeset/chatty-months-turn.md

@@ -0,0 +1,5 @@
+---
+"mobx-tanstack-query": patch
+---
+
+fixed `transformError` query/mutation feature

.changeset/fair-readers-say.md

@@ -0,0 +1,5 @@
+---
+"mobx-tanstack-query": minor
+---
+
+support new version `@tanstack/query-core` (`5.90.2`)

package.json

@@ -48,7 +48,7 @@
     "url": "git://github.com/js2me/mobx-tanstack-query"
   },
   "peerDependencies": {
-    "@tanstack/query-core": "^5.81.5",
+    "@tanstack/query-core": "^5.90.2",
     "mobx": "^6.12.4"
   },
   "dependencies": {

pnpm-lock.yaml

@@ -369,12 +369,7 @@ export class InfiniteQuery<
     this.start = this.start.bind(this);
 
     originalQueryProperties.forEach((property) => {
-      if (this[property]) return;
-      if (property === 'error' && this.features.transformError) {
-        Object.defineProperty(this, property, {
-          get: () => this.features.transformError!(this.result[property]),
-        });
-      } else {
+      if (!this[property]) {
         Object.defineProperty(this, property, {
           get: () => this.result[property],
         });

src/inifinite-query.ts

@@ -3,9 +3,9 @@ import {
   MutationObserver,
   MutationObserverOptions,
   MutationObserverResult,
-  MutationOptions,
   MutationObserverBaseResult,
   MutationStatus,
+  MutateOptions,
 } from '@tanstack/query-core';
 import { action, makeObservable, observable } from 'mobx';
 import { lazyObserve } from 'yummies/mobx';
@@ -42,37 +42,51 @@ export class Mutation<
     TData = unknown,
     TVariables = void,
     TError = DefaultError,
-    TContext = unknown,
+    TOnMutateResult = unknown,
   >
   extends Destroyable
   implements
     Disposable,
     Pick<
-      MutationObserverBaseResult<TData, TError, TVariables, TContext>,
+      MutationObserverBaseResult<TData, TError, TVariables, TOnMutateResult>,
       (typeof originalMutationProperties)[number]
     >
 {
   protected queryClient: AnyQueryClient;
 
-  mutationOptions: MutationObserverOptions<TData, TError, TVariables, TContext>;
-  mutationObserver: MutationObserver<TData, TError, TVariables, TContext>;
+  mutationOptions: MutationObserverOptions<
+    TData,
+    TError,
+    TVariables,
+    TOnMutateResult
+  >;
+  mutationObserver: MutationObserver<
+    TData,
+    TError,
+    TVariables,
+    TOnMutateResult
+  >;
 
-  result: MutationObserverResult<TData, TError, TVariables, TContext>;
+  result: MutationObserverResult<TData, TError, TVariables, TOnMutateResult>;
 
   protected features: MutationFeatures;
 
   protected settledListeners: MutationSettledListener<
     TData,
     TError,
     TVariables,
-    TContext
+    TOnMutateResult
   >[];
   protected errorListeners: MutationErrorListener<
     TError,
     TVariables,
-    TContext
+    TOnMutateResult
+  >[];
+  protected doneListeners: MutationDoneListener<
+    TData,
+    TVariables,
+    TOnMutateResult
   >[];
-  protected doneListeners: MutationDoneListener<TData, TVariables, TContext>[];
 
   private _observerSubscription?: VoidFunction;
   private hooks?: QueryClientHooks;
@@ -120,14 +134,19 @@ export class Mutation<
    */
   status!: MutationStatus;
 
-  context!: TContext | undefined;
+  context!: TOnMutateResult | undefined;
   failureCount!: number;
   failureReason!: TError | null;
   isPaused!: boolean;
   submittedAt!: number;
 
   constructor(
-    protected config: MutationConfig<TData, TVariables, TError, TContext>,
+    protected config: MutationConfig<
+      TData,
+      TVariables,
+      TError,
+      TOnMutateResult
+    >,
   ) {
     super(config.abortSignal);
 
@@ -166,15 +185,9 @@ export class Mutation<
     this.start = this.start.bind(this);
 
     originalMutationProperties.forEach((property) => {
-      if (property === 'error' && this.features.transformError) {
-        Object.defineProperty(this, property, {
-          get: () => this.features.transformError!(this.result[property]),
-        });
-      } else {
-        Object.defineProperty(this, property, {
-          get: () => this.result[property],
-        });
-      }
+      Object.defineProperty(this, property, {
+        get: () => this.result[property],
+      });
     });
 
     makeObservable(this);
@@ -185,7 +198,7 @@ export class Mutation<
       TData,
       TError,
       TVariables,
-      TContext
+      TOnMutateResult
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-expect-error
     >(queryClient, {
@@ -273,7 +286,7 @@ export class Mutation<
 
   async mutate(
     variables: TVariables,
-    options?: MutationOptions<TData, TError, TVariables, TContext>,
+    options?: MutateOptions<TData, TError, TVariables, TOnMutateResult>,
   ) {
     if (this.features.lazy) {
       let error: any;
@@ -299,7 +312,7 @@ export class Mutation<
 
   async start(
     variables: TVariables,
-    options?: MutationOptions<TData, TError, TVariables, TContext>,
+    options?: MutateOptions<TData, TError, TVariables, TOnMutateResult>,
   ) {
     return await this.mutate(variables, options);
   }
@@ -308,10 +321,14 @@ export class Mutation<
    * Modify this result so it matches the tanstack query result.
    */
   private updateResult(
-    result: MutationObserverResult<TData, TError, TVariables, TContext>,
+    result: MutationObserverResult<TData, TError, TVariables, TOnMutateResult>,
   ) {
     this.result = result || {};
 
+    if (this.features.transformError && this.result.error) {
+      this.result.error = this.features.transformError(this.result.error);
+    }
+
     if (result.isSuccess && !result.error) {
       this.doneListeners.forEach((fn) =>
         fn(result.data!, result.variables!, result.context),
@@ -330,16 +347,25 @@ export class Mutation<
   }
 
   onSettled(
-    listener: MutationSettledListener<TData, TError, TVariables, TContext>,
+    listener: MutationSettledListener<
+      TData,
+      TError,
+      TVariables,
+      TOnMutateResult
+    >,
   ): void {
     this.settledListeners.push(listener);
   }
 
-  onDone(listener: MutationDoneListener<TData, TVariables, TContext>): void {
+  onDone(
+    listener: MutationDoneListener<TData, TVariables, TOnMutateResult>,
+  ): void {
     this.doneListeners.push(listener);
   }
 
-  onError(listener: MutationErrorListener<TError, TVariables, TContext>): void {
+  onError(
+    listener: MutationErrorListener<TError, TVariables, TOnMutateResult>,
+  ): void {
     this.errorListeners.push(listener);
   }
 
@@ -370,5 +396,5 @@ export class MobxMutation<
   TData = unknown,
   TVariables = void,
   TError = DefaultError,
-  TContext = unknown,
-> extends Mutation<TData, TVariables, TError, TContext> {}
+  TOnMutateResult = unknown,
+> extends Mutation<TData, TVariables, TError, TOnMutateResult> {}

src/mutation.ts

@@ -9,9 +9,9 @@ export type CreateMutationParams<
   TData = unknown,
   TVariables = void,
   TError = DefaultError,
-  TContext = unknown,
+  TOnMutateResult = unknown,
 > = Omit<
-  MutationConfig<TData, TVariables, TError, TContext>,
+  MutationConfig<TData, TVariables, TError, TOnMutateResult>,
   'queryClient' | 'mutationFn'
 > & {
   queryClient?: QueryClient;
@@ -21,10 +21,10 @@ export const createMutation = <
   TData = unknown,
   TVariables = void,
   TError = DefaultError,
-  TContext = unknown,
+  TOnMutateResult = unknown,
 >(
-  fn: MutationConfig<TData, TVariables, TError, TContext>['mutationFn'],
-  params?: CreateMutationParams<TData, TVariables, TError, TContext>,
+  fn: MutationConfig<TData, TVariables, TError, TOnMutateResult>['mutationFn'],
+  params?: CreateMutationParams<TData, TVariables, TError, TOnMutateResult>,
 ) => {
   return new Mutation({
     ...params,

src/preset/create-mutation.ts

@@ -325,15 +325,9 @@ export class Query<
     this.start = this.start.bind(this);
 
     originalQueryProperties.forEach((property) => {
-      if (property === 'error' && this.features.transformError) {
-        Object.defineProperty(this, property, {
-          get: () => this.features.transformError!(this.result[property]),
-        });
-      } else {
-        Object.defineProperty(this, property, {
-          get: () => this.result[property],
-        });
-      }
+      Object.defineProperty(this, property, {
+        get: () => this.result[property],
+      });
     });
 
     makeObservable(this);
@@ -597,6 +591,10 @@ export class Query<
   private updateResult(result: QueryObserverResult<TData, TError>) {
     this._result = result;
 
+    if (this.features.transformError && this._result.error) {
+      this._result.error = this.features.transformError(this._result.error);
+    }
+
     if (result.isSuccess && !result.error && result.fetchStatus === 'idle') {
       this.doneListeners.forEach((fn) => fn(result.data!, void 0));
     } else if (result.error) {