UseInfiniteQuery tuple key inits

Author: Hoang Pham

Sources/SwiftUIQuery/UseInfiniteQuery.swift

@@ -304,9 +304,9 @@ public struct UseInfiniteQuery<
 
 /// Additional convenience methods for SwiftUI integration
 extension UseInfiniteQuery {
-    /// Create a UseInfiniteQuery with string-based query key
+    /// Create UseInfiniteQuery with KeyTuple2-based query key
     /// - Parameters:
-    ///   - queryKey: String-based query key
+    ///   - queryKey: KeyTuple2 identifier for the query
     ///   - queryFn: Function that fetches page data
     ///   - getNextPageParam: Function to get next page parameter from pages
     ///   - getPreviousPageParam: Function to determine the previous page parameter
@@ -323,9 +323,135 @@ extension UseInfiniteQuery {
     ///   - enabled: Whether the query should execute automatically (default: true)
     ///   - queryClient: Optional query client (uses shared instance if nil)
     ///   - content: View builder that receives the query result
-    public init(
-        queryKey: String,
-        queryFn: @escaping @Sendable (String, TPageParam?) async throws -> TData,
+    public init<K1: QueryKeyCodable, K2: QueryKeyCodable>(
+        queryKey: KeyTuple2<K1, K2>,
+        queryFn: @escaping @Sendable (KeyTuple2<K1, K2>, TPageParam?) async throws -> TData,
+        getNextPageParam: @escaping GetNextPageParamFunction<TData, TPageParam>,
+        getPreviousPageParam: GetPreviousPageParamFunction<TData, TPageParam>? = nil,
+        initialPageParam: TPageParam? = nil,
+        maxPages: Int? = nil,
+        retryConfig: RetryConfig = RetryConfig(),
+        networkMode: NetworkMode = .online,
+        staleTime: TimeInterval = 0,
+        gcTime: TimeInterval = defaultGcTime,
+        refetchTriggers: RefetchTriggers = .default,
+        refetchOnAppear: RefetchOnAppear = .ifStale,
+        structuralSharing: Bool = true,
+        meta: QueryMeta? = nil,
+        enabled: Bool = true,
+        queryClient: QueryClient? = nil,
+        @ViewBuilder content: @escaping (UseInfiniteQueryResult<TData, TPageParam>) -> Content
+    ) where TKey == KeyTuple2<K1, K2> {
+        let options = InfiniteQueryOptions<TData, QueryError, KeyTuple2<K1, K2>, TPageParam>(
+            queryKey: queryKey,
+            queryFn: queryFn,
+            getNextPageParam: getNextPageParam,
+            getPreviousPageParam: getPreviousPageParam,
+            initialPageParam: initialPageParam,
+            maxPages: maxPages,
+            retryConfig: retryConfig,
+            networkMode: networkMode,
+            staleTime: staleTime,
+            gcTime: gcTime,
+            refetchTriggers: refetchTriggers,
+            refetchOnAppear: refetchOnAppear,
+            structuralSharing: structuralSharing,
+            meta: meta,
+            enabled: enabled
+        )
+
+        self.init(
+            options: options,
+            queryClient: queryClient,
+            content: content
+        )
+    }
+
+    /// Create UseInfiniteQuery with KeyTuple3-based query key
+    /// - Parameters:
+    ///   - queryKey: KeyTuple3 identifier for the query
+    ///   - queryFn: Function that fetches page data
+    ///   - getNextPageParam: Function to get next page parameter from pages
+    ///   - getPreviousPageParam: Function to determine the previous page parameter
+    ///   - initialPageParam: Initial page parameter for the first page
+    ///   - maxPages: Maximum number of pages to retain
+    ///   - retryConfig: Configuration for retry behavior (default: RetryConfig())
+    ///   - networkMode: Network behavior configuration (default: .online)
+    ///   - staleTime: Time before data is considered stale (default: 0)
+    ///   - gcTime: Time before unused data is garbage collected (default: 5 minutes)
+    ///   - refetchTriggers: Configuration for automatic refetching triggers (default: .default)
+    ///   - refetchOnAppear: When to refetch data on view appear (default: .ifStale)
+    ///   - structuralSharing: Whether to use structural sharing for performance (default: true)
+    ///   - meta: Arbitrary metadata for this query
+    ///   - enabled: Whether the query should execute automatically (default: true)
+    ///   - queryClient: Optional query client (uses shared instance if nil)
+    ///   - content: View builder that receives the query result
+    public init<K1: QueryKeyCodable, K2: QueryKeyCodable, K3: QueryKeyCodable>(
+        queryKey: KeyTuple3<K1, K2, K3>,
+        queryFn: @escaping @Sendable (KeyTuple3<K1, K2, K3>, TPageParam?) async throws -> TData,
+        getNextPageParam: @escaping GetNextPageParamFunction<TData, TPageParam>,
+        getPreviousPageParam: GetPreviousPageParamFunction<TData, TPageParam>? = nil,
+        initialPageParam: TPageParam? = nil,
+        maxPages: Int? = nil,
+        retryConfig: RetryConfig = RetryConfig(),
+        networkMode: NetworkMode = .online,
+        staleTime: TimeInterval = 0,
+        gcTime: TimeInterval = defaultGcTime,
+        refetchTriggers: RefetchTriggers = .default,
+        refetchOnAppear: RefetchOnAppear = .ifStale,
+        structuralSharing: Bool = true,
+        meta: QueryMeta? = nil,
+        enabled: Bool = true,
+        queryClient: QueryClient? = nil,
+        @ViewBuilder content: @escaping (UseInfiniteQueryResult<TData, TPageParam>) -> Content
+    ) where TKey == KeyTuple3<K1, K2, K3> {
+        let options = InfiniteQueryOptions<TData, QueryError, KeyTuple3<K1, K2, K3>, TPageParam>(
+            queryKey: queryKey,
+            queryFn: queryFn,
+            getNextPageParam: getNextPageParam,
+            getPreviousPageParam: getPreviousPageParam,
+            initialPageParam: initialPageParam,
+            maxPages: maxPages,
+            retryConfig: retryConfig,
+            networkMode: networkMode,
+            staleTime: staleTime,
+            gcTime: gcTime,
+            refetchTriggers: refetchTriggers,
+            refetchOnAppear: refetchOnAppear,
+            structuralSharing: structuralSharing,
+            meta: meta,
+            enabled: enabled
+        )
+
+        self.init(
+            options: options,
+            queryClient: queryClient,
+            content: content
+        )
+    }
+
+    /// Create UseInfiniteQuery with KeyTuple4-based query key
+    /// - Parameters:
+    ///   - queryKey: KeyTuple4 identifier for the query
+    ///   - queryFn: Function that fetches page data
+    ///   - getNextPageParam: Function to get next page parameter from pages
+    ///   - getPreviousPageParam: Function to determine the previous page parameter
+    ///   - initialPageParam: Initial page parameter for the first page
+    ///   - maxPages: Maximum number of pages to retain
+    ///   - retryConfig: Configuration for retry behavior (default: RetryConfig())
+    ///   - networkMode: Network behavior configuration (default: .online)
+    ///   - staleTime: Time before data is considered stale (default: 0)
+    ///   - gcTime: Time before unused data is garbage collected (default: 5 minutes)
+    ///   - refetchTriggers: Configuration for automatic refetching triggers (default: .default)
+    ///   - refetchOnAppear: When to refetch data on view appear (default: .ifStale)
+    ///   - structuralSharing: Whether to use structural sharing for performance (default: true)
+    ///   - meta: Arbitrary metadata for this query
+    ///   - enabled: Whether the query should execute automatically (default: true)
+    ///   - queryClient: Optional query client (uses shared instance if nil)
+    ///   - content: View builder that receives the query result
+    public init<K1: QueryKeyCodable, K2: QueryKeyCodable, K3: QueryKeyCodable, K4: QueryKeyCodable>(
+        queryKey: KeyTuple4<K1, K2, K3, K4>,
+        queryFn: @escaping @Sendable (KeyTuple4<K1, K2, K3, K4>, TPageParam?) async throws -> TData,
         getNextPageParam: @escaping GetNextPageParamFunction<TData, TPageParam>,
         getPreviousPageParam: GetPreviousPageParamFunction<TData, TPageParam>? = nil,
         initialPageParam: TPageParam? = nil,
@@ -341,8 +467,8 @@ extension UseInfiniteQuery {
         enabled: Bool = true,
         queryClient: QueryClient? = nil,
         @ViewBuilder content: @escaping (UseInfiniteQueryResult<TData, TPageParam>) -> Content
-    ) where TKey == String {
-        let options = InfiniteQueryOptions<TData, QueryError, String, TPageParam>(
+    ) where TKey == KeyTuple4<K1, K2, K3, K4> {
+        let options = InfiniteQueryOptions<TData, QueryError, KeyTuple4<K1, K2, K3, K4>, TPageParam>(
             queryKey: queryKey,
             queryFn: queryFn,
             getNextPageParam: getNextPageParam,

Tests/SwiftUIQueryTests/KeyTupleTests.swift

@@ -168,4 +168,32 @@ struct KeyTupleTests {
         #expect(key7 == key8)
         #expect(key7 != key9)
     }
+
+    // MARK: - InfiniteQueryOptions KeyTuple Tests
+
+    @Test("InfiniteQueryOptions with KeyTuple2")
+    func infiniteQueryOptionsKeyTuple2() async {
+        struct Post: Sendable, Codable {
+            let id: Int
+            let title: String
+        }
+
+        let key = KeyTuple2("posts", 10)
+
+        let options = InfiniteQueryOptions<[Post], QueryError, KeyTuple2<String, Int>, Int>(
+            queryKey: key,
+            queryFn: { (_: KeyTuple2<String, Int>, pageParam: Int?) async throws -> [Post] in
+                let page = pageParam ?? 0
+                return [Post(id: page, title: "Post \(page)")]
+            },
+            getNextPageParam: { pages in
+                return pages.count < 3 ? pages.count : nil
+            },
+            initialPageParam: 0
+        )
+
+        #expect(options.queryKey == key)
+        #expect(options.queryKey.key1 == "posts")
+        #expect(options.queryKey.key2 == 10)
+    }
 }

Tests/SwiftUIQueryTests/UseInfiniteQueryTests.swift

@@ -697,7 +697,7 @@ struct InfiniteQueryTests {
         // After refetch, new data should be present
         #expect(refetchedData.pages.count == 1)
         #expect(infiniteQuery.state.data?.pages.count == 1)
-        #expect(await fetchCounter.count == 2) // Verify fetch was called twice
+        #expect(fetchCounter.count == 2) // Verify fetch was called twice
     }
 }