Squashed 'apollo-ios/' changes from 28c559ea..6200e120

6200e120 Make cache public within ReadTransaction (#661)

git-subtree-dir: apollo-ios
git-subtree-split: 6200e12074f7935b919451442160f8bc21040da6

Author: gh-action-runner

Sources/Apollo/ApolloStore.swift

@@ -201,19 +201,21 @@ public class ApolloStore {
   }
 
   public class ReadTransaction {
-    fileprivate let cache: any NormalizedCache
-      
+    fileprivate let _cache: any NormalizedCache
+
+    public var readOnlyCache: any ReadOnlyNormalizedCache { _cache }
+
     fileprivate lazy var loader: DataLoader<CacheKey, Record> = DataLoader { [weak self] batchLoad in
           guard let self else { return [:] }
-          return try cache.loadRecords(forKeys: batchLoad)
+          return try _cache.loadRecords(forKeys: batchLoad)
     }
 
     fileprivate lazy var executor = GraphQLExecutor(
       executionSource: CacheDataExecutionSource(transaction: self)
     ) 
 
     fileprivate init(store: ApolloStore) {
-      self.cache = store.cache
+      self._cache = store.cache
     }
 
     public func read<Query: GraphQLQuery>(query: Query) throws -> Query.Data {
@@ -264,6 +266,8 @@ public class ApolloStore {
 
   public final class ReadWriteTransaction: ReadTransaction {
 
+    public var cache: any NormalizedCache { _cache }
+
     fileprivate var updateChangedKeysFunc: DidChangeKeysFunc?
 
     override init(store: ApolloStore) {

Sources/Apollo/NormalizedCache.swift

@@ -1,12 +1,12 @@
-public protocol NormalizedCache: AnyObject {
-  
+public protocol NormalizedCache: AnyObject, ReadOnlyNormalizedCache {
+
   /// Loads records corresponding to the given keys.
   ///
   /// - Parameters:
   ///   - key: The cache keys to load data for
   /// - Returns: A dictionary of cache keys to records containing the records that have been found.
   func loadRecords(forKeys keys: Set<CacheKey>) throws -> [CacheKey: Record]
-    
+
   /// Merges a set of records into the cache.
   ///
   /// - Parameters:
@@ -46,3 +46,15 @@ public protocol NormalizedCache: AnyObject {
   /// Clears all records.
   func clear() throws
 }
+
+/// A read-only view of a `NormalizedCache` for use within a `ReadTransaction`.
+public protocol ReadOnlyNormalizedCache: AnyObject {
+
+  /// Loads records corresponding to the given keys.
+  ///
+  /// - Parameters:
+  ///   - key: The cache keys to load data for
+  /// - Returns: A dictionary of cache keys to records containing the records that have been found.
+  func loadRecords(forKeys keys: Set<CacheKey>) throws -> [CacheKey: Record]
+
+}