[v2] Fix fetch default cache policies (#777)

Author: AnthonyMDev

Sources/Apollo/ApolloClient.swift

@@ -126,7 +126,7 @@ public final class ApolloClient: Sendable {
   /// - Returns: A `GraphQLResponse` with the result for the query.
   public func fetch<Query: GraphQLQuery>(
     query: Query,
-    cachePolicy: CachePolicy.Query.SingleResponse,
+    cachePolicy: CachePolicy.Query.SingleResponse = .cacheFirst,
     requestConfiguration: RequestConfiguration? = nil
   ) async throws -> GraphQLResponse<Query>
   where Query.ResponseFormat == SingleResponseFormat {
@@ -175,7 +175,7 @@ public final class ApolloClient: Sendable {
   /// - Returns: An ``AsyncThrowingStream`` of `GraphQLResponse` results for the query.
   public func fetch<Query: GraphQLQuery>(
     query: Query,
-    cachePolicy: CachePolicy.Query.SingleResponse,
+    cachePolicy: CachePolicy.Query.SingleResponse = .cacheFirst,
     requestConfiguration: RequestConfiguration? = nil
   ) throws -> AsyncThrowingStream<GraphQLResponse<Query>, any Swift.Error>
   where Query.ResponseFormat == IncrementalDeferredResponseFormat {
@@ -261,7 +261,7 @@ public final class ApolloClient: Sendable {
   /// - Returns: An ``AsyncThrowingStream`` of `GraphQLResponse` results for the query.
   public func fetch<Query: GraphQLQuery>(
     query: Query,
-    fetchBehavior: FetchBehavior = FetchBehavior.CacheFirst,
+    fetchBehavior: FetchBehavior,
     requestConfiguration: RequestConfiguration? = nil
   ) throws -> AsyncThrowingStream<GraphQLResponse<Query>, any Swift.Error> {
     return try doInClientContext {
@@ -275,13 +275,9 @@ public final class ApolloClient: Sendable {
 
   // MARK: - Watch Query
 
-  // MARK: Watch Query w/Fetch Behavior
-
-  /// Watches a `GraphQLQuery` by first fetching an initial result using the provided ``FetchBehavior``. The
-  /// `resultHandler` is called after the initial fetch and again each time the data for the watched query changes in
-  /// the local cache of this client's ``ApolloClient/store``.
-  ///
-  /// This function triggers a fetch on the ``GraphQLQueryWatcher`` prior to returning it.
+  /// Watches a `GraphQLQuery` by first fetching an initial result from the network or local cache. The `resultHandler`
+  /// is called after the initial fetch and again each time the data for the watched query changes in the local cache
+  /// of this client's ``ApolloClient/store``.
   ///
   /// The ``GraphQLQueryWatcher`` returned by this function is notified whenever any of the data the query result
   /// depends on changes in the local cache. The ``GraphQLQueryWatcher`` retains the provided `resultHandler` and will
@@ -290,8 +286,8 @@ public final class ApolloClient: Sendable {
   ///
   /// - Parameters:
   ///   - query: The `GraphQLQuery` to fetch.
-  ///   - fetchBehavior: The ``FetchBehavior`` to use for this request.
-  ///   Determines if fetching will include cache/network fetches.
+  ///   - cachePolicy: A ``CachePolicy/Query/SingleResponse`` ``CachePolicy`` to use for this request.
+  ///   Determines if the initial fetch will include cache/network fetches.
   ///   - requestConfiguration: A ``RequestConfiguration`` to use for the watcher's initial fetch. Defaults to `nil`.
   ///   If `nil` the receiver's ``ApolloClient/defaultRequestConfiguration`` will be used.
   ///   - refetchOnFailedUpdates: Should the watcher perform a network fetch when it's watched objects have changed,
@@ -302,28 +298,23 @@ public final class ApolloClient: Sendable {
   ///   to stop receiving new results.
   public func watch<Query: GraphQLQuery>(
     query: Query,
-    fetchBehavior: FetchBehavior = FetchBehavior.CacheFirst,
+    cachePolicy: CachePolicy.Query.SingleResponse = .cacheFirst,
     requestConfiguration: RequestConfiguration? = nil,
     refetchOnFailedUpdates: Bool = true,
     resultHandler: @escaping GraphQLQueryWatcher<Query>.ResultHandler
   ) async -> GraphQLQueryWatcher<Query> {
-    let watcher = await GraphQLQueryWatcher(
-      client: self,
+    return await self.watch(
       query: query,
+      fetchBehavior: cachePolicy.toFetchBehavior(),
+      requestConfiguration: requestConfiguration,
       refetchOnFailedUpdates: refetchOnFailedUpdates,
       resultHandler: resultHandler
     )
-    Task {
-      await watcher.fetch(fetchBehavior: fetchBehavior, requestConfiguration: requestConfiguration)
-    }
-    return watcher
   }
 
-  // MARK: Watch Query - CachePolicy Overloads
-
-  /// Watches a `GraphQLQuery` by first fetching an initial result from the network or local cache. The `resultHandler`
-  /// is called after the initial fetch and again each time the data for the watched query changes in the local cache
-  /// of this client's ``ApolloClient/store``.
+  /// Watches a `GraphQLQuery` by first fetching an initial result from from the local cache and then from the network.
+  /// The `resultHandler` is called after the initial fetch and again each time the data for the watched query changes
+  /// in the local cache of this client's ``ApolloClient/store``.
   ///
   /// The ``GraphQLQueryWatcher`` returned by this function is notified whenever any of the data the query result
   /// depends on changes in the local cache. The ``GraphQLQueryWatcher`` retains the provided `resultHandler` and will
@@ -332,8 +323,8 @@ public final class ApolloClient: Sendable {
   ///
   /// - Parameters:
   ///   - query: The `GraphQLQuery` to fetch.
-  ///   - cachePolicy: A ``CachePolicy/Query/SingleResponse`` ``CachePolicy`` to use for this request.
-  ///   Determines if the initial fetch will include cache/network fetches.
+  ///   - cachePolicy: A ``CachePolicy`` to use for this request. This function overload only accepts the
+  ///   ``CachePolicy/Query/CacheAndNetwork/cacheAndNetwork`` policy.
   ///   - requestConfiguration: A ``RequestConfiguration`` to use for the watcher's initial fetch. Defaults to `nil`.
   ///   If `nil` the receiver's ``ApolloClient/defaultRequestConfiguration`` will be used.
   ///   - refetchOnFailedUpdates: Should the watcher perform a network fetch when it's watched objects have changed,
@@ -344,7 +335,7 @@ public final class ApolloClient: Sendable {
   ///   to stop receiving new results.
   public func watch<Query: GraphQLQuery>(
     query: Query,
-    cachePolicy: CachePolicy.Query.SingleResponse,
+    cachePolicy: CachePolicy.Query.CacheAndNetwork,
     requestConfiguration: RequestConfiguration? = nil,
     refetchOnFailedUpdates: Bool = true,
     resultHandler: @escaping GraphQLQueryWatcher<Query>.ResultHandler
@@ -358,9 +349,9 @@ public final class ApolloClient: Sendable {
     )
   }
 
-  /// Watches a `GraphQLQuery` by first fetching an initial result from from the local cache and then from the network.
-  /// The `resultHandler` is called after the initial fetch and again each time the data for the watched query changes
-  /// in the local cache of this client's ``ApolloClient/store``.
+  /// Watches a `GraphQLQuery` by first fetching an initial result from from the local cache. It does not attempt to
+  /// fetch results from the server. The `resultHandler` is called after the initial fetch and again each time the data
+  /// for the watched query changes in the local cache of this client's ``ApolloClient/store``.
   ///
   /// The ``GraphQLQueryWatcher`` returned by this function is notified whenever any of the data the query result
   /// depends on changes in the local cache. The ``GraphQLQueryWatcher`` retains the provided `resultHandler` and will
@@ -370,7 +361,7 @@ public final class ApolloClient: Sendable {
   /// - Parameters:
   ///   - query: The `GraphQLQuery` to fetch.
   ///   - cachePolicy: A ``CachePolicy`` to use for this request. This function overload only accepts the
-  ///   ``CachePolicy/Query/CacheAndNetwork/cacheAndNetwork`` policy.
+  ///   ``CachePolicy/Query/CacheOnly/cacheOnly`` policy.
   ///   - requestConfiguration: A ``RequestConfiguration`` to use for the watcher's initial fetch. Defaults to `nil`.
   ///   If `nil` the receiver's ``ApolloClient/defaultRequestConfiguration`` will be used.
   ///   - refetchOnFailedUpdates: Should the watcher perform a network fetch when it's watched objects have changed,
@@ -381,7 +372,7 @@ public final class ApolloClient: Sendable {
   ///   to stop receiving new results.
   public func watch<Query: GraphQLQuery>(
     query: Query,
-    cachePolicy: CachePolicy.Query.CacheAndNetwork,
+    cachePolicy: CachePolicy.Query.CacheOnly,
     requestConfiguration: RequestConfiguration? = nil,
     refetchOnFailedUpdates: Bool = true,
     resultHandler: @escaping GraphQLQueryWatcher<Query>.ResultHandler
@@ -395,9 +386,13 @@ public final class ApolloClient: Sendable {
     )
   }
 
-  /// Watches a `GraphQLQuery` by first fetching an initial result from from the local cache. It does not attempt to
-  /// fetch results from the server. The `resultHandler` is called after the initial fetch and again each time the data
-  /// for the watched query changes in the local cache of this client's ``ApolloClient/store``.
+  // MARK: Watch Query w/Fetch Behavior
+
+  /// Watches a `GraphQLQuery` by first fetching an initial result using the provided ``FetchBehavior``. The
+  /// `resultHandler` is called after the initial fetch and again each time the data for the watched query changes in
+  /// the local cache of this client's ``ApolloClient/store``.
+  ///
+  /// This function triggers a fetch on the ``GraphQLQueryWatcher`` prior to returning it.
   ///
   /// The ``GraphQLQueryWatcher`` returned by this function is notified whenever any of the data the query result
   /// depends on changes in the local cache. The ``GraphQLQueryWatcher`` retains the provided `resultHandler` and will
@@ -406,8 +401,8 @@ public final class ApolloClient: Sendable {
   ///
   /// - Parameters:
   ///   - query: The `GraphQLQuery` to fetch.
-  ///   - cachePolicy: A ``CachePolicy`` to use for this request. This function overload only accepts the
-  ///   ``CachePolicy/Query/CacheOnly/cacheOnly`` policy.
+  ///   - fetchBehavior: The ``FetchBehavior`` to use for this request.
+  ///   Determines if fetching will include cache/network fetches.
   ///   - requestConfiguration: A ``RequestConfiguration`` to use for the watcher's initial fetch. Defaults to `nil`.
   ///   If `nil` the receiver's ``ApolloClient/defaultRequestConfiguration`` will be used.
   ///   - refetchOnFailedUpdates: Should the watcher perform a network fetch when it's watched objects have changed,
@@ -418,18 +413,21 @@ public final class ApolloClient: Sendable {
   ///   to stop receiving new results.
   public func watch<Query: GraphQLQuery>(
     query: Query,
-    cachePolicy: CachePolicy.Query.CacheOnly,
+    fetchBehavior: FetchBehavior,
     requestConfiguration: RequestConfiguration? = nil,
     refetchOnFailedUpdates: Bool = true,
     resultHandler: @escaping GraphQLQueryWatcher<Query>.ResultHandler
   ) async -> GraphQLQueryWatcher<Query> {
-    return await self.watch(
+    let watcher = await GraphQLQueryWatcher(
+      client: self,
       query: query,
-      fetchBehavior: cachePolicy.toFetchBehavior(),
-      requestConfiguration: requestConfiguration,
       refetchOnFailedUpdates: refetchOnFailedUpdates,
       resultHandler: resultHandler
     )
+    Task {
+      await watcher.fetch(fetchBehavior: fetchBehavior, requestConfiguration: requestConfiguration)
+    }
+    return watcher
   }
 
   // MARK: - Perform Mutation