chore: clean up

Author: Hoang Pham

Sources/SwiftUIQuery/InfiniteQuery.swift

@@ -120,9 +120,6 @@ public final class InfiniteQuery<
     /// Current fetch task (if any)
     @PerceptionIgnored private nonisolated(unsafe) var fetchTask: Task<InfiniteData<TData, TPageParam>, Error>?
 
-    /// Whether the query has been destroyed
-    private var isDestroyed = false
-
     /// Timestamp when query became inactive (no active observers)
     private var inactiveAt: Date?
 
@@ -460,18 +457,6 @@ public final class InfiniteQuery<
         }
     }
 
-    /// Destroy the query and clean up resources
-    public func destroy() {
-        guard !isDestroyed else { return }
-        isDestroyed = true
-
-        cancel()
-        cleanup()
-
-        // Remove from cache
-        cache?.remove(self)
-    }
-
     // MARK: - Pagination Operations
 
     /// Get the next page parameter from current data
@@ -893,15 +878,6 @@ public final class InfiniteQuery<
         // Remove from cache (let cache handle the cleanup)
         cache?.remove(self)
     }
-
-    /// Clean up resources
-    private func cleanup() {
-        fetchTask?.cancel()
-        fetchTask = nil
-        observers.removeAll()
-        inactiveAt = nil
-        currentFetchDirection = nil
-    }
 }
 
 // MARK: - AnyInfiniteQuery Protocol Implementation

Sources/SwiftUIQuery/InfiniteQueryObserver.swift

@@ -207,9 +207,6 @@ public final class InfiniteQueryObserver<
     /// Timer for stale timeout
     @PerceptionIgnored private nonisolated(unsafe) var staleTimer: Timer?
 
-    /// Timer for refetch interval
-    @PerceptionIgnored private nonisolated(unsafe) var refetchTimer: Timer?
-
     // MARK: - Initialization
 
     public init(client: QueryClient, options: InfiniteQueryOptions<TData, QueryError, TKey, TPageParam>) {
@@ -231,7 +228,6 @@ public final class InfiniteQueryObserver<
     deinit {
         // Clean up timers synchronously
         staleTimer?.invalidate()
-        refetchTimer?.invalidate()
     }
 
     // MARK: - Public Methods
@@ -339,13 +335,6 @@ public final class InfiniteQueryObserver<
         clearTimers()
     }
 
-    /// Destroy the observer and clean up all resources
-    public func destroy() {
-        unsubscribe()
-        clearTimers()
-        currentQuery = nil
-    }
-
     // MARK: - AnyQueryObserver Protocol
 
     public func getCurrentResult() -> AnyQueryResult {
@@ -537,8 +526,6 @@ public final class InfiniteQueryObserver<
     private func clearTimers() {
         staleTimer?.invalidate()
         staleTimer = nil
-        refetchTimer?.invalidate()
-        refetchTimer = nil
     }
 }
 

Sources/SwiftUIQuery/Query.swift

@@ -118,9 +118,6 @@ public final class Query<TData: Sendable, TKey: QueryKey>: AnyQuery {
     /// Current fetch task (if any)
     @PerceptionIgnored private nonisolated(unsafe) var fetchTask: Task<TData, Error>?
 
-    /// Whether the query has been destroyed
-    private var isDestroyed = false
-
     /// Timestamp when query became inactive (no active observers)
     private var inactiveAt: Date?
 
@@ -435,18 +432,6 @@ public final class Query<TData: Sendable, TKey: QueryKey>: AnyQuery {
         }
     }
 
-    /// Destroy the query and clean up resources
-    public func destroy() {
-        guard !isDestroyed else { return }
-        isDestroyed = true
-
-        cancel()
-        cleanup()
-
-        // Remove from cache
-        cache?.remove(self)
-    }
-
     // MARK: - Observer Management
 
     /// Add an observer to this query
@@ -737,14 +722,6 @@ public final class Query<TData: Sendable, TKey: QueryKey>: AnyQuery {
         // Remove from cache (let cache handle the cleanup)
         cache?.remove(self)
     }
-
-    /// Clean up resources
-    private func cleanup() {
-        fetchTask?.cancel()
-        fetchTask = nil
-        observers.removeAll()
-        inactiveAt = nil
-    }
 }
 
 // MARK: - QueryState Extensions

Sources/SwiftUIQuery/QueryObserver.swift

@@ -143,9 +143,6 @@ public final class QueryObserver<TData: Sendable, TKey: QueryKey>: AnyQueryObser
     /// Timer for stale timeout
     @PerceptionIgnored private nonisolated(unsafe) var staleTimer: Timer?
 
-    /// Timer for refetch interval
-    @PerceptionIgnored private nonisolated(unsafe) var refetchTimer: Timer?
-
     // MARK: - Initialization
 
     public init(client: QueryClient, options: QueryOptions<TData, TKey>) {
@@ -164,7 +161,6 @@ public final class QueryObserver<TData: Sendable, TKey: QueryKey>: AnyQueryObser
     deinit {
         // Clean up timers synchronously
         staleTimer?.invalidate()
-        refetchTimer?.invalidate()
     }
 
     // MARK: - Public Methods
@@ -240,13 +236,6 @@ public final class QueryObserver<TData: Sendable, TKey: QueryKey>: AnyQueryObser
         clearTimers()
     }
 
-    /// Destroy the observer and clean up all resources
-    public func destroy() {
-        unsubscribe()
-        clearTimers()
-        currentQuery = nil
-    }
-
     // MARK: - AnyQueryObserver Protocol
 
     public func getCurrentResult() -> AnyQueryResult {
@@ -460,9 +449,6 @@ public final class QueryObserver<TData: Sendable, TKey: QueryKey>: AnyQueryObser
     private func clearTimers() {
         staleTimer?.invalidate()
         staleTimer = nil
-
-        refetchTimer?.invalidate()
-        refetchTimer = nil
     }
 }