Merge pull request #1553 from joreilly/use-incubating-cache-0.0.8

Use Apollo Normalized Cache incubating v0.0.8

Author: joreilly

gradle/libs.versions.toml

@@ -12,7 +12,7 @@ activity-compose = "1.10.1"
 androidx-lifecycle = "2.8.7"
 androidx-datastore = "1.1.3"
 apollo = "4.1.1"
-apollo-cache = "0.0.6"
+apollo-cache = "0.0.8"
 compose = "1.7.8"
 composeLifecyleRuntime="2.8.4"
 compose-multiplatform = "1.7.3"

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ApolloClientCache.kt

@@ -16,7 +16,7 @@ import com.apollographql.apollo.network.NetworkMonitor
 import com.apollographql.cache.normalized.api.CacheControlCacheResolver
 import com.apollographql.cache.normalized.api.SchemaCoordinatesMaxAgeProvider
 import com.apollographql.cache.normalized.maxStale
-import com.apollographql.cache.normalized.storeReceiveDate
+import com.apollographql.cache.normalized.storeReceivedDate
 import dev.johnoreilly.confetti.cache.Cache
 import dev.johnoreilly.confetti.di.getNormalizedCacheFactory
 import dev.johnoreilly.confetti.utils.registerApolloDebugServer
@@ -132,7 +132,7 @@ class ApolloClientCache : KoinComponent {
                     )
                 ),
             )
-            .storeReceiveDate(true)
+            .storeReceivedDate(true)
             .maxStale(Duration.INFINITE)
             .autoPersistedQueries()
             .addInterceptor(tokenProviderInterceptor)

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/fetchPolicy.kt

@@ -4,11 +4,11 @@ import com.apollographql.apollo.api.ApolloRequest
 import com.apollographql.apollo.api.ApolloResponse
 import com.apollographql.apollo.api.MutableExecutionOptions
 import com.apollographql.apollo.api.Operation
-import com.apollographql.apollo.exception.ApolloException
 import com.apollographql.apollo.interceptor.ApolloInterceptor
 import com.apollographql.apollo.interceptor.ApolloInterceptorChain
 import com.apollographql.cache.normalized.FetchPolicy
 import com.apollographql.cache.normalized.cacheInfo
+import com.apollographql.cache.normalized.errorsAsException
 import com.apollographql.cache.normalized.fetchFromCache
 import com.apollographql.cache.normalized.fetchPolicy
 import com.apollographql.cache.normalized.fetchPolicyInterceptor
@@ -53,29 +53,11 @@ private object CacheFirstInterceptor : ApolloInterceptor {
                     if (networkResponse.exception == null || !first) {
                         networkResponse
                     } else {
-                        cacheResponse.cacheMissAsException()
+                        cacheResponse.errorsAsException()
                     }
                 )
                 first = false
             }
         }
     }
 }
-
-private fun <D : Operation.Data> ApolloResponse<D>.cacheMissAsException(): ApolloResponse<D> {
-    return if (cacheInfo!!.isCacheHit) {
-        this
-    } else {
-        val cacheMissException =
-            errors.orEmpty().mapNotNull { it.extensions?.get("exception") as? ApolloException }.reduceOrNull { acc, e ->
-                acc.addSuppressed(e)
-                acc
-            }
-        newBuilder()
-            .exception(cacheMissException)
-            .data(null)
-            .errors(null)
-            .build()
-    }
-}
-