Nick feedback

Author: aashishpatil-g

Sources/Cache/ResultTree.swift

@@ -14,14 +14,19 @@
 
 import Foundation
 
-import FirebaseCore
-
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
-struct ResultTree {
-  let data: String // tree data - could be hydrated or dehydrated.
-  let ttl: TimeInterval // interval during which query results are considered fresh
-  let cachedAt: Date // Local time when the entry was cached / updated
-  var lastAccessed: Date // Local time when the entry was read or updated
+struct ResultTree: Codable {
+  // tree data - could be hydrated or dehydrated.
+  let data: String
+
+  // interval during which query results are considered fresh
+  let ttl: TimeInterval
+
+  // Local time when the entry was cached / updated
+  let cachedAt: Date
+
+  // Local time when the entry was read or updated
+  var lastAccessed: Date
 
   var rootObject: EntityNode?
 
@@ -37,21 +42,3 @@ struct ResultTree {
     case data = "d" // data cached
   }
 }
-
-extension ResultTree: Codable {
-  init(from decoder: any Decoder) throws {
-    let container = try decoder.container(keyedBy: CodingKeys.self)
-    cachedAt = try container.decode(Date.self, forKey: .cachedAt)
-    lastAccessed = try container.decode(Date.self, forKey: .lastAccessed)
-    ttl = try container.decode(TimeInterval.self, forKey: .ttl)
-    data = try container.decode(String.self, forKey: .data)
-  }
-
-  func encode(to encoder: any Encoder) throws {
-    var container = encoder.container(keyedBy: CodingKeys.self)
-    try container.encode(cachedAt, forKey: .cachedAt)
-    try container.encode(lastAccessed, forKey: .lastAccessed)
-    try container.encode(ttl, forKey: .ttl)
-    try container.encode(data, forKey: .data)
-  }
-}

Sources/Cache/ResultTreeProcessor.swift

@@ -66,17 +66,9 @@ class ImpactedQueryRefsAccumulator {
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 struct ResultTreeProcessor {
   /*
-   Go down the tree and convert them to entity nodes
-    For each Node
-      - extract globalID
-      - Get the EDO for the globalID
-        - extract scalars and update EDO with scalars
-      - for each array
-        - recursively process each object (could be scalar or composite)
-      - for composite objects (dictionaries), create references to their node
-        - create a Node and init it with dictionary.
+    Takes a JSON tree with data and normalizes the entities contained in it,
+    creating a resultant JSON tree with references to entities.
    */
-
   func dehydrateResults(_ hydratedTree: String, cacheProvider: CacheProvider,
                         requestor: (any QueryRefInternal)? = nil) throws -> (
     dehydratedResults: String,
@@ -116,6 +108,9 @@ struct ResultTreeProcessor {
     return (dehydratedResultsString, enode, impactedRefs)
   }
 
+  /*
+      Takes a dehydrated tree and fills it up with Entity data from referenced entities.
+   */
   func hydrateResults(_ dehydratedTree: String, cacheProvider: CacheProvider) throws ->
     (hydratedResults: String, rootObject: EntityNode) {
     guard let dehydratedData = dehydratedTree.data(using: .utf8) else {

Sources/Cache/SQLiteCacheProvider.swift

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseCore
 import Foundation
 import SQLite3
 

Sources/Internal/OperationsManager.swift

@@ -52,7 +52,7 @@ class OperationsManager {
       }
 
       if publisher == .auto || publisher == .observableMacro {
-        if #available(iOS 17, macOS 15, tvOS 17, watchOS 10, *) {
+        if #available(iOS 17, macOS 14, tvOS 17, watchOS 10, *) {
           let obsRef = QueryRefObservation<ResultDataType, VariableType>(
             request: request,
             dataType: resultType,

Sources/MutationRef.swift

@@ -31,18 +31,18 @@ public class MutationRef<
   ResultData: Decodable & Sendable,
   Variable: OperationVariable
 >: OperationRef {
-  private var request: any OperationRequest
+  private var request: MutationRequest<Variable>
 
   private var grpcClient: GrpcClient
 
-  init(request: any OperationRequest, grpcClient: GrpcClient) {
+  init(request: MutationRequest<Variable>, grpcClient: GrpcClient) {
     self.request = request
     self.grpcClient = grpcClient
   }
 
   public func execute() async throws -> OperationResult<ResultData> {
     let results = try await grpcClient.executeMutation(
-      request: request as! MutationRequest<Variable>,
+      request: request,
       resultType: ResultData.self
     )
     return results
@@ -54,6 +54,6 @@ public class MutationRef<
 
   public static func == (lhs: MutationRef<ResultData, Variable>,
                          rhs: MutationRef<ResultData, Variable>) -> Bool {
-    return lhs.request as? MutationRequest<Variable> == rhs.request as? MutationRequest<Variable>
+    return lhs.request == rhs.request
   }
 }

Sources/OperationResult.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 
-/// Struct returned by operation calls - query or mutation
+/// Structure representing the value returned by operation calls - query or mutation
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 public struct OperationResult<ResultData: Decodable & Sendable>: Sendable {
   public let data: ResultData?

Sources/Queries/GenericQueryRef.swift

@@ -12,11 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import CryptoKit
 import Foundation
 
-import Firebase
-
 @preconcurrency import Combine
 import Observation
 

Sources/Queries/ObservableQueryRef.swift

@@ -12,11 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import CryptoKit
 import Foundation
 
-import Firebase
-
 @preconcurrency import Combine
 import Observation
 
@@ -154,7 +151,7 @@ extension QueryRefObservableObject: QueryRefInternal {
 /// - ``data``: Published variable that contains bindable results of the query.
 /// - ``lastError``: Published variable that contains ``DataConnectError``  if last fetch had error.
 ///            If last fetch was successful, this variable is cleared
-@available(macOS 15, iOS 17, tvOS 17, watchOS 10, *)
+@available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
 @Observable
 public class QueryRefObservation<
   ResultData: Decodable & Sendable,
@@ -232,7 +229,7 @@ public class QueryRefObservation<
   }
 }
 
-@available(macOS 15, iOS 17, tvOS 17, watchOS 10, *)
+@available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
 public extension QueryRefObservation {
   nonisolated func hash(into hasher: inout Hasher) {
     hasher.combine(baseRef)
@@ -243,14 +240,14 @@ public extension QueryRefObservation {
   }
 }
 
-@available(macOS 15, iOS 17, tvOS 17, watchOS 10, *)
+@available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
 extension QueryRefObservation: CustomStringConvertible {
   public nonisolated var description: String {
     "QueryRefObservation(\(String(describing: baseRef)))"
   }
 }
 
-@available(macOS 15, iOS 17, tvOS 17, watchOS 10, *)
+@available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
 extension QueryRefObservation: QueryRefInternal {
   func publishServerResultsToSubscribers() async throws {
     try await baseRef.publishServerResultsToSubscribers()

Sources/Queries/QueryRef.swift

@@ -12,11 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import CryptoKit
 import Foundation
 
-import Firebase
-
 @preconcurrency import Combine
 import Observation
 

Sources/Queries/QueryRequest.swift

@@ -12,11 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import CryptoKit
 import Foundation
 
-import Firebase
-
 /// A QueryRequest is used to get a QueryRef to a Data Connect query using the specified query name
 /// and input variables to the query
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
@@ -51,7 +48,8 @@ struct QueryRequest<Variable: OperationVariable>: OperationRequest, Hashable, Eq
     self.variables = variables
   }
 
-  // Hashable and Equatable implementation
+  // MARK: - Hashable and Equatable implementation
+
   func hash(into hasher: inout Hasher) {
     hasher.combine(operationName)
     if let variables {
@@ -64,16 +62,6 @@ struct QueryRequest<Variable: OperationVariable>: OperationRequest, Hashable, Eq
       return false
     }
 
-    if lhs.variables == nil && rhs.variables == nil {
-      return true
-    }
-
-    guard let lhsVar = lhs.variables,
-          let rhsVar = rhs.variables,
-          lhsVar == rhsVar else {
-      return false
-    }
-
-    return true
+    return lhs.variables == rhs.variables
   }
 }