fix: safe remove for autoRemovePreviousQuery option

Author: js2me

src/query.ts

@@ -549,9 +549,7 @@ export class Query<
       this.features.autoRemovePreviousQuery &&
       options.queryHash !== nextQueryHash
     ) {
-      this.queryClient.removeQueries({
-        predicate: (query) => query.queryHash === options.queryHash,
-      });
+      this.remove({ safe: true });
     }
 
     options.queryHash = nextQueryHash;
@@ -616,7 +614,8 @@ export class Query<
             this.cumulativeQueryKeyHashesSet.has(query.options.queryHash!) &&
             (query.observers.length === 0 ||
               (query.observers.length === 1 &&
-                query.observers[0] === this.queryObserver))
+                query.observers[0] === this.queryObserver)) &&
+            (!params?.predicate || params.predicate(query))
           );
         },
         ...params,
@@ -641,7 +640,8 @@ export class Query<
             this.cumulativeQueryKeyHashesSet.has(query.options.queryHash!) &&
             (query.observers.length === 0 ||
               (query.observers.length === 1 &&
-                query.observers[0] === this.queryObserver))
+                query.observers[0] === this.queryObserver)) &&
+            (!params?.predicate || params.predicate(query))
           );
         },
         ...params,
@@ -655,7 +655,8 @@ export class Query<
           query.queryHash === this.options.queryHash &&
           (query.observers.length === 0 ||
             (query.observers.length === 1 &&
-              query.observers[0] === this.queryObserver)),
+              query.observers[0] === this.queryObserver)) &&
+          (!params?.predicate || params.predicate(query)),
       });
     }
 

src/query.types.ts

@@ -19,10 +19,10 @@ export interface QueryInvalidateParams
 export type MobxQueryInvalidateParams = QueryInvalidateParams;
 
 export interface QueryResetParams
-  extends Partial<Omit<QueryFilters, 'queryKey' | 'exact' | 'predicate'>> {}
+  extends Partial<Omit<QueryFilters, 'queryKey' | 'exact'>> {}
 
 export interface QueryRemoveParams
-  extends Partial<Omit<QueryFilters, 'queryKey' | 'exact' | 'predicate'>> {
+  extends Partial<Omit<QueryFilters, 'queryKey' | 'exact'>> {
   /**
    * Removes only queries that have no observers or one observer that is `queryObserver`.
    */