Make KeyPaths optional

apollographql · May 26, 2023 · 1492973 · 1492973
1 parent c76914d
commit 1492973
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Sources/Apollo/RelayPageExtractor.swift b/Sources/Apollo/RelayPageExtractor.swift
@@ -34,11 +34,14 @@ public struct RelayPageExtractor<Query: GraphQLQuery>: PageExtractionStrategy {
   /// - Parameters:
   ///   - hasNextPagePath: A `KeyPath` over a `Query.Data` which identifies the `hasNextPage` key within the `Query.Data`.
   ///   - endCursorPath: A `KeyPath` over a `Query.Data` which identifies the `endCursor` key within the `Query.Data`.
-  public init(hasNextPagePath: KeyPath<Query.Data, Bool>, endCursorPath: KeyPath<Query.Data, String?>) {
+  public init(
+    hasNextPagePath: KeyPath<Query.Data, Bool>?,
+    endCursorPath: KeyPath<Query.Data, String?>?
+  ) {
     _transform = { data in
       Page(
-        hasNextPage: data[keyPath: hasNextPagePath],
-        endCursor: data[keyPath: endCursorPath]
+        hasNextPage: hasNextPagePath.flatMap { data[keyPath: $0] } ?? false,
+        endCursor: endCursorPath.flatMap { data[keyPath: $0] }
       )
     }
   }