fix: preset exports; refactor: destroyable

Author: js2me

.changeset/chilly-poems-grin.md

@@ -0,0 +1,5 @@
+---
+"mobx-tanstack-query": patch
+---
+
+refactored unify destroy and aborts inside package entities

.changeset/ninety-eels-dream.md

@@ -0,0 +1,5 @@
+---
+"mobx-tanstack-query": patch
+---
+
+fixed preset exports

package.json

@@ -35,7 +35,8 @@
   "zshy": {
     "exports": {
       "./package.json": "./package.json",
-      ".": "./src/index.ts"
+      ".": "./src/index.ts",
+      "./preset": "./src/preset/index.ts"
     }
   },
   "bugs": {

src/inifinite-query.ts

@@ -14,7 +14,6 @@ import {
   RefetchOptions,
   SetDataOptions,
 } from '@tanstack/query-core';
-import { LinkedAbortController } from 'linked-abort-controller';
 import {
   action,
   reaction,
@@ -40,6 +39,7 @@ import { Query } from './query';
 import { QueryClient } from './query-client';
 import { AnyQueryClient, QueryClientHooks } from './query-client.types';
 import { QueryFeatures } from './query.types';
+import { Destroyable } from './utils/destroyable';
 
 const originalQueryProperties = [
   'data',
@@ -80,14 +80,14 @@ export class InfiniteQuery<
     TData = InfiniteData<TQueryFnData, TPageParam>,
     TQueryKey extends QueryKey = QueryKey,
   >
+  extends Destroyable
   implements
     Disposable,
     Pick<
       InfiniteQueryObserverBaseResult<TData, TError>,
       (typeof originalQueryProperties)[number]
     >
 {
-  protected abortController: LinkedAbortController;
   protected queryClient: AnyQueryClient;
 
   protected _result: InfiniteQueryObserverResult<TData, TError>;
@@ -313,6 +313,9 @@ export class InfiniteQuery<
       config = args[0];
       getDynamicOptions = args[0].options;
     }
+
+    super(config.abortSignal);
+
     this.cumulativeQueryKeyHashesSet = new Set();
 
     const { queryKey: queryKeyOrDynamicQueryKey, ...restOptions } = config;
@@ -322,7 +325,6 @@ export class InfiniteQuery<
       queryClient,
     };
 
-    this.abortController = new LinkedAbortController(config.abortSignal);
     this.queryClient = queryClient;
     this._result = undefined as any;
     this.isResultRequsted = false;
@@ -360,7 +362,6 @@ export class InfiniteQuery<
 
     observable.deep(this, '_result');
     observable.ref(this, 'isResultRequsted');
-    action(this, 'handleAbort');
     action.bound(this, 'setData');
     action.bound(this, 'update');
     action.bound(this, 'updateResult');
@@ -491,7 +492,7 @@ export class InfiniteQuery<
         this.updateResult,
       );
       this.abortController.signal.addEventListener('abort', () =>
-        this.handleAbort(),
+        this.handleDestroy(),
       );
     }
 
@@ -625,51 +626,11 @@ export class InfiniteQuery<
     return await Query.prototype.start.call(this, params);
   }
 
-  protected handleAbort() {
-    this._observerSubscription?.();
-
-    this.doneListeners = [];
-    this.errorListeners = [];
-
-    this.queryObserver.destroy();
-    this.isResultRequsted = false;
-
-    if (this.features.resetOnDestroy) {
-      this.reset();
-    }
-
-    if (this.features.removeOnDestroy) {
-      this.remove({
-        safe: this.features.removeOnDestroy === 'safe',
-      });
-    }
-
-    delete this._observerSubscription;
-
-    this.cumulativeQueryKeyHashesSet.clear();
-
+  protected handleDestroy() {
+    // @ts-expect-error
+    Query.prototype.cleanup.call(this);
     this.hooks?.onInfiniteQueryDestroy?.(this);
   }
-
-  destroy() {
-    this.abortController.abort();
-  }
-
-  /**
-   * @deprecated use `destroy`. This method will be removed in next major release
-   */
-  dispose() {
-    this.destroy();
-  }
-
-  [Symbol.dispose](): void {
-    this.destroy();
-  }
-
-  // Firefox fix (Symbol.dispose is undefined in FF)
-  [Symbol.for('Symbol.dispose')](): void {
-    this.destroy();
-  }
 }
 
 /**

src/mutation.ts

@@ -7,7 +7,6 @@ import {
   MutationObserverBaseResult,
   MutationStatus,
 } from '@tanstack/query-core';
-import { LinkedAbortController } from 'linked-abort-controller';
 import { action, makeObservable, observable } from 'mobx';
 import { lazyObserve } from 'yummies/mobx';
 
@@ -21,6 +20,7 @@ import {
 } from './mutation.types';
 import { QueryClient } from './query-client';
 import { AnyQueryClient, QueryClientHooks } from './query-client.types';
+import { Destroyable } from './utils/destroyable';
 
 const originalMutationProperties = [
   'data',
@@ -44,14 +44,14 @@ export class Mutation<
     TError = DefaultError,
     TContext = unknown,
   >
+  extends Destroyable
   implements
     Disposable,
     Pick<
       MutationObserverBaseResult<TData, TError, TVariables, TContext>,
       (typeof originalMutationProperties)[number]
     >
 {
-  protected abortController: LinkedAbortController;
   protected queryClient: AnyQueryClient;
 
   mutationOptions: MutationObserverOptions<TData, TError, TVariables, TContext>;
@@ -129,6 +129,8 @@ export class Mutation<
   constructor(
     protected config: MutationConfig<TData, TVariables, TError, TContext>,
   ) {
+    super(config.abortSignal);
+
     const { queryClient, invalidateQueries, mutationFn, ...restOptions } =
       config;
 
@@ -138,7 +140,6 @@ export class Mutation<
       Pick<QueryClient, 'mutationFeatures' | 'hooks'>
     >;
 
-    this.abortController = new LinkedAbortController(config.abortSignal);
     this.queryClient = queryClient;
     this.result = undefined as any;
 
@@ -219,8 +220,6 @@ export class Mutation<
       this._observerSubscription = this.mutationObserver.subscribe(
         this.updateResult,
       );
-
-      this.abortController.signal.addEventListener('abort', this.handleAbort);
     }
 
     if (invalidateQueries) {
@@ -348,7 +347,7 @@ export class Mutation<
     this.mutationObserver.reset();
   }
 
-  protected handleAbort = () => {
+  protected handleDestroy() {
     this._observerSubscription?.();
 
     this.doneListeners = [];
@@ -361,26 +360,6 @@ export class Mutation<
 
     delete this._observerSubscription;
     this.hooks?.onMutationDestroy?.(this);
-  };
-
-  destroy() {
-    this.abortController.abort();
-  }
-
-  /**
-   * @deprecated use `destroy`. This method will be removed in next major release
-   */
-  dispose() {
-    this.destroy();
-  }
-
-  [Symbol.dispose](): void {
-    this.destroy();
-  }
-
-  // Firefox fix (Symbol.dispose is undefined in FF)
-  [Symbol.for('Symbol.dispose')](): void {
-    this.destroy();
   }
 }